date:20151026

[MediaWiki-commits] [Gerrit] css styling for boxes and borders - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: css styling for boxes and borders
..


css styling for boxes and borders

added styling for boxex and borders according to
https://help.bluespice.com/index.php/Boxen

Change-Id: Ia1c8234c414186b5c80b466bf8e551d7606471e5
(cherry picked from commit 5934ba3e615921a1015ee835baf467a7d4056e84)
---
M resources/bluespice/bluespice.css
1 file changed, 76 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/resources/bluespice/bluespice.css 
b/resources/bluespice/bluespice.css
index 6a9d64f..99e319c 100644
--- a/resources/bluespice/bluespice.css
+++ b/resources/bluespice/bluespice.css
@@ -41,4 +41,79 @@
 .btn44 {
height:44px!important;
width:44px!important;
-}
\ No newline at end of file
+}
+
+.bluebox,
+.box-blue {
+   border:1px solid #6093D2;
+   background-color:#AEC8E8;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.beigebox,
+.box-beige {
+   border:1px solid #000;
+   background-color:#E0B978;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.greenbox,
+.box-green {
+   border:1px solid #237E14;
+   background-color:#DEFEBB;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.yellowbox,
+.box-yellow {
+   border:1px solid #00;
+   background-color:#AA;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.redbox,
+.box-red {
+   border:1px solid #DD;
+   background-color:#FF;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.blueborder,
+.border-blue {
+   border:1px solid #AEC8E8;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.beigeborder,
+.border-beige {
+   border:1px solid #E0B978;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.greenborder,
+.border-green {
+   border:1px solid #237E14;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.yellowborder,
+.border-yellow {
+   border:1px solid #00;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.redborder,
+.border-red {
+   border:1px solid #DD;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1c8234c414186b5c80b466bf8e551d7606471e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
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] Use listview.removeItem for reference removing in statementview - change (mediawiki...Wikibase)

2015-10-26 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Use listview.removeItem for reference removing in statementview
..

Use listview.removeItem for reference removing in statementview

`removeItem` triggers an event which is captured in `statementview` to update
the references counter.

Change-Id: I05d88246c2c0c61dbb22f517536b55bb8e321ef4
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index d445306..3479e2e 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -328,9 +328,7 @@
$newLi
.on( lia.prefixedEvent( 'afterstopediting' ), 
function( event, dropValue ) {
if ( dropValue ) {
-   liInstance.destroy();
-   $newLi.remove();
-   self._drawReferencesCounter();
+   
self._referencesListview.removeItem( $newLi );
} else {
var newReferenceWithHash = 
liInstance.value();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05d88246c2c0c61dbb22f517536b55bb8e321ef4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang 

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

[MediaWiki-commits] [Gerrit] [WIP] Controller - change (mediawiki...Wikibase)

2015-10-26 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: [WIP] Controller
..

[WIP] Controller

Bug: ?
Change-Id: I7ff95a3412d6ed08967ef9d52f807efdce8d545f
---
M view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
M 
view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
M view/resources/jquery/wikibase/toolbar/controller/resources.php
A view/resources/wikibase/Controller.js
M view/resources/wikibase/resources.php
5 files changed, 119 insertions(+), 99 deletions(-)


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

diff --git a/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
index a33f276..b88c93b 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
@@ -220,6 +220,7 @@
return;
}
 
+   // FIXME: There should be a listview::startEditing method
$.each( this.$listview.data( 'listview' ).value(), function() {
this.startEditing();
} );
@@ -236,56 +237,20 @@
 * Stops the widget's edit mode.
 * @since 0.5
 */
-   stopEditing: function( dropValue ) {
-   if ( !this.isInEditMode() || ( !this.isValid() || 
this.isInitialValue() ) && !dropValue ) {
+   stopEditing: function() {
+   if ( !this.isInEditMode() ) {
return;
}
 
-   this._trigger( 'stopediting', null, [dropValue] );
+   this._isInEditMode = false;
+   this.element.removeClass( 'wb-edit' );
 
-   var self = this;
-
-   this.element.removeClass( 'wb-error' );
this._detachEditModeEventHandlers();
-   this.disable();
 
-   if ( dropValue ) {
-   this._stopEditingReferenceSnaks();
+   // FIXME: There should be a listview::stopEditing method
+   this._stopEditingReferenceSnaks();
 
-   this.enable();
-   this.element.removeClass( 'wb-edit' );
-   this._isInEditMode = false;
-
-   this._trigger( 'afterstopediting', null, [ dropValue ] 
);
-   } else {
-   this._saveReferenceApiCall()
-   .done( function( savedReference ) {
-   self.options.value = savedReference;
-
-   self._stopEditingReferenceSnaks();
-
-   self.enable();
-
-   self.element.removeClass( 'wb-edit' );
-   self._isInEditMode = false;
-
-   self._trigger( 'afterstopediting', null, [ 
dropValue ] );
-   } )
-   .fail( function( error ) {
-   self.enable();
-
-   self._attachEditModeEventHandlers();
-   self.setError( error );
-   } );
-   }
-   },
-
-   /**
-* Cancels edit mode.
-* @since 0.5
-*/
-   cancelEditing: function() {
-   this.stopEditing( true );
+   this._trigger( 'afterstopediting' );
},
 
/**
@@ -377,39 +342,12 @@
},
 
/**
-* Triggers the API call to save the reference.
-* @see wikibase.entityChangers.ReferencesChanger.setReference
-* @private
-*
-* @return {Object} jQuery.Promise
-* @return {Function} return.done
-* @return {Reference} return.done.savedReference
-* @return {Function} return.fail
-* @return {wikibase.api.RepoApiError} return.fail.error
-*/
-   _saveReferenceApiCall: function() {
-   var self = this,
-   guid = this.options.statementGuid;
-
-   return this.options.referencesChanger.setReference( guid, 
this.value() )
-   .done( function( savedReference ) {
-   self._updateReferenceHashClass( savedReference );
-   } );
-   },
-
-   /**
 * Sets/removes error state from the widget.
 *
-* @param {wikibase.api.RepoApiError} [error]
+* @param {Boolean} error
 */
setError: function( error ) {
-   if ( error ) {
-   this.element.addClass( 'wb-error' );
-   this._trigger( 'toggleerror', null, [ error ] );
-   } else {
-   this.element.removeClass( 'wb-error' );
-

[MediaWiki-commits] [Gerrit] Make edittoolbar check for cancelEditing method - change (mediawiki...Wikibase)

2015-10-26 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Make edittoolbar check for cancelEditing method
..

Make edittoolbar check for cancelEditing method

Since the `edittoolbar` always has a cancel button, this method is always
necessary.

Change-Id: I1a4ef2fd8e88517f2c7e677bd99d4102e2b4d416
---
M view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git 
a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js 
b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
index 20051a1..a3392d2 100644
--- a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
+++ b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
@@ -63,6 +63,7 @@
 * @type {string[]}
 */
_requiredMethods: [
+   'cancelEditing',
'startEditing',
'stopEditing',
'setError'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a4ef2fd8e88517f2c7e677bd99d4102e2b4d416
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang 

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

[MediaWiki-commits] [Gerrit] Remove unused toolbar destroying code - change (mediawiki...Wikibase)

2015-10-26 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Remove unused toolbar destroying code
..

Remove unused toolbar destroying code

At that point, the snakviews are gone already.

Change-Id: I568382d51f5f8c0a24074ca6d830ea67dc52d68a
---
M 
view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
1 file changed, 0 insertions(+), 18 deletions(-)


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

diff --git 
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
 
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
index 4eb3960..467926b 100644
--- 
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
+++ 
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview-snakview.js
@@ -37,24 +37,6 @@
toolbarcontroller.registerEventHandler(
event.data.toolbar.type,
event.data.toolbar.id,
-   'referenceviewafterstopediting',
-   function( event, toolbarcontroller ) {
-   // Destroy the snakview 
toolbars:
-   var $referenceviewNode = $( 
event.target );
-   $.each(
-   
$referenceviewNode.find( '.wikibase-snakview' ),
-   function( i, 
snakviewNode ) {
-   
toolbarcontroller.destroyToolbar(
-   $( 
snakviewNode ).data( 'removetoolbar' )
-   );
-   }
-   );
-   }
-   );
-
-   toolbarcontroller.registerEventHandler(
-   event.data.toolbar.type,
-   event.data.toolbar.id,
'referenceviewdisable 
listviewitemremoved',
function( event ) {
var $referenceview = 
event.type.indexOf( 'referenceview' ) !== -1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I568382d51f5f8c0a24074ca6d830ea67dc52d68a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang 

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

[MediaWiki-commits] [Gerrit] Simplify snaklistview edit mode stopping in referenceview - change (mediawiki...Wikibase)

2015-10-26 Thread Adrian Lang (Code Review)

Adrian Lang has uploaded a new change for review.

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

Change subject: Simplify snaklistview edit mode stopping in referenceview
..

Simplify snaklistview edit mode stopping in referenceview

Currently, the referenceview throws away the `snaklistviews` no matter if
`dropValue` is true or not.

Change-Id: I012fc7cfa543c8046e597c852ceda435760e0a8b
---
M view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
1 file changed, 5 insertions(+), 28 deletions(-)


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

diff --git a/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
index c38cf44..a33f276 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
@@ -250,7 +250,7 @@
this.disable();
 
if ( dropValue ) {
-   this._stopEditingReferenceSnaks( dropValue );
+   this._stopEditingReferenceSnaks();
 
this.enable();
this.element.removeClass( 'wb-edit' );
@@ -262,7 +262,7 @@
.done( function( savedReference ) {
self.options.value = savedReference;
 
-   self._stopEditingReferenceSnaks( dropValue );
+   self._stopEditingReferenceSnaks();
 
self.enable();
 
@@ -290,41 +290,18 @@
 
/**
 * @private
-*
-* @param {boolean} dropValue
 */
-   _stopEditingReferenceSnaks: function( dropValue ) {
+   _stopEditingReferenceSnaks: function() {
var listview = this.$listview.data( 'listview' );
 
-   $.each( listview.value(), function() {
-   this.stopEditing( dropValue );
-
-   if ( dropValue && !this.value() ) {
-   // Remove snaklistview from referenceview if no 
snakviews are left in that
-   // snaklistview:
-   listview.removeItem( this.element );
-   }
+   listview.items().each( function() {
+   listview.removeItem( $( this ) );
} );
-
-   this.clear();
 
if ( this.options.value ) {
$.each( 
this.options.value.getSnaks().getGroupedSnakLists(), function() {
listview.addItem( this );
} );
-   }
-   },
-
-   /**
-* Clears the widget's content.
-* @since 0.5
-*/
-   clear: function() {
-   var listview = this.$listview.data( 'listview' ),
-   items = listview.items();
-
-   for ( var i = 0; i < items.length; i++ ) {
-   listview.removeItem( items.eq( i ) );
}
},
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I012fc7cfa543c8046e597c852ceda435760e0a8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang 

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

[MediaWiki-commits] [Gerrit] Added missing resources - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

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

Change subject: Added missing resources
..

Added missing resources

Since jenkins now validates on the existence of resources that were
referenced within CSS files we need to fix this.

Thos files are also missing in the original ExtJS Neptune Theme build. I
assume those rules are legacy code and not used anmore.

Still we want to make jenkins happy, so we add some dummy files.

Change-Id: I51b9c326357f101e419649e000a9a6d4d6af503f
---
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-focus-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-focus-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-focus-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-focus-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-over-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-over-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-over-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-over-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-pressed-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-pressed-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-pressed-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-pressed-sides.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-disabled-bg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-disabled-corners.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-disabled-fbg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-disabled-sides.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-focus-bg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-focus-corners.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-focus-fbg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-focus-sides.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-over-bg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-over-corners.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-over-fbg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-over-sides.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-pressed-bg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-pressed-corners.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-pressed-fbg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-pressed-sides.gif
32 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git 
a/resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-bg.gif
 
b/resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-bg.gif
new file mode 100644
index 000..48a5a75
--- /dev/null
+++ 
b/resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-bg.gif
Binary files differ
diff --git 
a/resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-corners.gif
 
b/resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-corners.gif
new file mode 100644
index 000..9a560e5
--- /dev/null
+++ 
b/resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-corners.gif
Binary files differ
diff --git 
a/resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-fbg.gif
 
b/resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-fbg.gif
new file mode 100644
index 000..48a5a75
--- /dev/null
+++

[MediaWiki-commits] [Gerrit] Assign salt grains for graphite - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for graphite
..

Assign salt grains for graphite

Change-Id: I6295349842f2ee91b24994ff28233752a76cb97c
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index dba83d2..7919114 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, 
debdeploy-ci:standard, debdeploy-librenms:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, 
debdeploy-ci:standard, debdeploy-librenms:standard, debdeploy-graphite:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for jobrunners - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for jobrunners
..

Assign salt grains for jobrunners

Change-Id: Ib4fd0c1e28747018ff8b97cf390299171f16a587
---
A hieradata/role/codfw/mediawiki/jobrunner.yaml
A hieradata/role/eqiad/mediawiki/jobrunner.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/248844/1

diff --git a/hieradata/role/codfw/mediawiki/jobrunner.yaml 
b/hieradata/role/codfw/mediawiki/jobrunner.yaml
new file mode 100644
index 000..468ee36
--- /dev/null
+++ b/hieradata/role/codfw/mediawiki/jobrunner.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-jobrunner-codfw:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/jobrunner.yaml 
b/hieradata/role/eqiad/mediawiki/jobrunner.yaml
new file mode 100644
index 000..956c50a
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/jobrunner.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-jobrunner-eqiad:
+value: standard
+
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index c243483..d6cce78 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -97,3 +97,7 @@
 mw-api = debdeploy-appserverapi-codfw:standard, 
debdeploy-appserverapi-eqiad:standard
 mw-api-canary = debdeploy-appserverapi-eqiad:canary
 mw-api-canary-single = debdeploy-appserverapi:single_canary
+jobrunner-eqiad = debdeploy-jobrunner-eqiad:standard
+jobrunner-codfw = debdeploy-jobrunner-codfw:standard
+jobrunner= debdeploy-jobrunner-codfw:standard, 
debdeploy-jobrunner-eqiad:standard
+jobrunner-canary = debdeploy-jobrunner-eqiad:canary

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for librenms - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for librenms
..

Assign salt grains for librenms

Change-Id: I61a1e4bcf34f1d0f1a8aaac9aae4a9bcc53e40ec
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/248846/1

diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 349b837..dba83d2 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, debdeploy-ci:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, 
debdeploy-ci:standard, debdeploy-librenms:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard
@@ -105,5 +105,4 @@
 mw-codfw = debdeploy-appserver-codfw:standard
 mw = debdeploy-appserver-codfw:standard, debdeploy-appserver-eqiad:standard
 mw-canary = debdeploy-appserver-eqiad:canary
-
 mw-canary-single = debdeploy-appserver:single_canary

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for mw api servers - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for mw api servers
..

Assign salt grains for mw api servers

Change-Id: I0afd68b60583521f8eb56c85c9b97e21a0767626
---
M hieradata/hosts/mw1114.yaml
A hieradata/role/eqiad/mediawiki/appserver/api.yaml
A hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
M modules/debdeploy/templates/debdeploy.erb
4 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/248843/1

diff --git a/hieradata/hosts/mw1114.yaml b/hieradata/hosts/mw1114.yaml
index f22a927..4ee0242 100644
--- a/hieradata/hosts/mw1114.yaml
+++ b/hieradata/hosts/mw1114.yaml
@@ -7,5 +7,8 @@
   # Limit number of child processes running at once
   # Also, use light processes, that are more efficient
   light_process_count: "%{::processorcount}"
+debdeploy::grains:
+  debdeploy-appserverapi:
+value: single_canary
 
   
diff --git a/hieradata/role/eqiad/mediawiki/appserver/api.yaml 
b/hieradata/role/eqiad/mediawiki/appserver/api.yaml
new file mode 100644
index 000..c414a60
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/appserver/api.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-appserverapi-eqiad:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml 
b/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
new file mode 100644
index 000..6825605
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-appserverapi-eqiad:
+value: canary
+
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 6ff8af2..c243483 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -92,3 +92,8 @@
 imagescaler-eqiad = debdeploy-imagescaler-eqiad:standard
 imagescaler-codfw = debdeploy-imagescaler-codfw:standard
 imagescaler-canary = debdeploy-imagescaler-eqiad:canary, 
debdeploy-imagescaler-codfw:canary
+mw-api-eqiad = debdeploy-appserverapi-eqiad:standard
+mw-api-codfw = debdeploy-appserverapi-codfw:standard
+mw-api = debdeploy-appserverapi-codfw:standard, 
debdeploy-appserverapi-eqiad:standard
+mw-api-canary = debdeploy-appserverapi-eqiad:canary
+mw-api-canary-single = debdeploy-appserverapi:single_canary

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for application servers - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for application servers
..

Assign salt grains for application servers

Change-Id: I5cb39b57c8cb299356512851f31dc028285831e0
---
A hieradata/hosts/mw1030.yaml
A hieradata/role/codfw/mediawiki/appserver.yaml
A hieradata/role/eqiad/mediawiki/appserver.yaml
A hieradata/role/eqiad/mediawiki/canary_appserver.yaml
M modules/debdeploy/templates/debdeploy.erb
5 files changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/248845/1

diff --git a/hieradata/hosts/mw1030.yaml b/hieradata/hosts/mw1030.yaml
new file mode 100644
index 000..e9bf63d
--- /dev/null
+++ b/hieradata/hosts/mw1030.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-appserver:
+value: single_canary
diff --git a/hieradata/role/codfw/mediawiki/appserver.yaml 
b/hieradata/role/codfw/mediawiki/appserver.yaml
new file mode 100644
index 000..31c4dcf
--- /dev/null
+++ b/hieradata/role/codfw/mediawiki/appserver.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-appserver-codfw:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/appserver.yaml 
b/hieradata/role/eqiad/mediawiki/appserver.yaml
new file mode 100644
index 000..85e639b
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/appserver.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-appserver-eqiad:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/canary_appserver.yaml 
b/hieradata/role/eqiad/mediawiki/canary_appserver.yaml
new file mode 100644
index 000..32d5ce1
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/canary_appserver.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-appserver-eqiad:
+value: canary
+
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index d6cce78..349b837 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -101,3 +101,9 @@
 jobrunner-codfw = debdeploy-jobrunner-codfw:standard
 jobrunner= debdeploy-jobrunner-codfw:standard, 
debdeploy-jobrunner-eqiad:standard
 jobrunner-canary = debdeploy-jobrunner-eqiad:canary
+mw-eqiad = debdeploy-appserver-eqiad:standard
+mw-codfw = debdeploy-appserver-codfw:standard
+mw = debdeploy-appserver-codfw:standard, debdeploy-appserver-eqiad:standard
+mw-canary = debdeploy-appserver-eqiad:canary
+
+mw-canary-single = debdeploy-appserver:single_canary

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for image scalers - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for image scalers
..

Assign salt grains for image scalers

Change-Id: I67b9468adfecb20a656105f30f1450a20cc3477f
---
A hieradata/hosts/mw1160.yaml
A hieradata/hosts/mw2148.yaml
A hieradata/role/codfw/mediawiki/imagescaler.yaml
A hieradata/role/eqiad/mediawiki/imagescaler.yaml
M modules/debdeploy/templates/debdeploy.erb
5 files changed, 18 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/mw1160.yaml b/hieradata/hosts/mw1160.yaml
new file mode 100644
index 000..c2f824e
--- /dev/null
+++ b/hieradata/hosts/mw1160.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-imagescaler-eqiad:
+value: canary
diff --git a/hieradata/hosts/mw2148.yaml b/hieradata/hosts/mw2148.yaml
new file mode 100644
index 000..f3cecf3
--- /dev/null
+++ b/hieradata/hosts/mw2148.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-imagescaler-codfw:
+value: canary
diff --git a/hieradata/role/codfw/mediawiki/imagescaler.yaml 
b/hieradata/role/codfw/mediawiki/imagescaler.yaml
new file mode 100644
index 000..e56d3ac
--- /dev/null
+++ b/hieradata/role/codfw/mediawiki/imagescaler.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-imagescaler-codfw:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/imagescaler.yaml 
b/hieradata/role/eqiad/mediawiki/imagescaler.yaml
new file mode 100644
index 000..74298c9
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/imagescaler.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-imagescaler-eqiad:
+value: standard
+
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index a4aafea..6ff8af2 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -88,3 +88,7 @@
 spark = debdeploy-spark-worker:standard
 poolcounter-eqiad = debdeploy-poolcounter-eqiad:standard
 poolcounter-codfw = debdeploy-poolcounter-codfw:standard
+imagescaler = debdeploy-imagescaler-eqiad:standard, 
debdeploy-imagescaler-codfw:standard
+imagescaler-eqiad = debdeploy-imagescaler-eqiad:standard
+imagescaler-codfw = debdeploy-imagescaler-codfw:standard
+imagescaler-canary = debdeploy-imagescaler-eqiad:canary, 
debdeploy-imagescaler-codfw:canary

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for openldap - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign salt grains for openldap
..

Assign salt grains for openldap

Change-Id: I4488441a689d864731414bacf1bfcaee0a080248
---
A hieradata/hosts/pollux.yaml
A hieradata/role/common/openldap/corp.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/248848/1

diff --git a/hieradata/hosts/pollux.yaml b/hieradata/hosts/pollux.yaml
new file mode 100644
index 000..49f0be0
--- /dev/null
+++ b/hieradata/hosts/pollux.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-openldap-corp:
+value: canary
diff --git a/hieradata/role/common/openldap/corp.yaml 
b/hieradata/role/common/openldap/corp.yaml
new file mode 100644
index 000..27bd37c
--- /dev/null
+++ b/hieradata/role/common/openldap/corp.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-openldap-corp:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 7919114..d32bd3c 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -106,3 +106,5 @@
 mw = debdeploy-appserver-codfw:standard, debdeploy-appserver-eqiad:standard
 mw-canary = debdeploy-appserver-eqiad:canary
 mw-canary-single = debdeploy-appserver:single_canary
+openldap-corp = debdeploy-openldap-corp:standard
+openldap-corp-canary = debdeploy-openldap-corp:canary

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

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

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

[MediaWiki-commits] [Gerrit] Add button to convert plain URL references - change (mediawiki...Citoid)

2015-10-26 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Add button to convert plain URL references
..

Add button to convert plain URL references

Due to how the context picks tools, we can't just extend
the ContextItem, so for now replace some methods.

Bug: T114564

Change-Id: Id94f5a8c75b742e2bcae8bb3732ea67defa3bffb
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ve.ui.CiteFromIdInspector.js
M modules/ve.ui.CiteFromIdInspectorTool.js
M modules/ve.ui.CitoidAction.js
A modules/ve.ui.CitoidReferenceContextItem.css
7 files changed, 81 insertions(+), 4 deletions(-)


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

diff --git a/extension.json b/extension.json
index f6789df..1749181 100644
--- a/extension.json
+++ b/extension.json
@@ -32,7 +32,8 @@
"styles": [
"modules/ve.ui.CiteSourceSelectWidget.css",
"modules/ve.ui.CiteFromIdInspectorTool.css",
-   "modules/ve.ui.CiteFromIdInspector.css"
+   "modules/ve.ui.CiteFromIdInspector.css",
+   "modules/ve.ui.CitoidReferenceContextItem.css"
],
"dependencies": [
"ext.visualEditor.mwreference",
@@ -56,6 +57,8 @@
"citoid-citefromiddialog-title",

"citoid-citefromiddialog-use-general-error-message",
"citoid-citefromidtool-title",
+   "citoid-referencecontextitem-convert-button",
+   "citoid-referencecontextitem-convert-message",
"citoid-template-type-map.json",
"citoid-unknown-error"
],
diff --git a/i18n/en.json b/i18n/en.json
index ef023ac..5238500 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,5 +17,7 @@
"citoid-citefromiddialog-use-general-error-message": "We couldn't make 
a citation for you. You can create one manually using the 
\"{{int:citoid-citefromiddialog-mode-manual}}\" tab above.",
"citoid-citefromidtool-title": "Cite",
"citoid-desc": "Provides access points between the citoid service and 
MediaWiki",
+   "citoid-referencecontextitem-convert-button": "Convert",
+   "citoid-referencecontextitem-convert-message": "This reference consists 
of just an external link. You can use the 
\"{{int:citoid-referencecontextitem-convert-button}}\" button below to generate 
a properly formatted reference.",
"citoid-unknown-error": "An unknown error has occured that prevented us 
from creating a citation. Please try again later."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0c5c081..ffdccef 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -25,5 +25,7 @@
"citoid-citefromiddialog-use-general-error-message": "Label notifying 
the user there was a problem creating their reference, and offering to use the 
full citation tool.\n* $1 – link to open the citation dialog; link label: 
{{msg-mw|Citoid-citefromiddialog-mode-manual}}",
"citoid-citefromidtool-title": "Label for the button to add a citation 
in the toolbar\n{{Identical|Cite}}",
"citoid-desc": 
"{{desc|name=Citoid|url=https://www.mediawiki.org/wiki/Citoid}};,
+   "citoid-referencecontextitem-convert-button": "",
+   "citoid-referencecontextitem-convert-message": "",
"citoid-unknown-error": "Error message indicating that the service to 
create citations has returned an error or is temporarily malfunctioning, asking 
the user to try again later."
 }
diff --git a/modules/ve.ui.CiteFromIdInspector.js 
b/modules/ve.ui.CiteFromIdInspector.js
index ee4785c..77c6c35 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -395,7 +395,9 @@
this.inDialog = data.inDialog || '';
 
// Collapse returns a new fragment, so update 
this.fragment
-   this.fragment = this.getFragment().collapseToEnd();
+   if ( !data.lookup ) {
+   this.fragment = 
this.getFragment().collapseToEnd();
+   }
 
// Create model
this.referenceModel = new ve.dm.MWReferenceModel( 
this.fragment.getDocument() );
@@ -412,6 +414,12 @@
this.referenceModel.insertReferenceNode( 
this.getFragment(), true );
}
 
+   if ( data.lookup ) {
+   this.lookupInput.setValue( data.lookup );
+   this.executeAction( 'lookup' );
+   return;
+

[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ContentTranslation)

2015-10-26 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.php
diff --git a/jenkins.pp b/jenkins.pp
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.pp
diff --git a/jenkins.rb b/jenkins.rb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.rb

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

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

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

[MediaWiki-commits] [Gerrit] Fix scrollbars in textareas in IE8-11 - change (oojs/ui)

2015-10-26 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Fix scrollbars in textareas in IE8-11
..

Fix scrollbars in textareas in IE8-11

Bug: T95522
Change-Id: I8650923632ba5f2778de06f341b647a04636354f
---
M src/styles/widgets/TextInputWidget.less
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/56/248856/1

diff --git a/src/styles/widgets/TextInputWidget.less 
b/src/styles/widgets/TextInputWidget.less
index d2e7dca..f375776 100644
--- a/src/styles/widgets/TextInputWidget.less
+++ b/src/styles/widgets/TextInputWidget.less
@@ -14,6 +14,11 @@
.oo-ui-box-sizing(border-box);
}
 
+   // IE8-11 defaults overflow to 'scroll'. Modern browsers use 'auto'
+   textarea {
+   overflow: auto;
+   }
+
// Remove default styling for , especially the 
built-in "clear" button
input[type="search"] {
// Safari

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8650923632ba5f2778de06f341b647a04636354f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] Assign salt grains for image scalers - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for image scalers
..


Assign salt grains for image scalers

Change-Id: I67b9468adfecb20a656105f30f1450a20cc3477f
---
A hieradata/hosts/mw1160.yaml
A hieradata/hosts/mw2148.yaml
A hieradata/role/codfw/mediawiki/imagescaler.yaml
A hieradata/role/eqiad/mediawiki/imagescaler.yaml
M modules/debdeploy/templates/debdeploy.erb
5 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/mw1160.yaml b/hieradata/hosts/mw1160.yaml
new file mode 100644
index 000..c2f824e
--- /dev/null
+++ b/hieradata/hosts/mw1160.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-imagescaler-eqiad:
+value: canary
diff --git a/hieradata/hosts/mw2148.yaml b/hieradata/hosts/mw2148.yaml
new file mode 100644
index 000..f3cecf3
--- /dev/null
+++ b/hieradata/hosts/mw2148.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-imagescaler-codfw:
+value: canary
diff --git a/hieradata/role/codfw/mediawiki/imagescaler.yaml 
b/hieradata/role/codfw/mediawiki/imagescaler.yaml
new file mode 100644
index 000..e56d3ac
--- /dev/null
+++ b/hieradata/role/codfw/mediawiki/imagescaler.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-imagescaler-codfw:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/imagescaler.yaml 
b/hieradata/role/eqiad/mediawiki/imagescaler.yaml
new file mode 100644
index 000..74298c9
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/imagescaler.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-imagescaler-eqiad:
+value: standard
+
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index a4aafea..6ff8af2 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -88,3 +88,7 @@
 spark = debdeploy-spark-worker:standard
 poolcounter-eqiad = debdeploy-poolcounter-eqiad:standard
 poolcounter-codfw = debdeploy-poolcounter-codfw:standard
+imagescaler = debdeploy-imagescaler-eqiad:standard, 
debdeploy-imagescaler-codfw:standard
+imagescaler-eqiad = debdeploy-imagescaler-eqiad:standard
+imagescaler-codfw = debdeploy-imagescaler-codfw:standard
+imagescaler-canary = debdeploy-imagescaler-eqiad:canary, 
debdeploy-imagescaler-codfw:canary

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

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

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

[MediaWiki-commits] [Gerrit] Do escaping before output on Newsletter special pages - change (mediawiki...Newsletter)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Do escaping before output on Newsletter special pages
..


Do escaping before output on Newsletter special pages

Bug: T116382
Change-Id: I7be05662b2da9aa0ef348835393c353147cc4c54
---
M includes/specials/SpecialNewsletter.php
M includes/specials/pagers/NewsletterManageTablePager.php
M includes/specials/pagers/NewsletterTablePager.php
3 files changed, 16 insertions(+), 15 deletions(-)

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



diff --git a/includes/specials/SpecialNewsletter.php 
b/includes/specials/SpecialNewsletter.php
index d9072ba..6007b7b 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -122,8 +122,9 @@
'mainpage' => array(
'type' => 'info',
'label-message' => 
'newsletter-view-mainpage',
-   'default' => Linker::link( $mainTitle, 
$mainTitle->getPrefixedText() ) . ' ' .
-   $this->msg( 'parentheses' 
)->rawParams(
+   'default' => Linker::link( $mainTitle, 
htmlspecialchars( $mainTitle->getPrefixedText() ) )
+   . ' '
+   . $this->msg( 'parentheses' 
)->rawParams(
Linker::link( 
$mainTitle, 'hist', array(), array( 'action' => 'history' ) )
)->escaped(),
'raw' => true,
diff --git a/includes/specials/pagers/NewsletterManageTablePager.php 
b/includes/specials/pagers/NewsletterManageTablePager.php
index 69169f8..152d9fe 100644
--- a/includes/specials/pagers/NewsletterManageTablePager.php
+++ b/includes/specials/pagers/NewsletterManageTablePager.php
@@ -26,10 +26,10 @@
public function getFieldNames() {
if ( $this->fieldNames === null ) {
$this->fieldNames = array(
-   'nl_id' => $this->msg( 
'newsletter-manage-header-name' )->text(),
-   'nlp_publisher_id' => $this->msg( 
'newsletter-manage-header-publisher' )->text(),
-   'permissions' => $this->msg( 
'newsletter-manage-header-permissions' )->text(),
-   'action' => $this->msg( 
'newsletter-manage-header-action' )->text(),
+   'nl_id' => $this->msg( 
'newsletter-manage-header-name' )->escaped(),
+   'nlp_publisher_id' => $this->msg( 
'newsletter-manage-header-publisher' )->escaped(),
+   'permissions' => $this->msg( 
'newsletter-manage-header-permissions' )->escaped(),
+   'action' => $this->msg( 
'newsletter-manage-header-action' )->escaped(),
);
}
return $this->fieldNames;
@@ -71,7 +71,7 @@
}
 
case 'nlp_publisher_id':
-   return User::newFromId( $value )->getName();
+   return htmlspecialchars( User::newFromId( 
$value )->getName() );
 
case 'permissions' :
return HTML::element(
@@ -82,7 +82,7 @@
'id' => 
'newslettermanage',
'checked' => 
$isPublisher ? true : false,
)
-   ) . $this->msg( 
'newsletter-publisher-radiobutton-label' )->text();
+   ) . $this->msg( 
'newsletter-publisher-radiobutton-label' )->escaped();
 
case 'action':
if ( $isPublisher ) {
diff --git a/includes/specials/pagers/NewsletterTablePager.php 
b/includes/specials/pagers/NewsletterTablePager.php
index 2b3a315..f359b71 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -22,15 +22,15 @@
public function getFieldNames() {
if ( $this->fieldNames === null ) {
$this->fieldNames = array(
-   'nl_name' => $this->msg( 
'newsletter-header-name' )->text(),
-   'nl_desc' => $this->msg( 
'newsletter-header-description' )->text(),
-   'nl_frequency' => $this->msg ( 
'newsletter-header-frequency' )->text(),
-   'subscriber_count' => $this->msg( 
'newsletter-header-subscriber_count' )->text(),
+

[MediaWiki-commits] [Gerrit] Assign salt grains for mw api servers - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for mw api servers
..


Assign salt grains for mw api servers

Change-Id: I0afd68b60583521f8eb56c85c9b97e21a0767626
---
M hieradata/hosts/mw1114.yaml
A hieradata/role/codfw/mediawiki/appserver/api.yaml
A hieradata/role/eqiad/mediawiki/appserver/api.yaml
A hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
M modules/debdeploy/templates/debdeploy.erb
5 files changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/mw1114.yaml b/hieradata/hosts/mw1114.yaml
index f22a927..4ee0242 100644
--- a/hieradata/hosts/mw1114.yaml
+++ b/hieradata/hosts/mw1114.yaml
@@ -7,5 +7,8 @@
   # Limit number of child processes running at once
   # Also, use light processes, that are more efficient
   light_process_count: "%{::processorcount}"
+debdeploy::grains:
+  debdeploy-appserverapi:
+value: single_canary
 
   
diff --git a/hieradata/role/codfw/mediawiki/appserver/api.yaml 
b/hieradata/role/codfw/mediawiki/appserver/api.yaml
new file mode 100644
index 000..6002034
--- /dev/null
+++ b/hieradata/role/codfw/mediawiki/appserver/api.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-appserverapi-codfw:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/appserver/api.yaml 
b/hieradata/role/eqiad/mediawiki/appserver/api.yaml
new file mode 100644
index 000..c414a60
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/appserver/api.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-appserverapi-eqiad:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml 
b/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
new file mode 100644
index 000..6825605
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/appserver/canary_api.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-appserverapi-eqiad:
+value: canary
+
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 6ff8af2..c243483 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -92,3 +92,8 @@
 imagescaler-eqiad = debdeploy-imagescaler-eqiad:standard
 imagescaler-codfw = debdeploy-imagescaler-codfw:standard
 imagescaler-canary = debdeploy-imagescaler-eqiad:canary, 
debdeploy-imagescaler-codfw:canary
+mw-api-eqiad = debdeploy-appserverapi-eqiad:standard
+mw-api-codfw = debdeploy-appserverapi-codfw:standard
+mw-api = debdeploy-appserverapi-codfw:standard, 
debdeploy-appserverapi-eqiad:standard
+mw-api-canary = debdeploy-appserverapi-eqiad:canary
+mw-api-canary-single = debdeploy-appserverapi:single_canary

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

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

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

[MediaWiki-commits] [Gerrit] Prevent category selector tipsies from hanging around forever - change (mediawiki...UploadWizard)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Prevent category selector tipsies from hanging around forever
..


Prevent category selector tipsies from hanging around forever

Bug: T115636
Change-Id: Ibcc0838e50f35c516a9d134fc5ce8cc2fe9ca42a
---
M resources/mw.UploadWizardDetails.js
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/resources/mw.UploadWizardDetails.js 
b/resources/mw.UploadWizardDetails.js
index 0f87c7b..3afc13a 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -444,6 +444,16 @@
};
this.categoriesWidget.setItemsFromData( categories );
 
+   this.categoriesWidgetItems = this.categoriesWidget.getItems();
+   this.categoriesWidget.on( 'change', function () {
+   var i;
+   // Kill any active tipsies, they like to get stuck
+   for ( i = 0; i < this.categoriesWidgetItems.length; i++ 
) {
+   this.categoriesWidgetItems[ i ].$element.tipsy( 
'hide' );
+   }
+   this.categoriesWidgetItems = 
this.categoriesWidget.getItems();
+   }.bind( this ) );
+
$categoriesDiv.find( '.mwe-upwiz-details-input' )
.append( this.categoriesWidget.$element );
};
@@ -853,6 +863,11 @@
// side effect: add error text to the page for fields in an 
incorrect state.
// we must call EVERY valid() function due to side effects; do 
not short-circuit.
valid: function () {
+   var i;
+   // Kill any active tipsies, they like to get stuck
+   for ( i = 0; i < this.categoriesWidgetItems.length; i++ 
) {
+   this.categoriesWidgetItems[ i ].$element.tipsy( 
'hide' );
+   }
// all the descriptions -- check min & max length
// categories are assumed valid
// pop open the 'more-options' if the date is bad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcc0838e50f35c516a9d134fc5ce8cc2fe9ca42a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add inline documentation and newlines for readability - change (mediawiki...PageImages)

2015-10-26 Thread WMDE

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

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

Change subject: Add inline documentation and newlines for readability
..

Add inline documentation and newlines for readability

Change-Id: I3a5a4ef67836cbfe0277f511f8b23030d248141c
---
M PageImages.body.php
M tests/phpunit/ApiQueryPageImagesTest.php
M tests/phpunit/PageImagesTest.php
3 files changed, 54 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/41/248841/1

diff --git a/PageImages.body.php b/PageImages.body.php
index bdef1cf..3ec8264 100644
--- a/PageImages.body.php
+++ b/PageImages.body.php
@@ -44,10 +44,12 @@
 
/**
 * ParserMakeImageParams hook handler, saves extended information about 
images used on page
+*
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/ParserMakeImageParams
+*
 * @param Title $title
 * @param File|bool $file
-* @param array $params
+* @param array &$params
 * @param Parser $parser
 * @return bool
 */
@@ -58,6 +60,7 @@
 
/**
 * AfterParserFetchFileAndTitle hook handler, saves information about 
gallery images
+*
 * @param Parser $parser
 * @param ImageGalleryBase $ig
 * @return bool
@@ -78,12 +81,14 @@
if ( !$file || !self::processThisTitle( $parser->getTitle() ) ) 
{
return;
}
+
if ( !$file instanceof File ) {
$file = wfFindFile( $file );
if ( !$file ) {
return;
}
}
+
$out = $parser->getOutput();
if ( !isset( $out->pageImages ) ) {
$out->pageImages = array();
@@ -106,7 +111,7 @@
 * We don't follow the core size calculation algorithm precisely 
because it's not required and editor's
 * intentions are more important than the precise number.
 *
-* @param array $params
+* @param array &$params
 * @param File $file
 */
private static function calcWidth( array &$params, File $file ) {
@@ -132,15 +137,18 @@
 
/**
 * LinksUpdate hook handler, sets at most 2 page properties depending 
on images on page
+*
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/LinksUpdate
-* @param LinksUpdate $lu
+*
+* @param LinksUpdate $linksUpdate
 * @return bool
 */
-   public static function onLinksUpdate( LinksUpdate $lu ) {
-   if ( !isset( $lu->getParserOutput()->pageImages ) ) {
+   public static function onLinksUpdate( LinksUpdate $linksUpdate ) {
+   if ( !isset( $linksUpdate->getParserOutput()->pageImages ) ) {
return true;
}
-   $images = $lu->getParserOutput()->pageImages;
+
+   $images = $linksUpdate->getParserOutput()->pageImages;
$scores = array();
$counter = 0;
foreach ( $images as $image ) {
@@ -150,6 +158,7 @@
}
$scores[$fileName] = max( $scores[$fileName], 
self::getScore( $image, $counter++ ) );
}
+
$image = false;
foreach ( $scores as $name => $score ) {
if ( $score > 0 && ( !$image || $score > 
$scores[$image] ) ) {
@@ -157,7 +166,7 @@
}
}
if ( $image ) {
-   $lu->mProperties[self::PROP_NAME] = $image;
+   $linksUpdate->mProperties[self::PROP_NAME] = $image;
}
 
return true;
@@ -165,9 +174,11 @@
 
/**
 * InfoAction hook handler, adds the page image to the info=action page
+*
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/InfoAction
+*
 * @param IContextSource $context
-* @param array $pageInfo
+* @param array[] &$pageInfo
 * @return bool
 */
public static function onInfoAction( IContextSource $context, 
&$pageInfo ) {
@@ -206,7 +217,8 @@
 
/**
 * ApiOpenSearchSuggest hook handler, enhances ApiOpenSearch results 
with this extension's data
-* @param array $results
+*
+* @param array[] &$results
 * @return bool
 */
public static function onApiOpenSearchSuggest( &$results ) {
@@ -215,6 +227,7 @@
if ( !$wgPageImagesExpandOpenSearchXml || !count( $results ) ) {
return true;
}
+
$pageIds = array_keys( $results );
$data = self::getImages( $pageIds, 50 );
foreach ( $pageIds as $id ) {

[MediaWiki-commits] [Gerrit] Migrate more callers away from $wgMemc - change (mediawiki/core)

2015-10-26 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Migrate more callers away from $wgMemc
..

Migrate more callers away from $wgMemc

Callers should use more expliciy lazy-loaded
cache factory methods.

Change-Id: Ifa0bf389720a09a931ee6466b993f787d83a09a7
---
M includes/User.php
M includes/api/ApiStashEdit.php
M includes/cache/FileCacheBase.php
M includes/filerepo/ForeignAPIRepo.php
M includes/filerepo/file/File.php
M includes/filerepo/file/ForeignAPIFile.php
M includes/jobqueue/JobQueueDB.php
M includes/jobqueue/JobQueueGroup.php
M includes/specials/SpecialUserlogin.php
9 files changed, 72 insertions(+), 69 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/248815/1

diff --git a/includes/User.php b/includes/User.php
index 6e52a1d..3e382d5 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1752,8 +1752,6 @@
return false;
}
 
-   global $wgMemc;
-
$limits = $wgRateLimits[$action];
$keys = array();
$id = $this->getId();
@@ -1808,11 +1806,13 @@
$keys[wfMemcKey( 'limiter', $action, 'user', $id )] = 
$userLimit;
}
 
+   $cache = ObjectCache::getLocalClusterInstance();
+
$triggered = false;
foreach ( $keys as $key => $limit ) {
list( $max, $period ) = $limit;
$summary = "(limit $max in {$period}s)";
-   $count = $wgMemc->get( $key );
+   $count = $cache->get( $key );
// Already pinged?
if ( $count ) {
if ( $count >= $max ) {
@@ -1825,11 +1825,11 @@
} else {
wfDebug( __METHOD__ . ": adding record for $key 
$summary\n" );
if ( $incrBy > 0 ) {
-   $wgMemc->add( $key, 0, intval( $period 
) ); // first ping
+   $cache->add( $key, 0, intval( $period ) 
); // first ping
}
}
if ( $incrBy > 0 ) {
-   $wgMemc->incr( $key, $incrBy );
+   $cache->incr( $key, $incrBy );
}
}
 
diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index e87fc97..ebddd51 100644
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -39,7 +39,7 @@
const ERROR_UNCACHEABLE = 'uncacheable';
 
public function execute() {
-   global $wgMemc;
+   $cache = ObjectCache::getLocalClusterInstance();
 
$user = $this->getUser();
$params = $this->extractRequestParams();
@@ -111,11 +111,10 @@
// De-duplicate requests on the same key
if ( $user->pingLimiter( 'stashedit' ) ) {
$status = 'ratelimited';
-   } elseif ( $wgMemc->lock( $key, 0, 30 ) ) {
+   } elseif ( $cache->lock( $key, 0, 30 ) ) {
/** @noinspection PhpUnusedLocalVariableInspection */
-   $unlocker = new ScopedCallback( function() use ( $key ) 
{
-   global $wgMemc;
-   $wgMemc->unlock( $key );
+   $unlocker = new ScopedCallback( function() use ( 
$cache, $key ) {
+   $cache->unlock( $key );
} );
$status = self::parseAndStash( $page, $content, $user );
} else {
@@ -133,7 +132,7 @@
 * @since 1.25
 */
public static function parseAndStash( WikiPage $page, Content $content, 
User $user ) {
-   global $wgMemc;
+   $cache = ObjectCache::getLocalClusterInstance();
 
$format = $content->getDefaultFormat();
$editInfo = $page->prepareContentForEdit( $content, null, 
$user, $format, false );
@@ -146,7 +145,7 @@
);
 
if ( $stashInfo ) {
-   $ok = $wgMemc->set( $key, $stashInfo, $ttl );
+   $ok = $cache->set( $key, $stashInfo, $ttl );
if ( $ok ) {
wfDebugLog( 'StashEdit', "Cached parser 
output for key '$key'." );
return self::ERROR_NONE;
@@ -173,7 +172,7 @@
 * will do nothing. Provided the values are cacheable, they will be 
stored
 * in memcached so that final edit submission might make use of them.
 *
-* @param Article|WikiPage $page Page

[MediaWiki-commits] [Gerrit] Assign salt grains for terbium - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for terbium
..


Assign salt grains for terbium

Change-Id: Ib592b6313f0c723737f984bda270a402bd0a210f
---
A hieradata/role/common/db/maintenance.yaml
A hieradata/role/common/ganglia/web.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/db/maintenance.yaml 
b/hieradata/role/common/db/maintenance.yaml
new file mode 100644
index 000..51651ef
--- /dev/null
+++ b/hieradata/role/common/db/maintenance.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-db-maintenance:
+value: standard
diff --git a/hieradata/role/common/ganglia/web.yaml 
b/hieradata/role/common/ganglia/web.yaml
new file mode 100644
index 000..6d5a8ad
--- /dev/null
+++ b/hieradata/role/common/ganglia/web.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-ganglia:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 6fd5b04..7a0ab6b 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib592b6313f0c723737f984bda270a402bd0a210f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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 Gruntfile.js - change (mediawiki...Popups)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Update Gruntfile.js
..


Update Gruntfile.js

Target all JS files, not just the ones in resources.

Change-Id: I036360365ebbd5e5654b5a74694e2656e63e56e6
---
A .jshintignore
M Gruntfile.js
2 files changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..3c3629e
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
index 2b95ad9..3550c1c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,14 +9,18 @@
banana: {
all: 'i18n/'
},
-   jscs: {
-   src: 'resources/*.js'
-   },
jshint: {
options: {
jshintrc: true
},
-   all: [ 'resources/*.js' ]
+   all: [
+   '*.js',
+   '**/*.js',
+   '!node_modules/**'
+   ]
+   },
+   jscs: {
+   src: '<%= jshint.all %>'
},
jsonlint: {
all: [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I036360365ebbd5e5654b5a74694e2656e63e56e6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Test name spelling fix - change (mediawiki...ContentTranslation)

2015-10-26 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

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

Change subject: Test name spelling fix
..

Test name spelling fix

Change-Id: Ibe689e1cf83c9dcf0c461267fe29f887392705dd
---
M tests/qunit/tools/ext.cx.tools.template.test.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/qunit/tools/ext.cx.tools.template.test.js 
b/tests/qunit/tools/ext.cx.tools.template.test.js
index 5eef196..5d7f896 100644
--- a/tests/qunit/tools/ext.cx.tools.template.test.js
+++ b/tests/qunit/tools/ext.cx.tools.template.test.js
@@ -68,7 +68,7 @@
} );
} );
 
-   QUnit.test( 'Template name adapatation', function ( assert ) {
+   QUnit.test( 'Template name adaptation', function ( assert ) {
var $fixture = $( '#qunit-fixture' );
 
QUnit.expect( 2 );

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

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

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

[MediaWiki-commits] [Gerrit] dumps: update listing of files for rsync to lastest rsync args - change (operations/puppet)

2015-10-26 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

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

Change subject: dumps: update listing of files for rsync to lastest rsync args
..

dumps: update listing of files for rsync to lastest rsync args

rsync 3.01 and on human formats sizes of files and requires
a special option not to do so. e don't want the commas so use
the option.

Change-Id: I36cfd2ebf367c632059ee0ef655f2d3e74c54b06
---
M modules/snapshot/files/dumps/list-last-n-good-dumps.py
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/modules/snapshot/files/dumps/list-last-n-good-dumps.py 
b/modules/snapshot/files/dumps/list-last-n-good-dumps.py
index 566be88..15ac40d 100755
--- a/modules/snapshot/files/dumps/list-last-n-good-dumps.py
+++ b/modules/snapshot/files/dumps/list-last-n-good-dumps.py
@@ -401,8 +401,9 @@
 """produce long listing of files from a specific dump run,
 by passing the file list to rsync --list-only"""
 fpath = self.getAbsOutDirPath(f)
-command = ["/usr/bin/rsync", "--list-only", "--files-from",
-   fpath + ".relpath", self.config.publicDir,
+command = ["/usr/bin/rsync", "--list-only", "--no-h",
+   "--files-from", fpath + ".relpath",
+   self.config.publicDir,
"dummy", ">", fpath + ".rsync"]
 commandString = " ".join(command)
 proc = Popen(commandString, shell=True, stderr=PIPE)

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

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

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

[MediaWiki-commits] [Gerrit] css styling for boxes and borders - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

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

Change subject: css styling for boxes and borders
..

css styling for boxes and borders

added styling for boxex and borders according to
https://help.bluespice.com/index.php/Boxen

Change-Id: Ia1c8234c414186b5c80b466bf8e551d7606471e5
(cherry picked from commit 5934ba3e615921a1015ee835baf467a7d4056e84)
---
M resources/bluespice/bluespice.css
1 file changed, 76 insertions(+), 1 deletion(-)


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

diff --git a/resources/bluespice/bluespice.css 
b/resources/bluespice/bluespice.css
index 6a9d64f..99e319c 100644
--- a/resources/bluespice/bluespice.css
+++ b/resources/bluespice/bluespice.css
@@ -41,4 +41,79 @@
 .btn44 {
height:44px!important;
width:44px!important;
-}
\ No newline at end of file
+}
+
+.bluebox,
+.box-blue {
+   border:1px solid #6093D2;
+   background-color:#AEC8E8;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.beigebox,
+.box-beige {
+   border:1px solid #000;
+   background-color:#E0B978;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.greenbox,
+.box-green {
+   border:1px solid #237E14;
+   background-color:#DEFEBB;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.yellowbox,
+.box-yellow {
+   border:1px solid #00;
+   background-color:#AA;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.redbox,
+.box-red {
+   border:1px solid #DD;
+   background-color:#FF;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.blueborder,
+.border-blue {
+   border:1px solid #AEC8E8;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.beigeborder,
+.border-beige {
+   border:1px solid #E0B978;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.greenborder,
+.border-green {
+   border:1px solid #237E14;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.yellowborder,
+.border-yellow {
+   border:1px solid #00;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.redborder,
+.border-red {
+   border:1px solid #DD;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1c8234c414186b5c80b466bf8e551d7606471e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] css styling for boxes and borders - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: css styling for boxes and borders
..


css styling for boxes and borders

added styling for boxex and borders according to
https://help.bluespice.com/index.php/Boxen

Change-Id: Ia1c8234c414186b5c80b466bf8e551d7606471e5
---
M resources/bluespice/bluespice.css
1 file changed, 76 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/resources/bluespice/bluespice.css 
b/resources/bluespice/bluespice.css
index 6a9d64f..99e319c 100644
--- a/resources/bluespice/bluespice.css
+++ b/resources/bluespice/bluespice.css
@@ -41,4 +41,79 @@
 .btn44 {
height:44px!important;
width:44px!important;
-}
\ No newline at end of file
+}
+
+.bluebox,
+.box-blue {
+   border:1px solid #6093D2;
+   background-color:#AEC8E8;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.beigebox,
+.box-beige {
+   border:1px solid #000;
+   background-color:#E0B978;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.greenbox,
+.box-green {
+   border:1px solid #237E14;
+   background-color:#DEFEBB;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.yellowbox,
+.box-yellow {
+   border:1px solid #00;
+   background-color:#AA;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.redbox,
+.box-red {
+   border:1px solid #DD;
+   background-color:#FF;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.blueborder,
+.border-blue {
+   border:1px solid #AEC8E8;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.beigeborder,
+.border-beige {
+   border:1px solid #E0B978;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.greenborder,
+.border-green {
+   border:1px solid #237E14;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.yellowborder,
+.border-yellow {
+   border:1px solid #00;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.redborder,
+.border-red {
+   border:1px solid #DD;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1c8234c414186b5c80b466bf8e551d7606471e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Mglaser 
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] dumps; fix another indentation screwup from the pylint - change (operations/dumps)

2015-10-26 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: dumps; fix another indentation screwup from the pylint
..


dumps; fix another indentation screwup from the pylint

didn't break things but did make some commands needlessly long text

Change-Id: I2939e1edaad924724b5a61302b91a591b2665887
---
M xmldumps-backup/dumps/jobs.py
1 file changed, 51 insertions(+), 51 deletions(-)

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



diff --git a/xmldumps-backup/dumps/jobs.py b/xmldumps-backup/dumps/jobs.py
index 7989093..b7d656a 100644
--- a/xmldumps-backup/dumps/jobs.py
+++ b/xmldumps-backup/dumps/jobs.py
@@ -1274,59 +1274,59 @@
 file_obj, self.verbose)
 file_obj.first_page_id = fname.find_first_page_id_in_file()
 
-# get the files that cover our range
-for file_obj in file_list:
-# If some of the file_objs in file_list could not be 
properly be parsed, some of
-# the (int) conversions below will fail. However, it is of 
little use to us,
-# which conversion failed. /If any/ conversion fails, it 
means, that that we do
-# not understand how to make sense of the current 
file_obj. Hence we cannot use
-# it as prefetch object and we have to drop it, to avoid 
passing a useless file
-# to the text pass. (This could days as of a comment 
below, but by not passing
-# a likely useless file, we have to fetch more texts from 
the database)
-#
-# Therefore try...except-ing the whole block is 
sufficient: If whatever error
-# occurs, we do not abort, but skip the file for prefetch.
-try:
-# If we could properly parse
-first_page_id_in_file = int(file_obj.first_page_id)
+# get the files that cover our range
+for file_obj in file_list:
+# If some of the file_objs in file_list could not be properly 
be parsed, some of
+# the (int) conversions below will fail. However, it is of 
little use to us,
+# which conversion failed. /If any/ conversion fails, it 
means, that that we do
+# not understand how to make sense of the current file_obj. 
Hence we cannot use
+# it as prefetch object and we have to drop it, to avoid 
passing a useless file
+# to the text pass. (This could days as of a comment below, 
but by not passing
+# a likely useless file, we have to fetch more texts from the 
database)
+#
+# Therefore try...except-ing the whole block is sufficient: If 
whatever error
+# occurs, we do not abort, but skip the file for prefetch.
+try:
+# If we could properly parse
+first_page_id_in_file = int(file_obj.first_page_id)
 
-# fixme what do we do here? this could be very 
expensive. is that worth it??
-if not file_obj.last_page_id:
-# (b) nasty hack, see (a)
-# it's not a checkpoint fle or we'd have the 
pageid in the filename
-# so... temporary hack which will give expensive 
results
-# if chunk file, and it's the last chunk, put none
-# if it's not the last chunk, get the first pageid 
in the next
-#  chunk and subtract 1
-# if not chunk, put none.
-if file_obj.is_chunk_file and file_obj.chunk_int < 
maxchunks:
-for fname in file_list:
-if fname.chunk_int == file_obj.chunk_int + 
1:
-# not true!  this could be a few past 
where it really is
-# (because of deleted pages that 
aren't included at all)
-file_obj.last_page_id = 
str(int(fname.first_page_id) - 1)
-if file_obj.last_page_id:
-last_page_id_in_file = int(file_obj.last_page_id)
-else:
-last_page_id_in_file = None
+# fixme what do we do here? this could be very expensive. 
is that worth it??
+if not file_obj.last_page_id:
+# (b) nasty hack, see (a)
+# it's not a checkpoint fle or we'd have the pageid in 
the filename
+# so... temporary hack which will give expensive 
results
+# if chunk

[MediaWiki-commits] [Gerrit] Add SpecialGadgetUsage page to QueryPage class hook - change (mediawiki/core)

2015-10-26 Thread Niharika29 (Code Review)

Niharika29 has uploaded a new change for review.

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

Change subject: Add SpecialGadgetUsage page to QueryPage class hook
..

Add SpecialGadgetUsage page to QueryPage class hook

SpecialGadgetUsage page is a special page in the Gadgets extension
and extends the QueryPage class.

Change-Id: I3007ebf4788695b87f787d565c8bdef81c2783a0
---
M includes/specialpage/QueryPage.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/248840/1

diff --git a/includes/specialpage/QueryPage.php 
b/includes/specialpage/QueryPage.php
index bfb29ae..87fd65c 100644
--- a/includes/specialpage/QueryPage.php
+++ b/includes/specialpage/QueryPage.php
@@ -99,6 +99,7 @@
array( 'UnwatchedpagesPage', 'Unwatchedpages' ),
array( 'UnusedtemplatesPage', 'Unusedtemplates' 
),
array( 'WithoutInterwikiPage', 
'Withoutinterwiki' ),
+   array( 'SpecialGadgetUsage', 'GadgetUsage' ),
);
Hooks::run( 'wgQueryPages', array( &$qp ) );
}

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

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

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

[MediaWiki-commits] [Gerrit] Cassandra: Update the DataStax repo public key - change (mediawiki/vagrant)

2015-10-26 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review.

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

Change subject: Cassandra: Update the DataStax repo public key
..

Cassandra: Update the DataStax repo public key

Bug: T116539
Change-Id: I1ee60627125347a992e32196e86cd48f692bc72c
---
M puppet/modules/cassandra/files/datastax-pubkey.asc
1 file changed, 16 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/27/248827/1

diff --git a/puppet/modules/cassandra/files/datastax-pubkey.asc 
b/puppet/modules/cassandra/files/datastax-pubkey.asc
index 850366f..adb7cd8 100644
--- a/puppet/modules/cassandra/files/datastax-pubkey.asc
+++ b/puppet/modules/cassandra/files/datastax-pubkey.asc
@@ -1,5 +1,5 @@
 -BEGIN PGP PUBLIC KEY BLOCK-
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1
 
 mQENBExkbXsBCACgUAbMWASAz/fmnMoWE4yJ/YHeuFHTK8zloJ/mApwizlQXTIVp
 U4UV8nbLJrbkFY92VTcC2/IBtvnHpZl8eVm/JSI7nojXc5Kmm4Ek/cY7uW2KKPr4
@@ -8,13 +8,13 @@
 SCEzCkn9zQfmyqs0lZk4odBx6rzE350xgEnzFktT2uekFYqRqPQY8f7AhVfj2DJF
 gVM4wXbSoVrTnDiFsaJt/Ea4OJ263jRUHeIRABEBAAG0LVJpcHRhbm8gUGFja2Fn
 ZSBSZXBvc2l0b3J5IDxwYXVsQHJpcHRhbm8uY29tPokBPgQTAQIAKAIbAwYLCQgH
-AwIGFQgCCQoLBBYCAwECHgECF4AFAlApH60FCQloTLAACgkQNQIA8rmZo3JlbAgA
-n9ZXlvXgMj3JACMBXInoQDkkuj0IorIFQ0/qRIqH6j4lzzw0j/6HVwOPKT50vivM
-aO7noEBU3AncXpRhtPPzGiKQ9yFmo7qQsBNIoSfgGRowMp6ZnjC07mKw9ywodI6m
-VXSSHLqi0MkPKTsGY0XpUg+cDPnUnYpI4oCD2ltPdZjSQ7CO1QrUQ4TAfMzWusAD
-qB9CNDRqozv03AFLEH5aMM3KLXGjXqxpyRa+vnym6gRmTIHvsHw2/iXF4eFFo35j
-RbX8kFtfS2VrEpl7HZBilgK798Tc/4ZVbMeBbF76e7oOOywL6XC7xB7ZHGSLOMPb
-sRqAqiCoFll2z/Qd+lTKnIkCHAQQAQgABgUCTGRt2QAKCRATbpzxe100LaUfD/9D
+AwIGFQgCCQoLBBYCAwECHgECF4AFAlW/zKMFCRLBYKQACgkQNQIA8rmZo3LebAgA
+gAwWkvBrPaD5Kf8H4uw9rXtHnHYxX5G6cOVJ3vuWCs1ov7m3JWq918q00hWfLtOs
+zb15kFcjcEJ7kiRFJmAXZhcX2I0DHTmTZSl9orKzoUlXQqAANJGdek8pzdTDUQfz
+V26k63d6eLqjXotrb0hFzg7B8VSolxRE44S5k1xhzUCedOqYYsWVv3xnRIP6UBPt
+WLvzrLa0o9x/hT4w81dOP4rzZMuq2RApnenoz9AZwJrmZ14QW2ncy4RbqK6pKdRJ
+y57vBv8F0LkGlLwBd/JYWwQ85lUTkNG5wCWdj0IEYTO3+fGyO1LHU6bVZCrNtkUE
+ahSZUiRdidiktIkbtNXImYkCHAQQAQgABgUCTGRt2QAKCRATbpzxe100LaUfD/9D
 q84HarIQMEoUiRBklg+afgTMaNNdvhU3V59KoMja2vMeE4JjE3SvNoKCHjPZj6Ti
 720KL6V5O/Uo1VjtSXzAPRJywcE9aS5HRjM2Dr1mp5GnmpvbiKBdl91G9aPc3D2Z
 LpG7vZr8E/vYLc5h1DMz2XDqi6gAqW2yxb2vnmHL4FiAdoXfpZimC9KZpUdTsGPO
@@ -38,12 +38,12 @@
 7igNPKi/0ELLyCIU/okUwqc0O/4r5PgFANkMyvvVNqzxjC5s8MXbGivJXiML67/Y
 0M/siNqDSia/TGItpXjvi7v1zulbiIV0iSBkO3vsxNE0xXGBXY/UztAShN3FTbx9
 CZDupi35wgqK7McJ3WSjEDzwkElmwkmh7JdLziyH09kS1wRqiLcB+wSTywARAQAB
-iQElBBgBAgAPAhsMBQJQKR+/BQkJaEzCAAoJEDUCAPK5maNyI4UH/3gFLV1iUdDQ
-Kw5rftmt75rDXGvMMWFyQPHjpR4KgdW4tqepoj614fSbXmeAXKdoLwtI5gNQD5W8
-YYOSgR1MGv+S1V15yO7xoX1mgv1wwJfNat9u86pnOo8lhXKsInPloESdTtVlYX/L
-+5t931bNVub/Nkw4FKxz1QfuJ2zjhJl9u7fkzwQF9LwLkB4eht9KIsBJobYDvgFw
-7r8vyrmv3SJ7anvw8Ojo0wWlzurjEQOWXFfUhP6EL61930tTdvUJNRdprA1KALui
-Nm6PDzZAhxGhPkG8XrNRAbbfSbtqSKwatofgLrMPQsa4lJ4yZ9uqd0PWE5dxXih4
-RPmGJpOrBPU=
-=JGkB
+iQElBBgBAgAPAhsMBQJVv8zOBQkSwWDOAAoJEDUCAPK5maNyLl4H/3n/+xZsuKia
+fHtBUMh44YRabEX1Bd10LAfxGlOZtKV/Dr1RaKetci6RRa5sJj0wKra6FhIryuqS
+jFTalPF3o8WjVEA5AjJ3ddSgAwX5gGJ3u+C0XMI0E6h/vAXh6meFxHtGinYr1Gcp
+P1/S3/Jy+0cmTt3FvqBtXtU3VIyb/4vUNZ+dY+jcw/gs/yS+s+jtR8hWUDbSrbU9
+pja+p1icNwU5pMbEfx1HYB7JCKuE0iJNbAFagRtPCOKq4vUTPDUQUB5MjWV+89+f
+cizh+doQR9z8e+/02drCCMWiUf4iiFs2dNHwaIPDOJ8Xn9xcxiUaKk32sjT3sict
+XO5tB2KhE3A=
+=YO7C
 -END PGP PUBLIC KEY BLOCK-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ee60627125347a992e32196e86cd48f692bc72c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] dumps: don't escape commands not run in shell - change (operations/dumps)

2015-10-26 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: dumps: don't escape commands not run in shell
..


dumps: don't escape commands not run in shell

Change-Id: Ifb02b47199403e4ecc5211da5f683620369ef349
---
M xmldumps-backup/dumps/fileutils.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/xmldumps-backup/dumps/fileutils.py 
b/xmldumps-backup/dumps/fileutils.py
index 22bb4ab..ab175f7 100644
--- a/xmldumps-backup/dumps/fileutils.py
+++ b/xmldumps-backup/dumps/fileutils.py
@@ -281,7 +281,7 @@
 raise BackupError("head command %s not found" % 
self._wiki.config.head)
 head = self._wiki.config.head
 head_esc = MiscUtils.shellEscape(head)
-pipeline.append([head_esc, "-500"])
+pipeline.append([head, "-500"])
 # without shell
 proc = CommandPipeline(pipeline, quiet=True)
 proc.run_pipeline_get_output()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb02b47199403e4ecc5211da5f683620369ef349
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] dumps: unfix a camelcase, imported module not fixed up yet - change (operations/dumps)

2015-10-26 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: dumps: unfix a camelcase, imported module not fixed up yet
..


dumps: unfix a camelcase, imported module not fixed up yet

Change-Id: Id516f977df132b1c8303ab5bf5da6c505f11e490
---
M xmldumps-backup/dumps/jobs.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/xmldumps-backup/dumps/jobs.py b/xmldumps-backup/dumps/jobs.py
index 0289a3c..7989093 100644
--- a/xmldumps-backup/dumps/jobs.py
+++ b/xmldumps-backup/dumps/jobs.py
@@ -1225,7 +1225,7 @@
 raise BackupError("php command %s not found" % 
self.wiki.config.php)
 
 if self._checkpoints_enabled:
-checkpoint_time = "--maxtime=%s" % 
(self.wiki.config.checkpoint_time)
+checkpoint_time = "--maxtime=%s" % 
(self.wiki.config.checkpointTime)
 checkpoint_file = "--checkpointfile=%s" % output_file.new_filename(
 output_file.dumpname, output_file.file_type, 
output_file.file_ext,
 output_file.date, output_file.chunk, "p%sp%s", None)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id516f977df132b1c8303ab5bf5da6c505f11e490
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ReferenceWidget: Rename view to preview - change (mediawiki...Citoid)

2015-10-26 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: ReferenceWidget: Rename view to preview
..

ReferenceWidget: Rename view to preview

This property is a PreviewElement, not a view node.

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


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

diff --git a/modules/ve.ui.CiteFromIdReferenceWidget.js 
b/modules/ve.ui.CiteFromIdReferenceWidget.js
index ee6e041..7d4c047 100644
--- a/modules/ve.ui.CiteFromIdReferenceWidget.js
+++ b/modules/ve.ui.CiteFromIdReferenceWidget.js
@@ -64,9 +64,9 @@
documentModel.getHtmlDocument()
);
node = doc.getDocumentNode().getChildren()[ 0 ];
-   this.view = new ve.ui.PreviewElement( node );
-   if ( this.view.isGenerating() ) {
-   this.view.once( 'render', this.renderPromise.resolve );
+   this.preview = new ve.ui.PreviewElement( node );
+   if ( this.preview.isGenerating() ) {
+   this.preview.once( 'render', this.renderPromise.resolve );
} else {
this.renderPromise.resolve();
}
@@ -86,7 +86,7 @@
this.$icon,
title.$element,
this.insertButton.$element,
-   this.view.$element
+   this.preview.$element
);
 };
 
@@ -102,7 +102,7 @@
  */
 ve.ui.CiteFromIdReferenceWidget.prototype.destroy = function () {
this.renderPromise.reject();
-   this.view.destroy();
+   this.preview.destroy();
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ee7e8a02100b9df101d1597f0d2b84825a781bc
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] Use resubmit to allow jenkins to re merge - change (integration/config)

2015-10-26 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Use resubmit to allow jenkins to re merge
..

Use resubmit to allow jenkins to re merge

Author of these code is Hashar. And resubmit idea is Legoktm idea.

Original code at https://gerrit.wikimedia.org/r/#/c/227223/

Change-Id: I74379b758a4b5a99bca702db604284e30f4fb3c7
---
M tests/test_zuul_layout.py
M zuul/layout.yaml
2 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/57/248857/1

diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
index a4a774c..8e2b3c9 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_layout.py
@@ -318,6 +318,35 @@
 event.account = {'email': 'untrus...@example.org'}
 self.assertFalse(test_manager.eventMatches(event, change))
 
+def test_recheck_on_approved_change_triggers_gate(self):
+gate_manager = self.getPipeline('gate-and-submit').manager
+
+change = zuul.model.Change('mediawiki/core')
+change.approvals = [{'type': 'Code-Review',
+ 'description': 'Code Review',
+ 'value': '2',
+ 'by': {'email': 'some...@wikimedia.org'},
+ }]
+
+event = zuul.model.TriggerEvent()
+event.type = 'comment-added'
+event.comment = 'Patch Set 1:\n\nresubmit'
+
+self.assertTrue(gate_manager.eventMatches(event, change),
+"gate-and-submit pipeline must process 'resubmit' "
+"on CR+2")
+
+indep_pipelines = [p for p in self.getPipelines()
+   if p.manager.__class__.__name__ ==
+   'IndependentPipelineManager']
+self.assertGreater(len(indep_pipelines), 0)
+
+for pipeline in indep_pipelines:
+# XXX need to bump our Zuul version to supports negative filters
+self.assertFalse(pipeline.manager.eventMatches(event, change),
+ "Independent pipeline %s must not process "
+ "'resubmit' on CR+2" % pipeline.name)
+
 def test_pipelines_trustiness(self):
 check_manager = self.getPipeline('check').manager
 test_manager = self.getPipeline('test').manager
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 959117d..d1943cb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -479,6 +479,10 @@
- ^(?!l10n-bot@translatewiki\.net).*$
   approval:
 - code-review: 2
+- event: comment-added
+  comment_filter: (?im)^Patch Set \d+:\n\n\s*resubmit\.?\s*$
+  require-approval:
+- code-review: 2
 start:
   gerrit:
 verified: 0

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-10-26T10:00:01+0000 - change (mediawiki...Wikidata)

2015-10-26 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2015-10-26T10:00:01+
..

New Wikidata Build - 2015-10-26T10:00:01+

Change-Id: Iee6dec30737c2b4845d314c46265d8896b0f76e0
---
M composer.lock
M extensions/Wikibase/client/i18n/ce.json
M extensions/Wikibase/client/i18n/pl.json
M extensions/Wikibase/client/i18n/war.json
M extensions/Wikibase/lib/i18n/lt.json
M extensions/Wikibase/repo/i18n/bgn.json
M extensions/Wikibase/repo/i18n/war.json
M vendor/composer/installed.json
8 files changed, 28 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/35/248835/1

diff --git a/composer.lock b/composer.lock
index b4592f8..124d052 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1441,12 +1441,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "0f0cb8767bde114212896b6ae1de593dc7023282"
+"reference": "d9a169b26ff724402febd8f4161b5d2920d94075"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/0f0cb8767bde114212896b6ae1de593dc7023282;,
-"reference": "0f0cb8767bde114212896b6ae1de593dc7023282",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d9a169b26ff724402febd8f4161b5d2920d94075;,
+"reference": "d9a169b26ff724402febd8f4161b5d2920d94075",
 "shasum": ""
 },
 "require": {
@@ -1515,7 +1515,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2015-10-25 00:42:33"
+"time": "2015-10-25 21:09:17"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/ce.json 
b/extensions/Wikibase/client/i18n/ce.json
index f2431fa..bb6e8c0 100644
--- a/extensions/Wikibase/client/i18n/ce.json
+++ b/extensions/Wikibase/client/i18n/ce.json
@@ -50,9 +50,15 @@
"wikibase-error-deserialize-error": "Хаамашна десериализаци ян 
цаделира.",
"wikibase-error-serialize-error": "Хаамашна сериализаци ян цаделира.",
"wikibase-error-invalid-entity-id": "Язйина идентификатор системин 
йоьвзуш яц. Лела йе хӀинца лелаш йолу черахь цхьаъ.",
-   "unconnectedpages": "Викихаамаш чохь вовшахтесна йоцу агӀонаш",
+   "unconnectedpages": "Элементех тесна йоцу агӀонаш",
"wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|хьажорг}} ю)",
-   "wikibase-unconnectedpages-submit": "Кхочушдé",
+   "wikibase-unconnectedpages-submit": "Гайта агӀонаш",
+   "pageswithbadges": "Билгалонаш йолу агӀонаш",
+   "pageswithbadges-summary": "ХӀокху агӀонгахь ю билгалйина агӀонаш 
(масала, Дика я Хаьржина). Керла агӀонаш хьалха гойтуш ю.",
+   "wikibase-pageswithbadges-invalid-id": "$1 — элементан нийса йоцу 
идентификатор",
+   "wikibase-pageswithbadges-legend": "Билгалонаш йолу агӀонийн могӀам",
+   "wikibase-pageswithbadges-badge": "Билгало:",
+   "wikibase-pageswithbadges-submit": "Гайта агӀонаш",
"wikibase-pageinfo-entity-id": "Викихаамаш чур элиментан ID",
"wikibase-pageinfo-entity-id-none": "ХӀумма цаоьшу",
"wikibase-property-render-error": "билгало «$1»: $2 гучуйоккхуш гӀалат 
ду",
diff --git a/extensions/Wikibase/client/i18n/pl.json 
b/extensions/Wikibase/client/i18n/pl.json
index 6543792..27fcb3b 100644
--- a/extensions/Wikibase/client/i18n/pl.json
+++ b/extensions/Wikibase/client/i18n/pl.json
@@ -57,10 +57,12 @@
"wikibase-error-deserialize-error": "Nieudana serializacja danych.",
"wikibase-error-serialize-error": "Nieudana serializacja danych.",
"wikibase-error-invalid-entity-id": "Wprowadzony identyfikator jest 
nieznany w systemie. Użyj prawidłowego identyfikatora encji.",
-   "unconnectedpages": "Niepowiązane strony",
+   "unconnectedpages": "Strony niepowiązane z elementami",
"wikibase-unconnectedpages-format-row": "(zawiera $1 
{{PLURAL:$1|odnośnik interwiki|odnośniki interwiki|odnośników interwiki}})",
"wikibase-unconnectedpages-submit": "Pokaż strony",
+   "pageswithbadges": "Strony z odznakami",
"wikibase-pageswithbadges-invalid-id": "„$1” nie jest poprawnym 
identyfikatorem elementu",
+   "wikibase-pageswithbadges-legend": "Lista stron, którym przyznano 
odznakę",
"wikibase-pageswithbadges-badge": "Odznaka:",
"wikibase-pageswithbadges-submit": "Pokaż strony",
"wikibase-pageinfo-entity-id": "Identyfikator elementu Wikidanych",
diff --git a/extensions/Wikibase/client/i18n/war.json 
b/extensions/Wikibase/client/i18n/war.json
index 221707c..94e641a 100644

[MediaWiki-commits] [Gerrit] Check lookup button state when handle input 'enter' event - change (mediawiki...Citoid)

2015-10-26 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Check lookup button state when handle input 'enter' event
..

Check lookup button state when handle input 'enter' event

I021c60094 makes this check unnecessary, but this is still
logical and will prevent against regressions in the future.

Bug: T116471
Change-Id: I482a73db395bf6e63a88f76e38de23f23b1a77c3
---
M modules/ve.ui.CiteFromIdInspector.js
1 file changed, 11 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve.ui.CiteFromIdInspector.js 
b/modules/ve.ui.CiteFromIdInspector.js
index ee4785c..ff9f60e 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -200,7 +200,7 @@
this.modeIndex.connect( this, { set: 'onModeIndexSet' } );
this.lookupInput.connect( this, {
change: 'onLookupInputChange',
-   enter: 'onLookupButtonClick'
+   enter: 'onLookupInputEnter'
} );
this.lookupButton.connect( this, { click: 'onLookupButtonClick' } );
this.previewSelectWidget.connect( this, { choose: 
'onPreviewSelectWidgetChoose' } );
@@ -374,7 +374,16 @@
 };
 
 /**
- * Respond to lookup button click, perform lookup
+ * Handle enter events from the lookup input
+ */
+ve.ui.CiteFromIdInspector.prototype.onLookupInputEnter = function () {
+   if ( !this.lookupButton.isDisabled() ) {
+   this.onLookupButtonClick();
+   }
+};
+
+/**
+ * Handle click events from the lookup button, perform lookup
  */
 ve.ui.CiteFromIdInspector.prototype.onLookupButtonClick = function () {
this.executeAction( 'lookup' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I482a73db395bf6e63a88f76e38de23f23b1a77c3
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] Backport of D2486378: Implement compress.bzip2:// stream wra... - change (operations...hhvm)

2015-10-26 Thread Ori.livneh (Code Review)

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

Change subject: Backport of D2486378: Implement compress.bzip2:// stream wrapper
..


Backport of D2486378: Implement compress.bzip2:// stream wrapper

Bug: T113932
Change-Id: I0f064cb92d96d32a0409825328bc9865246bacbe
---
A debian/patches/D2486378-compress_bzip2.patch
M debian/patches/series
2 files changed, 167 insertions(+), 0 deletions(-)

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



diff --git a/debian/patches/D2486378-compress_bzip2.patch 
b/debian/patches/D2486378-compress_bzip2.patch
new file mode 100644
index 000..8a33b54
--- /dev/null
+++ b/debian/patches/D2486378-compress_bzip2.patch
@@ -0,0 +1,166 @@
+From 46d04cfdb6b5987946f19ed6c65cee676e27b254 Mon Sep 17 00:00:00 2001
+From: Sara Golemon 
+Date: Tue, 29 Sep 2015 14:28:41 -0700
+Subject: [PATCH] Implement compress.bzip2:// stream wrapper
+
+Summary: Wraper BZ2File implementation with an opener.
+
+Closes https://github.com/facebook/hhvm/issues/6314
+
+Reviewed By: @paulbiss, @fredemmott
+
+Differential Revision: D2486378
+---
+ hphp/runtime/ext/bz2/ext_bz2.cpp| 45 +
+ hphp/test/slow/ext_bzip2/wrapper.php| 43 +++
+ hphp/test/slow/ext_bzip2/wrapper.php.expect | 21 ++
+ 3 files changed, 109 insertions(+)
+ create mode 100644 hphp/test/slow/ext_bzip2/wrapper.php
+ create mode 100644 hphp/test/slow/ext_bzip2/wrapper.php.expect
+
+diff --git a/hphp/runtime/ext/bz2/ext_bz2.cpp 
b/hphp/runtime/ext/bz2/ext_bz2.cpp
+index 174d109..bea8d5a 100644
+--- a/hphp/runtime/ext/bz2/ext_bz2.cpp
 b/hphp/runtime/ext/bz2/ext_bz2.cpp
+@@ -17,6 +17,8 @@
+ 
+ #include "hphp/runtime/ext/bz2/bz2-file.h"
+ #include "hphp/runtime/ext/std/ext_std_file.h"
++#include "hphp/runtime/base/stream-wrapper.h"
++#include "hphp/runtime/base/file-stream-wrapper.h"
+ #include "hphp/util/alloc.h"
+ #include 
+ 
+@@ -31,6 +33,44 @@
+ 
+ namespace HPHP {
+ 
///
++// compress.zlib:// stream wrapper
++
++namespace {
++static struct BZ2StreamWrapper : Stream::Wrapper {
++  virtual req::ptr open(const String& filename,
++  const String& mode,
++  int options,
++  const req::ptr& context) {
++static const char cz[] = "compress.bzip2://";
++
++if (strncmp(filename.c_str(), cz, sizeof(cz) - 1)) {
++  assert(false);
++  return nullptr;
++}
++
++String fname(filename.substr(sizeof(cz) - 1));
++String translated;
++if (fname.find("://") == -1) {
++  translated = File::TranslatePath(fname);
++  if (auto file = FileStreamWrapper::openFromCache(translated, mode)) {
++file->unzip();
++return file;
++  }
++} else {
++  translated = fname;
++}
++
++auto file = req::make();
++if (!file->open(translated, mode)) {
++  raise_warning("%s", file->getLastError().c_str());
++  return nullptr;
++}
++return file;
++  }
++} s_bzip2_stream_wrapper;
++} // nil namespace
++
++///
+ 
+ bool HHVM_FUNCTION(bzclose, const Resource& bz) {
+   return HHVM_FN(fclose)(bz);
+@@ -204,6 +244,11 @@ Variant HHVM_FUNCTION(bzdecompress, const String& source, 
int small /* = 0 */) {
+ class bz2Extension final : public Extension {
+  public:
+   bz2Extension() : Extension("bz2") {}
++
++  void moduleLoad(const IniSetting::Map& ini, Hdf hdf) override {
++s_bzip2_stream_wrapper.registerAs("compress.bzip2");
++  }
++
+   void moduleInit() override {
+ HHVM_FE(bzclose);
+ HHVM_FE(bzread);
+diff --git a/hphp/test/slow/ext_bzip2/wrapper.php 
b/hphp/test/slow/ext_bzip2/wrapper.php
+new file mode 100644
+index 000..d7d6463
+--- /dev/null
 b/hphp/test/slow/ext_bzip2/wrapper.php
+@@ -0,0 +1,43 @@
++ 0);
++echo "Compressed from original: ";
++var_dump($compressedSize < (strlen($loremIpsum) * 3/4));
++
++$readContents = file_get_contents("compress.bzip2://$fn");
++echo 'Match: ';
++var_dump($loremIpsum === $readContents);
++
++echo "- Contents -\n";
++readfile("compress.bzip2://$fn");
++
++unlink($fn);
+diff --git a/hphp/test/slow/ext_bzip2/wrapper.php.expect 
b/hphp/test/slow/ext_bzip2/wrapper.php.expect
+new file mode 100644
+index 000..6016048
+--- /dev/null
 b/hphp/test/slow/ext_bzip2/wrapper.php.expect
+@@ -0,0 +1,21 @@
++Written: bool(true)
++Readable: bool(true)
++Contains data: bool(true)
++Compressed from original: bool(true)
++Match: bool(true)
++- Contents -
++Lorem ipsum dolor sit amet,
++consectetur adipiscing elit,
++sed do eiusmod tempor incididunt
++ut labore et dolore magna aliqua.
++
++Ut enim ad minim veniam,
++quis nostrud exercitation ullamco laboris
++nisi ut aliquip ex ea commodo consequat.
++
++Duis aute

[MediaWiki-commits] [Gerrit] Add en-gb and de test cases to BabelLanguageCodesTest - change (mediawiki...Babel)

2015-10-26 Thread WMDE

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

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

Change subject: Add en-gb and de test cases to BabelLanguageCodesTest
..

Add en-gb and de test cases to BabelLanguageCodesTest

Change-Id: Ib0a2f86ba1952071a8dfaffe0b4edcd1870cb2db
---
M tests/phpunit/BabelLanguageCodesTest.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel 
refs/changes/38/248838/1

diff --git a/tests/phpunit/BabelLanguageCodesTest.php 
b/tests/phpunit/BabelLanguageCodesTest.php
index fe4da08..21c382f 100644
--- a/tests/phpunit/BabelLanguageCodesTest.php
+++ b/tests/phpunit/BabelLanguageCodesTest.php
@@ -26,6 +26,9 @@
return array(
array( 'invalidLanguageCode', false ),
array( 'en', 'en' ),
+   array( 'eng', 'en' ),
+   array( 'en-gb', 'en-gb' ),
+   array( 'de', 'de' ),
);
}
 
@@ -41,6 +44,9 @@
array( 'invalidLanguageCode', null, false ),
array( 'en', null, 'English' ),
array( 'en', 'en', 'English' ),
+   array( 'eng', null, 'English' ),
+   array( 'en-gb', null, 'British English' ),
+   array( 'de', null, 'Deutsch' ),
);
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 565a10d..35b9c41 - change (mediawiki/extensions)

2015-10-26 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 565a10d..35b9c41
..

Syncronize VisualEditor: 565a10d..35b9c41

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


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

diff --git a/VisualEditor b/VisualEditor
index 565a10d..35b9c41 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 565a10da61ab45b0ea579b83d747f4b05df9e992
+Subproject commit 35b9c4119a230de1cc77ce15a44bd8a2469a04ae

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d5d0f03d35ba4c7d662c10ffef509b4889cf15e
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] ReferenceWidget: Rename view to preview - change (mediawiki...Citoid)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: ReferenceWidget: Rename view to preview
..


ReferenceWidget: Rename view to preview

This property is a PreviewElement, not a view node.

Change-Id: I6ee7e8a02100b9df101d1597f0d2b84825a781bc
---
M modules/ve.ui.CiteFromIdReferenceWidget.js
1 file changed, 5 insertions(+), 5 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 ee6e041..7d4c047 100644
--- a/modules/ve.ui.CiteFromIdReferenceWidget.js
+++ b/modules/ve.ui.CiteFromIdReferenceWidget.js
@@ -64,9 +64,9 @@
documentModel.getHtmlDocument()
);
node = doc.getDocumentNode().getChildren()[ 0 ];
-   this.view = new ve.ui.PreviewElement( node );
-   if ( this.view.isGenerating() ) {
-   this.view.once( 'render', this.renderPromise.resolve );
+   this.preview = new ve.ui.PreviewElement( node );
+   if ( this.preview.isGenerating() ) {
+   this.preview.once( 'render', this.renderPromise.resolve );
} else {
this.renderPromise.resolve();
}
@@ -86,7 +86,7 @@
this.$icon,
title.$element,
this.insertButton.$element,
-   this.view.$element
+   this.preview.$element
);
 };
 
@@ -102,7 +102,7 @@
  */
 ve.ui.CiteFromIdReferenceWidget.prototype.destroy = function () {
this.renderPromise.reject();
-   this.view.destroy();
+   this.preview.destroy();
 };
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ee7e8a02100b9df101d1597f0d2b84825a781bc
Gerrit-PatchSet: 2
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: 565a10d..35b9c41 - change (mediawiki/extensions)

2015-10-26 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 565a10d..35b9c41
..


Syncronize VisualEditor: 565a10d..35b9c41

Change-Id: I3d5d0f03d35ba4c7d662c10ffef509b4889cf15e
---
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 565a10d..35b9c41 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 565a10da61ab45b0ea579b83d747f4b05df9e992
+Subproject commit 35b9c4119a230de1cc77ce15a44bd8a2469a04ae

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d5d0f03d35ba4c7d662c10ffef509b4889cf15e
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] AceEditorWidget: Use mw.loader#getState instead of private m... - change (mediawiki...VisualEditor)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: AceEditorWidget: Use mw.loader#getState instead of private 
moduleRegistry
..


AceEditorWidget: Use mw.loader#getState instead of private moduleRegistry

Change-Id: I845651af837ccc042b6193876e17ba2b571dfe9c
---
M modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
index 2a21fd4..234aba3 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
@@ -55,7 +55,7 @@
  */
 ve.ui.MWAceEditorWidget.prototype.setup = function () {
if ( !this.loadingPromise ) {
-   this.loadingPromise = mw.loader.moduleRegistry.hasOwnProperty( 
'ext.codeEditor.ace.modes' ) ?
+   this.loadingPromise = mw.loader.getState( 
'ext.codeEditor.ace.modes' ) ?
mw.loader.using( 'ext.codeEditor.ace.modes' ).then( 
this.setupEditor.bind( this ) ) :
$.Deferred().reject().promise();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I845651af837ccc042b6193876e17ba2b571dfe9c
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] Added missing resources - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Added missing resources
..


Added missing resources

Since jenkins now validates on the existence of resources that were
referenced within CSS files we need to fix this.

Thos files are also missing in the original ExtJS Neptune Theme build. I
assume those rules are legacy code and not used anmore.

Still we want to make jenkins happy, so we add some dummy files.

Change-Id: I51b9c326357f101e419649e000a9a6d4d6af503f
---
A resources/bluespice.extjs/bluespice-theme/#default#VML
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-disabled-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-focus-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-focus-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-focus-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-focus-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-over-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-over-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-over-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-over-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-pressed-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-pressed-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-pressed-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-large-pressed-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-disabled-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-disabled-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-disabled-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-disabled-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-focus-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-focus-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-focus-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-focus-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-over-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-over-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-over-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-over-sides.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-pressed-bg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-pressed-corners.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-pressed-fbg.gif
A 
resources/bluespice.extjs/bluespice-theme/images/btn/btn-plain-toolbar-medium-pressed-sides.gif
A resources/extjs/resources/ext-theme-neptune/images/#default#VML
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-bg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-disabled-bg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-disabled-corners.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-disabled-fbg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-disabled-sides.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-fbg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-focus-bg.gif
A 
resources/extjs/resources/ext-theme-neptune/images/btn/btn-plain-toolbar-large-focus-corners.gif
A

[MediaWiki-commits] [Gerrit] Use mExtensionData instead of undeclared class property - change (mediawiki...PageImages)

2015-10-26 Thread WMDE

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

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

Change subject: Use mExtensionData instead of undeclared class property
..

Use mExtensionData instead of undeclared class property

Change-Id: I155e37fda412cd467da7b34c52b34661c7c20224
---
M PageImages.body.php
M tests/phpunit/PageImagesTest.php
2 files changed, 14 insertions(+), 12 deletions(-)


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

diff --git a/PageImages.body.php b/PageImages.body.php
index 3ec8264..cfe7f19 100644
--- a/PageImages.body.php
+++ b/PageImages.body.php
@@ -89,10 +89,6 @@
}
}
 
-   $out = $parser->getOutput();
-   if ( !isset( $out->pageImages ) ) {
-   $out->pageImages = array();
-   }
if ( is_array( $handlerParams ) ) {
$myParams = $handlerParams;
self::calcWidth( $myParams, $file );
@@ -103,7 +99,11 @@
$myParams['filename'] = $file->getTitle()->getDBkey();
$myParams['fullwidth'] = $file->getWidth();
$myParams['fullheight'] = $file->getHeight();
-   $out->pageImages[] = $myParams;
+
+   $out = $parser->getOutput();
+   $pageImages = $out->getExtensionData( 'pageImages' ) ?: array();
+   $pageImages[] = $myParams;
+   $out->setExtensionData( 'pageImages', $pageImages );
}
 
/**
@@ -144,11 +144,11 @@
 * @return bool
 */
public static function onLinksUpdate( LinksUpdate $linksUpdate ) {
-   if ( !isset( $linksUpdate->getParserOutput()->pageImages ) ) {
+   $images = $linksUpdate->getParserOutput()->getExtensionData( 
'pageImages' );
+   if ( $images === null ) {
return true;
}
 
-   $images = $linksUpdate->getParserOutput()->pageImages;
$scores = array();
$counter = 0;
foreach ( $images as $image ) {
diff --git a/tests/phpunit/PageImagesTest.php b/tests/phpunit/PageImagesTest.php
index 46e074b..84f1303 100644
--- a/tests/phpunit/PageImagesTest.php
+++ b/tests/phpunit/PageImagesTest.php
@@ -4,7 +4,7 @@
 
 use MediaWikiTestCase;
 use PageImages;
-use stdClass;
+use ParserOutput;
 use Title;
 
 /**
@@ -35,10 +35,12 @@
}
 
public function testOnLinksUpdate() {
-   $parserOutput = new stdClass();
-   $parserOutput->pageImages = array(
-   array( 'filename' => 'A.jpg', 'fullwidth' => 100, 
'fullheight' => 50 ),
-   );
+   $parserOutput = new ParserOutput();
+   $parserOutput->setExtensionData( 'pageImages', array(
+   'filename' => 'A.jpg',
+   'fullwidth' => 100,
+   'fullheight' => 50,
+   ) );
 
$linksUpdate = $this->getMockBuilder( 'LinksUpdate' )
->disableOriginalConstructor()

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

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

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

[MediaWiki-commits] [Gerrit] UEModulePDF: Added PHP 5.6 compatibility - change (mediawiki...BlueSpiceExtensions)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

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

Change subject: UEModulePDF: Added PHP 5.6 compatibility
..

UEModulePDF: Added PHP 5.6 compatibility

Due to new security settings in PHP 5.6 the '@' annotation for uploads
with cURL is not allowed anymore. We need to use CURLFile class instead.

See http://php.net/manual/de/class.curlfile.php

See also https://gerrit.wikimedia.org/r/#/c/234523/2

Change-Id: I48e85fe912bd7513a51dfb65e9ed893d2b7ef488
---
M UEModulePDF/includes/PDFServlet.class.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/UEModulePDF/includes/PDFServlet.class.php 
b/UEModulePDF/includes/PDFServlet.class.php
index 80023c0..9631e7f 100644
--- a/UEModulePDF/includes/PDFServlet.class.php
+++ b/UEModulePDF/includes/PDFServlet.class.php
@@ -46,7 +46,7 @@
'fileType' => '', //Need to stay empty so 
UploadAsset servlet saves file to document root directory
'documentToken' => 
$this->aParams['document-token'],
'sourceHtmlFile_name' => basename( 
$sTmpHtmlFile ),
-   'sourceHtmlFile' => '@'.$sTmpHtmlFile,
+   'sourceHtmlFile' => class_exists( 'CURLFile' ) 
? new CURLFile( $sTmpHtmlFile ) : '@'.$sTmpHtmlFile,
'wikiId' => wfWikiID()
)
);
@@ -141,7 +141,7 @@
}
 
$aPostFiles['file'.$iCounter.'_name'] = 
$sFileName;
-   $aPostFiles['file'.$iCounter] = '@'.$sFilePath;
+   $aPostFiles['file'.$iCounter] = class_exists( 
'CURLFile' ) ? new CURLFile( $sFilePath ) : '@'.$sFilePath;
$iCounter++;
$iCurrentUploadSize += $iFileSize;
}

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

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

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

[MediaWiki-commits] [Gerrit] AceEditorWidget: Use mw.loader#getState instead of private m... - change (mediawiki...VisualEditor)

2015-10-26 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: AceEditorWidget: Use mw.loader#getState instead of private 
moduleRegistry
..

AceEditorWidget: Use mw.loader#getState instead of private moduleRegistry

Change-Id: I845651af837ccc042b6193876e17ba2b571dfe9c
---
M modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
index 2a21fd4..234aba3 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWAceEditorWidget.js
@@ -55,7 +55,7 @@
  */
 ve.ui.MWAceEditorWidget.prototype.setup = function () {
if ( !this.loadingPromise ) {
-   this.loadingPromise = mw.loader.moduleRegistry.hasOwnProperty( 
'ext.codeEditor.ace.modes' ) ?
+   this.loadingPromise = mw.loader.getState( 
'ext.codeEditor.ace.modes' ) ?
mw.loader.using( 'ext.codeEditor.ace.modes' ).then( 
this.setupEditor.bind( this ) ) :
$.Deferred().reject().promise();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I845651af837ccc042b6193876e17ba2b571dfe9c
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] puppetmaster: Move the role into the role module - change (operations/puppet)

2015-10-26 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: puppetmaster: Move the role into the role module
..

puppetmaster: Move the role into the role module

Move the puppetmaster role into the role module

Change-Id: I3571dab849cc8874367ec57dedbb3a1fb34aef92
---
D manifests/role/puppetmaster.pp
A modules/role/manifests/puppetmaster/backend.pp
A modules/role/manifests/puppetmaster/frontend.pp
A modules/role/manifests/puppetmaster/labs.pp
4 files changed, 119 insertions(+), 117 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/248850/1

diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
deleted file mode 100644
index 8edcbc2..000
--- a/manifests/role/puppetmaster.pp
+++ /dev/null
@@ -1,117 +0,0 @@
-# vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
-
-class role::puppetmaster::frontend {
-include passwords::puppet::database
-
-include role::backup::host
-backup::set { 'var-lib-puppet-ssl': }
-backup::set { 'var-lib-puppet-volatile': }
-
-system::role { 'puppetmaster':
-description => 'Puppetmaster frontend'
-}
-
-class { '::puppetmaster':
-server_type => 'frontend',
-workers =>  [
-{
-'worker' => 'palladium.eqiad.wmnet',
-'loadfactor' => 10,
-},
-{
-'worker' => 'strontium.eqiad.wmnet',
-'loadfactor' => 20,
-},
-],
-config  => {
-'storeconfigs'  => true, # Required by thin_storeconfigs on 
puppet 3.x
-'thin_storeconfigs' => true,
-'dbadapter' => 'mysql',
-'dbuser'=> 'puppet',
-'dbpassword'=> 
$passwords::puppet::database::puppet_production_db_pass,
-'dbserver'  => 'm1-master.eqiad.wmnet',
-}
-}
-}
-
-class role::puppetmaster::backend {
-include passwords::puppet::database
-include base::firewall
-
-system::role { 'puppetmaster':
-description => 'Puppetmaster backend'
-}
-
-class { '::puppetmaster':
-server_type => 'backend',
-config  => {
-'storeconfigs'  => true, # Required by thin_storeconfigs on 
puppet 3.x
-'thin_storeconfigs' => true,
-# lint:ignore:quoted_booleans
-# Not a simple boolean, this must be quoted.
-'ca'=> 'false',
-# lint:endignore
-'ca_server' => 'palladium.eqiad.wmnet',
-'dbadapter' => 'mysql',
-'dbuser'=> 'puppet',
-'dbpassword'=> 
$passwords::puppet::database::puppet_production_db_pass,
-'dbserver'  => 'm1-master.eqiad.wmnet',
-'dbconnections' => '256',
-}
-}
-
-ferm::service { 'puppetmaster-backend':
-proto  => 'tcp',
-port   => 8141,
-}
-
-$puppetmaster_hostname = hiera('puppetmaster')
-ferm::service { 'ssh_puppet_merge':
-proto  => 'tcp',
-port   => '22',
-srange => "@resolve(${puppetmaster_hostname})"
-}
-}
-
-class role::puppetmaster::labs {
-include network::constants
-
-$labs_ranges = [
-
$network::constants::all_network_subnets['production']['eqiad']['private']['labs-instances1-a-eqiad']['ipv4'],
-
$network::constants::all_network_subnets['production']['eqiad']['private']['labs-instances1-b-eqiad']['ipv4'],
-
$network::constants::all_network_subnets['production']['eqiad']['private']['labs-instances1-c-eqiad']['ipv4'],
-
$network::constants::all_network_subnets['production']['eqiad']['private']['labs-instances1-d-eqiad']['ipv4'],
-]
-
-include ldap::role::config::labs
-$ldapconfig = $ldap::role::config::labs::ldapconfig
-$basedn = $ldapconfig['basedn']
-
-# Only allow puppet access from the instances
-$allow_from = $::realm ? {
-'production' => flatten([$labs_ranges, '208.80.154.14']),
-'labs' => [ '192.168.0.0/21' ],
-}
-
-class { '::puppetmaster':
-server_name => hiera('labs_puppet_master'),
-allow_from  => $allow_from,
-config  => {
-'thin_storeconfigs' => false,
-'node_terminus' => 'ldap',
-'ldapserver'=> $ldapconfig['servernames'][0],
-'ldapbase'  => "ou=hosts,${basedn}",
-'ldapstring'=> 
'(&(objectclass=puppetClient)(associatedDomain=%s))',
-'ldapuser'  => $ldapconfig['proxyagent'],
-'ldappassword'  => $ldapconfig['proxypass'],
-'ldaptls'   => true,
-

[MediaWiki-commits] [Gerrit] Add a link to the experimental recommend tool - change (mediawiki...ContentTranslation)

2015-10-26 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

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

Change subject: Add a link to the experimental recommend tool
..

Add a link to the experimental recommend tool

Bug: T112720
Change-Id: I41a92b8decf8f47a2c0dd074c493c3674ee5080c
---
M ContentTranslation.hooks.php
M extension.json
M i18n/en.json
M modules/dashboard/ext.cx.suggestionlist.js
M modules/dashboard/styles/ext.cx.lists.common.less
5 files changed, 47 insertions(+), 5 deletions(-)


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

diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index c910ef2..979cdf2 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -166,6 +166,7 @@
$wgContentTranslationDomainCodeMapping,
$wgContentTranslationEnableSuggestions,
$wgContentTranslationExperimentalFeatures,
+   $wgContentTranslationUseRecommendWmflabs,
$wgContentTranslationDatabase,
$wgContentTranslationSiteTemplates,
$wgContentTranslationCampaigns,
@@ -177,6 +178,7 @@
$vars['wgContentTranslationDomainCodeMapping'] = 
$wgContentTranslationDomainCodeMapping;
$vars['wgContentTranslationEnableSuggestions'] = 
$wgContentTranslationEnableSuggestions;
$vars['wgContentTranslationExperimentalFeatures'] = 
$wgContentTranslationExperimentalFeatures;
+   $vars['wgContentTranslationUseRecommendWmflabs'] = 
$wgContentTranslationUseRecommendWmflabs;
$vars['wgContentTranslationDatabase'] = 
$wgContentTranslationDatabase;
$vars['wgContentTranslationSiteTemplates'] = 
$wgContentTranslationSiteTemplates;
$vars['wgContentTranslationCampaigns'] = 
$wgContentTranslationCampaigns;
diff --git a/extension.json b/extension.json
index fd8a700..1396954 100644
--- a/extension.json
+++ b/extension.json
@@ -130,8 +130,10 @@
"cxstats": true,
"newarticle": true
},
-   "@ContentTranslationUseMagnusTool":"Whether the Magnus tool to 
find missing articles to be enabled or not. This is initially made to 
experiment with an article comparison tool at 
http://tools.wmflabs.org/not-in-the-other-language/ See 
https://phabricator.wikimedia.org/T76843;,
+   "@ContentTranslationUseMagnusTool":"Whether to enable the 
Magnus tool to find missing articles or not. This is initially made to 
experiment with an article comparison tool at 
http://tools.wmflabs.org/not-in-the-other-language/ See 
https://phabricator.wikimedia.org/T76843;,
"ContentTranslationUseMagnusTool": true,
+   "@ContentTranslationUseRecommendWmflabs":"Whether to enable the 
Articles Recommended for Translation tool to find suggested articles. This is 
initially made to experiment with an article comparison tool at 
http://recommend.wmflabs.org/#Recommend See 
https://phabricator.wikimedia.org/T112720;,
+   "ContentTranslationUseRecommendWmflabs": true,
"ContentTranslationBrowserBlacklist": {
"msie": [ [ "<", 10 ] ]
},
@@ -831,6 +833,8 @@
"cx-suggestionlist-title",
"cx-suggestionlist-empty-title",
"cx-suggestionlist-empty-desc",
+   "cx-suggestionlist-empty-desc-with-recommend",
+   
"cx-suggestionlist-empty-desc-recommend-link-text",
"cx-suggestionlist-view-source-page",
"cx-suggestionlist-featured"
]
diff --git a/i18n/en.json b/i18n/en.json
index 9c68356..ffd4ad3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -110,8 +110,10 @@
"cx-translation-filter-suggested-translations": "Suggestions",
"cx-suggestionlist-favorite": "For later",
"cx-suggestionlist-title": "More suggestions",
-   "cx-suggestionlist-empty-title": "Sorry, no pages to suggest",
+   "cx-suggestionlist-empty-title": "No suggestions for now",
"cx-suggestionlist-empty-desc": "You can pick any topic of your choice 
when starting a new translation",
+   "cx-suggestionlist-empty-desc-with-recommend": "We found no 
suggestions. You can check later or find relevant pages using our experimental 
tool.",
+   "cx-suggestionlist-empty-desc-recommend-link-text": "View experimental 
suggestions",
"cx-suggestionlist-featured": "Featured",
"cx-suggestionlist-view-source-page": "View source page",
"cx-translation-filter-from-any-language": "From any language",
diff --git a/modules/dashboard/ext.cx.suggestionlist.js

[MediaWiki-commits] [Gerrit] Change the alignment of the empty list messages - change (mediawiki...ContentTranslation)

2015-10-26 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

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

Change subject: Change the alignment of the empty list messages
..

Change the alignment of the empty list messages

In the screenshot in T112720 the text is left-aligned with
some padding instead of centered.

Bug: T112720
Change-Id: Ic4464419fd85df2364bded08a2dc93f5e7803822
---
M modules/dashboard/styles/ext.cx.lists.common.less
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index bf48812..d348de8 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -27,7 +27,7 @@
 .cx-suggestionlist-empty {
.mw-ui-item;
color: #999;
-   text-align: center;
+   padding: 0 25% 0 25%;
 
&__img {
.background-image-svg('../images/cx-circle.svg', 
'../images/cx-circle.png');

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

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

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

[MediaWiki-commits] [Gerrit] Add missing @metadata block to aeb-arab.json - change (mediawiki...ProofreadPage)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Add missing @metadata block to aeb-arab.json
..


Add missing @metadata block to aeb-arab.json

Change-Id: Ic883de1e1ceaa2f3d61cb4038726ec71c0e8794f
---
M i18n/aeb-arab.json
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/i18n/aeb-arab.json b/i18n/aeb-arab.json
index 7e69428..25b9f28 100644
--- a/i18n/aeb-arab.json
+++ b/i18n/aeb-arab.json
@@ -1,4 +1,7 @@
 {
+   "@metadata": {
+   "authors": []
+   },
"indexpages": "قائمة صفحات الفهرس",
"pageswithoutscans": "صفحات من دون تفحص",
"proofreadpage_desc": "يسمح بمقارنة سهلة للنص مع المسح الأصلي",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic883de1e1ceaa2f3d61cb4038726ec71c0e8794f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...ProofreadPage)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: build: Configure banana-checker and jsonlint
..


build: Configure banana-checker and jsonlint

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

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



diff --git a/.gitignore b/.gitignore
index f610f91..381aa91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .*.swp
 .htaccess
 
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..0bf6c86
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.5"
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I795f623f14d525f8dfca7423f08d52602b253a6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add support for listpages.py - change (translatewiki)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Add support for listpages.py
..


Add support for listpages.py

Change-Id: I35cf60e085a74a703c8f96af92193ad5695c00ed
---
M groups/Pywikibot/Pywikibot.yaml
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, but someone else must approve
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/groups/Pywikibot/Pywikibot.yaml b/groups/Pywikibot/Pywikibot.yaml
index bd90641..4d302fd 100644
--- a/groups/Pywikibot/Pywikibot.yaml
+++ b/groups/Pywikibot/Pywikibot.yaml
@@ -271,6 +271,13 @@
   sourcePattern: "%GROUPROOT%/pywikibot/isbn/%CODE%.json"
 ---
 BASIC:
+  id: out-pywikipedia-listpages
+  label: Pywikibot List Pages
+
+FILES:
+  sourcePattern: "%GROUPROOT%/pywikibot/listpages/%CODE%.json"
+---
+BASIC:
   id: out-pywikipedia-lonelypages
   label: Pywikibot Lonely Pages Checker
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35cf60e085a74a703c8f96af92193ad5695c00ed
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Assign salt grains for kafkatee - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for kafkatee
..


Assign salt grains for kafkatee

Change-Id: I65bdcaf766cdb7309bb6cdc20d2a1315a74193df
---
A hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml 
b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
new file mode 100644
index 000..43d013a
--- /dev/null
+++ b/hieradata/role/common/logging/kafkatee/webrequest/ops.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-kafkatee:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index f4522c0..f5c205c 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65bdcaf766cdb7309bb6cdc20d2a1315a74193df
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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 for new ExtJS RL implementation - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

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

Change subject: Fix for new ExtJS RL implementation
..

Fix for new ExtJS RL implementation

As some BlueSpice main components relay on it we will need to check ix
ExtJS is available or make sure by using mw.loader.using

Change-Id: I71589e6fc9b394c3042f998d06efbbbce60263e1
TODO: The standard message dialogs may be a problem...
---
M resources/Resources.php
M resources/bluespice/bs.tools.js
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/18/248818/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 9b8567c..a0adf91 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -42,8 +42,7 @@
'bs-one-unit-ago',
'bs-now',
'blanknamespace', //MediaWiki
-   ),
-   'position' => 'bottom' // available since r85616
+   )
 ) + $aResourceModuleTemplate;
 
 $wgResourceModules['ext.bluespice.styles'] = array(
diff --git a/resources/bluespice/bs.tools.js b/resources/bluespice/bs.tools.js
index 9daee58..bc17c7f 100644
--- a/resources/bluespice/bs.tools.js
+++ b/resources/bluespice/bs.tools.js
@@ -14,6 +14,8 @@
overflowY: 'auto'
};
 
-   Ext.create('Ext.tip.ToolTip', conf);
+   mw.using( 'ext.bluespice.extjs' ).done(function() {
+   Ext.create( 'Ext.tip.ToolTip', conf );
+   });
});
 });
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for hue - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for hue
..


Assign salt grains for hue

Change-Id: I1cc22ca9acda42f17f1c01b90fb3836bcbaeb84b
---
A hieradata/role/common/analytics/hue.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/analytics/hue.yaml 
b/hieradata/role/common/analytics/hue.yaml
new file mode 100644
index 000..f3c3b72
--- /dev/null
+++ b/hieradata/role/common/analytics/hue.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-hue:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index b3487be..f28a5f5 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for pool counters - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for pool counters
..


Assign salt grains for pool counters

Change-Id: Ide6986a17bc38b4fed1c047597a55a341e489e7e
---
A hieradata/role/codfw/poolcounter.yaml
A hieradata/role/eqiad/poolcounter.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/codfw/poolcounter.yaml 
b/hieradata/role/codfw/poolcounter.yaml
new file mode 100644
index 000..5339b3f
--- /dev/null
+++ b/hieradata/role/codfw/poolcounter.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-poolcounter-codfw:
+value: standard
diff --git a/hieradata/role/eqiad/poolcounter.yaml 
b/hieradata/role/eqiad/poolcounter.yaml
new file mode 100644
index 000..aaecadd
--- /dev/null
+++ b/hieradata/role/eqiad/poolcounter.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-poolcounter-eqiad:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 602446a..a4aafea 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -86,3 +86,5 @@
 labvirt-canary = debdeploy-nova-compute:canary
 wdqs = debdeploy-wdqs:standard
 spark = debdeploy-spark-worker:standard
+poolcounter-eqiad = debdeploy-poolcounter-eqiad:standard
+poolcounter-codfw = debdeploy-poolcounter-codfw:standard

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

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

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

[MediaWiki-commits] [Gerrit] In UploadStash, prioritize core metadata over file handler m... - change (mediawiki/core)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: In UploadStash, prioritize core metadata over file handler 
metadata
..


In UploadStash, prioritize core metadata over file handler metadata

If us_props is too big for the database (> 64kb), don't store the
file handler metadata. This is usually by far the biggest portion
(For pdf/djvu it contains OCR data), and it's non-critical to the
upload process as it's only needed for display, and the file handler
will probably regenerate it anyway if it is missing.

At some point in the future, having data too big for a db field
is probably going to cause errors instead of silent truncation,
so we really don't want to be doing silent truncation.

An alternative way to solve T94562 might be to make it use us_sha1
instead of the one encoded in us_props, but seems like it's important
to fix us_props for other data in it too.

Bug: T94562
Change-Id: I8aed6a1a5c9a136090b36d4ad23d8429791f58c4
---
M includes/upload/UploadStash.php
1 file changed, 11 insertions(+), 1 deletion(-)

Approvals:
  Rillke: Looks good to me, but someone else must approve
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index b971c00..e241383 100644
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -54,6 +54,7 @@
 class UploadStash {
// Format of the key for files -- has to be suitable as a filename 
itself (e.g. ab12cd34ef.jpg)
const KEY_FORMAT_REGEX = '/^[\w-\.]+\.\w*$/';
+   const MAX_US_PROPS_SIZE = 65535;
 
/**
 * repository that this uses to store temp files
@@ -277,13 +278,22 @@
wfDebug( __METHOD__ . " inserting $stashPath under $key\n" );
$dbw = $this->repo->getMasterDb();
 
+   $serializedFileProps = serialize( $fileProps );
+   if ( strlen( $serializedFileProps ) > self::MAX_US_PROPS_SIZE ) 
{
+   // Database is going to truncate this and make the 
field invalid.
+   // Prioritize important metadata over file handler 
metadata.
+   // File handler should be prepared to regenerate 
invalid metadata if needed.
+   $fileProps['metadata'] = false;
+   $serializedFileProps = serialize( $fileProps );
+   }
+
$this->fileMetadata[$key] = array(
'us_id' => $dbw->nextSequenceValue( 
'uploadstash_us_id_seq' ),
'us_user' => $this->userId,
'us_key' => $key,
'us_orig_path' => $path,
'us_path' => $stashPath, // virtual URL
-   'us_props' => $dbw->encodeBlob( serialize( $fileProps ) 
),
+   'us_props' => $dbw->encodeBlob( $serializedFileProps ),
'us_size' => $fileProps['size'],
'us_sha1' => $fileProps['sha1'],
'us_mime' => $fileProps['mime'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8aed6a1a5c9a136090b36d4ad23d8429791f58c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Rillke 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make DateFormatter::getInstance use APC - change (mediawiki/core)

2015-10-26 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Make DateFormatter::getInstance use APC
..

Make DateFormatter::getInstance use APC

Change-Id: Idfff805903bffcdd6ff8f2a3c1331ca63476933e
---
M includes/parser/DateFormatter.php
1 file changed, 14 insertions(+), 9 deletions(-)


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

diff --git a/includes/parser/DateFormatter.php 
b/includes/parser/DateFormatter.php
index ef295ab..78f7775 100644
--- a/includes/parser/DateFormatter.php
+++ b/includes/parser/DateFormatter.php
@@ -124,18 +124,23 @@
 *  Defaults to the site content language
 * @return DateFormatter
 */
-   public static function ( $lang = null ) {
-   global $wgMemc, $wgContLang;
-   static $dateFormatter = false;
+   public static function getInstance( $lang = null ) {
+   global $wgContLang, $wgMainCacheType;
+
$lang = $lang ? wfGetLangObj( $lang ) : $wgContLang;
-   $key = wfMemcKey( 'dateformatter', $lang->getCode() );
+   $cache = ObjectCache::newAccelerator( $wgMainCacheType );
+
+   static $dateFormatter = false;
if ( !$dateFormatter ) {
-   $dateFormatter = $wgMemc->get( $key );
-   if ( !$dateFormatter ) {
-   $dateFormatter = new DateFormatter( $lang );
-   $wgMemc->set( $key, $dateFormatter, 3600 );
-   }
+   $dateFormatter = $cache->getWithSetCallback(
+   $cache->makeKey( 'dateformatter', 
$lang->getCode() ),
+   3600,
+   function () use ( $lang ) {
+   return new DateFormatter( $lang );
+   }
+   );
}
+
return $dateFormatter;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for wdqs - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for wdqs
..


Assign salt grains for wdqs

Change-Id: I9286df149c8e9c6164fa056c53314dc073d5b135
---
M hieradata/role/common/wdqs.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/wdqs.yaml b/hieradata/role/common/wdqs.yaml
index 6f99dbc..0f04540 100644
--- a/hieradata/role/common/wdqs.yaml
+++ b/hieradata/role/common/wdqs.yaml
@@ -4,3 +4,6 @@
   - wdqs-admins
 cluster: wdqs
 contactgroups: admins,wdqs-admins
+debdeploy::grains:
+  debdeploy-wdqs:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 12e0575..6fd5b04 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -83,3 +83,4 @@
 maps = debdeploy-maps-master:standard, debdeploy-maps-slave:standard
 labvirt = debdeploy-nova-compute:standard
 labvirt-canary = debdeploy-nova-compute:canary
+wdqs = debdeploy-wdqs:standard

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

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

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

[MediaWiki-commits] [Gerrit] ExtensionInfo: Added dependency ext.bluespice.extjs - change (mediawiki...BlueSpiceExtensions)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: ExtensionInfo: Added dependency ext.bluespice.extjs
..


ExtensionInfo: Added dependency ext.bluespice.extjs

This is necessary since ExtJS gets loaded as RL module

Change-Id: I4b1bc0b9dbf77d4e0675b1657ac8cc14e19d58ea
---
M ExtensionInfo/ExtensionInfo.setup.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/ExtensionInfo/ExtensionInfo.setup.php 
b/ExtensionInfo/ExtensionInfo.setup.php
index 9d54b5a..89539c4 100644
--- a/ExtensionInfo/ExtensionInfo.setup.php
+++ b/ExtensionInfo/ExtensionInfo.setup.php
@@ -30,7 +30,7 @@
'bs-extensioninfo-groupingtemplateviewtext'
),
'dependencies' => array(
-   'mediawiki.jqueryMsg'
+   'ext.bluespice.extjs'
),
'localBasePath' => $IP . 
'/extensions/BlueSpiceExtensions/ExtensionInfo/resources',
'remoteExtPath' => 'BlueSpiceExtensions/ExtensionInfo/resources',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b1bc0b9dbf77d4e0675b1657ac8cc14e19d58ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
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] Assign salt grains for labvirt/nova compute - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for labvirt/nova compute
..


Assign salt grains for labvirt/nova compute

Change-Id: Ic2e3dd7895cd48c1d81d303bb711a86f4a28706f
---
M hieradata/hosts/labvirt1005.yaml
M hieradata/role/common/nova/compute.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/labvirt1005.yaml b/hieradata/hosts/labvirt1005.yaml
index 0f97ce9..04ee89b 100644
--- a/hieradata/hosts/labvirt1005.yaml
+++ b/hieradata/hosts/labvirt1005.yaml
@@ -1 +1,4 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
+debdeploy::grains:
+  debdeploy-nova-compute:
+value: canary
diff --git a/hieradata/role/common/nova/compute.yaml 
b/hieradata/role/common/nova/compute.yaml
index 4559a8a..981749b 100644
--- a/hieradata/role/common/nova/compute.yaml
+++ b/hieradata/role/common/nova/compute.yaml
@@ -1 +1,4 @@
 cluster: virt
+debdeploy::grains:
+  debdeploy-nova-compute:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 45790a2..12e0575 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -81,3 +81,5 @@
 maps-master = debdeploy-maps-master:standard
 maps-slave = debdeploy-maps-slave:standard
 maps = debdeploy-maps-master:standard, debdeploy-maps-slave:standard
+labvirt = debdeploy-nova-compute:standard
+labvirt-canary = debdeploy-nova-compute:canary

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2e3dd7895cd48c1d81d303bb711a86f4a28706f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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 for new ExtJS RL implementation - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: Fix for new ExtJS RL implementation
..


Fix for new ExtJS RL implementation

As some BlueSpice main components relay on it we will need to check ix
ExtJS is available or make sure by using mw.loader.using

Pacth Set 2: Bypassing jenkins

Change-Id: I71589e6fc9b394c3042f998d06efbbbce60263e1
TODO: The standard message dialogs may be a problem...
---
M resources/Resources.php
M resources/bluespice/bs.tools.js
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/resources/Resources.php b/resources/Resources.php
index 9b8567c..a0adf91 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -42,8 +42,7 @@
'bs-one-unit-ago',
'bs-now',
'blanknamespace', //MediaWiki
-   ),
-   'position' => 'bottom' // available since r85616
+   )
 ) + $aResourceModuleTemplate;
 
 $wgResourceModules['ext.bluespice.styles'] = array(
diff --git a/resources/bluespice/bs.tools.js b/resources/bluespice/bs.tools.js
index 9daee58..bc17c7f 100644
--- a/resources/bluespice/bs.tools.js
+++ b/resources/bluespice/bs.tools.js
@@ -14,6 +14,8 @@
overflowY: 'auto'
};
 
-   Ext.create('Ext.tip.ToolTip', conf);
+   mw.using( 'ext.bluespice.extjs' ).done(function() {
+   Ext.create( 'Ext.tip.ToolTip', conf );
+   });
});
 });
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71589e6fc9b394c3042f998d06efbbbce60263e1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
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] Remove access to protected field - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: Remove access to protected field
..


Remove access to protected field

PatchSet 2: Bypassing jenkins verification

Change-Id: I2f8640ccdb4aa54ed1325c1cf123012642c9f367
---
M includes/utility/PageContentProvider.class.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/includes/utility/PageContentProvider.class.php 
b/includes/utility/PageContentProvider.class.php
index eca3a07..5bd4c53 100644
--- a/includes/utility/PageContentProvider.class.php
+++ b/includes/utility/PageContentProvider.class.php
@@ -72,7 +72,6 @@
//Default ParserOptions
$this->oParserOptions = ParserOptions::newFromUser( $wgUser );
$this->oParserOptions->setEditSection( false ); //Does not 
work...
-   $this->oParserOptions->mEditSection = false;//Does not work 
either...
$this->oParserOptions->setTidy( true );
$this->oParserOptions->setRemoveComments( true );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f8640ccdb4aa54ed1325c1cf123012642c9f367
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Tweichart 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ExtensionInfo: Added dependency ext.bluespice.extjs - change (mediawiki...BlueSpiceExtensions)

2015-10-26 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

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

Change subject: ExtensionInfo: Added dependency ext.bluespice.extjs
..

ExtensionInfo: Added dependency ext.bluespice.extjs

This is necessary since ExtJS gets loaded as RL module

Change-Id: I4b1bc0b9dbf77d4e0675b1657ac8cc14e19d58ea
---
M ExtensionInfo/ExtensionInfo.setup.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/ExtensionInfo/ExtensionInfo.setup.php 
b/ExtensionInfo/ExtensionInfo.setup.php
index 9d54b5a..89539c4 100644
--- a/ExtensionInfo/ExtensionInfo.setup.php
+++ b/ExtensionInfo/ExtensionInfo.setup.php
@@ -30,7 +30,7 @@
'bs-extensioninfo-groupingtemplateviewtext'
),
'dependencies' => array(
-   'mediawiki.jqueryMsg'
+   'ext.bluespice.extjs'
),
'localBasePath' => $IP . 
'/extensions/BlueSpiceExtensions/ExtensionInfo/resources',
'remoteExtPath' => 'BlueSpiceExtensions/ExtensionInfo/resources',

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

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

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

[MediaWiki-commits] [Gerrit] Convert getMagickVersion() to using APC - change (mediawiki/core)

2015-10-26 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Convert getMagickVersion() to using APC
..

Convert getMagickVersion() to using APC

Shelling out on my slow vagrant VM takes about ~3-4ms
so it's probably not worth a  fallback.

Change-Id: Ifd5758264cc15f1ae07972e839a243f5f891503e
---
M includes/media/TransformationalImageHandler.php
1 file changed, 20 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/248820/1

diff --git a/includes/media/TransformationalImageHandler.php 
b/includes/media/TransformationalImageHandler.php
index 15753a9..3558149 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -505,30 +505,31 @@
 * Retrieve the version of the installed ImageMagick
 * You can use PHPs version_compare() to use this value
 * Value is cached for one hour.
-* @return string Representing the IM version.
+* @return string|bool Representing the IM version; false on error
 */
protected function getMagickVersion() {
-   global $wgMemc;
+   return ObjectCache::newAccelerator( CACHE_NONE 
)->getWithSetCallback(
+   "imagemagick-version",
+   3600,
+   function () {
+   global $wgImageMagickConvertCommand;
 
-   $cache = $wgMemc->get( "imagemagick-version" );
-   if ( !$cache ) {
-   global $wgImageMagickConvertCommand;
-   $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) 
. ' -version';
-   wfDebug( __METHOD__ . ": Running convert -version\n" );
-   $retval = '';
-   $return = wfShellExec( $cmd, $retval );
-   $x = preg_match( '/Version: ImageMagick 
([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches );
-   if ( $x != 1 ) {
-   wfDebug( __METHOD__ . ": ImageMagick version 
check failed\n" );
+   $cmd = wfEscapeShellArg( 
$wgImageMagickConvertCommand ) . ' -version';
+   wfDebug( __METHOD__ . ": Running convert 
-version\n" );
+   $retval = '';
+   $return = wfShellExec( $cmd, $retval );
+   $x = preg_match(
+   '/Version: ImageMagick 
([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches
+   );
+   if ( $x != 1 ) {
+   wfDebug( __METHOD__ . ": ImageMagick 
version check failed\n" );
 
-   return null;
+   return false;
+   }
+
+   return $matches[1];
}
-   $wgMemc->set( "imagemagick-version", $matches[1], 3600 
);
-
-   return $matches[1];
-   }
-
-   return $cache;
+   );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] clone is not a function - change (mediawiki/core)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: clone is not a function
..


clone is not a function

Remove parenthesis around clone magic word

Change-Id: I2e0e53303f7c73745bd1ab4bcf32e74943efc4de
---
M includes/Linker.php
M includes/exception/ErrorPageError.php
M includes/page/ImagePage.php
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/Linker.php b/includes/Linker.php
index e821004..842d276 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1469,7 +1469,7 @@
if ( $target->getText() == '' 
&& !$target->isExternal()
&& !$local && $title
) {
-   $newTarget = clone ( 
$title );
+   $newTarget = clone 
$title;

$newTarget->setFragment( '#' . $target->getFragment() );
$target = $newTarget;
}
diff --git a/includes/exception/ErrorPageError.php 
b/includes/exception/ErrorPageError.php
index 3631a34..6366c74 100644
--- a/includes/exception/ErrorPageError.php
+++ b/includes/exception/ErrorPageError.php
@@ -44,7 +44,7 @@
// passing to the parent constructor. Our overridden report() 
below
// makes sure that the page shown to the user is not forced to 
English.
if ( $msg instanceof Message ) {
-   $enMsg = clone( $msg );
+   $enMsg = clone $msg;
} else {
$enMsg = wfMessage( $msg, $params );
}
diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 7957e65..3638aed 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -1533,7 +1533,7 @@
function __construct( $imagePage ) {
parent::__construct( $imagePage->getContext() );
$this->mImagePage = $imagePage;
-   $this->mTitle = clone ( $imagePage->getTitle() );
+   $this->mTitle = clone $imagePage->getTitle();
$this->mTitle->setFragment( '#filehistory' );
$this->mImg = null;
$this->mHist = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e0e53303f7c73745bd1ab4bcf32e74943efc4de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Convert logging from print to twisted.python.log - change (operations...pybal)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Convert logging from print to twisted.python.log
..


Convert logging from print to twisted.python.log

Since moving to systemd, we decided it was a good idea to let journalctl
handle our logs. However, journald interacts badly with programs logging
to stdout as it imposes buffering, which we don't like.

Moreover, pybal logs are at the moment all-or-nothing, resulting in
sometimes precious yet verbose info to flood the pybal logs. What we
want is to be able to select (by log level or via syslog) the critical
information, what is informative, and what is most of the times
unnecessary and to get just what we need. We write our logs to stderr,
where they will be handled by journald directly and won't need any
additional intervention on our side.

As a consequence, we move to using twisted.python.log to log messages,
with some sugar on top that should make the transition to using
twisted.logger in newer twisted versions much easier.

Change-Id: I77ddd0c4f98373b21ea3dc0ba05cafaad757c029
---
M pybal/config.py
M pybal/ipvs.py
M pybal/monitor.py
M pybal/monitors/dnsquery.py
M pybal/monitors/idleconnection.py
M pybal/monitors/proxyfetch.py
M pybal/monitors/runcommand.py
M pybal/pybal.py
M pybal/test/test_util.py
M pybal/util.py
10 files changed, 270 insertions(+), 72 deletions(-)

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



diff --git a/pybal/config.py b/pybal/config.py
index 3172cf6..d4499ea 100644
--- a/pybal/config.py
+++ b/pybal/config.py
@@ -15,10 +15,9 @@
 import re
 
 from twisted.internet import task
-from twisted.python import log
 from twisted.web import client
 
-from pybal.util import get_subclasses
+from pybal.util import get_subclasses, log
 
 
 class ConfigurationObserver(object):
diff --git a/pybal/ipvs.py b/pybal/ipvs.py
index 55d1bb2..a4b9162 100644
--- a/pybal/ipvs.py
+++ b/pybal/ipvs.py
@@ -5,6 +5,9 @@
 LVS state/configuration classes for PyBal
 """
 from twisted.internet import reactor, defer, protocol, error
+from . import util
+
+log = util.log
 
 
 class IPVSProcessProtocol(protocol.ProcessProtocol, object):
@@ -24,10 +27,9 @@
 
 def processExited(self, reason):
 if reason.check(error.ProcessTerminated):
-print("ipvsadm exited with status %d when executing cmdlist %s" %
-  (reason.value.exitCode, self.cmdList))
-print "ipvsadm stderr output:"
-print self.stderr
+log.error("ipvsadm exited with status %d when executing cmdlist 
%s" %
+  (reason.value.exitCode, self.cmdList))
+log.error("ipvsadm stderr output: {}".format(self.stderr))
 
 
 class IPVSManager(object):
@@ -242,7 +244,7 @@
 cmdList = [self.ipvsManager.commandAddServer(self.service(),
  server)]
 else:
-print('WARNING: bug: adding already existing server to LVS')
+log.warn('bug: adding already existing server to LVS')
 cmdList = [self.ipvsManager.commandEditServer(self.service(),
   server)]
 
diff --git a/pybal/monitor.py b/pybal/monitor.py
index d39045e..9d9783f 100644
--- a/pybal/monitor.py
+++ b/pybal/monitor.py
@@ -5,6 +5,10 @@
 Monitor class implementations for PyBal
 """
 from twisted.internet import reactor
+from . import util
+import logging
+
+_log = util._log
 
 
 class MonitoringProtocol(object):
@@ -60,15 +64,15 @@
 if self.coordinator:
 self.coordinator.resultDown(self, reason)
 
-def report(self, text):
+def report(self, text, level=logging.DEBUG):
 """Common method for reporting/logging check results."""
-print "[%s %s] %s (%s): %s" % (
-self.server.lvsservice.name,
-self.__name__,
+msg = "%s (%s): %s" % (
 self.server.host,
 self.server.textStatus(),
 text
 )
+s = "%s %s" % (self.server.lvsservice.name, self.__name__)
+_log(msg, level, s)
 
 def _getConfigBool(self, optionname, default=None):
 return self.configuration.getboolean(
diff --git a/pybal/monitors/dnsquery.py b/pybal/monitors/dnsquery.py
index 37e1cf5..33c3938 100644
--- a/pybal/monitors/dnsquery.py
+++ b/pybal/monitors/dnsquery.py
@@ -10,6 +10,7 @@
 from twisted.internet import reactor, defer
 from twisted.names import client, dns, error
 from twisted.python import runtime
+import logging
 
 import random, socket
 
@@ -17,52 +18,52 @@
 """
 Monitor that checks a DNS server by doing repeated DNS queries
 """
-
+
 __name__ = 'DNSQuery'
-
+
 INTV_CHECK = 10
 TIMEOUT_QUERY = 5
-
+
 catchList = (defer.TimeoutError, error.DomainError,
  error.AuthoritativeDomainError, error.DNSFormatError,

[MediaWiki-commits] [Gerrit] Remove unused fields from User - change (mediawiki/core)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Remove unused fields from User
..


Remove unused fields from User

Change-Id: Ib209747f1ebd1433969b13b1ecb86d3b57f9be9a
---
M includes/User.php
1 file changed, 4 insertions(+), 17 deletions(-)

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



diff --git a/includes/User.php b/includes/User.php
index 6e52a1d..e1c9e35 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -185,21 +185,8 @@
public $mName;
/** @var string */
public $mRealName;
-
-   /**
-* These fields were marked "@private", but were defined as public to
-* maintain compatibility with PHP4 code since PHP4 didn't support 
access
-* restrictions. AuthManager makes password handling pluggable, meaning
-* these fields don't make sense anymore. If this broke something, see
-* T89459 for the context of the change.
-* @deprecated These are mostly unused, but kept for now to raise 
errors on attempted access.
-*/
-   // @{
+   /** @var Password|null */
private $mPassword = null;
-   private $mNewpassword;
-   private $mNewpassTime;
-   private $mPasswordExpires;
-   // @}
 
/** @var string */
public $mEmail;
@@ -4097,13 +4084,13 @@
__METHOD__
);
try {
-   $mNewpassword = $passwordFactory->newFromCiphertext( 
$row->user_newpassword );
+   $newPassword = $passwordFactory->newFromCiphertext( 
$row->user_newpassword );
} catch ( PasswordError $e ) {
wfDebug( 'Invalid password hash found in database.' );
-   $mNewpassword = PasswordFactory::newInvalidPassword();
+   $newPassword = PasswordFactory::newInvalidPassword();
}
 
-   if ( $mNewpassword->equals( $plaintext ) ) {
+   if ( $newPassword->equals( $plaintext ) ) {
if ( is_null( $row->user_newpass_time ) ) {
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib209747f1ebd1433969b13b1ecb86d3b57f9be9a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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] dumps: one more conf file not updated for new path of dblists - change (operations/puppet)

2015-10-26 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

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

Change subject: dumps: one more conf file not updated for new path of dblists
..

dumps: one more conf file not updated for new path of dblists

Change-Id: I77af988c3810b7c8855e6bb605275968f2a403b0
---
M modules/snapshot/templates/wq.conf.erb
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/snapshot/templates/wq.conf.erb 
b/modules/snapshot/templates/wq.conf.erb
index 94be118..30e34f3 100644
--- a/modules/snapshot/templates/wq.conf.erb
+++ b/modules/snapshot/templates/wq.conf.erb
@@ -4,9 +4,9 @@
 #
 [wiki]
 mediawiki=<%= scope.lookupvar('snapshot::dirs::apachedir') %>
-allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/all.dblist
-privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/private.dblist
-closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/closed.dblist
+allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/dblists/all.dblist
+privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/dblists/private.dblist
+closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/dblists/closed.dblist
 skipwikislist=<%= scope.lookupvar('snapshot::dirs::wikiqueriesdir') 
-%>/dblists/skip.dblist
 adminsettings=private/PrivateSettings.php
 

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

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

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

[MediaWiki-commits] [Gerrit] Add rudimentary support to install Renameuser with composer. - change (mediawiki...Renameuser)

2015-10-26 Thread Ingomueller-net (Code Review)

Ingomueller-net has uploaded a new change for review.

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

Change subject: Add rudimentary support to install Renameuser with composer.
..

Add rudimentary support to install Renameuser with composer.

Adding name, type, and autoloader were enough to make it work. It
might be a good idea to add description, licence, etc as well.

Basic documentation on the topic:
* https://www.mediawiki.org/wiki/Composer/For_extensions
* 
http://www.bn2vs.com/blog/2013/11/24/introduction-to-composer-for-mediawiki-developers/
* https://getcomposer.org/doc/02-libraries.md

The final goal of this change is to publish Renameuser on
packagist.org so that it found by composer automatically.

Change-Id: Id19ec55183459bbf17ef44ad084a3305b406cc03
---
M composer.json
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/composer.json b/composer.json
index 99741dd..79cd92f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,9 @@
 {
+   "name": "mediawiki/renameuser",
+   "type": "mediawiki-extension",
+   "autoload": {
+   "files": ["Renameuser.php"]
+   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
"mediawiki/mediawiki-codesniffer": "0.5.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id19ec55183459bbf17ef44ad084a3305b406cc03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
Gerrit-Branch: master
Gerrit-Owner: Ingomueller-net 

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

[MediaWiki-commits] [Gerrit] Move base::firewall into the archiva role - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Move base::firewall into the archiva role
..


Move base::firewall into the archiva role

Change-Id: I87c7c9304690ba426e74d6084f8995e6be5b7602
---
M manifests/role/archiva.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/archiva.pp b/manifests/role/archiva.pp
index d02cd00..894a7bc 100644
--- a/manifests/role/archiva.pp
+++ b/manifests/role/archiva.pp
@@ -7,6 +7,8 @@
 class role::archiva {
 system::role { 'role::archiva': description => 'Apache Archiva Host' }
 
+include base::firewall
+
 if !defined(Package['openjdk-7-jdk']) {
 package { 'openjdk-7-jdk':
 ensure => 'installed',
diff --git a/manifests/site.pp b/manifests/site.pp
index 83f3167..79b4b75 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2437,7 +2437,6 @@
 $cluster = 'misc'
 # include firewall here, until it is on all hosts
 role archiva
-include base::firewall
 include standard
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] css styling for boxes and borders - change (mediawiki...BlueSpiceFoundation)

2015-10-26 Thread Dvogel hallowelt (Code Review)

Dvogel hallowelt has uploaded a new change for review.

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

Change subject: css styling for boxes and borders
..

css styling for boxes and borders

added styling for boxex and borders according to
https://help.bluespice.com/index.php/Boxen

Change-Id: Ia1c8234c414186b5c80b466bf8e551d7606471e5
---
M resources/bluespice/bluespice.css
1 file changed, 76 insertions(+), 1 deletion(-)


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

diff --git a/resources/bluespice/bluespice.css 
b/resources/bluespice/bluespice.css
index 6a9d64f..99e319c 100644
--- a/resources/bluespice/bluespice.css
+++ b/resources/bluespice/bluespice.css
@@ -41,4 +41,79 @@
 .btn44 {
height:44px!important;
width:44px!important;
-}
\ No newline at end of file
+}
+
+.bluebox,
+.box-blue {
+   border:1px solid #6093D2;
+   background-color:#AEC8E8;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.beigebox,
+.box-beige {
+   border:1px solid #000;
+   background-color:#E0B978;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.greenbox,
+.box-green {
+   border:1px solid #237E14;
+   background-color:#DEFEBB;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.yellowbox,
+.box-yellow {
+   border:1px solid #00;
+   background-color:#AA;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.redbox,
+.box-red {
+   border:1px solid #DD;
+   background-color:#FF;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.blueborder,
+.border-blue {
+   border:1px solid #AEC8E8;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.beigeborder,
+.border-beige {
+   border:1px solid #E0B978;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.greenborder,
+.border-green {
+   border:1px solid #237E14;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.yellowborder,
+.border-yellow {
+   border:1px solid #00;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}
+
+.redborder,
+.border-red {
+   border:1px solid #DD;
+   margin:0 0 10px;
+   padding:.3em .6em;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1c8234c414186b5c80b466bf8e551d7606471e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] Assign salt grains for gerrit - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for gerrit
..


Assign salt grains for gerrit

Change-Id: I2e61af9cf69648e71c86117bdfd1bfc10c222c46
---
M hieradata/role/common/gerrit/production.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/gerrit/production.yaml 
b/hieradata/role/common/gerrit/production.yaml
index af20d47..98b01a8 100644
--- a/hieradata/role/common/gerrit/production.yaml
+++ b/hieradata/role/common/gerrit/production.yaml
@@ -1,3 +1,6 @@
 admin::groups:
   - gerrit-root
   - gerrit-admin
+debdeploy::grains:
+  debdeploy-gerrit:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index f5c205c..45790a2 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for ci - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for ci
..


Assign salt grains for ci

Change-Id: I669441b5a382ac784cd27de29c2db5595881293a
---
A hieradata/role/common/ci/master.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/ci/master.yaml 
b/hieradata/role/common/ci/master.yaml
new file mode 100644
index 000..d01b266
--- /dev/null
+++ b/hieradata/role/common/ci/master.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-ci:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index f28a5f5..8110f68 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -5,7 +5,7 @@
 [serverlists]
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
-misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard
+misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-deployment:standard, debdeploy-packagebuild:standard, 
debdeploy-racktables:standard, debdeploy-syslog:standard, 
debdeploy-ipv6relay:standard, debdeploy-archiva:standard, 
debdeploy-pmacct:standard, debdeploy-labmon:standard, 
debdeploy-nova-control:standard, debdeploy-bugzilla:standard, 
debdeploy-installserver:standard, debdeploy-xenon:standard, 
debdeploy-icinga:standard, debdeploy-kafkatee:standard, 
debdeploy-gerrit:standard, debdeploy-ganglia:standard, 
debdeploy-db-maintenance:standard, debdeploy-hue:standard, debdeploy-ci:standard
 hadoop-worker = debdeploy-hadoop-worker:standard
 hadoop-worker-canary = debdeploy-hadoop-worker:canary
 hadoop-master = debdeploy-hadoop-master:standard

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

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

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

[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Popups)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: build: Updating development dependencies
..


build: Updating development dependencies

* grunt-contrib-jshint: 0.11.2 → 0.11.3
* grunt-jsonlint: 1.0.4 → 1.0.5

Change-Id: Ide62f02ded3a74b94454fd98d4ca7b9f20470883
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 6627546..26d449e 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
 "grunt": "0.4.5",
 "grunt-banana-checker": "0.4.0",
 "grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
 "grunt-jscs": "2.1.0",
-"grunt-jsonlint": "1.0.4"
+"grunt-jsonlint": "1.0.5"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide62f02ded3a74b94454fd98d4ca7b9f20470883
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add a column to indicate the default on/off status on Specia... - change (mediawiki...Gadgets)

2015-10-26 Thread Niharika29 (Code Review)

Niharika29 has uploaded a new change for review.

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

Change subject: Add a column to indicate the default on/off status on 
Special:GadgetUsage
..

Add a column to indicate the default on/off status on Special:GadgetUsage

Bug: T116393
Change-Id: Iec8a23cd8e7bee25b6bd62d8f67e2ab88b1d2437
---
M SpecialGadgetUsage.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 24 insertions(+), 1 deletion(-)


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

diff --git a/SpecialGadgetUsage.php b/SpecialGadgetUsage.php
index 96cb5b5..790ca0d 100644
--- a/SpecialGadgetUsage.php
+++ b/SpecialGadgetUsage.php
@@ -69,7 +69,7 @@
$html = Html::openElement( 'table', array( 'class' => array( 
'sortable', 'wikitable' ) ) );
$html .= Html::openElement( 'tr', array() );
 
-   $headers = array( 'gadgetusage-gadget', 'gadgetusage-usercount' 
);
+   $headers = array( 'gadgetusage-gadget', 
'gadgetusage-usercount', 'gadgetusage-default-status' );
foreach( $headers as $h ) {
$html .= Html::rawElement( 'th', array(), $this->msg( 
$h )->escaped() );
}
@@ -78,17 +78,38 @@
}
 
/**
+   * Get a list of default gadgets
+   * @return list
+   */
+   protected function getDefaultGadgets() {
+   $gadgets = GadgetRepo::singleton()->getStructuredList();
+   $gadgetsList = [];
+   foreach ( $gadgets as $gadget ) {
+   foreach ( $gadget as $gId => $gTitle ) {
+   if ( $gTitle->isOnByDefault() ) {
+   array_push( $gadgetsList, $gId );
+   }
+   }
+   }
+   return $gadgetsList;
+   }
+
+   /**
 * @param Skin $skin
 * @param object $result Result row
 * @return string bool
 */
public function formatResult( $skin, $result ) {
+   $defaultGadgets = $this->getDefaultGadgets();
$gadgetTitle = wfEscapeWikiText( substr( $result->title, 7 ) );
$gadgetUserCount = $this->getLanguage()->formatNum( 
$result->value );
if ( $gadgetTitle ) {
$html = Html::openElement( 'tr', array() );
$html .=  Html::rawElement( 'td', array(), $gadgetTitle 
);
$html .= Html::rawElement( 'td', array(), 
$gadgetUserCount );
+   $html .= Html::rawElement(
+   'td', array(), in_array( $gadgetTitle, 
$defaultGadgets ) ? 'On' : 'Off'
+   );
$html .= Html::closeElement( 'tr' );
return $html;
}
diff --git a/i18n/en.json b/i18n/en.json
index 4d2a164..1681434 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,6 +11,7 @@
"gadgetusage": "Gadget usage statistics",
"gadgetusage-gadget": "Gadget",
"gadgetusage-usercount": "Number of users",
+   "gadgetusage-default-status": "Default status",
"gadgetusage-noresults": "No gadgets found.",
"gadgetusage-summary": "This table indicates the number of users who 
have enabled each gadget on this wiki. It may include gadgets that are no 
longer available.",
"gadgets-definition": "",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1b75e29..06ef9c2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -22,6 +22,7 @@
"gadgetusage": "{{doc-special|Gadget usage statistics}}",
"gadgetusage-gadget": "Table column header on [[Special:GadgetUsage]]",
"gadgetusage-usercount": "Table column header on 
[[Special:GadgetUsage]]",
+   "gadgetusage-default-status": "Table column header on 
[[Special:GadgetUsage]]",
"gadgetusage-noresults": "Message shown to user when no gadgets found 
installed on the wiki. Used on [[Special:GadgetUsage]]",
"gadgetusage-summary": "Intro text on [[Special:GadgetUsage]]",
"gadgets-definition": "{{notranslate}}",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec8a23cd8e7bee25b6bd62d8f67e2ab88b1d2437
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] Convert ForeignApiRepo::httpGetCached() to the WAN cache - change (mediawiki/core)

2015-10-26 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Convert ForeignApiRepo::httpGetCached() to the WAN cache
..

Convert ForeignApiRepo::httpGetCached() to the WAN cache

Change-Id: I4f1098a6e98570fc4fea6941ffcd64540d6caebd
---
M includes/filerepo/ForeignAPIRepo.php
1 file changed, 8 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/248817/1

diff --git a/includes/filerepo/ForeignAPIRepo.php 
b/includes/filerepo/ForeignAPIRepo.php
index 4ffbf4a..38305dc 100644
--- a/includes/filerepo/ForeignAPIRepo.php
+++ b/includes/filerepo/ForeignAPIRepo.php
@@ -552,19 +552,16 @@
}
 
if ( !isset( $this->mQueryCache[$url] ) ) {
-   global $wgMemc;
-
-   $key = $this->getLocalCacheKey( get_class( $this ), 
$target, md5( $url ) );
-   $data = $wgMemc->get( $key );
+   $data = 
ObjectCache::getMainWANInstance()->getWithSetCallback(
+   $this->getLocalCacheKey( get_class( $this ), 
$target, md5( $url ) ),
+   $cacheTTL,
+   function () use ( $url ) {
+   return ForeignAPIRepo::httpGet( $url );
+   }
+   );
 
if ( !$data ) {
-   $data = self::httpGet( $url );
-
-   if ( !$data ) {
-   return null;
-   }
-
-   $wgMemc->set( $key, $data, $cacheTTL );
+   return null;
}
 
if ( count( $this->mQueryCache ) > 100 ) {

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for db analytics/sanitarium - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for db analytics/sanitarium
..


Assign salt grains for db analytics/sanitarium

Change-Id: I6b0227eba4639cb37a3e28ab1e3d8b1cc8689c32
---
A hieradata/role/common/mariadb/analytics.yaml
A hieradata/role/common/mariadb/sanitarium.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/mariadb/analytics.yaml 
b/hieradata/role/common/mariadb/analytics.yaml
new file mode 100644
index 000..1bb90aa
--- /dev/null
+++ b/hieradata/role/common/mariadb/analytics.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-db-analytics:
+value: standard
diff --git a/hieradata/role/common/mariadb/sanitarium.yaml 
b/hieradata/role/common/mariadb/sanitarium.yaml
new file mode 100644
index 000..a53ec5c
--- /dev/null
+++ b/hieradata/role/common/mariadb/sanitarium.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-db-sanitarium:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 8110f68..602446a 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -51,6 +51,7 @@
 memcached = debdeploy-memcached-codfw:standard, 
debdeploy-memcached-eqiad:standard
 db-parsercache = debdeploy-parsercache:standard
 db-labsdb = debdeploy-labsdb:standard
+db-misc-servers = debdeploy-db-analytics:standard, 
debdeploy-db-sanitarium:standard
 osm = debdeploy-osm-master:standard, debdeploy-osm-slave:standard
 osm-master = debdeploy-osm-master:standard
 osm-slave = debdeploy-osm-slave:standard

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

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

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

[MediaWiki-commits] [Gerrit] Re-adding PyBalConfigurationObserverError - change (operations...pybal)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Re-adding PyBalConfigurationObserverError
..


Re-adding PyBalConfigurationObserverError

It was erroneously removed in I15b39e060384b3b984e78f90875265760a3b123b

Change-Id: I55acc04b0c78f7b317c15270bbf451da3257931a
---
M pybal/config.py
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/pybal/config.py b/pybal/config.py
index d4499ea..3c5b167 100644
--- a/pybal/config.py
+++ b/pybal/config.py
@@ -20,6 +20,10 @@
 from pybal.util import get_subclasses, log
 
 
+class PyBalConfigurationError(Exception):
+pass
+
+
 class ConfigurationObserver(object):
 @classmethod
 def fromUrl(cls, coordinator, configUrl):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I55acc04b0c78f7b317c15270bbf451da3257931a
Gerrit-PatchSet: 5
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] dumps: one more conf file not updated for new path of dblists - change (operations/puppet)

2015-10-26 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: dumps: one more conf file not updated for new path of dblists
..


dumps: one more conf file not updated for new path of dblists

Change-Id: I77af988c3810b7c8855e6bb605275968f2a403b0
---
M modules/snapshot/templates/wq.conf.erb
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/snapshot/templates/wq.conf.erb 
b/modules/snapshot/templates/wq.conf.erb
index 94be118..30e34f3 100644
--- a/modules/snapshot/templates/wq.conf.erb
+++ b/modules/snapshot/templates/wq.conf.erb
@@ -4,9 +4,9 @@
 #
 [wiki]
 mediawiki=<%= scope.lookupvar('snapshot::dirs::apachedir') %>
-allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/all.dblist
-privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/private.dblist
-closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/closed.dblist
+allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/dblists/all.dblist
+privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/dblists/private.dblist
+closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') 
-%>/dblists/closed.dblist
 skipwikislist=<%= scope.lookupvar('snapshot::dirs::wikiqueriesdir') 
-%>/dblists/skip.dblist
 adminsettings=private/PrivateSettings.php
 

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

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

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

[MediaWiki-commits] [Gerrit] Assign salt grains for spark - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for spark
..


Assign salt grains for spark

Change-Id: Id7b378e6a57ebf057f5f391644f226f11f1f7ba9
---
A hieradata/role/common/analytics/spark/worker.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/analytics/spark/worker.yaml 
b/hieradata/role/common/analytics/spark/worker.yaml
new file mode 100644
index 000..4eb118d
--- /dev/null
+++ b/hieradata/role/common/analytics/spark/worker.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-spark-worker:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 7a0ab6b..b3487be 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -84,3 +84,4 @@
 labvirt = debdeploy-nova-compute:standard
 labvirt-canary = debdeploy-nova-compute:canary
 wdqs = debdeploy-wdqs:standard
+spark = debdeploy-spark-worker:standard

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

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

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

[MediaWiki-commits] [Gerrit] dumps: update listing of files for rsync to lastest rsync args - change (operations/puppet)

2015-10-26 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: dumps: update listing of files for rsync to lastest rsync args
..


dumps: update listing of files for rsync to lastest rsync args

rsync 3.01 and on human formats sizes of files and requires
a special option not to do so. e don't want the commas so use
the option.

Change-Id: I36cfd2ebf367c632059ee0ef655f2d3e74c54b06
---
M modules/snapshot/files/dumps/list-last-n-good-dumps.py
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/modules/snapshot/files/dumps/list-last-n-good-dumps.py 
b/modules/snapshot/files/dumps/list-last-n-good-dumps.py
index 566be88..15ac40d 100755
--- a/modules/snapshot/files/dumps/list-last-n-good-dumps.py
+++ b/modules/snapshot/files/dumps/list-last-n-good-dumps.py
@@ -401,8 +401,9 @@
 """produce long listing of files from a specific dump run,
 by passing the file list to rsync --list-only"""
 fpath = self.getAbsOutDirPath(f)
-command = ["/usr/bin/rsync", "--list-only", "--files-from",
-   fpath + ".relpath", self.config.publicDir,
+command = ["/usr/bin/rsync", "--list-only", "--no-h",
+   "--files-from", fpath + ".relpath",
+   self.config.publicDir,
"dummy", ">", fpath + ".rsync"]
 commandString = " ".join(command)
 proc = Popen(commandString, shell=True, stderr=PIPE)

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

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

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

[MediaWiki-commits] [Gerrit] Move the base::firewall include into the impala role - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Move the base::firewall include into the impala role
..


Move the base::firewall include into the impala role

Change-Id: I829a22910f3d15530e4d3a91c4bea6d3290d741e
---
M manifests/role/analytics/impala.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/analytics/impala.pp 
b/manifests/role/analytics/impala.pp
index d4a4ecf..3fef7ae 100644
--- a/manifests/role/analytics/impala.pp
+++ b/manifests/role/analytics/impala.pp
@@ -31,6 +31,7 @@
 #
 class role::analytics::impala::master {
 include role::analytics::impala
+include base::firewall
 
 # The llama-master package stupidly creates the llama user
 # with a non system uid.  This causes our admin module to
diff --git a/manifests/site.pp b/manifests/site.pp
index 26fd0ed..83f3167 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -150,7 +150,6 @@
 include role::analytics::clients
 include role::analytics::impala::master
 include role::logging::udp2log::misc
-include base::firewall
 }
 
 # analytics1027 hosts some frontend web interfaces to Hadoop

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

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

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

[MediaWiki-commits] [Gerrit] Update grunt-jsonlint to 1.0.5 - change (mediawiki/core)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Update grunt-jsonlint to 1.0.5
..


Update grunt-jsonlint to 1.0.5

This is a minor update there were packages updates in this version.

Change-Id: I43cced8c20153d06f764ebba90f64de0431e2d3f
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/package.json b/package.json
index 3ae7b78..209d325 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 "grunt-contrib-jshint": "0.11.3",
 "grunt-contrib-watch": "0.6.1",
 "grunt-jscs": "2.1.0",
-"grunt-jsonlint": "1.0.4",
+"grunt-jsonlint": "1.0.5",
 "grunt-karma": "0.12.1",
 "karma": "0.13.10",
 "karma-chrome-launcher": "0.2.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43cced8c20153d06f764ebba90f64de0431e2d3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Check the statsv limit size before sending metrics - change (performance/WebPageTest)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Check the statsv limit size before sending metrics
..


Check the statsv limit size before sending metrics

Check the current limit of the URL length sent to statsv
and split into multiple request depending on the actual
length.

Bug: T114997
Change-Id: I676500b082e1b0abee6526874316770628c689c3
---
M lib/reporter/statsv.js
1 file changed, 30 insertions(+), 24 deletions(-)

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



diff --git a/lib/reporter/statsv.js b/lib/reporter/statsv.js
index 37c9a14..f9cb188 100644
--- a/lib/reporter/statsv.js
+++ b/lib/reporter/statsv.js
@@ -8,6 +8,22 @@
 'use strict';
 var request = require('request');
 
+var STATSV_MAX_LENGTH = 2000;
+
+function sendMetrics(url, endpoint) {
+console.log('Will send: ' + url);
+request(url, function(error, response, body) { // jshint unused:false
+if (!error) {
+console.log('Succesfully sent metrics.');
+} else {
+// default testing to localhost, then skip error logging
+if (endpoint.indexOf('http://localhost') === -1) {
+console.error(error);
+}
+}
+});
+}
+
 module.exports = {
 /**
  * Validate the input arguments.
@@ -22,7 +38,7 @@
  */
 help: function() {
 console.log('   --endpoint   Where to send the statsv metrics 
' +
-'[https://www.example.com]');
+'[http://localhost]');
 },
 /**
  * Report the metrics by sending them to statsv.
@@ -30,7 +46,7 @@
  * @param {array} argv The input parameters for the run.
  */
 report: function(metrics, argv) {
-var endpoint = argv.endpoint || 'https://www.example.com';
+var endpoint = argv.endpoint || 'http://localhost';
 var flatten = {};
 // flatten the structure
 Object.keys(metrics).forEach(function(type) {
@@ -39,33 +55,23 @@
 });
 });
 
-
-// Lets do something smarter in the future, now
-// cut after 5 keys and send a new request
-var MAX_KEYS_PER_REQUEST = 5;
 var url = endpoint + '?';
-
 var keys = Object.keys(flatten);
+var newUrl;
 for (var i = 0; i < keys.length; i++) {
-
-url += keys[i] + '=' + flatten[keys[i]] + '&';
-// don't send first, and then for each MAX_KEYS_PER_REQUEST
-// and the last time
-if (i !== 0 && i % MAX_KEYS_PER_REQUEST === 0 || (i + 1 === 
flatten.length)) {
+newUrl = url + keys[i] + '=' + flatten[keys[i]] + '&';
+// If the new length is larger that the limit, send what we have
+if (newUrl.length >= STATSV_MAX_LENGTH) {
 url = url.slice(0, -1);
-console.log(url);
-request(url, function(error, response, body) { // jshint 
unused:false
-if (!error) {
-console.log('Succesfully sent metrics.');
-} else {
-// default testing to localhost, then skip error 
logging
-if (endpoint.indexOf('http://localhost') === -1) {
-console.error(error);
-}
-}
-});
-url = endpoint + '?';
+sendMetrics(url, endpoint);
+// Reset base url and add the new one
+url = endpoint + '?' + keys[i] + '=' + flatten[keys[i]] + '&';
+} else {
+url = newUrl;
 }
 }
+// send the last batch of metrics
+url = url.slice(0, -1);
+sendMetrics(url, endpoint);
 }
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I676500b082e1b0abee6526874316770628c689c3
Gerrit-PatchSet: 3
Gerrit-Project: performance/WebPageTest
Gerrit-Branch: master
Gerrit-Owner: Phedenskog 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] LoggerFactory: Only check for Psr\Log\LoggerInterface once - change (mediawiki/core)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: LoggerFactory: Only check for Psr\Log\LoggerInterface once
..


LoggerFactory: Only check for Psr\Log\LoggerInterface once

LoggerFactory::getInstance() will be called many times during the course
of handling a typical MediaWiki request. The interface_exists() guard
condition it uses is an attempt to provide an informative error message
when Composer managed libraries are not installed. This check is only
needed on the first invocation of getInstance() to be effective. Using
an additional boolean to guard the interface_exists() call will allow
the PHP runtime to avoid a potentially expensive (at least compared to
a static boolean comparison) function call.

This is the sort of thing that smells of premature optimization, but its
addition is in fact informed by examination of performance reports from
the Wikimedia production environment.

Bug: T115729
Change-Id: I437bcb5326b06145081f2b86f6c4d0c8dc1a318c
---
M includes/debug/logger/LoggerFactory.php
1 file changed, 16 insertions(+), 12 deletions(-)

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



diff --git a/includes/debug/logger/LoggerFactory.php 
b/includes/debug/logger/LoggerFactory.php
index f1b24e7..92fbb46 100644
--- a/includes/debug/logger/LoggerFactory.php
+++ b/includes/debug/logger/LoggerFactory.php
@@ -94,18 +94,22 @@
 * @return \\Psr\\Log\\LoggerInterface
 */
public static function getInstance( $channel ) {
-   if ( !interface_exists( '\Psr\Log\LoggerInterface' ) ) {
-   $message = (
-   'MediaWiki requires the https://github.com/php-fig/log;>PSR-3 logging ' .
-   "library to be present. This library is not 
embedded directly in MediaWiki's " .
-   "git repository and must be installed 
separately by the end user.\n\n" .
-   'Please see https://www.mediawiki.org/wiki/Download_from_Git' .
-   '#Fetch_external_libraries">mediawiki.org 
for help on installing ' .
-   'the required components.'
-   );
-   echo $message;
-   trigger_error( $message, E_USER_ERROR );
-   die( 1 );
+   static $hasPSR3Interface = null;
+   if ( $hasPSR3Interface === null ) {
+   $hasPSR3Interface = interface_exists( 
'\Psr\Log\LoggerInterface' );
+   if ( !$hasPSR3Interface ) {
+   $message = (
+   'MediaWiki requires the https://github.com/php-fig/log;>PSR-3 logging ' .
+   "library to be present. This 
library is not embedded directly in MediaWiki's " .
+   "git repository and must be installed 
separately by the end user.\n\n" .
+   'Please see https://www.mediawiki.org/wiki/Download_from_Git' .
+   
'#Fetch_external_libraries">mediawiki.org for help on installing ' .
+   'the required components.'
+   );
+   echo $message;
+   trigger_error( $message, E_USER_ERROR );
+   die( 1 );
+   }
}
 
return self::getProvider()->getLogger( $channel );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I437bcb5326b06145081f2b86f6c4d0c8dc1a318c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
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] Remove view source link from beta - change (mediawiki...MobileFrontend)

2015-10-26 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Remove view source link from beta
..

Remove view source link from beta

Note this doesn't address the issue with repeated messages.

Bug: T116654
Change-Id: Icb4a5a583b38f96e9d5dd246bb51802caa46924c
---
M i18n/en.json
M i18n/qqq.json
M includes/skins/SkinMinervaBeta.php
3 files changed, 0 insertions(+), 13 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 68a1e93..02e73c7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -355,7 +355,6 @@
"mobile-frontend-view": "Mobile view",
"mobile-frontend-view-desktop": "Desktop",
"mobile-frontend-view-mobile": "Mobile",
-   "mobile-frontend-view-source": "View source",
"mobile-frontend-watch-login": "Add $1 to your watchlist.",
"mobile-frontend-watchlist-a-z": "List",
"mobile-frontend-watchlist-a-z-empty-howto": "You are not currently 
watching any pages. Your watchlist helps you keep track of the pages that you 
are interested in. Watch pages by tapping the star icon.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4e710fc..92b7988 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -351,7 +351,6 @@
"mobile-frontend-view": "This is a link that appears at the bottom of a 
desktop view wiki page near {{msg-mw|privacy}} and {{msg-mw|disclaimers}}. 
Clicking it takes the user to a mobile view of the page.",
"mobile-frontend-view-desktop": "This is a link that appears at the 
bottom of the mobile page. Clicking it takes the user to the desktop page. It 
appears near the message {{msg-mw|Mobile-frontend-view-mobile}} and should be 
worded similarly.\n{{Identical|Desktop}}",
"mobile-frontend-view-mobile": "This appears at the bottom of the 
mobile page, meaning that the current view is mobile. It appears near the 
message {{msg-mw|Mobile-frontend-view-desktop}} and should be worded 
similarly.\n{{Identical|Mobile}}",
-   "mobile-frontend-view-source": "Link displayed when viewing an old 
revision.\n{{Identical|View source}}",
"mobile-frontend-watch-login": "Shows on [[Special:UserLogin]] when a 
user tries to watch a page whilst anonymous.\n\nParameters:\n* $1 - the page 
that will be watched upon logging in or signing 
up\n{{Related|Mobile-frontend-login}}",
"mobile-frontend-watchlist-a-z": "Label for a button that takes you to 
an A-Z list of all items in your watchlist.\n{{Identical|List}}",
"mobile-frontend-watchlist-a-z-empty-howto": "Message to accompany 
image",
diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index cf1c05e..920da33 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -142,17 +142,6 @@
return $styles;
}
 
-   /**
-* @return html for a message to display at top of old revisions
-*/
-   protected function getOldRevisionHtml() {
-   $viewSourceLink = Html::openElement( 'p' ) .
-   Html::element( 'a', array( 'href' => 
'#editor/0' ),
-   $this->msg( 
'mobile-frontend-view-source' )->text() ) .
-   Html::closeElement( 'p' );
-   return $viewSourceLink . parent::getOldRevisionHtml();
-   }
-
/** @inheritdoc */
protected function preparePageContent( QuickTemplate $tpl ) {
parent::preparePageContent( $tpl );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb4a5a583b38f96e9d5dd246bb51802caa46924c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Convert refreshLinks to use start/endAtomic - change (mediawiki/core)

2015-10-26 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Convert refreshLinks to use start/endAtomic
..

Convert refreshLinks to use start/endAtomic

Bug: T75456
Change-Id: Iad03f6076d8e319ff02cb26259ec9705105e92a7
---
M maintenance/refreshLinks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/249000/1

diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 06e1449..005f52b 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -243,12 +243,12 @@
}
 
$dbw = wfGetDB( DB_MASTER );
-   $dbw->begin( __METHOD__ );
+   $dbw->startAtomic( __METHOD__ );
 
$updates = $content->getSecondaryDataUpdates( $page->getTitle() 
);
DataUpdate::runUpdates( $updates );
 
-   $dbw->commit( __METHOD__ );
+   $dbw->endAtomic( __METHOD__ );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] JavaScriptContentTest: $wgScript != $wgScriptPath - change (mediawiki/core)

2015-10-26 Thread saper (Code Review)

saper has uploaded a new change for review.

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

Change subject: JavaScriptContentTest: $wgScript != $wgScriptPath
..

JavaScriptContentTest: $wgScript != $wgScriptPath

Set $wgScript, $wgScriptPath and $wgResourceBasePath
to avoid failures when running on a wiki with
a non-standard $wgScriptPath.

Reported-on:

https://lists.wikimedia.org/pipermail/wikitech-l/2015-October/083675.html

Change-Id: I8acbcca5449060ff5604bf275f690b53343e706e
---
M tests/phpunit/includes/content/JavaScriptContentTest.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/249004/1

diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php 
b/tests/phpunit/includes/content/JavaScriptContentTest.php
index b97842c..a636e56 100644
--- a/tests/phpunit/includes/content/JavaScriptContentTest.php
+++ b/tests/phpunit/includes/content/JavaScriptContentTest.php
@@ -258,7 +258,9 @@
public function testUpdateRedirect( $oldText, $expectedText ) {
$this->setMwGlobals( array(
'wgServer' => '//example.org',
-   'wgScriptPath' => '/w/index.php',
+   'wgScriptPath' => '/w',
+   'wgScript' => '/w/index.php',
+   'wgResourceBasePath' => '/w',
) );
$target = Title::newFromText( "testUpdateRedirect_target" );
 
@@ -317,7 +319,9 @@
public function testGetRedirectTarget( $title, $text ) {
$this->setMwGlobals( array(
'wgServer' => '//example.org',
-   'wgScriptPath' => '/w/index.php',
+   'wgScriptPath' => '/w',
+   'wgScript' => '/w/index.php',
+   'wgResourceBasePath' => '/w',
) );
$content = new JavaScriptContent( $text );
$target = $content->getRedirectTarget();

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

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

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

[MediaWiki-commits] [Gerrit] Fix cache key construction - change (mediawiki...Flow)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix cache key construction
..


Fix cache key construction

Since I83ea7e7336a1c9e64aa42284c2517089a736efe5,
wfForeignMemcKey( 'a', 'b' ) !== wfForeignMemcKey( 'a:b' )

Changing the way we generate some of the keys
so we read and write with the exact same keys.

Bug: T116582
Change-Id: I0bd52182d771e5cc25aec77428f704a0d102d41f
---
M includes/Repository/MultiGetList.php
M includes/Repository/TreeRepository.php
2 files changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/includes/Repository/MultiGetList.php 
b/includes/Repository/MultiGetList.php
index 7cfca54..93cf04d 100644
--- a/includes/Repository/MultiGetList.php
+++ b/includes/Repository/MultiGetList.php
@@ -22,14 +22,13 @@
}
 
/**
-* @param string $key
+* @param string $treeType
 * @param array $ids
 * @param callable $loadCallback
 * @return array
 * @throws InvalidInputException
 */
-   public function get( $key, array $ids, $loadCallback ) {
-   $key = implode( ':', (array) $key );
+   public function get( $treeType, array $ids, $loadCallback ) {
$cacheKeys = array();
foreach ( $ids as $id ) {
if ( $id instanceof UUID ) {
@@ -40,7 +39,7 @@
} else {
$cacheId = $id;
}
-   $cacheKeys[wfForeignMemcKey( 'flow', '', $key, 
$cacheId, Container::get( 'cache.version' ) )] = $id;
+   $cacheKeys[wfForeignMemcKey( 'flow', '', 'tree', 
$treeType, $cacheId, Container::get( 'cache.version' ) )] = $id;
}
return $this->getByKey( $cacheKeys, $loadCallback );
}
diff --git a/includes/Repository/TreeRepository.php 
b/includes/Repository/TreeRepository.php
index ee262a1..651a094 100644
--- a/includes/Repository/TreeRepository.php
+++ b/includes/Repository/TreeRepository.php
@@ -394,7 +394,7 @@
public function fetchSubtreeNodeList( array $roots ) {
$list = new MultiGetList( $this->cache );
$res = $list->get(
-   array( 'tree', 'subtree' ),
+   'subtree',
$roots,
array( $this, 'fetchSubtreeNodeListFromDb' )
);
@@ -443,7 +443,7 @@
public function fetchParentMap( array $nodes ) {
$list = new MultiGetList( $this->cache );
return $list->get(
-   array( 'tree', 'parent' ),
+   'parent',
$nodes,
array( $this, 'fetchParentMapFromDb' )
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bd52182d771e5cc25aec77428f704a0d102d41f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
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] [WIP] Switch www.wikimedia.org to source control - change (operations/puppet)

2015-10-26 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: [WIP] Switch www.wikimedia.org to source control
..

[WIP] Switch www.wikimedia.org to source control

Change-Id: Ifb29e7d0f75425c0385a9e94565bad1680eb918d
Dependency: I65da92508264010c6ba3a7dff6ca809a6c367ec2
Bug: T115964
---
M modules/mediawiki/files/apache/sites/wikimedia.conf
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/249009/1

diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf 
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index c5dd463..2eca37e 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -128,7 +128,10 @@
 RewriteRule . - [E=RW_PROTO:http]
 
 # Main page portal
-RewriteRule ^/$ /w/extract2.php?template=Www.wikimedia.org_template [L]
+RewriteRule ^/$ /portal/prod/wikimedia.org/index.html [L]
+
+Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+
 
 # Redirects for country portals from the old URLs
 RewriteRule ^/ch-portal/?$ http://wikipedia.ch/ [R=301,L]

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

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

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

[MediaWiki-commits] [Gerrit] Initial commit - change (RunningStat)

2015-10-26 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Initial commit
..

Initial commit

Change-Id: I236c2b807f1f689c67d303d60d92c7a49001c169
---
A .editorconfig
A .gitattributes
A .gitignore
A .travis.yml
A COPYING
A Doxyfile
A README.md
A composer.json
A phpcs.xml
A phpunit.xml.dist
A src/RunningStat.php
A tests/RunningStatTest.php
12 files changed, 796 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/RunningStat refs/changes/13/249013/1

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..42aefb6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = tab
+
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..b6fe658
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,10 @@
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.gitreview export-ignore
+.travis.yml export-ignore
+Doxyfile export-ignore
+composer.json export-ignore
+phpcs.xml export-ignore
+phpunit.xml.dist export-ignore
+tests/ export-ignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c760786
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/coverage
+/doc
+/vendor
+/composer.lock
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..c25a516
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+sudo: false
+language: php
+php:
+  - "5.3.3"
+  - "5.3"
+  - "5.4"
+  - "5.5"
+  - "5.6"
+  - "hhvm"
+install:
+  - composer install
+script:
+  - composer test
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..019694a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,342 @@
+== GNU GENERAL PUBLIC LICENSE ==
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+=== Preamble ===
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ==
+
+'''0.''' This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)

2015-10-26 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

203c8bd Remebmer appeal, make RapidHTML use configurable default
cec57e1 Localisation updates from https://translatewiki.net.
4382946 Stage risk_score before signature

Change-Id: I3ea2f02d3dcec3386c5d11b13f6de8c779d21459
---
D tests/DonationDataTest.php
D tests/MustacheFormTest.php
2 files changed, 0 insertions(+), 579 deletions(-)


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

diff --git a/tests/DonationDataTest.php b/tests/DonationDataTest.php
deleted file mode 100644
index 001e882..000
--- a/tests/DonationDataTest.php
+++ /dev/null
@@ -1,398 +0,0 @@
-<<< HEAD   (1a11fa Merge branch 'master' into deployment)
-===
-testAdapterClass = $adapterclass;
-
-   parent::__construct( $name, $data, $dataName );
-
-   $this->testData = array(
-   'amount' => '128.00',
-   'appeal' => 'JimmyQuote',
-   'email' => 'unitt...@example.com',
-   'fname' => 'Testocres',
-   'lname' => 'McTestingyou',
-   'street' => '123 Fake Street',
-   'city' => 'Springfield',
-   'state' => 'US',
-   'zip' => '9',
-   'country' => 'US',
-   'card_num' => '42',
-   'card_type' => 'visa',
-   'expiration' => '1138',
-   'cvv' => '665',
-   'currency_code' => 'USD',
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   'numAttempt' => '5',
-   'referrer' => 'http://www.testing.com/',
-   'utm_source' => '..cc',
-   'utm_medium' => 'large',
-   'utm_campaign' => 'yes',
-   'email-opt' => '',
-   'test_string' => '',
-   'token' => '113811',
-   'contribution_tracking_id' => '',
-   'data_hash' => '',
-   'action' => '',
-   'gateway' => 'DonationData',
-   'owa_session' => '',
-   'owa_ref' => 'http://localhost/importedTestData',
-   'user_ip' => $wgRequest->getIP(),
-   'server_ip' => $wgRequest->getIP(),
-   );
-
-   }
-
-
-   /**
-* @covers DonationData::__construct
-* @covers DonationData::getDataEscaped
-* @covers DonationData::populateData
-*/
-   public function testConstruct(){
-   global $wgLanguageCode, $wgRequest;
-
-   $ddObj = new DonationData( $this->getFreshGatewayObject( 
self::$initial_vars ) ); //as if we were posted.
-   $returned = $ddObj->getDataEscaped();
-   $expected = array(  'posted' => '',
-   'amount' => '0.00',
-   'appeal' => 'JimmyQuote',
-   'country' => 'XX',
-   'payment_method' => '',
-   'referrer' => '',
-   'utm_source' => '..',
-   'language' => $wgLanguageCode,
-   'gateway' => 'globalcollect',
-   'payment_submethod' => '',
-   'recurring' => '',
-   'user_ip' => $wgRequest->getIP(),
-   'server_ip' => $wgRequest->getIP(),
-   );
-   unset($returned['contribution_tracking_id']);
-   unset($returned['order_id']);
-   $this->assertEquals($expected, $returned, "Staged post data 
does not match expected (largely empty).");
-   }
-
-   /**
-* Test construction with external data (for tests and possible batch 
operations)
-*/
-   public function testConstructWithExternalData() {
-   global $wgRequest;
-
-   $expected = array (
-   'amount' => '35.00',
-   'appeal' => 'JimmyQuote',
-   'email' => 'testingd...@wikimedia.org',
-   'fname' => 'Tester',
-   'lname' => 'Testington',
-   'street' => '548 Market St.',
-   'city' => 'San Francisco',
-   'state' => 'CA',
-   'zip' => '94104',
-   'country' => 'US',
-   'card_num' => '378282246310005',
-   'card_type' => 'amex',
-   'expiration' => '0415',
-

[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)

2015-10-26 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

203c8bd Remebmer appeal, make RapidHTML use configurable default
cec57e1 Localisation updates from https://translatewiki.net.
4382946 Stage risk_score before signature

Change-Id: I3ea2f02d3dcec3386c5d11b13f6de8c779d21459
---
D tests/DonationDataTest.php
D tests/MustacheFormTest.php
2 files changed, 0 insertions(+), 579 deletions(-)

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



diff --git a/tests/DonationDataTest.php b/tests/DonationDataTest.php
deleted file mode 100644
index 001e882..000
--- a/tests/DonationDataTest.php
+++ /dev/null
@@ -1,398 +0,0 @@
-<<< HEAD   (1a11fa Merge branch 'master' into deployment)
-===
-testAdapterClass = $adapterclass;
-
-   parent::__construct( $name, $data, $dataName );
-
-   $this->testData = array(
-   'amount' => '128.00',
-   'appeal' => 'JimmyQuote',
-   'email' => 'unitt...@example.com',
-   'fname' => 'Testocres',
-   'lname' => 'McTestingyou',
-   'street' => '123 Fake Street',
-   'city' => 'Springfield',
-   'state' => 'US',
-   'zip' => '9',
-   'country' => 'US',
-   'card_num' => '42',
-   'card_type' => 'visa',
-   'expiration' => '1138',
-   'cvv' => '665',
-   'currency_code' => 'USD',
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   'numAttempt' => '5',
-   'referrer' => 'http://www.testing.com/',
-   'utm_source' => '..cc',
-   'utm_medium' => 'large',
-   'utm_campaign' => 'yes',
-   'email-opt' => '',
-   'test_string' => '',
-   'token' => '113811',
-   'contribution_tracking_id' => '',
-   'data_hash' => '',
-   'action' => '',
-   'gateway' => 'DonationData',
-   'owa_session' => '',
-   'owa_ref' => 'http://localhost/importedTestData',
-   'user_ip' => $wgRequest->getIP(),
-   'server_ip' => $wgRequest->getIP(),
-   );
-
-   }
-
-
-   /**
-* @covers DonationData::__construct
-* @covers DonationData::getDataEscaped
-* @covers DonationData::populateData
-*/
-   public function testConstruct(){
-   global $wgLanguageCode, $wgRequest;
-
-   $ddObj = new DonationData( $this->getFreshGatewayObject( 
self::$initial_vars ) ); //as if we were posted.
-   $returned = $ddObj->getDataEscaped();
-   $expected = array(  'posted' => '',
-   'amount' => '0.00',
-   'appeal' => 'JimmyQuote',
-   'country' => 'XX',
-   'payment_method' => '',
-   'referrer' => '',
-   'utm_source' => '..',
-   'language' => $wgLanguageCode,
-   'gateway' => 'globalcollect',
-   'payment_submethod' => '',
-   'recurring' => '',
-   'user_ip' => $wgRequest->getIP(),
-   'server_ip' => $wgRequest->getIP(),
-   );
-   unset($returned['contribution_tracking_id']);
-   unset($returned['order_id']);
-   $this->assertEquals($expected, $returned, "Staged post data 
does not match expected (largely empty).");
-   }
-
-   /**
-* Test construction with external data (for tests and possible batch 
operations)
-*/
-   public function testConstructWithExternalData() {
-   global $wgRequest;
-
-   $expected = array (
-   'amount' => '35.00',
-   'appeal' => 'JimmyQuote',
-   'email' => 'testingd...@wikimedia.org',
-   'fname' => 'Tester',
-   'lname' => 'Testington',
-   'street' => '548 Market St.',
-   'city' => 'San Francisco',
-   'state' => 'CA',
-   'zip' => '94104',
-   'country' => 'US',
-   'card_num' => '378282246310005',
-   'card_type' => 'amex',
-   'expiration' => '0415',
-   'cvv' => '001',
-   'currency_code' => 'USD',

[MediaWiki-commits] [Gerrit] Add hack to make VE education popups go away - change (mediawiki...Flow)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Add hack to make VE education popups go away
..


Add hack to make VE education popups go away

Doing this properly requires support in VE,
see T116659.

Bug: T116643
Change-Id: I19fea33eff927eb0e09e6ec852c56120eb63c7a0
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.js
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js 
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
index 159ef2f..0c82ca5 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
@@ -16,6 +16,9 @@
this,
{ toolbarConfig: { floatable: false } }
);
+
+   // HACK: stop VE's education popups from appearing (T116643)
+   this.dummyToolbar = true;
};
 
OO.inheritClass( mw.flow.ve.Target, ve.init.sa.DesktopTarget );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19fea33eff927eb0e09e6ec852c56120eb63c7a0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Commit RunningStat job configuration - change (integration/config)

2015-10-26 Thread jenkins-bot (Code Review)

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

Change subject: Commit RunningStat job configuration
..


Commit RunningStat job configuration

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 502f54c..aed9ad6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7825,6 +7825,12 @@
 postmerge:
   - phpunit-coverage-publish
 
+  - name: RunningStat
+template:
+  - name: composer-test-package
+postmerge:
+  - phpunit-coverage-publish
+
   - name: IPSet
 template:
  - name: composer-test-package

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22643acf949a216fbd1c7d9fe94b071d54adc8c0
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Handle lack of Title obj when running from script - change (mediawiki...ZeroPortal)

2015-10-26 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Handle lack of Title obj when running from script
..

Handle lack of Title obj when running from script

Bug: T76078
Change-Id: Ibcdba8eafe246a69059c0f0a0ce6157c98e3ecfb
---
M includes/ZeroConfigView.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroPortal 
refs/changes/19/249019/1

diff --git a/includes/ZeroConfigView.php b/includes/ZeroConfigView.php
index 9e80c32..c12a2c1 100644
--- a/includes/ZeroConfigView.php
+++ b/includes/ZeroConfigView.php
@@ -174,7 +174,8 @@
array_merge( $langs, array_flip( 
$cfg->whitelistedLangs ) );
}
 
-   $configXcs = $wgOut->getTitle()->getRootText();
+   $title = $wgOut->getTitle();
+   $configXcs = $title ? $title->getRootText() : '000-00';
 
$sites = $configsData[0]->sites;
$bannerSubdomain = !$sites || in_array( 'm.wikipedia', $sites ) 
? 'm' : 'zero';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcdba8eafe246a69059c0f0a0ce6157c98e3ecfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroPortal
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] admin: hoo and jzerebecki for wdqs admins - change (operations/puppet)

2015-10-26 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: admin: hoo and jzerebecki for wdqs admins
..

admin: hoo and jzerebecki for wdqs admins

Bug:T116702
Change-Id: I965024137ff64e75bdb448e8a0714774a073520f
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 8fdf6ec..96ebc4f 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -362,7 +362,7 @@
   wdqs-admins:
 gid: 755
 description: Admins for the WikiData Query Service project
-members: [smalyshev]
+members: [smalyshev, hoo, jzerebecki]
 privileges: ['ALL = NOPASSWD: /usr/sbin/service wdqs-blazegraph *',
  'ALL = NOPASSWD: /usr/sbin/service wdqs-updater *',
  'ALL = (blazegraph) NOPASSWD: ALL',

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

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

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

1 2 3 4 5 >

1 - 100 of 456 matches

Mail list logo