[MediaWiki-commits] [Gerrit] service::node: Provide MW API and RESTBase request templates - change (operations/puppet)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: service::node: Provide MW API and RESTBase request templates
..

service::node: Provide MW API and RESTBase request templates

As of v0.3.2, service-template-node provides a unified way of accessing
the MW and RESTBase APIs to services based on it. This patch brings the
production-configuration part in the mix to assure requests are directed
to the proper entity.

The important implication here is that once all of the needed services
update to service-template-node v0.3.2, there will be only one place
where we define how and where to contact MW and RESTBase; individual
services will no longer need to declare them separately.

Change-Id: I76e39f2caebbb90f4f7082a865e9ab6e33db9e4f
---
M hieradata/labs/deployment-prep/common.yaml
M modules/service/manifests/configuration.pp
M modules/service/templates/node/config.yaml.erb
3 files changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/291857/1

diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index ba85571..f160014 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -9,6 +9,8 @@
 has_lvs: false
 "puppetmaster::scripts::keep_reports_minutes": 360
 puppetmaster::autosigner: true
+service::configuration::mwapi_uri: 
http://deployment-mediawiki02.deployment-prep.eqiad.wmflabs/w/api.php
+service::configuration::restbase_uri: 
http://deployment-restbase02.deployment-prep.eqiad.wmflabs:7231
 #service::configuration::http_proxy:
 service::configuration::statsd_host: labmon1001.eqiad.wmnet
 service::configuration::logstash_host: 
deployment-logstash2.deployment-prep.eqiad.wmflabs
diff --git a/modules/service/manifests/configuration.pp 
b/modules/service/manifests/configuration.pp
index 59afc90..c10c056 100644
--- a/modules/service/manifests/configuration.pp
+++ b/modules/service/manifests/configuration.pp
@@ -4,6 +4,14 @@
 #
 # === Parameters
 #
+# [*mwapi_uri*]
+#   The host/IP where to reach the MW API. Default:
+#   http://api.svc.${::mw_primary}.wmnet/w/api.php
+#
+# [*restbase_uri*]
+#   The host/IP where to reach RESTBase. Default:
+#   http://restbase.svc.${::rb_site}.wmnet:7231
+#
 # [*http_proxy*]
 #   Full URL of the proxy to use
 #
@@ -28,6 +36,8 @@
 #   Default: false
 #
 class service::configuration(
+$mwapi_uri = "http://api.svc.${::mw_primary}.wmnet/w/api.php;,
+$restbase_uri  = "http://restbase.svc.${::rb_site}.wmnet:7231;,
 $http_proxy= undef,
 $statsd_host   = 'localhost',
 $statsd_port   = 8125,
diff --git a/modules/service/templates/node/config.yaml.erb 
b/modules/service/templates/node/config.yaml.erb
index ad09c37..178bc78 100644
--- a/modules/service/templates/node/config.yaml.erb
+++ b/modules/service/templates/node/config.yaml.erb
@@ -1,5 +1,7 @@
 <%
 cvars = {
+  'mwapi' => scope.lookupvar('service::configuration::mwapi_uri'),
+  'restbase'  => scope.lookupvar('service::configuration::restbase_uri'),
   'gelf_host' => scope.lookupvar('service::configuration::logstash_host'),
   'gelf_port' => scope.lookupvar('service::configuration::logstash_port'),
   'stat_host' => scope.lookupvar('service::configuration::statsd_host'),
@@ -62,3 +64,18 @@
   # cors: restricted.domain.org
   # URL of the outbound proxy to use (complete with protocol)
   proxy: <%= cvars['proxy'] %>
+  # the template used for contacting the MW API
+  mwapi_req:
+method: post
+uri: <%= cvars['mwapi'] %>
+headers:
+  host: '{{request.params.domain}}'
+  user-agent: '{{user-agent}}'
+body: '{{ default(request.query, {}) }}'
+  # the template used for contacting RESTBase
+  restbase_req:
+method: '{{request.method}}'
+uri: <%= cvars['restbase'] %>/{{domain}}/v1/{+path}
+query: '{{ default(request.query, {}) }}'
+headers: '{{request.headers}}'
+body: '{{request.body}}'

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

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

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

[MediaWiki-commits] [Gerrit] base::grub: fix the ioscheduler setting - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: base::grub: fix the ioscheduler setting
..


base::grub: fix the ioscheduler setting

Right now, what augeas would do is change wherever elevator=$ioscheduler
is set to elevator=deadline; but what we actually wanted to achieve in
I53bffa844224 was the opposite.

Change-Id: I4ffa4090cd82b361a063a28c0f972e9b04f72166
---
M modules/base/manifests/grub.pp
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  Faidon Liambotis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/base/manifests/grub.pp b/modules/base/manifests/grub.pp
index 0426431..a776a77 100644
--- a/modules/base/manifests/grub.pp
+++ b/modules/base/manifests/grub.pp
@@ -2,6 +2,7 @@
 # The shellvars_list lens is broken with backticks on older versions of
 # Augeas (< jessie), so keep a compatibility version with test/grep/sed
 if versioncmp($::augeasversion, '1.3.0') >= 0 {
+
 augeas { 'grub2':
 incl=> '/etc/default/grub',
 lens=> 'Shellvars_list.lns',
@@ -13,9 +14,8 @@
 # removes quiet, splash from default kopts
 'rm GRUB_CMDLINE_LINUX_DEFAULT/value[. = "quiet"]',
 'rm GRUB_CMDLINE_LINUX_DEFAULT/value[. = "splash"]',
-# CFQ I/O scheduler is the default allow override
-# with class default to deadline (the installer does this too)
-"set GRUB_CMDLINE_LINUX/value[. = \"elevator=${ioscheduler}\"] 
elevator=deadline",
+# Sets the ioscheduler to a specific value. Default is deadline
+"set GRUB_CMDLINE_LINUX/value[. =~ glob(\"elevator=*\")] 
elevator=${ioscheduler}",
 ],
 notify  => Exec['update-grub'],
 }
@@ -38,7 +38,7 @@
 notify  => Exec['update-grub'],
 }
 
-# The CFQ I/O scheduler is rather # suboptimal for some of our I/O
+# The CFQ I/O scheduler is rather suboptimal for some of our I/O
 # workloads. Override with deadline. (the installer does this too)
 exec { 'grub2 iosched deadline':
 path=> '/bin:/usr/bin',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ffa4090cd82b361a063a28c0f972e9b04f72166
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Gehel 
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] Simplify code using .one - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Simplify code using .one
..


Simplify code using .one

Change-Id: I84fb5e0ade474738ff6a05c2304de351a2476186
---
M resources/js/ext.uls.interface.js
1 file changed, 34 insertions(+), 29 deletions(-)

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



diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index 3802d02..cd11d88 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -87,28 +87,31 @@
var $displaySettings = displaySettings();
 
uls.$menu.find( '#uls-settings-block' ).append( 
$displaySettings );
-   $displaySettings.on( 'click', function () {
-   var languagesettings = $displaySettings.data( 
'languagesettings' ),
-   displaySettingsOptions = {
+
+   // Initialize the trigger
+   $displaySettings.one( 'click', function () {
+   var displaySettingsOptions = {
defaultModule: 'display'
},
ulsPosition = mw.config.get( 'wgULSPosition' ),
anonMode = ( mw.user.isAnon() &&
!mw.config.get( 
'wgULSAnonCanChangeLanguage' ) );
 
-   if ( !languagesettings ) {
-   // If the ULS trigger is shown in the top 
personal menu,
-   // closing the display settings must show the 
main ULS
-   // languages list, unless we are in anon mode 
and thus
-   // cannot show the language list
-   if ( ulsPosition === 'personal' && !anonMode ) {
-   displaySettingsOptions.onClose = 
function () {
-   uls.show();
-   };
-   }
-   $.extend( displaySettingsOptions, 
uls.position() );
-   $displaySettings.languagesettings( 
displaySettingsOptions ).click();
+   // If the ULS trigger is shown in the top personal menu,
+   // closing the display settings must show the main ULS
+   // languages list, unless we are in anon mode and thus
+   // cannot show the language list
+   if ( ulsPosition === 'personal' && !anonMode ) {
+   displaySettingsOptions.onClose = function () {
+   uls.show();
+   };
}
+   $.extend( displaySettingsOptions, uls.position() );
+   $displaySettings.languagesettings( 
displaySettingsOptions ).click();
+   } );
+
+   // On every click
+   $displaySettings.on( 'click', function () {
mw.hook( 'mw.uls.settings.open' ).fire( 'uls' );
uls.hide();
} );
@@ -123,21 +126,23 @@
var $inputSettings = inputSettings();
 
uls.$menu.find( '#uls-settings-block' ).append( $inputSettings 
);
+
+   // Initialize the trigger
+   $inputSettings.one( 'click', function () {
+   var position = uls.position();
+
+   $inputSettings.languagesettings( {
+   defaultModule: 'input',
+   onClose: function () {
+   uls.show();
+   },
+   top: position.top,
+   left: position.left
+   } ).click();
+   } );
+
+   // On every click
$inputSettings.on( 'click', function () {
-   var position = uls.position(),
-   languagesettings = $inputSettings.data( 
'languagesettings' );
-
-   if ( !languagesettings ) {
-   $inputSettings.languagesettings( {
-   defaultModule: 'input',
-   onClose: function () {
-   uls.show();
-   },
-   top: position.top,
-   left: position.left
-   } ).click();
-   }
-
mw.hook( 'mw.uls.settings.open' ).fire( 'uls' );
uls.hide();
} );

[MediaWiki-commits] [Gerrit] Remove redundant mw.loader.using - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Remove redundant mw.loader.using
..


Remove redundant mw.loader.using

The only caller is already loading the exact same modules right
before calling these functions.

Change-Id: I71bc682f88c45e8ff20e032c7e5ee2dc3f517baf
---
M resources/js/ext.uls.interface.js
1 file changed, 9 insertions(+), 14 deletions(-)

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



diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index 65499fe..3802d02 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -107,10 +107,7 @@
};
}
$.extend( displaySettingsOptions, 
uls.position() );
-   mw.loader.using( 
mw.uls.languageSettingsModules, function () {
-   $displaySettings.languagesettings( 
displaySettingsOptions )
-   .click();
-   } );
+   $displaySettings.languagesettings( 
displaySettingsOptions ).click();
}
mw.hook( 'mw.uls.settings.open' ).fire( 'uls' );
uls.hide();
@@ -131,16 +128,14 @@
languagesettings = $inputSettings.data( 
'languagesettings' );
 
if ( !languagesettings ) {
-   mw.loader.using( 
mw.uls.languageSettingsModules, function () {
-   $inputSettings.languagesettings( {
-   defaultModule: 'input',
-   onClose: function () {
-   uls.show();
-   },
-   top: position.top,
-   left: position.left
-   } ).click();
-   } );
+   $inputSettings.languagesettings( {
+   defaultModule: 'input',
+   onClose: function () {
+   uls.show();
+   },
+   top: position.top,
+   left: position.left
+   } ).click();
}
 
mw.hook( 'mw.uls.settings.open' ).fire( 'uls' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71bc682f88c45e8ff20e032c7e5ee2dc3f517baf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Santhosh 
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 GUI - change (wikidata...rdf)

[jenkins-bot (Code Review)]

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

Change subject: Update GUI
..


Update GUI

Change-Id: I67beaaf6a5a6336a7d270e51cfc592974925b675
---
M gui
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/gui b/gui
index 0c13cbd..a868d1a 16
--- a/gui
+++ b/gui
-Subproject commit 0c13cbd69ab4a528ed7ec3ced0adbd26ee9785e3
+Subproject commit a868d1af98da2c18f5a7ffeeacc8f40f9efdae09

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67beaaf6a5a6336a7d270e51cfc592974925b675
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
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 GUI - change (wikidata...rdf)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Update GUI
..

Update GUI

Change-Id: I67beaaf6a5a6336a7d270e51cfc592974925b675
---
M gui
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/gui b/gui
index 0c13cbd..a868d1a 16
--- a/gui
+++ b/gui
-Subproject commit 0c13cbd69ab4a528ed7ec3ced0adbd26ee9785e3
+Subproject commit a868d1af98da2c18f5a7ffeeacc8f40f9efdae09

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67beaaf6a5a6336a7d270e51cfc592974925b675
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] T125419: Fix selser issues serializing first table row - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: T125419: Fix selser issues serializing first table row
..


T125419: Fix selser issues serializing first table row

* This is another instance of the 'chameleon node' effect
  as in 7608aeab.
* Added new parser test that fails without this patch
  and passes with this patch.

Change-Id: Icef41bed2e2bfe81429556d1e32f9b4e8017a5c1
---
M lib/html2wt/WTSUtils.js
M tests/parserTests.txt
2 files changed, 29 insertions(+), 0 deletions(-)

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



diff --git a/lib/html2wt/WTSUtils.js b/lib/html2wt/WTSUtils.js
index 68a787c..77bae2f 100644
--- a/lib/html2wt/WTSUtils.js
+++ b/lib/html2wt/WTSUtils.js
@@ -89,6 +89,14 @@
// showed up on the same line via the "||" or "!!" syntax, 
nothing
// to worry about.
return DU.getDataParsoid(node).stx_v !== 'row';
+   } else if (node.nodeName === 'TR' && 
!DU.getDataParsoid(node).startTagSrc) {
+   // If this  didn't have a startTagSrc, it would have been
+   // the first row of a table in original wikitext. So, it is safe
+   // to reuse the original source for the row (without a "|-") as 
long as
+   // it continues to be the first row of the table.  If not, 
since we need to
+   // insert a "|-" to separate it from the newly added row (in an 
edit),
+   // we cannot simply reuse orig. wikitext for this .
+   return !DU.previousNonSepSibling(node);
} else if (DU.isNestedListOrListItem(node)) {
// If there are no previous siblings, bullets were assigned to
// containing elements in the ext.core.ListHandler. For example,
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 523953c..b6a857a 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7161,6 +7161,27 @@
 |}
 !!end
 
+!! test
+Testing selser after addition of new row before first row (T125419)
+!! options
+parsoid={
+  "modes": ["wt2wt", "selser"],
+  "changes": [
+[ "tr", "before", "X" ]
+  ]
+}
+!! wikitext
+{|
+|a
+|}
+!! wikitext/edited
+{|
+|X
+|-
+|a
+|}
+!! end
+
 ###
 ### Internal links
 ###

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icef41bed2e2bfe81429556d1e32f9b4e8017a5c1
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
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 styling for Special:Notification items - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Adjust styling for Special:Notification items
..

Adjust styling for Special:Notification items

The items should resemble the popup items, but the styles clashed
with the popup's cross-wiki notification item, so the image size
was smaller and the border was incomplete.

Bug: T136572
Change-Id: I3c3f825d469ccee1e711da21f627eeb9491e9480
---
M modules/styles/mw.echo.ui.DatedNotificationsWidget.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
M modules/styles/mw.echo.ui.SubGroupListWidget.less
M modules/ui/mw.echo.ui.NotificationItemWidget.js
4 files changed, 52 insertions(+), 20 deletions(-)


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

diff --git a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less 
b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
index 523568f..4f4b193 100644
--- a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
+++ b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
@@ -18,5 +18,19 @@
border-bottom: 1px #ccc solid;
margin-bottom: 0.5em;
}
+
+   .mw-echo-ui-notificationItemWidget {
+   border: 1px solid #DD;
+   padding: 0.5em;
+   box-sizing: border-box;
+
+   &:not(:last-child) {
+   border-bottom: 0;
+   }
+
+   &:last-child {
+   border-bottom: 1px solid #DD;
+   }
+   }
}
 }
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index ba270c1..05f5c0f 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -91,12 +91,23 @@
}
 
// Table layout only for the content inside bundles
-   &-bundle {
+   &-bundled {
display: table;
width: 100%;
+   padding: 0.5em;
+   border: 1px solid #DD;
+   box-sizing: border-box;
+   &:not(:last-child) {
+   border-bottom: 0;
+   }
+
+   &:last-child {
+   border-bottom: 1px solid #DD;
+   }
 
.mw-echo-ui-notificationItemWidget-content {
display: table-row;
+   padding-left: 0.5em + 1.5em;
 
.mw-echo-ui-notificationItemWidget {
// CSS table layout
@@ -112,6 +123,12 @@
&-icon {
position: relative;
padding-right: 0.5em;
+
+   img {
+   height: 1.5em;
+   width: 1.5em;
+   }
+
}
 
&-content-message {
@@ -147,6 +164,7 @@
&-markAsReadButton {
width: 1em;
float: none;
+   padding-top: 0;
}
 
}
diff --git a/modules/styles/mw.echo.ui.SubGroupListWidget.less 
b/modules/styles/mw.echo.ui.SubGroupListWidget.less
index 95035eb..0bd1dfa 100644
--- a/modules/styles/mw.echo.ui.SubGroupListWidget.less
+++ b/modules/styles/mw.echo.ui.SubGroupListWidget.less
@@ -31,26 +31,26 @@
margin-bottom: @bundle-group-padding / 2;
}
 
-   .mw-echo-ui-notificationItemWidget {
-   padding: 0.5em;
-   border: 1px solid #DD;
-   box-sizing: border-box;
+   // .mw-echo-ui-crossWikiNotificationItemWidget & 
.mw-echo-ui-notificationItemWidget {
+   //  padding: 0.5em;
+   //  border: 1px solid #DD;
+   //  box-sizing: border-box;
 
-   &:not(:last-child) {
-   border-bottom: 0;
-   }
+   //  &:not(:last-child) {
+   //  border-bottom: 0;
+   //  }
 
-   &-icon img {
-   height: 1.5em;
-   width: 1.5em;
-   }
+   //  &-icon img {
+   //  height: 1.5em;
+   //  width: 1.5em;
+   //  }
 
-   &-content {
-   padding-left: 0.5em + 1.5em;
-   }
+   //  &-content {
+   //  padding-left: 0.5em + 1.5em;
+   //  }
 
-   

[MediaWiki-commits] [Gerrit] Styling changes to Special:Notifications headers and toolbar - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Styling changes to Special:Notifications headers and toolbar
..


Styling changes to Special:Notifications headers and toolbar

Bug: T136580
Bug: T136568
Change-Id: I1a7f08cca8884ada42eca50ba802b4d1e0b788e0
---
M modules/echo.variables.less
M modules/styles/mw.echo.ui.DatedNotificationsWidget.less
M modules/styles/mw.echo.ui.NotificationsInboxWidget.less
M modules/styles/mw.echo.ui.SubGroupListWidget.less
4 files changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index 24b3d20..db1d2da 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -15,3 +15,4 @@
 @opacity-low: 0.5;
 @opacity-mid: 0.8;
 
+@specialpage-separation-unit: 0.7em;
diff --git a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less 
b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
index 20acc28..330f57a 100644
--- a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
+++ b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
@@ -1,3 +1,4 @@
+@import '../echo.variables';
 .mw-echo-ui-datedNotificationsWidget {
min-height: 5em;
 
@@ -7,8 +8,7 @@
overflow-y: auto;
 
&-header {
-   border-bottom: 1px #ccc solid;
-   margin-bottom: 0.5em;
+   margin-bottom: @specialpage-separation-unit;
}
}
 }
diff --git a/modules/styles/mw.echo.ui.NotificationsInboxWidget.less 
b/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
index b9dbe44..37964a9 100644
--- a/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
@@ -1,3 +1,4 @@
+@import '../echo.variables';
 .mw-echo-ui-notificationsInboxWidget {
&.oo-ui-pendingElement-pending .mw-echo-ui-datedSubGroupListWidget {
opacity: 0.5;
@@ -10,7 +11,7 @@
 
&-top {
display: table;
-   margin-bottom: 2em;
+   margin-bottom: 3 * @specialpage-separation-unit;
 
 
&-placeholder {
@@ -24,7 +25,7 @@
width: inherit;
margin-left: auto;
margin-right: auto;
-   margin-top: 2em;
+   margin-top: 3 * @specialpage-separation-unit;
}
 
&-pagination {
diff --git a/modules/styles/mw.echo.ui.SubGroupListWidget.less 
b/modules/styles/mw.echo.ui.SubGroupListWidget.less
index 95035eb..869c177 100644
--- a/modules/styles/mw.echo.ui.SubGroupListWidget.less
+++ b/modules/styles/mw.echo.ui.SubGroupListWidget.less
@@ -22,7 +22,6 @@
&-markAllReadButton {
display: table-cell;
text-align: right;
-   padding-bottom: 0.5em;
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] Styling changes to Special:Notifications headers and toolbar - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Styling changes to Special:Notifications headers and toolbar
..

Styling changes to Special:Notifications headers and toolbar

Bug: T136580
Change-Id: I1a7f08cca8884ada42eca50ba802b4d1e0b788e0
But: T136568
---
M modules/echo.variables.less
M modules/styles/mw.echo.ui.DatedNotificationsWidget.less
M modules/styles/mw.echo.ui.NotificationsInboxWidget.less
M modules/styles/mw.echo.ui.SubGroupListWidget.less
4 files changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index 24b3d20..db1d2da 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -15,3 +15,4 @@
 @opacity-low: 0.5;
 @opacity-mid: 0.8;
 
+@specialpage-separation-unit: 0.7em;
diff --git a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less 
b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
index 20acc28..330f57a 100644
--- a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
+++ b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
@@ -1,3 +1,4 @@
+@import '../echo.variables';
 .mw-echo-ui-datedNotificationsWidget {
min-height: 5em;
 
@@ -7,8 +8,7 @@
overflow-y: auto;
 
&-header {
-   border-bottom: 1px #ccc solid;
-   margin-bottom: 0.5em;
+   margin-bottom: @specialpage-separation-unit;
}
}
 }
diff --git a/modules/styles/mw.echo.ui.NotificationsInboxWidget.less 
b/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
index b9dbe44..37964a9 100644
--- a/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
@@ -1,3 +1,4 @@
+@import '../echo.variables';
 .mw-echo-ui-notificationsInboxWidget {
&.oo-ui-pendingElement-pending .mw-echo-ui-datedSubGroupListWidget {
opacity: 0.5;
@@ -10,7 +11,7 @@
 
&-top {
display: table;
-   margin-bottom: 2em;
+   margin-bottom: 3 * @specialpage-separation-unit;
 
 
&-placeholder {
@@ -24,7 +25,7 @@
width: inherit;
margin-left: auto;
margin-right: auto;
-   margin-top: 2em;
+   margin-top: 3 * @specialpage-separation-unit;
}
 
&-pagination {
diff --git a/modules/styles/mw.echo.ui.SubGroupListWidget.less 
b/modules/styles/mw.echo.ui.SubGroupListWidget.less
index 95035eb..869c177 100644
--- a/modules/styles/mw.echo.ui.SubGroupListWidget.less
+++ b/modules/styles/mw.echo.ui.SubGroupListWidget.less
@@ -22,7 +22,6 @@
&-markAllReadButton {
display: table-cell;
text-align: right;
-   padding-bottom: 0.5em;
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] Make the notifications list the pending element - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Make the notifications list the pending element
..


Make the notifications list the pending element

Change the pending element to be the notifications list rather than
the whole inbox widget in the Special:Notifications page.

Bug: T136581
Change-Id: I82b073c9cd628f30c13305510d6604e3ef636c2a
---
M modules/styles/mw.echo.ui.DatedNotificationsWidget.less
M modules/styles/mw.echo.ui.NotificationsInboxWidget.less
M modules/ui/mw.echo.ui.NotificationsInboxWidget.js
3 files changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less 
b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
index 20acc28..523568f 100644
--- a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
+++ b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
@@ -1,6 +1,14 @@
 .mw-echo-ui-datedNotificationsWidget {
min-height: 5em;
 
+   // We want everything inside the widget to be
+   // pending/transparent, but not the widget itself
+   // because otherwise, the background pending animation
+   // is also transparent.
+   &.oo-ui-pendingElement-pending > * {
+   opacity: 0.5;
+   }
+
.mw-echo-ui-subGroupListWidget {
// This is a hack to make sure that this widget
// is the nearest scrollable widget for the submenus
diff --git a/modules/styles/mw.echo.ui.NotificationsInboxWidget.less 
b/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
index b9dbe44..fdd6c3e 100644
--- a/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
@@ -1,8 +1,4 @@
 .mw-echo-ui-notificationsInboxWidget {
-   &.oo-ui-pendingElement-pending .mw-echo-ui-datedSubGroupListWidget {
-   opacity: 0.5;
-   }
-
&-toolbar {
&-row {
display: table-row;
diff --git a/modules/ui/mw.echo.ui.NotificationsInboxWidget.js 
b/modules/ui/mw.echo.ui.NotificationsInboxWidget.js
index 22076c4..1e5f0f8 100644
--- a/modules/ui/mw.echo.ui.NotificationsInboxWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationsInboxWidget.js
@@ -35,6 +35,7 @@
$overlay: this.$overlay
}
);
+   this.setPendingElement( this.datedListWidget.$element );
 
// Pagination
// TODO: Separate the pagination controls and labels to

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Followup to I7c13506b1a38f03815481651fd13411f7... - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Followup to 
I7c13506b1a38f03815481651fd13411f7cf7c0c9
..


dynamicproxy: Followup to I7c13506b1a38f03815481651fd13411f7cf7c0c9

Since the uwsgi::app defines the service to be running anyway.
This is not necessary, and adding it makes puppet barf.

Change-Id: Iedba15ea406102cbb5ff5ca8f5d9cc261804a642
---
M modules/dynamicproxy/manifests/api.pp
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index 11579e5..e049db4 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -31,10 +31,6 @@
 subscribe => File['/usr/local/bin/invisible-unicorn.py'],
 }
 
-service { 'uwsgi-invisible-unicorn':
-ensure  => running,
-}
-
 file { '/etc/dynamicproxy-api':
 ensure => directory,
 owner  => 'www-data',

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

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

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

[MediaWiki-commits] [Gerrit] dynamicproxy: Followup to I7c13506b1a38f03815481651fd13411f7... - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: dynamicproxy: Followup to 
I7c13506b1a38f03815481651fd13411f7cf7c0c9
..

dynamicproxy: Followup to I7c13506b1a38f03815481651fd13411f7cf7c0c9

Since the uwsgi::app defines the service to be running anyway.
This is not necessary, and adding it makes puppet barf.

Change-Id: Iedba15ea406102cbb5ff5ca8f5d9cc261804a642
---
M modules/dynamicproxy/manifests/api.pp
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/291853/1

diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index 11579e5..e049db4 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -31,10 +31,6 @@
 subscribe => File['/usr/local/bin/invisible-unicorn.py'],
 }
 
-service { 'uwsgi-invisible-unicorn':
-ensure  => running,
-}
-
 file { '/etc/dynamicproxy-api':
 ensure => directory,
 owner  => 'www-data',

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

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

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

[MediaWiki-commits] [Gerrit] Make the notifications list the pending element - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Make the notifications list the pending element
..

Make the notifications list the pending element

Change the pending element to be the notifications list rather than
the whole inbox widget in the Special:Notifications page.

Bug: T136581
Change-Id: I82b073c9cd628f30c13305510d6604e3ef636c2a
---
M modules/styles/mw.echo.ui.DatedNotificationsWidget.less
M modules/styles/mw.echo.ui.NotificationsInboxWidget.less
M modules/ui/mw.echo.ui.NotificationsInboxWidget.js
3 files changed, 9 insertions(+), 4 deletions(-)


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

diff --git a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less 
b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
index 20acc28..523568f 100644
--- a/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
+++ b/modules/styles/mw.echo.ui.DatedNotificationsWidget.less
@@ -1,6 +1,14 @@
 .mw-echo-ui-datedNotificationsWidget {
min-height: 5em;
 
+   // We want everything inside the widget to be
+   // pending/transparent, but not the widget itself
+   // because otherwise, the background pending animation
+   // is also transparent.
+   &.oo-ui-pendingElement-pending > * {
+   opacity: 0.5;
+   }
+
.mw-echo-ui-subGroupListWidget {
// This is a hack to make sure that this widget
// is the nearest scrollable widget for the submenus
diff --git a/modules/styles/mw.echo.ui.NotificationsInboxWidget.less 
b/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
index b9dbe44..fdd6c3e 100644
--- a/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationsInboxWidget.less
@@ -1,8 +1,4 @@
 .mw-echo-ui-notificationsInboxWidget {
-   &.oo-ui-pendingElement-pending .mw-echo-ui-datedSubGroupListWidget {
-   opacity: 0.5;
-   }
-
&-toolbar {
&-row {
display: table-row;
diff --git a/modules/ui/mw.echo.ui.NotificationsInboxWidget.js 
b/modules/ui/mw.echo.ui.NotificationsInboxWidget.js
index 22076c4..1e5f0f8 100644
--- a/modules/ui/mw.echo.ui.NotificationsInboxWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationsInboxWidget.js
@@ -35,6 +35,7 @@
$overlay: this.$overlay
}
);
+   this.setPendingElement( this.datedListWidget.$element );
 
// Pagination
// TODO: Separate the pagination controls and labels to

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

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

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

[MediaWiki-commits] [Gerrit] Attempt to fix dynamicproxy-api service - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: Attempt to fix dynamicproxy-api service
..


Attempt to fix dynamicproxy-api service

Puppet is broken on labs-dynamicproxy-test.openstack.eqiad.wmflabs
because /lib/systemd/system/invisible-unicorn.service does not exist,
But /lib/systemd/system/uwsgi-invisible-unicorn.service does.

Change-Id: I7c13506b1a38f03815481651fd13411f7cf7c0c9
---
M modules/dynamicproxy/manifests/api.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index bc26126..11579e5 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -31,7 +31,7 @@
 subscribe => File['/usr/local/bin/invisible-unicorn.py'],
 }
 
-service { 'invisible-unicorn':
+service { 'uwsgi-invisible-unicorn':
 ensure  => running,
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c13506b1a38f03815481651fd13411f7cf7c0c9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
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] Display a message if there are no notifications in Special:Page - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Display a message if there are no notifications in Special:Page
..

Display a message if there are no notifications in Special:Page

The zero results can either be because there are no notifications
at all for this user in the local wiki, or because there are no
results for the specific filter. Both messages are used for either
case.

Also, clean up the display of push/pop pending for the inbox widget
and hide the label in case the message count is 0 or 1 notifications
as it is unhelpful and irrelevant in these cases.

Bug: T136586
Change-Id: I1465f772bb9f5247df645d6612f951e5fd7d38cf
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/api/mw.echo.api.EchoApi.js
M modules/controller/mw.echo.Controller.js
M modules/model/mw.echo.dm.ModelManager.js
M modules/model/mw.echo.dm.NotificationsList.js
M modules/model/mw.echo.dm.PaginationModel.js
M modules/styles/mw.echo.ui.NotificationsInboxWidget.less
M modules/ui/mw.echo.ui.NotificationsInboxWidget.js
M modules/ui/mw.echo.ui.PaginationWidget.js
11 files changed, 164 insertions(+), 15 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index 9cdbfce..8b1b63f 100644
--- a/Resources.php
+++ b/Resources.php
@@ -296,6 +296,7 @@
'notification-inbox-filter-read',
'notification-inbox-filter-unread',
'notification-inbox-filter-all',
+   'echo-notification-placeholder-filters',
'echo-more-info',
'echo-feedback',
'echo-specialpage-section-markread',
diff --git a/i18n/en.json b/i18n/en.json
index d193e0d..abff167 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -108,6 +108,7 @@
"echo-api-failure": "Failed to fetch notifications.",
"echo-api-failure-cross-wiki": "Access to the remote domain was 
denied.",
"echo-notification-placeholder": "There are no notifications.",
+   "echo-notification-placeholder-filters": "There are no notifications 
matching this criteria.",
"echo-notification-loginrequired": "You must login to see your 
notifications.",
"echo-notification-popup-loginrequired": "Please log in to view your 
notifications.",
"echo-notification-markasread": "Mark as read",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f03c35e..900a9ca 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -99,6 +99,7 @@
"echo-api-failure": "Label for the text that notes an error in 
retrieving notifications for the Echo popup.",
"echo-api-failure-cross-wiki": "Label for the api failure text for a 
failure to fetch cross-wiki notifications, but the remote server is not granted 
access.",
"echo-notification-placeholder": "Label for the text that appears if 
there are no notifications in the Echo popup.",
+   "echo-notification-placeholder-filters": "Label for the text that 
appears if there are no notifications in the Special:Notifications page with 
filters selected.",
"echo-notification-loginrequired": "Message that displays when an 
anonymous user attempts to view notifications and gets redirect to the login 
page.",
"echo-notification-popup-loginrequired": "Message that displays when an 
anonymous user attempts to view notifications in their popup after a session 
expired.",
"echo-notification-markasread": "Label for the button to mark the 
notification as read.",
diff --git a/modules/api/mw.echo.api.EchoApi.js 
b/modules/api/mw.echo.api.EchoApi.js
index c0de083..f4aee2f 100644
--- a/modules/api/mw.echo.api.EchoApi.js
+++ b/modules/api/mw.echo.api.EchoApi.js
@@ -189,4 +189,7 @@
return this.network.getApiHandler( source 
).getFetchNotificationPromise( type );
};
 
+   mw.echo.api.EchoApi.prototype.getLimit = function () {
+   return this.limit;
+   };
 } )( mediaWiki );
diff --git a/modules/controller/mw.echo.Controller.js 
b/modules/controller/mw.echo.Controller.js
index 7fad2b5..bfd2081 100644
--- a/modules/controller/mw.echo.Controller.js
+++ b/modules/controller/mw.echo.Controller.js
@@ -76,6 +76,7 @@
filters = this.manager.getFiltersModel(),
continueValue = pagination.getPageContinue( page || 
pagination.getCurrPageIndex() );
 
+   pagination.setItemsPerPage( this.api.getLimit() );
return this.api.fetchNotifications(
this.manager.getTypeString(),
'local',
@@ -84,7 +85,7 @@
filters.getReadState()
)
.then( function ( data ) {
-   var i, notifData, newNotifData, date, 
itemModel, 

[MediaWiki-commits] [Gerrit] dynamicproxy: Migrate to python3 - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Migrate to python3
..


dynamicproxy: Migrate to python3

Change-Id: Ibf7ed28c56c2c0771e88408cb417547b9a44f1b9
---
M modules/dynamicproxy/manifests/api.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/dynamicproxy/manifests/api.pp 
b/modules/dynamicproxy/manifests/api.pp
index 0a5bb35..bc26126 100644
--- a/modules/dynamicproxy/manifests/api.pp
+++ b/modules/dynamicproxy/manifests/api.pp
@@ -14,12 +14,12 @@
 mode   => '0555',
 }
 
-require_package('python-flask', 'python-redis', 'python-flask-sqlalchemy')
+require_package('python3-flask', 'python3-redis', 
'python3-flask-sqlalchemy')
 
 uwsgi::app { 'invisible-unicorn':
 settings  => {
 uwsgi => {
-plugins=> 'python',
+plugins=> 'python3',
 master => true,
 http-socket=> '0.0.0.0:5668',
 mount  => 
'/dynamicproxy-api=/usr/local/bin/invisible-unicorn.py',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf7ed28c56c2c0771e88408cb417547b9a44f1b9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
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] Fix packaging issues - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Fix packaging issues
..

Fix packaging issues

- Added plugin-descriptor.properties.
- Setting direct dep to 2.3.1 for testing I'll try to make the plugin version to
  match elastic version when releasing.
- Fixed javadoc problems causing build failures when using latest oracle jdk
- Changed the plugin name seen by elasticsearch to experimental-highlighter

Change-Id: I0602d913c009c369ad374b8634eeb14bfc9d2899
---
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-elasticsearch-plugin/src/main/assemblies/plugin.xml
D 
experimental-highlighter-elasticsearch-plugin/src/main/resources/es-plugin.properties
A 
experimental-highlighter-elasticsearch-plugin/src/main/resources/plugin-metadata/plugin-descriptor.properties
M pom.xml
8 files changed, 35 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/49/291849/1

diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
index 1913f61..8ba9214 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
@@ -3,7 +3,7 @@
 import org.wikimedia.search.highlighter.experimental.extern.PriorityQueue;
 
 /**
- * Like Comparator but only determines if a < b.  Useful for working with 
{@link PriorityQueue}
+ * Like Comparator but only determines if a  b.  Useful for working with 
{@link PriorityQueue}
  */
 public interface LessThan {
 boolean lessThan(T a, T b);
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
index 18f5c0d..f799cb2 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
@@ -8,6 +8,8 @@
 /**
  * Caches results from another TermWeigher. Obviously, this is only
  * useful if the wrapped TermWeigher is slow.
+ *
+ * @param  the type holding the terms
  */
 public class CachingTermWeigher implements TermWeigher {
 private final Cache cache;
@@ -19,6 +21,7 @@
  * A note for Lucene users: This constructor won't work with BytesRef
  * because it doesn't clone the BytesRef.
  * 
+ * @param next the weigher to cache
  */
 public CachingTermWeigher(TermWeigher next) {
 this(new MapCache(new HashMap()), next);
@@ -26,6 +29,8 @@
 
 /**
  * Build with a provided cache.
+ * @param cache the cache backend to use
+ * @param next the term weigher to cache
  */
 public CachingTermWeigher(Cache cache, TermWeigher next) {
 this.cache = cache;
@@ -50,13 +55,13 @@
 /**
  * Get a cached weight if there is one.
  * @param term to lookup
- * @return if >= 0 then the cached weight, otherwise a signal that the 
weight is not found
+ * @return if ≥ 0 then the cached weight, otherwise a signal that the 
weight is not found
  */
 float get(T term);
 /**
  * Add a weight to the cache.
  * @param term the term
- * @param weight the weight, will be >= 0
+ * @param weight the weight, will be ≥ 0
  */
 void put(T term, float weight);
 }
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
index 18af67f..fe5ecc6 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
@@ -10,8 +10,9 @@
  * at a time. The reasons it can't do more then one extracter at a time are:
  * 
  

[MediaWiki-commits] [Gerrit] Setup 2.2 branch for 2.2.2 release - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Setup 2.2 branch for 2.2.2 release
..

Setup 2.2 branch for 2.2.2 release

Change-Id: Id7df1124867060d4a7bd760e9d0cfb5d408d0cb2
---
M .gitreview
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
6 files changed, 9 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/48/291848/1

diff --git a/.gitreview b/.gitreview
index 884c139..6d8a2df 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=search/highlighter.git
-defaultbranch=master
+defaultbranch=2.2
 defaultrebase=0
diff --git a/README.md b/README.md
index f1eb4f1..cce0d30 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
 
 | Experimental Highlighter Plugin |  ElasticSearch  |
 |-|-|
-| 2.2.0, master branch| 2.2.x   |
+| 2.2.2, 2.2 branch   | 2.2.2   |
 | 2.1.0, 2.1 branch   | 2.1.x   |
 | 2.0.0, 2.0 branch   | 2.0.x   |
 | 1.7.0 -> 1.7.1, 1.7 branch  | 1.7.X   |
diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index 4732d08..f92afa7 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.2.0-SNAPSHOT
+2.2.2-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index 2ce9093..33b2af6 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.2.0-SNAPSHOT
+2.2.2-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 0f61688..e5ad596 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.2.0-SNAPSHOT
+2.2.2-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index ecbd007..65d5786 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.2.0-SNAPSHOT
+  2.2.2-SNAPSHOT
   pom
 
   
@@ -49,7 +49,7 @@
 
   
 UTF-8
-2.2.1
+2.2.2
 
 5.4.1
@@ -133,13 +133,9 @@
   
 ${skip.unit.tests}
 
-  
+  
   
-  
+  
 
 20
 warn

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7df1124867060d4a7bd760e9d0cfb5d408d0cb2
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: 2.2
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] Fix security violations - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Fix security violations
..

Fix security violations

Plugins are now loaded in their own ClassLoader. It is no more possible to use
the package trick to access package visibles members/methods owned by
elasticsearch/lucene.  This patch removes all org.elasticsearch and
org.apache.lucene packages.  Unfortunately this was not seen by integration
tests because we use the same classloader.

Change-Id: I7f72c6af3f7e61eca0bd2e4a4f89f325107d83d8
---
D 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
R 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
R 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/FieldWrapper.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/plugin/ExperimentalHighlighterModule.java
R 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/automaton/OffsetReturningRunAutomaton.java
M 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/AutomatonHitEnum.java
7 files changed, 46 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/50/291850/1

diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
deleted file mode 100644
index 2becd87..000
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.elasticsearch.search.highlight;
-
-import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
-
-/**
- * Wraps Lucene's XTooComplexToDeterminizeException to be serializable to be
- * thrown over the wire.
- */
-public class RegexTooComplexException extends RuntimeException {
-private static final long serialVersionUID = -41975279199116247L;
-
-public RegexTooComplexException(TooComplexToDeterminizeException e) {
-super(e.getMessage());
-}
-}
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
index 20e29d3..8d74fe0 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
+++ 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.search.highlight.FieldWrapper;
 import org.wikimedia.search.highlighter.experimental.Segmenter;
 import org.wikimedia.search.highlighter.experimental.snippet.MultiSegmenter;
 
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
similarity index 94%
rename from 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
rename to 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
index 30d4b2c..1605e3c 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
+++ 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
@@ -1,4 +1,4 @@
-package org.elasticsearch.search.highlight;
+package org.wikimedia.highlighter.experimental.elasticsearch;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,7 +13,6 @@
 
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.automaton.RegExp;
-import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.ESLoggerFactory;
 import 

[MediaWiki-commits] [Gerrit] Setup 2.1 branch for 2.1.2 release - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Setup 2.1 branch for 2.1.2 release
..

Setup 2.1 branch for 2.1.2 release

Change-Id: I4cef9452f1eb757d3a58e80b0394aae391afacf0
---
M .gitreview
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
6 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/45/291845/1

diff --git a/.gitreview b/.gitreview
index 884c139..2da6133 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=search/highlighter.git
-defaultbranch=master
+defaultbranch=2.1
 defaultrebase=0
diff --git a/README.md b/README.md
index cc90a8f..9e9998f 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
 
 | Experimental Highlighter Plugin |  ElasticSearch  |
 |-|-|
-| 2.1.0, master branch| 2.0.x   |
+| 2.1.2, 2.1 branch   | 2.1.2   |
 | 2.0.0, 2.0 branch   | 2.0.x   |
 | 1.7.0 -> 1.7.1, 1.7 branch  | 1.7.X   |
 | 1.6.0, 1.6 branch   | 1.6.X   |
diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index 3de9271..f73b4f3 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.1.0-SNAPSHOT
+2.1.2-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index e1164df..1edcb4d 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.1.0-SNAPSHOT
+2.1.2-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 0711fc8..675c824 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.1.0-SNAPSHOT
+2.1.2-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index e6053f1..6a14943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.1.0-SNAPSHOT
+  2.1.2-SNAPSHOT
   pom
 
   
@@ -49,7 +49,7 @@
 
   
 UTF-8
-2.1.0
+2.1.2
 
 5.3.1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cef9452f1eb757d3a58e80b0394aae391afacf0
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: 2.1
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] Fix packaging issues - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Fix packaging issues
..

Fix packaging issues

- Added plugin-descriptor.properties.
- Setting direct dep to 2.3.1 for testing I'll try to make the plugin version to
  match elastic version when releasing.
- Fixed javadoc problems causing build failures when using latest oracle jdk
- Changed the plugin name seen by elasticsearch to experimental-highlighter

Change-Id: Ic211c946ca435dc5784ca68fd652bc1a2b195b5f
---
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-elasticsearch-plugin/src/main/assemblies/plugin.xml
D 
experimental-highlighter-elasticsearch-plugin/src/main/resources/es-plugin.properties
A 
experimental-highlighter-elasticsearch-plugin/src/main/resources/plugin-metadata/plugin-descriptor.properties
M pom.xml
8 files changed, 36 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/46/291846/1

diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
index 1913f61..8ba9214 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
@@ -3,7 +3,7 @@
 import org.wikimedia.search.highlighter.experimental.extern.PriorityQueue;
 
 /**
- * Like Comparator but only determines if a < b.  Useful for working with 
{@link PriorityQueue}
+ * Like Comparator but only determines if a  b.  Useful for working with 
{@link PriorityQueue}
  */
 public interface LessThan {
 boolean lessThan(T a, T b);
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
index 18f5c0d..f799cb2 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
@@ -8,6 +8,8 @@
 /**
  * Caches results from another TermWeigher. Obviously, this is only
  * useful if the wrapped TermWeigher is slow.
+ *
+ * @param  the type holding the terms
  */
 public class CachingTermWeigher implements TermWeigher {
 private final Cache cache;
@@ -19,6 +21,7 @@
  * A note for Lucene users: This constructor won't work with BytesRef
  * because it doesn't clone the BytesRef.
  * 
+ * @param next the weigher to cache
  */
 public CachingTermWeigher(TermWeigher next) {
 this(new MapCache(new HashMap()), next);
@@ -26,6 +29,8 @@
 
 /**
  * Build with a provided cache.
+ * @param cache the cache backend to use
+ * @param next the term weigher to cache
  */
 public CachingTermWeigher(Cache cache, TermWeigher next) {
 this.cache = cache;
@@ -50,13 +55,13 @@
 /**
  * Get a cached weight if there is one.
  * @param term to lookup
- * @return if >= 0 then the cached weight, otherwise a signal that the 
weight is not found
+ * @return if ≥ 0 then the cached weight, otherwise a signal that the 
weight is not found
  */
 float get(T term);
 /**
  * Add a weight to the cache.
  * @param term the term
- * @param weight the weight, will be >= 0
+ * @param weight the weight, will be ≥ 0
  */
 void put(T term, float weight);
 }
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
index 18af67f..fe5ecc6 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
@@ -10,8 +10,9 @@
  * at a time. The reasons it can't do more then one extracter at a time are:
  * 
  

[MediaWiki-commits] [Gerrit] Fix security violations - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Fix security violations
..

Fix security violations

Plugins are now loaded in their own ClassLoader. It is no more possible to use
the package trick to access package visibles members/methods owned by
elasticsearch/lucene.  This patch removes all org.elasticsearch and
org.apache.lucene packages.  Unfortunately this was not seen by integration
tests because we use the same classloader.

Change-Id: Ie201f5de6e81fda45689d5a7c274c72eaf953c6c
---
D 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
R 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
R 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/FieldWrapper.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/plugin/ExperimentalHighlighterModule.java
R 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/automaton/OffsetReturningRunAutomaton.java
M 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/AutomatonHitEnum.java
7 files changed, 46 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/47/291847/1

diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
deleted file mode 100644
index 2becd87..000
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.elasticsearch.search.highlight;
-
-import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
-
-/**
- * Wraps Lucene's XTooComplexToDeterminizeException to be serializable to be
- * thrown over the wire.
- */
-public class RegexTooComplexException extends RuntimeException {
-private static final long serialVersionUID = -41975279199116247L;
-
-public RegexTooComplexException(TooComplexToDeterminizeException e) {
-super(e.getMessage());
-}
-}
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
index 20e29d3..8d74fe0 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
+++ 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.search.highlight.FieldWrapper;
 import org.wikimedia.search.highlighter.experimental.Segmenter;
 import org.wikimedia.search.highlighter.experimental.snippet.MultiSegmenter;
 
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
similarity index 94%
rename from 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
rename to 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
index 8b69d6b..6f8298e 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
+++ 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
@@ -1,4 +1,4 @@
-package org.elasticsearch.search.highlight;
+package org.wikimedia.highlighter.experimental.elasticsearch;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,7 +13,6 @@
 
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.automaton.RegExp;
-import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.ESLoggerFactory;
 import 

[MediaWiki-commits] [Gerrit] Fix security violations - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Fix security violations
..

Fix security violations

Plugins are now loaded in their own ClassLoader. It is no more possible to use
the package trick to access package visibles members/methods owned by
elasticsearch/lucene.  This patch removes all org.elasticsearch and
org.apache.lucene packages.  Unfortunately this was not seen by integration
tests because we use the same classloader.

Change-Id: Ic7d458b107d4b3f25d018f0792cbc02f38e0fb48
---
D 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
R 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
R 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/FieldWrapper.java
M 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/plugin/ExperimentalHighlighterModule.java
R 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/automaton/OffsetReturningRunAutomaton.java
M 
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/hit/AutomatonHitEnum.java
7 files changed, 46 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/44/291844/1

diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
deleted file mode 100644
index 2becd87..000
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/RegexTooComplexException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.elasticsearch.search.highlight;
-
-import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
-
-/**
- * Wraps Lucene's XTooComplexToDeterminizeException to be serializable to be
- * thrown over the wire.
- */
-public class RegexTooComplexException extends RuntimeException {
-private static final long serialVersionUID = -41975279199116247L;
-
-public RegexTooComplexException(TooComplexToDeterminizeException e) {
-super(e.getMessage());
-}
-}
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
index 20e29d3..8d74fe0 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
+++ 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/DelayedSegmenter.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.search.highlight.FieldWrapper;
 import org.wikimedia.search.highlighter.experimental.Segmenter;
 import org.wikimedia.search.highlighter.experimental.snippet.MultiSegmenter;
 
diff --git 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
similarity index 94%
rename from 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
rename to 
experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
index 8b69d6b..6f8298e 100644
--- 
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
+++ 
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/wikimedia/highlighter/experimental/elasticsearch/ExperimentalHighlighter.java
@@ -1,4 +1,4 @@
-package org.elasticsearch.search.highlight;
+package org.wikimedia.highlighter.experimental.elasticsearch;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,7 +13,6 @@
 
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.automaton.RegExp;
-import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.ESLoggerFactory;
 import 

[MediaWiki-commits] [Gerrit] Fix packaging issues - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Fix packaging issues
..

Fix packaging issues

- Added plugin-descriptor.properties.
- Setting direct dep to 2.3.1 for testing I'll try to make the plugin version to
  match elastic version when releasing.
- Fixed javadoc problems causing build failures when using latest oracle jdk
- Changed the plugin name seen by elasticsearch to experimental-highlighter

Change-Id: I54a7dd154fff8b4a0e7d2f1bbd04523b9e6e55d6
---
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
M 
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-elasticsearch-plugin/src/main/assemblies/plugin.xml
D 
experimental-highlighter-elasticsearch-plugin/src/main/resources/es-plugin.properties
A 
experimental-highlighter-elasticsearch-plugin/src/main/resources/plugin-metadata/plugin-descriptor.properties
M pom.xml
8 files changed, 36 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/43/291843/1

diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
index 1913f61..8ba9214 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/LessThan.java
@@ -3,7 +3,7 @@
 import org.wikimedia.search.highlighter.experimental.extern.PriorityQueue;
 
 /**
- * Like Comparator but only determines if a < b.  Useful for working with 
{@link PriorityQueue}
+ * Like Comparator but only determines if a  b.  Useful for working with 
{@link PriorityQueue}
  */
 public interface LessThan {
 boolean lessThan(T a, T b);
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
index 18f5c0d..f799cb2 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/CachingTermWeigher.java
@@ -8,6 +8,8 @@
 /**
  * Caches results from another TermWeigher. Obviously, this is only
  * useful if the wrapped TermWeigher is slow.
+ *
+ * @param  the type holding the terms
  */
 public class CachingTermWeigher implements TermWeigher {
 private final Cache cache;
@@ -19,6 +21,7 @@
  * A note for Lucene users: This constructor won't work with BytesRef
  * because it doesn't clone the BytesRef.
  * 
+ * @param next the weigher to cache
  */
 public CachingTermWeigher(TermWeigher next) {
 this(new MapCache(new HashMap()), next);
@@ -26,6 +29,8 @@
 
 /**
  * Build with a provided cache.
+ * @param cache the cache backend to use
+ * @param next the term weigher to cache
  */
 public CachingTermWeigher(Cache cache, TermWeigher next) {
 this.cache = cache;
@@ -50,13 +55,13 @@
 /**
  * Get a cached weight if there is one.
  * @param term to lookup
- * @return if >= 0 then the cached weight, otherwise a signal that the 
weight is not found
+ * @return if ≥ 0 then the cached weight, otherwise a signal that the 
weight is not found
  */
 float get(T term);
 /**
  * Add a weight to the cache.
  * @param term the term
- * @param weight the weight, will be >= 0
+ * @param weight the weight, will be ≥ 0
  */
 void put(T term, float weight);
 }
diff --git 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
index 18af67f..fe5ecc6 100644
--- 
a/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
+++ 
b/experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/source/NonMergingMultiSourceExtracter.java
@@ -10,8 +10,9 @@
  * at a time. The reasons it can't do more then one extracter at a time are:
  * 
  

[MediaWiki-commits] [Gerrit] Setup 2.0 branch for 2.0.2 release - change (search/highlighter)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Setup 2.0 branch for 2.0.2 release
..

Setup 2.0 branch for 2.0.2 release

Change-Id: Ica37bbadba8664fb13218338e1262c827e97251e
---
M .gitreview
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
6 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/42/291842/1

diff --git a/.gitreview b/.gitreview
index 884c139..0185262 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=search/highlighter.git
-defaultbranch=master
+defaultbranch=2.0
 defaultrebase=0
diff --git a/README.md b/README.md
index f55fafa..7425306 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
 
 | Experimental Highlighter Plugin |  ElasticSearch  |
 |-|-|
-| 2.0.0, master branch| 2.0.x   |
+| 2.0.2, 2.0 branch   | 2.0.2   |
 | 1.7.0 -> 1.7.1, 1.7 branch  | 1.7.X   |
 | 1.6.0, 1.6 branch   | 1.6.X   |
 | 1.5.0 -> 1.5.1, 1.5 branch  | 1.5.X   |
diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index 651e12a..92113c9 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.0.0-SNAPSHOT
+2.0.2-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index 6b0baf4..4bcc705 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.0.0-SNAPSHOT
+2.0.2-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index dceba0b..c32ea82 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.0.0-SNAPSHOT
+2.0.2-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 861ca20..5e7b460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.0.0-SNAPSHOT
+  2.0.2-SNAPSHOT
   pom
 
   
@@ -49,7 +49,7 @@
 
   
 UTF-8
-2.0.0
+2.0.2
 
 5.2.1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica37bbadba8664fb13218338e1262c827e97251e
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: 2.0
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] BetaFeatures: Bump dates, list departments, drop now-graduat... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: BetaFeatures: Bump dates, list departments, drop now-graduated 
Notifications one
..


BetaFeatures: Bump dates, list departments, drop now-graduated Notifications one

Noting that the Flow personal opt-in has special permission. New dates are six 
months
after master commit of the most recent significant (user-facing) change – 
version bumps
etc. don't count.

Change-Id: I48b7c3650dcd8008a6a5d94ebaf9308c043fd596
---
M wmf-config/InitialiseSettings.php
1 file changed, 7 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a61ce39..d952164 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12554,14 +12554,13 @@
 // DO NOT add entries here without OK from Greg Grossmeier or James Forrester.
 'wgBetaFeaturesWhitelist' => [
'default' => [
-   'visualeditor-enable',  // VisualEditor – 
on-going (special permission)
-   'uls-compact-links',// ! 2015-05-03 – 
Compact language links
-   'popups',   // 2016-01-16 – 
Hovercards
-   'beta-feature-flow-user-talk-page', // 2016-03-02 - 
Flow opt-in
-   'cx',   // 2016-05-08 - 
ContentTranslation
-   'read-more',// 2016-06-10 - 
Read more
-   'cirrussearch-completionsuggester', // 2016-06-17 - 
Completion Suggester / type as you search
-   'echo-cross-wiki-notifications',// 2016-07-19 - 
Enhanced/cross-wiki notifications
+   'visualeditor-enable',  // [Editing] 
On-going (special permission) – VisualEditor
+   'beta-feature-flow-user-talk-page', // [Editing] 
On-going (special permission) – Flow opt-in
+   'uls-compact-links',// [Editing] 
2016-11-23 – Compact language links
+   'popups',   // [Reading] 
2016-11-26 – Hovercards
+   'cx',   // [Editing] 
2016-11-07 - ContentTranslation
+   'read-more',// [Reading] 
2016-11-11 - Read more
+   'cirrussearch-completionsuggester', // [Discovery] 
2016-11-27 - Completion Suggester / type as you search
],
 ],
 

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

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

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

[MediaWiki-commits] [Gerrit] tools: Allow bastions to talk to flannel etcd - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: tools: Allow bastions to talk to flannel etcd
..


tools: Allow bastions to talk to flannel etcd

Bug: T136413
Change-Id: Ic9954742f46aab94effbb686365197601888d824
---
M modules/role/manifests/toollabs/etcd/flannel.pp
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/modules/role/manifests/toollabs/etcd/flannel.pp 
b/modules/role/manifests/toollabs/etcd/flannel.pp
index 84f3516..1113b0b 100644
--- a/modules/role/manifests/toollabs/etcd/flannel.pp
+++ b/modules/role/manifests/toollabs/etcd/flannel.pp
@@ -3,19 +3,20 @@
 
 include base::firewall
 
-$worker_nodes = join(hiera('k8s::worker_hosts'), ' ')
-$peer_nodes = join(hiera('flannel::etcd_hosts'), ' ')
-$proxy_nodes = join(hiera('toollabs::proxy::proxies'), ' ')
+$worker_hosts = join(hiera('k8s::worker_hosts'), ' ')
+$bastion_hosts = join(hiera('k8s::bastion_hosts'), ' ')
+$peer_hosts = join(hiera('flannel::etcd_hosts'), ' ')
+$proxy_hosts = join(hiera('toollabs::proxy::proxies'), ' ')
 
 ferm::service { 'flannel-clients':
 proto  => 'tcp',
 port   => '2379',
-srange => "@resolve((${worker_nodes} ${peer_nodes} ${proxy_nodes}))"
+srange => "@resolve((${worker_hosts} ${peer_hosts} ${proxy_hosts} 
${bastion_hosts}))"
 }
 
 ferm::service { 'flannel-peers':
 proto  => 'tcp',
 port   => '2380',
-srange => "@resolve((${peer_nodes}))"
+srange => "@resolve((${peer_hosts}))"
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] tools: Allow bastions to talk to flannel etcd - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Allow bastions to talk to flannel etcd
..

tools: Allow bastions to talk to flannel etcd

Bug: T136413
Change-Id: Ic9954742f46aab94effbb686365197601888d824
---
M modules/role/manifests/toollabs/etcd/flannel.pp
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/291841/1

diff --git a/modules/role/manifests/toollabs/etcd/flannel.pp 
b/modules/role/manifests/toollabs/etcd/flannel.pp
index 84f3516..1113b0b 100644
--- a/modules/role/manifests/toollabs/etcd/flannel.pp
+++ b/modules/role/manifests/toollabs/etcd/flannel.pp
@@ -3,19 +3,20 @@
 
 include base::firewall
 
-$worker_nodes = join(hiera('k8s::worker_hosts'), ' ')
-$peer_nodes = join(hiera('flannel::etcd_hosts'), ' ')
-$proxy_nodes = join(hiera('toollabs::proxy::proxies'), ' ')
+$worker_hosts = join(hiera('k8s::worker_hosts'), ' ')
+$bastion_hosts = join(hiera('k8s::bastion_hosts'), ' ')
+$peer_hosts = join(hiera('flannel::etcd_hosts'), ' ')
+$proxy_hosts = join(hiera('toollabs::proxy::proxies'), ' ')
 
 ferm::service { 'flannel-clients':
 proto  => 'tcp',
 port   => '2379',
-srange => "@resolve((${worker_nodes} ${peer_nodes} ${proxy_nodes}))"
+srange => "@resolve((${worker_hosts} ${peer_hosts} ${proxy_hosts} 
${bastion_hosts}))"
 }
 
 ferm::service { 'flannel-peers':
 proto  => 'tcp',
 port   => '2380',
-srange => "@resolve((${peer_nodes}))"
+srange => "@resolve((${peer_hosts}))"
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] [ReplaceText] Add npm test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [ReplaceText] Add npm test
..

[ReplaceText] Add npm test

Also move jsonlint and jshint to check: for non-whitelisted users.

Requires If89e3c94c49cc4d0f9ca7fa30cbfed772ba58493

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/291840/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d419ef3..c9e22df 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7059,9 +7059,11 @@
 
   - name: mediawiki/extensions/ReplaceText
 template:
-  - name: jshint
-  - name: jsonlint
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
+  - jshint
 
   - name: mediawiki/extensions/RSS
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa64b80fa3b79615cd3e82482facdfe06a5f495f
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] Add npm entry point - change (mediawiki...ReplaceText)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add npm entry point
..

Add npm entry point

Change-Id: If89e3c94c49cc4d0f9ca7fa30cbfed772ba58493
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 43 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReplaceText 
refs/changes/39/291839/1

diff --git a/.gitignore b/.gitignore
index 98b092a..189373c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *~
 *.kate-swp
 .*.swp
+node_modules/**
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..2759c87
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,31 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: false
+   },
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
+   },
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '*.json',
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..c1d398e
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "1.0.1",
+"grunt-contrib-jshint": "1.0.0",
+"grunt-banana-checker": "0.5.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If89e3c94c49cc4d0f9ca7fa30cbfed772ba58493
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReplaceText
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] [ReplaceSet] Add composer-test test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [ReplaceSet] Add composer-test test
..

[ReplaceSet] Add composer-test test

Requires Id48228a7e90ed474ba11f3e6eea4a677c5488c03

Change-Id: I0783b9c194a4952f4731ab28435d4e9e51cebb77
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/38/291838/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d419ef3..1e719a4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7053,6 +7053,7 @@
 
   - name: mediawiki/extensions/ReplaceSet
 template:
+  - name: composer-test
   - name: jsonlint
   - name: jshint
   - name: extension-unittests-generic

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0783b9c194a4952f4731ab28435d4e9e51cebb77
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] HTMLForm: Allow distinguishing between form views and submis... - change (mediawiki/core)

[Code Review]

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

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

Change subject: HTMLForm: Allow distinguishing between form views and 
submission attempts
..

HTMLForm: Allow distinguishing between form views and submission attempts

Calling HTMLForm::setFormIdentifier() will set an internal identifier
for this form. It will be submitted as a hidden form field, allowing
HTMLForm to determine whether the form was submitted (or just viewed).
Setting this serves two purposes:

* If you use two or more forms on one page, it allows HTMLForm to
  identify which of the forms was submitted, and not attempt to
  validate the other ones. (T102114)
* If you use checkbox or multiselect fields inside a form using the
  GET method, it allows HTMLForm to distinguish between the initial
  page view and a form submission with all checkboxes or select
  options unchecked. (T29676)

Bug: T102114
Bug: T29676
Change-Id: Ib6ce3fd8941be86211cff5c6932b5e84982490fa
---
M includes/htmlform/HTMLCheckField.php
M includes/htmlform/HTMLCheckMatrix.php
M includes/htmlform/HTMLForm.php
M includes/htmlform/HTMLFormField.php
M includes/htmlform/HTMLMultiSelectField.php
5 files changed, 76 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/291837/1

diff --git a/includes/htmlform/HTMLCheckField.php 
b/includes/htmlform/HTMLCheckField.php
index 4a6b804..5daf035 100644
--- a/includes/htmlform/HTMLCheckField.php
+++ b/includes/htmlform/HTMLCheckField.php
@@ -118,9 +118,9 @@
 
// GetCheck won't work like we want for checks.
// Fetch the value in either one of the two following case:
-   // - we have a valid token (form got posted or GET forged by 
the user)
+   // - we have a valid submit attempt (form got posted or GET 
forged by the user)
// - checkbox name has a value (false or true), ie is not null
-   if ( $request->getCheck( 'wpEditToken' ) || $request->getVal( 
$this->mName ) !== null ) {
+   if ( $this->isSubmitAttempt( $request ) || $request->getVal( 
$this->mName ) !== null ) {
return $invert
? !$request->getBool( $this->mName )
: $request->getBool( $this->mName );
diff --git a/includes/htmlform/HTMLCheckMatrix.php 
b/includes/htmlform/HTMLCheckMatrix.php
index 9f67233..b324fb6 100644
--- a/includes/htmlform/HTMLCheckMatrix.php
+++ b/includes/htmlform/HTMLCheckMatrix.php
@@ -225,22 +225,13 @@
 * @return array
 */
function loadDataFromRequest( $request ) {
-   if ( $this->mParent->getMethod() == 'post' ) {
-   if ( $request->wasPosted() ) {
-   // Checkboxes are not added to the request 
arrays if they're not checked,
-   // so it's perfectly possible for there not to 
be an entry at all
-   return $request->getArray( $this->mName, [] );
-   } else {
-   // That's ok, the user has not yet submitted 
the form, so show the defaults
-   return $this->getDefault();
-   }
-   } else {
-   // This is the impossible case: if we look at $_GET and 
see no data for our
-   // field, is it because the user has not yet submitted 
the form, or that they
-   // have submitted it with all the options unchecked. We 
will have to assume the
-   // latter, which basically means that you can't specify 
'positive' defaults
-   // for GET forms.
+   if ( $this->isSubmitAttempt( $request ) ) {
+   // Checkboxes are just not added to the request arrays 
if they're not checked,
+   // so it's perfectly possible for there not to be an 
entry at all
return $request->getArray( $this->mName, [] );
+   } else {
+   // That's ok, the user has not yet submitted the form, 
so show the defaults
+   return $this->getDefault();
}
}
 
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index de3e0ae..6246e0e 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -188,6 +188,7 @@
protected $mSubmitText;
protected $mSubmitTooltip;
 
+   protected $mFormIdentifier;
protected $mTitle;
protected $mMethod = 'post';
protected $mWasSubmitted = false;
@@ -478,7 +479,14 @@
}
 
# Load data from the request.
-   $this->loadData();
+   if (
+   !$this->mFormIdentifier ||
+

[MediaWiki-commits] [Gerrit] Display error message on API failure or empty result - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Display error message on API failure or empty result
..


Display error message on API failure or empty result

Show an API failure message if the request failed.
Also take this opportunity to show a message in case
there are no notifications at all.

Bug: T136467
Change-Id: If5761ec3d3df10a8774561bed06a4ade54458c4b
---
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
M modules/ui/mw.echo.ui.NotificationsListWidget.js
M modules/ui/mw.echo.ui.PlaceholderItemWidget.js
3 files changed, 15 insertions(+), 6 deletions(-)

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



diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js 
b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
index 4b366fa..a06a11f 100644
--- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
@@ -362,8 +362,8 @@
}
},
// Failure
-   function ( errObject ) {
-   
widget.notificationsWidget.resetLoadingOption( errObject.errInfo );
+   function () {
+   
widget.notificationsWidget.resetLoadingOption( mw.msg( 'echo-api-failure' ) );
}
)
.then( this.emit.bind( this, 'finishLoading' ) )
diff --git a/modules/ui/mw.echo.ui.NotificationsListWidget.js 
b/modules/ui/mw.echo.ui.NotificationsListWidget.js
index 70a3815..b4af11f 100644
--- a/modules/ui/mw.echo.ui.NotificationsListWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationsListWidget.js
@@ -149,7 +149,12 @@
// Reset the current items and re-add the new item widgets
this.clearItems();
this.addItems( itemWidgets );
-   this.resetLoadingOption();
+
+   this.resetLoadingOption(
+   itemWidgets.length === 0 ?
+   mw.msg( 'echo-notification-placeholder' ) :
+   ''
+   );
};
 
/**
@@ -194,9 +199,7 @@
itemWidgets = this.getItems();
 
for ( i = 0; i < itemWidgets.length; i++ ) {
-   if ( itemWidgets[ i ].resetInitiallyUnseen ) {
-   itemWidgets[ i ].resetInitiallyUnseen();
-   }
+   itemWidgets[ i ].resetInitiallyUnseen();
}
};
 } )( mediaWiki );
diff --git a/modules/ui/mw.echo.ui.PlaceholderItemWidget.js 
b/modules/ui/mw.echo.ui.PlaceholderItemWidget.js
index 5af299e..71eff32 100644
--- a/modules/ui/mw.echo.ui.PlaceholderItemWidget.js
+++ b/modules/ui/mw.echo.ui.PlaceholderItemWidget.js
@@ -85,4 +85,10 @@
mw.echo.ui.PlaceholderItemWidget.prototype.getId = function () {
return 0;
};
+
+   /**
+* Do nothing for resetInitiallyUnseen since it is requested by the 
list widget
+*/
+   mw.echo.ui.PlaceholderItemWidget.prototype.resetInitiallyUnseen = 
function () {};
+
 } )( mediaWiki, jQuery );

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

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

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

[MediaWiki-commits] [Gerrit] k8s: Ensure /etc/kubernetes is present wherever required - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: k8s: Ensure /etc/kubernetes is present wherever required
..


k8s: Ensure /etc/kubernetes is present wherever required

Change-Id: I932664528562393f0e03e5ad4997ec7007a18d94
---
M modules/k8s/manifests/infrastructure_config.pp
M modules/k8s/manifests/kubelet.pp
2 files changed, 8 insertions(+), 10 deletions(-)

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



diff --git a/modules/k8s/manifests/infrastructure_config.pp 
b/modules/k8s/manifests/infrastructure_config.pp
index 3bab4c1..b628c89 100644
--- a/modules/k8s/manifests/infrastructure_config.pp
+++ b/modules/k8s/manifests/infrastructure_config.pp
@@ -1,4 +1,11 @@
 class k8s::infrastructure_config {
+file { '/etc/kubernetes':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
 $users = hiera('k8s_users')
 # Ugly HACK!
 $client_token = inline_template("<%= @users.select { |u| u['name'] == 
'client-infrastructure' }[0]['token'] %>")
@@ -8,5 +15,6 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0400',
+require => File['/etc/kubernetes'],
 }
 }
diff --git a/modules/k8s/manifests/kubelet.pp b/modules/k8s/manifests/kubelet.pp
index d1e7834..ccc6b67 100644
--- a/modules/k8s/manifests/kubelet.pp
+++ b/modules/k8s/manifests/kubelet.pp
@@ -6,16 +6,6 @@
 include ::k8s::infrastructure_config
 
 file { [
-'/etc/kubernetes/',
-'/etc/kubernetes/manifests',
-]:
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-}
-
-file { [
 '/var/run/kubernetes',
 '/var/lib/kubelet',
 ] :

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I932664528562393f0e03e5ad4997ec7007a18d94
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Gehel 
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] BetaFeatures: Bump dates, list departments, drop now-graduat... - change (operations/mediawiki-config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: BetaFeatures: Bump dates, list departments, drop now-graduated 
Notifications one
..

BetaFeatures: Bump dates, list departments, drop now-graduated Notifications one

Noting that the Flow personal opt-in has special permission. New dates are six 
months
after master commit of the most recent significant (user-facing) change – 
version bumps
etc. don't count.

Change-Id: I48b7c3650dcd8008a6a5d94ebaf9308c043fd596
---
M wmf-config/InitialiseSettings.php
1 file changed, 7 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a61ce39..d952164 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12554,14 +12554,13 @@
 // DO NOT add entries here without OK from Greg Grossmeier or James Forrester.
 'wgBetaFeaturesWhitelist' => [
'default' => [
-   'visualeditor-enable',  // VisualEditor – 
on-going (special permission)
-   'uls-compact-links',// ! 2015-05-03 – 
Compact language links
-   'popups',   // 2016-01-16 – 
Hovercards
-   'beta-feature-flow-user-talk-page', // 2016-03-02 - 
Flow opt-in
-   'cx',   // 2016-05-08 - 
ContentTranslation
-   'read-more',// 2016-06-10 - 
Read more
-   'cirrussearch-completionsuggester', // 2016-06-17 - 
Completion Suggester / type as you search
-   'echo-cross-wiki-notifications',// 2016-07-19 - 
Enhanced/cross-wiki notifications
+   'visualeditor-enable',  // [Editing] 
On-going (special permission) – VisualEditor
+   'beta-feature-flow-user-talk-page', // [Editing] 
On-going (special permission) – Flow opt-in
+   'uls-compact-links',// [Editing] 
2016-11-23 – Compact language links
+   'popups',   // [Reading] 
2016-11-26 – Hovercards
+   'cx',   // [Editing] 
2016-11-07 - ContentTranslation
+   'read-more',// [Reading] 
2016-11-11 - Read more
+   'cirrussearch-completionsuggester', // [Discovery] 
2016-11-27 - Completion Suggester / type as you search
],
 ],
 

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

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

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

[MediaWiki-commits] [Gerrit] Fix encryption code in Session - change (mediawiki/core)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix encryption code in Session
..

Fix encryption code in Session

* verify that the algorithm that's about to be used is available
* fix exception namespace

Bug: T136587
Change-Id: I9f8636bef0e10b4f2b8bfe232a26a8c33376ca04
---
M includes/session/Session.php
1 file changed, 11 insertions(+), 4 deletions(-)


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

diff --git a/includes/session/Session.php b/includes/session/Session.php
index 3d48101..f694b36 100644
--- a/includes/session/Session.php
+++ b/includes/session/Session.php
@@ -425,15 +425,22 @@
// Encrypt
// @todo: import a pure-PHP library for AES instead of doing 
$wgSessionInsecureSecrets
$iv = \MWCryptRand::generate( 16, true );
-   if ( function_exists( 'openssl_encrypt' ) ) {
+   if (
+   function_exists( 'openssl_encrypt' )
+   && in_array( 'aes-256-ctr', 
openssl_get_cipher_methods(), true )
+   ) {
$ciphertext = openssl_encrypt( $serialized, 
'aes-256-ctr', $encKey, OPENSSL_RAW_DATA, $iv );
if ( $ciphertext === false ) {
-   throw new UnexpectedValueException( 'Encryption 
failed: ' . openssl_error_string() );
+   throw new \UnexpectedValueException( 
'Encryption failed: ' . openssl_error_string() );
}
-   } elseif ( function_exists( 'mcrypt_encrypt' ) ) {
+   } elseif (
+   function_exists( 'mcrypt_encrypt' )
+   && in_array( 'rijndael-128', mcrypt_list_algorithms(), 
true )
+   && in_array( 'ctr', mcrypt_list_modes(), true )
+   ) {
$ciphertext = mcrypt_encrypt( 'rijndael-128', $encKey, 
$serialized, 'ctr', $iv );
if ( $ciphertext === false ) {
-   throw new UnexpectedValueException( 'Encryption 
failed' );
+   throw new \UnexpectedValueException( 
'Encryption failed' );
}
} elseif ( $wgSessionInsecureSecrets ) {
$ex = new \Exception( 'No encryption is available, 
storing data as plain text' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f8636bef0e10b4f2b8bfe232a26a8c33376ca04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Use commandRegistry from current surface, not target - change (mediawiki...Cite)

[jenkins-bot (Code Review)]

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

Change subject: Use commandRegistry from current surface, not target
..


Use commandRegistry from current surface, not target

This shouldn't make a difference for any current implementations
but in the future different surfaces my have different commands.

Change-Id: I383a4a76cda142107da2f8aa1c6a90c4307e3b97
---
M modules/ve-cite/ve.ce.MWReferenceNode.js
M modules/ve-cite/ve.ui.MWReferenceDialog.js
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-cite/ve.ce.MWReferenceNode.js 
b/modules/ve-cite/ve.ce.MWReferenceNode.js
index 86a566b..d90f457 100644
--- a/modules/ve-cite/ve.ce.MWReferenceNode.js
+++ b/modules/ve-cite/ve.ce.MWReferenceNode.js
@@ -103,7 +103,7 @@
if ( items.length ) {
contextItem = ve.ui.contextItemFactory.lookup( items[ 0 ].name 
);
if ( contextItem ) {
-   command = ve.init.target.commandRegistry.lookup( 
contextItem.static.commandName );
+   command = 
this.getRoot().getSurface().getSurface().commandRegistry.lookup( 
contextItem.static.commandName );
if ( command ) {
command.execute( 
this.focusableSurface.getSurface() );
}
diff --git a/modules/ve-cite/ve.ui.MWReferenceDialog.js 
b/modules/ve-cite/ve.ui.MWReferenceDialog.js
index 8e65f20..3764677 100644
--- a/modules/ve-cite/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-cite/ve.ui.MWReferenceDialog.js
@@ -244,7 +244,7 @@
this.referenceTarget.destroy();
}
 
-   citeCommands = Object.keys( ve.init.target.commandRegistry.registry 
).filter( function ( command ) {
+   citeCommands = Object.keys( 
ve.init.target.getSurface().commandRegistry.registry ).filter( function ( 
command ) {
return command.indexOf( 'cite-' ) !== -1;
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I383a4a76cda142107da2f8aa1c6a90c4307e3b97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Display error message on API failure or empty result - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Display error message on API failure or empty result
..

Display error message on API failure or empty result

Show an API failure message if the request failed.
Also take this opportunity to show a message in case
there are no notifications at all.

Bug: T136467
Change-Id: If5761ec3d3df10a8774561bed06a4ade54458c4b
---
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
M modules/ui/mw.echo.ui.NotificationsListWidget.js
M modules/ui/mw.echo.ui.PlaceholderItemWidget.js
3 files changed, 14 insertions(+), 3 deletions(-)


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

diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js 
b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
index 4b366fa..a06a11f 100644
--- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
@@ -362,8 +362,8 @@
}
},
// Failure
-   function ( errObject ) {
-   
widget.notificationsWidget.resetLoadingOption( errObject.errInfo );
+   function () {
+   
widget.notificationsWidget.resetLoadingOption( mw.msg( 'echo-api-failure' ) );
}
)
.then( this.emit.bind( this, 'finishLoading' ) )
diff --git a/modules/ui/mw.echo.ui.NotificationsListWidget.js 
b/modules/ui/mw.echo.ui.NotificationsListWidget.js
index 70a3815..8bf81a5 100644
--- a/modules/ui/mw.echo.ui.NotificationsListWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationsListWidget.js
@@ -149,7 +149,12 @@
// Reset the current items and re-add the new item widgets
this.clearItems();
this.addItems( itemWidgets );
-   this.resetLoadingOption();
+
+   this.resetLoadingOption(
+   itemWidgets.length === 0 ?
+   mw.msg( 'echo-notification-placeholder' ) :
+   ''
+   );
};
 
/**
diff --git a/modules/ui/mw.echo.ui.PlaceholderItemWidget.js 
b/modules/ui/mw.echo.ui.PlaceholderItemWidget.js
index 5af299e..71eff32 100644
--- a/modules/ui/mw.echo.ui.PlaceholderItemWidget.js
+++ b/modules/ui/mw.echo.ui.PlaceholderItemWidget.js
@@ -85,4 +85,10 @@
mw.echo.ui.PlaceholderItemWidget.prototype.getId = function () {
return 0;
};
+
+   /**
+* Do nothing for resetInitiallyUnseen since it is requested by the 
list widget
+*/
+   mw.echo.ui.PlaceholderItemWidget.prototype.resetInitiallyUnseen = 
function () {};
+
 } )( mediaWiki, jQuery );

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

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

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

[MediaWiki-commits] [Gerrit] raid/hpssacli: don't barf on HP SSD Smart Path configs - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: raid/hpssacli: don't barf on HP SSD Smart Path configs
..


raid/hpssacli: don't barf on HP SSD Smart Path configs

On systems with SSD arrays, one of the recommended HP configurations
-and as far as I know, the default- is to disable the BBU cache and use
a technology that's instead called "HP SSD Smart Path".

In these cases, dsa-check-hpssacli warns, as "controller slot=N show
status" returns "Cache: Not Configured", despite this being a valid
configuration.

It turns out that there is another field, per LD, called "LD
Acceleration Method" that can get the values of "Controller Cache",
"HP SSD Smart Path" or "All disabled"; the first two being OK, the
latter one indicative of a problem. Switch the check to use those
instead.

I've yet to see a controller in our infrastructure with a failed or
misconfigured cache, so I'm not entirely sure that a config with "LD
Acceleration Method: Controller Cache" and "Cache: Not Configured" would
not occur. That wouldn't make any sense though, so let's risk it :)

Change-Id: Iea7f1ce17c8ec0ba801ad02154b417e9068cf1dc
---
M modules/raid/files/dsa-check-hpssacli
1 file changed, 12 insertions(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  Volans: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/raid/files/dsa-check-hpssacli 
b/modules/raid/files/dsa-check-hpssacli
index 4f97a52..959198e 100755
--- a/modules/raid/files/dsa-check-hpssacli
+++ b/modules/raid/files/dsa-check-hpssacli
@@ -149,6 +149,14 @@
record('UNKNOWN');
}
}
+   if (/^ *LD Acceleration Method: (.*)$/) {
+   my $status = $1;
+   # can at least be "Controller Cache" or HP SSD 
Smart Path", both OK
+   if ($status eq 'All disabled') {
+   push @{$status{'Acceleration method'}}, 
"LD$logicaldrive disabled";
+   record('WARNING');
+   }
+   }
}
}
 
@@ -300,9 +308,12 @@
if (/^ *(.*) Status: (.*)$/) {
my $system = $1;
my $status = $2;
+
+   # skip the cache check, we track the LD Acceleration 
Method above
+   next if ($system eq 'Cache');
+
push @{$status{$status}}, $system;
if ($status ne 'OK') {
-   next if ($params->{'no-battery'} && $system eq 
'Cache');
next if ($params->{'no-battery'} && $system eq 
'Battery/Capacitor');
record('WARNING');
};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea7f1ce17c8ec0ba801ad02154b417e9068cf1dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Volans 
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 cloneWithData - change (mediawiki...Cite)

[jenkins-bot (Code Review)]

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

Change subject: Use cloneWithData
..


Use cloneWithData

Change-Id: Ibab88f333cd39aabc73a579e1b05fc9b830b6d86
---
M modules/ve-cite/ve.dm.MWReferenceModel.js
1 file changed, 6 insertions(+), 20 deletions(-)

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



diff --git a/modules/ve-cite/ve.dm.MWReferenceModel.js 
b/modules/ve-cite/ve.dm.MWReferenceModel.js
index ecf35a9..6fbc5c8 100644
--- a/modules/ve-cite/ve.dm.MWReferenceModel.js
+++ b/modules/ve-cite/ve.dm.MWReferenceModel.js
@@ -226,26 +226,12 @@
if ( this.deferDoc ) {
this.doc = this.deferDoc();
} else {
-   this.doc = new ve.dm.Document(
-   [
-   { type: 'paragraph', internal: { 
generated: 'wrapper' } },
-   { type: '/paragraph' },
-   { type: 'internalList' },
-   { type: '/internalList' }
-   ],
-   // htmlDocument
-   this.parentDoc.getHtmlDocument(),
-   // parentDocument
-   null,
-   // internalList
-   null,
-   // innerWhitespace
-   null,
-   // lang
-   this.parentDoc.getLang(),
-   // dir
-   this.parentDoc.getDir()
-   );
+   this.doc = this.parentDoc.cloneWithData( [
+   { type: 'paragraph', internal: { generated: 
'wrapper' } },
+   { type: '/paragraph' },
+   { type: 'internalList' },
+   { type: '/internalList' }
+   ] );
}
}
return this.doc;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibab88f333cd39aabc73a579e1b05fc9b830b6d86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Adding missing icon file - change (analytics/analytics.wikimedia.org)

[Nuria (Code Review)]

Nuria has uploaded a new change for review.

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

Change subject: Adding missing icon file
..

Adding missing icon file

Bug: T136217
Change-Id: I5ccce296e65cf257bb1705c0cb63c960a36466a2
---
A dashboards/fonts/icons.woff2
A dashboards/themes/default/assets/fonts
2 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/analytics.wikimedia.org 
refs/changes/33/291833/1

diff --git a/dashboards/fonts/icons.woff2 b/dashboards/fonts/icons.woff2
new file mode 100644
index 000..3311d58
--- /dev/null
+++ b/dashboards/fonts/icons.woff2
Binary files differ
diff --git a/dashboards/themes/default/assets/fonts 
b/dashboards/themes/default/assets/fonts
new file mode 12
index 000..aa3d3e3
--- /dev/null
+++ b/dashboards/themes/default/assets/fonts
@@ -0,0 +1 @@
+../../../fonts/
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ccce296e65cf257bb1705c0cb63c960a36466a2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/analytics.wikimedia.org
Gerrit-Branch: master
Gerrit-Owner: Nuria 

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

[MediaWiki-commits] [Gerrit] raid/hpssacli: don't barf on SATA + 6Gbps speed - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: raid/hpssacli: don't barf on SATA + 6Gbps speed
..


raid/hpssacli: don't barf on SATA + 6Gbps speed

SATA 3.0 actually supports an 6.0Gbps rate and we have systems having
that (e.g. lvs1012). dsa-check-hpssacli currently warns about them
because it seems to support only up to 3.0Gbps. Add support for it.

SATA 3.2 goes up to 16Gbps but I have not seen this in the wild yet, so
it's unknown how hpssacli would display such a thing. Avoid guessing it
for now.

Change-Id: I9207136b9539df1d0af0714f60357c46e25b7f8d
---
M modules/raid/files/dsa-check-hpssacli
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  Volans: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/raid/files/dsa-check-hpssacli 
b/modules/raid/files/dsa-check-hpssacli
index 220d65b..4f97a52 100755
--- a/modules/raid/files/dsa-check-hpssacli
+++ b/modules/raid/files/dsa-check-hpssacli
@@ -245,7 +245,7 @@
} elsif ($type eq 'SAS' || $type eq 'SAS+') {
$key = 'PHY Transfer Rate';
if ($value{'Interface Type'} eq 'SATA') {
-   $expected = [ '1.5Gbps', '3.0Gbps' ];
+   $expected = [ '1.5Gbps', '3.0Gbps', '6.0Gbps' ];
} elsif ($value{'PHY Count'} eq '2') {
if (defined($value{'Redundant Path(s)'})) {
$expected = [ '3.0GBPS, 3.0GBPS', 
'6.0GBPS, 6.0GBPS',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9207136b9539df1d0af0714f60357c46e25b7f8d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Volans 
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 commandRegistry from current surface, not target - change (mediawiki...Cite)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Use commandRegistry from current surface, not target
..

Use commandRegistry from current surface, not target

This shouldn't make a difference for any current implementations
but in the future different surfaces my have different commands.

Change-Id: I383a4a76cda142107da2f8aa1c6a90c4307e3b97
---
M modules/ve-cite/ve.ce.MWReferenceNode.js
M modules/ve-cite/ve.ui.MWReferenceDialog.js
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve-cite/ve.ce.MWReferenceNode.js 
b/modules/ve-cite/ve.ce.MWReferenceNode.js
index 86a566b..d90f457 100644
--- a/modules/ve-cite/ve.ce.MWReferenceNode.js
+++ b/modules/ve-cite/ve.ce.MWReferenceNode.js
@@ -103,7 +103,7 @@
if ( items.length ) {
contextItem = ve.ui.contextItemFactory.lookup( items[ 0 ].name 
);
if ( contextItem ) {
-   command = ve.init.target.commandRegistry.lookup( 
contextItem.static.commandName );
+   command = 
this.getRoot().getSurface().getSurface().commandRegistry.lookup( 
contextItem.static.commandName );
if ( command ) {
command.execute( 
this.focusableSurface.getSurface() );
}
diff --git a/modules/ve-cite/ve.ui.MWReferenceDialog.js 
b/modules/ve-cite/ve.ui.MWReferenceDialog.js
index 8e65f20..3764677 100644
--- a/modules/ve-cite/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-cite/ve.ui.MWReferenceDialog.js
@@ -244,7 +244,7 @@
this.referenceTarget.destroy();
}
 
-   citeCommands = Object.keys( ve.init.target.commandRegistry.registry 
).filter( function ( command ) {
+   citeCommands = Object.keys( 
ve.init.target.getSurface().commandRegistry.registry ).filter( function ( 
command ) {
return command.indexOf( 'cite-' ) !== -1;
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I383a4a76cda142107da2f8aa1c6a90c4307e3b97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
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] Add composer entry point with phplint and phpcs - change (mediawiki...ReplaceText)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add composer entry point with phplint and phpcs
..

Add composer entry point with phplint and phpcs

Bug: T136589
Change-Id: Id48228a7e90ed474ba11f3e6eea4a677c5488c03
---
M ReplaceText.php
A composer.json
A phpcs.xml
3 files changed, 23 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReplaceText 
refs/changes/31/291831/1

diff --git a/ReplaceText.php b/ReplaceText.php
index f07a90c..1367a9d 100644
--- a/ReplaceText.php
+++ b/ReplaceText.php
@@ -23,8 +23,9 @@
$wgMessagesDirs['ReplaceText'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['ReplaceTextAlias'] = __DIR__ . 
'/ReplaceText.alias.php';
/* wfWarn(
-   'Deprecated PHP entry point used for Replace Text extension. Please use 
wfLoadExtension instead, ' .
-   'see https://www.mediawiki.org/wiki/Extension_registration for more 
details.'
+   'Deprecated PHP entry point used for Replace Text extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
); */
return;
 }
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..d61810b
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   },
+   "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/291831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id48228a7e90ed474ba11f3e6eea4a677c5488c03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReplaceText
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] MediaWiki theme: Adjacent disabled ButtonGroup/SelectWidget ... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: MediaWiki theme: Adjacent disabled ButtonGroup/SelectWidget 
buttons border
..


MediaWiki theme: Adjacent disabled ButtonGroup/SelectWidget buttons border

Adding visible `border` to adjacent disabled
ButtonGroupWidget/ButtonSelectWidget buttons.
Also removing unnecessary `background-color` property.

Bug: T136571
Change-Id: I8418c3233dc0886b2662ea05265561bd53f030b1
---
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
2 files changed, 12 insertions(+), 6 deletions(-)

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



diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index e6da3d1..b704e02 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -144,10 +144,18 @@
}
}
 
-   &.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
-   background-color: @background-color-filled-disabled;
-   color: @color-disabled-framed;
-   border: 1px solid @border-color-disabled;
+   &.oo-ui-widget-disabled {
+   & > .oo-ui-buttonElement-button {
+   background-color: 
@background-color-filled-disabled;
+   color: @color-disabled-framed;
+   border: 1px solid @border-color-disabled;
+   }
+
+   & + .oo-ui-widget-disabled {
+   & > .oo-ui-buttonElement-button {
+   border-left-color: 
@color-disabled-framed;
+   }
+   }
}
 
&.oo-ui-widget-enabled {
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index c314a6e..1be715e 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -902,7 +902,6 @@
 
 .theme-oo-ui-buttonOptionWidget () {
padding: 0;
-   background-color: transparent;
 
&.oo-ui-optionWidget-selected,
&.oo-ui-optionWidget-pressed,
@@ -1141,7 +1140,6 @@
 
 .theme-oo-ui-buttonSelectWidget () {
border-radius: @border-radius-default;
-
.oo-ui-inline-spacing( 0.5em );
 
&:focus {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8418c3233dc0886b2662ea05265561bd53f030b1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Pginer 
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 cloneWithData - change (mediawiki...Cite)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Use cloneWithData
..

Use cloneWithData

Change-Id: Ibab88f333cd39aabc73a579e1b05fc9b830b6d86
---
M modules/ve-cite/ve.dm.MWReferenceModel.js
1 file changed, 6 insertions(+), 20 deletions(-)


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

diff --git a/modules/ve-cite/ve.dm.MWReferenceModel.js 
b/modules/ve-cite/ve.dm.MWReferenceModel.js
index ecf35a9..6fbc5c8 100644
--- a/modules/ve-cite/ve.dm.MWReferenceModel.js
+++ b/modules/ve-cite/ve.dm.MWReferenceModel.js
@@ -226,26 +226,12 @@
if ( this.deferDoc ) {
this.doc = this.deferDoc();
} else {
-   this.doc = new ve.dm.Document(
-   [
-   { type: 'paragraph', internal: { 
generated: 'wrapper' } },
-   { type: '/paragraph' },
-   { type: 'internalList' },
-   { type: '/internalList' }
-   ],
-   // htmlDocument
-   this.parentDoc.getHtmlDocument(),
-   // parentDocument
-   null,
-   // internalList
-   null,
-   // innerWhitespace
-   null,
-   // lang
-   this.parentDoc.getLang(),
-   // dir
-   this.parentDoc.getDir()
-   );
+   this.doc = this.parentDoc.cloneWithData( [
+   { type: 'paragraph', internal: { generated: 
'wrapper' } },
+   { type: '/paragraph' },
+   { type: 'internalList' },
+   { type: '/internalList' }
+   ] );
}
}
return this.doc;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibab88f333cd39aabc73a579e1b05fc9b830b6d86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
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] raid/hpssacli: don't barf on HP SSD Smart Path configs - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: raid/hpssacli: don't barf on HP SSD Smart Path configs
..

raid/hpssacli: don't barf on HP SSD Smart Path configs

On systems with SSD arrays, one of the recommended HP configurations
-and as far as I know, the default- is to disable the BBU cache and use
a technology that's instead called "HP SSD Smart Path".

In these cases, dsa-check-hpssacli warns, as "controller slot=N show
status" returns "Cache: Not Configured", despite this being a valid
configuration.

It turns out that there is another field, per LD, called "LD
Acceleration Method" that can get the values of "Controller Cache",
"HP SSD Smart Path" or "All disabled"; the first two being OK, the
latter one indicative of a problem. Switch the check to use those
instead.

I've yet to see a controller in our infrastructure with a failed or
misconfigured cache, so I'm not entirely sure that a config with "LD
Acceleration Method: Controller Cache" and "Cache: Not Configured" would
not occur. That wouldn't make any sense though, so let's risk it :)

Change-Id: Iea7f1ce17c8ec0ba801ad02154b417e9068cf1dc
---
M modules/raid/files/dsa-check-hpssacli
1 file changed, 12 insertions(+), 1 deletion(-)


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

diff --git a/modules/raid/files/dsa-check-hpssacli 
b/modules/raid/files/dsa-check-hpssacli
index 4f97a52..959198e 100755
--- a/modules/raid/files/dsa-check-hpssacli
+++ b/modules/raid/files/dsa-check-hpssacli
@@ -149,6 +149,14 @@
record('UNKNOWN');
}
}
+   if (/^ *LD Acceleration Method: (.*)$/) {
+   my $status = $1;
+   # can at least be "Controller Cache" or HP SSD 
Smart Path", both OK
+   if ($status eq 'All disabled') {
+   push @{$status{'Acceleration method'}}, 
"LD$logicaldrive disabled";
+   record('WARNING');
+   }
+   }
}
}
 
@@ -300,9 +308,12 @@
if (/^ *(.*) Status: (.*)$/) {
my $system = $1;
my $status = $2;
+
+   # skip the cache check, we track the LD Acceleration 
Method above
+   next if ($system eq 'Cache');
+
push @{$status{$status}}, $system;
if ($status ne 'OK') {
-   next if ($params->{'no-battery'} && $system eq 
'Cache');
next if ($params->{'no-battery'} && $system eq 
'Battery/Capacitor');
record('WARNING');
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea7f1ce17c8ec0ba801ad02154b417e9068cf1dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] raid/hpssacli: don't barf on SATA + 6Gbps speed - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: raid/hpssacli: don't barf on SATA + 6Gbps speed
..

raid/hpssacli: don't barf on SATA + 6Gbps speed

SATA 3.0 actually supports an 6.0Gbps rate and we have systems having
that (e.g. lvs1012). dsa-check-hpssacli currently warns about them
because it seems to support only up to 3.0Gbps. Add support for it.

SATA 3.2 goes up to 16Gbps but I have not seen this in the wild yet, so
it's unknown how hpssacli would display such a thing. Avoid guessing it
for now.

Change-Id: I9207136b9539df1d0af0714f60357c46e25b7f8d
---
M modules/raid/files/dsa-check-hpssacli
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/291828/1

diff --git a/modules/raid/files/dsa-check-hpssacli 
b/modules/raid/files/dsa-check-hpssacli
index 220d65b..4f97a52 100755
--- a/modules/raid/files/dsa-check-hpssacli
+++ b/modules/raid/files/dsa-check-hpssacli
@@ -245,7 +245,7 @@
} elsif ($type eq 'SAS' || $type eq 'SAS+') {
$key = 'PHY Transfer Rate';
if ($value{'Interface Type'} eq 'SATA') {
-   $expected = [ '1.5Gbps', '3.0Gbps' ];
+   $expected = [ '1.5Gbps', '3.0Gbps', '6.0Gbps' ];
} elsif ($value{'PHY Count'} eq '2') {
if (defined($value{'Redundant Path(s)'})) {
$expected = [ '3.0GBPS, 3.0GBPS', 
'6.0GBPS, 6.0GBPS',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9207136b9539df1d0af0714f60357c46e25b7f8d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Use cloneWithData in beforePaste - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Use cloneWithData in beforePaste
..


Use cloneWithData in beforePaste

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

Approvals:
  Jforrester: 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 7fa8411..7e78a99 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1820,11 +1820,7 @@
// before conversion as it can affect textStart/End offsets.
delete contextElement.internal;
ve.dm.converter.getDomSubtreeFromModel(
-   new ve.dm.Document(
-   new ve.dm.ElementLinearData( 
documentModel.getStore(), context ),
-   documentModel.getHtmlDocument(), undefined, 
documentModel.getInternalList(),
-   documentModel.getLang(), documentModel.getDir()
-   ),
+   documentModel.cloneWithData( context, true ),
this.$pasteTarget[ 0 ]
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie53ede24c164bcfee58e035ed770714f26d0ead5
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use cloneWithData - change (mediawiki...Citoid)

[jenkins-bot (Code Review)]

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

Change subject: Use cloneWithData
..


Use cloneWithData

Change-Id: I4127854cbc5e1a9a90f4f2864a2af8b1081315f9
---
M modules/ve.ui.CiteFromIdReferenceWidget.js
1 file changed, 3 insertions(+), 7 deletions(-)

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



diff --git a/modules/ve.ui.CiteFromIdReferenceWidget.js 
b/modules/ve.ui.CiteFromIdReferenceWidget.js
index a19952e..4b002b3 100644
--- a/modules/ve.ui.CiteFromIdReferenceWidget.js
+++ b/modules/ve.ui.CiteFromIdReferenceWidget.js
@@ -12,7 +12,7 @@
  * @cfg {Object[]} citeTools An array of available citation tool configuration
  */
 ve.ui.CiteFromIdReferenceWidget = function VeUiCiteFromIdReferenceWidget( 
documentModel, transclusionModel, config ) {
-   var i, len, icon, item, title, data, doc, node;
+   var i, len, icon, item, title, doc, node;
 
config = config || {};
 
@@ -47,7 +47,7 @@
} );
 
// Create the citation preview
-   data = [
+   doc = documentModel.cloneWithData( [
{
type: 'mwTransclusionInline',
attributes: {
@@ -57,12 +57,8 @@
{ type: '/mwTransclusionInline' },
{ type: 'internalList' },
{ type: '/internalList' }
-   ];
+   ] );
 
-   doc = new ve.dm.Document(
-   new ve.dm.ElementLinearData( documentModel.getStore(), data ),
-   documentModel.getHtmlDocument()
-   );
node = doc.getDocumentNode().getChildren()[ 0 ];
this.preview = new ve.ui.MWPreviewElement( node );
if ( this.preview.isGenerating() ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4127854cbc5e1a9a90f4f2864a2af8b1081315f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0f61ca8..d5ad1d3 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 0f61ca8..d5ad1d3
..


Syncronize VisualEditor: 0f61ca8..d5ad1d3

Change-Id: I4872f42eec7b771025984b00b198297ce80bd88c
---
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 0f61ca8..d5ad1d3 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 0f61ca8196dc0964a0a230ad9c66ba2b6e13089d
+Subproject commit d5ad1d3ff80cb3576111dc5cdac09770afbf59e1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4872f42eec7b771025984b00b198297ce80bd88c
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] Use cloneWithData - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Use cloneWithData
..


Use cloneWithData

Change-Id: I7ffe3c7ab20d5f785a6642c8293f271f4dc08ff8
---
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
M modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
3 files changed, 10 insertions(+), 28 deletions(-)

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



diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index 4ce711d..33a7848 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -821,26 +821,12 @@
  */
 ve.dm.MWImageModel.prototype.getCaptionDocument = function () {
if ( !this.captionDoc ) {
-   this.captionDoc = new ve.dm.Document(
-   [
-   { type: 'paragraph', internal: { generated: 
'wrapper' } },
-   { type: '/paragraph' },
-   { type: 'internalList' },
-   { type: '/internalList' }
-   ],
-   // htmlDocument
-   this.parentDoc.getHtmlDocument(),
-   // parentDocument
-   null,
-   // internalList
-   null,
-   // innerWhitespace
-   null,
-   // lang
-   this.parentDoc.getLang(),
-   // dir
-   this.parentDoc.getDir()
-   );
+   this.captionDoc = this.parentDoc.cloneWithData( [
+   { type: 'paragraph', internal: { generated: 'wrapper' } 
},
+   { type: '/paragraph' },
+   { type: 'internalList' },
+   { type: '/internalList' }
+   ] );
}
return this.captionDoc;
 };
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
index 762f118..149951c 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
@@ -55,7 +55,8 @@
doc = 
this.selectedNode.getDocument().cloneFromRange( 
this.selectedNode.getOuterRange() );
} else {
element = this.getNewElement();
-   doc = new ve.dm.Document( [
+   // We assume that WindowAction pass
+   doc = 
data.fragment.getDocument().cloneWithData( [
element,
{ type: '/' + element.type },
{ type: 'internalList' },
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 8e3529b..56f8bad 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -1271,17 +1271,12 @@
if ( this.imageModel ) {
captionDocument = this.imageModel.getCaptionDocument();
} else {
-   captionDocument = new ve.dm.Document( [
+   captionDocument = doc.cloneWithData( [
{ type: 'paragraph', internal: { generated: 'wrapper' } 
},
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
-   ],
-   // The ve.dm.Document constructor expects
-   // ( data, htmlDocument, parentDocument, internalList, 
innerWhitespace, lang, dir )
-   // as parameters. We are only interested in setting up 
language, hence the
-   // multiple 'null' values.
-   null, null, null, null, doc.getLang(), doc.getDir() );
+   ] );
}
 
this.store = doc.getStore();

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0f61ca8..d5ad1d3 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 0f61ca8..d5ad1d3
..

Syncronize VisualEditor: 0f61ca8..d5ad1d3

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


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

diff --git a/VisualEditor b/VisualEditor
index 0f61ca8..d5ad1d3 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 0f61ca8196dc0964a0a230ad9c66ba2b6e13089d
+Subproject commit d5ad1d3ff80cb3576111dc5cdac09770afbf59e1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4872f42eec7b771025984b00b198297ce80bd88c
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] Add Talk link at bottom of page - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Add Talk link at bottom of page
..


Add Talk link at bottom of page

Opens the talk page from the link in external browser.

Change-Id: I39e5b18d5c96def6b9ac41a0fead92eeddf22712
(cherry picked from commit 89069e7df9d31dacf32c7d5b967a526121fa4a43)
---
M app/src/main/java/org/wikipedia/page/Namespace.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/PageTitle.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
6 files changed, 30 insertions(+), 4 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/Namespace.java 
b/app/src/main/java/org/wikipedia/page/Namespace.java
index d17e9cf..abd21a7 100644
--- a/app/src/main/java/org/wikipedia/page/Namespace.java
+++ b/app/src/main/java/org/wikipedia/page/Namespace.java
@@ -95,6 +95,14 @@
 return Namespace.SPECIAL;
 }
 
+// This works for the links provided by the app itself since they 
always have the English
+// version of the namespace.
+// TODO: It would be nice to add a mapping table, as is done for File 
and Special,
+// so we can also handle links passed to the app.
+if (name != null && name.contains("Talk")) {
+return Namespace.TALK;
+}
+
 return Namespace.MAIN;
 }
 
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 046567b..a58905c 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -376,10 +376,12 @@
 if (!isResumed()) {
 return;
 }
-// if it's a Special page, launch it in an external browser, since 
mobileview
+// If it's a Special page, launch it in an external browser, since 
mobileview
 // doesn't support the Special namespace.
 // TODO: remove when Special pages are properly returned by the server
-if (title.isSpecial()) {
+// If this is a Talk page also show in external browser since we don't 
handle those pages
+// in the app very well at this time.
+if (title.isSpecial() || title.isTalkPage()) {
 visitInExternalBrowser(getActivity(), 
Uri.parse(title.getMobileUri()));
 return;
 }
diff --git a/app/src/main/java/org/wikipedia/page/PageTitle.java 
b/app/src/main/java/org/wikipedia/page/PageTitle.java
index 7242c4e..0fe4eef 100644
--- a/app/src/main/java/org/wikipedia/page/PageTitle.java
+++ b/app/src/main/java/org/wikipedia/page/PageTitle.java
@@ -286,6 +286,15 @@
 return namespace().special();
 }
 
+/**
+ * Check if the Title represents a talk page
+ *
+ * @return true if it is a talk page, false if not
+ */
+public boolean isTalkPage() {
+return namespace().talk();
+}
+
 @Override
 public int describeContents() {
 return 0;
diff --git 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 92f4ee6..42d1a8d 100644
--- 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++ 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -272,11 +272,16 @@
 if (page.isMainPage() || page.isFilePage()) {
 pageLastUpdatedText.setVisibility(View.GONE);
 } else {
-String lastUpdatedHtml = "" + activity.getString(R.string.last_updated_text,
 
formatDateRelative(page.getPageProperties().getLastModified())
 + "");
-pageLastUpdatedText.setText(Html.fromHtml(lastUpdatedHtml));
+// TODO: Hide the Talk link if already on a talk page
+PageTitle talkPageTitle = new PageTitle("Talk", 
title.getPrefixedText(), title.getSite());
+String discussionHtml = ""
++ activity.getString(R.string.talk_page_link_text) + 
"";
+pageLastUpdatedText.setText(Html.fromHtml(lastUpdatedHtml + " 
 " + discussionHtml));
 pageLastUpdatedText.setMovementMethod(new 
LinkMovementMethodExt(linkHandler));
 pageLastUpdatedText.setVisibility(View.VISIBLE);
 }
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index de28215..7d1e4ad 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -61,6 +61,7 @@
   Distance to the place mentioned 
in the nearby page in kilometers. Please leave the %.2f as is. It represents a 
floating point number with 2 

[MediaWiki-commits] [Gerrit] Increase the number of workers for osm2pgsql. - change (operations/puppet)

[Gehel (Code Review)]

Gehel has submitted this change and it was merged.

Change subject: Increase the number of workers for osm2pgsql.
..


Increase the number of workers for osm2pgsql.

On new maps server, we have CPU underutilization during import. This change
raises the number of threads for new maps servers but keep the current
configuration for the old maps-test servers.

Bug: T136578
Change-Id: Ib9aee02b8a0e0a876bc713eccb1e64b185a82237
---
M modules/role/manifests/maps/master.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/maps/master.pp 
b/modules/role/manifests/maps/master.pp
index 08be1da..a0bc12f 100644
--- a/modules/role/manifests/maps/master.pp
+++ b/modules/role/manifests/maps/master.pp
@@ -41,7 +41,7 @@
 ensure=> present,
 flat_nodes=> true,
 expire_levels => '16',
-num_threads   => 4,
+num_threads   => $::processorcount/2,
 pg_password   => $osmupdater_pass,
 period=> 'day', # Remove thse as soon as we get down to minute
 hour  => '1',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9aee02b8a0e0a876bc713eccb1e64b185a82237
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Gehel 
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 cloneWithData - change (mediawiki...Citoid)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Use cloneWithData
..

Use cloneWithData

Change-Id: I4127854cbc5e1a9a90f4f2864a2af8b1081315f9
---
M modules/ve.ui.CiteFromIdReferenceWidget.js
1 file changed, 3 insertions(+), 7 deletions(-)


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

diff --git a/modules/ve.ui.CiteFromIdReferenceWidget.js 
b/modules/ve.ui.CiteFromIdReferenceWidget.js
index a19952e..4b002b3 100644
--- a/modules/ve.ui.CiteFromIdReferenceWidget.js
+++ b/modules/ve.ui.CiteFromIdReferenceWidget.js
@@ -12,7 +12,7 @@
  * @cfg {Object[]} citeTools An array of available citation tool configuration
  */
 ve.ui.CiteFromIdReferenceWidget = function VeUiCiteFromIdReferenceWidget( 
documentModel, transclusionModel, config ) {
-   var i, len, icon, item, title, data, doc, node;
+   var i, len, icon, item, title, doc, node;
 
config = config || {};
 
@@ -47,7 +47,7 @@
} );
 
// Create the citation preview
-   data = [
+   doc = documentModel.cloneWithData( [
{
type: 'mwTransclusionInline',
attributes: {
@@ -57,12 +57,8 @@
{ type: '/mwTransclusionInline' },
{ type: 'internalList' },
{ type: '/internalList' }
-   ];
+   ] );
 
-   doc = new ve.dm.Document(
-   new ve.dm.ElementLinearData( documentModel.getStore(), data ),
-   documentModel.getHtmlDocument()
-   );
node = doc.getDocumentNode().getChildren()[ 0 ];
this.preview = new ve.ui.MWPreviewElement( node );
if ( this.preview.isGenerating() ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4127854cbc5e1a9a90f4f2864a2af8b1081315f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
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] Replace use of jStorage with mw.storage - change (mediawiki...Popups)

[jenkins-bot (Code Review)]

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

Change subject: Replace use of jStorage with mw.storage
..


Replace use of jStorage with mw.storage

Use the standardised MediaWiki storage system for the simple use
case of disabling/enabling Popups. The jStorage library is 12kb
uncompressed and cannot be justified for this usage (and if it becomes
the standardised library mw.storage will begin using it)

This means that browsers with full localStorage or no localStorage
support will not be able to disable Popups. Given the current ecosystem
of the web - localStorage is widely supported - and the fact that grade
A browsers enjoy localStorage support - this is not a problem.
See 
https://github.com/wikimedia/mediawiki/blob/REL1_27/resources/src/startup.js#L59

Changes:
* Stop using jStorage
* Cleanup and migrate previous values in jStorage with plan for removing this
in a month.

Bug: T136241
Change-Id: I6dac2911e84d6cb20731be34add01576cf407c46
---
M extension.json
M resources/ext.popups.core.js
M resources/ext.popups.experiment.js
M resources/ext.popups.settings.js
M resources/ext.popups.targets/desktopTarget.js
M tests/qunit/ext.popups.core.test.js
M tests/qunit/ext.popups.experiment.test.js
M tests/qunit/ext.popups.settings.test.js
8 files changed, 58 insertions(+), 36 deletions(-)

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



diff --git a/extension.json b/extension.json
index d19e1fa..db88d9b 100644
--- a/extension.json
+++ b/extension.json
@@ -82,7 +82,7 @@
"resources/ext.popups.targets/desktopTarget.js"
],
"dependencies": [
-   "jquery.jStorage",
+   "mediawiki.storage",
"jquery.client",
"ext.popups.core",
"ext.popups.renderer.desktopRenderer",
@@ -104,7 +104,6 @@
],
"dependencies": [
"ext.popups.core",
-   "jquery.jStorage",
"mediawiki.user",
"mediawiki.storage",
"mediawiki.experiments"
diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index 4b2aef6..d96c25e 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -214,16 +214,16 @@
};
 
/**
-* Save the popups enabled state via $.jStorage
+* Save the popups enabled state via device storage
 *
 * @param {boolean} isEnabled
 */
mw.popups.saveEnabledState = function ( isEnabled ) {
-   $.jStorage.set( popupsEnabledStorageKey, isEnabled.toString() );
+   mw.storage.set( popupsEnabledStorageKey, isEnabled ? '1' : '0' 
);
};
 
/**
-* Retrieve the popups enabled state via $.jStorage or 
'wgPopupsExperiment'
+* Retrieve the popups enabled state via device storage or 
'wgPopupsExperiment'
 * config variable.
 * If the experiment isn't running, then continue to enable Popups
 * by default during initialisation. In this case the return value
@@ -233,7 +233,7 @@
 */
mw.popups.getEnabledState = function () {
if ( !mw.config.get( 'wgPopupsExperiment', false ) ) {
-   return $.jStorage.get( popupsEnabledStorageKey ) !== 
'false';
+   return mw.storage.get( popupsEnabledStorageKey ) !== 
'0';
} else {
return mw.popups.experiment.isUserInCondition();
}
diff --git a/resources/ext.popups.experiment.js 
b/resources/ext.popups.experiment.js
index 4812b1b..809fb02 100644
--- a/resources/ext.popups.experiment.js
+++ b/resources/ext.popups.experiment.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function ( mw ) {
 
/**
 * @ignore
@@ -24,9 +24,9 @@
 * @ignore
 */
function hasUserEnabledFeature() {
-   var value = $.jStorage.get( 'mwe-popups-enabled' );
+   var value = mw.storage.get( 'mwe-popups-enabled' );
 
-   return Boolean( value ) && value !== 'false';
+   return Boolean( value ) && value !== '0';
}
 
/**
@@ -37,7 +37,7 @@
 * @ignore
 */
function hasUserDisabledFeature() {
-   return $.jStorage.get( 'mwe-popups-enabled' ) === 'false';
+   return mw.storage.get( 'mwe-popups-enabled' ) === '0';
}
 
/**
@@ -87,4 +87,4 @@
return mw.experiments.getBucket( config, getToken() ) !== 
'control';
};
 
-}( mediaWiki, jQuery ) );
+}( mediaWiki ) );
diff --git a/resources/ext.popups.settings.js b/resources/ext.popups.settings.js
index 

[MediaWiki-commits] [Gerrit] Render settings via template - change (mediawiki...Popups)

[jenkins-bot (Code Review)]

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

Change subject: Render settings via template
..


Render settings via template

This improves readability and separates the HTML from the
JavaScript

Change-Id: Ib765d78890b9aeb05940df00160790b01751a36b
---
M Popups.hooks.php
M resources/ext.popups.settings.js
A resources/settings.mustache
M tests/browser/features/support/pages/article_page.rb
4 files changed, 78 insertions(+), 104 deletions(-)

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



diff --git a/Popups.hooks.php b/Popups.hooks.php
index ed39cb0..c81db91 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -92,6 +92,7 @@
),
'templates' => array(
'popup.mustache' => 'resources/popup.mustache',
+   'settings.mustache' => 
'resources/settings.mustache',
),
'styles' => array(
'resources/ext.popups.animation.less',
diff --git a/resources/ext.popups.settings.js b/resources/ext.popups.settings.js
index d8f2582..50e3731 100644
--- a/resources/ext.popups.settings.js
+++ b/resources/ext.popups.settings.js
@@ -20,115 +20,55 @@
 * @method render
 */
settings.render = function () {
-   var
-   $closeIcon = $( '' ).html( '' ),
-   $titleText = $( '' ).text( mw.message( 
'popups-settings-title' ).text() ),
-   $title = $( '' ).append( $closeIcon, $titleText 
),
-   $description = $( '' ).text( mw.message( 
'popups-settings-description' ).text() ),
-   $radioGroup = $( '' ),
-   $cancelButton = $( '' )
-   .addClass( 'mw-ui-button mw-ui-quiet' )
-   .text( mw.message( 'popups-settings-cancel' 
).text() )
-   .attr( 'type', 'button' ),
-   $saveButton = $( '' )
-   .addClass( 'mw-ui-button mw-ui-constructive' )
-   .text( mw.message( 'popups-settings-save' 
).text() )
-   .attr( 'type', 'button' ),
-   $actions = $( '' )
-   .addClass( 'mwe-popups-settings-actions' )
-   .append( $cancelButton, $saveButton ),
-   $okayButton = $( '' )
-   .addClass( 'mw-ui-button mw-ui-constructive' )
-   .text( mw.message( 'popups-settings-help-ok' 
).text() )
-   .attr( 'type', 'button' ),
-   $help = $( '' )
-   .attr( 'id', 'mwe-popups-settings-help' )
-   .append(
-   $( '' ).text( mw.message( 
'popups-settings-help' ).text() ),
-   $( '' ).addClass( 
'mwe-popups-settings-help-image' ),
-   $( '' ).addClass( 
'mwe-popups-settings-actions' ).append( $okayButton )
-   )
-   .hide(),
-   $form = $( '' ).append( $radioGroup, $actions ),
-   $main = $( '' ).attr( 'id', 
'mwe-popups-settings-form' ).append( $description, $form ),
-   options = {
-   simple: [
-   mw.message( 
'popups-settings-option-simple' ).text(),
-   mw.message( 
'popups-settings-option-simple-description' ).text(),
-   'images/hovercard.svg'
-   ],
-   advanced: [
-   mw.message( 
'popups-settings-option-advanced' ).text(),
-   mw.message( 
'popups-settings-option-advanced-description' ).text(),
-   'images/navpop.svg'
-   ],
-   off: [
-   mw.message( 
'popups-settings-option-off' ).text(),
-   mw.message( 
'popups-settings-option-off-description' ).text()
-   ]
-   };
+   var path = mw.config.get( 'wgExtensionAssetsPath' ) + 
'/Popups/resources/',
+   choices = [
+   {
+   id: 'simple',
+   name: mw.message( 
'popups-settings-option-simple' ).text(),
+   description: mw.message( 
'popups-settings-option-simple-description' 

[MediaWiki-commits] [Gerrit] Increase the number of workers for osm2pgsql. - change (operations/puppet)

[Gehel (Code Review)]

Gehel has uploaded a new change for review.

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

Change subject: Increase the number of workers for osm2pgsql.
..

Increase the number of workers for osm2pgsql.

On new maps server, we have CPU underutilization during import. This change
raises the number of threads for new maps servers but keep the current
configuration for the old maps-test servers.

Bug: T136578
Change-Id: Ib9aee02b8a0e0a876bc713eccb1e64b185a82237
---
M hieradata/hosts/maps-test2001.yaml
M hieradata/hosts/maps2001.yaml
M modules/role/manifests/maps/master.pp
3 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/291825/1

diff --git a/hieradata/hosts/maps-test2001.yaml 
b/hieradata/hosts/maps-test2001.yaml
index c5dc28a..c9af666 100644
--- a/hieradata/hosts/maps-test2001.yaml
+++ b/hieradata/hosts/maps-test2001.yaml
@@ -1,2 +1,3 @@
 cassandra::rack: a5
 do_paging: false
+osm::planet_sync::num_threads: 4
diff --git a/hieradata/hosts/maps2001.yaml b/hieradata/hosts/maps2001.yaml
index db7b54b..a53e93b 100644
--- a/hieradata/hosts/maps2001.yaml
+++ b/hieradata/hosts/maps2001.yaml
@@ -15,3 +15,5 @@
 tilerator::conf_sources: sources.prod2.yaml
 tilerator::ui::conf_sources: sources.prod2.yaml
 kartotherian::conf_sources: sources.prod2.yaml
+
+osm::planet_sync::num_threads: 12
diff --git a/modules/role/manifests/maps/master.pp 
b/modules/role/manifests/maps/master.pp
index 08be1da..f629357 100644
--- a/modules/role/manifests/maps/master.pp
+++ b/modules/role/manifests/maps/master.pp
@@ -41,7 +41,6 @@
 ensure=> present,
 flat_nodes=> true,
 expire_levels => '16',
-num_threads   => 4,
 pg_password   => $osmupdater_pass,
 period=> 'day', # Remove thse as soon as we get down to minute
 hour  => '1',

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

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

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

[MediaWiki-commits] [Gerrit] parserTests.js: Fix manual changes support for before/after ... - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: parserTests.js: Fix manual changes support for before/after 
selector
..


parserTests.js: Fix manual changes support for before/after selector

* Using  for table content doesn't work since  tags can only
  be inserted in 

Change-Id: I78a534787bececb4677b12a5b8fe5b193b42809f
---
M bin/parserTests.js
1 file changed, 32 insertions(+), 6 deletions(-)

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



diff --git a/bin/parserTests.js b/bin/parserTests.js
index 8d9c2d3..788942c 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -774,17 +774,43 @@
// a good way to get at the text and comment nodes
var jquery = {
after: function(html) {
-   var div = this.ownerDocument.createElement('div');
-   div.innerHTML = html;
-   DU.migrateChildren(div, this.parentNode, 
this.nextSibling);
+   var div, tbl;
+   if (this.parentNode.nodeName === 'TBODY') {
+   tbl = this.ownerDocument.createElement('table');
+   tbl.innerHTML = html;
+   //  is implicitly added when inner html 
is set to ..
+   DU.migrateChildren(tbl.firstChild, 
this.parentNode, this.nextSibling);
+   } else if (this.parentNode.nodeName === 'TR') {
+   tbl = this.ownerDocument.createElement('table');
+   tbl.innerHTML = '';
+   tbl.firstChild.firstChild.innerHTML = html;
+   DU.migrateChildren(tbl.firstChild.firstChild, 
this.parentNode, this.nextSibling);
+   } else {
+   div = this.ownerDocument.createElement('div');
+   div.innerHTML = html;
+   DU.migrateChildren(div, this.parentNode, 
this.nextSibling);
+   }
},
attr: function(name, val) {
this.setAttribute(name, val);
},
before: function(html) {
-   var div = this.ownerDocument.createElement('div');
-   div.innerHTML = html;
-   DU.migrateChildren(div, this.parentNode, this);
+   var div, tbl;
+   if (this.parentNode.nodeName === 'TBODY') {
+   tbl = this.ownerDocument.createElement('table');
+   tbl.innerHTML = html;
+   //  is implicitly added when inner html 
is set to ..
+   DU.migrateChildren(tbl.firstChild, 
this.parentNode, this);
+   } else if (this.parentNode.nodeName === 'TR') {
+   tbl = this.ownerDocument.createElement('table');
+   tbl.innerHTML = '';
+   tbl.firstChild.firstChild.innerHTML = html;
+   DU.migrateChildren(tbl.firstChild.firstChild, 
this.parentNode, this);
+   } else {
+   div = this.ownerDocument.createElement('div');
+   div.innerHTML = html;
+   DU.migrateChildren(div, this.parentNode, this);
+   }
},
removeAttr: function(name) {
this.removeAttribute(name);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78a534787bececb4677b12a5b8fe5b193b42809f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] MediaWiki theme: Adjacent disabled ButtonGroup/SelectWidget ... - change (oojs/ui)

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: MediaWiki theme: Adjacent disabled ButtonGroup/SelectWidget 
buttons border
..

MediaWiki theme: Adjacent disabled ButtonGroup/SelectWidget buttons border

Adding visible `border` to adjacent disabled
ButtonGroupWidget/ButtonSelectWidget buttons.
Also removing unnecessary `background-color` property.

Bug: T136571
Change-Id: I8418c3233dc0886b2662ea05265561bd53f030b1
---
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
2 files changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/23/291823/1

diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index e6da3d1..b704e02 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -144,10 +144,18 @@
}
}
 
-   &.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
-   background-color: @background-color-filled-disabled;
-   color: @color-disabled-framed;
-   border: 1px solid @border-color-disabled;
+   &.oo-ui-widget-disabled {
+   & > .oo-ui-buttonElement-button {
+   background-color: 
@background-color-filled-disabled;
+   color: @color-disabled-framed;
+   border: 1px solid @border-color-disabled;
+   }
+
+   & + .oo-ui-widget-disabled {
+   & > .oo-ui-buttonElement-button {
+   border-left-color: 
@color-disabled-framed;
+   }
+   }
}
 
&.oo-ui-widget-enabled {
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index c314a6e..1be715e 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -902,7 +902,6 @@
 
 .theme-oo-ui-buttonOptionWidget () {
padding: 0;
-   background-color: transparent;
 
&.oo-ui-optionWidget-selected,
&.oo-ui-optionWidget-pressed,
@@ -1141,7 +1140,6 @@
 
 .theme-oo-ui-buttonSelectWidget () {
border-radius: @border-radius-default;
-
.oo-ui-inline-spacing( 0.5em );
 
&:focus {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8418c3233dc0886b2662ea05265561bd53f030b1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] Use cloneWithData - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Use cloneWithData
..

Use cloneWithData

Change-Id: I7ffe3c7ab20d5f785a6642c8293f271f4dc08ff8
---
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
M modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
3 files changed, 10 insertions(+), 28 deletions(-)


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

diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index 4ce711d..33a7848 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -821,26 +821,12 @@
  */
 ve.dm.MWImageModel.prototype.getCaptionDocument = function () {
if ( !this.captionDoc ) {
-   this.captionDoc = new ve.dm.Document(
-   [
-   { type: 'paragraph', internal: { generated: 
'wrapper' } },
-   { type: '/paragraph' },
-   { type: 'internalList' },
-   { type: '/internalList' }
-   ],
-   // htmlDocument
-   this.parentDoc.getHtmlDocument(),
-   // parentDocument
-   null,
-   // internalList
-   null,
-   // innerWhitespace
-   null,
-   // lang
-   this.parentDoc.getLang(),
-   // dir
-   this.parentDoc.getDir()
-   );
+   this.captionDoc = this.parentDoc.cloneWithData( [
+   { type: 'paragraph', internal: { generated: 'wrapper' } 
},
+   { type: '/paragraph' },
+   { type: 'internalList' },
+   { type: '/internalList' }
+   ] );
}
return this.captionDoc;
 };
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
index 762f118..149951c 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
@@ -55,7 +55,8 @@
doc = 
this.selectedNode.getDocument().cloneFromRange( 
this.selectedNode.getOuterRange() );
} else {
element = this.getNewElement();
-   doc = new ve.dm.Document( [
+   // We assume that WindowAction pass
+   doc = 
data.fragment.getDocument().cloneWithData( [
element,
{ type: '/' + element.type },
{ type: 'internalList' },
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 8e3529b..56f8bad 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -1271,17 +1271,12 @@
if ( this.imageModel ) {
captionDocument = this.imageModel.getCaptionDocument();
} else {
-   captionDocument = new ve.dm.Document( [
+   captionDocument = doc.cloneWithData( [
{ type: 'paragraph', internal: { generated: 'wrapper' } 
},
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
-   ],
-   // The ve.dm.Document constructor expects
-   // ( data, htmlDocument, parentDocument, internalList, 
innerWhitespace, lang, dir )
-   // as parameters. We are only interested in setting up 
language, hence the
-   // multiple 'null' values.
-   null, null, null, null, doc.getLang(), doc.getDir() );
+   ] );
}
 
this.store = doc.getStore();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ffe3c7ab20d5f785a6642c8293f271f4dc08ff8
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] Remove the `mobile.buttonWithSpinner` module - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Remove the `mobile.buttonWithSpinner` module
..


Remove the `mobile.buttonWithSpinner` module

The module is not being used anywhere and there seems to be a
disagreement over its implementation. See the task for more info.

Bug: T95490
Change-Id: I42438c2ce2a5c1d0a45ef6b8177678608fd8e9b8
---
M extension.json
D resources/mobile.buttonWithSpinner/ButtonWithSpinner.js
D resources/mobile.buttonWithSpinner/ajax-loader.gif
D resources/mobile.buttonWithSpinner/buttonWithSpinner.less
4 files changed, 0 insertions(+), 63 deletions(-)

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



diff --git a/extension.json b/extension.json
index 5523db1..7d511b1 100644
--- a/extension.json
+++ b/extension.json
@@ -1203,21 +1203,6 @@
"mobile-frontend-watchlist-please-wait"
]
},
-   "mobile.buttonWithSpinner": {
-   "targets": [
-   "mobile",
-   "desktop"
-   ],
-   "dependencies": [
-   "oojs-ui"
-   ],
-   "styles": [
-   
"resources/mobile.buttonWithSpinner/buttonWithSpinner.less"
-   ],
-   "scripts": [
-   
"resources/mobile.buttonWithSpinner/ButtonWithSpinner.js"
-   ]
-   },
"mobile.languages.structured": {
"class": "MFResourceLoaderParsedMessageModule",
"dependencies": [
diff --git a/resources/mobile.buttonWithSpinner/ButtonWithSpinner.js 
b/resources/mobile.buttonWithSpinner/ButtonWithSpinner.js
deleted file mode 100644
index de68b98..000
--- a/resources/mobile.buttonWithSpinner/ButtonWithSpinner.js
+++ /dev/null
@@ -1,40 +0,0 @@
-( function ( M ) {
-   /**
-* Button with a spinner indicator
-* Behaves the same as OO.ui.Button widget. Also defines custom methods 
that show and hide
-* the spinner.
-* @param {Object} config
-* @constructor
-*/
-   var ButtonWithSpinner = function ( config ) {
-   ButtonWithSpinner.super.call( this, config );
-   };
-   OO.inheritClass( ButtonWithSpinner, OO.ui.ButtonWidget );
-
-   /**
-* Show the spinner and hide the label (and save the label for future 
use)
-*/
-   ButtonWithSpinner.prototype.showSpinner = function () {
-   var originalWidth = this.$button.width();
-
-   this.defaultLabel = this.getLabel();
-   // Don't let the button width change
-   this.$button.width( originalWidth );
-   this
-   .setIndicator( 'spinner' )
-   .setLabel( '' )
-   .setDisabled( true );
-   };
-
-   /**
-* Hide the spinner and show the default label
-*/
-   ButtonWithSpinner.prototype.hideSpinner = function () {
-   this
-   .setIndicator( null )
-   .setLabel( this.defaultLabel )
-   .setDisabled( false );
-   };
-
-   M.define( 'mobile.buttonWithSpinner/ButtonWithSpinner', 
ButtonWithSpinner );
-}( mw.mobileFrontend ) );
diff --git a/resources/mobile.buttonWithSpinner/ajax-loader.gif 
b/resources/mobile.buttonWithSpinner/ajax-loader.gif
deleted file mode 100644
index c519155..000
--- a/resources/mobile.buttonWithSpinner/ajax-loader.gif
+++ /dev/null
Binary files differ
diff --git a/resources/mobile.buttonWithSpinner/buttonWithSpinner.less 
b/resources/mobile.buttonWithSpinner/buttonWithSpinner.less
deleted file mode 100644
index 109df07..000
--- a/resources/mobile.buttonWithSpinner/buttonWithSpinner.less
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'minerva.mixins';
-
-.oo-ui-indicator-spinner {
-   .background-image( 'ajax-loader.gif' );
-   .background-size( 100%, 100% );
-   margin-left: 0 !important;
-   margin-right: 0 !important;
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42438c2ce2a5c1d0a45ef6b8177678608fd8e9b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: 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] raid: double NRPE timeout for check_hpssacli - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: raid: double NRPE timeout for check_hpssacli
..


raid: double NRPE timeout for check_hpssacli

It takes > 10s (10.7s, for example) to run the check on machines with
lots of disks and logical volumes, such as ms-be boxes. Increase the
timeout to 20s.

Change-Id: I5f527acadcafe739747eba30bb04be5a17eca081
---
M modules/raid/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index 23538e9..f609d74 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -61,6 +61,7 @@
 nrpe::monitor_service { 'raid_hpssacli':
 description  => 'HP RAID',
 nrpe_command => '/usr/local/lib/nagios/plugins/check_hpssacli',
+timeout  => 20, # can take > 10s on servers with lots of disks
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f527acadcafe739747eba30bb04be5a17eca081
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
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: eb9c346..0f61ca8 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: eb9c346..0f61ca8
..


Syncronize VisualEditor: eb9c346..0f61ca8

Change-Id: Ie9e09cf8d13b674a966584ed749f1f32d370bec5
---
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 eb9c346..0f61ca8 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit eb9c3462217ab396ba713f88d7e5785e46cec5c7
+Subproject commit 0f61ca8196dc0964a0a230ad9c66ba2b6e13089d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9e09cf8d13b674a966584ed749f1f32d370bec5
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] Syncronize VisualEditor: eb9c346..0f61ca8 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: eb9c346..0f61ca8
..

Syncronize VisualEditor: eb9c346..0f61ca8

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


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

diff --git a/VisualEditor b/VisualEditor
index eb9c346..0f61ca8 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit eb9c3462217ab396ba713f88d7e5785e46cec5c7
+Subproject commit 0f61ca8196dc0964a0a230ad9c66ba2b6e13089d

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9e09cf8d13b674a966584ed749f1f32d370bec5
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] raid: double NRPE timeout for check_hpssacli - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: raid: double NRPE timeout for check_hpssacli
..

raid: double NRPE timeout for check_hpssacli

It takes > 10s (10.7s, for example) to run the check on machines with
lots of disks and logical volumes, such as ms-be boxes. Increase the
timeout to 20s.

Change-Id: I5f527acadcafe739747eba30bb04be5a17eca081
---
M modules/raid/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/291820/1

diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index 23538e9..f609d74 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -61,6 +61,7 @@
 nrpe::monitor_service { 'raid_hpssacli':
 description  => 'HP RAID',
 nrpe_command => '/usr/local/lib/nagios/plugins/check_hpssacli',
+timeout  => 20, # can take > 10s on servers with lots of disks
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f527acadcafe739747eba30bb04be5a17eca081
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] networks::constants: use slice_network_constants - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: networks::constants: use slice_network_constants
..

networks::constants: use slice_network_constants

Use the newly introduced slice_network_constants() function to create
$mw_appserver_networks and $analytics_networks simply and without too
much fuss or need to maintain

Change-Id: I172a317dea23dba3f2a53aacd4406bd68ef04ddd
---
M modules/network/manifests/constants.pp
1 file changed, 10 insertions(+), 34 deletions(-)


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

diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index 810723a..80e7545 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -1,6 +1,8 @@
 class network::constants {
 
-# Dummy notify to also specing hiera lookups. Do not remove
+# Dummy resource to allow RSpec to work with hiera lookups. Without it 
RSpec
+# will not load hiera settings and unrelated tests about functions in this
+# module will fail. Any resource would be, but this class has none
 notify { 'dummy': message => '' }
 
 # Note this name is misleading.  Most of these are "external" networks,
@@ -101,29 +103,12 @@
 # Networks hosting MediaWiki application servers
 if $::realm == 'production' {
 # TODO: Revisit this structure in the future
-$mw_appserver_networks =
-[
-'208.80.152.0/22',# external
-'2620:0:860::/46',# all external previous was for silver
-'10.64.37.14/32', # nobelium, temporary mw install to copy 
over es indices
-'2620:0:861:119:f21f:afff:fee8:b1fb/64', # same as ^
-
$all_network_subnets['production']['eqiad']['private']['private1-a-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['private1-a-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['private1-b-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['private1-b-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['private1-c-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['private1-c-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['private1-d-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['private1-d-eqiad']['ipv6'],
-
$all_network_subnets['production']['codfw']['private']['private1-a-codfw']['ipv4'],
-
$all_network_subnets['production']['codfw']['private']['private1-a-codfw']['ipv6'],
-
$all_network_subnets['production']['codfw']['private']['private1-b-codfw']['ipv4'],
-
$all_network_subnets['production']['codfw']['private']['private1-b-codfw']['ipv6'],
-
$all_network_subnets['production']['codfw']['private']['private1-c-codfw']['ipv4'],
-
$all_network_subnets['production']['codfw']['private']['private1-c-codfw']['ipv6'],
-
$all_network_subnets['production']['codfw']['private']['private1-d-codfw']['ipv4'],
-
$all_network_subnets['production']['codfw']['private']['private1-d-codfw']['ipv6'],
-]
+$mw_appserver_networks = flatten([
+slice_network_constants('production', { 'sphere' => 'public' }),
+slice_network_constants('production', {
+'sphere' => 'private',
+'description' => 'private' }),
+])
 } elsif $::realm == 'labs' {
 # rely on security groups in labs to restrict this
 $mw_appserver_networks = ['10.0.0.0/8', '127.0.0.1']
@@ -133,16 +118,7 @@
 }
 
 # Analytics subnets
-$analytics_networks = [
-
$all_network_subnets['production']['eqiad']['private']['analytics1-a-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-a-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-b-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-b-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-c-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-c-eqiad']['ipv6'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-d-eqiad']['ipv4'],
-
$all_network_subnets['production']['eqiad']['private']['analytics1-d-eqiad']['ipv6'],
-]
+$analytics_networks = slice_network_constants('production', { 
'description' => 'analytics'})
 
 # Networks that trebuchet/git-deploy
 # will be able to deploy 

[MediaWiki-commits] [Gerrit] raid: fix sudo rules for hpssacli (mostly for ms-be) - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: raid: fix sudo rules for hpssacli (mostly for ms-be)
..


raid: fix sudo rules for hpssacli (mostly for ms-be)

Some ms-be boxes have controllers in slot 3 and certainly more than 9
logical drives. Our current sudo rules (Debian's) don't cover these, so
expand them to be a little more inclusive.

Change-Id: I7b3356ff7547ed481106c35806664853f71c0ae3
---
M modules/raid/manifests/init.pp
1 file changed, 14 insertions(+), 14 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index 2a12820..23538e9 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -40,21 +40,21 @@
 user   => 'nagios',
 privileges => [
 'ALL = NOPASSWD: /usr/sbin/hpssacli controller all show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] ld 
all show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] ld 
[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd 
all show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd 
[0-9]\:[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd 
[0-9][EIC]\:[0-9]\:[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd 
[0-9][EIC]\:[0-9]\:[0-9][0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] 
show status',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] ld 
all show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] ld * 
show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] pd 
all show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] pd 
[0-9]\:[0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] pd 
[0-9][EIC]\:[0-9]\:[0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] pd 
[0-9][EIC]\:[0-9]\:[0-9][0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] show 
status',
 'ALL = NOPASSWD: /usr/sbin/hpacucli controller all show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] ld 
all show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] ld 
[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd 
all show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd 
[0-9]\:[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd 
[0-9][EIC]\:[0-9]\:[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd 
[0-9][EIC]\:[0-9]\:[0-9][0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] 
show status',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] ld 
all show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] ld * 
show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] pd 
all show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] pd 
[0-9]\:[0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] pd 
[0-9][EIC]\:[0-9]\:[0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] pd 
[0-9][EIC]\:[0-9]\:[0-9][0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] show 
status',
 ],
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] raid: fix sudo rules for hpssacli (mostly for ms-be) - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: raid: fix sudo rules for hpssacli (mostly for ms-be)
..

raid: fix sudo rules for hpssacli (mostly for ms-be)

Some ms-be boxes have controllers in slot 3 and certainly more than 9
logical drives. Our current sudo rules (Debian's) don't cover these, so
expand them to be a little more inclusive.

Change-Id: I7b3356ff7547ed481106c35806664853f71c0ae3
---
M modules/raid/manifests/init.pp
1 file changed, 14 insertions(+), 14 deletions(-)


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

diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index 2a12820..23538e9 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -40,21 +40,21 @@
 user   => 'nagios',
 privileges => [
 'ALL = NOPASSWD: /usr/sbin/hpssacli controller all show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] ld 
all show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] ld 
[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd 
all show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd 
[0-9]\:[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd 
[0-9][EIC]\:[0-9]\:[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd 
[0-9][EIC]\:[0-9]\:[0-9][0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] 
show status',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] ld 
all show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] ld * 
show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] pd 
all show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] pd 
[0-9]\:[0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] pd 
[0-9][EIC]\:[0-9]\:[0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] pd 
[0-9][EIC]\:[0-9]\:[0-9][0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpssacli controller slot=[0-9] show 
status',
 'ALL = NOPASSWD: /usr/sbin/hpacucli controller all show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] ld 
all show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] ld 
[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd 
all show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd 
[0-9]\:[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd 
[0-9][EIC]\:[0-9]\:[0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd 
[0-9][EIC]\:[0-9]\:[0-9][0-9] show',
-'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] 
show status',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] ld 
all show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] ld * 
show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] pd 
all show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] pd 
[0-9]\:[0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] pd 
[0-9][EIC]\:[0-9]\:[0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] pd 
[0-9][EIC]\:[0-9]\:[0-9][0-9] show',
+'ALL = NOPASSWD: /usr/sbin/hpacucli controller slot=[0-9] show 
status',
 ],
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b3356ff7547ed481106c35806664853f71c0ae3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Update service-template-node to v0.3.2 - change (mediawiki...mobileapps)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Update service-template-node to v0.3.2
..

Update service-template-node to v0.3.2

Change-Id: I945d21e341b5d6d7d3a9848ea166bc68f281878d
---
M app.js
M config.dev.yaml
M config.prod.yaml
M doc/coding.md
M doc/deployment.md
A lib/api-util.js
M lib/gallery.js
M lib/mwapi.js
M lib/parsoid-access.js
M lib/util.js
M package.json
M scripts/gen-init-scripts.rb
M test/features/app/app.js
M test/features/mobile-summary/pagecontent.js
14 files changed, 352 insertions(+), 145 deletions(-)


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

diff --git a/app.js b/app.js
index 14df8c1..5bf409e 100644
--- a/app.js
+++ b/app.js
@@ -8,6 +8,7 @@
 var bodyParser = require('body-parser');
 var fs = BBPromise.promisifyAll(require('fs'));
 var sUtil = require('./lib/util');
+var apiUtil = require('./lib/api-util');
 var packageInfo = require('./package.json');
 var yaml = require('js-yaml');
 
@@ -63,6 +64,9 @@
 return item.trim();
 }).join('|') + ')$', 'i');
 
+// set up the request templates for the APIs
+apiUtil.setupApiTemplates(app);
+
 // set up the spec
 if(!app.conf.spec) {
 app.conf.spec = __dirname + '/spec.yaml';
@@ -108,6 +112,9 @@
 sUtil.initAndLogRequest(req, app);
 next();
 });
+
+// set up the user agent header string to use for requests
+app.conf.user_agent = app.conf.user_agent || app.info.name;
 
 // disable the X-Powered-By header
 app.set('x-powered-by', false);
@@ -214,4 +221,3 @@
 }).then(createServer);
 
 };
-
diff --git a/config.dev.yaml b/config.dev.yaml
index 989552e..6bc9d80 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -59,15 +59,21 @@
   #   - if-match
   #   - user-agent
   #   - x-request-id
-  restbase_req:
-uri: http://{domain}/api/rest_v1/page/html/{title}
-headers:
-  user-agent: WMF Mobile Content Service dev
-  accept: text/html; charset=utf-8; 
profile="mediawiki.org/specs/html/1.2.0"
+  # the user agent to use when issuing requests
+  user_agent: WMF Mobile Content Service dev
+  # the template used for contacting the MW API
   mwapi_req:
 method: post
-uri: http://{domain}/w/api.php
+uri: http://{{domain}}/w/api.php
 headers:
-  user-agent: WMF Mobile Content Service dev
+  user-agent: '{{user-agent}}'
+body: '{{ default(request.query, {}) }}'
+  # the template used for contacting RESTBase
+  restbase_req:
+method: get
+uri: http://{{domain}}/api/rest_v1/{+path}
+query: '{{ default(request.query, {}) }}'
+headers: '{{request.headers}}'
+body: '{{request.body}}'
   # whether to print extra debug info
   debug: true
diff --git a/config.prod.yaml b/config.prod.yaml
index d250cc1..c489d2e 100644
--- a/config.prod.yaml
+++ b/config.prod.yaml
@@ -33,16 +33,48 @@
   port: 6927
   # interface: localhost # uncomment to only listen on localhost
   # more per-service config settings
-  restbase_req:
-uri: http://restbase.svc.eqiad.wmnet:7231/{domain}/v1/page/html/{title}
-headers:
-  user-agent: WMF Mobile Content Service
-  accept: text/html; charset=utf-8; 
profile="mediawiki.org/specs/html/1.2.0"
+  # the location of the spec, defaults to spec.yaml if not specified
+  # spec: ./spec.template.yaml
+  # allow cross-domain requests to the API (default '*')
+  cors: '*'
+  # to disable use:
+  # cors: false
+  # to restrict to a particular domain, use:
+  # cors: restricted.domain.org
+  # content for the CSP headers
+  # csp: false  # uncomment this line to disable sending them
+  # URL of the outbound proxy to use (complete with protocol)
+  # proxy: http://my.proxy.org:8080
+  # the list of domains for which not to use the proxy defined above
+  # no_proxy_list:
+  #   - domain1.com
+  #   - domain2.org
+  # the list of incoming request headers that can be logged; if left empty,
+  # the following headers are allowed: cache-control, content-length,
+  # content-type, if-match, user-agent, x-request-id
+  # log_header_whitelist:
+  #   - cache-control
+  #   - content-length
+  #   - content-type
+  #   - if-match
+  #   - user-agent
+  #   - x-request-id
+  # the user agent to use when issuing requests
+  user_agent: WMF Mobile Content Service
+  # the template used for contacting the MW API
   mwapi_req:
 method: post
 uri: http://api.svc.eqiad.wmnet/w/api.php
 headers:
-  host: '{request.params.domain}'
-  user-agent: WMF Mobile Content Service
+  host: '{{request.params.domain}}'
+  user-agent: 

[MediaWiki-commits] [Gerrit] Keep osmosis osm_expire files for a month - change (operations/puppet)

[Gehel (Code Review)]

Gehel has submitted this change and it was merged.

Change subject: Keep osmosis osm_expire files for a month
..


Keep osmosis osm_expire files for a month

Bug: T136577
Change-Id: Ie84aaa60a7b2932cf274fcf2dcbbd449a3da86ed
---
M modules/osm/manifests/planet_sync.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/osm/manifests/planet_sync.pp 
b/modules/osm/manifests/planet_sync.pp
index 005f116..19a1651 100644
--- a/modules/osm/manifests/planet_sync.pp
+++ b/modules/osm/manifests/planet_sync.pp
@@ -103,7 +103,7 @@
 }
 cron { "expire_old_planet_syncs-${name}":
 ensure  => $ensure,
-command => "/usr/bin/find ${expire_dir} -mtime +5 -exec rm {} \\;",
+command => "/usr/bin/find ${expire_dir} -mtime +30 -exec rm {} \\;",
 user=> 'osmupdater',
 hour=> $hour,
 minute  => $minute,

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

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

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

[MediaWiki-commits] [Gerrit] Remove jquery.qunit.completenessTest - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: Remove jquery.qunit.completenessTest
..

Remove jquery.qunit.completenessTest

Originally added in r89853 (540419a82e; MediaWiki 1.17.1).

I created it as an experiment but it never quite worked. Frontend
modules moved into seperate project as part of librarisation have
proper code coverage through Karma already. For MediaWiki core this
is still a work in progress, but CompletenessTest has been
unmaintained for a while now.

Change-Id: I5647b23500d26b0d8a831fd69ceaaf4a2cea555e
---
M includes/specials/SpecialJavaScriptTest.php
M resources/Resources.php
D resources/src/jquery/jquery.qunit.completenessTest.js
M tests/qunit/data/testrunner.js
4 files changed, 3 insertions(+), 361 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/89/291789/1

diff --git a/includes/specials/SpecialJavaScriptTest.php 
b/includes/specials/SpecialJavaScriptTest.php
index ecb166a..c1d5c03 100644
--- a/includes/specials/SpecialJavaScriptTest.php
+++ b/includes/specials/SpecialJavaScriptTest.php
@@ -171,7 +171,7 @@
$out->addHtml( Html::inlineScript(
ResourceLoader::makeLoaderConditionalScript(
Xml::encodeJsCall( 'mw.loader.using', array(
-   array( 'jquery.qunit', 
'jquery.qunit.completenessTest' ),
+   array( 'jquery.qunit' ),
new XmlJsCode(
'function () {' . 
Xml::encodeJsCall( 'mw.loader.load', array( $modules ) ) . '}'
)
diff --git a/resources/Resources.php b/resources/Resources.php
index e56d557..1f7b80b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -278,11 +278,6 @@
'position' => 'top',
'targets' => array( 'desktop', 'mobile' ),
),
-   'jquery.qunit.completenessTest' => array(
-   'scripts' => 
'resources/src/jquery/jquery.qunit.completenessTest.js',
-   'dependencies' => 'jquery.qunit',
-   'targets' => array( 'desktop', 'mobile' ),
-   ),
'jquery.spinner' => array(
'scripts' => 'resources/src/jquery/jquery.spinner.js',
'styles' => 'resources/src/jquery/jquery.spinner.css',
diff --git a/resources/src/jquery/jquery.qunit.completenessTest.js 
b/resources/src/jquery/jquery.qunit.completenessTest.js
deleted file mode 100644
index 556bf8c..000
--- a/resources/src/jquery/jquery.qunit.completenessTest.js
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * jQuery QUnit CompletenessTest 0.4
- *
- * Tests the completeness of test suites for object oriented javascript
- * libraries. Written to be used in environments with jQuery and QUnit.
- * Requires jQuery 1.7.2 or higher.
- *
- * Built for and tested with:
- * - Chrome 19
- * - Firefox 4
- * - Safari 5
- *
- * @author Timo Tijhof, 2011-2012
- */
-( function ( mw, $ ) {
-   'use strict';
-
-   var util,
-   hasOwn = Object.prototype.hasOwnProperty,
-   log = ( window.console && window.console.log )
-   ? function () { return window.console.log.apply( 
window.console, arguments ); }
-   : function () {};
-
-   // Simplified version of a few jQuery methods, except that they don't
-   // call other jQuery methods. Required to be able to run the 
CompletenessTest
-   // on jQuery itself as well.
-   util = {
-   keys: Object.keys || function ( object ) {
-   var key, keys = [];
-   for ( key in object ) {
-   if ( hasOwn.call( object, key ) ) {
-   keys.push( key );
-   }
-   }
-   return keys;
-   },
-   each: function ( object, callback ) {
-   var name;
-   for ( name in object ) {
-   if ( callback.call( object[ name ], name, 
object[ name ] ) === false ) {
-   break;
-   }
-   }
-   },
-   // $.type and $.isEmptyObject are safe as is, they don't call
-   // other $.* methods. Still need to be derefenced into `util`
-   // since the CompletenessTest will overload them with spies.
-   type: $.type,
-   isEmptyObject: $.isEmptyObject
-   };
-
-   /**
-* CompletenessTest
-* @constructor
-*
-* @example
-*  var myTester = new CompletenessTest( myLib );
-* @param masterVariable {Object} The root variable that 

[MediaWiki-commits] [Gerrit] Keep osmosis osm_expire files for a month - change (operations/puppet)

[Gehel (Code Review)]

Gehel has uploaded a new change for review.

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

Change subject: Keep osmosis osm_expire files for a month
..

Keep osmosis osm_expire files for a month

Bug: T136577
Change-Id: Ie84aaa60a7b2932cf274fcf2dcbbd449a3da86ed
---
M modules/osm/manifests/planet_sync.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/291788/1

diff --git a/modules/osm/manifests/planet_sync.pp 
b/modules/osm/manifests/planet_sync.pp
index 005f116..19a1651 100644
--- a/modules/osm/manifests/planet_sync.pp
+++ b/modules/osm/manifests/planet_sync.pp
@@ -103,7 +103,7 @@
 }
 cron { "expire_old_planet_syncs-${name}":
 ensure  => $ensure,
-command => "/usr/bin/find ${expire_dir} -mtime +5 -exec rm {} \\;",
+command => "/usr/bin/find ${expire_dir} -mtime +30 -exec rm {} \\;",
 user=> 'osmupdater',
 hour=> $hour,
 minute  => $minute,

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

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

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

[MediaWiki-commits] [Gerrit] Easify disabled `.oo-ui-tool-link` rules - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Easify disabled `.oo-ui-tool-link` rules
..


Easify disabled `.oo-ui-tool-link` rules

Concatenating & reducing disabled `.oo-ui-tool-link` rules across ToolGroup
files.

Change-Id: I37e10e8f8cb2e6bf232798b1d13f85d97ffdcf6a
---
M src/styles/ToolGroup.less
M src/styles/toolgroups/BarToolGroup.less
M src/styles/toolgroups/ListToolGroup.less
M src/styles/toolgroups/MenuToolGroup.less
M src/styles/toolgroups/PopupToolGroup.less
5 files changed, 8 insertions(+), 33 deletions(-)

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



diff --git a/src/styles/ToolGroup.less b/src/styles/ToolGroup.less
index f2fe4e7..1810e44 100644
--- a/src/styles/ToolGroup.less
+++ b/src/styles/ToolGroup.less
@@ -10,6 +10,13 @@
 
.oo-ui-tool-link {
text-decoration: none;
+   cursor: pointer;
+   }
+
+   &.oo-ui-widget-disabled .oo-ui-tool-link,
+   .oo-ui-widget-disabled > .oo-ui-tool-link {
+   outline: 0;
+   cursor: default;
}
 
.theme-oo-ui-toolGroup();
diff --git a/src/styles/toolgroups/BarToolGroup.less 
b/src/styles/toolgroups/BarToolGroup.less
index 1611a9d..70a0e1b 100644
--- a/src/styles/toolgroups/BarToolGroup.less
+++ b/src/styles/toolgroups/BarToolGroup.less
@@ -6,12 +6,6 @@
display: none;
}
 
-   &.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool {
-   > .oo-ui-tool-link {
-   cursor: pointer;
-   }
-   }
-
> .oo-ui-toolGroup-tools > .oo-ui-tool {
display: inline-block;
position: relative;
@@ -40,11 +34,6 @@
.oo-ui-tool-title {
display: inline;
}
-   }
-
-   &.oo-ui-widget-disabled > .oo-ui-tool-link {
-   outline: 0;
-   cursor: default;
}
}
 
diff --git a/src/styles/toolgroups/ListToolGroup.less 
b/src/styles/toolgroups/ListToolGroup.less
index 406c230..09bcfd8 100644
--- a/src/styles/toolgroups/ListToolGroup.less
+++ b/src/styles/toolgroups/ListToolGroup.less
@@ -3,18 +3,7 @@
 .oo-ui-listToolGroup {
.oo-ui-tool {
display: block;
-
.oo-ui-box-sizing( border-box );
-
-   &-link {
-   cursor: pointer;
-   }
-
-   &.oo-ui-widget-disabled {
-   .oo-ui-tool-link {
-   cursor: default;
-   }
-   }
}
 
.theme-oo-ui-listToolGroup();
diff --git a/src/styles/toolgroups/MenuToolGroup.less 
b/src/styles/toolgroups/MenuToolGroup.less
index cfbbe0b..08fd99f 100644
--- a/src/styles/toolgroups/MenuToolGroup.less
+++ b/src/styles/toolgroups/MenuToolGroup.less
@@ -3,16 +3,6 @@
 .oo-ui-menuToolGroup {
.oo-ui-tool {
display: block;
-
-   &-link {
-   cursor: pointer;
-   }
-
-   &.oo-ui-widget-disabled {
-   .oo-ui-tool-link {
-   cursor: default;
-   }
-   }
}
 
.theme-oo-ui-menuToolGroup();
diff --git a/src/styles/toolgroups/PopupToolGroup.less 
b/src/styles/toolgroups/PopupToolGroup.less
index 35ae1a3..0cd6563 100644
--- a/src/styles/toolgroups/PopupToolGroup.less
+++ b/src/styles/toolgroups/PopupToolGroup.less
@@ -57,7 +57,7 @@
text-align: right;
}
 
-   .oo-ui-tool-accel:not(:empty) {
+   .oo-ui-tool-accel:not( :empty ) {
// Push away from tool's title
padding-left: 3em;
}

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

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

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

[MediaWiki-commits] [Gerrit] ButtonElement: Remove unnecessary inheritance duplication of... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: ButtonElement: Remove unnecessary inheritance duplication of 
`display`
..


ButtonElement: Remove unnecessary inheritance duplication of `display`

Removing unnecessary duplicaiton of `display` property on frameless
ButtonElement.

Change-Id: I34f0414145b4a8416cc1d5131cae9462e7d720b5
---
M src/styles/elements/ButtonElement.less
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/src/styles/elements/ButtonElement.less 
b/src/styles/elements/ButtonElement.less
index beec91e..44c6844 100644
--- a/src/styles/elements/ButtonElement.less
+++ b/src/styles/elements/ButtonElement.less
@@ -28,7 +28,6 @@
}
 
&-frameless {
-   display: inline-block;
position: relative;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Use cloneWithData in beforePaste - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Use cloneWithData in beforePaste
..

Use cloneWithData in beforePaste

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


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/87/291787/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 7fa8411..7e78a99 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1820,11 +1820,7 @@
// before conversion as it can affect textStart/End offsets.
delete contextElement.internal;
ve.dm.converter.getDomSubtreeFromModel(
-   new ve.dm.Document(
-   new ve.dm.ElementLinearData( 
documentModel.getStore(), context ),
-   documentModel.getHtmlDocument(), undefined, 
documentModel.getInternalList(),
-   documentModel.getLang(), documentModel.getDir()
-   ),
+   documentModel.cloneWithData( context, true ),
this.$pasteTarget[ 0 ]
);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie53ede24c164bcfee58e035ed770714f26d0ead5
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/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] sca: remove cxserver-admin - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: sca: remove cxserver-admin
..

sca: remove cxserver-admin

cxserver now resides on scb, no reason for cxserver-admin access

Change-Id: I47bf8bd48261dfbf843a70794422839fc34626f5
---
M hieradata/role/common/sca.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/role/common/sca.yaml b/hieradata/role/common/sca.yaml
index 237eafc..d5d37e8 100644
--- a/hieradata/role/common/sca.yaml
+++ b/hieradata/role/common/sca.yaml
@@ -1,7 +1,6 @@
 cluster: sca
 admin::groups:
   - sc-admins
-  - cxserver-admin
   - zotero-admin
   - apertium-admins
 service::configuration::log_dir: /srv/log

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

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

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

[MediaWiki-commits] [Gerrit] raid: add monitoring for HP controllers - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: raid: add monitoring for HP controllers
..


raid: add monitoring for HP controllers

This shamelessly uses the check that the Debian System Administration
team has written, along with its assorted sudo rules for hpssacli.

Source: http://anonscm.debian.org/cgit/mirror/dsa-nagios.git

Bug: T97998
Change-Id: I8922d077fe782325758725a68c350849e4d0de6d
---
A modules/raid/files/dsa-check-hpssacli
M modules/raid/manifests/init.pp
2 files changed, 358 insertions(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/raid/files/dsa-check-hpssacli 
b/modules/raid/files/dsa-check-hpssacli
new file mode 100755
index 000..220d65b
--- /dev/null
+++ b/modules/raid/files/dsa-check-hpssacli
@@ -0,0 +1,319 @@
+#!/usr/bin/perl -w
+
+# check _physical_ disk status of disks on HP smart array controllers
+# requires hpssacli
+#
+# does _not_ check raid status.  use arrayprobe for that.
+
+# Copyright (c) 2008,2009,2010,2011 Peter Palfrader 
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+use strict;
+use English;
+use Getopt::Long;
+
+# nagios exit codes
+my %CODE = (
+   'OK'=> 0,
+   'WARNING'   => 1,
+   'CRITICAL'  => 2,
+   'UNKNOWN'   => 3
+);
+
+my $EXITCODE = 'OK';
+
+$SIG{'__DIE__'} = sub {
+   print @_;
+   exit $CODE{'UNKNOWN'};
+};
+
+sub runcmd($) {
+   my ($cmd) = @_;
+   $cmd = "sudo hpssacli $cmd";
+   open(FH, $cmd."|") or die ("Cannot run $cmd: $!");
+   my @lines = ;
+   close FH;
+   die ("no results from $cmd\n") if (scalar @lines == 0);
+   return \@lines;
+}
+
+sub record($) {
+   my ($newexit) = @_;
+   die "code $newexit not defined\n" unless defined $CODE{$newexit};
+
+   if ($CODE{$newexit} > $CODE{$EXITCODE}) {
+   $EXITCODE = $newexit;
+   };
+}
+
+my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--no-battery] 
[--ignore-controller=] [--no-controller-ok] 
[--ignore-transfer-speed= [--ignore-transfer-speed= ...]]\n";
+my $params;
+Getopt::Long::Configure('bundling');
+if (!GetOptions (
+   '--help'  => \$params->{'help'},
+   '--no-battery'=> \$params->{'no-battery'},
+   '--no-controller-ok'  => \$params->{'no-controller-ok'},
+   '--ignore-controller=s'   => \$params->{'ignore-controller'},
+   '--ignore-transfer-speed=s@'  => \$params->{'ignore-transfer-speed'},
+   )) {
+   die ($usage);
+};
+if ($params->{'help'}) {
+   print $usage;
+   exit (0);
+};
+die ($usage) unless (scalar @ARGV == 0);
+
+my $ctrlallshow = runcmd("controller all show");
+my @controllers;
+for (@$ctrlallshow) {
+   chomp;
+   next if /^$/;
+   next if ($params->{'ignore-controller'} && 
/$params->{'ignore-controller'}/);
+   if (/in Slot ([0-9a-z]+)/) {
+   push @controllers, $1;
+   next;
+   };
+   die ("Cannot read line '$_' gotten from hpssacli controller all 
show\n");
+};
+
+if (scalar @controllers == 0) {
+   if ($params->{'no-controller-ok'}) {
+   print "No smartarray controllers found with hpssacli\n";
+   exit $CODE{'OK'}
+   } else {
+   print "UNKNOWN: No smartarray controllers found with 
hpssacli\n";
+   exit $CODE{'UNKNOWN'}
+   }
+};
+
+my @resultstr;
+
+for my $slot (sort @controllers) {
+   my @drives;
+   my $nodrives = 0;
+   my %status;
+
+   my $ldallshow = runcmd("controller slot=$slot ld all show");
+   my @logicaldrives;
+   for (@$ldallshow) {
+   chomp;
+   next if /^$/;
+   next if (/^\S.*in Slot $slot/);
+   next if /^ *array [A-Z]$/;
+   if (/logicaldrive ([0-9a-z]+)/) {
+

[MediaWiki-commits] [Gerrit] Change-Prop: White-list user-agent header header in http filter - change (operations/puppet)

[Ppchelko (Code Review)]

Ppchelko has uploaded a new change for review.

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

Change subject: Change-Prop: White-list user-agent header header in http filter
..

Change-Prop: White-list user-agent header header in http filter

After https://github.com/wikimedia/hyperswitch/pull/41 we're
white-listing all the headers passed to backend services to avoid
distributing personal indentifyable information to untrusted
desctinations. But in change-prop we need to explicitly allow
user-agent header to be sent to the services.

Change-Id: I6d0c51ae5394eb7419fce0f11e07d87fbd1e4eb3
---
M modules/changeprop/templates/config.yaml.erb
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/291784/1

diff --git a/modules/changeprop/templates/config.yaml.erb 
b/modules/changeprop/templates/config.yaml.erb
index 436a0f6..842d41c 100644
--- a/modules/changeprop/templates/config.yaml.erb
+++ b/modules/changeprop/templates/config.yaml.erb
@@ -6,6 +6,8 @@
   options:
 allow:
   - pattern: /^https?:\/\//
+forward_headers:
+  user-agent: true
   title: The Change Propagation root
   paths:
 /{api:sys}/purge:

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

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

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

[MediaWiki-commits] [Gerrit] Remove the `mobile.buttonWithSpinner` module - change (mediawiki...MobileFrontend)

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review.

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

Change subject: Remove the `mobile.buttonWithSpinner` module
..

Remove the `mobile.buttonWithSpinner` module

The module is not being used anywhere and there seems to be a
disagreement over its implementation. See the task for more info.

Bug: T95490
Change-Id: I42438c2ce2a5c1d0a45ef6b8177678608fd8e9b8
---
M extension.json
D resources/mobile.buttonWithSpinner/ButtonWithSpinner.js
D resources/mobile.buttonWithSpinner/ajax-loader.gif
D resources/mobile.buttonWithSpinner/buttonWithSpinner.less
4 files changed, 0 insertions(+), 63 deletions(-)


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

diff --git a/extension.json b/extension.json
index 5523db1..7d511b1 100644
--- a/extension.json
+++ b/extension.json
@@ -1203,21 +1203,6 @@
"mobile-frontend-watchlist-please-wait"
]
},
-   "mobile.buttonWithSpinner": {
-   "targets": [
-   "mobile",
-   "desktop"
-   ],
-   "dependencies": [
-   "oojs-ui"
-   ],
-   "styles": [
-   
"resources/mobile.buttonWithSpinner/buttonWithSpinner.less"
-   ],
-   "scripts": [
-   
"resources/mobile.buttonWithSpinner/ButtonWithSpinner.js"
-   ]
-   },
"mobile.languages.structured": {
"class": "MFResourceLoaderParsedMessageModule",
"dependencies": [
diff --git a/resources/mobile.buttonWithSpinner/ButtonWithSpinner.js 
b/resources/mobile.buttonWithSpinner/ButtonWithSpinner.js
deleted file mode 100644
index de68b98..000
--- a/resources/mobile.buttonWithSpinner/ButtonWithSpinner.js
+++ /dev/null
@@ -1,40 +0,0 @@
-( function ( M ) {
-   /**
-* Button with a spinner indicator
-* Behaves the same as OO.ui.Button widget. Also defines custom methods 
that show and hide
-* the spinner.
-* @param {Object} config
-* @constructor
-*/
-   var ButtonWithSpinner = function ( config ) {
-   ButtonWithSpinner.super.call( this, config );
-   };
-   OO.inheritClass( ButtonWithSpinner, OO.ui.ButtonWidget );
-
-   /**
-* Show the spinner and hide the label (and save the label for future 
use)
-*/
-   ButtonWithSpinner.prototype.showSpinner = function () {
-   var originalWidth = this.$button.width();
-
-   this.defaultLabel = this.getLabel();
-   // Don't let the button width change
-   this.$button.width( originalWidth );
-   this
-   .setIndicator( 'spinner' )
-   .setLabel( '' )
-   .setDisabled( true );
-   };
-
-   /**
-* Hide the spinner and show the default label
-*/
-   ButtonWithSpinner.prototype.hideSpinner = function () {
-   this
-   .setIndicator( null )
-   .setLabel( this.defaultLabel )
-   .setDisabled( false );
-   };
-
-   M.define( 'mobile.buttonWithSpinner/ButtonWithSpinner', 
ButtonWithSpinner );
-}( mw.mobileFrontend ) );
diff --git a/resources/mobile.buttonWithSpinner/ajax-loader.gif 
b/resources/mobile.buttonWithSpinner/ajax-loader.gif
deleted file mode 100644
index c519155..000
--- a/resources/mobile.buttonWithSpinner/ajax-loader.gif
+++ /dev/null
Binary files differ
diff --git a/resources/mobile.buttonWithSpinner/buttonWithSpinner.less 
b/resources/mobile.buttonWithSpinner/buttonWithSpinner.less
deleted file mode 100644
index 109df07..000
--- a/resources/mobile.buttonWithSpinner/buttonWithSpinner.less
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'minerva.mixins';
-
-.oo-ui-indicator-spinner {
-   .background-image( 'ajax-loader.gif' );
-   .background-size( 100%, 100% );
-   margin-left: 0 !important;
-   margin-right: 0 !important;
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42438c2ce2a5c1d0a45ef6b8177678608fd8e9b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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] UniversalExport: Improved tag documentation - change (mediawiki...BlueSpiceExtensions)

[Pwirth (Code Review)]

Pwirth has submitted this change and it was merged.

Change subject: UniversalExport: Improved tag documentation
..


UniversalExport: Improved tag documentation

Tag desciptions in InsertMagic now have examples and links to
helppage.

Change-Id: Ieb7d0dd26a6aab336ca12b70b2273a21d24b1e46
---
M UniversalExport/UniversalExport.class.php
1 file changed, 21 insertions(+), 2 deletions(-)

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



diff --git a/UniversalExport/UniversalExport.class.php 
b/UniversalExport/UniversalExport.class.php
index 64646ee..83bbe65 100644
--- a/UniversalExport/UniversalExport.class.php
+++ b/UniversalExport/UniversalExport.class.php
@@ -289,7 +289,13 @@
'type' => 'tag',
'name' => 'uemeta',
'desc' => wfMessage( 'bs-universalexport-tag-meta-desc' 
)->plain(),
-   'code' => '',
+   'code' => '',
+   'examples' => array(
+   array(
+   'code' => ''
+   )
+   ),
+   'helplink' => 
'https://help.bluespice.com/index.php/UniversalExport'
);
 
$oResponse->result[] = array(
@@ -297,7 +303,13 @@
'type' => 'tag',
'name' => 'ueparams',
'desc' => wfMessage( 
'bs-universalexport-tag-params-desc' )->plain(),
-   'code' => '',
+   'code' => '',
+   'examples' => array(
+   array(
+   'code' => ''
+   )
+   ),
+   'helplink' => 
'https://help.bluespice.com/index.php/UniversalExport'
);
 
$oResponse->result[] = array(
@@ -306,6 +318,7 @@
'name' => 'uepagebreak',
'desc' => wfMessage( 
'bs-universalexport-tag-pagebreak-desc' )->plain(),
'code' => '',
+   'helplink' => 
'https://help.bluespice.com/index.php/UniversalExport'
);
 
$oResponse->result[] = array(
@@ -314,6 +327,12 @@
'name' => 'uenoexport',
'desc' => wfMessage( 
'bs-universalexport-tag-noexport-desc' )->plain(),
'code' => 'Not included in 
export',
+   'examples' => array(
+   array(
+   'code' => 'Not included 
in export'
+   )
+   ),
+   'helplink' => 
'https://help.bluespice.com/index.php/UniversalExport'
);
 
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb7d0dd26a6aab336ca12b70b2273a21d24b1e46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
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] [HOLD] Enable AuthManager on beta wikitech - change (operations/mediawiki-config)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: [HOLD] Enable AuthManager on beta wikitech
..

[HOLD] Enable AuthManager on beta wikitech

HOLD: LdapAuthentication and AbuseFilter patches need to be merged first.

Bug: T135504
Change-Id: I48f9df58c73de13c4ade2457d8535e6ff4cffd9c
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 66822d1..16136e6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -85,6 +85,7 @@
 
 'wgDisableAuthManager' => [
'default' => true,
+   'labstestwiki' => false,
 ],
 
 # wgLanguageCode @{

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48f9df58c73de13c4ade2457d8535e6ff4cffd9c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Weekly Phabricator email: List archived projects with open t... - change (operations/puppet)

[Aklapper (Code Review)]

Aklapper has uploaded a new change for review.

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

Change subject: Weekly Phabricator email: List archived projects with open tasks
..

Weekly Phabricator email: List archived projects with open tasks

Bug: T133649
Change-Id: Ic2b23d843d08c0f2e8329fb36f1ea6a7447e17f5
---
M modules/phabricator/templates/project_changes.sh.erb
1 file changed, 36 insertions(+), 0 deletions(-)


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

diff --git a/modules/phabricator/templates/project_changes.sh.erb 
b/modules/phabricator/templates/project_changes.sh.erb
index a60e402..e08fc1b 100644
--- a/modules/phabricator/templates/project_changes.sh.erb
+++ b/modules/phabricator/templates/project_changes.sh.erb
@@ -73,6 +73,38 @@
 END
 )
 
+#echo "result_archived_projects_open_tasks"
+# see https://phabricator.wikimedia.org/T133649
+result_archived_projects_open_tasks=$(MYSQL_PWD=${sql_pass} /usr/bin/mysql -h 
$sql_host -u$sql_user $sql_name << END
+
+SELECT p.name, count(p.name) AS n
+FROM phabricator_maniphest.edge edg
+JOIN phabricator_maniphest.maniphest_task t
+JOIN phabricator_project.project p
+WHERE edg.dst LIKE 'PHID-PROJ-%'
+AND edg.src LIKE 'PHID-TASK-%'
+AND p.phid = edg.dst
+AND p.status = 100
+AND t.phid = edg.src
+AND (t.status = "open" OR t.status = "stalled")
+AND edg.src NOT IN
+(SELECT edg2.src
+FROM phabricator_maniphest.edge edg2
+JOIN phabricator_maniphest.maniphest_task t2
+JOIN phabricator_project.project p2
+WHERE edg2.dst LIKE 'PHID-PROJ-%'
+AND edg2.src LIKE 'PHID-TASK-%'
+AND edg2.dst != "PHID-PROJ-onnxucoedheq3jevknyr"
+AND p2.phid = edg2.dst
+AND p2.status = 0
+AND t2.phid = edg2.src
+AND (t2.status = "open" OR t2.status = "stalled"))
+GROUP BY p.name
+ORDER BY n DESC;
+
+END
+)
+
 #echo "result_single_workboard_column"
 # see https://phabricator.wikimedia.org/T105865
 result_single_workboard_column=$(MYSQL_PWD=${sql_pass} /usr/bin/mysql -h 
$sql_host -u$sql_user $sql_name << END
@@ -113,6 +145,10 @@
 ${result_column_changes}
 
 
+ARCHIVED PROJECTS WITH OPEN TASKS:
+${result_archived_projects_open_tasks}
+
+
 PROJECT WORKBOARDS WITH A SINGLE COLUMN ONLY:
 ${result_single_workboard_column}
 

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

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

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

[MediaWiki-commits] [Gerrit] pngcrush -brute -reduce on mediawiki.skinning - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: pngcrush -brute -reduce on mediawiki.skinning
..


pngcrush -brute -reduce on mediawiki.skinning

About 25 % size reduction. Looks good in my image viewer.

Change-Id: I9e4815a75899a68e30b8c264f3d772c8ceb6301b
---
M resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
M resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png 
b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
index afad5c6..2704514 100644
--- a/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png 
b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
index 4ccc943..c8b2645 100644
--- a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e4815a75899a68e30b8c264f3d772c8ceb6301b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] raid: fix circular dependency - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: raid: fix circular dependency
..


raid: fix circular dependency

File[/etc/default/mpt-statusd] =>
Package[mpt-status] =>
Class[Packages::Mpt_status] =>
Class[Raid] =>
File[/etc/default/mpt-statusd]

Change-Id: I608ad724758c555bf5e6c7102c4b5dc1172746a8
---
M modules/raid/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index f6ff0d2..804ecea 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -26,7 +26,9 @@
 }
 
 if 'mpt' in $raid {
-require_package('mpt-status')
+package { 'mpt-status':
+ensure => present,
+}
 
 file { '/etc/default/mpt-statusd':
 ensure  => present,

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

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

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

[MediaWiki-commits] [Gerrit] raid: fix circular dependency - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: raid: fix circular dependency
..

raid: fix circular dependency

File[/etc/default/mpt-statusd] =>
Package[mpt-status] =>
Class[Packages::Mpt_status] =>
Class[Raid] =>
File[/etc/default/mpt-statusd]

Change-Id: I608ad724758c555bf5e6c7102c4b5dc1172746a8
---
M modules/raid/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/291780/1

diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index f6ff0d2..804ecea 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -26,7 +26,9 @@
 }
 
 if 'mpt' in $raid {
-require_package('mpt-status')
+package { 'mpt-status':
+ensure => present,
+}
 
 file { '/etc/default/mpt-statusd':
 ensure  => present,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I608ad724758c555bf5e6c7102c4b5dc1172746a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Add explicit GENDER to abusefilter-log-detailedentry-meta - change (mediawiki...AbuseFilter)

[jenkins-bot (Code Review)]

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

Change subject: Add explicit GENDER to abusefilter-log-detailedentry-meta
..


Add explicit GENDER to abusefilter-log-detailedentry-meta

To avoid translatewiki.net warnings.

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

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



diff --git a/i18n/en.json b/i18n/en.json
index 4bac383..fb3421a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -49,7 +49,7 @@
"abusefilter-log-search-submit": "Search",
"abusefilter-log-entry": "$1: $2 triggered an abuse filter, performing 
the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6",
"abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter, 
performing the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6 
($7)",
-   "abusefilter-log-detailedentry-meta": "$1: $2 triggered $3, performing 
the action \"$4\" on $5.\nActions taken: $6;\nFilter description: $7 ($8)",
+   "abusefilter-log-detailedentry-meta": "$1: $2 triggered $3, 
{{GENDER:$9|performing}} the action \"$4\" on $5.\nActions taken: $6;\nFilter 
description: $7 ($8)",
"abusefilter-log-detailedentry-global": "global filter $1",
"abusefilter-log-detailedentry-local": "filter $1",
"abusefilter-log-detailslink": "details",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I791b06e294e4f7097495a280163c83be3c5c8e6d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Se4598 
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] raid: setup multiple checks, one per each RAID found - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: raid: setup multiple checks, one per each RAID found
..


raid: setup multiple checks, one per each RAID found

Instead of calling check_raid once, and let it autodetect a single RAID
controller (or always return "OK", if none found), tie our newly-created
fact with our newly-written check-raid support for arguments to setup
multiple NRPE checks, as (or if) needed.

This also removes support for /etc/nagios/raid_utility which was used as
a workaround for systems with multiple RAID controllers, such as
labstore1001.

Bug: T84050
Change-Id: Id55187c725ec08e3c24f362729143a2182061726
---
M modules/raid/files/check-raid.py
M modules/raid/manifests/init.pp
2 files changed, 27 insertions(+), 15 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/raid/files/check-raid.py b/modules/raid/files/check-raid.py
index 06b86b0..c03687c 100644
--- a/modules/raid/files/check-raid.py
+++ b/modules/raid/files/check-raid.py
@@ -10,14 +10,6 @@
 
 def main():
 try:
-# following the model of self determination for OS and driver
-# allow for a declarative override to ensure a specific driver
-with open('/etc/nagios/raid_utility') as f:
-hc_driver = f.read().strip()
-except:
-hc_driver = None
-
-try:
 argv_driver = sys.argv[1]
 except:
 argv_driver = None
@@ -25,8 +17,6 @@
 osName = os.uname()[0]
 if argv_driver:
 driver = argv_driver
-elif hc_driver:
-driver = hc_driver
 elif osName == 'SunOS':
 driver = 'zpool'
 elif osName == 'Linux':
diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index 5ece243..f6ff0d2 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -14,8 +14,15 @@
 # following line should be then removed.
 $raid = split($::raid, ',')
 
+$check_raid = '/usr/bin/sudo /usr/local/lib/nagios/plugins/check_raid'
+
 if 'megaraid' in $raid {
 require_package('megacli')
+
+nrpe::monitor_service { 'raid_megaraid':
+description  => 'MegaRAID',
+nrpe_command => "${check_raid} megacli",
+}
 }
 
 if 'mpt' in $raid {
@@ -29,17 +36,37 @@
 content => "RUN_DAEMON=no\n",
 before  => Package['mpt-status'],
 }
+
+nrpe::monitor_service { 'raid_mpt':
+description  => 'MPT RAID',
+nrpe_command => "${check_raid} mpt",
+}
 }
 if 'md' in $raid {
 # if there is an "md" RAID configured, mdadm is already installed
+
+nrpe::monitor_service { 'raid_md':
+description  => 'MD RAID',
+nrpe_command => "${check_raid} md",
+}
 }
 
 if 'aac' in $raid {
 require_package('arcconf')
+
+nrpe::monitor_service { 'raid_aac':
+description  => 'Adaptec RAID',
+nrpe_command => "${check_raid} aac",
+}
 }
 
 if 'twe' in $raid {
 require_package('tw-cli')
+
+nrpe::monitor_service { 'raid_twe':
+description  => '3ware TW',
+nrpe_command => "${check_raid} twe",
+}
 }
 
 file { '/usr/local/lib/nagios/plugins/check_raid':
@@ -53,10 +80,5 @@
 sudo::user { 'nagios_raid':
 user   => 'nagios',
 privileges => ['ALL = NOPASSWD: 
/usr/local/lib/nagios/plugins/check_raid'],
-}
-
-nrpe::monitor_service { 'raid':
-description  => 'RAID',
-nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_raid',
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id55187c725ec08e3c24f362729143a2182061726
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Improve provider's canCreateUser logic - change (mediawiki...TitleBlacklist)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Improve provider's canCreateUser logic
..

Improve provider's canCreateUser logic

Test non-autocreations; assume the user would override.

Change-Id: I18d40d95ffcb1aadd724efb3181a7cb32b803ff4
---
M TitleBlacklistPreAuthenticationProvider.php
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/TitleBlacklistPreAuthenticationProvider.php 
b/TitleBlacklistPreAuthenticationProvider.php
index 9d33408..19bd3c2 100644
--- a/TitleBlacklistPreAuthenticationProvider.php
+++ b/TitleBlacklistPreAuthenticationProvider.php
@@ -39,9 +39,10 @@
 
public function testUserForCreation( $user, $autocreate ) {
$sv = StatusValue::newGood();
-   // only check autocreation here, testForAccountCreation will 
catch the rest
-   if ( $autocreate && $this->blockAutoAccountCreation ) {
-   $sv->merge( TitleBlacklistHooks::testUserName( 
$user->getName(), $user, false, true ) );
+   $creator = RequestContext::getMain()->getUser();
+
+   if ( !$autocreate || $this->blockAutoAccountCreation ) {
+   $sv->merge( TitleBlacklistHooks::testUserName( 
$user->getName(), $creator, true, true ) );
}
return $sv;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18d40d95ffcb1aadd724efb3181a7cb32b803ff4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Return error message in users API cancreate field - change (mediawiki/core)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Return error message in users API cancreate field
..

Return error message in users API cancreate field

That API field exposes AuthManager::canCreateAccount, where the error
message is important.

Change-Id: Idef441b311b94ff0cb6c4deaed1ac93959ee7ee8
---
M includes/api/ApiQueryUsers.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/291777/1

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 68ec38d..5afb66f 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -262,8 +262,11 @@
} else {
$data[$u]['missing'] = true;
if ( isset( $this->prop['cancreate'] ) 
&& !$this->getConfig()->get( 'DisableAuthManager' ) ) {
-   $data[$u]['cancreate'] = 
MediaWiki\Auth\AuthManager::singleton()->canCreateAccount( $u )
-   ->isGood();
+   $status = 
MediaWiki\Auth\AuthManager::singleton()->canCreateAccount( $u );
+   $data[$u]['cancreate'] = 
$status->isGood();
+   if ( !$status->isGood() ) {
+   
$data[$u]['cancreateerror'] = $this->getErrorFormatter()->arrayFromStatus( 
$status );
+   }
}
}
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idef441b311b94ff0cb6c4deaed1ac93959ee7ee8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Selser: Bug fix reusing separator text from original source - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Selser: Bug fix reusing separator text from original source
..


Selser: Bug fix reusing separator text from original source

* It makes sense in retrospect, but it is safer to reuse original
  separator only if the original source is reusable for nodes that
  surround the separator.

* The three newly passing selser tests are genuine passes and the
  new output is correct.

* Combined with a followup patch, this leads to correct selser output
  on a test case for T125419.

Change-Id: I3d48581a52aca7a88b651993b89cf40122f47cee
---
M lib/html2wt/separators.js
M tests/parserTests-blacklist.js
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/lib/html2wt/separators.js b/lib/html2wt/separators.js
index 58d1869..5f4f9b5 100644
--- a/lib/html2wt/separators.js
+++ b/lib/html2wt/separators.js
@@ -515,6 +515,7 @@
(state.selserMode && !state.inModifiedContent &&
!DU.nextToDeletedBlockNodeInWT(state.env, prevNode, 
true) &&
!DU.nextToDeletedBlockNodeInWT(state.env, node, false) 
&&
+   WTSUtils.origSrcValidInEditedContext(state.env, 
prevNode) &&
WTSUtils.origSrcValidInEditedContext(state.env, node)));
if (origSepUsable) {
if (!DU.isElt(prevNode)) {
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index c6a1ce7..de0fca2 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -1906,7 +1906,6 @@
 add("selser", "Fuzz testing: Parser16 [[0,1]]", "{|\n!https://|||}");
 add("selser", "Fuzz testing: Parser16 [[3,[2]]]", 
"{|\n!https://|||}");
 add("selser", "Fuzz testing: Parser16 [[0,[[1,1,1,0", "{|\n! 
data-foobar=\"zu74dq5r4l5wmi\" |https://|| data-foobar=\"at9q2rxpkvivbo6r\" ||| 
data-foobar=\"knfvnx3swhppsyvi\" }");
-add("selser", "Fuzz testing: Parser16 [[0,[[0,2,4,2", 
"{|\n!https://\n!yojby2s147usdcxr||\n!v7e4oycgqkqehfr\n!k6xurl8iqpz257b9|||}");
 add("selser", "Fuzz testing: Parser16 [1]", "{| 
data-foobar=\"rwdbutcm2hbprpb9\"\n!https://|||}");
 add("selser", "Fuzz testing: Parser16 [[2,[1]]]", 
"{|\n!https://|||}");
 add("selser", "Fuzz testing: Parser21 [[2,2]]", 
"{|\n! irc://{{ftp://a\; 
onmouseover=\"alert('hello world');\"\n||}");
@@ -1991,7 +1990,6 @@
 add("selser", "Don't break table handling if language converter markup is in 
the cell. [[3,1]]", "{|\n|-\n| -{R|B}-\n|}");
 add("selser", "Don't break table handling if language converter markup is in 
the cell. [[3,[1,3]]]", "{|\n|- data-foobar=\"62vnpmgm6rzlg14i\"\n| 
-{R|B}-\n|}");
 add("selser", "Don't break table handling if language converter markup is in 
the cell. [[0,1]]", "{|\n|-\n| -{R|B}-\n|}");
-add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy [3]]],0]]", "**{{bullet}}");
 add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy [[1,0]]", "*** Foo {{bullet}}");
 add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy [[2,0]]", "* wzen8urjy55qaor\n*** Foo {{bullet}}");
 add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy [1]", "*** Foo {{bullet}}");
@@ -2002,7 +2000,6 @@
 add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy [[[2],0]]", "*vkl4nqq6z9kvs4i\n*** Foo {{bullet}}");
 add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy [[[1],0]]", "*** Foo {{bullet}}");
 add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy 1]],0]]", "*** Foo {{bullet}}");
-add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy [[3,0]]", "**{{bullet}}");
 add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy 2]],0]]", "** y0slrsmmchjxxbt9\n*** Foo {{bullet}}");
 add("selser", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy [[[4],0]]", "***u5i7s9pdlw8w7b9{{bullet}}");
 add("selser", "HHP2.1: Heuristics for headings in preprocessor parenthetical 
structures [0,2,4]", "{{foo|\n\n2l1t9h2tgp41v2t9\n\npiz397o23x7s0pb9\n");

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d48581a52aca7a88b651993b89cf40122f47cee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] Update wikibase/javascript-api to 1.1.1 - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: Update wikibase/javascript-api to 1.1.1
..


Update wikibase/javascript-api to 1.1.1

Bug: T136543
Change-Id: I61efa8f0775688296b19161967d083be9b03d6bc
---
M composer.lock
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
M vendor/wikibase/javascript-api/README.md
M vendor/wikibase/javascript-api/WikibaseJavaScriptApi.php
M vendor/wikibase/javascript-api/src/getLocationAgnosticMwApi.js
6 files changed, 63 insertions(+), 58 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 01175dc..9e00062 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1308,16 +1308,16 @@
 },
 {
 "name": "wikibase/javascript-api",
-"version": "1.1.0",
+"version": "1.1.1",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi.git;,
-"reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0"
+"reference": "8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/a9c0202a33f278edd024f0c150d6281a6635bfc0;,
-"reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c;,
+"reference": "8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c",
 "shasum": ""
 },
 "require": {
@@ -1348,7 +1348,7 @@
 }
 ],
 "description": "JavaScript client for the Wikibase Repository web 
API",
-"time": "2016-02-17 10:46:01"
+"time": "2016-05-30 17:31:31"
 },
 {
 "name": "wikibase/quality",
diff --git a/vendor/composer/autoload_files.php 
b/vendor/composer/autoload_files.php
index 0abc7cb..01a2716 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -20,10 +20,10 @@
 '4b37f72a623577cc8b75c6a738dc9d30' => $vendorDir . 
'/wikibase/data-model-javascript/init.php',
 '7bfd6f61201c5428720c19ba0ef3d730' => $vendorDir . 
'/wikimedia/purtle/Purtle.php',
 '3a1322766b0dbc9cf396163859b9f864' => $vendorDir . 
'/wikibase/serialization-javascript/init.php',
-'f44e0a54bf5f0864879c4d3e46950b49' => $vendorDir . 
'/wikibase/javascript-api/WikibaseJavaScriptApi.php',
 'e47bdf5a503f90444b98ecdcab719841' => $vendorDir . 
'/wikibase/internal-serialization/mediawiki.php',
 '499fed5dd24a6329f26a3973b04c5440' => $baseDir . 
'/extensions/ValueView/ValueView.php',
 'b27615ec50616984e4b07db5658aba0d' => $vendorDir . 
'/data-values/data-types/DataTypes.php',
 '0dd9431cbbfa9ed9cb9d565d7129dbaf' => $vendorDir . 
'/data-values/validators/Validators.php',
+'f44e0a54bf5f0864879c4d3e46950b49' => $vendorDir . 
'/wikibase/javascript-api/WikibaseJavaScriptApi.php',
 '6b49d0287e368cb66263e04ca7d9699f' => $baseDir . 
'/extensions/WikimediaBadges/WikimediaBadges.php',
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ff538ed..a7499ba 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -401,52 +401,6 @@
 "description": "Wikibase datamodel serialization implementation in 
JavaScript"
 },
 {
-"name": "wikibase/javascript-api",
-"version": "1.1.0",
-"version_normalized": "1.1.0.0",
-"source": {
-"type": "git",
-"url": 
"https://github.com/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi.git;,
-"reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/a9c0202a33f278edd024f0c150d6281a6635bfc0;,
-"reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0",
-"shasum": ""
-},
-"require": {
-"data-values/javascript": "~0.8.0|~0.7.0|~0.6.0"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.5.1"
-},
-"time": "2016-02-17 10:46:01",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"files": [
-"WikibaseJavaScriptApi.php"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"GPL-2.0+"
-],
-"authors": [
- 

[MediaWiki-commits] [Gerrit] Migrate to use Intuition as a library - change (labs...heritage)

[Code Review]

Jean-Frédéric has uploaded a new change for review.

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

Change subject: Migrate to use Intuition as a library
..

Migrate to use Intuition as a library

Instead of relying on a local installation.

This is the more modern way of using Intuition,
and paves the way to have messages used locally.

This also makes it easier to have a local
development environment.

- Add Intuition as a dependency in composer.json
- Change loader in common.php to load from the vendor
  directory rather than relative to the $tsI18nDir variable
  (which points to an hardocoded path on ToolLabs NFS)
- Remove tsI18nDir variable from Defaults.php

Bug: T134565
Change-Id: I6feac5712065d61e967eefdacb4206fe663ff9ef
---
M api/common.php
M api/includes/Defaults.php
M composer.json
3 files changed, 15 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/76/291776/1

diff --git a/api/common.php b/api/common.php
index e669644..f8c3ea3 100644
--- a/api/common.php
+++ b/api/common.php
@@ -20,19 +20,19 @@
require dirname( dirname( __FILE__ ) ) . "/{$config_override}";
 }
 
-/* Localization */
-if ( $tsI18nDir ) {
-   require_once( "$tsI18nDir/ToolStart.php" );
-   $opts = array(
-   'domain' => 'MonumentsAPI', // name of your main text-domain 
here
-   'globalfunctions' => true, // defines _(), _e() and _g() as 
shortcut for $I18N->msg( .. )
-   'suppresserrors' => false, // Krinkle heeft het stukgemaakt
-   );
-   $I18N = new TsIntuition( $opts );
-} else {
-   $I18N = null;
-}
+/* Localization
+ * We are loading Intuition as a library via Composer
+ */
+require_once __DIR__ . '/../vendor/autoload.php';
 
+$opts = array(
+   'domain' => 'MonumentsAPI', // name of your main text-domain here
+   'globalfunctions' => true, // defines _(), _e() and _g() as shortcut 
for $I18N->msg( .. )
+   'suppresserrors' => false, // Krinkle heeft het stukgemaakt
+   );
+$I18N = new Intuition( $opts );
+
+/* Database */
 $dbStatus = Database::define($dbServer, $dbDatabase, $dbUser,
isset( $toolserver_password )? $toolserver_password : $dbPassword );
 if (!$dbStatus) {
diff --git a/api/includes/Defaults.php b/api/includes/Defaults.php
index a266e72..fa826ab 100644
--- a/api/includes/Defaults.php
+++ b/api/includes/Defaults.php
@@ -5,7 +5,6 @@
 $dbDatabase = 's51138__heritage_p';
 $dbPassword = 'https://gerrit.wikimedia.org/r/291776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6feac5712065d61e967eefdacb4206fe663ff9ef
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 

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

[MediaWiki-commits] [Gerrit] raid: vary package installation on the RAID installed - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: raid: vary package installation on the RAID installed
..


raid: vary package installation on the RAID installed

Installing all RAID controller packages on all hosts is kind of a waste.
Use the newly-written $raid fact to differentiate systems based on what
kind of RAID controller they have installed and install the appropriate
packages.

Bug: T84050
Change-Id: Ia16b7ad8ad281640fe18fe77cb781d2480af54dc
---
M modules/raid/manifests/init.pp
1 file changed, 29 insertions(+), 9 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index c8f22eb..5ece243 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -9,17 +9,37 @@
 #  include raid
 
 class raid {
-package { [ 'megacli', 'arcconf', 'mpt-status' ]:
-ensure => 'latest',
+# unfortunately, we don't support stringify_facts=false yet; when we
+# eventually do, the fact should be adjusted to not join with ",", and the
+# following line should be then removed.
+$raid = split($::raid, ',')
+
+if 'megaraid' in $raid {
+require_package('megacli')
 }
 
-file { '/etc/default/mpt-statusd':
-ensure  => present,
-owner   => 'root',
-group   => 'root',
-mode=> '0555',
-content => "RUN_DAEMON=no\n",
-before  => Package['mpt-status'],
+if 'mpt' in $raid {
+require_package('mpt-status')
+
+file { '/etc/default/mpt-statusd':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => "RUN_DAEMON=no\n",
+before  => Package['mpt-status'],
+}
+}
+if 'md' in $raid {
+# if there is an "md" RAID configured, mdadm is already installed
+}
+
+if 'aac' in $raid {
+require_package('arcconf')
+}
+
+if 'twe' in $raid {
+require_package('tw-cli')
 }
 
 file { '/usr/local/lib/nagios/plugins/check_raid':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia16b7ad8ad281640fe18fe77cb781d2480af54dc
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] DraggableGroupWidget: Remove unnecessary `cursor` property - change (oojs/ui)

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: DraggableGroupWidget: Remove unnecessary `cursor` property
..

DraggableGroupWidget: Remove unnecessary `cursor` property

Removing unnecessary, duplicated fallback `cursor` property on
DraggableGroupWidget.

Change-Id: Ib41a696b066fbd6856a448d186e637241a16ab01
---
M src/styles/elements/DraggableElement.less
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/75/291775/1

diff --git a/src/styles/elements/DraggableElement.less 
b/src/styles/elements/DraggableElement.less
index 053d5f6..f363f56 100644
--- a/src/styles/elements/DraggableElement.less
+++ b/src/styles/elements/DraggableElement.less
@@ -13,7 +13,6 @@
}
 
&-handle:active {
-   cursor: move;
cursor: url( images/grabbing.cur );
cursor: -webkit-grabbing;
cursor: -moz-grabbing;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib41a696b066fbd6856a448d186e637241a16ab01
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] Update wikibase/javascript-api to 1.1.1 - change (mediawiki...Wikidata)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Update wikibase/javascript-api to 1.1.1
..

Update wikibase/javascript-api to 1.1.1

Bug: T136543
Change-Id: I61efa8f0775688296b19161967d083be9b03d6bc
---
M composer.lock
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
M vendor/wikibase/javascript-api/README.md
M vendor/wikibase/javascript-api/WikibaseJavaScriptApi.php
M vendor/wikibase/javascript-api/src/getLocationAgnosticMwApi.js
6 files changed, 63 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/74/291774/1

diff --git a/composer.lock b/composer.lock
index 01175dc..9e00062 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1308,16 +1308,16 @@
 },
 {
 "name": "wikibase/javascript-api",
-"version": "1.1.0",
+"version": "1.1.1",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi.git;,
-"reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0"
+"reference": "8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/a9c0202a33f278edd024f0c150d6281a6635bfc0;,
-"reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c;,
+"reference": "8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c",
 "shasum": ""
 },
 "require": {
@@ -1348,7 +1348,7 @@
 }
 ],
 "description": "JavaScript client for the Wikibase Repository web 
API",
-"time": "2016-02-17 10:46:01"
+"time": "2016-05-30 17:31:31"
 },
 {
 "name": "wikibase/quality",
diff --git a/vendor/composer/autoload_files.php 
b/vendor/composer/autoload_files.php
index 0abc7cb..01a2716 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -20,10 +20,10 @@
 '4b37f72a623577cc8b75c6a738dc9d30' => $vendorDir . 
'/wikibase/data-model-javascript/init.php',
 '7bfd6f61201c5428720c19ba0ef3d730' => $vendorDir . 
'/wikimedia/purtle/Purtle.php',
 '3a1322766b0dbc9cf396163859b9f864' => $vendorDir . 
'/wikibase/serialization-javascript/init.php',
-'f44e0a54bf5f0864879c4d3e46950b49' => $vendorDir . 
'/wikibase/javascript-api/WikibaseJavaScriptApi.php',
 'e47bdf5a503f90444b98ecdcab719841' => $vendorDir . 
'/wikibase/internal-serialization/mediawiki.php',
 '499fed5dd24a6329f26a3973b04c5440' => $baseDir . 
'/extensions/ValueView/ValueView.php',
 'b27615ec50616984e4b07db5658aba0d' => $vendorDir . 
'/data-values/data-types/DataTypes.php',
 '0dd9431cbbfa9ed9cb9d565d7129dbaf' => $vendorDir . 
'/data-values/validators/Validators.php',
+'f44e0a54bf5f0864879c4d3e46950b49' => $vendorDir . 
'/wikibase/javascript-api/WikibaseJavaScriptApi.php',
 '6b49d0287e368cb66263e04ca7d9699f' => $baseDir . 
'/extensions/WikimediaBadges/WikimediaBadges.php',
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ff538ed..a7499ba 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -401,52 +401,6 @@
 "description": "Wikibase datamodel serialization implementation in 
JavaScript"
 },
 {
-"name": "wikibase/javascript-api",
-"version": "1.1.0",
-"version_normalized": "1.1.0.0",
-"source": {
-"type": "git",
-"url": 
"https://github.com/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi.git;,
-"reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/a9c0202a33f278edd024f0c150d6281a6635bfc0;,
-"reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0",
-"shasum": ""
-},
-"require": {
-"data-values/javascript": "~0.8.0|~0.7.0|~0.6.0"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.5.1"
-},
-"time": "2016-02-17 10:46:01",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"files": [
-"WikibaseJavaScriptApi.php"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-

[MediaWiki-commits] [Gerrit] Make terms table compatible with MediaInfo - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Make terms table compatible with MediaInfo
..


Make terms table compatible with MediaInfo

There are multiple intermediate hacks in this patch. The problem is: When I
split this patch into two (one for storing terms, one for retrieving), it's
still unusable. When you try to edit a label or description, both storing and
retrieving must work.

I think all hacks in PS2 are acceptable and this patch can be merged as it is.

A proper solution for retrieving MediaInfo terms is proposed in I9b54124.

Bug: T134735
Change-Id: I0f7e2e352f5bd33666532552f9c800b1f13ab2a1
---
M lib/includes/Store/BufferingTermLookup.php
M lib/includes/Store/Sql/SqlEntityInfoBuilder.php
M lib/includes/Store/Sql/TermSqlIndex.php
M lib/includes/TermIndexEntry.php
4 files changed, 71 insertions(+), 27 deletions(-)

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



diff --git a/lib/includes/Store/BufferingTermLookup.php 
b/lib/includes/Store/BufferingTermLookup.php
index f21663c..9c48fe4 100644
--- a/lib/includes/Store/BufferingTermLookup.php
+++ b/lib/includes/Store/BufferingTermLookup.php
@@ -184,7 +184,13 @@
$keys = array();
 
foreach ( $terms as $term ) {
-   $key = $this->getBufferKey( $term->getEntityId(), 
$term->getType(), $term->getLanguage() );
+   $id = $term->getEntityId();
+
+   if ( $id === null ) {
+   continue;
+   }
+
+   $key = $this->getBufferKey( $id, $term->getType(), 
$term->getLanguage() );
$this->buffer->set( $key, $term->getText() );
$keys[] = $key;
}
diff --git a/lib/includes/Store/Sql/SqlEntityInfoBuilder.php 
b/lib/includes/Store/Sql/SqlEntityInfoBuilder.php
index b4a0416..a973b1e 100644
--- a/lib/includes/Store/Sql/SqlEntityInfoBuilder.php
+++ b/lib/includes/Store/Sql/SqlEntityInfoBuilder.php
@@ -373,7 +373,13 @@
private function injectTerms( ResultWrapper $dbResult ) {
foreach ( $dbResult as $row ) {
// FIXME: this only works for items and properties
-   $entityId = 
LegacyIdInterpreter::newIdFromTypeAndNumber( $row->term_entity_type, 
(int)$row->term_entity_id );
+   try {
+   $entityId = 
LegacyIdInterpreter::newIdFromTypeAndNumber( $row->term_entity_type, 
(int)$row->term_entity_id );
+   } catch ( InvalidArgumentException $ex ) {
+   wfWarn( 'Unsupported entity type "' . 
$row->term_entity_type . '"' );
+   continue;
+   }
+
$key = $entityId->getSerialization();
 
if ( !isset( $this->entityInfo[$key] ) ) {
diff --git a/lib/includes/Store/Sql/TermSqlIndex.php 
b/lib/includes/Store/Sql/TermSqlIndex.php
index fe98528..c38a294 100644
--- a/lib/includes/Store/Sql/TermSqlIndex.php
+++ b/lib/includes/Store/Sql/TermSqlIndex.php
@@ -10,9 +10,11 @@
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Item;
-use Wikibase\DataModel\Term\Fingerprint;
-use Wikibase\DataModel\Term\FingerprintProvider;
+use Wikibase\DataModel\Term\AliasesProvider;
+use Wikibase\DataModel\Term\AliasGroupList;
+use Wikibase\DataModel\Term\DescriptionsProvider;
 use Wikibase\DataModel\Term\LabelsProvider;
+use Wikibase\DataModel\Term\TermList;
 use Wikibase\Lib\Store\LabelConflictFinder;
 
 /**
@@ -25,6 +27,7 @@
  * @author Jens Ohlig < jens.oh...@wikimedia.de >
  * @author Daniel Kinzler
  * @author Denny
+ * @author Thiemo Mättig
  */
 class TermSqlIndex extends DBAccessBase implements TermIndex, 
LabelConflictFinder {
 
@@ -177,51 +180,77 @@
 * @return TermIndexEntry[]
 */
public function getEntityTerms( EntityDocument $entity ) {
-   // FIXME: OCP violation. No support for new types of entities 
can be registered
+   // FIXME: Introduce and use an Int32EntityId interface.
+   if ( !method_exists( $entity->getId(), 'getNumericId' ) ) {
+   wfWarn( 'Entity type "' . $entity->getType() . '" does 
not implement getNumericId' );
+   return [];
+   }
 
+   $terms = [];
$extraFields = [
'entityType' => $entity->getType(),
'entityId' => $entity->getId()->getNumericId(),
];
 
-   if ( $entity instanceof FingerprintProvider ) {
-   $fingerprint = $entity->getFingerprint();
-   return $this->getFingerprintTerms( 

[MediaWiki-commits] [Gerrit] Release 1.1.1 - change (mediawiki...WikibaseJavaScriptApi)

[jenkins-bot (Code Review)]

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

Change subject: Release 1.1.1
..


Release 1.1.1

Bug: T136543
Change-Id: Ic31be04422a14f37c7d7aeef5f9089c412580299
---
M README.md
M WikibaseJavaScriptApi.php
2 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 22f34bc..e6dc91b 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,10 @@
 
 ## Release notes
 
+### 1.1.1 (2016-05-30)
+
+* Fix getLocationAgnosticMwApi behavior in Internet Explorer
+
 ### 1.1.0 (2016-02-17)
 
 * Added optional propertyId parameter to RepoApi::formatValue
diff --git a/WikibaseJavaScriptApi.php b/WikibaseJavaScriptApi.php
index 157c013..a6d22f2 100644
--- a/WikibaseJavaScriptApi.php
+++ b/WikibaseJavaScriptApi.php
@@ -5,7 +5,7 @@
return 1;
 }
 
-define( 'WIKIBASE_JAVASCRIPT_API_VERSION', '1.1.0' );
+define( 'WIKIBASE_JAVASCRIPT_API_VERSION', '1.1.1' );
 
 // Include the composer autoloader if it is present.
 if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic31be04422a14f37c7d7aeef5f9089c412580299
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi
Gerrit-Branch: 1.1.x
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: JanZerebecki 
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