[MediaWiki-commits] [Gerrit] adding 7zip archives to the MIMEs - change (mediawiki/core)

[DennisRoczek (Code Review)]

DennisRoczek has uploaded a new change for review.

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

Change subject: adding 7zip archives to the MIMEs
..

adding 7zip archives to the MIMEs

Change-Id: Ib3392b7fcec475c153099a1b92fe195c5eb4b195
---
M includes/mime.info
M includes/mime.types
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/242101/1

diff --git a/includes/mime.info b/includes/mime.info
index 840b9d8..999be92 100644
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -76,7 +76,7 @@
 application/x-tar  [ARCHIVE]
 application/x-stuffit  [ARCHIVE]
 application/x-opc+zip  [ARCHIVE]
-
+application/x-7z-compressed [ARCHIVE]
 
 text/javascript application/x-javascript application/x-ecmascript 
text/ecmascript  [EXECUTABLE]
 application/x-bash [EXECUTABLE]
diff --git a/includes/mime.types b/includes/mime.types
index 210610a..3b9899f 100644
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -20,6 +20,7 @@
 application/vnd.wap.wmlc wmlc
 application/vnd.wap.wmlscriptc wmlsc
 application/voicexml+xml vxml
+application/x-7z-compressed 7z
 application/x-bcpio bcpio
 application/x-bzip bz
 application/x-bzip2 bz2

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Fixed Style/StringLiterals RuboCop offense
..


Fixed Style/StringLiterals RuboCop offense

Bug: T113846
Change-Id: I9825d582b9e94662cbabe99651f6e242d31bd55d
---
M .rubocop_todo.yml
M Gemfile
M tests/browser/features/support/env.rb
M tests/browser/features/support/pages/editable_random_page.rb
M tests/browser/features/support/pages/registration_page.rb
5 files changed, 16 insertions(+), 23 deletions(-)

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



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 77eeff2..e752c85 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -15,12 +15,6 @@
 - 'tests/browser/features/support/pages/editable_random_page.rb'
 - 'tests/browser/features/support/pages/registration_page.rb'
 
-# Offense count: 18
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
-
 # Offense count: 38
 # Cop supports --auto-correct.
 Style/Tab:
diff --git a/Gemfile b/Gemfile
index ce6b54a..e9a988b 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source "https://rubygems.org;
+source 'https://rubygems.org'
 
-gem "mediawiki_selenium", "~> 0.4.2"
-gem "rubocop", "~> 0.34.2", require: false
+gem 'mediawiki_selenium', '~> 0.4.2'
+gem 'rubocop', '~> 0.34.2', require: false
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index 8ac08ea..c768f2f 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -1 +1 @@
-require "mediawiki_selenium"
+require 'mediawiki_selenium'
diff --git a/tests/browser/features/support/pages/editable_random_page.rb 
b/tests/browser/features/support/pages/editable_random_page.rb
index e37a707..4408a9e 100644
--- a/tests/browser/features/support/pages/editable_random_page.rb
+++ b/tests/browser/features/support/pages/editable_random_page.rb
@@ -1,9 +1,8 @@
 class EditableRandomPage < RandomPage
-   h1(:title, id: "firstHeading")
-   div(:cta, id: "mw-gettingstarted-cta-editable-main-page")
-   a(:edit_this_page, id: "mw-gettingstarted-editable-main-edit-page")
-   a(:edit_suggested_page, id: "mw-gettingstarted-editable-main-fix-pages")
-   a(:no_thanks, class: "mw-gettingstarted-cta-leave-link")
-
-   a(:create_account, css: "#pt-createaccount a")
+   h1(:title, id: 'firstHeading')
+   div(:cta, id: 'mw-gettingstarted-cta-editable-main-page')
+   a(:edit_this_page, id: 'mw-gettingstarted-editable-main-edit-page')
+   a(:edit_suggested_page, id: 'mw-gettingstarted-editable-main-fix-pages')
+   a(:no_thanks, class: 'mw-gettingstarted-cta-leave-link')
+   a(:create_account, css: '#pt-createaccount a')
 end
diff --git a/tests/browser/features/support/pages/registration_page.rb 
b/tests/browser/features/support/pages/registration_page.rb
index 0ab4db6..ef6dcd4 100644
--- a/tests/browser/features/support/pages/registration_page.rb
+++ b/tests/browser/features/support/pages/registration_page.rb
@@ -1,11 +1,11 @@
 class RegistrationPage
include PageObject
 
-   text_field(:username, id: "wpName2")
-   text_field(:password, id: "wpPassword2")
-   text_field(:password_confirmation, id: "wpRetype")
-   button(:register, id: "wpCreateaccount")
-   a(:return_to, css: "#mw-returnto a")
+   text_field(:username, id: 'wpName2')
+   text_field(:password, id: 'wpPassword2')
+   text_field(:password_confirmation, id: 'wpRetype')
+   button(:register, id: 'wpCreateaccount')
+   a(:return_to, css: '#mw-returnto a')
 
def register_user(username)
self.username = username
@@ -13,7 +13,7 @@
self.password = password
self.password_confirmation = password
 
-   if ENV.key?("MEDIAWIKI_CAPTCHA_BYPASS_PASSWORD")
+   if ENV.key?('MEDIAWIKI_CAPTCHA_BYPASS_PASSWORD')
bypass_script = <<-END
var $bypass = $( '' ).attr( {
type: 'hidden',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9825d582b9e94662cbabe99651f6e242d31bd55d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Swalling 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

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

[jenkins-bot (Code Review)]

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

Change subject: Fixed Style/SpaceInsideStringInterpolation RuboCop offense
..


Fixed Style/SpaceInsideStringInterpolation RuboCop offense

Bug: T113846
Change-Id: I1bace67484747011c00741f93d006e8ab35bc4ea
---
M .rubocop_todo.yml
M tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb
2 files changed, 1 insertion(+), 8 deletions(-)

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



diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8289761..77eeff2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -15,13 +15,6 @@
 - 'tests/browser/features/support/pages/editable_random_page.rb'
 - 'tests/browser/features/support/pages/registration_page.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SpaceInsideStringInterpolation:
-  Exclude:
-- 
'tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb'
-
 # Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git 
a/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb 
b/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb
index 65ad737..3166f4d 100644
--- 
a/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb
+++ 
b/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb
@@ -2,7 +2,7 @@
@original_title = on(EditableRandomPage).title
 
on(EditableRandomPage).create_account_element.click
-   on(RegistrationPage).register_user "Test Account #{ @random_string }"
+   on(RegistrationPage).register_user "Test Account #{@random_string}"
 end
 
 Then(/^I should be returned to the same article$/) do

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bace67484747011c00741f93d006e8ab35bc4ea
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Swalling 
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: split realserver_ips in codfw/eqiad - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: restbase: split realserver_ips in codfw/eqiad
..

restbase: split realserver_ips in codfw/eqiad

Change-Id: I0a81e4bf73c451e4161d8968b695963f6a5c2cfe
---
M hieradata/role/codfw/restbase.yaml
M hieradata/role/common/restbase.yaml
M hieradata/role/eqiad/restbase.yaml
3 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/242110/1

diff --git a/hieradata/role/codfw/restbase.yaml 
b/hieradata/role/codfw/restbase.yaml
index 190ce12..504efcf 100644
--- a/hieradata/role/codfw/restbase.yaml
+++ b/hieradata/role/codfw/restbase.yaml
@@ -5,3 +5,6 @@
 - restbase2004.codfw.wmnet
 - restbase2005.codfw.wmnet
 - restbase2006.codfw.wmnet
+
+lvs::realserver::realserver_ips:
+  - '10.2.1.17' # restbase.svc.codfw.wmnet
diff --git a/hieradata/role/common/restbase.yaml 
b/hieradata/role/common/restbase.yaml
index 8961cb4..98e10e1 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -15,8 +15,5 @@
 restbase::cassandra_user: restbase
 restbase::cassandra_password: "%{passwords::cassandra::restbase}"
 
-lvs::realserver::realserver_ips:
-  - '10.2.2.17' # restbase.svc.eqiad.wmnet
-
 admin::groups:
   - restbase-roots
diff --git a/hieradata/role/eqiad/restbase.yaml 
b/hieradata/role/eqiad/restbase.yaml
index 68126cb..e352e91 100644
--- a/hieradata/role/eqiad/restbase.yaml
+++ b/hieradata/role/eqiad/restbase.yaml
@@ -8,3 +8,6 @@
 - restbase1007.eqiad.wmnet
 - restbase1008.eqiad.wmnet
 - restbase1009.eqiad.wmnet
+
+lvs::realserver::realserver_ips:
+  - '10.2.2.17' # restbase.svc.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a81e4bf73c451e4161d8968b695963f6a5c2cfe
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] Update theme tests - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Update theme tests
..


Update theme tests

Requires https://gerrit.wikimedia.org/r/#/c/224943/

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

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 3b0ae96..49d58dd 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -966,7 +966,6 @@
   - mwext-Tabber
   - mwext-Tabs
   - mwext-TemplateInfo
-  - mwext-Theme
   - mwext-ThemeDesigner
   - mwext-ThrottleOverride
   - mwext-ThumbParser
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b7b0286..1ad2d91 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1317,8 +1317,6 @@
 voting: false
   - name: mwext-TemplateInfo-jslint
 voting: false
-  - name: mwext-Theme-jslint
-voting: false
   - name: mwext-ThemeDesigner-jslint
 voting: false
   - name: mwext-ThrottleOverride-jslint
@@ -6005,8 +6003,12 @@
 
   - name: mediawiki/extensions/Theme
 template:
-  - name: extension-jslint
-  - name: extension-unittests-generic
+ - name: composer-test
+ - name: extension-unittests-generic
+ - name: npm
+check:
+ - jsonlint
+ - jshint
 
   - name: mediawiki/extensions/ThemeDesigner
 template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id53e1d6415906250cf4c020182fe866b4656f34e
Gerrit-PatchSet: 18
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use color codes from ext.cx.common.less - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Use color codes from ext.cx.common.less
..

Use color codes from ext.cx.common.less

Fixes some TODO items in less files.

Change-Id: I97ad4a2fb5c78fd96ac21fe8c77bfad52235712c
---
M modules/tools/styles/ext.cx.tools.dictionary.less
M modules/tools/styles/ext.cx.tools.link.less
M modules/tools/styles/ext.cx.tools.mt.less
M modules/tools/styles/ext.cx.tools.reference.less
4 files changed, 18 insertions(+), 19 deletions(-)


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

diff --git a/modules/tools/styles/ext.cx.tools.dictionary.less 
b/modules/tools/styles/ext.cx.tools.dictionary.less
index 59afeb4..c5f8534 100644
--- a/modules/tools/styles/ext.cx.tools.dictionary.less
+++ b/modules/tools/styles/ext.cx.tools.dictionary.less
@@ -9,7 +9,7 @@
 .card__title-row {
.mw-ui-item;
.mw-ui-one-whole;
-   color: #c9c9c9; // TODO Should come from library?
+   color: @gray;
font-size: medium;
padding-top: 8px;
 }
@@ -24,7 +24,7 @@
font-size: x-large;
font-weight: lighter;
line-height: 1.5em;
-   color: #565656; // TODO Should come from library?
+   color: @gray-dark;
 }
 
 .card__definition {
@@ -35,7 +35,7 @@
float: none; // XXX why would it be needed?
padding: @vertical-margin @horizontal-margin;
line-height: 1.5em;
-   color: #565656; // TODO Should come from library?
+   color: @gray-dark;
 }
 
 .card__translations {
@@ -55,8 +55,8 @@
border-radius: 2px;
 
&:hover {
-   background-color: #f0f0f0;
-   color: #252525;
+   background-color: @gray-light;
+   color: @gray-darker;
}
}
 }
diff --git a/modules/tools/styles/ext.cx.tools.link.less 
b/modules/tools/styles/ext.cx.tools.link.less
index 133174c..4d68e83 100644
--- a/modules/tools/styles/ext.cx.tools.link.less
+++ b/modules/tools/styles/ext.cx.tools.link.less
@@ -45,7 +45,7 @@
float: none;
padding: @vertical-margin @horizontal-margin;
font-size: large;
-   color: #565656; // TODO Should come from library?
+   color: @gray-dark;
.background-image-svg('../images/clear.svg', '../images/clear.png');
background-repeat: no-repeat;
background-color: #FF;
@@ -64,7 +64,7 @@
.mw-ui-one-whole;
padding: @vertical-margin @horizontal-margin;
font-size: large;
-   color: #565656; // TODO Should come from library?
+   color: @gray-dark;
.background-image-svg('../images/add.svg', '../images/add.png');
background-repeat: no-repeat;
background-position: left 10px center;
@@ -93,7 +93,7 @@
&:empty {
.background-image-svg('../images/link_lightgray.svg', 
'../images/link_lightgray.png');
background-repeat: no-repeat;
-   background-color: #fbfbfb;
+   background-color: @gray-lighter;
background-position: center center;
border-right: 1px solid #ee;
}
@@ -134,7 +134,7 @@
.card__link-image-container  {
.background-image-svg('../images/question-mark.svg', 
'../images/question-mark.png');
background-repeat: no-repeat;
-   background-color: #fbfbfb;
+   background-color: @gray-lighter;
background-position: center center;
border-right: 1px solid #ee;
}
@@ -149,7 +149,7 @@
.card__link-image-container {
.background-image-svg('../images/link_flagged_lightgray.svg', 
'../images/link_flagged_lightgray.png');
background-repeat: no-repeat;
-   background-color: #fbfbfb;
+   background-color: @gray-lighter;
background-position: center center;
border-right: 1px solid #ee;
}
@@ -171,7 +171,7 @@
 .card__link-instruction {
.mw-ui-item;
.mw-ui-one-whole;
-   color: #565656;
+   color: @gray-dark;
font-size: large;
border-top: 1px solid #dd;
clear: both;
@@ -195,7 +195,7 @@
color: #777;
 
&:hover {
-   color: #252525;
+   color: @gray-darker;
}
}
 
diff --git a/modules/tools/styles/ext.cx.tools.mt.less 
b/modules/tools/styles/ext.cx.tools.mt.less
index 1f5fda9..72af107 100644
--- a/modules/tools/styles/ext.cx.tools.mt.less
+++ b/modules/tools/styles/ext.cx.tools.mt.less
@@ -6,7 +6,7 @@
.mw-ui-item;
.mw-ui-one-whole;
float: none; // XXX why would it be needed?
-   color: #c9c9c9; // TODO Should come from 

[MediaWiki-commits] [Gerrit] [Accessibility Simulation] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [Accessibility Simulation] Register extension
..


[Accessibility Simulation] Register extension

Change-Id: I5b8a68183b525cee36329fd672d3f5616296dc1f
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 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 fdbdc22..127a9e7 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -9,6 +9,8 @@
 #ignored=accesscontrol-info-user, accesscontrol-info-anonymous, 
accesscontrol-info-deny, accesscontrol-edit-anonymous
 #ignored=accesscontrol-edit-users
 
+Accessibility Simulation
+
 # Disabled 2015-07-21 afters SULF finished
 # Account Audit
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b8a68183b525cee36329fd672d3f5616296dc1f
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] RuboCop should ignore cache folder - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: RuboCop should ignore cache folder
..


RuboCop should ignore cache folder

Bug: T106220
Change-Id: I1563b2945a1bbc1a21d1dfe1eaa10133b321779e
---
M .rubocop.yml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.rubocop.yml b/.rubocop.yml
index c8f54ea..55c48a5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,6 +4,7 @@
   # Only enforce rules that have an entry in the style guide
   StyleGuideCopsOnly: true
   Exclude:
+- 'cache/**/*'
 - 'mediawiki/**/*'
 - 'mediawiki-*/**/*'
 - 'puppet/modules/activemq/**/*'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1563b2945a1bbc1a21d1dfe1eaa10133b321779e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: BryanDavis 
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] Update for I51f7966add: load oojs-ui.styles.icons - change (mediawiki...UploadWizard)

[jenkins-bot (Code Review)]

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

Change subject: Update for I51f7966add: load oojs-ui.styles.icons
..


Update for I51f7966add: load oojs-ui.styles.icons

Change-Id: I74c930aeee1c9adf586322c34ce8c14a3c432755
---
M UploadWizardHooks.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index abef0da..9fedff3 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -56,6 +56,7 @@
 
'oojs',
'oojs-ui',
+   'oojs-ui.styles.icons',
'oojs-ui.styles.icons-editing-core',
'oojs-ui.styles.icons-editing-advanced',
'mediawiki.widgets',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74c930aeee1c9adf586322c34ce8c14a3c432755
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Change jslint to jshint in SkelJS - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Change jslint to jshint in SkelJS
..


Change jslint to jshint in SkelJS

Also add jsonlint test.

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

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 49d58dd..18e8338 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -935,7 +935,6 @@
   - mwext-SimpleSurvey
   - mwext-SiteMetrics
   - mwext-SiteSettings
-  - mwext-SkelJS
   - mwext-SkinPerNamespace
   - mwext-skins
   - mwext-SlimboxThumbs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1ad2d91..6ab1cfc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1263,8 +1263,6 @@
 voting: false
   - name: mwext-SiteSettings-jslint
 voting: false
-  - name: mwext-SkelJS-jslint
-voting: false
   - name: mwext-SkinPerNamespace-jslint
 voting: false
   - name: mwext-SlimboxThumbs-jslint
@@ -5860,7 +5858,8 @@
 
   - name: mediawiki/extensions/SkelJS
 template:
-  - name: extension-jslint
+  - name: jsonlint
+  - name: jshint
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/SkinPerNamespace

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7103a2a991dc9cc32b1ac9cd3b3c778fc9d707b9
Gerrit-PatchSet: 11
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] restbase: add LVS codfw configuration - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: restbase: add LVS codfw configuration
..


restbase: add LVS codfw configuration

Bug: T108613
Change-Id: Ia4b4b1e16f35eb2bf473e89a47d28b1f3354f7bf
---
M conftool-data/nodes/codfw.yaml
M conftool-data/services/services.yaml
M hieradata/common/lvs/configuration.yaml
M modules/role/manifests/lvs/balancer.pp
4 files changed, 16 insertions(+), 3 deletions(-)

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



diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index e32dffc..c134ba4 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -258,3 +258,10 @@
   elastic2022.codfw.wmnet: [elasticsearch]
   elastic2023.codfw.wmnet: [elasticsearch]
   elastic2024.codfw.wmnet: [elasticsearch]
+restbase:
+  restbase2001.codfw.wmnet: [restbase]
+  restbase2002.codfw.wmnet: [restbase]
+  restbase2003.codfw.wmnet: [restbase]
+  restbase2004.codfw.wmnet: [restbase]
+  restbase2005.codfw.wmnet: [restbase]
+  restbase2006.codfw.wmnet: [restbase]
diff --git a/conftool-data/services/services.yaml 
b/conftool-data/services/services.yaml
index 969e4af..fcb1231 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -92,6 +92,7 @@
   weight: 10
 datacenters:
 - eqiad
+- codfw
 maps:
   kartotherian:
 port: 6533
diff --git a/hieradata/common/lvs/configuration.yaml 
b/hieradata/common/lvs/configuration.yaml
index 3001294..1bf8e7b 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -94,6 +94,7 @@
 eqiad: 10.2.2.15
   restbase: _block020
 eqiad: 10.2.2.17
+codfw: 10.2.1.17
   zotero: _block021
 eqiad: 10.2.2.16
   kartotherian: _block022
@@ -747,10 +748,11 @@
 eqiad:
   hostname: graphoid.svc.eqiad.wmnet
   restbase:
-description: RESTBase, restbase.svc.eqiad.wmnet
+description: "RESTBase, restbase.svc.%{::site}.wmnet"
 class: low-traffic
 sites:
 - eqiad
+- codfw
 ip: *ip_block020
 port: 7231
 bgp: 'yes'
@@ -758,7 +760,7 @@
 monitors:
   ProxyFetch:
 url:
-- http://restbase.svc.eqiad.wmnet
+- "http://restbase.svc.%{::site}.wmnet;
   IdleConnection:
 timeout-clean-reconnect: 3
 max-delay: 300
@@ -766,10 +768,12 @@
   cluster: restbase
   service: restbase
 icinga:
-  check_command: check_http_lvs_on_port!restbase.svc.eqiad.wmnet!7231!/
+  check_command: 
"check_http_lvs_on_port!restbase.svc.%{::site}.wmnet!7231!/"
   sites:
 eqiad:
   hostname: restbase.svc.eqiad.wmnet
+codfw:
+  hostname: restbase.svc.codfw.wmnet
   zotero:
 description: Zotero, zotero.svc.eqiad.wmnet
 class: low-traffic
diff --git a/modules/role/manifests/lvs/balancer.pp 
b/modules/role/manifests/lvs/balancer.pp
index 7574e2f..5478edf 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -58,6 +58,7 @@
 $sip['swift'][$::site],
 $sip['search'][$::site],
 $sip['kartotherian'][$::site],
+$sip['restbase'][$::site],
 ],
 
 # esams + ulsfo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4b4b1e16f35eb2bf473e89a47d28b1f3354f7bf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [ActionEditSubmit] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [ActionEditSubmit] Register extension
..


[ActionEditSubmit] Register extension

Change-Id: Ie383e226d55f7cb0c73f0dd6053884f07a069c3a
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 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 a30bca2..fdbdc22 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -16,6 +16,8 @@
 aliasfile = AccountInfo/AccountInfo.alias.php
 ignored=accountinfo-none
 
+Action Edit Submit
+
 # Active Abstract : No real extension. Plugin for dumpBackup.php
 
 Activity Monitor

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie383e226d55f7cb0c73f0dd6053884f07a069c3a
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] Stats: Set maximum height for callouts in bar charts - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Stats: Set maximum height for callouts in bar charts
..

Stats: Set maximum height for callouts in bar charts

This make it scrollable after a maximum height

Bug: T101826
Change-Id: Ibecc993b24fd65d9164b6def955481af1f860077
---
M modules/stats/ext.cx.stats.js
M modules/stats/styles/ext.cx.stats.less
2 files changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/stats/ext.cx.stats.js b/modules/stats/ext.cx.stats.js
index 93494cf..7daef1c 100644
--- a/modules/stats/ext.cx.stats.js
+++ b/modules/stats/ext.cx.stats.js
@@ -454,6 +454,7 @@
 
$translations.find( '.cx-stats-chart__bar' 
).last().callout( {
trigger: 'hover',
+   classes: 'cx-stats-chart__callout-container',
direction: $.fn.callout.autoDirection( '0' ),
content: $callout
} );
diff --git a/modules/stats/styles/ext.cx.stats.less 
b/modules/stats/styles/ext.cx.stats.less
index 3c4ce11..1aa2ece 100644
--- a/modules/stats/styles/ext.cx.stats.less
+++ b/modules/stats/styles/ext.cx.stats.less
@@ -148,6 +148,10 @@
text-align: center;
}
}
+   &__callout-container > .cx-callout-content {
+   max-height: 500px;
+   overflow-y: auto;
+   }
 }
 
 .cx-stats-chart__callout-count {

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

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

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

[MediaWiki-commits] [Gerrit] Test against injection in comment lines - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Test against injection in comment lines
..


Test against injection in comment lines

Change-Id: I90f2a043731389bc84419e8e253269787e4e6a6e
---
M client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git 
a/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php 
b/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
index f69e176..383946c 100644
--- a/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
+++ b/client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
@@ -124,6 +124,15 @@
null
)
),
+   'comment-injection' => array(
+   array(),
+   array(
+   
'/\(scriptevil\/script\)/'
+   ),
+   $this->getEditSiteLinkRecentChange(
+   'evil'
+   )
+   ),
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90f2a043731389bc84419e8e253269787e4e6a6e
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Relax section id validations in mw.cx.getSourceSection and g... - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Relax section id validations in mw.cx.getSourceSection and 
getTranslationSection
..


Relax section id validations in mw.cx.getSourceSection and getTranslationSection

These section ids are generated by parsoid. Usually it is prefixed with 'mw'.
But it is not guaranteed. Sometimes templates assign their own ids to sections

This commit removes the validations for prefixes because we need to accept
ids from templates as well.

Bug: T112253
Change-Id: I6875f6445d43039bc191d02295675b09315bf00c
---
M modules/util/ext.cx.util.js
1 file changed, 17 insertions(+), 12 deletions(-)

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



diff --git a/modules/util/ext.cx.util.js b/modules/util/ext.cx.util.js
index d279bf8..6934026 100644
--- a/modules/util/ext.cx.util.js
+++ b/modules/util/ext.cx.util.js
@@ -37,22 +37,27 @@
return sectionTypes.join( ',' );
};
 
+   /**
+* Get the source section by a given Id. These Ids are generated
+* by parsoid. Usually it is prefixed with 'mw'. But it is not
+* guaranteed. Sometimes templates assign their own ids to sections.
+* See T112253
+*
+* @param  {string} id Source section id.
+* @return {jQuery}
+*/
mw.cx.getSourceSection = function ( id ) {
-   // Sanity check, id should be either a number or prefixed with 
mw
-   if ( !id || ( isNaN( id ) && id.indexOf( 'mw' ) !== 0 ) ) {
-   return $( [] );
-   } else {
-   return $( document.getElementById( id ) );
-   }
+   return $( document.getElementById( id ) );
};
 
+   /**
+* Get the target section by a given source section Id.
+*
+* @param  {string} id Source section id.
+* @return {jQuery}
+*/
mw.cx.getTranslationSection = function ( id ) {
-   // Sanity check
-   if (  !id || isNaN( id ) && id.indexOf( 'mw' ) !== 0 ) {
-   return $( [] );
-   } else {
-   return $( document.getElementById( 'cx' + id ) );
-   }
+   return $( document.getElementById( 'cx' + id ) );
};
 
/**

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Fixed Style/Tab RuboCop offense
..


Fixed Style/Tab RuboCop offense

As a side effects, Style/IndentationWidth offense is also fixed.

Bug: T113846
Change-Id: I2dc9d48470bba35bba64415a5d1fa115418aaf01
---
M .rubocop.yml
D .rubocop_todo.yml
M tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb
M tests/browser/features/support/pages/editable_random_page.rb
M tests/browser/features/support/pages/registration_page.rb
5 files changed, 38 insertions(+), 64 deletions(-)

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



diff --git a/.rubocop.yml b/.rubocop.yml
index 3c8a650..84567a5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   StyleGuideCopsOnly: true
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index e752c85..000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-09-26 17:32:07 +0200 using RuboCop version 0.34.2.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: Width.
-Style/IndentationWidth:
-  Exclude:
-- 
'tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb'
-- 'tests/browser/features/support/pages/editable_random_page.rb'
-- 'tests/browser/features/support/pages/registration_page.rb'
-
-# Offense count: 38
-# Cop supports --auto-correct.
-Style/Tab:
-  Exclude:
-- 
'tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb'
-- 'tests/browser/features/support/pages/editable_random_page.rb'
-- 'tests/browser/features/support/pages/registration_page.rb'
diff --git 
a/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb 
b/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb
index 3166f4d..5a13b4f 100644
--- 
a/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb
+++ 
b/tests/browser/features/step_definitions/modal_on_editable_returnto_steps.rb
@@ -1,26 +1,26 @@
 When(/^I register$/) do
-   @original_title = on(EditableRandomPage).title
+  @original_title = on(EditableRandomPage).title
 
-   on(EditableRandomPage).create_account_element.click
-   on(RegistrationPage).register_user "Test Account #{@random_string}"
+  on(EditableRandomPage).create_account_element.click
+  on(RegistrationPage).register_user "Test Account #{@random_string}"
 end
 
 Then(/^I should be returned to the same article$/) do
-   expect(on(EditableRandomPage).title).to eq @original_title
+  expect(on(EditableRandomPage).title).to eq @original_title
 end
 
 Then(/^I should see a modal call to action$/) do
-   expect(on(EditableRandomPage).cta_element.when_present).to be_visible
+  expect(on(EditableRandomPage).cta_element.when_present).to be_visible
 end
 
 Then(/^one action is edit this page$/) do
-   expect(on(EditableRandomPage).edit_this_page_element).to be_visible
+  expect(on(EditableRandomPage).edit_this_page_element).to be_visible
 end
 
 Then(/^one action is edit a suggested page$/) do
-   expect(on(EditableRandomPage).edit_suggested_page_element).to be_visible
+  expect(on(EditableRandomPage).edit_suggested_page_element).to be_visible
 end
 
 Then(/^one action is no thanks, maybe later$/) do
-   expect(on(EditableRandomPage).no_thanks_element).to be_visible
+  expect(on(EditableRandomPage).no_thanks_element).to be_visible
 end
diff --git a/tests/browser/features/support/pages/editable_random_page.rb 
b/tests/browser/features/support/pages/editable_random_page.rb
index 4408a9e..8f2b7c9 100644
--- a/tests/browser/features/support/pages/editable_random_page.rb
+++ b/tests/browser/features/support/pages/editable_random_page.rb
@@ -1,8 +1,8 @@
 class EditableRandomPage < RandomPage
-   h1(:title, id: 'firstHeading')
-   div(:cta, id: 'mw-gettingstarted-cta-editable-main-page')
-   a(:edit_this_page, id: 'mw-gettingstarted-editable-main-edit-page')
-   a(:edit_suggested_page, id: 'mw-gettingstarted-editable-main-fix-pages')
-   a(:no_thanks, class: 'mw-gettingstarted-cta-leave-link')
-   a(:create_account, css: '#pt-createaccount a')
+  h1(:title, id: 'firstHeading')
+  div(:cta, id: 'mw-gettingstarted-cta-editable-main-page')
+  a(:edit_this_page, id: 'mw-gettingstarted-editable-main-edit-page')
+  a(:edit_suggested_page, id: 'mw-gettingstarted-editable-main-fix-pages')
+  a(:no_thanks, class: 'mw-gettingstarted-cta-leave-link')
+  a(:create_account, css: '#pt-createaccount a')
 end

[MediaWiki-commits] [Gerrit] Add support for PHP CodeSniffer checks - change (mediawiki...AccountAudit)

[jenkins-bot (Code Review)]

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

Change subject: Add support for PHP CodeSniffer checks
..


Add support for PHP CodeSniffer checks

Also fix any remaining errors and warnings.

Change-Id: I7989ee5dd0be13a8c3a97c62599e78dd4f4991cc
---
M .gitignore
M AccountAudit.hooks.php
M AccountAudit.php
A composer.json
A phpcs.xml
5 files changed, 27 insertions(+), 4 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 4bf4869..854a2d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-.svn
 *~
 *.kate-swp
 .*.swp
 node_modules/
+/composer.lock
+/vendor/
diff --git a/AccountAudit.hooks.php b/AccountAudit.hooks.php
index d9da33e..aa44cd6 100644
--- a/AccountAudit.hooks.php
+++ b/AccountAudit.hooks.php
@@ -87,4 +87,4 @@
} );
}
}
-}
\ No newline at end of file
+}
diff --git a/AccountAudit.php b/AccountAudit.php
index 85547c7..1123246 100644
--- a/AccountAudit.php
+++ b/AccountAudit.php
@@ -4,9 +4,11 @@
// Keep i18n globals so mergeMessageFileList.php doesn't break
$wgMessagesDirs['AccountAudit'] = __DIR__ . '/i18n';
/* wfWarn(
-   'Deprecated PHP entry point used for AccountAudit extension. 
Please use wfLoadExtension instead, ' .
-   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   'Deprecated PHP entry point used for AccountAudit extension. ' .
+   'Please use wfLoadExtension instead, see ' .
+   'https://www.mediawiki.org/wiki/Extension_registration for more 
details.'
); */
+
return;
 } else {
die( 'This version of the AccountAudit extension requires MediaWiki 
1.25+' );
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..4365e8a
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9",
+   "mediawiki/mediawiki-codesniffer": "0.4.0"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
+   ]
+   }
+}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..d81a292
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+
+
+   
+   .
+   
+   
+   vendor
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7989ee5dd0be13a8c3a97c62599e78dd4f4991cc
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/AccountAudit
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
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] Fallback and namespace names changes for Asturianu (ast) - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fallback and namespace names changes for Asturianu (ast)
..


Fallback and namespace names changes for Asturianu (ast)

* Set $fallback to Spanish (es), as Asturianu (ast) is a language spoken
solely in Spain. If a message is missing it'd be far more easier for local
users to understand Spanish rather than English.

* Added namespace gender aliases for asturianu.

Change-Id: Iafad07bae88bff5e6c39e5759f2ef4e5efcade1e
---
M languages/messages/MessagesAst.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/languages/messages/MessagesAst.php 
b/languages/messages/MessagesAst.php
index 7f48c9a..506aa3e 100644
--- a/languages/messages/MessagesAst.php
+++ b/languages/messages/MessagesAst.php
@@ -8,6 +8,8 @@
  *
  */
 
+$fallback = 'es';
+
 $namespaceNames = array(
NS_MEDIA=> 'Medios',
NS_SPECIAL  => 'Especial',
@@ -46,6 +48,11 @@
'Categoría_discusión' => NS_CATEGORY_TALK,
 );
 
+$namespaceGenderAliases = array(
+   NS_USER => array( 'male' => 'Usuariu', 'female' => 'Usuaria' ),
+   NS_USER_TALK => array( 'male' => 'Usuariu_alderique', 'female' => 
'Usuaria_alderique' ),
+);
+
 $specialPageAliases = array(
'Block' => array( 'Bloquiar', 'BloquiarIP', 
'BloquiarUsuariu' ),
'Log'   => array( 'Rexistru', 'Rexistros' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafad07bae88bff5e6c39e5759f2ef4e5efcade1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
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] Updated RuboCop to the latest version - change (mediawiki...Echo)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Updated RuboCop to the latest version
..

Updated RuboCop to the latest version

Also:

- explicitly set csscss version
- removed obsolete RVM configuration from Gemfile
- regenerated .rubocop_todo.yml file
- updated .rubocop.yml with recommended configuration

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

Change-Id: Iee78543e46d4613ff2c765e4c3ad6c6f3b049202
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
4 files changed, 20 insertions(+), 29 deletions(-)


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

diff --git a/.rubocop.yml b/.rubocop.yml
index 7ce21af..e4392ba 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,21 +1,13 @@
 inherit_from: .rubocop_todo.yml
 
-Metrics/AbcSize:
-  Enabled: false
+AllCops:
+  StyleGuideCopsOnly: true
 
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
+# uncomment when the offese is fixed
+# Metrics/LineLength:
+#   Max: 100
 
 Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
   Enabled: false
 
 Style/Alias:
@@ -23,3 +15,9 @@
 
 Style/SignalException:
   Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+Style/TrivialAccessors:
+  ExactNameMatch: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0649914..3857e04 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,16 +1,12 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-02-23 09:43:04 -0700 using RuboCop version 0.29.0.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-09-29 12:45:22 +0200 using RuboCop version 0.34.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
+# Offense count: 6
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 113
-
-# Offense count: 1
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Enabled: false
+  Max: 108
diff --git a/Gemfile b/Gemfile
index 2e8abbd..25c3dbe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,5 @@
-# ruby=ruby-2.1.1
-# ruby-gemset=Echo
-
 source 'https://rubygems.org'
 
-gem 'csscss'
+gem 'csscss', '~> 1.3.3'
 gem 'mediawiki_selenium', '~> 1.4.0'
-gem 'rubocop', require: false
+gem 'rubocop', '~> 0.34.2', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a81931..35a5a70 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,9 +102,9 @@
   ruby
 
 DEPENDENCIES
-  csscss
+  csscss (~> 1.3.3)
   mediawiki_selenium (~> 1.4.0)
-  rubocop
 
 BUNDLED WITH
1.10.5
+  rubocop (~> 0.34.2)

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

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

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

[MediaWiki-commits] [Gerrit] [ActionEditSubmit] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [ActionEditSubmit] Register extension
..

[ActionEditSubmit] Register extension

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/99/242099/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index a30bca2..fdbdc22 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -16,6 +16,8 @@
 aliasfile = AccountInfo/AccountInfo.alias.php
 ignored=accountinfo-none
 
+Action Edit Submit
+
 # Active Abstract : No real extension. Plugin for dumpBackup.php
 
 Activity Monitor

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie383e226d55f7cb0c73f0dd6053884f07a069c3a
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] install_server: cassandra to /srv for 2 ssd hosts - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: install_server: cassandra to /srv for 2 ssd hosts
..

install_server: cassandra to /srv for 2 ssd hosts

switch to /srv, initially to try multi-instance on restbase-test2*

Bug: T113714
Change-Id: I802a8158e8ac50132e344f8bc662ba977fded9fb
---
M modules/install_server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/242098/1

diff --git 
a/modules/install_server/files/autoinstall/partman/cassandrahosts-2ssd.cfg 
b/modules/install_server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
index 76e2964..890a80d 100644
--- a/modules/install_server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
+++ b/modules/install_server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
@@ -5,7 +5,7 @@
 # * layout:
 #   - /:   ext4, RAID1
 #   - swap:   RAID1, 1GB
-#   - /var: RAID0, on ssd
+#   - /srv: RAID0, on ssd
 
 d-ipartman-auto/method string  raid
 d-ipartman-md/device_remove_md boolean true
@@ -33,12 +33,12 @@
10   4  -1  ext4\
$lvmok{ }   \
$defaultignore{ }   \
-   lv_name{ var }  \
+   lv_name{ srv }  \
method{ format }\
format{ }   \
use_filesystem{ }   \
filesystem{ ext4 }  \
-   mountpoint{ /var }  \
+   mountpoint{ /srv }  \
.
 
 # Parameters are:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I802a8158e8ac50132e344f8bc662ba977fded9fb
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] Give instructions on removing email address from account - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Give instructions on removing email address from account
..


Give instructions on removing email address from account

Update the description for the Special:ChangeEmail form to include
instructions on how to remove email address association from the user's
account.

Bug: T98799
Change-Id: I10dca0c24faf24b117ef7d1e3c20319575805aff
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0b17c78..dc06b10 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -555,7 +555,7 @@
"passwordreset-emailerror-capture": "A password reset email was 
generated, which is shown below, but sending it to the {{GENDER:$2|user}} 
failed: $1",
"changeemail": "Change email address",
"changeemail-summary": "",
-   "changeemail-text": "Complete this form to change your email address. 
You will need to enter your password to confirm this change.",
+   "changeemail-text": "Complete this form to change your email address. 
You will need to enter your password to confirm this change. If you would like 
to remove the association of any email address from your account, leave the 
email address blank when submitting the form.",
"changeemail-no-info": "You must be logged in to access this page 
directly.",
"changeemail-oldemail": "Current email address:",
"changeemail-newemail": "New email address:",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10dca0c24faf24b117ef7d1e3c20319575805aff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: He7d3r 
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] Fix and unify JS-based toggling - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix and unify JS-based toggling
..


Fix and unify JS-based toggling

This fixes an issue introduced in I57bcae87ad4bb07f97606ec1ce8ec1d948adfd93 and
shows the in other languages list for non-JS users.

Change-Id: Ib056af0794fb3ab251fe71336ecc55b6417ebd2f
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M 
view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsview.css
M view/resources/templates.php
M view/resources/wikibase/wikibase.css
M view/src/ClaimHtmlGenerator.php
M view/src/EntityViewPlaceholderExpander.php
6 files changed, 14 insertions(+), 16 deletions(-)

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



diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index ee574da..1f495c8 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -89,7 +89,8 @@
'', // Qualifiers
'', // Toolbar placeholder
'', // References heading
-   '' // List of references
+   '', // List of references
+   '' // wikibase-initially-collapsed for 
wikibase-statementview-references
],
templateShortCuts: {
$rankSelector: '.wikibase-statementview-rankselector',
@@ -365,9 +366,10 @@
} );
 
// Collapse references if there is at least one.
-   if ( this._referencesListview.items().length > 0 ) {
-   this.$references.css( 'display', 'none' );
-   }
+   this.$references.toggleClass(
+   'wikibase-initially-hidden',
+   this._referencesListview.items().length > 0
+   );
 
// toggle for references section:
var $toggler = $( '' ).toggler( { $subject: 
this.$references } );
diff --git 
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsview.css
 
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsview.css
index 75c2e88..e8a0012 100644
--- 
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsview.css
+++ 
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsview.css
@@ -34,10 +34,6 @@
 .wikibase-entitytermsview 
.wikibase-entitytermsview-entitytermsforlanguagelistview {
margin-top: 1em;
 }
-.wikibase-entitytermsview 
.wikibase-entitytermsview-entitytermsforlanguagelistview-collapsed {
-   display: none;
-}
-
 
 .wikibase-entitytermsview 
.wikibase-entitytermsview-entitytermsforlanguagelistview-toggler {
display: inline-block;
diff --git a/view/resources/templates.php b/view/resources/templates.php
index 8287cca..2cd34fd 100644
--- a/view/resources/templates.php
+++ b/view/resources/templates.php
@@ -98,7 +98,7 @@
$5

$6
-   $7
+   $7

 
 HTML;
diff --git a/view/resources/wikibase/wikibase.css 
b/view/resources/wikibase/wikibase.css
index 34105e2..2030971 100644
--- a/view/resources/wikibase/wikibase.css
+++ b/view/resources/wikibase/wikibase.css
@@ -490,8 +490,8 @@
clear: both;
 }
 
-/* References are initially hidden if JS is enabled */
-.client-js .wikibase-statementview-references {
+/* Some UI elements are initially hidden if JS is enabled */
+.client-js .wikibase-initially-collapsed {
display: none;
 }
 
diff --git a/view/src/ClaimHtmlGenerator.php b/view/src/ClaimHtmlGenerator.php
index 40f1608..3f2561b 100644
--- a/view/src/ClaimHtmlGenerator.php
+++ b/view/src/ClaimHtmlGenerator.php
@@ -88,9 +88,8 @@
 
$referencesHeading = $this->getReferencesHeading( $statement );
 
-   $referencesHtml = $this->getHtmlForReferences(
-   $statement->getReferences()
-   );
+   $references = $statement->getReferences();
+   $referencesHtml = $this->getHtmlForReferences( $references );
 
return $this->templateFactory->render(
'wikibase-statementview',
@@ -100,7 +99,8 @@
$this->getHtmlForQualifiers( 
$statement->getQualifiers() ),
$editSectionHtml,
$referencesHeading,
-   $referencesHtml
+   $referencesHtml,
+   count( $references ) ? 'wikibase-initially-collapsed' : 
''
);
}
 
diff --git a/view/src/EntityViewPlaceholderExpander.php 
b/view/src/EntityViewPlaceholderExpander.php

[MediaWiki-commits] [Gerrit] Use variable documentation in Preprocessor_DOM.php - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Use variable documentation in Preprocessor_DOM.php
..


Use variable documentation in Preprocessor_DOM.php

Instead of having comments behind variable declaration.

This also avoids mixed tabs and spaces at begin of line

Change-Id: Iba62430f4413fd52bac1d51f5c5df4cb6479284d
---
M includes/parser/Preprocessor_DOM.php
1 file changed, 29 insertions(+), 7 deletions(-)

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



diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 562062f..4e359a6 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -848,12 +848,31 @@
  * @ingroup Parser
  */
 class PPDStackElement {
-   public $open,  // Opening character (\n for heading)
-   $close, // Matching closing character
-   $count, // Number of opening characters found 
(number of "=" for heading)
-   $parts, // Array of PPDPart objects describing 
pipe-separated parts.
-   $lineStart; // True if the open char appeared at the 
start of the input line.
-   // Not set for headings.
+   /**
+* @var string Opening character (\n for heading)
+*/
+   public $open;
+
+   /**
+* @var string Matching closing character
+*/
+   public $close;
+
+   /**
+* @var int Number of opening characters found (number of "=" for 
heading)
+*/
+   public $count;
+
+   /**
+* @var PPDPart[] Array of PPDPart objects describing pipe-separated 
parts.
+*/
+   public $parts;
+
+   /**
+* @var bool True if the open char appeared at the start of the input 
line.
+*  Not set for headings.
+*/
+   public $lineStart;
 
public $partClass = 'PPDPart';
 
@@ -924,7 +943,10 @@
  * @ingroup Parser
  */
 class PPDPart {
-   public $out; // Output accumulator string
+   /**
+* @var string Output accumulator string
+*/
+   public $out;
 
// Optional member variables:
//   eqposPosition of equals sign in output accumulator

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba62430f4413fd52bac1d51f5c5df4cb6479284d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Jackmcbarn 
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] Update interwiki tests - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Update interwiki tests
..


Update interwiki tests

Adds extension-unittests-generic test, remove obsolete jobs and tests
covered by the template.

Moves jshint to check: since npm will now run jshint.

Bug: T90943
Change-Id: I9ccad2ec4f9199935aa97ac289b777a909bcd84f
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 13 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 38b828c..3b0ae96 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -478,7 +478,6 @@
  - Hovergallery
  - IndexFunction
  - intersection
- - Interwiki
  - JsonConfig
  - Limn
  - ListSignup
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3becf97..1afcd9f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4008,21 +4008,11 @@
   - name: mediawiki/extensions/Interwiki
 template:
   - name: composer-test
-  - name: jshint
+  - name: extension-unittests-generic
   - name: npm
 check:
-  - phplint
-  - php-composer-validate
   - jsonlint
-test:
-  - phplint
-  - php-composer-validate
-gate-and-submit:
-  - mediawiki-gate
-  - phplint
-  - php-composer-validate
-experimental:
-  - php-composer-test
+  - jshint
 
   - name: mediawiki/extensions/intersection
 template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ccad2ec4f9199935aa97ac289b777a909bcd84f
Gerrit-PatchSet: 13
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Pass edit summary through ExternalChangeFactory. - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Pass edit summary through ExternalChangeFactory.
..


Pass edit summary through ExternalChangeFactory.

This is part of the refactoring of the edit summary handling code that will
allow us to re-use the repo side summary generation code on the client.

This change implements points A, B, and C of part 4 of T101836#1414639.
In particular, it allows an edit summary to be passed via the
ExternalChange without being overwritten.

NOTE: this requires core patch I757f2b91f3b

Bug: T111039
Change-Id: I0fed0a5280450af6caeff9328e07f9f3409ee2b7
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
M client/includes/recentchanges/ChangeLineFormatter.php
M client/includes/recentchanges/ExternalChange.php
M client/includes/recentchanges/ExternalChangeFactory.php
M client/includes/recentchanges/ExternalRecentChange.php
M client/tests/phpunit/includes/recentchanges/ChangeLineFormatterTest.php
M client/tests/phpunit/includes/recentchanges/ExternalChangeFactoryTest.php
M client/tests/phpunit/includes/recentchanges/RevisionDataTest.php
9 files changed, 326 insertions(+), 209 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  Daniel Kinzler: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 1cdeb15..9716fee 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -15,6 +15,7 @@
 use Skin;
 use SpecialRecentChanges;
 use SpecialWatchlist;
+use StubObject;
 use Title;
 use UnexpectedValueException;
 use User;
@@ -31,6 +32,7 @@
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\SiteLink;
+use Wikibase\Lib\AutoCommentFormatter;
 
 /**
  * File defining the hook handlers for the Wikibase Client extension.
@@ -143,7 +145,8 @@
if ( $type == RC_EXTERNAL ) {
$wikibaseClient = WikibaseClient::getDefaultInstance();
$changeFactory = new ExternalChangeFactory(
-   $wikibaseClient->getSettings()->getSetting( 
'repoSiteId' )
+   $wikibaseClient->getSettings()->getSetting( 
'repoSiteId' ),
+   $wikibaseClient->getContentLanguage()
);
 
try {
@@ -177,6 +180,44 @@
}
 
/**
+* Handler for the FormatAutocomments hook, implementing localized 
formatting
+* for machine readable autocomments generated by SummaryFormatter.
+*
+* @param string &$comment reference to the autocomment text
+* @param bool $pre true if there is content before the autocomment
+* @param string $auto the autocomment unformatted
+* @param bool $post true if there is content after the autocomment
+* @param Title|null $title use for further information
+* @param bool $local shall links be generated locally or globally
+* @param string|null $wikiId The ID of the wiki the comment applies 
to, if not the local wiki.
+*
+* @return bool
+*/
+   public static function onFormat( &$comment, $pre, $auto, $post, $title, 
$local, $wikiId = null ) {
+   global $wgContLang;
+
+   $wikibaseClient = WikibaseClient::getDefaultInstance();
+   $repoId = $wikibaseClient->getSettings()->getSetting( 
'repoSiteId' );
+
+   // Only do special formatting for comments from a wikibase repo.
+   // XXX: what to do if the local wiki is the repo? For entity 
pages, RepoHooks has a handler.
+   // But what to do for other pages? Note that if the local wiki 
is the repo, $repoId will be
+   // false, and $wikiId will be null.
+   if ( $wikiId !== $repoId ) {
+   return;
+   }
+
+   StubObject::unstub( $wgContLang );
+
+   $formatter = new AutoCommentFormatter( $wgContLang, array( 
'wikibase-entity' ) );
+   $formattedComment = $formatter->formatAutoComment( $auto );
+
+   if ( is_string( $formattedComment ) ) {
+   $comment = $formatter->wrapAutoComment( $pre, 
$formattedComment, $post );
+   }
+   }
+
+   /**
 * Modifies watchlist query to include external changes
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/SpecialWatchlistQuery
 *
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index ecf4e88..35d5702 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -126,6 +126,7 @@
$wgHooks['ArticleDeleteAfterSuccess'][] = 
'\Wikibase\ClientHooks::onArticleDeleteAfterSuccess';
$wgHooks['ParserLimitReportFormat'][] = 

[MediaWiki-commits] [Gerrit] Add composer/npm entry points - change (mediawiki...SpamDiffTool)

[jenkins-bot (Code Review)]

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

Change subject: Add composer/npm entry points
..


Add composer/npm entry points

Support for running npm tests
Composer for doing php code sniffing.
Update .gitignore

Change-Id: I12a687acd9542621e6eabc81bae4275a35869f91
---
A .gitignore
A .jscsrc
A .jshintignore
A Gruntfile.js
A composer.json
A package.json
6 files changed, 61 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..9759e26
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/composer.lock
+/node_modules
+/vendor
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+   "preset": "wikimedia"
+}
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..3c3629e
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a365428
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,31 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jscs' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   jshint: {
+   all: [
+   '*.js'
+   ]
+   },
+   jscs: {
+   src: '<%= jshint.all %>'
+   },
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '*.json',
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..f2883f7
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,10 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor"
+   ]
+   }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..2717c89
--- /dev/null
+++ b/package.json
@@ -0,0 +1,13 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-contrib-jshint": "0.11.3",
+"grunt-banana-checker": "0.2.2",
+"grunt-jscs": "2.1.0",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12a687acd9542621e6eabc81bae4275a35869f91
Gerrit-PatchSet: 15
Gerrit-Project: mediawiki/extensions/SpamDiffTool
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add support for new tests in Jenkins - change (mediawiki...Theme)

[jenkins-bot (Code Review)]

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

Change subject: Add support for new tests in Jenkins
..


Add support for new tests in Jenkins

Follows-up: https://gerrit.wikimedia.org/r/#/c/224838/

Change-Id: I864cd3a21b412984448b0a7879bae20dfd3b
---
M .gitignore
A .jscsrc
A .jshintignore
A .jshintrc
A Gruntfile.js
A composer.json
A package.json
7 files changed, 89 insertions(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index 98b092a..f9037de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-.svn
+/composer.lock
+/node_modules/
+/vendor/
 *~
 *.kate-swp
 .*.swp
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+   "preset": "wikimedia"
+}
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..022b988
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,2 @@
+node_modules
+vendor
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..66e3d48
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,24 @@
+{
+   // Enforcing
+   "bitwise": true,
+   "eqeqeq": true,
+   "freeze": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "undef": true,
+   "unused": true,
+   "strict": false,
+
+   // Relaxing
+   "es5": false,
+
+   // Environment
+   "browser": true,
+   "jquery": true,
+
+   "globals": {
+   "mediaWiki": false,
+   "OO": false
+   }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..4538071
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,34 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jscs' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [
+   '*.js'
+   ]
+   },
+   jscs: {
+   src: '<%= jshint.all %>'
+   },
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '*.json',
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..f2883f7
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,10 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor"
+   ]
+   }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..2717c89
--- /dev/null
+++ b/package.json
@@ -0,0 +1,13 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-contrib-jshint": "0.11.3",
+"grunt-banana-checker": "0.2.2",
+"grunt-jscs": "2.1.0",
+"grunt-jsonlint": "1.0.4"
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I864cd3a21b412984448b0a7879bae20dfd3b
Gerrit-PatchSet: 19
Gerrit-Project: mediawiki/extensions/Theme
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] restbase: split realserver_ips in codfw/eqiad - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: restbase: split realserver_ips in codfw/eqiad
..


restbase: split realserver_ips in codfw/eqiad

Change-Id: I0a81e4bf73c451e4161d8968b695963f6a5c2cfe
---
M hieradata/role/codfw/restbase.yaml
M hieradata/role/common/restbase.yaml
M hieradata/role/eqiad/restbase.yaml
3 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/role/codfw/restbase.yaml 
b/hieradata/role/codfw/restbase.yaml
index 190ce12..504efcf 100644
--- a/hieradata/role/codfw/restbase.yaml
+++ b/hieradata/role/codfw/restbase.yaml
@@ -5,3 +5,6 @@
 - restbase2004.codfw.wmnet
 - restbase2005.codfw.wmnet
 - restbase2006.codfw.wmnet
+
+lvs::realserver::realserver_ips:
+  - '10.2.1.17' # restbase.svc.codfw.wmnet
diff --git a/hieradata/role/common/restbase.yaml 
b/hieradata/role/common/restbase.yaml
index 8961cb4..98e10e1 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -15,8 +15,5 @@
 restbase::cassandra_user: restbase
 restbase::cassandra_password: "%{passwords::cassandra::restbase}"
 
-lvs::realserver::realserver_ips:
-  - '10.2.2.17' # restbase.svc.eqiad.wmnet
-
 admin::groups:
   - restbase-roots
diff --git a/hieradata/role/eqiad/restbase.yaml 
b/hieradata/role/eqiad/restbase.yaml
index 68126cb..e352e91 100644
--- a/hieradata/role/eqiad/restbase.yaml
+++ b/hieradata/role/eqiad/restbase.yaml
@@ -8,3 +8,6 @@
 - restbase1007.eqiad.wmnet
 - restbase1008.eqiad.wmnet
 - restbase1009.eqiad.wmnet
+
+lvs::realserver::realserver_ips:
+  - '10.2.2.17' # restbase.svc.eqiad.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a81e4bf73c451e4161d8968b695963f6a5c2cfe
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] Move scripts to a src dir - change (analytics/limn-wikidata-data)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Move scripts to a src dir
..

Move scripts to a src dir

Change-Id: If6c3a75510f4573bb4f84cfde54bfbcf97c530c4
---
R src/export.sh
R src/wikidata_getclaims_property_use.sh
R src/wikidata_site_stats.sh
R src/wikidata_social.php
4 files changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/export.sh b/src/export.sh
similarity index 100%
rename from export.sh
rename to src/export.sh
diff --git a/wikidata_getclaims_property_use.sh 
b/src/wikidata_getclaims_property_use.sh
similarity index 100%
rename from wikidata_getclaims_property_use.sh
rename to src/wikidata_getclaims_property_use.sh
diff --git a/wikidata_site_stats.sh b/src/wikidata_site_stats.sh
similarity index 100%
rename from wikidata_site_stats.sh
rename to src/wikidata_site_stats.sh
diff --git a/wikidata_social.php b/src/wikidata_social.php
similarity index 98%
rename from wikidata_social.php
rename to src/wikidata_social.php
index 4e82392..660ec02 100644
--- a/wikidata_social.php
+++ b/src/wikidata_social.php
@@ -22,7 +22,7 @@
  * @return string[] service name keys and key values
  */
 function getConfig() {
-   $config = trim( file_get_contents( __DIR__ . '/config' ) );
+   $config = trim( file_get_contents( __DIR__ . '/../config' ) );
$configLines = explode( "\n", $config );
$config = array();
foreach( $configLines as $configLine ) {

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

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

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

[MediaWiki-commits] [Gerrit] Move create SQL from comments to own files - change (analytics/limn-wikidata-data)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Move create SQL from comments to own files
..

Move create SQL from comments to own files

Change-Id: I5919012b79d5e83d86b7f44cb920d275717289c0
---
A sql/create/wikidata_getclaims_property_use.sql
A sql/create/wikidata_site_stats.sql
A sql/create/wikidata_social.sql
M src/wikidata_getclaims_property_use.sh
M src/wikidata_site_stats.sh
M src/wikidata_social.php
6 files changed, 31 insertions(+), 9 deletions(-)


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

diff --git a/sql/create/wikidata_getclaims_property_use.sql 
b/sql/create/wikidata_getclaims_property_use.sql
new file mode 100644
index 000..c85d2c3
--- /dev/null
+++ b/sql/create/wikidata_getclaims_property_use.sql
@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS staging.wikidata_getclaims_property_use
+  (
+ date DATE NOT NULL,
+ property VARCHAR(6) NOT NULL,
+ countINT(12)
+  );
\ No newline at end of file
diff --git a/sql/create/wikidata_site_stats.sql 
b/sql/create/wikidata_site_stats.sql
new file mode 100644
index 000..e7865e9
--- /dev/null
+++ b/sql/create/wikidata_site_stats.sql
@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS wikidata_site_stats
+  (
+ date  DATE NOT NULL,
+ total_views   BIGINT(20) NOT NULL,
+ total_edits   BIGINT(20) NOT NULL,
+ good_articles BIGINT(20) NOT NULL,
+ total_pages   BIGINT(20) NOT NULL,
+ users BIGINT(20) NOT NULL,
+ active_users  BIGINT(20) NOT NULL
+  );
\ No newline at end of file
diff --git a/sql/create/wikidata_social.sql b/sql/create/wikidata_social.sql
new file mode 100644
index 000..c68cf06
--- /dev/null
+++ b/sql/create/wikidata_social.sql
@@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS wikidata_social
+  (
+ date   DATE NOT NULL,
+ twitterINT(6),
+ facebook   INT(6),
+ googleplus INT(6),
+ identica   INT(6),
+ newsletter INT(6),
+ mail   INT(6),
+ techmail   INT(6),
+ ircINT(6)
+  );
\ No newline at end of file
diff --git a/src/wikidata_getclaims_property_use.sh 
b/src/wikidata_getclaims_property_use.sh
index 03b558b..22a69f9 100644
--- a/src/wikidata_getclaims_property_use.sh
+++ b/src/wikidata_getclaims_property_use.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 #
-# A table needs to exist for this script to function:
-# CREATE TABLE IF NOT EXISTS wikidata_getclaims_property_use ( date DATE NOT 
NULL, property VARCHAR(6) NOT NULL, count INT(12) );
-#
+# A table needs to exist for this script to function (see the file in 
/sql/create)
 
 # If I want data for the 22nd I need logs rotated on 22nd and 23rd
 
diff --git a/src/wikidata_site_stats.sh b/src/wikidata_site_stats.sh
index 9eaff53..800b33a 100644
--- a/src/wikidata_site_stats.sh
+++ b/src/wikidata_site_stats.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 #
-# A table needs to exist for this script to function:
-# CREATE TABLE IF NOT EXISTS wikidata_site_stats ( date DATE NOT NULL, 
total_views BIGINT(20) NOT NULL, total_edits BIGINT(20) NOT NULL, good_articles 
BIGINT(20) NOT NULL, total_pages BIGINT(20) NOT NULL, users BIGINT(20) NOT 
NULL, active_users BIGINT(20) NOT NULL );
-#
+# A table needs to exist for this script to function (see the file in 
/sql/create)
 
 dateISO=`date --date=today --iso-8601=date`
 
diff --git a/src/wikidata_social.php b/src/wikidata_social.php
index 3489211..fe22dea 100644
--- a/src/wikidata_social.php
+++ b/src/wikidata_social.php
@@ -11,9 +11,7 @@
  * mm-wikidatatech-pass mailpass2
  * mm-user u...@domain.foo
  *
- * This script also requires a database table to write into!
- * //date,twitter,facebook,googleplus,identica,newsletter,mail,techmail,irc
- * CREATE TABLE IF NOT EXISTS wikidata_social ( date DATE NOT NULL, twitter 
INT(6), facebook INT(6), googleplus INT(6), identica INT(6), newsletter INT(6), 
mail INT(6), techmail INT(6), irc INT(6) );
+ * This script also requires a database table to write into (see the file in 
/sql/create)
  */
 
 libxml_use_internal_errors( true );

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

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

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

[MediaWiki-commits] [Gerrit] Release 0.3.0 of QuickSurveys - change (mediawiki...QuickSurveys)

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review.

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

Change subject: Release 0.3.0 of QuickSurveys
..

Release 0.3.0 of QuickSurveys

See https://www.mediawiki.org/wiki/Reading/Web/How_to_release for
notes on process.

Bug: T113663
Change-Id: I0e68b9fe99d98c6d5504c08fc8fab040a5927f27
---
M HISTORY
M extension.json
2 files changed, 14 insertions(+), 1 deletion(-)


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

diff --git a/HISTORY b/HISTORY
index d359ed5..ba02f55 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,16 @@
+==QuickSurveys 0.3.0==
+4952c44 RuboCop setup
+f4e98b0 Fix schema dependency and resolve other logging errors
+8cfc8f9 Make internal surveys accept arbitrary answers
+dd31bd4 Remove the heart icon per design review
+f8a7e01 build: Updating development dependencies
+d324649 Don't configure answers with a map
+e9e2888 QA: Add browser tests for multiple answer surveys
+7c64620 Fix escaping issues in samples
+017810f QuickSurvey tweaks
+692ae82 External surveys should behave identical to internal surveys
+94b249a Security improvements
+3fe893c Init QuickSurveys only on existing pages in the main namespace
 ==QuickSurveys 0.2.0==
 8b923dd Return development to the `dev` branch
 4952c44 RuboCop setup
diff --git a/extension.json b/extension.json
index 6987d0a..9697146 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "QuickSurveys",
-   "version": "0.2.0",
+   "version": "0.3.0",
"author": [
"Bahodir Mansurov",
"Joaquin Hernandez",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e68b9fe99d98c6d5504c08fc8fab040a5927f27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] Prepare YearMonthTimeParser to get rid of MediaWiki core dep... - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Prepare YearMonthTimeParser to get rid of MediaWiki core 
dependency
..

Prepare YearMonthTimeParser to get rid of MediaWiki core dependency

This is pure refactoring. The goal is to make this parser independent
from MediaWiki core. Note that this is only a first step. Please review
and merge this as it is. More will be done in later patches.

This patch is motivated by https://github.com/DataValues/Time/pull/93
where I do the same to the YearMonthDayTimeParser. Both should use the
same array( localized month names => numbers ) in the end. This array
will be constructed in the TimeParserFactory (that's the reason for the
@see).

Change-Id: I2e35005a557180ff955678cfc0ed0e3d8a3e13b8
---
M repo/includes/Parsers/YearMonthTimeParser.php
1 file changed, 28 insertions(+), 13 deletions(-)


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

diff --git a/repo/includes/Parsers/YearMonthTimeParser.php 
b/repo/includes/Parsers/YearMonthTimeParser.php
index 9d41570..411cd04 100644
--- a/repo/includes/Parsers/YearMonthTimeParser.php
+++ b/repo/includes/Parsers/YearMonthTimeParser.php
@@ -16,6 +16,7 @@
  *
  * @licence GNU GPL v2+
  * @author Adam Shorland
+ * @author Thiemo Mättig
  *
  * @todo move me to DataValues-time
  * @todo match BCE dates in here
@@ -25,9 +26,9 @@
const FORMAT_NAME = 'yearmonth';
 
/**
-* @var Language
+* @var int[]
 */
-   private $lang;
+   private $monthNameUnlocalizations;
 
/**
 * @var ValueParser
@@ -40,11 +41,32 @@
public function __construct( ParserOptions $options = null ) {
parent::__construct( $options );
 
-   $this->lang = Language::factory( $this->getOption( 
ValueParser::OPT_LANG ) );
+   $languageCode = $this->getOption( ValueParser::OPT_LANG );
+   $this->monthNameUnlocalizations = 
$this->getMonthNameUnlocalizations( $languageCode );
$this->isoTimestampParser = new IsoTimestampParser(
new CalendarModelParser( $this->options ),
$this->options
);
+   }
+
+   /**
+* @see TimeParserFactory::getMwMonthNameReplacements
+*
+* @param string $languageCode
+*
+* @return int[]
+*/
+   private function getMonthNameUnlocalizations( $languageCode ) {
+   $language = Language::factory( $languageCode );
+
+   $replacements = array();
+
+   for ( $i = 1; $i <= 12; $i++ ) {
+   $replacements[$language->getMonthName( $i )] = $i;
+   $replacements[$language->getMonthAbbreviation( $i )] = 
$i;
+   }
+
+   return $replacements;
}
 
/**
@@ -118,20 +140,13 @@
 * Check for both the full name and abbreviations
 *
 * @param string|int $year
-* @param string|int $month
+* @param string $month
 *
 * @return TimeValue|bool
 */
private function parseYearMonth( $year, $month ) {
-   $names = $this->lang->getMonthNamesArray();
-   for ( $i = 1; $i <= 12; $i++ ) {
-   if ( strcasecmp( $names[$i], $month ) === 0 ) {
-   return $this->getTimeFromYearMonth( $year, $i );
-   }
-   }
-   $nameAbbrevs = $this->lang->getMonthAbbreviationsArray();
-   for ( $i = 1; $i <= 12; $i++ ) {
-   if ( strcasecmp( $nameAbbrevs[$i], $month ) === 0 ) {
+   foreach ( $this->monthNameUnlocalizations as $monthName => $i ) 
{
+   if ( strcasecmp( $monthName, $month ) === 0 ) {
return $this->getTimeFromYearMonth( $year, $i );
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e35005a557180ff955678cfc0ed0e3d8a3e13b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] Convert to JSON i18n - change (mediawiki...ActionEditSubmit)

[jenkins-bot (Code Review)]

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

Change subject: Convert to JSON i18n
..


Convert to JSON i18n

Change-Id: I1774b2d1585b33bb33b987e762730070da317d00
---
D ActionEditSubmit.i18n.php
M ActionEditSubmit.php
A i18n/en.json
A i18n/es.json
A i18n/fr.json
A i18n/qqq.json
6 files changed, 33 insertions(+), 42 deletions(-)

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



diff --git a/ActionEditSubmit.i18n.php b/ActionEditSubmit.i18n.php
deleted file mode 100644
index e2a6e26..000
--- a/ActionEditSubmit.i18n.php
+++ /dev/null
@@ -1,38 +0,0 @@
- "Changes every 'action=edit' to 
'action=submit'",
-);
-
-/** Message documentation
- * @author David Leaman
- */
-$messages['qqq'] = array(
-   'actioneditsubmit-desc' => "Description for Special:Version",
-);
-
-/** Español
- * @author David Leaman
- */
-$messages['es'] = array(
-   'actioneditsubmit-desc' => "Cambia todo los 'action=edit' a 
'action=submit'",
-);
-
-/** Français
- * @author David Leaman
- */
-$messages['fr'] = array(
-   'actioneditsubmit-desc' => "Change les «action=edit» à «action=submit»",
-);
-
diff --git a/ActionEditSubmit.php b/ActionEditSubmit.php
index b27c952..60d52f1 100644
--- a/ActionEditSubmit.php
+++ b/ActionEditSubmit.php
@@ -18,8 +18,5 @@
 );
 
 $wgAutoloadClasses['ActionEditSubmitHooks'] = __DIR__ . 
'/ActionEditSubmit.hooks.php';
-
-$wgExtensionMessagesFiles['ActionEditSubmit'] = __DIR__ . 
'/ActionEditSubmit.i18n.php';
-
+$wgMessagesDirs['ActionEditSubmit'] = __DIR__ . '/i18n';
 $wgHooks['GetLocalURL'][] = 'ActionEditSubmitHooks::inlineEditURL';
-
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..bf8a13f
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "David Leaman"
+   ]
+   },
+   "actioneditsubmit-desc": "Changes every 'action=edit' to 
'action=submit'"
+}
diff --git a/i18n/es.json b/i18n/es.json
new file mode 100644
index 000..3bf9dc5
--- /dev/null
+++ b/i18n/es.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "David Leaman"
+   ]
+   },
+   "actioneditsubmit-desc": "Cambia todo los 'action=edit' a 
'action=submit'"
+}
diff --git a/i18n/fr.json b/i18n/fr.json
new file mode 100644
index 000..080b4b8
--- /dev/null
+++ b/i18n/fr.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "David Leaman"
+   ]
+   },
+   "actioneditsubmit-desc": "Change les «action=edit» à «action=submit»"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..8a282b2
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "David Leaman"
+   ]
+   },
+   "actioneditsubmit-desc": "Description for Special:Version"
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1774b2d1585b33bb33b987e762730070da317d00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ActionEditSubmit
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Refactor badgeselector - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Refactor badgeselector
..


Refactor badgeselector

This removes a lot of code necessary for handling asynchronous badge adding,
since the placeholder badges are added synchronously, and provide the same
interface. It also condenses handling of the empty badge used as a menu anchor.

Change-Id: I24a144d917d3e8c094ab54c501d82a23e2714148
---
M view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.badgeselector.tests.js
2 files changed, 90 insertions(+), 116 deletions(-)

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



diff --git a/view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js 
b/view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
index 0eebcbc..33705a2 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
@@ -170,42 +170,14 @@
 
/**
 * Creates the individual badges' DOM structures.
-*
-* @return {jQuery.Promise}
-* No resolved parameters.
-* No rejected parameters.
 */
_createBadges: function() {
-   var deferred = $.Deferred();
-
if( this.element.children( '.wb-badge' ).length ) {
-   return deferred.resolve().promise();
+   return;
}
 
-   if( !this.options.value.length && this.isInEditMode() ) {
-   this._addEmptyBadge();
-   return deferred.resolve().promise();
-   }
-
-   var self = this;
-
-   for( var i = 0; i < this.options.value.length; i++ ) {
-   this._addPlaceholderBadge( this.options.value[i] );
-   }
-
-   $.when.apply( $, $.map( this.options.value, function( badgeId ) 
{
-   return self.options.entityIdPlainFormatter.format( 
badgeId ).done( function( badgeLabel ) {
-   self._addBadge( badgeId, badgeLabel );
-   } );
-   } ) ).done( function() {
-   deferred.resolve();
-   } )
-   .fail( function() {
-   // TODO: Display error message
-   deferred.reject();
-   } );
-
-   return deferred.promise();
+   this._updateEmptyBadge();
+   this._addBadges();
},
 
/**
@@ -310,7 +282,7 @@
deferred.reject();
} );
 
-   return deferred;
+   return deferred.promise();
},
 
/**
@@ -320,78 +292,76 @@
 * @param {boolean} targetState
 */
_toggleBadge: function( badgeId, targetState ) {
-   var self = this;
if( targetState ) {
this.element.children( '.wb-badge-' + badgeId 
).remove();
-   if( !this.element.children( '.wb-badge' ).length ) {
-   this._addEmptyBadge();
-   }
-
-   this._trigger( 'change' );
} else {
-   this.options.entityIdPlainFormatter.format( badgeId 
).done( function( badgeLabel ) {
-   self._addBadge( badgeId, badgeLabel );
-   self._getEmptyBadge().remove();
-   self._trigger( 'change' );
-   } );
+   this._addBadge( badgeId );
}
+   this._updateEmptyBadge();
+   this._trigger( 'change' );
+   },
+
+   _addBadges: function() {
+   var self = this;
+   $.each( this.options.value, function( index, badgeId ) {
+   self._addBadge( badgeId );
+   } );
},
 
/**
-* Creates a placeholder badge to be displayed while loading the actual 
badge information. The
-* placeholder will be replaced when calling this._addBadge() with the 
same badge id.
+* Add the DOM for a badge with the given itemId.
 *
 * @param {string} badgeId
 */
-   _addPlaceholderBadge: function( badgeId ) {
-   if( this.element.children( '[data-wb-badge="' + badgeId + '"]' 
).length ) {
-   return;
-   }
-   this.element.append(
-   mw.wbTemplate( 'wb-badge',
-   badgeId + ' ' + this.options.badges[badgeId],
-   badgeId,
+   _addBadge: function( badgeId ) {
+   var self = this,
+  

[MediaWiki-commits] [Gerrit] Set absolute URLs for source links - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Set absolute URLs for source links
..


Set absolute URLs for source links

Set absolute URLs for source link's href attributes so that
the links  point to correct wiki instead of relative URL to current wiki.

Bug: T97110
Change-Id: I860a239a0c49d2f98acfc86acbc64e1d3d9e9005
---
M modules/source/ext.cx.source.js
1 file changed, 16 insertions(+), 11 deletions(-)

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



diff --git a/modules/source/ext.cx.source.js b/modules/source/ext.cx.source.js
index 3ce0ec3..cfba1af 100644
--- a/modules/source/ext.cx.source.js
+++ b/modules/source/ext.cx.source.js
@@ -153,12 +153,13 @@
 
this.$content = $( '' )
.addClass( 'cx-column__content' );
-
this.$container.append( this.$title, $subHeading, this.$content 
);
this.showLoadingIndicator();
};
 
ContentTranslationSource.prototype.load = function ( content ) {
+   var self = this;
+
this.$content.html( content.segmentedContent );
 
// @todo figure out what should be done here
@@ -171,6 +172,18 @@
} catch ( e ) {
mw.log( 'Could not load ext.cite.style, References will 
fallback to default style' );
}
+
+   // Set absolute URLs for source links href attributes so that 
the links
+   // point to correct wiki instead of relative URL to current wiki
+   this.$content.find( 'a[rel="mw:WikiLink"]' ).each( function () {
+   var url,
+   $link = $( this );
+
+   url = self.siteMapper.getPageUrl(
+   mw.cx.sourceLanguage, cleanupLinkHref( 
$link.attr( 'href' ) )
+   );
+   $link.attr( 'href', url );
+   } );
};
 
/**
@@ -224,8 +237,6 @@
};
 
ContentTranslationSource.prototype.listen = function () {
-   var self = this;
-
mw.hook( 'mw.cx.source.loaded' ).add( $.proxy( this.load, this 
) );
// Apply source filter plugin to the content
this.$content.cxFilterSource();
@@ -237,17 +248,11 @@
} );
 
this.$content.on( 'click', 'a', function ( e ) {
-   var url,
-   $link = $( this );
+   var $link = $( this );
 
// Allow link exploration
if ( e.shiftKey || e.ctrlKey ) {
-   url = self.siteMapper.getPageUrl(
-   mw.cx.sourceLanguage, cleanupLinkHref( 
$link.attr( 'href' ) )
-   );
-   window.open( url, '_blank' );
-
-   return false;
+   return true;
}
 
// Avoid all reference links

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I860a239a0c49d2f98acfc86acbc64e1d3d9e9005
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Rename Azerbaijani Wikisource project and namespaces - change (operations/mediawiki-config)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Rename Azerbaijani Wikisource project and namespaces
..

Rename Azerbaijani Wikisource project and namespaces

Bug: T114002
Change-Id: I14a36b7e09af23b26f0f54e9dbb3c1697c39a9e9
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f0530e7..a68805a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1509,7 +1509,7 @@
'azwiki' => 'Vikipediya',
'azwikibooks' => 'Vikikitab', // T33068
'azwikiquote' => 'Vikisitat',
-   'azwikisource' => 'VikiMənbə',
+   'azwikisource' => 'Vikimənbə', // T114002
'azbwiki' => 'ویکی‌پدیا', // T106305
'bawiki' => 'Википедия', // T43167
'bdwikimedia' => 'উইকিমিডিয়া বাংলাদেশ',
@@ -1988,7 +1988,7 @@
'aywiki' => 'Wikipidiya',
'azwiki' => 'Vikipediya',
'azwikibooks' => 'Vikikitab', // T33068
-   'azwikisource' => 'VikiMənbə',
+   'azwikisource' => 'Vikimənbə',
'azwikiquote' => 'Vikisitat',
'azbwiki' => 'ویکی‌پدیا', // T106305
'bawiki' => 'Википедия', // T43167
@@ -2597,6 +2597,8 @@
'Wikiquote_talk' => NS_PROJECT_TALK,
),
'+azwikisource' => array(
+   'VikiMənbə' => NS_PROJECT, // T114002
+   'VikiMənbə müzakirəsi' => NS_PROJECT_TALK, // T114002
'Portal' => 100,
'Portal_talk' => 101,
),

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

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

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

[MediaWiki-commits] [Gerrit] [Cookie Policy] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [Cookie Policy] Register extension
..

[Cookie Policy] Register extension

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/05/242105/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 127a9e7..0dd9c1f 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -706,6 +706,10 @@
 aliasfile = Convert2Wiki/Convert2Wiki.alias.php
 optional = convert2wiki-format-csv
 
+Cookie Policy
+descmsg = cookie-policy-description
+ignored = cookie-policy-link, cookie-policy-site-name
+
 Copy To Clipboard
 
 Create Page

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2aeb600297c287fd4a01b5249ccef26d8910cdd4
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] [Cookie Policy] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [Cookie Policy] Register extension
..


[Cookie Policy] Register extension

Change-Id: I2aeb600297c287fd4a01b5249ccef26d8910cdd4
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 4 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 127a9e7..0dd9c1f 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -706,6 +706,10 @@
 aliasfile = Convert2Wiki/Convert2Wiki.alias.php
 optional = convert2wiki-format-csv
 
+Cookie Policy
+descmsg = cookie-policy-description
+ignored = cookie-policy-link, cookie-policy-site-name
+
 Copy To Clipboard
 
 Create Page

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2aeb600297c287fd4a01b5249ccef26d8910cdd4
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] composer/npm jobs for SpamDiffTool - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: composer/npm jobs for SpamDiffTool
..


composer/npm jobs for SpamDiffTool

This adds the npm test and composer test to SpamDiffTool

This also adds jshint test to check: and jsonlint test to check: moving
it from template.

Requires https://gerrit.wikimedia.org/r/#/c/228625/

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1afcd9f..b7b0286 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7137,8 +7137,13 @@
 
   - name: mediawiki/extensions/SpamDiffTool
 template:
+  - name: composer-test
   - name: jsonlint
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
+  - jshint
 
   - name: mediawiki/extensions/Spreadsheet
 template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9d5d01c88930df636faf1d672b442d705f46640
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] (re)define git-ssh for LVS - change (operations/dns)

[Rush (Code Review)]

Rush has uploaded a new change for review.

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

Change subject: (re)define git-ssh for LVS
..

(re)define git-ssh for LVS

Change-Id: I087431cbe0840535e169c00063eb68815e8e7ec4
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1de1c70..b6cf95c 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -242,6 +242,8 @@
 1H  IN  2620:0:861:ed1a::3:14
 restbase1H  IN CNAME restbase.eqiad
 rest1H  IN CNAME restbase.eqiad
+git-ssh.eqiad 1H  IN A208.80.154.249
+git-ssh1H  IN CNAME git-ssh.eqiad
 
 ;;; ulsfo
 text-lb.ulsfo   600 IN DYNA geoip!text-addrs/ulsfo
@@ -445,7 +447,6 @@
 gerrit  1H  IN A208.80.154.81
 1H  IN  2620:0:861:3:208:80:154:81
 git 1H  IN CNAMEmisc-web-lb.eqiad
-git-ssh 1H  IN A208.80.154.82
 gdash   1H  IN CNAMEmisc-web-lb.eqiad
 tessera 1H  IN CNAMEmisc-web-lb.eqiad
 graphite1H  IN CNAMEmisc-web-lb.eqiad

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

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

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

[MediaWiki-commits] [Gerrit] Filter out integration/config puppet validate - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Filter out integration/config puppet validate
..

Filter out integration/config puppet validate

No point in triggering the puppet validation job when there is no .pp
modifications.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/36/242136/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1db9872..4f5cb5b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -568,6 +568,10 @@
 files:
  - '^.*\.pp$'
 
+  - name: 'integration-config-puppet-validate'
+files:
+ - '^.*\.pp$'
+
   - name: '^(.*-)?ruby1.9.3lint$'
 files:
  - '^.*\.rb$'

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

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

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

[MediaWiki-commits] [Gerrit] Use new travis infrastructure (sudo:false). - change (mediawiki...text_renderer)

[jenkins-bot (Code Review)]

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

Change subject: Use new travis infrastructure (sudo:false).
..


Use new travis infrastructure (sudo:false).

Change-Id: I8d29c8e5ccc8a848f7a3d120c076bd3feef0ecff
---
M .travis.yml
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 93af107..9ad957a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,10 @@
+sudo: false
 language: node_js
+addons:
+  apt:
+packages:
+- zip
+- unzip
 node_js:
   - "4.1"
   - "0.10"
@@ -6,5 +12,3 @@
 before_install:
  - NODE_VERSION=$(node -e 'console.log(process.version.replace(/[.][0-9]+$/, 
""))')
  - if [ "v0.8" = "$NODE_VERSION" ]; then npm install -g npm@1.4.28 && npm 
install -g npm ; fi
- - sudo apt-get update -qq
- - sudo apt-get install -qq unzip

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d29c8e5ccc8a848f7a3d120c076bd3feef0ecff
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/text_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] No longer strip parenthetical content from first sentence. - change (mediawiki...mobileapps)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: No longer strip parenthetical content from first sentence.
..

No longer strip parenthetical content from first sentence.

[Note: copied from dbrant's app-side patch at
https://gerrit.wikimedia.org/r/#/c/242135/]

This was an experiment to try to improve the readability of the first
sentence of the article, which often contains information in parentheses.
But, since the (relatively naive) algorithm for removing parentheses also
affects links that have parentheses in them, this was doing more harm than
good by breaking these links.

Note: we are still stripping parenthetical content from link previews, but
that's because we don't enable links within the preview. If we end up
enabling links in the preview, then we'll need to revisit this issue.

Bug: T96871
Change-Id: Iafa8d3213c9b824d8c6ebffd22a1b4b34fe38709
---
M www/js/transforms/relocateFirstParagraph.js
1 file changed, 1 insertion(+), 49 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/49/242149/1

diff --git a/www/js/transforms/relocateFirstParagraph.js 
b/www/js/transforms/relocateFirstParagraph.js
index 095ffd8..77cb1c2 100644
--- a/www/js/transforms/relocateFirstParagraph.js
+++ b/www/js/transforms/relocateFirstParagraph.js
@@ -1,47 +1,5 @@
 var transformer = require("../transformer");
 
-// Takes a block of text, and removes any text within parentheses, but only
-// until the end of the first sentence.
-// Based on Extensions:Popups - ext.popups.renderer.article.js
-function removeParensFromText( string ) {
-var ch;
-var newString = '';
-var level = 0;
-var i = 0;
-for( ; i < string.length; i++ ) {
-ch = string.charAt( i );
-if ( ch === ')' && level === 0  ) {
-// abort if we have an imbalance of parentheses
-return string;
-}
-if ( ch === '(' ) {
-level++;
-continue;
-} else if ( ch === ')' ) {
-level--;
-continue;
-}
-if ( level === 0 ) {
-// Remove leading spaces before parentheses
-if ( ch === ' ' && (i < string.length - 1) && string.charAt( i + 1 
) === '(' ) {
-continue;
-}
-newString += ch;
-if ( ch === '.' ) {
-// stop at the end of the first sentence
-break;
-}
-}
-}
-// fill in the rest of the string
-if ( i + 1 < string.length ) {
-newString += string.substring( i + 1, string.length );
-}
-// if we had an imbalance of parentheses, then return the original string,
-// instead of the transformed one.
-return ( level === 0 ) ? newString : string;
-}
-
 // Move the first non-empty paragraph of text to the top of the section.
 // This will have the effect of shifting the infobox and/or any images at the 
top of the page
 // below the first paragraph, allowing the user to start reading the page 
right away.
@@ -83,13 +41,7 @@
 // Move the P!
 block_0.insertBefore(p.parentNode.removeChild(p), block_0.firstChild);
 
-// Transform the first sentence of the first paragraph.
-// (but only for non-production, and only on enwiki)
-if ( window.isBeta && window.siteLanguage.indexOf( "en" ) > -1 ) {
-p.innerHTML = removeParensFromText(p.innerHTML);
-}
-
 // But only move one P!
 break;
 }
-} );
\ No newline at end of file
+} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafa8d3213c9b824d8c6ebffd22a1b4b34fe38709
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

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

[MediaWiki-commits] [Gerrit] No longer strip parenthetical content from first sentence. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: No longer strip parenthetical content from first sentence.
..


No longer strip parenthetical content from first sentence.

This was an experiment to try to improve the readability of the first
sentence of the article, which often contains information in parentheses.
But, since the (relatively naive) algorithm for removing parentheses also
affects links that have parentheses in them, this was doing more harm than
good by breaking these links.

Note: we are still stripping parenthetical content from link previews, but
that's because we don't enable links within the preview. If we end up
enabling links in the preview, then we'll need to revisit this issue.

Bug: T96871
Change-Id: Ic01e82cdf088f6acb42b80f2c355d300907e3950
---
M app/src/main/assets/bundle.js
M www/js/transforms/relocateFirstParagraph.js
2 files changed, 0 insertions(+), 96 deletions(-)

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



diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index d91e474..af6c29b 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -1024,48 +1024,6 @@
 
},{"../transformer":12,"./collapseTables":16}],20:[function(require,module,exports){
 var transformer = require("../transformer");
 
-// Takes a block of text, and removes any text within parentheses, but only
-// until the end of the first sentence.
-// Based on Extensions:Popups - ext.popups.renderer.article.js
-function removeParensFromText( string ) {
-var ch;
-var newString = '';
-var level = 0;
-var i = 0;
-for( ; i < string.length; i++ ) {
-ch = string.charAt( i );
-if ( ch === ')' && level === 0  ) {
-// abort if we have an imbalance of parentheses
-return string;
-}
-if ( ch === '(' ) {
-level++;
-continue;
-} else if ( ch === ')' ) {
-level--;
-continue;
-}
-if ( level === 0 ) {
-// Remove leading spaces before parentheses
-if ( ch === ' ' && (i < string.length - 1) && string.charAt( i + 1 
) === '(' ) {
-continue;
-}
-newString += ch;
-if ( ch === '.' ) {
-// stop at the end of the first sentence
-break;
-}
-}
-}
-// fill in the rest of the string
-if ( i + 1 < string.length ) {
-newString += string.substring( i + 1, string.length );
-}
-// if we had an imbalance of parentheses, then return the original string,
-// instead of the transformed one.
-return ( level === 0 ) ? newString : string;
-}
-
 // Move the first non-empty paragraph of text to the top of the section.
 // This will have the effect of shifting the infobox and/or any images at the 
top of the page
 // below the first paragraph, allowing the user to start reading the page 
right away.
@@ -1106,12 +1064,6 @@
 
 // Move the P!
 block_0.insertBefore(p.parentNode.removeChild(p), block_0.firstChild);
-
-// Transform the first sentence of the first paragraph.
-// (but only for non-production, and only on enwiki)
-if ( window.isBeta && window.siteLanguage.indexOf( "en" ) > -1 ) {
-p.innerHTML = removeParensFromText(p.innerHTML);
-}
 
 // But only move one P!
 break;
diff --git a/www/js/transforms/relocateFirstParagraph.js 
b/www/js/transforms/relocateFirstParagraph.js
index 095ffd8..8b0f9e5 100644
--- a/www/js/transforms/relocateFirstParagraph.js
+++ b/www/js/transforms/relocateFirstParagraph.js
@@ -1,47 +1,5 @@
 var transformer = require("../transformer");
 
-// Takes a block of text, and removes any text within parentheses, but only
-// until the end of the first sentence.
-// Based on Extensions:Popups - ext.popups.renderer.article.js
-function removeParensFromText( string ) {
-var ch;
-var newString = '';
-var level = 0;
-var i = 0;
-for( ; i < string.length; i++ ) {
-ch = string.charAt( i );
-if ( ch === ')' && level === 0  ) {
-// abort if we have an imbalance of parentheses
-return string;
-}
-if ( ch === '(' ) {
-level++;
-continue;
-} else if ( ch === ')' ) {
-level--;
-continue;
-}
-if ( level === 0 ) {
-// Remove leading spaces before parentheses
-if ( ch === ' ' && (i < string.length - 1) && string.charAt( i + 1 
) === '(' ) {
-continue;
-}
-newString += ch;
-if ( ch === '.' ) {
-// stop at the end of the first sentence
-break;
-}
-}
-}
-// fill 

[MediaWiki-commits] [Gerrit] Fix plural in mergehistory-done message - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix plural in mergehistory-done message
..


Fix plural in mergehistory-done message

Follow up to I9931bf48182bd41ff32bdac1798336319f233341

Change-Id: Ia4eb3bef3a11faef654922fe05c0d9ef98dc9b90
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index df55298..e547fcd 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -856,7 +856,7 @@
"mergehistory-go": "Show mergeable edits",
"mergehistory-submit": "Merge revisions",
"mergehistory-empty": "No revisions can be merged.",
-   "mergehistory-done": "$3 {{PLURAL:$3|revision|revisions}} of $1 were 
merged into [[:$2]].",
+   "mergehistory-done": "$3 {{PLURAL:$3|revision|revisions}} of $1 
{{PLURAL:$3|was|were}} merged into [[:$2]].",
"mergehistory-fail": "Unable to perform history merge, please recheck 
the page and time parameters.",
"mergehistory-fail-toobig" : "Unable to perform history merge as more 
than the limit of $1 {{PLURAL:$1|revision|revisions}} would be moved.",
"mergehistory-no-source": "Source page $1 does not exist.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4eb3bef3a11faef654922fe05c0d9ef98dc9b90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Glaisher 
Gerrit-Reviewer: Raimond Spekking 
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] Update mediawiki/mediawiki-codesniffer to 0.4.0 - change (mediawiki...Farmer)

[jenkins-bot (Code Review)]

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

Change subject: Update mediawiki/mediawiki-codesniffer to 0.4.0
..


Update mediawiki/mediawiki-codesniffer to 0.4.0

Change-Id: I856d85f3a186b6e97fb00bc7e0b935391db69f94
---
M MediaWikiFarmer.php
M composer.json
M phpcs.xml
3 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/MediaWikiFarmer.php b/MediaWikiFarmer.php
index 63cab67..1c8ad62 100644
--- a/MediaWikiFarmer.php
+++ b/MediaWikiFarmer.php
@@ -114,8 +114,10 @@
$this->_useDatabase = ( $this->_databaseName !== null );
 
if ( $this->_useDatabase ) {
+   // @codingStandardsIgnoreStart
global $IP;
require_once ( "$IP/includes/GlobalFunctions.php" );
+   // @codingStandardsIgnoreEnd
} else {
if ( !is_dir( $this->_configDirectory ) ) {
throw new MWException( 'configDirectory not 
found: ' . $this->_configDirectory );
diff --git a/composer.json b/composer.json
index 534f8fb..e0f4e67 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,12 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.*",
-   "mediawiki/mediawiki-codesniffer": "0.3.0"
+   "mediawiki/mediawiki-codesniffer": "0.4.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
-   "phpcs -p"
+   "phpcs -p -s"
]
}
 }
diff --git a/phpcs.xml b/phpcs.xml
index cb19440..d81a292 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,6 +2,7 @@
 

.
-   
+   
+   
vendor
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I856d85f3a186b6e97fb00bc7e0b935391db69f94
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Farmer
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update .travis.yml to use new infrastructure. - change (mediawiki...latex_renderer)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Update .travis.yml to use new infrastructure.
..

Update .travis.yml to use new infrastructure.

Change-Id: I3296a622595eef5d8ece2d38a8fbccc91ef2e187
---
M .travis.yml
1 file changed, 29 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
 refs/changes/38/242138/1

diff --git a/.travis.yml b/.travis.yml
index dc8a657..39ff540 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,33 @@
+sudo: false
 language: node_js
+addons:
+  apt:
+sources:
+- texlive-backports
+packages:
+- zip
+- unzip
+- texlive-xetex
+- texlive-latex-recommended
+- texlive-latex-extra
+- texlive-generic-extra
+- texlive-fonts-recommended
+- texlive-fonts-extra
+- fonts-hosny-amiri
+- ttf-farsiweb
+- fonts-nafees
+- fonts-arphic-uming
+- fonts-arphic-ukai
+- fonts-droid
+- fonts-baekmuk
+- texlive-lang-all
+- latex-xcolor
+- lmodern
+- poppler-utils
+- imagemagick
+- librsvg2-bin
+- libjpeg-progs
+- djvulibre-bin
 node_js:
   - "4.1"
   - "0.10"
@@ -6,6 +35,3 @@
 before_install:
  - NODE_VERSION=$(node -e 'console.log(process.version.replace(/[.][0-9]+$/, 
""))')
  - if [ "v0.8" = "$NODE_VERSION" ]; then npm install -g npm@1.4.28 && npm 
install -g npm ; fi
- - sudo add-apt-repository -y ppa:texlive-backports/ppa
- - sudo apt-get update -qq
- - sudo apt-get install -qq texlive-xetex texlive-latex-recommended 
texlive-latex-extra texlive-generic-extra texlive-fonts-recommended 
texlive-fonts-extra fonts-hosny-amiri ttf-farsiweb fonts-nafees 
fonts-arphic-uming fonts-arphic-ukai fonts-droid fonts-baekmuk texlive-lang-all 
latex-xcolor lmodern poppler-utils imagemagick librsvg2-bin libjpeg-progs 
djvulibre-bin unzip

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3296a622595eef5d8ece2d38a8fbccc91ef2e187
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Prevent TextExtracts from possibly returning wikitext (worka... - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Prevent TextExtracts from possibly returning wikitext 
(workaround).
..

Prevent TextExtracts from possibly returning wikitext (workaround).

The TextExtracts extension returns content from the lead section of the
requested article. It allows the caller to specify a certain number of
sentences, or a certain number of characters, to retrieve from the lead
section.  But what if the caller requests more data than is present in the
lead section?

Well, in the case of "sentences", the extension correctly returns the
maximum number of available sentences in the lead section, and no more.
However, in the case of "characters", it actually goes beyond the lead
section, and appends content from subsequent sections, which might include
unparsed wikitext (e.g. section headings, edit link, etc).

Previously, we were requesting 512 characters, so that we can parse them
ourselves into two intelligible sentences based on the user's Locale.
This patch changes it to use "sentences": We ask for 10 sentences, and
then re-parse the text using our sentence parsing logic to end up with 2
sentences.

Why do we trust our sentence parsing logic more than TextExtracts? Because
it's better-tailored to the user's Locale on the client side. For example,
in the case of English, the TextExtracts extension incorrectly treats
abbreviations like "i.e.", "B.C.", "Jr.", etc. as separate sentences,
whereas our parser will leave those alone.

Bug: T101153
Change-Id: Id227e82e058debf3efb1fb9aea8f8187b52b2645
---
M app/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java 
b/app/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
index 9e43931..c621b31 100755
--- a/app/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/PreviewFetchTask.java
@@ -19,8 +19,7 @@
 public void buildQueryParams(RequestBuilder builder) {
 builder.param("prop", "extracts|pageimages|pageterms")
.param("redirects", "true")
-   .param("exchars", "512")
-   //.param("exsentences", "2")
+   .param("exsentences", "10")
.param("explaintext", "true")
.param("piprop", "thumbnail|name")
.param("pithumbsize", 
Integer.toString(WikipediaApp.PREFERRED_THUMB_SIZE))

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

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

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

[MediaWiki-commits] [Gerrit] Don't run jscs on node 0.8. - change (mediawiki...zim_renderer)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Don't run jscs on node 0.8.
..

Don't run jscs on node 0.8.

Change-Id: Id58cc87dd8231fc76935dc67fd5b553605c027b1
---
M package.json
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/zim_renderer
 refs/changes/42/242142/1

diff --git a/package.json b/package.json
index 35dd3cd..7521203 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,13 @@
   "description": "Converts mediawiki collection bundles (as generated by 
mw-ocg-bundler) to ZIM files",
   "main": "lib/index.js",
   "scripts": {
+"lint": "npm run jshint && npm run jscs",
+"lint-no-0.8": "node -e 
'process.exit(/v0[.][0-8][.]/.test(process.version) ? 0 : 1)' || npm run lint",
 "jshint": "jshint .",
 "jscs": "jscs .",
 "jscs-fix": "jscs --fix .",
 "mocha": "mocha",
-"test": "npm run jshint && npm run jscs && (npm run mocha || echo Mocha 
tests are not working yet)",
+"test": "npm run lint-no-0.8 && (npm run mocha || echo Mocha tests are not 
working yet)",
 "travis": "npm-travis --remote gerrit 
wikimedia/mediawiki-extensions-Collection-OfflineContentGenerator-zim_renderer"
   },
   "repository": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id58cc87dd8231fc76935dc67fd5b553605c027b1
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/zim_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Rsync: Unquote booleans - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Rsync:  Unquote booleans
..


Rsync:  Unquote booleans

Bug: T113783
Change-Id: I80362002e2f665daac829bfef959714f09c5c3e8
---
M manifests/misc/udp2log.pp
M manifests/role/analytics.pp
M manifests/role/analytics/kafka.pp
M manifests/role/ci.pp
M manifests/role/eventlogging.pp
M manifests/role/labsnfs.pp
M manifests/role/lists.pp
M modules/archiva/manifests/gitfat.pp
M modules/dataset/manifests/rsync/default.pp
M modules/openstack/manifests/nova/compute.pp
M modules/rsync/manifests/server/module.pp
M modules/rsync/spec/defines/server_module_spec.rb
M modules/scap/manifests/master.pp
M modules/scap/manifests/proxy.pp
M modules/statistics/manifests/rsyncd.pp
M modules/swift/manifests/storage.pp
16 files changed, 37 insertions(+), 37 deletions(-)

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



diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 0917e7e..c0b1bd8 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -84,7 +84,7 @@
 rsync::server::module { 'udp2log':
 comment => 'udp2log log files',
 path=> $path,
-read_only   => 'yes',
+read_only   => yes,
 hosts_allow => $hosts_allow;
 }
 
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index b6270bd..2e0708a 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -99,8 +99,8 @@
 # be present and mounted at /mnt/hdfs
 rsync::server::module { 'hdfs-archive':
 path=> "${::cdh::hadoop::mount::mount_point}/wmf/data/archive",
-read_only   => 'yes',
-list=> 'yes',
+read_only   => yes,
+list=> yes,
 hosts_allow => $hosts_allow,
 require => Class['cdh::hadoop::mount'],
 }
diff --git a/manifests/role/analytics/kafka.pp 
b/manifests/role/analytics/kafka.pp
index fa7bcd1..f5ac848 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -216,7 +216,7 @@
 description  => 'Kafka Broker Server',
 nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -C 
java -a "kafka.Kafka /etc/kafka/server.properties"',
 require  => Class['::kafka::server'],
-critical => 'true',
+critical => true,
 }
 
 # Generate icinga alert if this jmxtrans instance is not running.
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 6a8b6f1..8be5f30 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -470,7 +470,7 @@
 
 rsync::server::module { 'doc':
 path  => '/srv/doc',
-read_only => 'no',
+read_only => no,
 require   => [
 File['/srv/doc'],
 Class['role::labs::lvm::srv'],
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index ed25784..8140a95 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -250,8 +250,8 @@
 
 rsync::server::module { 'eventlogging':
 path=> $log_dir,
-read_only   => 'yes',
-list=> 'yes',
+read_only   => yes,
+list=> yes,
 require => File[$log_dir],
 hosts_allow => $backup_destinations,
 }
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 76d3a3b..2a02f92 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -19,7 +19,7 @@
 
 rsync::server::module { 'pagecounts':
 path=> '/srv/dumps/pagecounts',
-read_only   => 'no',
+read_only   => no,
 hosts_allow => $dump_servers_ips,
 }
 
@@ -30,7 +30,7 @@
 $statistics_servers = hiera('statistics_servers')
 rsync::server::module { 'statistics':
 path=> '/srv/statistics',
-read_only   => 'no',
+read_only   => no,
 hosts_allow => $statistics_servers,
 require => File['/srv/statistics']
 }
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index c2a728e..7da5c7c 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -181,31 +181,31 @@
 
 rsync::server::module { 'lists':
 path=> '/var/lib/mailman/lists',
-read_only   => 'no',
+read_only   => no,
 hosts_allow => '208.80.154.61',
 }
 
 rsync::server::module { 'archives':
 path=> '/var/lib/mailman/archives',
-read_only   => 'no',
+read_only   => no,
 hosts_allow => '208.80.154.61',
 }
 
 rsync::server::module { 'data':
 path=> '/var/lib/mailman/data',
-read_only   => 'no',
+read_only   => no,
 hosts_allow => '208.80.154.61',
 }
 
 rsync::server::module { 'qfiles':

[MediaWiki-commits] [Gerrit] Adjust success/failure message - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Adjust success/failure message
..


Adjust success/failure message

To match the Gerrit regex matcher.

Similar to:

d495881 - Adjust yamllint status message to match Gerrit
5e78f75 - Tweak 'yamlllint' Gerrit message to mention deprecation

Change-Id: I4a7356cd77261745371f5b689b1e838b86b60712
---
M zuul/layout.yaml
1 file changed, 15 insertions(+), 14 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1db9872..c82bf59 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1607,33 +1607,33 @@
 
   - name: beta-mediawiki-config-update-eqiad
 branch: ^master$
-success-message: 'Change has been deployed on the EQIAD beta cluster'
-failure-message: 'Failed deployment on the EQIAD beta cluster :-/ Please 
contact a member of the beta project to fixup the working directory on the 
destination server.'
+success-message: 'SUCCESS Change has been deployed on the EQIAD beta 
cluster'
+failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ 
Please contact a member of the beta project to fixup the working directory on 
the destination server.'
 
   - name: beta-cxserver-update-eqiad
 branch: ^master$
-success-message: 'Change has been deployed on the EQIAD beta cluster'
-failure-message: 'Failed deployment on the EQIAD beta cluster :-/ Please 
contact a member of the beta project to investigate.'
+success-message: 'SUCCESS Change has been deployed on the EQIAD beta 
cluster'
+failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ 
Please contact a member of the beta project to investigate.'
 
   - name: beta-parsoid-update-eqiad
 branch: ^master$
-success-message: 'Change has been deployed on the EQIAD beta cluster'
-failure-message: 'Failed deployment on the EQIAD beta cluster :-/ Please 
contact a member of the beta project to investigate.'
+success-message: 'SUCCESS Change has been deployed on the EQIAD beta 
cluster'
+failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ 
Please contact a member of the beta project to investigate.'
 
   - name: parsoidsvc-source-jsduck-publish
 branch: ^master$
-success-message: 'Deployed documentation to 
https://doc.wikimedia.org/Parsoid/master/'
-failure-message: 'Failed to deploy documentation :-/'
+success-message: 'SUCCESS Deployed documentation to 
https://doc.wikimedia.org/Parsoid/master/'
+failure-message: 'FAILURE Failed to deploy documentation :-/'
 
 
   - name: integration-docroot-deploy
 branch: ^master$
-success-message: 'View https://integration.wikimedia.org/ or 
https://doc.wikimedia.org/. Deployed'
-failure-message: 'Failed to deploy. Please contact a continuous 
integration team member to fixup the docroot on the destination server. FAILURE'
+success-message: 'SUCCESS View https://integration.wikimedia.org/ or 
https://doc.wikimedia.org/. Deployed'
+failure-message: 'FAILURE Failed to deploy. Please contact a continuous 
integration team member to fixup the docroot on the destination server.'
 
   - name: 'integration-jjb-config-diff'
-success-message: 'Review the XML difference. Build'
-failure-message: 'Failed to compare your patchset with the current 
configuration. FAILURE'
+success-message: 'SUCCESS Review the XML difference.'
+failure-message: 'FAILURE Failed to compare your patchset with the current 
configuration.'
 files: '^jjb/.*'
 
   - name: 'integration-config-tox-dib-jessie'
@@ -1641,8 +1641,9 @@
 
   - name: 'integration-zuul-layoutdiff'
 voting: false
-success-message: 'No layout difference. Build'
-failure-message: 'Review the Zuul layout difference. Build'
+# Note how the messages are mixed up. Gotta change the job exit code.
+success-message: 'FAILURE No layout difference. Build'
+failure-message: 'SUCCESS Review the Zuul layout difference. Build'
 
   - name: 'yamllint'
 success-message: 'SUCCESS This job is deprecated. Please lint YAML files 
with a test. T95890.'

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

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

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

[MediaWiki-commits] [Gerrit] Use API for formatting in JS - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Use API for formatting in JS
..


Use API for formatting in JS

Bug: T87754
Bug: T88275
Bug: T88426
Bug: T98208
Change-Id: I641d8c46009f59e2b11284cb949322ae4d186b60
---
M repo/resources/Resources.php
M repo/resources/wikibase.ui.entityViewInit.js
M view/resources/jquery/wikibase/jquery.wikibase.itemview.js
M view/resources/jquery/wikibase/jquery.wikibase.propertyview.js
M view/resources/jquery/wikibase/jquery.wikibase.statementgrouplistview.js
M view/resources/jquery/wikibase/resources.php
A view/resources/wikibase/entityIdFormatter/CachingEntityIdHtmlFormatter.js
A view/resources/wikibase/entityIdFormatter/CachingEntityIdPlainFormatter.js
A 
view/resources/wikibase/entityIdFormatter/DataValueBasedEntityIdHtmlFormatter.js
A 
view/resources/wikibase/entityIdFormatter/DataValueBasedEntityIdPlainFormatter.js
D view/resources/wikibase/entityIdFormatter/SimpleEntityIdHtmlFormatter.js
D view/resources/wikibase/entityIdFormatter/SimpleEntityIdPlainFormatter.js
M view/resources/wikibase/entityIdFormatter/resources.php
M view/resources/wikibase/utilities/resources.php
M view/resources/wikibase/utilities/wikibase.utilities.ui.js
M view/resources/wikibase/view/ViewFactory.js
M view/resources/wikibase/view/resources.php
M 
view/tests/qunit/jquery/wikibase/jquery.wikibase.statementgrouplistview.tests.js
A 
view/tests/qunit/wikibase/entityIdFormatter/DataValueBasedEntityIdHtmlFormatter.tests.js
A 
view/tests/qunit/wikibase/entityIdFormatter/DataValueBasedEntityIdPlainFormatter.tests.js
D 
view/tests/qunit/wikibase/entityIdFormatter/SimpleEntityIdHtmlFormatter.tests.js
D 
view/tests/qunit/wikibase/entityIdFormatter/SimpleEntityIdPlainFormatter.tests.js
M view/tests/qunit/wikibase/entityIdFormatter/resources.php
M view/tests/qunit/wikibase/view/ViewFactory.tests.js
24 files changed, 368 insertions(+), 414 deletions(-)

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



diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index ad7e20c..4eeb658 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -83,10 +83,15 @@
'jquery.wikibase.wbtooltip',
'jquery.cookie',
'wikibase.api.getLocationAgnosticMwApi',
+   'wikibase.datamodel.EntityId',
'wikibase.dataTypeStore',
'wikibase.entityChangers.EntityChangersFactory',
'wikibase.experts.getStore',
'wikibase.formatters.getStore',
+   
'wikibase.entityIdFormatter.CachingEntityIdHtmlFormatter',
+   
'wikibase.entityIdFormatter.CachingEntityIdPlainFormatter',
+   
'wikibase.entityIdFormatter.DataValueBasedEntityIdHtmlFormatter',
+   
'wikibase.entityIdFormatter.DataValueBasedEntityIdPlainFormatter',
'wikibase.EntityInitializer',
'wikibase.parsers.getStore',
'wikibase.api.RepoApi',
diff --git a/repo/resources/wikibase.ui.entityViewInit.js 
b/repo/resources/wikibase.ui.entityViewInit.js
index 8db03c7..f4e430c 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -103,19 +103,29 @@
entity
),
contentLanguages = new 
wikibase.WikibaseContentLanguages(),
+   formatterStore = getFormatterStore( repoApi, 
dataTypeStore ),
+   parserStore = getParserStore( repoApi ),
+   entityIdFormatter = new ( formatterStore.getFormatter( 
wb.datamodel.EntityId.TYPE ) )( { lang: userLanguages[0] } ),
+   entityIdParser = new ( parserStore.getParser( 
wb.datamodel.EntityId.TYPE ) )( { lang: userLanguages[0] } ),
viewFactory = new wikibase.view.ViewFactory(
contentLanguages,
dataTypeStore,
entityChangersFactory,
+   new 
wb.entityIdFormatter.CachingEntityIdHtmlFormatter(
+   new 
wb.entityIdFormatter.DataValueBasedEntityIdHtmlFormatter( entityIdParser, 
entityIdFormatter )
+   ),
+   new 
wb.entityIdFormatter.CachingEntityIdPlainFormatter(
+   new 
wb.entityIdFormatter.DataValueBasedEntityIdPlainFormatter( entityIdParser, 
entityIdFormatter )
+   ),
entityStore,

[MediaWiki-commits] [Gerrit] Remove unused code from statementgrouplistview test - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Remove unused code from statementgrouplistview test
..

Remove unused code from statementgrouplistview test

Follows up on 6b970e7fabd

Change-Id: I317d98445e51546c42e1f880a82644cf9b742a80
---
M 
view/tests/qunit/jquery/wikibase/jquery.wikibase.statementgrouplistview.tests.js
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git 
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementgrouplistview.tests.js
 
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementgrouplistview.tests.js
index e5255be..39f9584 100644
--- 
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementgrouplistview.tests.js
+++ 
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementgrouplistview.tests.js
@@ -6,11 +6,6 @@
 ( function( $, wb, QUnit ) {
 'use strict';
 
-var entityStore = new wb.store.EntityStore();
-entityStore.get = function () {
-   return $.Deferred().resolve().promise();
-};
-
 /**
  * @param {Object} [options={}]
  * @param {jQuery} [$node]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I317d98445e51546c42e1f880a82644cf9b742a80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Bump make-release version glob - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Bump make-release version glob
..

Bump make-release version glob

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


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

diff --git a/scripts/make-release.py b/scripts/make-release.py
index a472e3c..88d0266 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -41,7 +41,7 @@
 
 PATH_PREFIX = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 GRADLEW = './gradlew'
-VERSION_START = '2.0'
+VERSION_START = '2.1'
 
 
 def p(*path_fragments):

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

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

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

[MediaWiki-commits] [Gerrit] ExtendedSearch: Added hook to PreproccessSearchString - change (mediawiki...BlueSpiceExtensions)

[jenkins-bot (Code Review)]

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

Change subject: ExtendedSearch: Added hook to PreproccessSearchString
..


ExtendedSearch: Added hook to PreproccessSearchString

* Added hook BSExtendedSearchBaseAfterPreprocessSearchInput
* Needs merge to master!

Patch-Set2:

* Added hook to hook.txt

Change-Id: If0489b6f1e8d4b49861d63053a85d75d869f7404
---
M ExtendedSearch/doc/Hooks.txt
M ExtendedSearch/includes/ExtendedSearchBase.class.php
2 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/ExtendedSearch/doc/Hooks.txt b/ExtendedSearch/doc/Hooks.txt
index a6aee58..b377342 100644
--- a/ExtendedSearch/doc/Hooks.txt
+++ b/ExtendedSearch/doc/Hooks.txt
@@ -24,6 +24,8 @@
  &$iID:
  $bTitleExists:
 
+'BSExtendedSearchBaseAfterPreprocessSearchInput':
+&$sSearchString
 
 ==BuildIndexMainControl.class==
 'BS:ExtendedSearch:AddDocumentLog':
diff --git a/ExtendedSearch/includes/ExtendedSearchBase.class.php 
b/ExtendedSearch/includes/ExtendedSearchBase.class.php
index 80e778e..7cde3ce 100644
--- a/ExtendedSearch/includes/ExtendedSearchBase.class.php
+++ b/ExtendedSearch/includes/ExtendedSearchBase.class.php
@@ -371,6 +371,11 @@
$sSearchString
);
$sSearchString = trim( $sSearchString );
+
+   wfRunHooks( 'BSExtendedSearchBaseAfterPreprocessSearchInput', 
array(
+   &$sSearchString
+   ));
+
wfProfileOut( 'BS::'.__METHOD__ );
 
return $sSearchString;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0489b6f1e8d4b49861d63053a85d75d869f7404
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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 .travis.yml to build zimwriterfs. - change (mediawiki...zim_renderer)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Update .travis.yml to build zimwriterfs.
..

Update .travis.yml to build zimwriterfs.

Change-Id: Ia62eb497fb8875e7ab23f0e440b9b8b9a10edcac
---
M .travis.yml
1 file changed, 21 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/zim_renderer
 refs/changes/39/242139/1

diff --git a/.travis.yml b/.travis.yml
index 93af107..727d916 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,29 @@
+sudo: false
 language: node_js
+addons:
+  apt:
+packages:
+- zip
+- unzip
+- liblzma-dev
+- libmagic-dev
 node_js:
   - "4.1"
   - "0.10"
   - "0.8"
 before_install:
+ - echo Installing zimwriterfs.
+ - pushd $HOME
+ - git clone https://gerrit.wikimedia.org/r/p/openzim
+ - pushd openzim/zimlib
+ - ./autogen.sh && ./configure --prefix=$HOME && make && make install
+ - popd
+ - pushd openzim/zimwriterfs
+ - ./autogen.sh && ./configure --prefix=$HOME CXXFLAGS="-I$HOME/include 
-L$HOME/lib" CFLAGS="-I$HOME/include -L$HOME/lib" && make && make install
+ - popd
+ - echo Cleaning up. && /bin/rm -rf openzim
+ - popd
+ - which zimwriterfs
+ - zimwriterfs --help
  - NODE_VERSION=$(node -e 'console.log(process.version.replace(/[.][0-9]+$/, 
""))')
  - if [ "v0.8" = "$NODE_VERSION" ]; then npm install -g npm@1.4.28 && npm 
install -g npm ; fi
- - sudo apt-get update -qq
- - sudo apt-get install -qq unzip

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia62eb497fb8875e7ab23f0e440b9b8b9a10edcac
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/zim_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Various bugfixes / tweaks - change (operations...debdeploy)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Various bugfixes / tweaks
..

Various bugfixes / tweaks

Move generation of spec files to a separate command installed in /usr/bin
Fix syntax of generated YAML files
Fix parsing of dpkg status file for binNMUed packages

Change-Id: Id0ae40db09abd6c926d31a58beb03bf0f0604a30
---
M debian/changelog
M debian/debdeploy-master.dirs
M debian/debdeploy-master.install
M docs/TODO
M docs/readme.txt
M master/debdeploy
A master/generate-debdeploy-spec
M minion/debdeploy-minion.py
8 files changed, 116 insertions(+), 91 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/debdeploy 
refs/changes/40/242140/1

diff --git a/debian/changelog b/debian/changelog
index 5a89dd7..13e09c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debdeploy (0.0.8-1) jessie-wikimedia; urgency=medium
+
+  * Move generation of spec files to a separate command installed in /usr/bin
+  * Fix syntax of generated YAML files
+  * Fix parsing of dpkg status file for binNMUed packages
+
+ -- Moritz Muehlenhoff   Fri, 25 Sep 2015 16:52:23 
+0200
+
 debdeploy (0.0.7-1) jessie-wikimedia; urgency=medium
 
   * Improve error handling in case of malformed YAML specs
diff --git a/debian/debdeploy-master.dirs b/debian/debdeploy-master.dirs
index 7c53a23..cae4528 100644
--- a/debian/debdeploy-master.dirs
+++ b/debian/debdeploy-master.dirs
@@ -3,4 +3,5 @@
 /usr/lib/debdeploy/
 /usr/lib/python2.7/dist-packages/
 /usr/sbin/
+/usr/bin/
 
diff --git a/debian/debdeploy-master.install b/debian/debdeploy-master.install
index 064b37e..1783969 100644
--- a/debian/debdeploy-master.install
+++ b/debian/debdeploy-master.install
@@ -2,3 +2,4 @@
 master/debdeploy_updatespec.py /usr/lib/python2.7/dist-packages/
 master/debdeploy_conf.py /usr/lib/python2.7/dist-packages/
 master/debdeploy /usr/sbin
+master/generate-debdeploy-spec /usr/bin
diff --git a/docs/TODO b/docs/TODO
index 95272f6..12c0381 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -4,7 +4,6 @@
 
 Refinements to existing functionality:
 - Bash completion for commands and options
-- Add a command to generate a YAML file interactively
 - Write initiated deployment jobs into a logfile
 - Provide logrotate configs
 
@@ -14,3 +13,5 @@
   and create a WMF-specific IRC notification which updates "server admin log"
 - Make the logging configurable and add a WMF-specific logging method for
   Logstash
+- Implement timed restarts, which restart services not an once, but in
+  steps/with delays
diff --git a/docs/readme.txt b/docs/readme.txt
index 6add055..5ce9269 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -2,10 +2,10 @@
 Summary
 ---
 
-debdeploy is based on salt to reuse it's authentication and transfer
-capabilities. Updates are initiated via the debdeploy tool running
-on the salt master. Servers can be grouped into arbitrary sets of
-servers/services based on Salt grains.
+debdeploy allows the deployment of software updates in Debian (or Debian-based)
+environments on a large scale. It is based on salt; updates are
+initiated via the debdeploy tool running on the salt master. Servers
+can be grouped into arbitrary sets of servers/services based on Salt grains.
 
 Basic setup
 ---
diff --git a/master/debdeploy b/master/debdeploy
index dc8e05f..72cd06c 100755
--- a/master/debdeploy
+++ b/master/debdeploy
@@ -342,86 +342,6 @@
 for i in sorted(members):
 print i
 
-def generate_spec(supported_distros):
-'''
-Interactivey generate an update spec file in the currently directory.
-'''
-
-source = ""
-comment = ""
-updatetype = ""
-fixes = {}
-
-while source == "":
-source = raw_input("Please enter the name of source package (e.g. 
openssl). Leave blank or type 'quit' to abort\n>").strip()
-if source == "" or source == "quit":
-print "Aborting"
-sys.exit(1)
-
-comment = raw_input('You can enter an optional comment, e.g. a reference 
to a security advisory or a CVE ID mapping\n>').strip()
-if comment == "quit":
-print "Aborting"
-sys.exit(1)
-
-while updatetype not in ['tool', 'daemon-direct', 'daemon-disrupt', 
'reboot', 'library', 'quit']:
-print "tool   -> The updated packages is an enduser tool, can 
be"
-print "  rolled-out immediately."
-print "daemon-direct  -> Daemons which are restarted during update, 
but which"
-print "  do no affect existing users."
-print "daemon-disrupt -> Daemons which are restarted during update, 
where the"
-print "  users notice an impact. The update procedure 
is almost"
-print "  identical, but displays additional warnings"
-print "reboot -> Lowlevel component which requires a 

[MediaWiki-commits] [Gerrit] Move cursor offset calc from CE Surface to DM Document - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Move cursor offset calc from CE Surface to DM Document
..


Move cursor offset calc from CE Surface to DM Document

Change-Id: I701d778ba2f7a7ff9dea047d73f192029f6a277a
---
M src/ce/ve.ce.Surface.js
M src/dm/ve.dm.Document.js
M tests/ce/ve.ce.Surface.test.js
M tests/dm/ve.dm.Document.test.js
4 files changed, 92 insertions(+), 91 deletions(-)

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



diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 5baf0af..7028c4d 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2284,7 +2284,8 @@
  */
 ve.ce.Surface.prototype.selectAll = function () {
var internalListRange, range, matrix,
-   selection = this.getModel().getSelection();
+   selection = this.getModel().getSelection(),
+   dmDoc = this.getModel().getDocument();
 
if ( selection instanceof ve.dm.LinearSelection ) {
if ( this.getActiveTableNode() && 
this.getActiveTableNode().getEditingFragment() ) {
@@ -2293,8 +2294,8 @@
} else {
internalListRange = 
this.getModel().getDocument().getInternalList().getListNode().getOuterRange();
range = new ve.Range(
-   this.getNearestCorrectOffset( 0, 1 ),
-   this.getNearestCorrectOffset( 
internalListRange.start, -1 )
+   dmDoc.getNearestCursorOffset( 0, 1 ),
+   dmDoc.getNearestCursorOffset( 
internalListRange.start, -1 )
);
}
this.getModel().setLinearSelection( range );
@@ -2773,7 +2774,8 @@
nodeOffset = node.getModel().getOffset(),
previousData = previous.text.split( '' ),
nextData = next.text.split( '' ),
-   modelData = this.model.getDocument().data,
+   dmDoc = this.getModel().getDocument(),
+   modelData = dmDoc.data,
lengthDiff = next.text.length - previous.text.length,
surface = this;
 
@@ -2900,7 +2902,7 @@
}
newRange = next.range;
if ( newRange.isCollapsed() ) {
-   newRange = new ve.Range( this.getNearestCorrectOffset( 
newRange.start, 1 ) );
+   newRange = new ve.Range( dmDoc.getNearestCursorOffset( 
newRange.start, 1 ) );
}
 
this.changeModel(
@@ -4127,14 +4129,15 @@
  * @return {boolean} return.isBackwards True if the focus is before the anchor
  */
 ve.ce.Surface.prototype.getSelectionState = function ( range ) {
-   var anchor, focus;
+   var anchor, focus,
+   dmDoc = this.getModel().getDocument();
 
// Anchor/focus at the nearest correct position in the direction that 
grows the selection
anchor = this.documentView.getNodeAndOffset(
-   this.getNearestCorrectOffset( range.from, range.isBackwards() ? 
1 : -1 )
+   dmDoc.getNearestCursorOffset( range.from, range.isBackwards() ? 
1 : -1 )
);
focus = this.documentView.getNodeAndOffset(
-   this.getNearestCorrectOffset( range.to, range.isBackwards() ? 
-1 : 1 )
+   dmDoc.getNearestCursorOffset( range.to, range.isBackwards() ? 
-1 : 1 )
);
return new ve.SelectionState( {
anchorNode: anchor.node,
@@ -4187,53 +4190,6 @@
this.$highlightsFocused.append( $highlights );
} else {
this.$highlightsBlurred.append( $highlights );
-   }
-};
-
-/*! Helpers */
-
-/**
- * Get the nearest offset that a cursor can be placed at.
- *
- * TODO: Find a better name and a better place for this method
- *
- * @method
- * @param {number} offset Offset to start looking at
- * @param {number} [direction=-1] Direction to look in, +1 or -1
- * @return {number} Nearest offset a cursor can be placed at
- */
-ve.ce.Surface.prototype.getNearestCorrectOffset = function ( offset, direction 
) {
-   var contentOffset, structuralOffset,
-   documentModel = this.getModel().getDocument(),
-   data = documentModel.data;
-
-   direction = direction > 0 ? 1 : -1;
-   if (
-   data.isContentOffset( offset ) ||
-   documentModel.hasSlugAtOffset( offset )
-   ) {
-   return offset;
-   }
-
-   contentOffset = data.getNearestContentOffset( offset, direction );
-   structuralOffset = data.getNearestStructuralOffset( offset, direction, 
true );
-
-   if ( !documentModel.hasSlugAtOffset( structuralOffset ) && 
contentOffset !== -1 ) {
-   return contentOffset;
-   }
-
-   if ( direction === 1 ) {
-   if ( contentOffset < offset ) {
- 

[MediaWiki-commits] [Gerrit] Adjust success/failure message - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Adjust success/failure message
..

Adjust success/failure message

To match the Gerrit regex matcher.

Change-Id: I4a7356cd77261745371f5b689b1e838b86b60712
---
M zuul/layout.yaml
1 file changed, 15 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/45/242145/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1db9872..c82bf59 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1607,33 +1607,33 @@
 
   - name: beta-mediawiki-config-update-eqiad
 branch: ^master$
-success-message: 'Change has been deployed on the EQIAD beta cluster'
-failure-message: 'Failed deployment on the EQIAD beta cluster :-/ Please 
contact a member of the beta project to fixup the working directory on the 
destination server.'
+success-message: 'SUCCESS Change has been deployed on the EQIAD beta 
cluster'
+failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ 
Please contact a member of the beta project to fixup the working directory on 
the destination server.'
 
   - name: beta-cxserver-update-eqiad
 branch: ^master$
-success-message: 'Change has been deployed on the EQIAD beta cluster'
-failure-message: 'Failed deployment on the EQIAD beta cluster :-/ Please 
contact a member of the beta project to investigate.'
+success-message: 'SUCCESS Change has been deployed on the EQIAD beta 
cluster'
+failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ 
Please contact a member of the beta project to investigate.'
 
   - name: beta-parsoid-update-eqiad
 branch: ^master$
-success-message: 'Change has been deployed on the EQIAD beta cluster'
-failure-message: 'Failed deployment on the EQIAD beta cluster :-/ Please 
contact a member of the beta project to investigate.'
+success-message: 'SUCCESS Change has been deployed on the EQIAD beta 
cluster'
+failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ 
Please contact a member of the beta project to investigate.'
 
   - name: parsoidsvc-source-jsduck-publish
 branch: ^master$
-success-message: 'Deployed documentation to 
https://doc.wikimedia.org/Parsoid/master/'
-failure-message: 'Failed to deploy documentation :-/'
+success-message: 'SUCCESS Deployed documentation to 
https://doc.wikimedia.org/Parsoid/master/'
+failure-message: 'FAILURE Failed to deploy documentation :-/'
 
 
   - name: integration-docroot-deploy
 branch: ^master$
-success-message: 'View https://integration.wikimedia.org/ or 
https://doc.wikimedia.org/. Deployed'
-failure-message: 'Failed to deploy. Please contact a continuous 
integration team member to fixup the docroot on the destination server. FAILURE'
+success-message: 'SUCCESS View https://integration.wikimedia.org/ or 
https://doc.wikimedia.org/. Deployed'
+failure-message: 'FAILURE Failed to deploy. Please contact a continuous 
integration team member to fixup the docroot on the destination server.'
 
   - name: 'integration-jjb-config-diff'
-success-message: 'Review the XML difference. Build'
-failure-message: 'Failed to compare your patchset with the current 
configuration. FAILURE'
+success-message: 'SUCCESS Review the XML difference.'
+failure-message: 'FAILURE Failed to compare your patchset with the current 
configuration.'
 files: '^jjb/.*'
 
   - name: 'integration-config-tox-dib-jessie'
@@ -1641,8 +1641,9 @@
 
   - name: 'integration-zuul-layoutdiff'
 voting: false
-success-message: 'No layout difference. Build'
-failure-message: 'Review the Zuul layout difference. Build'
+# Note how the messages are mixed up. Gotta change the job exit code.
+success-message: 'FAILURE No layout difference. Build'
+failure-message: 'SUCCESS Review the Zuul layout difference. Build'
 
   - name: 'yamllint'
 success-message: 'SUCCESS This job is deprecated. Please lint YAML files 
with a test. T95890.'

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

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

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

[MediaWiki-commits] [Gerrit] [Translate] Test composer-test in experiment - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [Translate] Test composer-test in experiment
..

[Translate] Test composer-test in experiment

See if this fixes the composer test issue.

Change-Id: Ia98206caed91dff6a0e74b52362ce71d3113eeef
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/47/242147/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1db9872..e99bc10 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7331,7 +7331,7 @@
   - name: extension-unittests
   - name: extension-phpcs
 experimental:
-  - php-composer-test
+  - composer-test
 
   - name: mediawiki/extensions/TranslationNotifications
 template:

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor: Set TransitionDefault true for the English Wik... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: VisualEditor: Set TransitionDefault true for the English 
Wikipedia
..


VisualEditor: Set TransitionDefault true for the English Wikipedia

Change-Id: I4a8de04308d7137f1d3ce9728e5536dd4356c140
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 1 deletion(-)

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

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6fc009b..7cc861d 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -890,7 +890,6 @@
),
'$wmgVisualEditorTransitionDefault' => array(
'default' => false,
-   'enwiki' => true,
),
//  BetaFeatures end ---
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f0530e7..11789c1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12884,6 +12884,7 @@
 // opt-out).
 'wmgVisualEditorTransitionDefault' => array(
'default' => false,
+   'enwiki' => true,
 ),
 
 // Should VisualEditor's "beta welcome" be shown

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

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

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

[MediaWiki-commits] [Gerrit] Cache the "modified hash" for the SitesModule - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Cache the "modified hash" for the SitesModule
..

Cache the "modified hash" for the SitesModule

Computing it is quite heavy, so cache it for
a couple of minutes (10) in the accelerator
cache.

Bug: T113665
Change-Id: I9510fc2de7abfe7ed459e5b0e9f07c05e4ef4389
---
M lib/includes/modules/SitesModule.php
M lib/includes/modules/SitesModuleWorker.php
M lib/tests/phpunit/SitesModuleWorkerTest.php
3 files changed, 59 insertions(+), 10 deletions(-)


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

diff --git a/lib/includes/modules/SitesModule.php 
b/lib/includes/modules/SitesModule.php
index 61c8a09..69d3e99 100644
--- a/lib/includes/modules/SitesModule.php
+++ b/lib/includes/modules/SitesModule.php
@@ -26,7 +26,8 @@
public function __construct() {
$this->worker = new SitesModuleWorker(
Settings::singleton(),
-   SiteSQLStore::newInstance()
+   SiteSQLStore::newInstance(),
+   wfGetCache( CACHE_ACCEL )
);
}
 
diff --git a/lib/includes/modules/SitesModuleWorker.php 
b/lib/includes/modules/SitesModuleWorker.php
index 1d747b0..f343613 100644
--- a/lib/includes/modules/SitesModuleWorker.php
+++ b/lib/includes/modules/SitesModuleWorker.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Lib;
 
+use BagOStuff;
 use MediaWikiSite;
 use Site;
 use SiteList;
@@ -32,12 +33,19 @@
private $siteStore;
 
/**
+* @var BagOStuff
+*/
+   private $cache;
+
+   /**
 * @param SettingsArray $settings
 * @param SiteStore $siteStore
+* @param BagOStuff $cache
 */
-   public function __construct( SettingsArray $settings, SiteStore 
$siteStore ) {
+   public function __construct( SettingsArray $settings, SiteStore 
$siteStore, BagOStuff $cache ) {
$this->settings = $settings;
$this->siteStore = $siteStore;
+   $this->cache = $cache;
}
 
/**
@@ -170,18 +178,37 @@
}
 
/**
+* @return string
+*/
+   private function computeModifiedHash() {
+   $data = array(
+   $this->getSiteLinkGroups(),
+   $this->getSpecialSiteLinkGroups(),
+   $this->getSitesHash()
+   );
+
+   return sha1( json_encode( $data ) );
+   }
+
+   /**
+* This returns a hash which should change whenever either a relevant 
setting
+* or the list of sites changes. Because computing this list is quite 
heavy and
+* it barely changes, cache that hash for a short bit.
+*
 * @see ResourceLoaderModule::getModifiedHash
 *
 * @return string
 */
public function getModifiedHash() {
-   $data = array(
-   $this->getSiteLinkGroups(),
-   $this->getSpecialSiteLinkGroups(),
-   $this->getSitesHash()
-   );
+   $cacheKey = wfMemcKey( 'wikibase-sites-module-modified-hash' );
+   $hash = $this->cache->get( $cacheKey );
 
-   return sha1( json_encode( $data ) );
+   if ( $hash === false ) {
+   $hash = $this->computeModifiedHash();
+   $this->cache->set( $cacheKey, $hash, 10 * 60 );
+   }
+
+   return $hash;
}
 
 }
diff --git a/lib/tests/phpunit/SitesModuleWorkerTest.php 
b/lib/tests/phpunit/SitesModuleWorkerTest.php
index 9233dbd..3fff82e 100644
--- a/lib/tests/phpunit/SitesModuleWorkerTest.php
+++ b/lib/tests/phpunit/SitesModuleWorkerTest.php
@@ -2,6 +2,8 @@
 
 namespace Wikibase\Test;
 
+use BagOStuff;
+use HashBagOStuff;
 use MediaWikiSite;
 use PHPUnit_Framework_TestCase;
 use Site;
@@ -27,13 +29,15 @@
 * @param Site[] $sites
 * @param string[] $groups
 * @param string[] $specialGroups
+* @param BagOStuff $cache
 *
 * @return SitesModuleWorker
 */
private function newSitesModuleWorker(
array $sites = array(),
array $groups = array(),
-   array $specialGroups = array()
+   array $specialGroups = array(),
+   BagOStuff $cache = null
) {
$siteStore = $this->getMock( '\SiteStore' );
$siteStore->expects( $this->any() )
@@ -44,7 +48,9 @@
new SettingsArray( array(
'siteLinkGroups' => $groups,
'specialSiteLinkGroups' => $specialGroups
-   ) ), $siteStore
+   ) ),
+   $siteStore,
+

[MediaWiki-commits] [Gerrit] Adds augmented clickthroughs to dashboard + Adds 'user engag... - change (wikimedia...rainbow)

[OliverKeyes (Code Review)]

OliverKeyes has submitted this change and it was merged.

Change subject: Adds augmented clickthroughs to dashboard + Adds 'user 
engagement' KPI summary box + Adds 'user engagement' KPI time series + Adds 
page visit time LD10/25/50/75/90/95/99 time series + Fixes dashboard titles 
(including in browser window)
..


Adds augmented clickthroughs to dashboard
+ Adds 'user engagement' KPI summary box
+ Adds 'user engagement' KPI time series
+ Adds page visit time LD10/25/50/75/90/95/99 time series
+ Fixes dashboard titles (including in browser window)

Bug: T113637
Change-Id: I808213c595925ae7ad3269403637b77483a4116e
---
A assets/content/kpi_augmented_clickthroughs.md
M assets/content/kpis_summary.md
A assets/content/survival.md
M server.R
M ui.R
M utils.R
6 files changed, 263 insertions(+), 160 deletions(-)

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



diff --git a/assets/content/kpi_augmented_clickthroughs.md 
b/assets/content/kpi_augmented_clickthroughs.md
new file mode 100644
index 000..4a52a64
--- /dev/null
+++ b/assets/content/kpi_augmented_clickthroughs.md
@@ -0,0 +1,23 @@
+Key Performance Indicator: User Engagement (Augmented Clickthroughs)
+===
+
+We are in the process of obtaining qualitative data from our users (their 
intent and satisfaction), so this metric is less akin to "user satisfaction" 
and more akin to "user engagement" we observe.
+
+This metric combines the clickthrough rate and the proportion of users' 
session dwell times exceeding the threshold of 10s.
+
+Outages and inaccuracies
+--
+
+* None so far!
+
+Questions, bug reports, and feature suggestions
+--
+For technical, non-bug questions, [email 
Mikhail](mailto:mpo...@wikimedia.org?subject=Dashboard%20Question). If you 
experience a bug or notice something wrong or have a suggestion, [open a ticket 
in 
Phabricator](https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery)
 in the Discovery board or [email 
Dan](mailto:dga...@wikimedia.org?subject=Dashboard%20Question).
+
+
+
+  Link to this dashboard:
+  http://searchdata.wmflabs.org/metrics/#kpi_zero_results;>
+http://searchdata.wmflabs.org/metrics/#kpi_zero_results
+  
+
diff --git a/assets/content/kpis_summary.md b/assets/content/kpis_summary.md
index 40d2ab6..ff55a60 100644
--- a/assets/content/kpis_summary.md
+++ b/assets/content/kpis_summary.md
@@ -1,10 +1,10 @@
 Key Performance Indicators
 ===
 
-* **User-perceived load time** If our search is fast and snappy, then more 
people will use it! 
-* **Zero Results Rate** If a user gets zero results for their query, they’ve 
by definition not found what they’re looking for.
-* **API usage** We want people, both within our movement and outside it, to be 
able to easily access our information.
-* **[User 
Satisfaction](https://meta.wikimedia.org/wiki/Research:Measuring_User_Search_Satisfaction)**
 If a user searches for something and clicks on a result, then they found what 
they wanted.
+- **User-perceived load time** If our search is fast and snappy, then more 
people will use it! 
+- **Zero Results Rate** If a user gets zero results for their query, they’ve 
by definition not found what they’re looking for.
+- **API usage** We want people, both within our movement and outside it, to be 
able to easily access our information.
+- **User Engagement** (not quite **[User 
Satisfaction](https://meta.wikimedia.org/wiki/Research:Measuring_User_Search_Satisfaction)**)
 This is an augmented version of clickthrough rate. In it we are including the 
proportion of users' sessions exceeding a pre-specified threshold. **Note** 
that we deployed v2.0 of the satisfaction schema on 9/2/2015. You may see 
**NA** if we do not have enough data available at the time.
 
 Outages and inaccuracies
 --
diff --git a/assets/content/survival.md b/assets/content/survival.md
new file mode 100644
index 000..cd41a11
--- /dev/null
+++ b/assets/content/survival.md
@@ -0,0 +1,25 @@
+Automated survival analysis: page visit times
+===
+
+This shows the length of time that must pass before we lose N% of the test 
population. In general, it appears it takes 15s to lose 10%, 25-35s to lose 
25%, and 55-75s to lose 50%. When the number goes up, we can infer that users 
are staying on the pages longer.
+
+On most days, we retain at least 20% of the test population past the 7 minute 
mark (the point at which the user's browser stops checking in), so on those 
days we cannot calculate the time it takes to lose 90/95/99% of the users.
+
+There are some days when we CAN calculate those times, and it can take 
anywhere between 270s (4m30s) and 390s (6m30s) for 90% of the users to have 
closed the page they clicked through from the search results page.
+
+Outages and inaccuracies
+--
+
+* None so far!
+
+Questions, bug reports, and feature suggestions
+--
+For technical, non-bug questions, [email 

[MediaWiki-commits] [Gerrit] Enable a few more syntax highlighting rules when editing. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Enable a few more syntax highlighting rules when editing.
..

Enable a few more syntax highlighting rules when editing.

Syntax highlighting when editing wikitext in the app has been available
for over a year, but has so far been disabled, in the hopes of coming up
with an entirely transformative editing experience in the app. Since we
haven't created such an experience just yet, presenting the user with
modestly highlighted wikitext is better than a solid wall of unhighlighted
wikitext.

Change-Id: I03065408d8b01d82ff262a65c0b957637fbeaafc
---
M app/src/main/java/org/wikipedia/editing/richtext/SyntaxHighlighter.java
M app/src/main/res/values/colors.xml
2 files changed, 4 insertions(+), 2 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/editing/richtext/SyntaxHighlighter.java 
b/app/src/main/java/org/wikipedia/editing/richtext/SyntaxHighlighter.java
index b64d0e8..a8af86d 100644
--- a/app/src/main/java/org/wikipedia/editing/richtext/SyntaxHighlighter.java
+++ b/app/src/main/java/org/wikipedia/editing/richtext/SyntaxHighlighter.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.Editable;
@@ -54,7 +55,6 @@
 }
 }));
 
-/*
 // internal link:
 syntaxRules.add(new SyntaxRule("[[", "]]", new 
SyntaxRule.SyntaxRuleStyle() {
 @Override
@@ -68,7 +68,7 @@
 syntaxRules.add(new SyntaxRule("[", "]", new 
SyntaxRule.SyntaxRuleStyle() {
 @Override
 public SpanExtents createSpan(int spanStart, SyntaxRule 
syntaxItem) {
-return new 
ColorSpanEx(parentActivity.getResources().getColor(R.color.syntax_highlight_extlink),
+return new 
ColorSpanEx(parentActivity.getResources().getColor(Utils.getThemedAttributeId(parentActivity,
 R.attr.link_color)),
  Color.TRANSPARENT, spanStart, 
syntaxItem);
 }
 }));
@@ -106,6 +106,7 @@
 }
 }));
 
+/*
 // section level 4:
 syntaxRules.add(new SyntaxRule("", "", new 
SyntaxRule.SyntaxRuleStyle() {
 @Override
diff --git a/app/src/main/res/values/colors.xml 
b/app/src/main/res/values/colors.xml
index 21adf77..22fa185 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -90,6 +90,7 @@
 
 #a0a0a0
 #505050
+#484
 
 #80ff
 #ff606060

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

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

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

[MediaWiki-commits] [Gerrit] Add oozie email sending subworkflow wrapper - change (analytics/refinery)

[Nuria (Code Review)]

Nuria has submitted this change and it was merged.

Change subject: Add oozie email sending subworkflow wrapper
..


Add oozie email sending subworkflow wrapper

Bug: T113253

Change-Id: I0ef57ec914c7b13e896ff0836b42f975787984b9
---
A oozie/util/send_error_email/worflow.xml
1 file changed, 77 insertions(+), 0 deletions(-)

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



diff --git a/oozie/util/send_error_email/worflow.xml 
b/oozie/util/send_error_email/worflow.xml
new file mode 100644
index 000..842b433
--- /dev/null
+++ b/oozie/util/send_error_email/worflow.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+parent_name
+
+UNSET
+
+The name of the parent workflow in error.
+
+
+
+
+parent_failed_action
+
+UNSET
+
+The name of the parent action that failed.
+
+
+
+
+to
+
o...@wikimedia.org,j...@wikimedia.org,milimet...@wikimedia.org,madhuvi...@wikimedia.org,mfo...@wikimedia.org
+
+The comma-separated list of email recipients
+
+
+
+
+subject
+Fatal Error - Oozie Job ${parent_name}
+
+The subject of the email
+
+
+
+
+body
+
+The action that raised an error is thought to be 
${parent_failed_action}.
+Please have a look and take necessary action !
+Thanks :)
+-- Oozie
+
+
+The body of the email
+
+
+
+
+
+
+
+
+
+${to}
+${subject}
+${body}
+
+
+
+
+
+
+send_error_email action failed, error 
message[${wf:errorMessage(wf:lastErrorNode())}]
+
+
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ef57ec914c7b13e896ff0836b42f975787984b9
Gerrit-PatchSet: 4
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Joal 
Gerrit-Reviewer: Joal 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] ExtendedSearch: Added hook to PreproccessSearchString - change (mediawiki...BlueSpiceExtensions)

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review.

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

Change subject: ExtendedSearch: Added hook to PreproccessSearchString
..

ExtendedSearch: Added hook to PreproccessSearchString

* Added hook BSExtendedSearchBaseAfterPreprocessSearchInput
* Needs merge to master!

Patch-Set2:

* Added hook to hook.txt

Change-Id: If0489b6f1e8d4b49861d63053a85d75d869f7404
---
M ExtendedSearch/doc/Hooks.txt
M ExtendedSearch/includes/ExtendedSearchBase.class.php
2 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/ExtendedSearch/doc/Hooks.txt b/ExtendedSearch/doc/Hooks.txt
index a6aee58..b377342 100644
--- a/ExtendedSearch/doc/Hooks.txt
+++ b/ExtendedSearch/doc/Hooks.txt
@@ -24,6 +24,8 @@
  &$iID:
  $bTitleExists:
 
+'BSExtendedSearchBaseAfterPreprocessSearchInput':
+&$sSearchString
 
 ==BuildIndexMainControl.class==
 'BS:ExtendedSearch:AddDocumentLog':
diff --git a/ExtendedSearch/includes/ExtendedSearchBase.class.php 
b/ExtendedSearch/includes/ExtendedSearchBase.class.php
index 80e778e..7cde3ce 100644
--- a/ExtendedSearch/includes/ExtendedSearchBase.class.php
+++ b/ExtendedSearch/includes/ExtendedSearchBase.class.php
@@ -371,6 +371,11 @@
$sSearchString
);
$sSearchString = trim( $sSearchString );
+
+   wfRunHooks( 'BSExtendedSearchBaseAfterPreprocessSearchInput', 
array(
+   &$sSearchString
+   ));
+
wfProfileOut( 'BS::'.__METHOD__ );
 
return $sSearchString;

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

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

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

[MediaWiki-commits] [Gerrit] mw.widgets.DateInputWidget: Actually display the indicator - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: mw.widgets.DateInputWidget: Actually display the indicator
..


mw.widgets.DateInputWidget: Actually display the indicator

We were only passing stuff around...

Change-Id: I0d494cffae0c26a6b04ffe102e9e9d6f3c5f5c81
---
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
2 files changed, 43 insertions(+), 11 deletions(-)

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



diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index 3a018ce..9231fcc 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
@@ -57,6 +57,7 @@
 *
 * @class
 * @extends OO.ui.InputWidget
+* @mixins OO.ui.mixin.IndicatorElement
 *
 * @constructor
 * @param {Object} [config] Configuration options
@@ -104,7 +105,8 @@
}
 
// Properties (must be set before parent constructor, which 
calls #setValue)
-   this.handle = new OO.ui.LabelWidget();
+   this.$handle = $( '' );
+   this.label = new OO.ui.LabelWidget();
this.textInput = new OO.ui.TextInputWidget( {
required: config.required,
placeholder: placeholder,
@@ -141,6 +143,9 @@
// Parent constructor
mw.widgets.DateInputWidget.parent.call( this, config );
 
+   // Mixin constructors
+   OO.ui.mixin.IndicatorElement.call( this, config );
+
// Events
this.calendar.connect( this, {
change: 'onCalendarChange'
@@ -155,21 +160,22 @@
this.calendar.$element.on( {
keypress: this.onCalendarKeyPress.bind( this )
} );
-   this.handle.$element.on( {
+   this.$handle.on( {
click: this.onClick.bind( this ),
keypress: this.onKeyPress.bind( this )
} );
 
// Initialization
// Move 'tabindex' from this.$input (which is invisible) to the 
visible handle
-   this.setTabIndexedElement( this.handle.$element );
-   this.handle.$element
+   this.setTabIndexedElement( this.$handle );
+   this.$handle
+   .append( this.label.$element, this.$indicator )
.addClass( 'mw-widget-dateInputWidget-handle' );
this.calendar.$element
.addClass( 'mw-widget-dateInputWidget-calendar' );
this.$element
.addClass( 'mw-widget-dateInputWidget' )
-   .append( this.handle.$element, this.textInput.$element, 
this.calendar.$element );
+   .append( this.$handle, this.textInput.$element, 
this.calendar.$element );
 
if ( config.$overlay ) {
this.calendar.setFloatableContainer( this.$element );
@@ -212,6 +218,7 @@
/* Inheritance */
 
OO.inheritClass( mw.widgets.DateInputWidget, OO.ui.InputWidget );
+   OO.mixinClass( mw.widgets.DateInputWidget, OO.ui.mixin.IndicatorElement 
);
 
/* Methods */
 
@@ -337,7 +344,7 @@
if ( this.getValue() === '' ) {
this.textInput.setValue( '' );
this.calendar.setDate( null );
-   this.handle.setLabel( mw.msg( 
'mw-widgets-dateinput-no-date' ) );
+   this.label.setLabel( mw.msg( 
'mw-widgets-dateinput-no-date' ) );
this.$element.addClass( 
'mw-widget-dateInputWidget-empty' );
} else {
if ( !this.inTextInput ) {
@@ -346,7 +353,7 @@
if ( !this.inCalendar ) {
this.calendar.setDate( this.getValue() );
}
-   this.handle.setLabel( this.getMoment().format( 
this.getDisplayFormat() ) );
+   this.label.setLabel( this.getMoment().format( 
this.getDisplayFormat() ) );
this.$element.removeClass( 
'mw-widget-dateInputWidget-empty' );
}
};
@@ -358,7 +365,7 @@
 */
mw.widgets.DateInputWidget.prototype.deactivate = function () {
this.$element.removeClass( 'mw-widget-dateInputWidget-active' );
-   this.handle.toggle( true );
+   this.$handle.show();
this.textInput.toggle( false );

[MediaWiki-commits] [Gerrit] ExtendedSearch: Added hook to PreproccessSearchString - change (mediawiki...BlueSpiceExtensions)

[jenkins-bot (Code Review)]

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

Change subject: ExtendedSearch: Added hook to PreproccessSearchString
..


ExtendedSearch: Added hook to PreproccessSearchString

* Added hook BSExtendedSearchBaseAfterPreprocessSearchInput
* Needs merge to master!

Patch-Set2:

* Added hook to hook.txt

Change-Id: If0489b6f1e8d4b49861d63053a85d75d869f7404
---
M ExtendedSearch/doc/Hooks.txt
M ExtendedSearch/includes/ExtendedSearchBase.class.php
2 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/ExtendedSearch/doc/Hooks.txt b/ExtendedSearch/doc/Hooks.txt
index a6aee58..b377342 100644
--- a/ExtendedSearch/doc/Hooks.txt
+++ b/ExtendedSearch/doc/Hooks.txt
@@ -24,6 +24,8 @@
  &$iID:
  $bTitleExists:
 
+'BSExtendedSearchBaseAfterPreprocessSearchInput':
+&$sSearchString
 
 ==BuildIndexMainControl.class==
 'BS:ExtendedSearch:AddDocumentLog':
diff --git a/ExtendedSearch/includes/ExtendedSearchBase.class.php 
b/ExtendedSearch/includes/ExtendedSearchBase.class.php
index 80e778e..7cde3ce 100644
--- a/ExtendedSearch/includes/ExtendedSearchBase.class.php
+++ b/ExtendedSearch/includes/ExtendedSearchBase.class.php
@@ -371,6 +371,11 @@
$sSearchString
);
$sSearchString = trim( $sSearchString );
+
+   wfRunHooks( 'BSExtendedSearchBaseAfterPreprocessSearchInput', 
array(
+   &$sSearchString
+   ));
+
wfProfileOut( 'BS::'.__METHOD__ );
 
return $sSearchString;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0489b6f1e8d4b49861d63053a85d75d869f7404
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Tweichart 
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 batching from EntityStore - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Remove unused batching from EntityStore
..


Remove unused batching from EntityStore

Change-Id: Ie71052c244889d7f12c370afea39fbb4a3164e8f
---
M view/resources/wikibase/store/store.ApiEntityStore.js
M view/resources/wikibase/store/store.CachingEntityStore.js
M view/resources/wikibase/store/store.CombiningEntityStore.js
M view/resources/wikibase/store/store.EntityStore.js
M view/tests/qunit/wikibase/store/store.CachingEntityStore.tests.js
5 files changed, 38 insertions(+), 210 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/view/resources/wikibase/store/store.ApiEntityStore.js 
b/view/resources/wikibase/store/store.ApiEntityStore.js
index 2327f90..eec0b7d 100644
--- a/view/resources/wikibase/store/store.ApiEntityStore.js
+++ b/view/resources/wikibase/store/store.ApiEntityStore.js
@@ -43,47 +43,32 @@
_repoApi: null,
 
/**
-* @see wikibase.store.EntityStore.getMultipleRaw
+* @see wikibase.store.EntityStore.get
 */
-   getMultipleRaw: function( entityIds ) {
-   var deferreds = $.map( entityIds, function() { return 
$.Deferred(); } ),
-   self = this,
-   entityIdToIndex = {};
+   get: function( entityId ) {
+   var deferred = $.Deferred(),
+   self = this;
 
-   $.each( entityIds, function( i, entityId ) {
-   entityIdToIndex[ entityId ] = i;
-   } );
-
-   this._repoApi.getEntities( entityIds, null, 
this._languages )
+   this._repoApi.getEntities( [ entityId ], null, 
this._languages )
.done( function( result ) {
-   $.each( result.entities, function( id, 
entityData ) {
-   // return entities not found (e.g. 
deleted) as null, and allow
-   // valueViewBuilder to select 
appropriate expert for such case.
-   var entity = null,
-   entityId = id;
+   var entityData = result.entities[ entityId ];
+   var entity = null;
 
-   if( entityData.missing !== '' ) {
-   entity = 
self._fetchedEntityUnserializer.deserialize( {
-   title: entityData.title,
-   content: entityData
-   } );
+   if( entityData.missing !== '' ) {
+   entity = 
self._fetchedEntityUnserializer.deserialize( {
+   title: entityData.title,
+   content: entityData
+   } );
+   }
 
-   entityId = 
entity.getContent().getId();
-   }
-
-   deferreds[ entityIdToIndex[ entityId ] 
].resolve( entity );
-   } );
+   deferred.resolve( entity );
} )
// FIXME: Evaluate failing promise
.fail( function() {
-   $.each( entityIds, function( i, entityId ) {
-   deferreds[ entityIdToIndex[ entityId ] 
].reject();
-   } );
+   deferred.reject();
} );
 
-   return $.map( deferreds, function( deferred ) {
-   return deferred.promise();
-   } );
+   return deferred.promise();
}
} );
 }( wikibase, jQuery ) );
diff --git a/view/resources/wikibase/store/store.CachingEntityStore.js 
b/view/resources/wikibase/store/store.CachingEntityStore.js
index ae99441..8eeb002 100644
--- a/view/resources/wikibase/store/store.CachingEntityStore.js
+++ b/view/resources/wikibase/store/store.CachingEntityStore.js
@@ -35,33 +35,13 @@
_store: null,
 
/**
-* @see wikibase.store.EntityStore.getMultipleRaw
+* @see wikibase.store.EntityStore.get
 */
-   getMultipleRaw: function( entityIds ) {
-   var deferreds = [],
-   self = this,
- 

[MediaWiki-commits] [Gerrit] mw.widgets.TitleOptionWidget: Prevent page navigation by cli... - change (mediawiki/core)

[Code Review]

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

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

Change subject: mw.widgets.TitleOptionWidget: Prevent page navigation by 
clicking labels
..

mw.widgets.TitleOptionWidget: Prevent page navigation by clicking labels

However, allow opening the link in a new tab.

The same code is used in other components, e.g. jquery.suggestions.

Follow-up to ba358947bfb81b58d64489063bd4be816d1a46da.

Change-Id: Ie6840a20c1cc1a10fb1fb74717982dbe7e331d36
---
M resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
index 138715a..9b0b270 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js
@@ -51,6 +51,14 @@
this.$label.attr( 'href', config.url );
this.$element.addClass( 'mw-widget-titleOptionWidget' );
 
+   // Allow opening the link in new tab, but not regular 
navigation.
+   this.$label.on( 'click', function ( e ) {
+   // Do not interfere with non-left clicks or if modifier 
keys are pressed (e.g. ctrl-click).
+   if ( !( e.which !== 1 || e.altKey || e.ctrlKey || 
e.shiftKey || e.metaKey ) ) {
+   e.preventDefault();
+   }
+   } );
+
// Highlight matching parts of link suggestion
this.$label.autoEllipsis( { hasSpan: false, tooltip: true, 
matchText: config.query } );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6840a20c1cc1a10fb1fb74717982dbe7e331d36
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] Follow-up If556afa10: Fix typo: nodeType -> nodeName - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Follow-up If556afa10: Fix typo: nodeType -> nodeName
..

Follow-up If556afa10: Fix typo: nodeType -> nodeName

Change-Id: I19915647981787f7bbf2c86fc7bd02308d5da218
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 5bd3a0b..feb6c54 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -153,7 +153,7 @@
contentNodes = $.parseHTML( data.content );
 
// Inline nodes may come back in a wrapper paragraph; in that case, 
unwrap it
-   if ( contentNodes.length === 1 && contentNodes[ 0 ].nodeType === 'P' ) {
+   if ( contentNodes.length === 1 && contentNodes[ 0 ].nodeName === 'P' ) {
contentNodes = Array.prototype.slice.apply( contentNodes[ 0 
].childNodes );
}
deferred.resolve( contentNodes );

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Rsync: Unquote booleans" - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Revert "Rsync:  Unquote booleans"
..


Revert "Rsync:  Unquote booleans"

I got carried away and unquoted 'no' and 'yes' as well, which turns out to be 
harmless but not really appropriate.

This reverts commit 49f949e85dfe6bc330810f07552e9c81619dc24a.

Change-Id: I87b04f8d0f2212b0b76ac6549b1bff6ffc1a8b23
---
M manifests/misc/udp2log.pp
M manifests/role/analytics.pp
M manifests/role/analytics/kafka.pp
M manifests/role/ci.pp
M manifests/role/eventlogging.pp
M manifests/role/labsnfs.pp
M manifests/role/lists.pp
M modules/archiva/manifests/gitfat.pp
M modules/dataset/manifests/rsync/default.pp
M modules/openstack/manifests/nova/compute.pp
M modules/rsync/manifests/server/module.pp
M modules/rsync/spec/defines/server_module_spec.rb
M modules/scap/manifests/master.pp
M modules/scap/manifests/proxy.pp
M modules/statistics/manifests/rsyncd.pp
M modules/swift/manifests/storage.pp
16 files changed, 37 insertions(+), 37 deletions(-)

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



diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index c0b1bd8..0917e7e 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -84,7 +84,7 @@
 rsync::server::module { 'udp2log':
 comment => 'udp2log log files',
 path=> $path,
-read_only   => yes,
+read_only   => 'yes',
 hosts_allow => $hosts_allow;
 }
 
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 2e0708a..b6270bd 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -99,8 +99,8 @@
 # be present and mounted at /mnt/hdfs
 rsync::server::module { 'hdfs-archive':
 path=> "${::cdh::hadoop::mount::mount_point}/wmf/data/archive",
-read_only   => yes,
-list=> yes,
+read_only   => 'yes',
+list=> 'yes',
 hosts_allow => $hosts_allow,
 require => Class['cdh::hadoop::mount'],
 }
diff --git a/manifests/role/analytics/kafka.pp 
b/manifests/role/analytics/kafka.pp
index f5ac848..fa7bcd1 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -216,7 +216,7 @@
 description  => 'Kafka Broker Server',
 nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -C 
java -a "kafka.Kafka /etc/kafka/server.properties"',
 require  => Class['::kafka::server'],
-critical => true,
+critical => 'true',
 }
 
 # Generate icinga alert if this jmxtrans instance is not running.
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 8be5f30..6a8b6f1 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -470,7 +470,7 @@
 
 rsync::server::module { 'doc':
 path  => '/srv/doc',
-read_only => no,
+read_only => 'no',
 require   => [
 File['/srv/doc'],
 Class['role::labs::lvm::srv'],
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 8140a95..ed25784 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -250,8 +250,8 @@
 
 rsync::server::module { 'eventlogging':
 path=> $log_dir,
-read_only   => yes,
-list=> yes,
+read_only   => 'yes',
+list=> 'yes',
 require => File[$log_dir],
 hosts_allow => $backup_destinations,
 }
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 2a02f92..76d3a3b 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -19,7 +19,7 @@
 
 rsync::server::module { 'pagecounts':
 path=> '/srv/dumps/pagecounts',
-read_only   => no,
+read_only   => 'no',
 hosts_allow => $dump_servers_ips,
 }
 
@@ -30,7 +30,7 @@
 $statistics_servers = hiera('statistics_servers')
 rsync::server::module { 'statistics':
 path=> '/srv/statistics',
-read_only   => no,
+read_only   => 'no',
 hosts_allow => $statistics_servers,
 require => File['/srv/statistics']
 }
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 7da5c7c..c2a728e 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -181,31 +181,31 @@
 
 rsync::server::module { 'lists':
 path=> '/var/lib/mailman/lists',
-read_only   => no,
+read_only   => 'no',
 hosts_allow => '208.80.154.61',
 }
 
 rsync::server::module { 'archives':
 path=> '/var/lib/mailman/archives',
-read_only   => no,
+read_only   => 'no',
 hosts_allow => '208.80.154.61',
 }
 
 rsync::server::module { 'data':
 path  

[MediaWiki-commits] [Gerrit] Turn mmv-next/mmv-prev into OO events - change (mediawiki...MultimediaViewer)

[jenkins-bot (Code Review)]

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

Change subject: Turn mmv-next/mmv-prev into OO events
..


Turn mmv-next/mmv-prev into OO events

More of those events sent to the document can be converted, but it's a start...

Bug: T77253
Change-Id: I6100ce303346ab9fa94332e91f5d730dc83f4e65
---
M resources/mmv/mmv.js
M resources/mmv/mmv.lightboxinterface.js
M resources/mmv/ui/mmv.ui.canvasButtons.js
M resources/mmv/ui/mmv.ui.js
M tests/qunit/mmv/mmv.lightboxinterface.test.js
M tests/qunit/mmv/mmv.test.js
M tests/qunit/mmv/ui/mmv.ui.canvasButtons.test.js
7 files changed, 43 insertions(+), 39 deletions(-)

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



diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index 55b4525..08624cd 100644
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -944,12 +944,13 @@
MMVP.setupEventHandlers = function () {
var viewer = this;
 
+   this.ui.connect( this, {
+   'next': 'nextImage',
+   'prev': 'prevImage'
+   } );
+
$( document ).on( 'mmv-close.mmvp', function () {
viewer.close();
-   } ).on( 'mmv-next.mmvp', function () {
-   viewer.nextImage();
-   } ).on( 'mmv-prev.mmvp', function () {
-   viewer.prevImage();
} ).on( 'mmv-resize-end.mmvp', function () {
viewer.resize( viewer.ui );
} ).on( 'mmv-request-thumbnail.mmvp', function ( e, size ) {
@@ -969,7 +970,9 @@
* Unregisters all event handlers. Currently only used in tests.
*/
MMVP.cleanupEventHandlers = function () {
-   $( document ).off( 'mmv-close.mmvp mmv-next.mmvp mmv-prev.mmvp 
mmv-resize-end.mmvp' );
+   $( document ).off( 'mmv-close.mmvp mmv-resize-end.mmvp' );
+
+   this.ui.disconnect( this );
};
 
/**
diff --git a/resources/mmv/mmv.lightboxinterface.js 
b/resources/mmv/mmv.lightboxinterface.js
index 0fa0527..18b0474 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -193,6 +193,11 @@
this.handleEvent( 'mmv-faded-out', function ( e ) { 
ui.fadedOut( e ); } );
this.handleEvent( 'mmv-fade-stopped', function ( e ) { 
ui.fadeStopped( e ); } );
 
+   this.buttons.connect( this, {
+   'next': [ 'emit', 'next' ],
+   'prev': [ 'emit', 'prev' ]
+   } );
+
$parent = $( parentId || document.body );
 
// Clean up fullscreen data because hard-existing fullscreen 
might have left
@@ -407,10 +412,11 @@
}
 
if ( forward ) {
-   $( document ).trigger( $.Event( 
'mmv-next' ) );
+   this.emit( 'next' );
} else {
-   $( document ).trigger( $.Event( 
'mmv-prev' ) );
+   this.emit( 'prev' );
}
+
e.preventDefault();
break;
}
diff --git a/resources/mmv/ui/mmv.ui.canvasButtons.js 
b/resources/mmv/ui/mmv.ui.canvasButtons.js
index e691c31..6e2e248 100644
--- a/resources/mmv/ui/mmv.ui.canvasButtons.js
+++ b/resources/mmv/ui/mmv.ui.canvasButtons.js
@@ -94,11 +94,11 @@
} );
 
this.$next.click( function () {
-   $container.trigger( $.Event( 'mmv-next' ) );
+   buttons.emit( 'next' );
} );
 
this.$prev.click( function () {
-   $container.trigger( $.Event( 'mmv-prev' ) );
+   buttons.emit( 'prev' );
} );
}
oo.inheritClass( CanvasButtons, mw.mmv.ui.Element );
diff --git a/resources/mmv/ui/mmv.ui.js b/resources/mmv/ui/mmv.ui.js
index 8543706..9071dfa 100644
--- a/resources/mmv/ui/mmv.ui.js
+++ b/resources/mmv/ui/mmv.ui.js
@@ -15,7 +15,7 @@
  * along with MultimediaViewer.  If not, see .
  */
 
-( function ( mw, $ ) {
+( function ( mw, $, oo ) {
var EP,
cachedRTL;
 
@@ -27,6 +27,8 @@
 * @param {jQuery} $container
 */
function Element( $container ) {
+   oo.EventEmitter.call( this );
+
/** @property {jQuery} $container The element that contains the 
UI element. */
this.$container = $container;
 
@@ -46,6 +48,9 @@
 */
this.timers = {};
}
+
+   oo.mixinClass( Element, oo.EventEmitter );
+
EP = Element.prototype;
 
/**
@@ -244,4 +249,4 @@

[MediaWiki-commits] [Gerrit] Only run one phpunit composer job variant for core - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Only run one phpunit composer job variant for core
..


Only run one phpunit composer job variant for core

The hhvm variant is faster. One of them should be sufficient to catch
regressions in comparison to the job variant that uses mediawiki/vendor instead
of composer.

Change-Id: Ie6e9990e406e6c51677f1e0246b55e2497a4ab20
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9ecdcb2..d034e6a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2078,7 +2078,6 @@
   - mediawiki-phpunit-hhvm
   - mediawiki-phpunit-hhvm-composer
   - mediawiki-phpunit-zend
-  - mediawiki-phpunit-zend-composer
   - mediawiki-core-qunit
   - mediawiki-core-bundle-rubocop
   - mediawiki-core-ruby1.9.3lint
@@ -2094,6 +2093,11 @@
   #   test_release_mediawiki_non_wmf_version_tags
   #
   #- mediawiki-core-release
+experimental:
+  # not in the test pipeline and only in gate-and-submit for performance 
reasons, is listed here to be able to manually trigger it
+  - mediawiki-phpunit-hhvm-composer
+  # will replace mediawiki-phpunit-zend for branches not using vendor, 
currently not used as the composer part is covered by the hhvm variant
+  - mediawiki-phpunit-zend-composer
 
   - name: mediawiki/vendor
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Add tests - change (mediawiki...AdvancedMeta)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Add tests
..

Add tests

Fix all issues so tests pass.

Change-Id: I138ff72cd24099c82c13e252254047cfd3685651
---
A .gitignore
A AdvancedMeta.class.php
D AdvancedMeta.i18n.php
M AdvancedMeta.php
A Gruntfile.js
A composer.json
A package.json
A phpcs.xml
8 files changed, 461 insertions(+), 420 deletions(-)


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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..854a2d2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*~
+*.kate-swp
+.*.swp
+node_modules/
+/composer.lock
+/vendor/
diff --git a/AdvancedMeta.class.php b/AdvancedMeta.class.php
new file mode 100644
index 000..c7408fc
--- /dev/null
+++ b/AdvancedMeta.class.php
@@ -0,0 +1,388 @@
+indexedPages = $indexedPages;
+   }
+
+   /**
+* Specify keywords that should be added to every page.
+* @param $keywords The keywords in an array.
+*/
+   public function setGlobalKeywords( $keywords ) {
+   $this->globalKeywords = $keywords;
+   }
+
+   /**
+* SEO can be a delicate issue. Define here who is allowed to edit the 
meta tags
+* allow users individually, by username. Warning: Case sensitive!
+*/
+   public function setAllowedUsers( $users ) {
+   $this->allowedUsers = $users;
+   }
+
+   /**
+* allow users by mediawiki's own usergroups
+* or the special groups 'loggedin' and 'all' ('all' allowing even 
anonymous edits)
+*/
+   public function setAllowedUsergroups( $usergroups ) {
+   $this->allowedUsergroups = $usergroups;
+   }
+
+   /**
+* Hook 1: in /includes/parser/Parser.php
+* Loops through the different sections of the page being parsed
+* and adds html for the meta input forms into the article edit pages
+*
+* @param object $parser The parser object
+* @param string $text
+*
+* @global indexedpages defined in the global config section above
+* @global alloweusers defined in the global config section above
+*
+* @return true
+*
+*/
+   public function onParserBeforeTidy( &$parser, &$text ) {
+
+   global $wgUser, $wgRequest;
+
+   $title = $parser->getTitle();
+
+   // only run this hook for edit forms
+   if ( !$wgRequest->getVal( 'action' ) == ( 'edit' || 'submit' ) 
) return false;
+
+   // can this user edit meta for this page?
+   if ( !$this->canEditMeta() ) return false;
+
+   // handle submit (preview)
+   if ( $wgRequest->wasPosted() ) {
+   // it's probably a preview, so show the newly submitted 
meta too, otherwise we'll lose 'em
+   $meta = array(
+   'rindex' => ( isset( $_POST['wpIndex'] ) ) ? 
'1' : '0',
+   'rfollow' => ( isset( $_POST['wpFollow'] ) ) ? 
'1' : '0',
+   'titlealias' => $_POST['wpTitleAlias'],
+   'keywords' => $_POST['wpKeywords'],
+   'description' => $_POST['wpDescription']
+   );
+   } else {
+   // else just get the meta from the db
+   $meta = $this->getMetaByArticleID( 
$title->getArticleID() );
+
+   // no meta or creating a new article? make default 
values
+   if ( empty( $meta ) || $title->getArticleID() == '0' ) {
+   $meta = array(
+   'rindex' => '1',
+   'rfollow' => '1',
+   'titlealias' => '',
+   'keywords' => '',
+   'description' => ''
+   );
+   }
+   }
+
+   // prepare checkboxes
+   $checkindex = ( $meta['rindex'] == '1' ) ? 'checked="checked"' 
: '';
+   $checkfollow = ( $meta['rfollow'] == '1' ) ? 
'checked="checked"' : '';
+
+   // some mediawiki preference variables
+   $cols = $wgUser->getIntOption( 'cols' );
+   $ew = $wgUser->getOption( 'editwidth' );
+
+   $addedkeywords = wfMsg( 'globalkeywords' ) == 
'globalkeywords' ?
+   '(none)' :
+   wfMsg( 'globalkeywords' );
+
+   // define replacements
+   $replaceFrom[] = '';
+
+   // @codingStandardsIgnoreStart Ignore long lines
+   $replaceWith[] =
+   '' . wfMsg( 

[MediaWiki-commits] [Gerrit] dataset: Remove needless quotes around a 'true' - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: dataset: Remove needless quotes around a 'true'
..

dataset: Remove needless quotes around a 'true'

A regular old boolean will suit us fine, and the check
in the template as written is broken for a quoted
boolean anyway.

Bug: T113783
Change-Id: I768686f22dd512feafbac0b4de8d18e8064d004a
---
M modules/dataset/manifests/rsync/default.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/242171/1

diff --git a/modules/dataset/manifests/rsync/default.pp 
b/modules/dataset/manifests/rsync/default.pp
index 5c8d7d1..f0d21cc 100644
--- a/modules/dataset/manifests/rsync/default.pp
+++ b/modules/dataset/manifests/rsync/default.pp
@@ -1,5 +1,5 @@
 class dataset::rsync::default(
-$rsync_enable  = 'true', # this is a string used in a template
+$rsync_enable  = true,
 $public= true,
 $rsync_opts= '--bwlimit=5',
 $rsync_config_file = undef

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

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

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

[MediaWiki-commits] [Gerrit] Prepare YearMonthTimeParser to get rid of MediaWiki core dep... - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Prepare YearMonthTimeParser to get rid of MediaWiki core 
dependency
..


Prepare YearMonthTimeParser to get rid of MediaWiki core dependency

This is pure refactoring. The goal is to make this parser independent
from MediaWiki core. Note that this is only a first step. Please review
and merge this as it is. More will be done in later patches.

This patch is motivated by https://github.com/DataValues/Time/pull/93
where I do the same to the YearMonthDayTimeParser. Both should use the
same array( localized month names => numbers ) in the end. This array
will be constructed in the TimeParserFactory (that's the reason for the
@see).

Change-Id: I2e35005a557180ff955678cfc0ed0e3d8a3e13b8
---
M repo/includes/Parsers/YearMonthTimeParser.php
1 file changed, 28 insertions(+), 13 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  Addshore: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/repo/includes/Parsers/YearMonthTimeParser.php 
b/repo/includes/Parsers/YearMonthTimeParser.php
index 9d41570..411cd04 100644
--- a/repo/includes/Parsers/YearMonthTimeParser.php
+++ b/repo/includes/Parsers/YearMonthTimeParser.php
@@ -16,6 +16,7 @@
  *
  * @licence GNU GPL v2+
  * @author Adam Shorland
+ * @author Thiemo Mättig
  *
  * @todo move me to DataValues-time
  * @todo match BCE dates in here
@@ -25,9 +26,9 @@
const FORMAT_NAME = 'yearmonth';
 
/**
-* @var Language
+* @var int[]
 */
-   private $lang;
+   private $monthNameUnlocalizations;
 
/**
 * @var ValueParser
@@ -40,11 +41,32 @@
public function __construct( ParserOptions $options = null ) {
parent::__construct( $options );
 
-   $this->lang = Language::factory( $this->getOption( 
ValueParser::OPT_LANG ) );
+   $languageCode = $this->getOption( ValueParser::OPT_LANG );
+   $this->monthNameUnlocalizations = 
$this->getMonthNameUnlocalizations( $languageCode );
$this->isoTimestampParser = new IsoTimestampParser(
new CalendarModelParser( $this->options ),
$this->options
);
+   }
+
+   /**
+* @see TimeParserFactory::getMwMonthNameReplacements
+*
+* @param string $languageCode
+*
+* @return int[]
+*/
+   private function getMonthNameUnlocalizations( $languageCode ) {
+   $language = Language::factory( $languageCode );
+
+   $replacements = array();
+
+   for ( $i = 1; $i <= 12; $i++ ) {
+   $replacements[$language->getMonthName( $i )] = $i;
+   $replacements[$language->getMonthAbbreviation( $i )] = 
$i;
+   }
+
+   return $replacements;
}
 
/**
@@ -118,20 +140,13 @@
 * Check for both the full name and abbreviations
 *
 * @param string|int $year
-* @param string|int $month
+* @param string $month
 *
 * @return TimeValue|bool
 */
private function parseYearMonth( $year, $month ) {
-   $names = $this->lang->getMonthNamesArray();
-   for ( $i = 1; $i <= 12; $i++ ) {
-   if ( strcasecmp( $names[$i], $month ) === 0 ) {
-   return $this->getTimeFromYearMonth( $year, $i );
-   }
-   }
-   $nameAbbrevs = $this->lang->getMonthAbbreviationsArray();
-   for ( $i = 1; $i <= 12; $i++ ) {
-   if ( strcasecmp( $nameAbbrevs[$i], $month ) === 0 ) {
+   foreach ( $this->monthNameUnlocalizations as $monthName => $i ) 
{
+   if ( strcasecmp( $monthName, $month ) === 0 ) {
return $this->getTimeFromYearMonth( $year, $i );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e35005a557180ff955678cfc0ed0e3d8a3e13b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hoo man 
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 bugfixes / tweaks - change (operations...debdeploy)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Various bugfixes / tweaks
..


Various bugfixes / tweaks

Move generation of spec files to a separate command installed in /usr/bin
Fix syntax of generated YAML files
Fix parsing of dpkg status file for binNMUed packages

Change-Id: Id0ae40db09abd6c926d31a58beb03bf0f0604a30
---
M debian/changelog
M debian/debdeploy-master.dirs
M debian/debdeploy-master.install
M docs/TODO
M docs/readme.txt
M master/debdeploy
A master/generate-debdeploy-spec
M minion/debdeploy-minion.py
8 files changed, 116 insertions(+), 91 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 5a89dd7..13e09c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debdeploy (0.0.8-1) jessie-wikimedia; urgency=medium
+
+  * Move generation of spec files to a separate command installed in /usr/bin
+  * Fix syntax of generated YAML files
+  * Fix parsing of dpkg status file for binNMUed packages
+
+ -- Moritz Muehlenhoff   Fri, 25 Sep 2015 16:52:23 
+0200
+
 debdeploy (0.0.7-1) jessie-wikimedia; urgency=medium
 
   * Improve error handling in case of malformed YAML specs
diff --git a/debian/debdeploy-master.dirs b/debian/debdeploy-master.dirs
index 7c53a23..cae4528 100644
--- a/debian/debdeploy-master.dirs
+++ b/debian/debdeploy-master.dirs
@@ -3,4 +3,5 @@
 /usr/lib/debdeploy/
 /usr/lib/python2.7/dist-packages/
 /usr/sbin/
+/usr/bin/
 
diff --git a/debian/debdeploy-master.install b/debian/debdeploy-master.install
index 064b37e..1783969 100644
--- a/debian/debdeploy-master.install
+++ b/debian/debdeploy-master.install
@@ -2,3 +2,4 @@
 master/debdeploy_updatespec.py /usr/lib/python2.7/dist-packages/
 master/debdeploy_conf.py /usr/lib/python2.7/dist-packages/
 master/debdeploy /usr/sbin
+master/generate-debdeploy-spec /usr/bin
diff --git a/docs/TODO b/docs/TODO
index 95272f6..12c0381 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -4,7 +4,6 @@
 
 Refinements to existing functionality:
 - Bash completion for commands and options
-- Add a command to generate a YAML file interactively
 - Write initiated deployment jobs into a logfile
 - Provide logrotate configs
 
@@ -14,3 +13,5 @@
   and create a WMF-specific IRC notification which updates "server admin log"
 - Make the logging configurable and add a WMF-specific logging method for
   Logstash
+- Implement timed restarts, which restart services not an once, but in
+  steps/with delays
diff --git a/docs/readme.txt b/docs/readme.txt
index 6add055..5ce9269 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -2,10 +2,10 @@
 Summary
 ---
 
-debdeploy is based on salt to reuse it's authentication and transfer
-capabilities. Updates are initiated via the debdeploy tool running
-on the salt master. Servers can be grouped into arbitrary sets of
-servers/services based on Salt grains.
+debdeploy allows the deployment of software updates in Debian (or Debian-based)
+environments on a large scale. It is based on salt; updates are
+initiated via the debdeploy tool running on the salt master. Servers
+can be grouped into arbitrary sets of servers/services based on Salt grains.
 
 Basic setup
 ---
diff --git a/master/debdeploy b/master/debdeploy
index dc8e05f..72cd06c 100755
--- a/master/debdeploy
+++ b/master/debdeploy
@@ -342,86 +342,6 @@
 for i in sorted(members):
 print i
 
-def generate_spec(supported_distros):
-'''
-Interactivey generate an update spec file in the currently directory.
-'''
-
-source = ""
-comment = ""
-updatetype = ""
-fixes = {}
-
-while source == "":
-source = raw_input("Please enter the name of source package (e.g. 
openssl). Leave blank or type 'quit' to abort\n>").strip()
-if source == "" or source == "quit":
-print "Aborting"
-sys.exit(1)
-
-comment = raw_input('You can enter an optional comment, e.g. a reference 
to a security advisory or a CVE ID mapping\n>').strip()
-if comment == "quit":
-print "Aborting"
-sys.exit(1)
-
-while updatetype not in ['tool', 'daemon-direct', 'daemon-disrupt', 
'reboot', 'library', 'quit']:
-print "tool   -> The updated packages is an enduser tool, can 
be"
-print "  rolled-out immediately."
-print "daemon-direct  -> Daemons which are restarted during update, 
but which"
-print "  do no affect existing users."
-print "daemon-disrupt -> Daemons which are restarted during update, 
where the"
-print "  users notice an impact. The update procedure 
is almost"
-print "  identical, but displays additional warnings"
-print "reboot -> Lowlevel component which requires a system 
reboot"
-print "  kernel/glibc/dbus). 

[MediaWiki-commits] [Gerrit] Follow-up If556afa10: Fix typo: nodeType -> nodeName - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Follow-up If556afa10: Fix typo: nodeType -> nodeName
..


Follow-up If556afa10: Fix typo: nodeType -> nodeName

Change-Id: I19915647981787f7bbf2c86fc7bd02308d5da218
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 5bd3a0b..feb6c54 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -153,7 +153,7 @@
contentNodes = $.parseHTML( data.content );
 
// Inline nodes may come back in a wrapper paragraph; in that case, 
unwrap it
-   if ( contentNodes.length === 1 && contentNodes[ 0 ].nodeType === 'P' ) {
+   if ( contentNodes.length === 1 && contentNodes[ 0 ].nodeName === 'P' ) {
contentNodes = Array.prototype.slice.apply( contentNodes[ 0 
].childNodes );
}
deferred.resolve( contentNodes );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19915647981787f7bbf2c86fc7bd02308d5da218
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tchanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: d3d81ca..074f7bc - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: d3d81ca..074f7bc
..

Syncronize VisualEditor: d3d81ca..074f7bc

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


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

diff --git a/VisualEditor b/VisualEditor
index d3d81ca..074f7bc 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit d3d81ca2587b3fa5dd989208fbd6c8b7a2a124d8
+Subproject commit 074f7bcefeb50e6bccf1ec6d6a9ad87112e4de4f

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: d3d81ca..074f7bc - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: d3d81ca..074f7bc
..


Syncronize VisualEditor: d3d81ca..074f7bc

Change-Id: I5a613a1686ea44e44d412973133fb2f7ff442f06
---
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 d3d81ca..074f7bc 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit d3d81ca2587b3fa5dd989208fbd6c8b7a2a124d8
+Subproject commit 074f7bcefeb50e6bccf1ec6d6a9ad87112e4de4f

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a613a1686ea44e44d412973133fb2f7ff442f06
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] Revert "Rsync: Unquote booleans" - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Revert "Rsync:  Unquote booleans"
..

Revert "Rsync:  Unquote booleans"

I got carried away and unquoted 'no' and 'yes' as well, which turns out to be 
harmless but not really appropriate.

This reverts commit 49f949e85dfe6bc330810f07552e9c81619dc24a.

Change-Id: I87b04f8d0f2212b0b76ac6549b1bff6ffc1a8b23
---
M manifests/misc/udp2log.pp
M manifests/role/analytics.pp
M manifests/role/analytics/kafka.pp
M manifests/role/ci.pp
M manifests/role/eventlogging.pp
M manifests/role/labsnfs.pp
M manifests/role/lists.pp
M modules/archiva/manifests/gitfat.pp
M modules/dataset/manifests/rsync/default.pp
M modules/openstack/manifests/nova/compute.pp
M modules/rsync/manifests/server/module.pp
M modules/rsync/spec/defines/server_module_spec.rb
M modules/scap/manifests/master.pp
M modules/scap/manifests/proxy.pp
M modules/statistics/manifests/rsyncd.pp
M modules/swift/manifests/storage.pp
16 files changed, 37 insertions(+), 37 deletions(-)


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

diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index c0b1bd8..0917e7e 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -84,7 +84,7 @@
 rsync::server::module { 'udp2log':
 comment => 'udp2log log files',
 path=> $path,
-read_only   => yes,
+read_only   => 'yes',
 hosts_allow => $hosts_allow;
 }
 
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 2e0708a..b6270bd 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -99,8 +99,8 @@
 # be present and mounted at /mnt/hdfs
 rsync::server::module { 'hdfs-archive':
 path=> "${::cdh::hadoop::mount::mount_point}/wmf/data/archive",
-read_only   => yes,
-list=> yes,
+read_only   => 'yes',
+list=> 'yes',
 hosts_allow => $hosts_allow,
 require => Class['cdh::hadoop::mount'],
 }
diff --git a/manifests/role/analytics/kafka.pp 
b/manifests/role/analytics/kafka.pp
index f5ac848..fa7bcd1 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -216,7 +216,7 @@
 description  => 'Kafka Broker Server',
 nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -C 
java -a "kafka.Kafka /etc/kafka/server.properties"',
 require  => Class['::kafka::server'],
-critical => true,
+critical => 'true',
 }
 
 # Generate icinga alert if this jmxtrans instance is not running.
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 8be5f30..6a8b6f1 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -470,7 +470,7 @@
 
 rsync::server::module { 'doc':
 path  => '/srv/doc',
-read_only => no,
+read_only => 'no',
 require   => [
 File['/srv/doc'],
 Class['role::labs::lvm::srv'],
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 8140a95..ed25784 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -250,8 +250,8 @@
 
 rsync::server::module { 'eventlogging':
 path=> $log_dir,
-read_only   => yes,
-list=> yes,
+read_only   => 'yes',
+list=> 'yes',
 require => File[$log_dir],
 hosts_allow => $backup_destinations,
 }
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
index 2a02f92..76d3a3b 100644
--- a/manifests/role/labsnfs.pp
+++ b/manifests/role/labsnfs.pp
@@ -19,7 +19,7 @@
 
 rsync::server::module { 'pagecounts':
 path=> '/srv/dumps/pagecounts',
-read_only   => no,
+read_only   => 'no',
 hosts_allow => $dump_servers_ips,
 }
 
@@ -30,7 +30,7 @@
 $statistics_servers = hiera('statistics_servers')
 rsync::server::module { 'statistics':
 path=> '/srv/statistics',
-read_only   => no,
+read_only   => 'no',
 hosts_allow => $statistics_servers,
 require => File['/srv/statistics']
 }
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 7da5c7c..c2a728e 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -181,31 +181,31 @@
 
 rsync::server::module { 'lists':
 path=> '/var/lib/mailman/lists',
-read_only   => no,
+read_only   => 'no',
 hosts_allow => '208.80.154.61',
 }
 
 rsync::server::module { 'archives':
 path=> '/var/lib/mailman/archives',
-read_only   => no,
+read_only   => 'no',
 hosts_allow => '208.80.154.61',
 }
 
 

[MediaWiki-commits] [Gerrit] Make default appeal configurable - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Make default appeal configurable
..

Make default appeal configurable

Not hardcoded to Appeal-default

Change-Id: I6d0ea951f8c7d566f85323c40a21a56cb913d418
---
M DonationInterface.php
M gateway_forms/Mustache.php
2 files changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/DonationInterface.php b/DonationInterface.php
index 8115b2b..91991d1 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -145,6 +145,8 @@
  * $appeal and $language will be substituted before transclusion
  */
 $wgDonationInterfaceAppealWikiTemplate = 
'LanguageSwitch|2011FR/$appeal/text|$language';
+// Used as the value for $appeal when nothing is given in query string
+$wgDonationInterfaceDefaultAppeal = 'JimmyQuote';
 
 // Email address used when donor enters nothing
 $wgDonationInterfaceDefaultEmail = 'nob...@wikimedia.org';
diff --git a/gateway_forms/Mustache.php b/gateway_forms/Mustache.php
index b632039..ad5dbad 100644
--- a/gateway_forms/Mustache.php
+++ b/gateway_forms/Mustache.php
@@ -85,7 +85,8 @@
$data['has_no_script_redirect'] = isset( $redirect ); // grr
 
$appealWikiTemplate = $this->gateway->getGlobal( 
'AppealWikiTemplate' );
-   $appeal = $this->make_safe( $request->getText( 'appeal', 
'Appeal-default' ) );
+   $defaultAppeal = $this->gateway->getGlobal( 'DefaultAppeal' );
+   $appeal = $this->make_safe( $request->getText( 'appeal', 
$defaultAppeal ) );
$appealWikiTemplate = str_replace( '$appeal', $appeal, 
$appealWikiTemplate );
$appealWikiTemplate = str_replace( '$language', 
$data['language'], $appealWikiTemplate );
$data['appeal_text'] = $output->parse( '{{' . 
$appealWikiTemplate . '}}' );

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

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

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

[MediaWiki-commits] [Gerrit] adding shell user sbisson - change (operations/puppet)

[RobH (Code Review)]

RobH has uploaded a new change for review.

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

Change subject: adding shell user sbisson
..

adding shell user sbisson

adding new shell user Stephane Bisson (WMF Employee) for bastion and
stat1003 (researcher group) access

T113676

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


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index dc639f6..48fc8c2 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -73,7 +73,7 @@
   joal, thcipriani, daisy, ashwinpp, jhobs, tomasz, lpintscher,
   pcoombe, mholloway-shell, madhuvishy, niedzielski, 
neilpquinn-wmf,
   gpaumier, moushira, aklapper, qchris, tjones, srijan, johnflewis,
-  addshore, jminor, pt1979, asherman, etonkovidova]
+  addshore, jminor, pt1979, asherman, etonkovidova, sbisson]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts
@@ -111,7 +111,7 @@
   mforns, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal,
   daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson, 
niedzielski,
   neilpquinn-wmf, tbayer, moushira, dbrant, maxsem, srijan, 
krenair,
-  jminor, asherman, etonkovidova]
+  jminor, asherman, etonkovidova, sbisson]
   ldap-admins:
 gid: 715
 description: ldap admins
@@ -1625,3 +1625,10 @@
 realname: Elena Tonkovidova
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCqxPSqR8la7MAqz7BC6+1xM4tSKrZObfbh3unfyu4cuPtaj1v6oJ+wm7USqVR8sSVFoqpyq8kVLL6mGgLt+HzCWT5c3fyDrPdRJ89o0EXlkZ02EGkmTDdYzs7VLkvSyKLIqxg1wOdX8s0oYaiCaJ6OiFi/lIjfyOVcnIQ0yB4h3qcpzMXlzjiAsyWBTA/wNCY2pCEjKR3JdW8aYV8tw/ol0eV3F5Q9hZumrd7GwAD6AJMnHlNgUAHTd+g5RllhBsniXOu1ejZWyTka3dWjSyK3JFAyDUmVNZwC+l6XC1bSyOoFEMyWDctmXpKqKbe24IfQ/vVeh9PzYr5sbasVX5gV
 etonkovidova@Administrators-MacBook-Air.local]
 uid: 11400
+  sbisson:
+ensure: present
+gid: 500
+name: sbisson
+realname: Stephane Bisson
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDWBhtVz0rMyWOMkA/h5veSdmrzNd6SB4kktb98TjC1JtFDu5U8SggBFobAIOgy0DEIIo5rjtdQ2a+NB+zqP2jgYuJ4F4S6NPG4o3zWyNdaRRNit0/KC0U1UXhmHGk3WODAc5mbAMTtDRz6aJvo0GbK141AzKppD/QCOYkr7bMz6UcxRXe7DKGENYMvw+IiB98IdKg6ilO0k9YdBIRuF4GFDOlRnCCeJ8gzyukbHbGVMfMkW1jqWQeyzdBSUlxROzBQ74Ge5gy63rj8ypAXhJ3O5t8UCWUCX+wgsyCZwKaDt4C/ejt+N74hCeQ0aemzkFGHD6EvpFYZXiks2wGQiy3B
 sbisson@sbissons-MacBook-Air.local]
+uid: 11999

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b459f336bf4ea0f7a05b4d51fa4104a172c71fa
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] Make it easer to debug php code sniffer - change (mediawiki...Metrolook)

[jenkins-bot (Code Review)]

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

Change subject: Make it easer to debug php code sniffer
..


Make it easer to debug php code sniffer

Change-Id: Iaa53b85af8b01a3e7be4f371ac878f7dd61de877
---
M composer.json
M phpcs.xml
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 9254cbd..c2c5b01 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
-   "phpcs -p"
+   "phpcs -p -s"
]
}
 }
diff --git a/phpcs.xml b/phpcs.xml
index cb19440..d81a292 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,6 +2,7 @@
 

.
-   
+   
+   
vendor
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa53b85af8b01a3e7be4f371ac878f7dd61de877
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make "JimmyQuote" default appeal - change (mediawiki...DonationInterface)

[Pcoombe (Code Review)]

Pcoombe has uploaded a new change for review.

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

Change subject: Make "JimmyQuote" default appeal
..

Make "JimmyQuote" default appeal

Currently the default appeal if nothing is specified in the URL is
"Appeal-default" [1]. This is very out of date and contains many inaccuracies.
We have been linking to "JimmyQuote" [2] as the appeal from donatewiki and all
banners for a long time now.

This change makes "JimmyQuote" the new default if no appeal is specified in the
URL. This should be considerably easier than editing/moving the many 
translations
on paymentswiki.

[1] 
https://payments.wikimedia.org/index.php/Template:2011FR/Appeal-default/text/en
[2] https://payments.wikimedia.org/index.php/Template:2011FR/JimmyQuote/text/en

Bug: T114127
Change-Id: Id3af2367d80017f05324aa7767518721623206b4
---
M gateway_forms/Mustache.php
M gateway_forms/RapidHtml.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/gateway_forms/Mustache.php b/gateway_forms/Mustache.php
index b632039..cfb434d 100644
--- a/gateway_forms/Mustache.php
+++ b/gateway_forms/Mustache.php
@@ -85,7 +85,7 @@
$data['has_no_script_redirect'] = isset( $redirect ); // grr
 
$appealWikiTemplate = $this->gateway->getGlobal( 
'AppealWikiTemplate' );
-   $appeal = $this->make_safe( $request->getText( 'appeal', 
'Appeal-default' ) );
+   $appeal = $this->make_safe( $request->getText( 'appeal', 
'JimmyQuote' ) );
$appealWikiTemplate = str_replace( '$appeal', $appeal, 
$appealWikiTemplate );
$appealWikiTemplate = str_replace( '$language', 
$data['language'], $appealWikiTemplate );
$data['appeal_text'] = $output->parse( '{{' . 
$appealWikiTemplate . '}}' );
diff --git a/gateway_forms/RapidHtml.php b/gateway_forms/RapidHtml.php
index bcdba59..74fca14 100644
--- a/gateway_forms/RapidHtml.php
+++ b/gateway_forms/RapidHtml.php
@@ -185,7 +185,7 @@
// handle the appeal and appeal header
// TODO: determine and set variables for the default templates
$appeal_title_name = $this->make_safe( $wgRequest->getText( 
'appeal-title', 'Appeal-title-default' ) );
-   $appeal_name = $this->make_safe( $wgRequest->getText( 'appeal', 
'Appeal-default' ) );
+   $appeal_name = $this->make_safe( $wgRequest->getText( 'appeal', 
'JimmyQuote' ) );
 
$form = str_replace( "@appeal-title", $appeal_title_name, $form 
);
$form = str_replace( "@appeal", $appeal_name, $form );

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

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

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

[MediaWiki-commits] [Gerrit] Make it more obvious that users can remove their email address - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Make it more obvious that users can remove their email address
..


Make it more obvious that users can remove their email address

* Add help message to new email address field indicating that the field
  should be left blank if the user want to remove their email address.
  and the consequences of no email address it.
* Update changeemail related messages.

Bug: T98799
Change-Id: Ie92e393207ee30811fd30e25e72b9e523d95fd62
---
M includes/specials/SpecialChangeEmail.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 10 insertions(+), 7 deletions(-)

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



diff --git a/includes/specials/SpecialChangeEmail.php 
b/includes/specials/SpecialChangeEmail.php
index 22df04e..65fa01f 100644
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -92,7 +92,8 @@
'NewEmail' => array(
'type' => 'email',
'label-message' => 'changeemail-newemail',
-   'autofocus' => true
+   'autofocus' => true,
+   'help-message' => 'changeemail-newemail-help',
),
);
 
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 2011286..4d8e392 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -553,12 +553,13 @@
"passwordreset-emailsent": "A password reset email has been sent.",
"passwordreset-emailsent-capture": "A password reset email has been 
sent, which is shown below.",
"passwordreset-emailerror-capture": "A password reset email was 
generated, which is shown below, but sending it to the {{GENDER:$2|user}} 
failed: $1",
-   "changeemail": "Change email address",
+   "changeemail": "Change or remove email address",
"changeemail-summary": "",
-   "changeemail-text": "Complete this form to change your email address. 
You will need to enter your password to confirm this change. If you would like 
to remove the association of any email address from your account, leave the 
email address blank when submitting the form.",
+   "changeemail-text": "Complete this form to change your email address. 
You will need to enter your password to confirm this change. If you would like 
to remove the association of any email address from your account, leave the new 
email address blank when submitting the form.",
"changeemail-no-info": "You must be logged in to access this page 
directly.",
"changeemail-oldemail": "Current email address:",
"changeemail-newemail": "New email address:",
+   "changeemail-newemail-help": "This field should be left blank if you 
want to remove your email address. You will not be able to reset a forgotten 
password and will not receive emails from this wiki if the email address is 
removed.",
"changeemail-none": "(none)",
"changeemail-password": "Your {{SITENAME}} password:",
"changeemail-submit": "Change email",
@@ -965,7 +966,7 @@
"prefs-watchlist-token": "Watchlist token:",
"prefs-misc": "Misc",
"prefs-resetpass": "Change password",
-   "prefs-changeemail": "Change email address",
+   "prefs-changeemail": "Change or remove email address",
"prefs-setemail": "Set an email address",
"prefs-email": "Email options",
"prefs-rendering": "Appearance",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 208e395..f32a585 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -726,12 +726,13 @@
"passwordreset-emailsent": "Used in [[Special:PasswordReset]].\n\nSee 
also:\n* {{msg-mw|Passwordreset-emailsent-capture}}\n* 
{{msg-mw|Passwordreset-emailerror-capture}}",
"passwordreset-emailsent-capture": "Used in 
[[Special:PasswordReset]].\n\nSee also:\n* 
{{msg-mw|Passwordreset-emailsent}}\n* 
{{msg-mw|Passwordreset-emailerror-capture}}",
"passwordreset-emailerror-capture": "Error message displayed in 
[[Special:PasswordReset]] when sending an email fails. Parameters:\n* $1 - 
error message\n* $2 - username, used for GENDER\nSee also:\n* 
{{msg-mw|Passwordreset-emailsent}}\n* 
{{msg-mw|Passwordreset-emailsent-capture}}",
-   "changeemail": "Title of [[Special:ChangeEmail|special page]].",
+   "changeemail": "Title of [[Special:ChangeEmail|special page]]. This 
page also allows removing the user's email address.",
"changeemail-summary": "{{ignored}}",
"changeemail-text": "Text of [[Special:ChangeEmail]].",
"changeemail-no-info": "Error message for 
[[Special:ChangeEmail]].\n\nParameters:\n* $1 (unused) - a link to 
[[Special:UserLogin]] with 

[MediaWiki-commits] [Gerrit] [ActivityMonitor] Add extension-unittests-generic test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [ActivityMonitor] Add extension-unittests-generic test
..

[ActivityMonitor] Add extension-unittests-generic test

Remove basic mw-check and replace with extension-unittests-generic test.

Change-Id: I8dfb36f6609d89c04e3e9fd04bb2c83da5e83227
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0987d66..5c510a5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3018,7 +3018,7 @@
 
   - name: mediawiki/extensions/ActivityMonitor
 template:
-  - name: mw-checks-test
+  - name: extension-unittests-generic
   - name: jshint
   - name: jsonlint
 

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

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

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

[MediaWiki-commits] [Gerrit] wmnet: rename tmh1001 and 1002 mgmt interfaces - change (operations/dns)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: wmnet: rename tmh1001 and 1002 mgmt interfaces
..


wmnet: rename tmh1001 and 1002 mgmt interfaces

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

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index bad8440..cd54af8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1787,7 +1787,7 @@
 49  1H  IN PTR  wmf3424.mgmt.eqiad.wmnet.
 50  1H  IN PTR  strontium.mgmt.eqiad.wmnet.
 50  1H  IN PTR  wmf3425.mgmt.eqiad.wmnet.
-51  1H  IN PTR  yttrium.mgmt.eqiad.wmnet.
+51  1H  IN PTR  mw1259.mgmt.eqiad.wmnet.
 51  1H  IN PTR  wmf3426.mgmt.eqiad.wmnet.
 52  1H  IN PTR  wmf3427.mgmt.eqiad.wmnet.
 53  1H  IN PTR  niobium.mgmt.eqiad.wmnet.
@@ -1803,7 +1803,7 @@
 58  1H  IN PTR  palladium.mgmt.eqiad.wmnet.
 59  1H  IN PTR  silver.mgmt.eqiad.wmnet.
 59  1H  IN PTR  wmf3434.mgmt.eqiad.wmnet.
-60  1H  IN PTR  tmh1002.mgmt.eqiad.wmnet.
+60  1H  IN PTR  mw1260.mgmt.eqiad.wmnet.
 60  1H  IN PTR  wmf3435.mgmt.eqiad.wmnet.
 61  1H  IN PTR  wmf3437.mgmt.eqiad.wmnet.
 61  1H  IN PTR  pc1001.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 7b30c79..681b83f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -956,7 +956,7 @@
 cp1073  1H  IN A10.65.2.117
 wmf4668 1H  IN A10.65.2.118
 cp1074  1H  IN A10.65.2.118
-tmh1001 1H  IN A10.65.3.51
+mw1259  1H  IN A10.65.3.51
 WMF3426 1H  IN A10.65.3.51
 WMF3427 1H  IN A10.65.3.52
 WMF3423 1H  IN A10.65.3.48
@@ -1886,7 +1886,7 @@
 WMF3425 1H  IN A10.65.3.50
 arsenic 1H  IN A10.65.3.45
 WMF3420 1H  IN A10.65.3.45
-tmh1002 1H  IN A10.65.3.60
+mw1260  1H  IN A10.65.3.60
 WMF3435 1H  IN A10.65.3.60
 niobium 1H  IN A10.65.3.53
 WMF3428 1H  IN A10.65.3.53

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

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

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

[MediaWiki-commits] [Gerrit] shinken: Fix inclusion of labs proxyagent password in shinke... - change (operations/puppet)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: shinken: Fix inclusion of labs proxyagent password in shinkengen
..


shinken: Fix inclusion of labs proxyagent password in shinkengen

Apparently at some point this stopped being required in base?
It's a bit strange because shinken-01.shinken.eqiad.wmflabs still seems
perfectly happy, but on shinken-ircbot-testing.shinken.eqiad.wmflabs this is
causing shinkengen to get a blank LDAP password and therefore output blank
files, meaning shinken won't start.

Change-Id: Icedfff2eb5fdd0fac36977e8eecc60e1d34f1835
---
M modules/shinken/manifests/shinkengen.pp
1 file changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/modules/shinken/manifests/shinkengen.pp 
b/modules/shinken/manifests/shinkengen.pp
index c2b74f0..642047f 100644
--- a/modules/shinken/manifests/shinkengen.pp
+++ b/modules/shinken/manifests/shinkengen.pp
@@ -13,16 +13,14 @@
 #
 # [*ldap_bindas*]
 #   What to bind as when connecting to LDAP server
-#
-# [*ldap_pass*]
-#   Simple LDAP password to use when connecting to LDAP server
 class shinken::shinkengen(
 $ldap_server = 'ldap-eqiad.wikimedia.org',
 $ldap_bindas = 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org',
-$ldap_pass = $passwords::ldap::labs::proxypass,
 ){
 
 include shinken
+include passwords::ldap::labs
+$ldap_pass = $passwords::ldap::labs::proxypass
 
 package { [
 'python3-ldap3', # Custom package of 
https://pypi.python.org/pypi/python3-ldap

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icedfff2eb5fdd0fac36977e8eecc60e1d34f1835
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Jcrespo 
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] More Exhibit fixes - this time, for typos I made earlier - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: More Exhibit fixes - this time, for typos I made earlier
..

More Exhibit fixes - this time, for typos I made earlier

Change-Id: I7b268a75c06f9aa2e13e9ca8dae7e55b03527e66
---
M formats/CargoExhibitFormat.php
1 file changed, 11 insertions(+), 14 deletions(-)


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

diff --git a/formats/CargoExhibitFormat.php b/formats/CargoExhibitFormat.php
index ee9fa04..93084d2 100644
--- a/formats/CargoExhibitFormat.php
+++ b/formats/CargoExhibitFormat.php
@@ -173,7 +173,7 @@
$exhibit_busy = $cgScriptPath . "/skins/loading.gif";
// The "loading" message is just alt-text, so it doesn't really
// matter that it's hardcoded in English.
-   $text = '';
+   $preViewsText = '';
 
$field_list = array();
foreach ( $sqlQueries as $sqlQuery ) {
@@ -203,14 +203,14 @@
$this->displayParams = $displayParams;
 
// lens
-   $text .= $this->createLens( $field_list );
+   $preViewsText .= $this->createLens( $field_list );
 
// Facets
if ( array_key_exists( 'facets', $displayParams ) ) {
$facets = array_map('trim', explode( ',' , 
$displayParams['facets'] ) );
-   $text .= $this->createFacets( $facets );
+   $preViewsText .= $this->createFacets( $facets );
} else {
-   $text .= $this->createFacets( array_slice( $field_list, 
0, 3 ) );
+   $preViewsText .= $this->createFacets( array_slice( 
$field_list, 0, 3 ) );
}
 
if ( array_key_exists( 'datalabel', $displayParams ) ) {
@@ -233,30 +233,27 @@
$this->automateViews( $sqlQueries );
}
 
-   $text_views = "";
-
+   $viewsText = "";
foreach ( $this->views as $view ) {
switch ( $view ) {
case "Timeline":
-   $text_views .= $this->createTimeline( 
$sqlQueries );
+   $viewsText .= $this->createTimeline( 
$sqlQueries );
break;
case "Map":
-   $text_views .= $this->createMap( 
$sqlQueries );
+   $viewsText .= $this->createMap( 
$sqlQueries );
break;
case "Tabular":
-   $text_views .= 
$this->createTabular($field_list);
+   $viewsText .= 
$this->createTabular($field_list);
}
}
 
if ( count( $this->views ) > 1 ){
-   $text .= Html::rawElement( 'div',
+   $viewsText = Html::rawElement( 'div',
array( 'data-ex-role' => "viewPanel" ),
-   $text_views );
-   } else {
-   $text .= $text_views ;
+   $viewsText );
}
 
-   return '' . $text . '' ;
+   return $preViewsText . '' . $viewsText . 
'' ;
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Interlanguage link: Avoid the requirement of jquery.uls.data... - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Interlanguage link: Avoid the requirement of jquery.uls.data 
module on page load
..


Interlanguage link: Avoid the requirement of jquery.uls.data module on page load

This is an improved version of Ic1ad144b44 and does not require
jquery.uls.data before we see that we need to show a gray interlanguage link.

Bug: T113650
Change-Id: If8bae978308fbf472371393b0fe9b50bb5679012
---
M modules/entrypoint/ext.cx.interlanguagelink.js
1 file changed, 20 insertions(+), 7 deletions(-)

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



diff --git a/modules/entrypoint/ext.cx.interlanguagelink.js 
b/modules/entrypoint/ext.cx.interlanguagelink.js
index 2fcf858..0bb399e 100644
--- a/modules/entrypoint/ext.cx.interlanguagelink.js
+++ b/modules/entrypoint/ext.cx.interlanguagelink.js
@@ -22,15 +22,27 @@
 * @return {string[]} target languages
 */
function getSuggestedTargetLanguages() {
-   var specialCode, specialCodes, specialCodeIndex,
+   var i, specialCode, specialCodes, specialCodeIndex,
uniquePossibleTargetLanguages,
+   acceptLanguages,
possibleTargetLanguages = [],
pageLanguage = mw.config.get( 'wgPageContentLanguage' );
 
possibleTargetLanguages.push( mw.config.get( 'wgUserLanguage' ) 
);
possibleTargetLanguages.push( mw.uls.getBrowserLanguage() );
 
-   $.merge( possibleTargetLanguages, 
mw.uls.getAcceptLanguageList() );
+   acceptLanguages = mw.uls.getAcceptLanguageList();
+   // Accept language codes can have country extensions like en-US.
+   // So remove them so that it is like domain code format.
+   for ( i = 0; i < acceptLanguages.length; i++ ) {
+   // be-tarask has hyphen in the code
+   if ( acceptLanguages[ i ] === 'be-tarask' ) {
+   continue;
+   }
+   acceptLanguages[ i ] = acceptLanguages[ i ].split( '-' 
)[ 0 ];
+   }
+
+   $.merge( possibleTargetLanguages, acceptLanguages );
$.merge( possibleTargetLanguages, mw.uls.getPreviousLanguages() 
);
 
// Replace possibly non-standard, macro and duplicate language 
codes
@@ -51,9 +63,7 @@
uniquePossibleTargetLanguages = mw.cx.unique( 
possibleTargetLanguages );
 
return $.grep( uniquePossibleTargetLanguages, function ( 
language ) {
-   return language !== pageLanguage &&
-   // Known language for ULS
-   language !== $.uls.data.getAutonym( language );
+   return language !== pageLanguage;
} );
}
 
@@ -77,7 +87,6 @@
} else {
autonym = $.uls.data.getAutonym( code );
}
-
// TODO: This should be done more robustly.
// We can't use something like wgContentLanguage because this
// will fail for a wiki like simple.wikipedia.org, where
@@ -119,6 +128,8 @@
 
mw.hook( 'mw.cx.cta.shown' ).fire( campaign );
 
+   // We load the below modules only when required to show gray 
interlanguage links.
+   // This is important since gray interlanguage links appear in 
along with articles.
dependencies = [ 'ext.cx.entrypoint', 'jquery.uls.data' ];
 
mw.loader.using( dependencies, function () {
@@ -133,7 +144,9 @@
 
$pLangList = $( '#p-lang ul' );
$.each( suggestedTargetLanguages, function ( i, code ) {
-   if ( !pageInLanguageExists( code ) ) {
+   // Code should not be a language in which page 
exists.
+   // Also it should be known language for ULS.
+   if ( !pageInLanguageExists( code ) && code !== 
$.uls.data.getAutonym( code ) ) {
$newItem = createCXInterlanguageItem( 
code );
$pLangList.prepend( $newItem );
$newItem.cxEntryPoint( {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8bae978308fbf472371393b0fe9b50bb5679012
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: 

[MediaWiki-commits] [Gerrit] Add username to the User-Agent header. - change (mediawiki...bundler)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Add username to the User-Agent header.
..

Add username to the User-Agent header.

Inspired by similar code in Kiwix's mwoffliner.

Change-Id: Ie61436590228a614b4290e12f16bab26c6e900f7
---
M lib/headers.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/bundler
 refs/changes/58/242158/1

diff --git a/lib/headers.js b/lib/headers.js
index 55ea527..906f9b7 100644
--- a/lib/headers.js
+++ b/lib/headers.js
@@ -2,8 +2,10 @@
 'use strict';
 require('core-js/shim');
 var packageJson = require('../package.json');
+var user = process.env.USER || process.env.LOGNAME || process.env.HOME ||
+   'unknown';
 
 // These are the headers we will send with every API request.
 module.exports = {
-   'User-Agent': [packageJson.name, packageJson.version].join('/'),
+   'User-Agent': [packageJson.name, packageJson.version, user].join('/'),
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie61436590228a614b4290e12f16bab26c6e900f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Add tests - change (mediawiki...Ads)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Add tests
..

Add tests

Fix all issues so tests pass.

Change-Id: I0a7b9cd056df0cd1234d59ff41b76e73983b9b91
---
M .gitignore
A Gruntfile.js
D ads.i18n.php
M ads.php
M ads_body.php
A composer.json
M i18n/en.json
A package.json
A phpcs.xml
9 files changed, 136 insertions(+), 125 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..854a2d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-.svn
 *~
 *.kate-swp
 .*.swp
+node_modules/
+/composer.lock
+/vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/ads.i18n.php b/ads.i18n.php
deleted file mode 100644
index d3b34c6..000
--- a/ads.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShime0a147b9fbb7ac74' ) ) {
-   function wfJsonI18nShime0a147b9fbb7ac74( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShime0a147b9fbb7ac74';
-}
diff --git a/ads.php b/ads.php
index 819f279..6abfa12 100644
--- a/ads.php
+++ b/ads.php
@@ -1,50 +1,45 @@
-
-* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 
or later
-* @link http://www.mediawiki.org/wiki/Extension:Ads Documentation
-*
-*/
-
-if (!defined('MEDIAWIKI')) die('This file is part of MediaWiki. It is not a 
valid entry point. ERROR 11135');
-
-$dir = dirname(__FILE__) . '/';
-
-/**
-* Options (NB: edit the settings you want to customize in LocalSettings.php)
-***/
-$wgads_Inserts = array(
-   'ads_display' => array('on' => false,
-   'content' => array(
-   
array('title1','content1'),
-   
array('title2','content2'))),
-   );
-/**
-* End of options
-***/
-$wgExtensionCredits['other'][] = array(
-   'name' => 'Ads',
-   'author' => array('[[wikipedia:es:Miguel2706]]'),
-   'url' => 'http://www.mediawiki.org/wiki/Extension:Ads',
-   'descriptionmsg' => 'ads-desc',
-   'version' => '1.1.0',
-);
-
-$wgAutoloadClasses['ads'] = $dir . 'ads_body.php';
-$wgMessagesDirs['ads'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['ads'] = $dir . 'ads.i18n.php';
-$wgHooks['ParserFirstCallInit'][] = 'wfads';
-
-
-
-function wfads()
-{
-   new ads;
-   return true;
-}
-
-unset( $dir );
+
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
+ * @link 

[MediaWiki-commits] [Gerrit] adding user etonkovidova - change (operations/puppet)

[RobH (Code Review)]

RobH has submitted this change and it was merged.

Change subject: adding user etonkovidova
..


adding user etonkovidova

Setting up Elena Tonkovidova (WMF Employee) for shell access to bastions
and to stat1003 (researchers group)

T113680

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

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 73d31a6..dc639f6 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -73,7 +73,7 @@
   joal, thcipriani, daisy, ashwinpp, jhobs, tomasz, lpintscher,
   pcoombe, mholloway-shell, madhuvishy, niedzielski, 
neilpquinn-wmf,
   gpaumier, moushira, aklapper, qchris, tjones, srijan, johnflewis,
-  addshore, jminor, pt1979, asherman]
+  addshore, jminor, pt1979, asherman, etonkovidova]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts
@@ -111,7 +111,7 @@
   mforns, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal,
   daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson, 
niedzielski,
   neilpquinn-wmf, tbayer, moushira, dbrant, maxsem, srijan, 
krenair,
-  jminor, asherman]
+  jminor, asherman, etonkovidova]
   ldap-admins:
 gid: 715
 description: ldap admins
@@ -1618,3 +1618,10 @@
 realname: Papaul Tshibamba
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCmlt2EID9N7s/YwZ91Ma4t+/M4aQEGx6Qzzwz+pFOC/CNiz43fw89fHsMmrrU+e6T9hI9nTz899EVaxM8CG9kmGtpYOtcpoFkcMhFlnP9JZpuUzmE/DVVDXBFnrjnXQzNisKjpPOe+NEu4v4NDwPv+cOQpJ8uXqikg+pd0ZYWxbdFIp+7dokhk1+1ltxTCDDrMkiZEBbfYEcXmw2Kt0KU2hdq9IRg1o/YFJSYVmIXkkN3Ayr238vYLi03946ReyKm/czGq+0UFh+Lp+TuDwrVa/kOqBko6aAJgVvYLofKF6CgfTHmMPfA01EbCDUtPxmg6nUF0fHweQsGKMHKFxFSF
 productionwiki]
 uid: 10275
+  etonkovidova:
+ensure: present
+gid: 500
+name: etonkovidova
+realname: Elena Tonkovidova
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCqxPSqR8la7MAqz7BC6+1xM4tSKrZObfbh3unfyu4cuPtaj1v6oJ+wm7USqVR8sSVFoqpyq8kVLL6mGgLt+HzCWT5c3fyDrPdRJ89o0EXlkZ02EGkmTDdYzs7VLkvSyKLIqxg1wOdX8s0oYaiCaJ6OiFi/lIjfyOVcnIQ0yB4h3qcpzMXlzjiAsyWBTA/wNCY2pCEjKR3JdW8aYV8tw/ol0eV3F5Q9hZumrd7GwAD6AJMnHlNgUAHTd+g5RllhBsniXOu1ejZWyTka3dWjSyK3JFAyDUmVNZwC+l6XC1bSyOoFEMyWDctmXpKqKbe24IfQ/vVeh9PzYr5sbasVX5gV
 etonkovidova@Administrators-MacBook-Air.local]
+uid: 11400

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I898f09ad35795f17ae18f07e40414fdf2d80722e
Gerrit-PatchSet: 1
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] Adjust sample page to avoid generating empty p tags - change (mediawiki...QuickSurveys)

[jenkins-bot (Code Review)]

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

Change subject: Adjust sample page to avoid generating empty p tags
..


Adjust sample page to avoid generating empty p tags

The existing sample page was generating two empty p tags at the top
of the page which made testing more confusing than it needed to be.

Quick surveys are supposed to inject themselves after the first paragraph
and having an empty paragraph confuses this.

Change-Id: Ie794ea91145f12b0e2b19fece698cc6f52b45e7e
---
M tests/browser/samples/infobox_and_image.wikitext
1 file changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/tests/browser/samples/infobox_and_image.wikitext 
b/tests/browser/samples/infobox_and_image.wikitext
index af5f895..f666dc8 100644
--- a/tests/browser/samples/infobox_and_image.wikitext
+++ b/tests/browser/samples/infobox_and_image.wikitext
@@ -1,15 +1,4 @@
-
 "Barack" and "Obama" redirect here. For his father, see 
[[:Barack Obama, Sr.]].For other uses of "Barack", see [[:Barack 
(disambiguation)]].For other uses of "Obama", see [[:Obama 
(disambiguation)]].
-[[Category:Wikipedia indefinitely move-protected pages|Barack Obama]]
-[[File:Padlock-silver.svg|20px|link=Wikipedia:Protection 
policy#semi|alt=Page semi-protected|This article is semi-protected to promote 
compliance with the policy on biographies of living 
people]][[Category:Wikipedia indefinitely semi-protected 
biographies of living people|Barack Obama]]
-[[File:cscr-featured.svg|20x20px
- |link=Wikipedia:Featured articles
- |
- |This is a featured article. Click here for more information.]]
-[[Category:Featured articles]]
-
-[[Category:Use American English from December 2014]][[Category:All 
Wikipedia articles written in American English]]
-[[Category:Use mdy dates from July 2015]]
 {| class="infobox vcard " style="width: 22em; border: 4px double #d69d36; 
padding:0.3em; padding-bottom:0em;border: 1px solid #aaa; border-spacing: 3px; 
background-color: #f9f9f9; color: black; margin: 0.5em 0 0.5em 1em; padding: 
0.2em; float: right; clear: right; font-size: 88%; line-height: 1.5em;"
 ! colspan=2 class="n" style="text-align: center; font-size: 132%;"|Barack Obama
 |-
@@ -301,3 +290,14 @@
 Blank section.
 == External links ==
 Blank section.
+
+[[Category:Wikipedia indefinitely move-protected pages|Barack Obama]]
+[[File:Padlock-silver.svg|20px|link=Wikipedia:Protection 
policy#semi|alt=Page semi-protected|This article is semi-protected to promote 
compliance with the policy on biographies of living 
people]][[Category:Wikipedia indefinitely semi-protected 
biographies of living people|Barack Obama]]
+[[File:cscr-featured.svg|20x20px
+ |link=Wikipedia:Featured articles
+ |
+ |This is a featured article. Click here for more information.]]
+[[Category:Featured articles]]
+
+[[Category:Use American English from December 2014]][[Category:All 
Wikipedia articles written in American English]]
+[[Category:Use mdy dates from July 2015]]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie794ea91145f12b0e2b19fece698cc6f52b45e7e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: dev
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
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] Make it easer to debug php code sniffer, Update mediawiki/me... - change (mediawiki...Vector)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Make it easer to debug php code sniffer, Update 
mediawiki/mediawiki-codesniffer to 0.4.0
..

Make it easer to debug php code sniffer, Update mediawiki/mediawiki-codesniffer 
to 0.4.0

Change-Id: I28a0aa347c43811e54afd901d8059e93b00208a2
---
M composer.json
M phpcs.xml
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/74/242174/1

diff --git a/composer.json b/composer.json
index ab93dc0..0180de0 100644
--- a/composer.json
+++ b/composer.json
@@ -34,13 +34,12 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.*",
-   "mediawiki/mediawiki-codesniffer": "0.3.0"
+   "mediawiki/mediawiki-codesniffer": "0.4.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
-   "phpcs -p"
+   "phpcs -p -s"
]
}
-
 }
diff --git a/phpcs.xml b/phpcs.xml
index cb19440..d81a292 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,6 +2,7 @@
 

.
-   
+   
+   
vendor
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28a0aa347c43811e54afd901d8059e93b00208a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] More Exhibit fixes - this time, for typos I made earlier - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: More Exhibit fixes - this time, for typos I made earlier
..


More Exhibit fixes - this time, for typos I made earlier

Change-Id: I7b268a75c06f9aa2e13e9ca8dae7e55b03527e66
---
M formats/CargoExhibitFormat.php
1 file changed, 11 insertions(+), 14 deletions(-)

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



diff --git a/formats/CargoExhibitFormat.php b/formats/CargoExhibitFormat.php
index ee9fa04..93084d2 100644
--- a/formats/CargoExhibitFormat.php
+++ b/formats/CargoExhibitFormat.php
@@ -173,7 +173,7 @@
$exhibit_busy = $cgScriptPath . "/skins/loading.gif";
// The "loading" message is just alt-text, so it doesn't really
// matter that it's hardcoded in English.
-   $text = '';
+   $preViewsText = '';
 
$field_list = array();
foreach ( $sqlQueries as $sqlQuery ) {
@@ -203,14 +203,14 @@
$this->displayParams = $displayParams;
 
// lens
-   $text .= $this->createLens( $field_list );
+   $preViewsText .= $this->createLens( $field_list );
 
// Facets
if ( array_key_exists( 'facets', $displayParams ) ) {
$facets = array_map('trim', explode( ',' , 
$displayParams['facets'] ) );
-   $text .= $this->createFacets( $facets );
+   $preViewsText .= $this->createFacets( $facets );
} else {
-   $text .= $this->createFacets( array_slice( $field_list, 
0, 3 ) );
+   $preViewsText .= $this->createFacets( array_slice( 
$field_list, 0, 3 ) );
}
 
if ( array_key_exists( 'datalabel', $displayParams ) ) {
@@ -233,30 +233,27 @@
$this->automateViews( $sqlQueries );
}
 
-   $text_views = "";
-
+   $viewsText = "";
foreach ( $this->views as $view ) {
switch ( $view ) {
case "Timeline":
-   $text_views .= $this->createTimeline( 
$sqlQueries );
+   $viewsText .= $this->createTimeline( 
$sqlQueries );
break;
case "Map":
-   $text_views .= $this->createMap( 
$sqlQueries );
+   $viewsText .= $this->createMap( 
$sqlQueries );
break;
case "Tabular":
-   $text_views .= 
$this->createTabular($field_list);
+   $viewsText .= 
$this->createTabular($field_list);
}
}
 
if ( count( $this->views ) > 1 ){
-   $text .= Html::rawElement( 'div',
+   $viewsText = Html::rawElement( 'div',
array( 'data-ex-role' => "viewPanel" ),
-   $text_views );
-   } else {
-   $text .= $text_views ;
+   $viewsText );
}
 
-   return '' . $text . '' ;
+   return $preViewsText . '' . $viewsText . 
'' ;
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Add a "back to top" button to the bottom right of the page - change (mediawiki...MobileFrontend)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Add a "back to top" button to the bottom right of the page
..

Add a "back to top" button to the bottom right of the page

It's only visible, if the "first screen" isn't in the viewport anymore.

Bug: T98701
Change-Id: I11a8ccb1e701644dcb328bfec9fe346f75ae1b71
---
M includes/Resources.php
A resources/mobile.backtotop/BackToTopOverlay.hogan
A resources/mobile.backtotop/BackToTopOverlay.js
A resources/mobile.backtotop/backtotop.js
A resources/mobile.backtotop/backtotop.less
A resources/skins.minerva.beta.scripts/backtotop.js
6 files changed, 132 insertions(+), 0 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index bea7c07..c509742 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -394,6 +394,23 @@
),
),
 
+   'mobile.backtotop' => $wgMFResourceFileModuleBoilerplate + array(
+   'dependencies' => array(
+   'mobile.startup',
+   'mobile.toggling',
+   ),
+   'scripts' => array(
+   'resources/mobile.backtotop/BackToTopOverlay.js',
+   'resources/mobile.backtotop/backtotop.js',
+   ),
+   'styles' => array(
+   'resources/mobile.backtotop/backtotop.less',
+   ),
+   'templates' => array(
+   'BackToTopOverlay.hogan' => 
'resources/mobile.backtotop/BackToTopOverlay.hogan',
+   ),
+   ),
+
// FIXME: Split this module into different features.
'mobile.startup' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
@@ -1698,6 +1715,7 @@
// These modules should only setup routes/events or
// load code under certain conditions.
'mobile.search.beta',
+   'mobile.backtotop',
),
'scripts' => array(

'resources/skins.minerva.beta.scripts/commonsCategory.js',
diff --git a/resources/mobile.backtotop/BackToTopOverlay.hogan 
b/resources/mobile.backtotop/BackToTopOverlay.hogan
new file mode 100644
index 000..1dd5be9
--- /dev/null
+++ b/resources/mobile.backtotop/BackToTopOverlay.hogan
@@ -0,0 +1 @@
+
diff --git a/resources/mobile.backtotop/BackToTopOverlay.js 
b/resources/mobile.backtotop/BackToTopOverlay.js
new file mode 100644
index 000..5b76dc1
--- /dev/null
+++ b/resources/mobile.backtotop/BackToTopOverlay.js
@@ -0,0 +1,48 @@
+( function ( M, $ ) {
+
+   var BackToTopOverlay,
+   View = M.require( 'mobile.view/View' );
+
+   /**
+* Displays a little arrow at the bottom right of the viewport.
+* @class BackToTopOverlay
+* @extends View
+*/
+   BackToTopOverlay = View.extend( {
+   /**
+* @inheritdoc
+*/
+   className: 'backtotop',
+   /**
+* @inheritdoc
+*/
+   template: mw.template.get( 'mobile.backtotop', 
'BackToTopOverlay.hogan' ),
+   /**
+* @inheritdoc
+*/
+   events: $.extend( {}, View.prototype.events, {
+   click: 'onBackToTopClick'
+   } ),
+
+   /**
+* Show the back to top element, if it's not visible already.
+*/
+   show: function () {
+   this.$el.css( 'visibility', 'visible' ).addClass( 
'visible' );
+   },
+
+   /**
+* Hide the back to top element, if it's visible.
+*/
+   hide: function () {
+   this.$el.removeClass( 'visible' );
+   },
+
+   onBackToTopClick: function () {
+   $( 'html, body' ).animate( { scrollTop: 0 }, 400 );
+   }
+   } );
+
+   M.define( 'mobile.backtotop/BackToTopOverlay', BackToTopOverlay );
+
+}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/mobile.backtotop/backtotop.js 
b/resources/mobile.backtotop/backtotop.js
new file mode 100644
index 000..1de923b
--- /dev/null
+++ b/resources/mobile.backtotop/backtotop.js
@@ -0,0 +1,23 @@
+( function ( M, $ ) {
+   var BackToTopOverlay = M.require( 'mobile.backtotop/BackToTopOverlay' ),
+   backtotop = new BackToTopOverlay();
+
+   function showBackToTop() {
+   backtotop.show();
+   }
+
+   function hideBackToTop() {
+   backtotop.hide();
+   }
+
+   // initialize the back to top element
+   backtotop.appendTo(