date:20150311

[MediaWiki-commits] [Gerrit] Get rid of some lifecyclehandlers in container-test.php - change (mediawiki...Flow)

2015-03-11 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Get rid of some lifecyclehandlers in container-test.php
..

Get rid of some lifecyclehandlers in container-test.php

We used to do this in PostRevisionTestCase.php, but that
doesn't seem like an appropriate place to put it.

Also, the way we used to do this was by checking for the
listener to be of a certain class. The NotificationListener,
however, had been wrapped in a DeferredInsertLifecycleHandler
so that check was no longer valid.

Bug: T89691
Change-Id: Icbe18fb0becbe0d289ffdc1e03a716398915da2f
---
M container-test.php
M container.php
M tests/phpunit/Collection/PostCollectionTest.php
M tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
M tests/phpunit/LinksTableTest.php
M tests/phpunit/PostRevisionTestCase.php
6 files changed, 51 insertions(+), 57 deletions(-)


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

diff --git a/container-test.php b/container-test.php
index 087627b..fe57cf3 100644
--- a/container-test.php
+++ b/container-test.php
@@ -13,4 +13,31 @@
-method( 'validate' )
-will( $testCase-returnValue( Status::newGood() ) );
 
+
+foreach( array_unique( $container['storage.manager_list'] ) as $key ) {
+   if ( !isset( $container[$key.listeners] ) ) {
+   continue;
+   }
+
+   $c-extend( $key.listeners, function( $listeners ) use ( $key ) {
+   return array_filter(
+   $listeners,
+   function( $listener ) {
+   return !in_array( $listener, array(
+   // putting together the right metadata 
for a commit is beyond the
+   // scope of these tests
+   'storage.post.listeners.notification',
+   // Recent changes logging is outside 
the scope of tests, and
+   // causes interaction issues
+   'listener.recentchanges',
+   // BoardHistory requires we also wire 
together TopicListEntry objects for
+   // each revision, but that's also 
beyond our scope.
+   'storage.board_history.indexes.primary',
+   ));
+   },
+   ARRAY_FILTER_USE_KEY
+   );
+   } );
+}
+
 return $container;
diff --git a/container.php b/container.php
index 5f9daf2..0f65e4b 100644
--- a/container.php
+++ b/container.php
@@ -199,9 +199,9 @@
 };
 $c['storage.workflow.listeners'] = function( $c ) {
return array(
-   $c['listener.occupation'],
-   $c['listener.url_generator'],
-   $c['storage.workflow.listeners.topiclist'],
+   'listener.occupation' = $c['listener.occupation'],
+   'listener.url_generator' = $c['listener.url_generator'],
+   'storage.workflow.listeners.topiclist' = 
$c['storage.workflow.listeners.topiclist'],
);
 };
 $c['storage.workflow'] = function( $c ) {
@@ -306,11 +306,11 @@
 };
 $c['storage.header.listeners'] = function( $c ) {
return array(
-   $c['reference.recorder'],
-   $c['storage.board_history.indexes.primary'],
-   $c['storage.header.listeners.username'],
-   $c['listener.recentchanges'],
-   $c['listener.editcount'],
+   'reference.recorder' = $c['reference.recorder'],
+   'storage.board_history.indexes.primary' = 
$c['storage.board_history.indexes.primary'],
+   'storage.header.listeners.username' = 
$c['storage.header.listeners.username'],
+   'listener.recentchanges' = $c['listener.recentchanges'],
+   'listener.editcount' = $c['listener.editcount'],
);
 };
 $c['storage.header.primary_key'] = array( 'rev_id' );
@@ -385,15 +385,15 @@
 };
 $c['storage.post_summary.listeners'] = function( $c ) {
return array(
-   $c['listener.recentchanges'],
-   $c['storage.post_summary.listeners.username'],
-   $c['storage.board_history.indexes.primary'],
-   $c['listener.editcount'],
+   'listener.recentchanges' = $c['listener.recentchanges'],
+   'storage.post_summary.listeners.username' = 
$c['storage.post_summary.listeners.username'],
+   'storage.board_history.indexes.primary' = 
$c['storage.board_history.indexes.primary'],
+   'listener.editcount' = $c['listener.editcount'],
// topic history -- to keep a history by topic we have to know 
what topic every post
// belongs to, not just its parent.

[MediaWiki-commits] [Gerrit] Follow-up 02923f694630: fix submodule - change (mediawiki...VisualEditor)

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

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

Change subject: Follow-up 02923f694630: fix submodule
..


Follow-up 02923f694630: fix submodule

Was branched off of the wrong point.

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

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



diff --git a/lib/ve b/lib/ve
index bc8b388..ecd7944 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit bc8b38893c72a09428dc44a2ca66b8017e733f62
+Subproject commit ecd7944f3a4a29a784a89e3dd2e5d0133cc1e805

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb8eccf9577302f671951988a4c3334a5111d3a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
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 'interface_editor' to 'interface-editor' at ckbwiki - change (operations/mediawiki-config)

2015-03-11 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Update 'interface_editor' to 'interface-editor' at ckbwiki
..

Update 'interface_editor' to 'interface-editor' at ckbwiki

Follow up on I35334f38ec3eb99a435930714f2ede99703fa4f9.
abusefilter config wasn't updated for ckbwiki.

Bug: T85731
Change-Id: Idc195c409fe23b550b6af9549370d81b1acfedcd
---
M wmf-config/abusefilter.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index 97897af..c0a3691 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -59,7 +59,7 @@
$wgAbuseFilterNotifications = false;
$wgGroupPermissions['autoconfirmed']['abusefilter-view'] = true;
$wgGroupPermissions['autoconfirmed']['abusefilter-log'] = true;
-   $wgGroupPermissions['interface_editor']['abusefilter-modify'] = 
true;
+   $wgGroupPermissions['interface-editor']['abusefilter-modify'] = 
true;
$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true;
$wgGroupPermissions['sysop']['abusefilter-revert'] = true;
$wgGroupPermissions['sysop']['abusefilter-view-private'] = true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc195c409fe23b550b6af9549370d81b1acfedcd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Glaisher glaisher.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e68e3d7..5362d4d - change (mediawiki/extensions)

2015-03-11 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: e68e3d7..5362d4d
..


Syncronize VisualEditor: e68e3d7..5362d4d

Change-Id: I0710d01a6113f093b935183de1bec9f60da3699e
---
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 e68e3d7..5362d4d 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e68e3d70fb012edc1469e6ef8491bf134605343a
+Subproject commit 5362d4d98361e8ffb8672d25cac6a825fc2755f1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0710d01a6113f093b935183de1bec9f60da3699e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revert Made JobQueueFederated no longer need checkDelay f... - change (mediawiki/core)

2015-03-11 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Revert Made JobQueueFederated no longer need checkDelay for 
delaying
..

Revert Made JobQueueFederated no longer need checkDelay for delaying

Breaks Cirrus and Wikibase

This reverts commit c8f96384aad312e52969b81dd8ce6b8d80c3857a.

Change-Id: I15278d52806bf30d6ea6c6b9eb8586160f65c42b
---
M includes/jobqueue/JobQueue.php
M includes/jobqueue/JobQueueRedis.php
2 files changed, 21 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/195953/1

diff --git a/includes/jobqueue/JobQueue.php b/includes/jobqueue/JobQueue.php
index 0492954..1a730d3 100644
--- a/includes/jobqueue/JobQueue.php
+++ b/includes/jobqueue/JobQueue.php
@@ -44,6 +44,9 @@
/** @var int Maximum number of times to try a job */
protected $maxTries;
 
+   /** @var bool Allow delayed jobs */
+   protected $checkDelay;
+
/** @var BagOStuff */
protected $dupCache;
/** @var JobQueueAggregator */
@@ -69,6 +72,10 @@
}
if ( !in_array( $this-order, $this-supportedOrders() ) ) {
throw new MWException( __CLASS__ .  does not support 
'{$this-order}' order. );
+   }
+   $this-checkDelay = !empty( $params['checkDelay'] );
+   if ( $this-checkDelay  !$this-supportsDelayedJobs() ) {
+   throw new MWException( __CLASS__ .  does not support 
delayed jobs. );
}
$this-dupCache = wfGetCache( CACHE_ANYTHING );
$this-aggr = isset( $params['aggregator'] )
@@ -96,6 +103,10 @@
 *  but not acknowledged as completed after this many 
seconds. Recycling
 *  of jobs simple means re-inserting them into the 
queue. Jobs can be
 *  attempted up to three times before being discarded.
+*   - checkDelay : If supported, respect Job::getReleaseTimestamp() in 
the push functions.
+*  This lets delayed jobs wait in a staging area until 
a given timestamp is
+*  reached, at which point they will enter the queue. 
If this is not enabled
+*  or not supported, an exception will be thrown on 
delayed job insertion.
 *
 * Queue classes should throw an exception if they do not support the 
options given.
 *
@@ -135,6 +146,14 @@
 */
final public function getOrder() {
return $this-order;
+   }
+
+   /**
+* @return bool Whether delayed jobs are enabled
+* @since 1.22
+*/
+   final public function delayedJobsEnabled() {
+   return $this-checkDelay;
}
 
/**
@@ -307,7 +326,7 @@
if ( $job-getType() !== $this-type ) {
throw new MWException(
Got '{$job-getType()}' job; expected 
a '{$this-type}' job. );
-   } elseif ( $job-getReleaseTimestamp()  
!$this-supportsDelayedJobs() ) {
+   } elseif ( $job-getReleaseTimestamp()  
!$this-checkDelay ) {
throw new MWException(
Got delayed '{$job-getType()}' job; 
delays are not supported. );
}
diff --git a/includes/jobqueue/JobQueueRedis.php 
b/includes/jobqueue/JobQueueRedis.php
index d9fe30b..243fec9 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -93,6 +93,7 @@
Non-daemonized mode is no longer supported. 
Please install the  .
mediawiki/services/jobrunner service and 
update \$wgJobTypeConf as needed. );
}
+   $this-checkDelay = true; // always enabled
}
 
protected function supportedOrders() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15278d52806bf30d6ea6c6b9eb8586160f65c42b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Change string used by extension to identify itself - change (mediawiki...Citoid)

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

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

Change subject: Change string used by extension to identify itself
..


Change string used by extension to identify itself

Change ve.ui.CiteFromIdInspector.static.templateDataName
from a string identifying the path to the more general
string 'citoid', which is used as a key in TemplateData
to identify the appropriate Map in the 'maps' object.

Change-Id: I8cc6b10e4e34f878c09f7290b2adefa159dc7c08
---
M modules/ve.ui.CiteFromIdInspector.js
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/modules/ve.ui.CiteFromIdInspector.js 
b/modules/ve.ui.CiteFromIdInspector.js
index 23d7d58..df4b690 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -34,9 +34,7 @@
 ve.ui.CiteFromIdInspector.static.size = 'large';
 
 // The string used in TemplateData to identify the correct Map object
-
-// TODO: Replace this to a more general string Citoid
-ve.ui.CiteFromIdInspector.static.templateDataName = 
'extension/Citoid/ve.ui.CiteFromIDDialog';
+ve.ui.CiteFromIdInspector.static.templateDataName = 'citoid';
 
 // The requested format from the citoid client, passed as a GET parameter
 ve.ui.CiteFromIdInspector.static.citoidFormat = 'mediawiki';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8cc6b10e4e34f878c09f7290b2adefa159dc7c08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz mv...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] TDG: Support optional text of 'deprecated' property - change (mediawiki...TemplateData)

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

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

Change subject: TDG: Support optional text of 'deprecated' property
..


TDG: Support optional text of 'deprecated' property

The deprecated property allows for either a boolean or text, so we
should allow the user to insert guidance text in case that property
is true. To achieve that, the model also defines 'textValue' for
boolean properties with text representation so an internal property can
be set to hold that value and inputs can be automatically built from the
property structure.

Bug: T90734
Change-Id: Iadc6abdcc0cf2721a311cf43847b306cb269b5e8
---
M TemplateData.php
M i18n/en.json
M i18n/qqq.json
M modules/ext.templateDataGenerator.data.js
M modules/ext.templateDataGenerator.ui.tdDialog.js
M tests/ext.templateData.tests.js
6 files changed, 105 insertions(+), 15 deletions(-)

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



diff --git a/TemplateData.php b/TemplateData.php
index 8b361c2..66cebbc 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -129,6 +129,7 @@
'templatedata-modal-table-param-autovalue',
'templatedata-modal-table-param-default',
'templatedata-modal-table-param-deprecated',
+   'templatedata-modal-table-param-deprecatedValue',
'templatedata-modal-table-param-description',
'templatedata-modal-table-param-importoption',
'templatedata-modal-table-param-importoption-subtitle',
diff --git a/i18n/en.json b/i18n/en.json
index 2cd1741..042cbb3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -62,6 +62,7 @@
templatedata-modal-table-param-autovalue: Auto value,
templatedata-modal-table-param-default: Default,
templatedata-modal-table-param-deprecated: Deprecated,
+   templatedata-modal-table-param-deprecatedValue: Deprecated guidance,
templatedata-modal-table-param-description: Description ($1),
templatedata-modal-table-param-importoption: Add $1 suggested 
{{PLURAL:$1|parameter|parameters}},
templatedata-modal-table-param-importoption-subtitle: Including: $1,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b57367b..0b75c73 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -69,6 +69,7 @@
templatedata-modal-table-param-autovalue: Label for a parameter 
property input: Parameter auto value in the table,
templatedata-modal-table-param-default: Label for a parameter 
property input: Default value of the parameter.\n{{Identical|Default}},
templatedata-modal-table-param-deprecated: Label for a parameter 
property input: Deprecated status of the parameter.\n{{Identical|Deprecated}},
+   templatedata-modal-table-param-deprecatedValue: Label for a 
parameter property input: Deprecated guidance of the parameter.,
templatedata-modal-table-param-description: Label for a parameter 
property input: Description of the parameter. $1 - currently showing 
language.\n{{Identical|Description}},
templatedata-modal-table-param-importoption: Label for the import 
option in the parameter list in the edit dialog. $1 - number of suggested 
parameters that can be imported.,
templatedata-modal-table-param-importoption-subtitle: A list of 
suggested parameter names in the import option in the parameter list in the 
edit dialog. $1 - list (or partial list) of suggested parameter names to 
import.\n{{Identical|Including}},
diff --git a/modules/ext.templateDataGenerator.data.js 
b/modules/ext.templateDataGenerator.data.js
index 7e3f85b..51da0fe 100644
--- a/modules/ext.templateDataGenerator.data.js
+++ b/modules/ext.templateDataGenerator.data.js
@@ -186,7 +186,14 @@
type: 'string'
},
deprecated: {
-   type: 'boolean'
+   type: 'boolean',
+   // This should only be defined for boolean properties.
+   // Define the property that represents the text value.
+   textValue: 'deprecatedValue'
+   },
+   deprecatedValue: {
+   type: 'string',
+   changesBooleanValue: 'deprecated'
},
required: {
type: 'boolean'
@@ -520,11 +527,12 @@
  * @return {boolean} Parameter was added successfully
  */
 mw.TemplateData.Model.prototype.addParam = function ( key, paramData ) {
-   var prop, name, lang,
+   var prop, name, lang, propToSet,
existingNames = this.getAllParamNames(),
data = $.extend( true, {}, paramData ),
language = this.getDefaultLanguage(),
-   propertiesWithLanguage = 
this.constructor.static.getPropertiesWithLanguage();
+   propertiesWithLanguage = 
this.constructor.static.getPropertiesWithLanguage(),
+

[MediaWiki-commits] [Gerrit] Update JSDuck config to standard jsduck.json - change (mediawiki...VisualEditor)

2015-03-11 Thread Krinkle (Code Review)

Krinkle has submitted this change and it was merged.

Change subject: Update JSDuck config to standard jsduck.json
..


Update JSDuck config to standard jsduck.json

Also
* This way we don't need to pass the --config=jsduck.config.json
  parameter but can run plain 'jsduck' in Jenkins. Allowing it
  to use the standard job template for testing.

* Move processes=0 to jsduck.json.
  Workaround for https://github.com/senchalabs/jsduck/issues/525

* Use standard ' - Documentation' suffix, which makes the first
  part of the title render in bold (similar to how we do in OOjs
  and OOjs UI already).

Change-Id: I6c9c7a1f29df0a72dc8cd0d37a83aaef23068062
(cherry picked from commit 5813d5327158a33befec26a8eb3ebbf119525e23)
---
D .docs/config.json
R .jsduck/CustomTags.rb
R .jsduck/categories.json
R .jsduck/eg-iframe.html
R .jsduck/eg-iframe.html.template
R .jsduck/external.js
R .jsduck/generate.sh
R .jsduck/mw-categories.json
M Gruntfile.js
M bin/generateDocs.sh
A jsduck.json
11 files changed, 30 insertions(+), 33 deletions(-)

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



diff --git a/.docs/config.json b/.docs/config.json
deleted file mode 100644
index 81a5751..000
--- a/.docs/config.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-   --title: VisualEditor Code Documentation,
-   --categories: ../.docs/categories.json,
-   --eg-iframe: ../.docs/eg-iframe.html,
-   --tags: ./CustomTags.rb,
-   --warnings: [-nodoc(class,public)],
-   --builtin-classes: true,
-   --warnings-exit-nonzero: true,
-   --external: 
HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,
-   --output: ../docs,
-   --: [
-   ./external.js,
-   ../lib/ve/.jsduck/external.js,
-   ../lib/ve/lib/oojs,
-   ../lib/ve/lib/oojs-ui,
-   ../lib/ve/lib/unicodejs,
-   ../lib/ve/src,
-   ../lib/ve/tests,
-   ../modules/ve-mw
-   ]
-}
diff --git a/.docs/CustomTags.rb b/.jsduck/CustomTags.rb
similarity index 100%
rename from .docs/CustomTags.rb
rename to .jsduck/CustomTags.rb
diff --git a/.docs/categories.json b/.jsduck/categories.json
similarity index 100%
rename from .docs/categories.json
rename to .jsduck/categories.json
diff --git a/.docs/eg-iframe.html b/.jsduck/eg-iframe.html
similarity index 100%
rename from .docs/eg-iframe.html
rename to .jsduck/eg-iframe.html
diff --git a/.docs/eg-iframe.html.template b/.jsduck/eg-iframe.html.template
similarity index 100%
rename from .docs/eg-iframe.html.template
rename to .jsduck/eg-iframe.html.template
diff --git a/.docs/external.js b/.jsduck/external.js
similarity index 100%
rename from .docs/external.js
rename to .jsduck/external.js
diff --git a/.docs/generate.sh b/.jsduck/generate.sh
similarity index 100%
rename from .docs/generate.sh
rename to .jsduck/generate.sh
diff --git a/.docs/mw-categories.json b/.jsduck/mw-categories.json
similarity index 100%
rename from .docs/mw-categories.json
rename to .jsduck/mw-categories.json
diff --git a/Gruntfile.js b/Gruntfile.js
index 9618290..6c369d1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,9 +20,9 @@
pkg: grunt.file.readJSON( 'package.json' ),
jsduckcatconfig: {
main: {
-   target: '.docs/categories.json',
+   target: '.jsduck/categories.json',
from: [
-   '.docs/mw-categories.json',
+   '.jsduck/mw-categories.json',
{
file: 
'lib/ve/.jsduck/categories.json',
aggregate: {
@@ -42,8 +42,8 @@
},
buildloader: {
egiframe: {
-   targetFile: '.docs/eg-iframe.html',
-   template: '.docs/eg-iframe.html.template',
+   targetFile: '.jsduck/eg-iframe.html',
+   template: '.jsduck/eg-iframe.html.template',
modules: modules,
load: [ 'visualEditor.desktop.standalone' ],
pathPrefix: 'lib/ve/',
@@ -56,7 +56,7 @@
},
all: [
'*.js',
-   '{.docs,build}/**/*.js',
+   '{.jsduck,build}/**/*.js',
'modules/**/*.js'
]
},
diff --git a/bin/generateDocs.sh b/bin/generateDocs.sh
index 5cf9422..eeba646 100755
--- a/bin/generateDocs.sh
+++ b/bin/generateDocs.sh
@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 set -e
-
-REPO_DIR=$(cd

[MediaWiki-commits] [Gerrit] Adapt bin/refinery-drop-webrequest-partitions to work with r... - change (analytics/refinery)

2015-03-11 Thread Joal (Code Review)

Joal has submitted this change and it was merged.

Change subject: Adapt bin/refinery-drop-webrequest-partitions to work with 
refined table
..


Adapt bin/refinery-drop-webrequest-partitions to work with refined table

I made a good pass at making this script configurable enough to work
with many possible partition layouts, but this got more complicated
the more I tried.  I decided to just add a --webrequest-type flag
and hardcode the needed regexes and globs in order to parse
Hive partition path layouts into datetimes for both the
refined and raw webrequest tables.

Bug: T89257
Change-Id: Ia5d724120511b9d55f577cb2b8512cc482c69622
---
M bin/refinery-drop-webrequest-partitions
M python/refinery/util.py
M python/tests/test_refinery/test_util.py
3 files changed, 86 insertions(+), 43 deletions(-)

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



diff --git a/bin/refinery-drop-webrequest-partitions 
b/bin/refinery-drop-webrequest-partitions
index 542bef6..70c976c 100755
--- a/bin/refinery-drop-webrequest-partitions
+++ b/bin/refinery-drop-webrequest-partitions
@@ -29,6 +29,7 @@
 -t --table=table  Name of webrequest table.  [default: 
webrequest]
 -l --location=locationBase HDFS location path of the 
webrequest table.  If not
 specified, this will be inferred from 
the table schema metadata.
+-w --webrequest-type=type Either 'raw' or 'refined'.  [default: 
raw]
 -o --hive-options=options Any valid Hive CLI options you want to 
pass to Hive commands.
 Example: '--auxpath 
/path/to/hive-serdes-1.0-SNAPSHOT.jar'
 -v --verboseTurn on verbose debug logging.
@@ -47,17 +48,20 @@
 # from pprint import pprint as pp
 
 
+
+
 if __name__ == '__main__':
 # parse arguments
 arguments = docopt(__doc__)
 # pp(arguments)
-days   = int(arguments['--older-than-days'])
-database   = arguments['--database']
-table  = arguments['--table']
-table_location = arguments['--location']
-hive_options   = arguments['--hive-options']
-verbose= arguments['--verbose']
-dry_run= arguments['--dry-run']
+days= int(arguments['--older-than-days'])
+database= arguments['--database']
+table   = arguments['--table']
+table_location  = arguments['--location']
+hive_options= arguments['--hive-options']
+webrequest_type = arguments['--webrequest-type']
+verbose = arguments['--verbose']
+dry_run = arguments['--dry-run']
 
 log_level = logging.INFO
 if verbose:
@@ -67,21 +71,17 @@
 format='%(asctime)s %(levelname)-6s %(message)s',
 datefmt='%Y-%m-%dT%H:%M:%S')
 
-# This regex names its group matches by the actual
-# partition column name.  This is required so that
-# HiveUtils partition_spec_from_path can parse a path
-# and return a partition spec for use in a Hive DDL statement.
-webrequest_path_regex = 
re.compile(r'/webrequest_(?Pwebrequest_source[^/]+)/hourly/(?Pyear[^/]+)/(?Pmonth[^/]+)/(?Pday[^/]+)/(?Phour[^/]+)')
 
-# This regex tells HiveUtils partition_datetime_from_path
-# how to extract just the date portion from a partition path.
-# The match group will be passed to dateutil.parser.parse to
-# return a datetime object.
-webrequest_date_regex = re.compile(r'.*/hourly/(.+)$')
+if webrequest_type not in ['raw', 'refined']:
+logging.error('\'{0}\' is not a valid webrequest-type.  Must be one of 
\'raw\' or \'refined\''
+.format(webrequest_type))
+sys.exit(1)
 
-# Allows easy extraction of partition fields from the partition spec.
-# This regex is used with HiveUtils partition_datetime_from_spec.
-partition_spec_regex   = 
re.compile(r'webrequest_source=(?Pwebrequest_source[^/,]+)[/,]year=(?Pyear[^/,]+)[/,]month=(?Pmonth[^/,]+)[/,]day=(?Pday[^/]+)[/,]hour=(?Phour[^/,]+)')
+if not HdfsUtils.validate_path(table_location):
+logging.error('{0} table location \'{1}\' is not a valid HDFS path.  
Path must start with \'/\' or \'hdfs://\'.  Aborting.'
+.format(table, table_location))
+sys.exit(1)
+
 
 # Instantiate HiveUtils.
 hive = HiveUtils(database, hive_options)
@@ -92,17 +92,36 @@
 if table_location == None:
 table_location = hive.table_location(table)
 
-if not HdfsUtils.validate_path(table_location):
-logging.error('{0} table location \'{1}\' is not a valid HDFS path.  
Path must start with \'/\' or \'hdfs://\'.  Aborting.'
-.format(table, table_location))
-sys.exit(1)
 
-# This glob will be used to list out all partition paths in HDFS.
-partition_glob = os.path.join(table_location, '*', 'hourly', '*', '*', 
'*', '*')
+#

[MediaWiki-commits] [Gerrit] jsduck: Add 'mediawiki.startUp.js' to eg-iframe - change (mediawiki/core)

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

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

Change subject: jsduck: Add 'mediawiki.startUp.js' to eg-iframe
..


jsduck: Add 'mediawiki.startUp.js' to eg-iframe

Follows-up 2ea420eed86. Without this, the startUp() is never called,
and mw.config remains undefined which caused some of the examples
to no longer work properly.

Also move onerror handler to first script (follows-up a64a07d).
Exceptions from other code (eg. startup or mediawiki modules),
were not being caught.

Also include 'error' in the line being logged from onerror.

Change-Id: I3956da40b0bd862acab6d4552932aa609c17d569
---
M maintenance/jsduck/eg-iframe.html
M resources/Resources.php
2 files changed, 32 insertions(+), 25 deletions(-)

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



diff --git a/maintenance/jsduck/eg-iframe.html 
b/maintenance/jsduck/eg-iframe.html
index 50d7921..4e61140 100644
--- a/maintenance/jsduck/eg-iframe.html
+++ b/maintenance/jsduck/eg-iframe.html
@@ -3,6 +3,36 @@
 head
meta charset=utf-8
titleMediaWiki Code Example/title
+   script
+   /**
+* Basic log console for the example iframe in documentation 
pages.
+*/
+   var log = ( function () {
+   var pre;
+   return function () {
+   var str, i, len, line;
+   if ( !pre ) {
+   pre = document.createElement( 'pre' );
+   pre.className = 'mw-jsduck-log';
+   ( document.body || 
document.documentElement ).appendChild( pre );
+   }
+   str = [];
+   for ( i = 0, len = arguments.length; i  len; 
i++ ) {
+   str.push( String( arguments[ i ] ) );
+   }
+   line = document.createElement( 'div' );
+   line.className = 'mw-jsduck-log-line';
+   line.appendChild(
+   document.createTextNode( 
str.join( ' , ' ) + '\n' )
+   );
+   pre.appendChild( line );
+   };
+   }() );
+
+   window.onerror = function ( error, filePath, linerNr ) {
+   log( error + '\n' + filePath + ':' + linerNr  );
+   };
+   /script
script src=modules/src/startup.js/script
script
function startUp() {
@@ -11,6 +41,7 @@
/script
script src=modules/lib/jquery/jquery.js/script
script src=modules/src/mediawiki/mediawiki.js/script
+   script src=modules/src/mediawiki/mediawiki.startUp.js/script
style
.mw-jsduck-log {
position: relative;
@@ -45,31 +76,6 @@
 /head
 body
 script
-   /**
-* Basic log console for the example iframe in documentation pages.
-*/
-   var log = ( function () {
-   var pre;
-   return function () {
-   var str, i, len, line;
-   if ( !pre ) {
-   pre = document.createElement( 'pre' );
-   pre.className = 'mw-jsduck-log';
-   document.body.appendChild( pre );
-   }
-   str = [];
-   for ( i = 0, len = arguments.length; i  len; i++ ) {
-   str.push( String( arguments[ i ] ) );
-   }
-   line = document.createElement( 'div' );
-   line.className = 'mw-jsduck-log-line';
-   line.appendChild(
-   document.createTextNode( str.join( ' , 
' ) + '\n' )
-   );
-   pre.appendChild( line );
-   };
-   }() );
-
if ( window.mw ) {
mw.log = log;
}
diff --git a/resources/Resources.php b/resources/Resources.php
index faaf852..50a03f6 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -772,6 +772,7 @@
/* MediaWiki */
 
'mediawiki' = array(
+   // Keep maintenance/jsduck/eg-iframe.html in sync
'scripts' = array(
'resources/src/mediawiki/mediawiki.js',
'resources/src/mediawiki/mediawiki.startUp.js',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3956da40b0bd862acab6d4552932aa609c17d569
Gerrit-PatchSet: 2
Gerrit-Project:

[MediaWiki-commits] [Gerrit] Swap expectX() for requireX() where possible - change (wikimedia/iegreview)

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

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

Change subject: Swap expectX() for requireX() where possible
..


Swap expectX() for requireX() where possible

Change-Id: Ied136a47fb6eb298c8267595566912c866a6c0b6
---
M src/Controllers/Admin/User.php
M src/Controllers/Login.php
M src/Controllers/Proposals/Edit.php
M src/Controllers/Proposals/Review.php
M src/Controllers/User/ChangePassword.php
5 files changed, 16 insertions(+), 20 deletions(-)

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



diff --git a/src/Controllers/Admin/User.php b/src/Controllers/Admin/User.php
index 8329883..128c946 100644
--- a/src/Controllers/Admin/User.php
+++ b/src/Controllers/Admin/User.php
@@ -60,11 +60,11 @@
protected function handlePost() {
$id = $this-request-post( 'id' );
 
-   $this-form-expectString( 'username', array( 'required' = 
true ) );
+   $this-form-requireString( 'username' );
$this-form-expectString( 'password',
array( 'required' = ( $id == 'new' ) )
);
-   $this-form-expectEmail( 'email', array( 'required' = true ) 
);
+   $this-form-requireEmail( 'email' );
$this-form-expectBool( 'reviewer' );
$this-form-expectBool( 'isvalid' );
$this-form-expectBool( 'isadmin' );
diff --git a/src/Controllers/Login.php b/src/Controllers/Login.php
index 57b61d2..5a13423 100644
--- a/src/Controllers/Login.php
+++ b/src/Controllers/Login.php
@@ -45,8 +45,8 @@
$next = filter_var( $next, \FILTER_VALIDATE_URL, 
\FILTER_FLAG_PATH_REQUIRED );
}
 
-   $this-form-expectString( 'username', array( 'required' = 
true ) );
-   $this-form-expectString( 'password', array( 'required' = 
true ) );
+   $this-form-requireString( 'username' );
+   $this-form-requireString( 'password' );
 
if ( $this-form-validate() ) {
$authed = $this-authManager-authenticate(
diff --git a/src/Controllers/Proposals/Edit.php 
b/src/Controllers/Proposals/Edit.php
index de94f1e..2fd9a15 100644
--- a/src/Controllers/Proposals/Edit.php
+++ b/src/Controllers/Proposals/Edit.php
@@ -45,19 +45,16 @@
),
$defaults
);
-   $this-form-expectString( 'title', array(
-   'required' = true,
+   $this-form-requireString( 'title', array(
'default' = $defaults['title'],
) );
-   $this-form-expectUrl( 'url', array(
-   'required' = true,
+   $this-form-requireUrl( 'url', array(
'default' = $defaults['url'],
) );
// TODO: themes from db?
-   $this-form-expectInArray( 'theme',
+   $this-form-requireInArray( 'theme',
array( 'online', 'offline', 'tool', 'research' ),
array(
-   'required' = true,
'default' = $defaults['theme'],
) );
$this-form-expectInt( 'amount', array(
diff --git a/src/Controllers/Proposals/Review.php 
b/src/Controllers/Proposals/Review.php
index 10dfdd2..a5e8d87 100644
--- a/src/Controllers/Proposals/Review.php
+++ b/src/Controllers/Proposals/Review.php
@@ -34,17 +34,16 @@
 class Review extends Controller {
 
protected function handlePost( $id ) {
-   $required = array( 'required' = true );
-   $this-form-expectInt( 'proposal', $required );
-   $this-form-expectInt( 'impact', $required );
+   $this-form-requireInt( 'proposal' );
+   $this-form-requireInt( 'impact' );
$this-form-expectString( 'impact_note' );
-   $this-form-expectInt( 'innovation', $required );
+   $this-form-requireInt( 'innovation' );
$this-form-expectString( 'innovation_note' );
-   $this-form-expectInt( 'ability', $required );
+   $this-form-requireInt( 'ability' );
$this-form-expectString( 'ability_note' );
-   $this-form-expectInt( 'engagement', $required );
+   $this-form-requireInt( 'engagement' );
$this-form-expectString( 'engagement_note' );
-   $this-form-expectInt( 'recommendation', $required );
+   $this-form-requireInt( 'recommendation' );
$this-form-expectString( 'comments' );
 
if ( $this-form-validate() ) {
diff --git a/src/Controllers/User/ChangePassword.php 
b/src/Controllers/User/ChangePassword.php
index 180296e..17b0e85 100644
--- a/src/Controllers/User/ChangePassword.php
+++

[MediaWiki-commits] [Gerrit] Additional params 'filename' and 'link text' - change (mediawiki...Cargo)

2015-03-11 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Additional params 'filename' and 'link text'
..


Additional params 'filename' and 'link text'

Support has been added for two additional parameters. Filename sets the
name of the file to be downloaded, instead of 'results.csv'. Link text
sets the text of the text shown on the page, instead of the
'cargo-viewcsv' message ('View CSV' in English).

Change-Id: If85be4133c294e71767b58340b6907a829181bbb
---
M formats/CargoCSVFormat.php
M specials/CargoExport.php
2 files changed, 19 insertions(+), 6 deletions(-)

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



diff --git a/formats/CargoCSVFormat.php b/formats/CargoCSVFormat.php
index 90e4a48..beab6be 100644
--- a/formats/CargoCSVFormat.php
+++ b/formats/CargoCSVFormat.php
@@ -24,13 +24,20 @@
if ( array_key_exists( 'delimiter', $displayParams ) ) {
$queryParams['delimiter'] = $displayParams['delimiter'];
}
-
+   if ( array_key_exists( 'filename', $displayParams ) ) {
+   $queryParams['filename'] = $displayParams['filename'];
+   }
+   if ( array_key_exists( 'link text', $displayParams ) ) {
+   $linktext = $displayParams['link text'];
+   } else { 
+   $linktext = wfMessage( 'cargo-viewcsv' )-text();
+   }
$linkAttrs = array(
'href' = $ce-getFullURL( $queryParams ),
);
-   $text = Html::rawElement( 'a', $linkAttrs, wfMessage( 
'cargo-viewcsv' )-text() );
+   $text = Html::rawElement( 'a', $linkAttrs, $linktext );
 
-   return $text;
+   return $text; 
}
 
 }
diff --git a/specials/CargoExport.php b/specials/CargoExport.php
index 9295289..ecf1512 100644
--- a/specials/CargoExport.php
+++ b/specials/CargoExport.php
@@ -51,7 +51,11 @@
} elseif ( $delimiter == '\t' ) {
$delimiter = \t;
}
-   $this-displayCSVData( $sqlQueries, $delimiter );
+   $filename = $req-getVal( 'filename' );
+   if ( $filename == '' ) {
+   $filename = 'results.csv';
+   }
+   $this-displayCSVData( $sqlQueries, $delimiter, 
$filename );
} elseif ( $format == 'json' ) {
$this-displayJSONData( $sqlQueries );
}
@@ -216,9 +220,11 @@
print json_encode( $displayedArray, JSON_NUMERIC_CHECK | 
JSON_HEX_TAG );
}
 
-   function displayCSVData( $sqlQueries, $delimiter ) {
+   function displayCSVData( $sqlQueries, $delimiter, $filename ) {
+   $attachmenttext = Content-Disposition: attachment; filename=;
+   $attachmenttext .= $filename;
header( Content-Type: text/csv );
-   header( Content-Disposition: attachment; filename=results.csv 
);
+   header( $attachmenttext );
 
// We'll only use the first query, if there's more than one.
$sqlQuery = $sqlQueries[0];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If85be4133c294e71767b58340b6907a829181bbb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: AdSvS a...@wikibase.nl
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add bash script for updating submodule - change (mediawiki...deploy)

2015-03-11 Thread Mvolz (Code Review)

Mvolz has uploaded a new change for review.

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

Change subject: Add bash script for updating submodule
..

Add bash script for updating submodule

Add bash script bin/updateSubmodule.sh
for creating a commit that updates the
citoid submodule.

Change-Id: I4e1453fe5b20b09e45d300bc0052ff75516af349
---
A bin/updateSubmodule.sh
1 file changed, 67 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid/deploy 
refs/changes/11/195911/1

diff --git a/bin/updateSubmodule.sh b/bin/updateSubmodule.sh
new file mode 100755
index 000..804abe2
--- /dev/null
+++ b/bin/updateSubmodule.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+# This script generates a commit that updates the src submodule
+# ./bin/updateSubmodule.shupdates to master
+# ./bin/updateSubmodule.sh hash   updates to specified hash
+
+echo Working from the git repo at path 
+pwd
+
+# Check that both working directories are clean
+if git status -uno --ignore-submodules | grep -i changes  /dev/null
+then
+   echo 2 Working directory must be clean
+   exit 1
+fi
+cd src
+if git status -uno --ignore-submodules | grep -i changes  /dev/null
+then
+   echo 2 src working directory must be clean
+   exit 1
+fi
+cd ..
+
+git checkout origin
+git submodule update
+cd src
+git fetch origin
+
+# Figure out what to set the submodule to
+if [ x$1 != x ]
+then
+   TARGET=$1
+   TARGETDESC=$1
+else
+   TARGET=origin/master
+   TARGETDESC=master ($(git rev-parse --short origin/master))
+fi
+
+# Generate commit summary
+NEWCHANGES=$(git log ..$TARGET --oneline --no-merges --reverse --color=never)
+NEWCHANGESDISPLAY=$(git log ..$TARGET --oneline --no-merges --reverse 
--color=always)
+COMMITMSG=$(cat END
+Update citoid submodule to $TARGETDESC
+
+New changes:
+$NEWCHANGES
+END
+)
+# Check out master of citoid
+git checkout $TARGET
+
+# Commit
+cd ..
+
+pwd
+git commit src -m $COMMITMSG  /dev/null
+if [ $? == 1 ]
+then
+   echo 2 No changes
+else
+   cat 2 END
+
+
+Created commit with changes:
+$NEWCHANGESDISPLAY
+END
+fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e1453fe5b20b09e45d300bc0052ff75516af349
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mvolz mv...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Run on trusty nodes - change (labs...grrrit)

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

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

Change subject: Run on trusty nodes
..


Run on trusty nodes

They have a much better version of node. This doesn't actually
run on the precise nodes at all.

Change-Id: I2a6108597100ba96efda1fd330b8babe13f09756
---
M src/kick.bash
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/kick.bash b/src/kick.bash
index c454edd..cf7348f 100755
--- a/src/kick.bash
+++ b/src/kick.bash
@@ -2,4 +2,4 @@
 # Stop current job if it exists, and start a new one
 jstop lolrrit-wm
 sleep 2s # Stupid hack to make sure the job is killed
-jsub -N lolrrit-wm -mem 1G -continuous node 
/data/project/lolrrit-wm/lolrrit-wm/src/relay.js
+jsub -l release=trusty -N lolrrit-wm -mem 1G -continuous node 
/data/project/lolrrit-wm/lolrrit-wm/src/relay.js

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a6108597100ba96efda1fd330b8babe13f09756
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Name refinery drop cron jobs accordingly - change (operations/puppet)

2015-03-11 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Name refinery drop cron jobs accordingly
..

Name refinery drop cron jobs accordingly

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


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

diff --git a/manifests/role/analytics/refinery.pp 
b/manifests/role/analytics/refinery.pp
index 6e7a7d0..11e8f1e 100644
--- a/manifests/role/analytics/refinery.pp
+++ b/manifests/role/analytics/refinery.pp
@@ -74,7 +74,7 @@
 
 # keep this many days of raw data
 $raw_retention_days = 31
-cron { 'refinery-drop-webrequest-partitions':
+cron { 'refinery-drop-webrequest-raw-partitions':
 command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${raw_retention_days} -D wmf_raw -l /wmf/data/raw/webrequest -w raw  
${log_file} 21,
 user= 'hdfs',
 minute  = '15',
@@ -83,7 +83,7 @@
 
 # keep this many days of refined data
 $raw_retention_days = 62
-cron { 'refinery-drop-webrequest-partitions':
+cron { 'refinery-drop-webrequest-refined-partitions':
 command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${refined_retention_days} -D wmf -l /wmf/data/wmf/webrequest -w refined  
${log_file} 21,
 user= 'hdfs',
 minute  = '45',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77a807f3241c06d46f61e10db79bda94dc976203
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

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

2015-03-11 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

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

Update VE core submodule to master (4d7fda1)

New changes:
f7611ac ce.RangeState: Check this.node for falseyness, not just null
4fd4229 Revert Prevent form submission in FragmentInspector
e3af2bc Make ve.init.sa.Target toolbar config overridable

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


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

diff --git a/lib/ve b/lib/ve
index ad44a9b..4d7fda1 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit ad44a9b8bd8e237e1eb8284e2b21254212df2549
+Subproject commit 4d7fda1e07aef697ce3f3ee54fe72836304396b5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I576246e577c8388361750470edabcdbbdc5b4e4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Follow-up 02923f694630: fix submodule - change (mediawiki...VisualEditor)

2015-03-11 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Follow-up 02923f694630: fix submodule
..

Follow-up 02923f694630: fix submodule

Was branched off of the wrong point.

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


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

diff --git a/lib/ve b/lib/ve
index bc8b388..ecd7944 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit bc8b38893c72a09428dc44a2ca66b8017e733f62
+Subproject commit ecd7944f3a4a29a784a89e3dd2e5d0133cc1e805

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb8eccf9577302f671951988a4c3334a5111d3a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com

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

[MediaWiki-commits] [Gerrit] Updated vega to upstream v1.5.0 - change (mediawiki...Graph)

2015-03-11 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Updated vega to upstream v1.5.0
..

Updated vega to upstream v1.5.0

Change-Id: I264126612c0eb1a401b85302145453ee02363cd0
---
M lib/vega.js
1 file changed, 87 insertions(+), 24 deletions(-)


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

diff --git a/lib/vega.js b/lib/vega.js
index 104c3a1..b696921 100644
--- a/lib/vega.js
+++ b/lib/vega.js
@@ -1963,13 +1963,15 @@
   var renderer = function() {
 this._ctx = null;
 this._el = null;
+this._bgcolor = null;
 this._imgload = 0;
   };
 
   var prototype = renderer.prototype;
 
-  prototype.initialize = function(el, width, height, pad) {
+  prototype.initialize = function(el, width, height, pad, bgcolor) {
 this._el = el;
+this.background(bgcolor);
   
 if (!el) return this; // early exit if no DOM element
 
@@ -1987,6 +1989,11 @@
 canvas.exit().remove();
 
 return this.resize(width, height, pad);
+  };
+  
+  prototype.background = function(bgcolor) {
+this._bgcolor = bgcolor;
+return this;
   };
 
   prototype.resize = function(width, height, pad) {
@@ -2105,7 +2112,7 @@
 this._scene = scene;
 g.save();
 bb = setBounds(g, getBounds(items));
-g.clearRect(-pad.left, -pad.top, w, h);
+this.clear(-pad.left, -pad.top, w, h);
 
 // render
 this.draw(g, scene, bb);
@@ -2116,7 +2123,7 @@
   g.save();
   bb2 = setBounds(g, getBounds(items));
   if (!bb.encloses(bb2)) {
-g.clearRect(-pad.left, -pad.top, w, h);
+this.clear(-pad.left, -pad.top, w, h);
 this.draw(g, scene, bb2);
   }
 }
@@ -2130,6 +2137,16 @@
 var marktype = scene.marktype,
 renderer = vg.canvas.marks.draw[marktype];
 renderer.call(this, ctx, scene, bounds);
+  };
+
+  prototype.clear = function(x, y, w, h) {
+var g = this._ctx;
+
+g.clearRect(x, y, w, h);
+if (this._bgcolor != null) {
+  g.fillStyle = this._bgcolor;
+  g.fillRect(x, y, w, h); 
+}
   };
 
   prototype.renderAsync = function(scene) {
@@ -2662,7 +2679,7 @@
   
   var prototype = renderer.prototype;
   
-  prototype.initialize = function(el, width, height, pad) {
+  prototype.initialize = function(el, width, height, pad, bgcolor) {
 this._el = el;
 
 // remove any existing svg element
@@ -2672,6 +2689,10 @@
 this._svg = d3.select(el)
   .append(svg)
   .attr(class, marks);
+
+if (bgcolor != null) {
+  this._svg.style(background-color, bgcolor);
+}
 
 // set the svg root group
 this._ctx = this._svg.append(g);
@@ -7251,6 +7272,12 @@
 
   return axes;
 })();
+vg.parse.background = function(bg) {
+  // return null if input is null or undefined
+  if (bg == null) return null;
+  // run through d3 rgb to sanity check
+  return d3.rgb(bg) + ;
+};
 vg.parse.data = function(spec, callback) {
   var model = {
 defs: spec,
@@ -7571,7 +7598,10 @@
 }
 
 // multiply, offset, return value
-val = ( + (ref.mult?(vg.number(ref.mult)+ * ):) + val + )
+val = (
+  + (ref.mult != null ? (vg.number(ref.mult) +  * ) : )
+  + val
+  + )
   + (ref.offset ?  +  + vg.number(ref.offset) : );
 return val;
   }
@@ -7808,29 +7838,30 @@
   return scales;
 })();
 vg.parse.spec = function(spec, callback, viewFactory) {
-  
+
   viewFactory = viewFactory || vg.ViewFactory;
-  
+
   function parse(spec) {
 // protect against subsequent spec modification
 spec = vg.duplicate(spec);
-
+
 var width = spec.width || 500,
 height = spec.height || 500,
 viewport = spec.viewport || null;
-
+
 var defs = {
   width: width,
   height: height,
   viewport: viewport,
+  background: vg.parse.background(spec.background),
   padding: vg.parse.padding(spec.padding),
   marks: vg.parse.marks(spec, width, height),
   data: vg.parse.data(spec.data, function() { callback(viewConstructor); })
 };
-
+
 var viewConstructor = viewFactory(defs);
   }
-  
+
   vg.isObject(spec) ? parse(spec) :
 d3.json(spec, function(error, json) {
   error ? vg.error(error) : parse(json);
@@ -9897,6 +9928,7 @@
 this._model = new vg.Model();
 this._width = this.__width = width || 500;
 this._height = this.__height = height || 500;
+this._bgcolor = null;
 this._autopad = 1;
 this._padding = {top:0, left:0, bottom:0, right:0};
 this._viewport = null;
@@ -9926,6 +9958,15 @@
   if (this._el) this.initialize(this._el.parentNode);
   this._model.height(this._height);
   if (this._strict) this._autopad = 1;
+}
+return this;
+  };
+
+  prototype.background = function(bgcolor) {
+if (!arguments.length) return this._bgcolor;
+if (this._bgcolor !== bgcolor) {
+  this._bgcolor = bgcolor;
+  if (this._el)

[MediaWiki-commits] [Gerrit] Implemented action=query list=listpages - change (mediawiki...Gather)

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

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

Change subject: Implemented action=query  list=listpages
..


Implemented action=query  list=listpages

Same as list=watchlistraw, except it also supports
lspid=NNN -- if 0, uses watchlist, otherwise uses new lists.

Change-Id: I5779c251414907aafd0f213fa580f22dbd6781e9
---
M Gather.php
M extension.json
A includes/api/ApiQueryListPages.php
3 files changed, 273 insertions(+), 2 deletions(-)

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



diff --git a/Gather.php b/Gather.php
index 9210c98..bc5e5c5 100644
--- a/Gather.php
+++ b/Gather.php
@@ -67,6 +67,7 @@
'Gather\api\ApiEditList' = 'api/ApiEditList',
'Gather\api\ApiQueryLists' = 'api/ApiQueryLists',
'Gather\api\CollectionsListApi' = 'api/CollectionsListApi',
+   'Gather\api\ApiQueryListPages' = 'api/ApiQueryListPages',
 
 );
 
@@ -91,6 +92,7 @@
 $wgAPIModules['gather'] = 'Gather\api\CollectionsListApi';
 $wgAPIModules['editlist'] = 'Gather\api\ApiEditList';
 $wgAPIListModules['lists'] = 'Gather\api\ApiQueryLists';
+$wgAPIListModules['listpages'] = 'Gather\api\ApiQueryListPages';
 
 // ResourceLoader modules
 require_once __DIR__ . /resources/Resources.php;
diff --git a/extension.json b/extension.json
index e21e550..5c57d94 100644
--- a/extension.json
+++ b/extension.json
@@ -54,16 +54,18 @@
Gather\\views\\CollectionsListItemCard: 
includes/views/CollectionsListItemCard.php,
Gather\\views\\helpers\\CSS: includes/views/helpers/CSS.php,
Gather\\SpecialGather: includes/specials/SpecialGather.php,
+   Gather\\api\\CollectionsListApi: 
includes/api/CollectionsListApi.php,
Gather\\api\\ApiEditList: includes/api/ApiEditList.php,
Gather\\api\\ApiQueryLists: includes/api/ApiQueryLists.php,
-   Gather\\api\\CollectionsListApi: 
includes/api/CollectionsListApi.php
+   Gather\\api\\ApiQueryListPages: 
includes/api/ApiQueryListPages.php
},
APIModules: {
editlist: Gather\\api\\ApiEditList,
gather: Gather\\api\\CollectionsListApi
},
APIListModules: {
-   lists: Gather\\api\\ApiQueryLists
+   lists: Gather\\api\\ApiQueryLists,
+   listpages: Gather\\api\\ApiQueryListPages
},
ResourceModules: {
ext.gather.icons: {
diff --git a/includes/api/ApiQueryListPages.php 
b/includes/api/ApiQueryListPages.php
new file mode 100644
index 000..02475a1
--- /dev/null
+++ b/includes/api/ApiQueryListPages.php
@@ -0,0 +1,267 @@
+?php
+/**
+ *
+ *
+ * Created on March 6, 2015
+ *
+ * Copyright © 2015 Yuri Astrakhan FirstnameLastname@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+namespace Gather\api;
+
+use ApiBase;
+use ApiPageSet;
+use ApiQuery;
+use ApiQueryBase;
+use ApiQueryGeneratorBase;
+use MWException;
+use Title;
+use User;
+
+/**
+ * Query module to enumerate all available lists
+ *
+ * @ingroup API
+ */
+class ApiQueryListPages extends ApiQueryGeneratorBase {
+
+   public function __construct( ApiQuery $query, $moduleName ) {
+   parent::__construct( $query, $moduleName, 'lsp' );
+   }
+
+   public function execute() {
+   $this-run();
+   }
+
+   public function executeGenerator( $resultPageSet ) {
+   $this-run( $resultPageSet );
+   }
+
+   private function run( $resultPageSet = null ) {
+
+   $params = $this-extractRequestParams();
+   $user = $this-getWatchlistUser( $params );
+
+   if ( $params['id'] ) {
+   // Runs this code whenever ID is given and is not 0 
(watchlist)
+   // Will be removed once DB storage is implemented
+   $this-tempProcessCollectionFromJson( $resultPageSet, 
$params, $user );
+   return;
+   }
+
+   $this-selectNamedDB( 'watchlist', DB_SLAVE, 'watchlist' );
+   $this-addTables( 'watchlist' );
+   $this-addFields( array( 'wl_namespace', 'wl_title' ) );
+

[MediaWiki-commits] [Gerrit] Updated vega to upstream v1.5.0 - change (mediawiki...Graph)

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

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

Change subject: Updated vega to upstream v1.5.0
..


Updated vega to upstream v1.5.0

Change-Id: I264126612c0eb1a401b85302145453ee02363cd0
---
M lib/vega.js
1 file changed, 87 insertions(+), 24 deletions(-)

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



diff --git a/lib/vega.js b/lib/vega.js
index 104c3a1..b696921 100644
--- a/lib/vega.js
+++ b/lib/vega.js
@@ -1963,13 +1963,15 @@
   var renderer = function() {
 this._ctx = null;
 this._el = null;
+this._bgcolor = null;
 this._imgload = 0;
   };
 
   var prototype = renderer.prototype;
 
-  prototype.initialize = function(el, width, height, pad) {
+  prototype.initialize = function(el, width, height, pad, bgcolor) {
 this._el = el;
+this.background(bgcolor);
   
 if (!el) return this; // early exit if no DOM element
 
@@ -1987,6 +1989,11 @@
 canvas.exit().remove();
 
 return this.resize(width, height, pad);
+  };
+  
+  prototype.background = function(bgcolor) {
+this._bgcolor = bgcolor;
+return this;
   };
 
   prototype.resize = function(width, height, pad) {
@@ -2105,7 +2112,7 @@
 this._scene = scene;
 g.save();
 bb = setBounds(g, getBounds(items));
-g.clearRect(-pad.left, -pad.top, w, h);
+this.clear(-pad.left, -pad.top, w, h);
 
 // render
 this.draw(g, scene, bb);
@@ -2116,7 +2123,7 @@
   g.save();
   bb2 = setBounds(g, getBounds(items));
   if (!bb.encloses(bb2)) {
-g.clearRect(-pad.left, -pad.top, w, h);
+this.clear(-pad.left, -pad.top, w, h);
 this.draw(g, scene, bb2);
   }
 }
@@ -2130,6 +2137,16 @@
 var marktype = scene.marktype,
 renderer = vg.canvas.marks.draw[marktype];
 renderer.call(this, ctx, scene, bounds);
+  };
+
+  prototype.clear = function(x, y, w, h) {
+var g = this._ctx;
+
+g.clearRect(x, y, w, h);
+if (this._bgcolor != null) {
+  g.fillStyle = this._bgcolor;
+  g.fillRect(x, y, w, h); 
+}
   };
 
   prototype.renderAsync = function(scene) {
@@ -2662,7 +2679,7 @@
   
   var prototype = renderer.prototype;
   
-  prototype.initialize = function(el, width, height, pad) {
+  prototype.initialize = function(el, width, height, pad, bgcolor) {
 this._el = el;
 
 // remove any existing svg element
@@ -2672,6 +2689,10 @@
 this._svg = d3.select(el)
   .append(svg)
   .attr(class, marks);
+
+if (bgcolor != null) {
+  this._svg.style(background-color, bgcolor);
+}
 
 // set the svg root group
 this._ctx = this._svg.append(g);
@@ -7251,6 +7272,12 @@
 
   return axes;
 })();
+vg.parse.background = function(bg) {
+  // return null if input is null or undefined
+  if (bg == null) return null;
+  // run through d3 rgb to sanity check
+  return d3.rgb(bg) + ;
+};
 vg.parse.data = function(spec, callback) {
   var model = {
 defs: spec,
@@ -7571,7 +7598,10 @@
 }
 
 // multiply, offset, return value
-val = ( + (ref.mult?(vg.number(ref.mult)+ * ):) + val + )
+val = (
+  + (ref.mult != null ? (vg.number(ref.mult) +  * ) : )
+  + val
+  + )
   + (ref.offset ?  +  + vg.number(ref.offset) : );
 return val;
   }
@@ -7808,29 +7838,30 @@
   return scales;
 })();
 vg.parse.spec = function(spec, callback, viewFactory) {
-  
+
   viewFactory = viewFactory || vg.ViewFactory;
-  
+
   function parse(spec) {
 // protect against subsequent spec modification
 spec = vg.duplicate(spec);
-
+
 var width = spec.width || 500,
 height = spec.height || 500,
 viewport = spec.viewport || null;
-
+
 var defs = {
   width: width,
   height: height,
   viewport: viewport,
+  background: vg.parse.background(spec.background),
   padding: vg.parse.padding(spec.padding),
   marks: vg.parse.marks(spec, width, height),
   data: vg.parse.data(spec.data, function() { callback(viewConstructor); })
 };
-
+
 var viewConstructor = viewFactory(defs);
   }
-  
+
   vg.isObject(spec) ? parse(spec) :
 d3.json(spec, function(error, json) {
   error ? vg.error(error) : parse(json);
@@ -9897,6 +9928,7 @@
 this._model = new vg.Model();
 this._width = this.__width = width || 500;
 this._height = this.__height = height || 500;
+this._bgcolor = null;
 this._autopad = 1;
 this._padding = {top:0, left:0, bottom:0, right:0};
 this._viewport = null;
@@ -9926,6 +9958,15 @@
   if (this._el) this.initialize(this._el.parentNode);
   this._model.height(this._height);
   if (this._strict) this._autopad = 1;
+}
+return this;
+  };
+
+  prototype.background = function(bgcolor) {
+if (!arguments.length) return this._bgcolor;
+if (this._bgcolor !== bgcolor) {
+  this._bgcolor = bgcolor;
+  if (this._el) this.initialize(this._el.parentNode);
 }
 return this;
   };
@@

[MediaWiki-commits] [Gerrit] [WIP] BsInsertImage: Fixes - change (mediawiki...BlueSpiceExtensions)

2015-03-11 Thread Pwirth (Code Review)

Pwirth has uploaded a new change for review.

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

Change subject: [WIP] BsInsertImage: Fixes
..

[WIP] BsInsertImage: Fixes

* Used watchlist instead of deprecated watch param for API
* Some fields now wont be send to prevent API warnings
* Used a hidden field to create the value for text param

Change-Id: I20f7a5f7b5f62cacff12b5ea1170c1f8e3dfe006
---
M InsertFile/resources/BS.InsertFile/UploadPanel.js
1 file changed, 16 insertions(+), 5 deletions(-)


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

diff --git a/InsertFile/resources/BS.InsertFile/UploadPanel.js 
b/InsertFile/resources/BS.InsertFile/UploadPanel.js
index d323d23..3cb9d14 100644
--- a/InsertFile/resources/BS.InsertFile/UploadPanel.js
+++ b/InsertFile/resources/BS.InsertFile/UploadPanel.js
@@ -42,6 +42,15 @@
 
this.taDescription = Ext.create('Ext.form.field.TextArea', {
fieldLabel: 
mw.message('bs-insertfile-uploaddescfilelabel').plain(),
+   id: this.getId()+'-description',
+   value: '',
+   //name: 'text',
+   submitValue: false
+   });
+
+   //This hidden field will store the combined data of 
this.storeLicenses,
+   //this.taDescription and this.bsCategories on submit
+   this.hfText = Ext.create('Ext.form.field.Hidden', {
id: this.getId()+'-text',
value: '',
name: 'text'
@@ -61,7 +70,8 @@
type: this.storeFileType
},
remoteSort: true,
-   fields: ['text', 'value', 'indent']
+   fields: ['text', 'value', 'indent'],
+   submitValue: false
});
 
this.cbLicences = Ext.create('Ext.form.ComboBox',{
@@ -100,7 +110,8 @@
this.cbxWatch = Ext.create('Ext.form.field.Checkbox', {
boxLabel: 
mw.message('bs-insertfile-uploadwatchthislabel').plain(),
id: this.getId()+'watch_page',
-   name: 'watch'
+   name: 'watchlist',
+   inputValue: 'watch'
});
 
this.cbxWarnings = Ext.create('Ext.form.field.Checkbox', {
@@ -111,8 +122,8 @@
 
this.bsCategories = Ext.create( 'BS.form.CategoryBoxSelect', {
id: this.getId()+'categories',
-   name: 'categories',
-   fieldLabel: 
mw.message('bs-insertfile-categories').plain()
+   fieldLabel: 
mw.message('bs-insertfile-categories').plain(),
+   submitValue: false
});
 
this.fsDetails = Ext.create( 'Ext.form.FieldSet', {
@@ -222,7 +233,7 @@
});
desc += \n + categoryLink.toString();
}
-   this.taDescription.setValue( desc );
+   this.hfText.setValue(desc);
 
this.cbLicences.disable(); //To prevent the form from 
submitting a generated name
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20f7a5f7b5f62cacff12b5ea1170c1f8e3dfe006
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] delete etherpad SSL cert - change (operations/puppet)

2015-03-11 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: delete etherpad SSL cert
..


delete etherpad SSL cert

Etherpad has been moved behind misc-web (T85788) so SSL
now terminates at nginx level and we don't need this cert anymore.

Bug:T92045
Bug:T85788
Bug:T73156
Change-Id: If7b878a2b20ec94b3d991aacbceb5f801a80c8dd
---
D files/ssl/etherpad.wikimedia.org.crt
1 file changed, 0 insertions(+), 28 deletions(-)

Approvals:
  Chmarkine: Looks good to me, but someone else must approve
  RobH: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  John F. Lewis: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/files/ssl/etherpad.wikimedia.org.crt 
b/files/ssl/etherpad.wikimedia.org.crt
deleted file mode 100644
index ebe4d8f..000
--- a/files/ssl/etherpad.wikimedia.org.crt
+++ /dev/null
@@ -1,28 +0,0 @@
--BEGIN CERTIFICATE-
-MIIEszCCA5ugAwIBAgIDAhQ5MA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
-NTYgQ0EgLSBHMzAeFw0xNTAyMDIyMTIxMjRaFw0xNjAxMDkxNDQxMzBaMIGaMRMw
-EQYDVQQLEwpHVDY2NDc3MTg0MTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-bS9yZXNvdXJjZXMvY3BzIChjKTE0MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEfMB0GA1UEAxMWZXRoZXJwYWQud2lraW1l
-ZGlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJrsVVrbh9Gd
-QQhw+xc5Cq0D2hgvRIQHKZZhh+PcMcsl1RqbRVxlEacLyvqrb6EYrCBkmSGWtS2h
-DqF74VrNbwkFhRcoxhcjD1x+B2CnXSyglBEWIu8o8gg97gCIuHkzAIpMTT8JitkA
-kPCNT60r3cysAZncPjcEUX/NB0guX11VsQ0bRsim8UvuQghFV2oo1sH+ef8UaHnt
-p48wxXAlyGhfzQC7wFX4HfYCuW8sLpGwR/GksEc/Xu+JuITukwuUwQEV8kpDSorf
-ENCjtEqtt1XI5Xac5HHSQNo8hLzlQJR8dKtsYzhDMRmAca8JUbjw8PRlp/DfETc4
-1RlJq40YW0sCAwEAAaOCAVIwggFOMB8GA1UdIwQYMBaAFMOc8/zTRgg0u85Gf6B8
-W/PiCMtZMFcGCCsGAQUFBwEBBEswSTAfBggrBgEFBQcwAYYTaHR0cDovL2d2LnN5
-bWNkLmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcnQw
-DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAh
-BgNVHREEGjAYghZldGhlcnBhZC53aWtpbWVkaWEub3JnMCsGA1UdHwQkMCIwIKAe
-oByGGmh0dHA6Ly9ndi5zeW1jYi5jb20vZ3YuY3JsMAwGA1UdEwEB/wQCMAAwRQYD
-VR0gBD4wPDA6BgpghkgBhvhFAQc2MCwwKgYIKwYBBQUHAgEWHmh0dHBzOi8vd3d3
-LnJhcGlkc3NsLmNvbS9sZWdhbDANBgkqhkiG9w0BAQsFAAOCAQEAfF+Byx7cRloi
-WuR+W3yGB13tmzJBNQJK5OhChvZFDJiUFnj6uhvV0hjiNXc9hXpFbZN5QuuZVKz2
-wxR7R3Fb/ZKIAm6BkTacL4ORw5BTIiJWp/VhWdEwi4HoiM9GMvrkgXSHzlHY5iEJ
-7NGGIiWb81KV/RuogU839hT5c7clTNcFArYb2YlXBjK3ZGnCeUInnuIkoP1SWcLO
-GhYuzt4TLX8YqSqy5iZ/byI8Iw6BtZwg4/kMjpGyaGSF0rlMcNE8TiHfyksFXebl
-k59qQmfNOtjyJ0dUKxZMZ+/Ni4+/wtbzoFuyLNuUPoBlHY/Flv3zqQ3vWO8AdFF6
-by5HO1/T/w==
--END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7b878a2b20ec94b3d991aacbceb5f801a80c8dd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Chmarkine chmark...@hotmail.com
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: RobH r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set $wmgAbuseFilterEmergencyDisableThreshold to 0.30 at commons - change (operations/mediawiki-config)

2015-03-11 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Set $wmgAbuseFilterEmergencyDisableThreshold to 0.30 at commons
..

Set $wmgAbuseFilterEmergencyDisableThreshold to 0.30 at commons

Bug: T87431
Change-Id: Idf7109f89f9dd0399a9d25e749bdceb3a60caedf
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a35f774..eac0fed 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10998,6 +10998,9 @@
'default' = array(
'default' = 0.05,
),
+   'commonswiki' = array( // T87431
+   'default' = 0.30,
+   ),
 ),
 'wmgAbuseFilterEmergencyDisableCount' = array(
'default' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf7109f89f9dd0399a9d25e749bdceb3a60caedf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Glaisher glaisher.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Update citoid submodule to master (2cd246b) - change (mediawiki...deploy)

2015-03-11 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Update citoid submodule to master (2cd246b)
..

Update citoid submodule to master (2cd246b)

New changes:
0d7cb7f Bug fixes: fix status response codes
40d109c Fix: anchor PMC and PMCIDs to beginning of string
d7dc97c Add Grunt with jshint and clean-up its errors
5367b52 Use html-metadata library
5d1dfe2 Create CitoidService object
2c44c4a Fix: Don't convert ISSN/ISBN in MWDeprecated
df82fe3 Make zotero.js an object
522a3ae [WIP] Convert scrape.js to Scraper.js
3306e49 Fix callback in CitoidService.prototype.scrape
119ae43 Add ability to set requesting User-Agent
ce06491 Add mocha tests
76c5339 Fix: itemType was missing in URLs with scrape err
ba07349 Fix: Change itemType of 520 citation to 'webpage'
f59613e Add ability to request AcceptLanguage
3f4b85d Allow outbound proxy config; breaking change
2cd246b Fix acceptLanguage commit a30d6be

Change-Id: I32a01dbbc320346b41c0ee41e6230b750becfc3f
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid/deploy 
refs/changes/37/195937/1

diff --git a/src b/src
index f52ea4d..2cd246b 16
--- a/src
+++ b/src
-Subproject commit f52ea4deab9a7353c99d27a819d320d15bfc9e5f
+Subproject commit 2cd246b99fd2f407b92c33a079a1120f0abe7117

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32a01dbbc320346b41c0ee41e6230b750becfc3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] etherpad: remove SSL cert and settings frm role - change (operations/puppet)

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

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: etherpad: remove SSL cert and settings frm role
..


etherpad: remove SSL cert and settings frm role

If we want to remove the cert per If7b878a2b20ec94b3 we need to do
this too or puppet will try to install non-existing certs.

Bug:T85788
Change-Id: Ic632b74fc3940836a709dbb189b9235e0cb5b93e
---
M manifests/role/etherpad.pp
1 file changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/manifests/role/etherpad.pp b/manifests/role/etherpad.pp
index 05c9c04..4f2d8eb 100644
--- a/manifests/role/etherpad.pp
+++ b/manifests/role/etherpad.pp
@@ -12,21 +12,14 @@
 case $::realm {
 'labs': {
 $etherpad_host = $::fqdn
-$etherpad_ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-$etherpad_ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key'
 }
 'production': {
 $etherpad_host = 'etherpad.wikimedia.org'
-install_certificate{ 'etherpad.wikimedia.org': }
-$etherpad_ssl_cert = '/etc/ssl/certs/etherpad.wikimedia.org.pem'
-$etherpad_ssl_key = '/etc/ssl/private/etherpad.wikimedia.org.key'
 }
 'default': {
 fail('unknown realm, should be labs or production')
 }
 }
-
-$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
 
 class { '::etherpad':
 etherpad_host= $etherpad_host,
@@ -41,7 +34,6 @@
 include ::apache::mod::rewrite
 include ::apache::mod::proxy
 include ::apache::mod::proxy_http
-include ::apache::mod::ssl
 
 ::apache::site { 'etherpad.wikimedia.org':
 content = template('misc/etherpad.wikimedia.org.erb'),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic632b74fc3940836a709dbb189b9235e0cb5b93e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
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 auth to an untracked file, auth.php - change (mediawiki...release)

2015-03-11 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: move auth to an untracked file, auth.php
..

move auth to an untracked file, auth.php

example contents in auth.php.example...

This prevents git from complaining about uncommitted changes
due to auth credentials stored directly in the source.

Change-Id: I44d236e0e3e85e01d5b46509096bd1810b124f6c
---
M .gitignore
A make-deploy-notes/auth.php.example
M make-deploy-notes/uploadChangelog.php
3 files changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/.gitignore b/.gitignore
index 9f8054b..76a5efc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
 /.tox
+/make-deploy-notes/auth.php
diff --git a/make-deploy-notes/auth.php.example 
b/make-deploy-notes/auth.php.example
new file mode 100644
index 000..7403ac5
--- /dev/null
+++ b/make-deploy-notes/auth.php.example
@@ -0,0 +1,2 @@
+?php
+$wiki-login( 'wiki username', 'wiki password' );
diff --git a/make-deploy-notes/uploadChangelog.php 
b/make-deploy-notes/uploadChangelog.php
index 6c62db8..366f38e 100644
--- a/make-deploy-notes/uploadChangelog.php
+++ b/make-deploy-notes/uploadChangelog.php
@@ -47,7 +47,14 @@
 require_once( __DIR__ . '/botclasses.php' );
 $wiki = new wikipedia( 'https://www.mediawiki.org/w/api.php' );
 
-$wiki-login( '', '' );
+
+// auth.php should contain the following:
+// ?php
+// $wiki-login( 'username', 'password' );
+
+if (file_exists(__DIR__.'/auth.php')) {
+   require_once( __DIR__.'/auth.php');
+}
 
 list( $major, $minor ) = getMajorMinor( $version );
 $wiki-edit( MediaWiki 1.{$major}/wmf{$minor}/Changelog, $output, Update 
changelog for $version, false, false );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44d236e0e3e85e01d5b46509096bd1810b124f6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: 20after4 mmod...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add logrotate fragment for graphite-web - change (operations/puppet)

2015-03-11 Thread coren (Code Review)

coren has uploaded a new change for review.

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

Change subject: Add logrotate fragment for graphite-web
..

Add logrotate fragment for graphite-web

(Currrently, no rotation is active)

Change-Id: Idc20ce6a3f5c577160c2529ecc939b20dc70
---
A modules/graphite/files/graphite-web-logrotate
M modules/graphite/manifests/web.pp
2 files changed, 31 insertions(+), 0 deletions(-)


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

diff --git a/modules/graphite/files/graphite-web-logrotate 
b/modules/graphite/files/graphite-web-logrotate
new file mode 100644
index 000..e8c0718
--- /dev/null
+++ b/modules/graphite/files/graphite-web-logrotate
@@ -0,0 +1,21 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+#
+#
+#  Logrotate fragment for graphite-web
+#
+#   source: modules/graphite/files/graphite-web-logrotate
+#   from:   graphite::web
+#
+/var/log/graphite-web/*.log {
+   daily
+   compress
+   size 300M
+   rotate 0
+   missingok
+   nocreate
+   sharedscripts
+   postrotate
+test ! -x /sbin/uwsgictl || /sbin/uwsgictl restart
+   endscript
+}
diff --git a/modules/graphite/manifests/web.pp 
b/modules/graphite/manifests/web.pp
index 715b8a6..7090a31 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -139,4 +139,14 @@
 unless  = /usr/local/sbin/graphite-auth check ${admin_user} 
${admin_pass},
 require = File['/usr/local/sbin/graphite-auth'],
 }
+
+file { '/etc/logrotate.d/graphite-web':
+ensure  = present,
+mode= '0444',
+owner   = 'root',
+group   = 'root',
+source  = 'puppet:///modules/graphite/graphite-web-logrotate',
+require = File['/var/log/graphite-web'],
+}
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc20ce6a3f5c577160c2529ecc939b20dc70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Width adjustments in entityview css - change (mediawiki...Wikibase)

2015-03-11 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Width adjustments in entityview css
..

Width adjustments in entityview css

to avoid excessive wrapping of text in snak values

Change-Id: I58ca8b537a6cea54aa174d08f9448fb238ee9560
---
M lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
index 065e47a..25e4086 100644
--- 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
+++ 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityview.css
@@ -5,15 +5,14 @@
 .wikibase-entityview {
clear: both; /* wrap around success message */
float: left; /* float left to let widget container float right next to 
it */
-   width: 100%;
 }
 
 .wikibase-entityview  * {
float: left;
-   max-width: 65em;
 }
 
 .wikibase-entityview .wikibase-entityview-main {
margin: 0 2em 2em 0;
+   max-width: 65em;
width: 100%; /* required because it's a floating block element now */
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58ca8b537a6cea54aa174d08f9448fb238ee9560
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] migrate-patch utility to retain security patches - change (mediawiki...release)

2015-03-11 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: migrate-patch utility to retain security patches
..

migrate-patch utility to retain security patches

this utility forward-migrates security patches from
a previous wmf branch to a newly cut wmf branch.

Change-Id: I9dae598d09267abceded0b28f80e0301b537
---
A migrate-patch/migrate-patch
A migrate-patch/migrate-submodule-patch
2 files changed, 35 insertions(+), 0 deletions(-)


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

diff --git a/migrate-patch/migrate-patch b/migrate-patch/migrate-patch
new file mode 100755
index 000..4f56ed9
--- /dev/null
+++ b/migrate-patch/migrate-patch
@@ -0,0 +1,24 @@
+STAGE=/srv/mediawiki-staging
+#OLDVERSION=`$STAGE/multiversion/activeMWVersions|cut -d   -f2`
+OLDVERSION=$1
+TMPFILE=`mktemp`
+MIGRATE_PATCH_DIR=`dirname $0`
+
+set -e
+
+if [ ! -d $OLDVERSION ]; then
+   echo 'USAGE: migrate-patch $STAGE/php-VERSION'
+   echo
+echo 'Note: current working directory should be set to the root'
+   echo '  of the new branch checkout'
+   echo
+   exit 1
+fi
+
+pushd $STAGE/php-$OLDVERSION/
+git format-patch -k --stdout @{u}.. $TMPFILE
+popd
+cat $TMPFILE | git am -3 -k
+rm $TMPFILE
+
+git submodule summary | grep '\*.*' | cut -d ' ' -f 2-3 | xargs 
$MIGRATE_PATCH_DIR/migrate-submodule-patch $STAGE/php-$OLDVERSION/
diff --git a/migrate-patch/migrate-submodule-patch 
b/migrate-patch/migrate-submodule-patch
new file mode 100755
index 000..9f04613
--- /dev/null
+++ b/migrate-patch/migrate-submodule-patch
@@ -0,0 +1,11 @@
+#!/bin/bash
+TMPFILE=`mktemp`
+
+set -e
+
+pushd $1
+cd $2
+git format-patch -k --stdout $3  $TMPFILE
+popd
+cat $TMPFILE | git am -3 -k
+rm $TMPFILE

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dae598d09267abceded0b28f80e0301b537
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: 20after4 mmod...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update VisualEditor for cherry-picks - change (mediawiki/core)

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

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

Change subject: Update VisualEditor for cherry-picks
..


Update VisualEditor for cherry-picks

Unbreaks fatally broken code that, in a very fortunate accident, wasn't synced.

New changes:
4e30627 Add composer entry point for phpcs and linting
4f4ab81 Update JSDuck config to standard jsduck.json
5435975 Follow-up I5918367: Add new classes to jsduck.json
eac5ffe Fix broken .gitreview
3c4fa9c Follow-up 02923f694630: fix submodule
a39fce8 Update VE core submodule for cherry-pick

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 02923f6..a39fce8 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 02923f694630d9c1a30758324e661bf6fe16c00b
+Subproject commit a39fce8991e7dd29b297ca89077239f15a4b900a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic46d819ffa272fba5424415e840bdc20a66628f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] adding kartik to statistics-users - change (operations/puppet)

2015-03-11 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: adding kartik to statistics-users
..


adding kartik to statistics-users

milimetric requested additional users for managing the lang eng
dashboard

T91625

Change-Id: Ib33b11f9e90a80890fd940c4946936430c6471cc
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index fa285be..d56c777 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -176,7 +176,7 @@
   qchris, tnegrin, marktraceur, msyed, nuria, leila, gilles, 
haithams,
   dbrant, tgr, haithams, handrade, dr0ptp4kt, brion, bsitzmann,
   deskana, jzerebecki, dduvall, nettrom, mforns, jkatz, 
ebernhardson,
-  mlitn, tbayer, ananthrk, joal, tomasz]
+  mlitn, tbayer, ananthrk, joal, tomasz, kartik]
   statistics-admins:
 posix_name: stats
 description: access files created by stats user cron jobs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib33b11f9e90a80890fd940c4946936430c6471cc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH r...@wikimedia.org
Gerrit-Reviewer: RobH r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [BrowserTest] update locator - change (mediawiki...VisualEditor)

2015-03-11 Thread Cmcmahon (Code Review)

Cmcmahon has uploaded a new change for review.

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

Change subject: [BrowserTest] update locator
..

[BrowserTest] update locator

Locator for the Insert/More link changed

Change-Id: I2d4f68edb4bfad6813e9138afb77efadd75b2986
---
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git 
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 84aef68..ab55703 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -170,7 +170,7 @@
   span(:ve_link_ui, class: 'oo-ui-widget oo-ui-widget-enabled 
oo-ui-labelElement-label oo-ui-labelWidget oo-ui-processDialog-title 
oo-ui-labelElement', text: 'Link')
   span(:ve_media_menu, class: 'oo-ui-iconElement-icon oo-ui-icon-picture')
   span(:ve_more_markup_options, css: 
'span.oo-ui-tool-name-more-fewer:nth-child(10)  a:nth-child(1)  
span:nth-child(2)')
-  a(:ve_more_references_options, css: 
'span.oo-ui-tool-name-more-fewer:nth-child(9)  a:nth-child(1)')
+  a(:ve_more_references_options, css: '.ve-test-toolbar-insert  
div:nth-child(2)  span:nth-child(8)  a:nth-child(1)')
   span(:ve_numbering, class: 'oo-ui-iconElement-icon oo-ui-icon-number-list')
   span(:ve_references, class: 'oo-ui-iconElement-icon oo-ui-icon-references')
   span(:ve_strikethrough, class: 'oo-ui-iconElement-icon 
oo-ui-icon-strikethrough-s')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d4f68edb4bfad6813e9138afb77efadd75b2986
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update JSDuck config to standard jsduck.json - change (mediawiki...VisualEditor)

2015-03-11 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Update JSDuck config to standard jsduck.json
..

Update JSDuck config to standard jsduck.json

Also
* This way we don't need to pass the --config=jsduck.config.json
  parameter but can run plain 'jsduck' in Jenkins. Allowing it
  to use the standard job template for testing.

* Move processes=0 to jsduck.json.
  Workaround for https://github.com/senchalabs/jsduck/issues/525

* Use standard ' - Documentation' suffix, which makes the first
  part of the title render in bold (similar to how we do in OOjs
  and OOjs UI already).

Change-Id: I6c9c7a1f29df0a72dc8cd0d37a83aaef23068062
(cherry picked from commit 5813d5327158a33befec26a8eb3ebbf119525e23)
---
D .docs/config.json
R .jsduck/CustomTags.rb
R .jsduck/categories.json
R .jsduck/eg-iframe.html
R .jsduck/eg-iframe.html.template
R .jsduck/external.js
R .jsduck/generate.sh
R .jsduck/mw-categories.json
M Gruntfile.js
M bin/generateDocs.sh
A jsduck.json
11 files changed, 30 insertions(+), 33 deletions(-)


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

diff --git a/.docs/config.json b/.docs/config.json
deleted file mode 100644
index 81a5751..000
--- a/.docs/config.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-   --title: VisualEditor Code Documentation,
-   --categories: ../.docs/categories.json,
-   --eg-iframe: ../.docs/eg-iframe.html,
-   --tags: ./CustomTags.rb,
-   --warnings: [-nodoc(class,public)],
-   --builtin-classes: true,
-   --warnings-exit-nonzero: true,
-   --external: 
HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,
-   --output: ../docs,
-   --: [
-   ./external.js,
-   ../lib/ve/.jsduck/external.js,
-   ../lib/ve/lib/oojs,
-   ../lib/ve/lib/oojs-ui,
-   ../lib/ve/lib/unicodejs,
-   ../lib/ve/src,
-   ../lib/ve/tests,
-   ../modules/ve-mw
-   ]
-}
diff --git a/.docs/CustomTags.rb b/.jsduck/CustomTags.rb
similarity index 100%
rename from .docs/CustomTags.rb
rename to .jsduck/CustomTags.rb
diff --git a/.docs/categories.json b/.jsduck/categories.json
similarity index 100%
rename from .docs/categories.json
rename to .jsduck/categories.json
diff --git a/.docs/eg-iframe.html b/.jsduck/eg-iframe.html
similarity index 100%
rename from .docs/eg-iframe.html
rename to .jsduck/eg-iframe.html
diff --git a/.docs/eg-iframe.html.template b/.jsduck/eg-iframe.html.template
similarity index 100%
rename from .docs/eg-iframe.html.template
rename to .jsduck/eg-iframe.html.template
diff --git a/.docs/external.js b/.jsduck/external.js
similarity index 100%
rename from .docs/external.js
rename to .jsduck/external.js
diff --git a/.docs/generate.sh b/.jsduck/generate.sh
similarity index 100%
rename from .docs/generate.sh
rename to .jsduck/generate.sh
diff --git a/.docs/mw-categories.json b/.jsduck/mw-categories.json
similarity index 100%
rename from .docs/mw-categories.json
rename to .jsduck/mw-categories.json
diff --git a/Gruntfile.js b/Gruntfile.js
index 9618290..6c369d1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,9 +20,9 @@
pkg: grunt.file.readJSON( 'package.json' ),
jsduckcatconfig: {
main: {
-   target: '.docs/categories.json',
+   target: '.jsduck/categories.json',
from: [
-   '.docs/mw-categories.json',
+   '.jsduck/mw-categories.json',
{
file: 
'lib/ve/.jsduck/categories.json',
aggregate: {
@@ -42,8 +42,8 @@
},
buildloader: {
egiframe: {
-   targetFile: '.docs/eg-iframe.html',
-   template: '.docs/eg-iframe.html.template',
+   targetFile: '.jsduck/eg-iframe.html',
+   template: '.jsduck/eg-iframe.html.template',
modules: modules,
load: [ 'visualEditor.desktop.standalone' ],
pathPrefix: 'lib/ve/',
@@ -56,7 +56,7 @@
},
all: [
'*.js',
-   '{.docs,build}/**/*.js',
+   '{.jsduck,build}/**/*.js',
'modules/**/*.js'
]
},
diff --git a/bin/generateDocs.sh b/bin/generateDocs.sh
index 5cf9422..eeba646 100755
--- a/bin/generateDocs.sh
+++

[MediaWiki-commits] [Gerrit] FeedItem: Use full URL with protocol for id/guid in Atom... - change (mediawiki/core)

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

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

Change subject: FeedItem: Use full URL with protocol for id/guid in 
Atom/RSS feeds
..


FeedItem: Use full URL with protocol for id/guid in Atom/RSS feeds

Bug: T89975
Change-Id: Ib84932b70aa8194b7bdabe7c90d7fdcc66054a1c
---
M includes/Feed.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Feed.php b/includes/Feed.php
index 9be3f57..600b136 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -92,7 +92,7 @@
 */
public function getUniqueId() {
if ( $this-uniqueId ) {
-   return $this-xmlEncode( $this-uniqueId );
+   return $this-xmlEncode( wfExpandUrl( $this-uniqueId, 
PROTO_CURRENT ) );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib84932b70aa8194b7bdabe7c90d7fdcc66054a1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Spage sp...@wikimedia.org
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 composer entry point for phpcs and linting - change (mediawiki...VisualEditor)

2015-03-11 Thread Krinkle (Code Review)

Krinkle has submitted this change and it was merged.

Change subject: Add composer entry point for phpcs and linting
..


Add composer entry point for phpcs and linting

Bug: T90943
Change-Id: I0a95ef0f12149aaccdc3e7383c99b694a9dce990
(cherry picked from commit 5ffdabd2db875f95598afd2947cfbec6712cb19d)
---
M .gitignore
A composer.json
2 files changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 7ef91db..29103a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 # Install and build artifacts
 /docs
 node_modules
+composer.lock
+vendor
 
 # OS
 .DS_Store
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..800bf15
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+   require-dev: {
+   jakub-onderka/php-parallel-lint: 0.8.0,
+   mediawiki/mediawiki-codesniffer: 0.1.0
+   },
+   scripts: {
+   test: [
+   parallel-lint . --exclude vendor,
+   phpcs 
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki 
--extensions=php,php5,inc --ignore=vendor -p .
+   ]
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a95ef0f12149aaccdc3e7383c99b694a9dce990
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add proper mediawiki.page.watch.ajax dependency - change (mediawiki...Wikibase)

2015-03-11 Thread WMDE

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

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

Change subject: Add proper mediawiki.page.watch.ajax dependency
..

Add proper mediawiki.page.watch.ajax dependency

Looks like the module was loaded by default but isn't any more.

Bug: T87640
Change-Id: I313d36b7b2c8787611ad0395413b27a90c27aa14
---
M repo/resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 9f7ff08..530a5e7 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -146,6 +146,7 @@
'wikibase.ui.entityViewInit.js' // should 
probably be adjusted for more modularity
),
'dependencies' = array(
+   'mediawiki.page.watch.ajax',
'mediawiki.user',
'mw.config.values.wbRepo',
'jquery.wikibase.itemview',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I313d36b7b2c8787611ad0395413b27a90c27aa14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de

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

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

2015-03-11 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Update VE core submodule for cherry-pick
..

Update VE core submodule for cherry-pick

New changes:
7539aba Unbreak cursoring inside table cells

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


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

diff --git a/lib/ve b/lib/ve
index ecd7944..7539aba 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit ecd7944f3a4a29a784a89e3dd2e5d0133cc1e805
+Subproject commit 7539aba68b185d1eda316cc885ecc8aca715e776

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18d4a4b1a6f9a37472c0a2830a3b2eac5858cc1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add white background to overlapping edit buttons - change (mediawiki...Wikibase)

2015-03-11 Thread WMDE

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

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

Change subject: Add white background to overlapping edit buttons
..

Add white background to overlapping edit buttons

This is an alternative proposal to Ideafcd1. This solves the problem
of the edit buttons becoming unreadable. It's not a perfect solution,
especially because it does not fix the problem of the text *under* the
edit buttons becoming unreadable. This is on purpose. I do not want to
add a padding somwhere that wastes space and is only useful in certain
edge cases.

Note that this issue will probably be solved with the new UI.

Bug: T89956
Change-Id: I9b98115efe337218404b35358e80ab67df99cbe8
---
M 
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entitytermsview.css
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entitytermsview.css
 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entitytermsview.css
index 6bb0465..2bb2b61 100644
--- 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entitytermsview.css
+++ 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entitytermsview.css
@@ -74,6 +74,11 @@
position: relative;
 }
 
+.wikibase-entitytermsview .wikibase-toolbar {
+   background-color: rgba(255, 255, 255, 0.8);
+   text-shadow: 0 0 2px #FFF;
+}
+
 .wikibase-entitytermsview .wikibase-entitytermsview-heading-container  
.wikibase-toolbar-container {
float: right;
margin-top: 1.9em;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b98115efe337218404b35358e80ab67df99cbe8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Adding dns entries including ipv6 for cp1071-1074 - change (operations/dns)

2015-03-11 Thread Cmjohnson (Code Review)

Cmjohnson has submitted this change and it was merged.

Change subject: Adding dns entries including ipv6 for cp1071-1074
..


Adding dns entries including ipv6 for cp1071-1074

Change-Id: Ib277510fbbdaf9c72600a2b904d5aea13572ef4d
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/wmnet
3 files changed, 32 insertions(+), 1 deletion(-)

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



diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 2c4d65d..877fa78 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -157,6 +157,10 @@
 
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae4-1020.cr1-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae4-1020.cr2-eqiad.wikimedia.org.
+5.0.1.0.8.4.0.0.4.6.0.0.0.1.0.0 1H IN PTR   cp1071.eqiad.wmnet.
+6.0.1.0.8.4.0.0.4.6.0.0.0.1.0.0 1H IN PTR   cp1072.eqiad.wmnet.
+7.0.1.0.8.4.0.0.4.6.0.0.0.1.0.0 1H IN PTR   cp1073.eqiad.wmnet.
+8.0.1.0.8.4.0.0.4.6.0.0.0.1.0.0 1H IN PTR   cp1074.eqiad.wmnet.
 
 ; analytics1-d-eqiad (2620:0:861:108::/64)
 $ORIGIN 8.0.1.0.{{ zonename }}.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 397f236..e72ac36 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1031,7 +1031,10 @@
 102 1H  IN PTR  mc1014.eqiad.wmnet.
 103 1H  IN PTR  mc1015.eqiad.wmnet.
 104 1H  IN PTR  mc1016.eqiad.wmnet.
-
+105 1H  IN PTR  cp1071.eqiad.wmnet.
+106 1H  IN PTR  cp1072.eqiad.wmnet.
+107 1H  IN PTR  cp1073.eqiad.wmnet.
+108 1H  IN PTR  cp1074.eqiad.wmnet.
 
 $ORIGIN 49.64.{{ zonename }}.
 1   1H IN PTR   vl1020-eth3.lvs1001.wikimedia.org.
@@ -1656,6 +1659,14 @@
 113 1H  IN PTR  restbase1005.mgmt.eqiad.wmnet.
 114 1H  IN PTR  wmf4661.mgmt.eqiad.wmnet.
 114 1H  IN PTR  restbase1006.mgmt.eqiad.wmnet.
+115 1H  IN PTR  wmf4665.mgmt.eqiad.wmnet.
+115 1H  IN PTR  cp1071.mgmt.eqiad.wmnet.
+116 1H  IN PTR  wmf4666.mgmt.eqiad.wmnet.
+116 1H  IN PTR  cp1072.mgmt.eqiad.wmnet.
+117 1H  IN PTR  wmf4667.mgmt.eqiad.wmnet.
+117 1H  IN PTR  cp1073.mgmt.eqiad.wmnet.
+118 1H  IN PTR  wmf4668.mgmt.eqiad.wmnet.
+118 1H  IN PTR  cp1074.mgmt.eqiad.wmnet.
 
 $ORIGIN 3.65.{{ zonename }}.
 
diff --git a/templates/wmnet b/templates/wmnet
index 2bbb3ad..cf76d56 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -186,6 +186,14 @@
  1H IN   2620:0:861:101:10:64:0:106
 cp1070   1H IN A 10.64.0.107
  1H IN   2620:0:861:101:10:64:0:107
+cp1071   1H IN A 10.64.48.105
+ 1H IN   2620:0:861:107:10:64:48:105
+cp1072   1H IN A 10.64.48.106
+ 1H IN   2620:0:861:107:10:64:48:106
+cp1073   1H IN A 10.64.48.107
+ 1H IN   2620:0:861:107:10:64:48:107
+cp1074   1H IN A 10.64.48.108
+ 1H IN   2620:0:861:107:10:64:48:108
 curium  1H  IN A10.64.0.170
 1H  IN  2620:0:861:101:10:64:0:170
 db1001  1H  IN A10.64.0.5
@@ -885,6 +893,14 @@
 cp1068  1H  IN A10.65.2.68
 cp1069  1H  IN A10.65.2.69
 cp1070  1H  IN A10.65.2.70
+wmf4665 1H  IN A10.65.2.115
+cp1071  1H  IN A10.65.2.115
+wmf4666 1H  IN A10.65.2.116
+cp1072  1H  IN A10.65.2.116
+wmf4667 1H  IN A10.65.2.117
+cp1073  1H  IN A10.65.2.117
+wmf4668 1H  IN A10.65.2.118
+cp1074  1H  IN A10.65.2.119
 tmh1001 1H  IN A10.65.3.51
 WMF3426 1H  IN A10.65.3.51
 zirconium   1H  IN A10.65.3.52

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib277510fbbdaf9c72600a2b904d5aea13572ef4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] varnish: catch planet.wm.o as well - change (operations/puppet)

2015-03-11 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: varnish: catch planet.wm.o as well
..


varnish: catch planet.wm.o as well

Just add a straight == clause for catching the
planet.wm.o domain.

Bug:T92051
Change-Id: I03aa53f4e48e198d8f000c33e4383b3e850a4344
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 3d4aacf..d786e73 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -77,7 +77,7 @@
set req.backend = analytics1001;
}
}
-   elsif (req.http.Host ~ .*\.planet\.wikimedia\.org) {
+   elsif (req.http.Host ~ .*\.planet\.wikimedia\.org || req.http.Host == 
planet.wikimedia.org) {
set req.backend = zirconium;
} elsif (req.http.Host == etherpad.wikimedia.org) {
set req.backend = zirconium;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I03aa53f4e48e198d8f000c33e4383b3e850a4344
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Southparkfan southparkfan...@hotmail.com
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 composer entry point for phpcs and linting - change (mediawiki...VisualEditor)

2015-03-11 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Add composer entry point for phpcs and linting
..

Add composer entry point for phpcs and linting

Bug: T90943
Change-Id: I0a95ef0f12149aaccdc3e7383c99b694a9dce990
(cherry picked from commit 5ffdabd2db875f95598afd2947cfbec6712cb19d)
---
M .gitignore
A composer.json
2 files changed, 14 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 7ef91db..29103a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 # Install and build artifacts
 /docs
 node_modules
+composer.lock
+vendor
 
 # OS
 .DS_Store
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..800bf15
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+   require-dev: {
+   jakub-onderka/php-parallel-lint: 0.8.0,
+   mediawiki/mediawiki-codesniffer: 0.1.0
+   },
+   scripts: {
+   test: [
+   parallel-lint . --exclude vendor,
+   phpcs 
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki 
--extensions=php,php5,inc --ignore=vendor -p .
+   ]
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a95ef0f12149aaccdc3e7383c99b694a9dce990
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix old serialized UUIDs in logging table - change (mediawiki...Flow)

2015-03-11 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Fix old serialized UUIDs in logging table
..

Fix old serialized UUIDs in logging table

Change-Id: I27a2513e1fb2bc3af771ea1d72c75da026b15d27
---
M maintenance/FlowFixLog.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/maintenance/FlowFixLog.php b/maintenance/FlowFixLog.php
index 94414a0..8e1208b 100644
--- a/maintenance/FlowFixLog.php
+++ b/maintenance/FlowFixLog.php
@@ -27,7 +27,7 @@
}
 
protected function getUpdateKey() {
-   return 'FlowFixLog';
+   return 'FlowFixLog:version2';
}
 
protected function doDBUpdates() {
@@ -134,6 +134,12 @@
$params['topicId'] = $topic-getId();
}
 
+   // we used to save (serialized) UUID objects; now we just save 
the
+   // alphanumeric representation
+   foreach ( $params as $key = $value ) {
+   $params[$key] = $value instanceof UUID ? 
$value-getAlphadecimal() : $value;
+   }
+
// re-serialize params (UUID used to serialize more verbose; 
might
// as well shrink that down now that we're updating anyway...)
$updates['log_params'] = serialize( $params );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27a2513e1fb2bc3af771ea1d72c75da026b15d27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix broken .gitreview file - change (VisualEditor/VisualEditor)

2015-03-11 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Fix broken .gitreview file
..

Fix broken .gitreview file

This should have been updated by make-wmf-branch but wasn't.

Change-Id: I89528f528d70906201f1040ffdf5de3627ccc0d0
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/20/195920/1

diff --git a/.gitreview b/.gitreview
index 5b28d55..e118572 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=VisualEditor/VisualEditor.git
-defaultbranch=master
+defaultbranch=wmf/1.25wmf20
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89528f528d70906201f1040ffdf5de3627ccc0d0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com

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

[MediaWiki-commits] [Gerrit] planet: rm SSL settings and ports.conf.ssl - change (operations/puppet)

2015-03-11 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: planet: rm SSL settings and ports.conf.ssl
..


planet: rm SSL settings and ports.conf.ssl

No SSL related settings are used here anymore, we are terminating
SSL at misc-web nginx.

Change-Id: I222c7ff1a1de3a719a4033de84acefb40b7d0786
---
D modules/planet/files/apache/ports.conf.ssl
M modules/planet/manifests/apachesite.pp
M modules/planet/manifests/index_site.pp
3 files changed, 0 insertions(+), 14 deletions(-)

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



diff --git a/modules/planet/files/apache/ports.conf.ssl 
b/modules/planet/files/apache/ports.conf.ssl
deleted file mode 100644
index 25a0d02..000
--- a/modules/planet/files/apache/ports.conf.ssl
+++ /dev/null
@@ -1,10 +0,0 @@
-# ! this file is managed by puppet !
-# simple Apache ports.conf with enabled SSL (NameVirtualHost *:443)
-
-NameVirtualHost *:80
-Listen 80
-
-IfModule mod_ssl.c
-NameVirtualHost *:443
-Listen 443
-/IfModule
diff --git a/modules/planet/manifests/apachesite.pp 
b/modules/planet/manifests/apachesite.pp
index 906ac0f..e9c2c5e 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -1,8 +1,6 @@
 # defined type: an apache site config for a planet-venus language version
 define planet::apachesite {
 
-$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
-
 apache::site { ${title}.planet.${planet::planet_domain_name}:
 content = template('planet/apache/planet-language.erb'),
 }
diff --git a/modules/planet/manifests/index_site.pp 
b/modules/planet/manifests/index_site.pp
index 8cc7f03..d0b08cb 100644
--- a/modules/planet/manifests/index_site.pp
+++ b/modules/planet/manifests/index_site.pp
@@ -1,8 +1,6 @@
 # sets up the planet-venus index/portal site
 class planet::index_site {
 
-$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
-
 apache::site { planet.${planet::planet_domain_name}:
 content = template('planet/apache/planet.erb'),
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I222c7ff1a1de3a719a4033de84acefb40b7d0786
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] adding katrik to statistics-users - change (operations/puppet)

2015-03-11 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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

Change subject: adding katrik to statistics-users
..

adding katrik to statistics-users

milimetric requested additional users for managing the lang eng
dashboard

T91625

Change-Id: Ib33b11f9e90a80890fd940c4946936430c6471cc
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index fa285be..d56c777 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -176,7 +176,7 @@
   qchris, tnegrin, marktraceur, msyed, nuria, leila, gilles, 
haithams,
   dbrant, tgr, haithams, handrade, dr0ptp4kt, brion, bsitzmann,
   deskana, jzerebecki, dduvall, nettrom, mforns, jkatz, 
ebernhardson,
-  mlitn, tbayer, ananthrk, joal, tomasz]
+  mlitn, tbayer, ananthrk, joal, tomasz, kartik]
   statistics-admins:
 posix_name: stats
 description: access files created by stats user cron jobs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib33b11f9e90a80890fd940c4946936430c6471cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH r...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] mw.loader: Replace log() calls with mw.track events - change (mediawiki/core)

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

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

Change subject: mw.loader: Replace log() calls with mw.track events
..


mw.loader: Replace log() calls with mw.track events

This allows other consumers (such as an error logging backend) to
subscribe to these errors.

Change-Id: I157e2fb5c6b4d77736fcaf0a87c624e76a833161
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 65 insertions(+), 36 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 2e78c1c..17b06ce 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -17,31 +17,6 @@
trackQueue = [];
 
/**
-* Log a message to window.console, if possible.
-*
-* Useful to force logging of some  errors that are otherwise hard to 
detect (i.e., this logs
-* also in production mode). Gets console references in each invocation 
instead of caching the
-* reference, so that debugging tools loaded later are supported (e.g. 
Firebug Lite in IE).
-*
-* @private
-* @method log_
-* @param {string} msg Text for the log entry.
-* @param {Error} [e]
-*/
-   function log( msg, e ) {
-   var console = window.console;
-   if ( console  console.log ) {
-   console.log( msg );
-   // If we have an exception object, log it to the error 
channel to trigger a
-   // proper stacktraces in browsers that support it. No 
fallback as we have no browsers
-   // that don't support error(), but do support log().
-   if ( e  console.error ) {
-   console.error( String( e ), e );
-   }
-   }
-   }
-
-   /**
 * Create an object that can be read from or written to from methods 
that allow
 * interaction both with single and multiple properties at once.
 *
@@ -679,10 +654,25 @@
 *   error is not module-related or the module cannot 
be easily identified due to
 *   batched handling.
 * @param {string} source Source of the error. Possible 
values:
+*
 *   - style: stylesheet error (only affects old IE 
where a special style loading method
 * is used)
 *   - load-callback: exception thrown by user callback
 *   - module-execute: exception thrown by module code
+*   - store-eval: could not evaluate module code 
cached in localStorage
+*   - store-localstorage-init: localStorage or JSON 
parse error in mw.loader.store.init
+*   - store-localstorage-json: JSON conversion error 
in mw.loader.store.set
+*   - store-localstorage-update: localStorage or JSON 
conversion error in mw.loader.store.update
+*/
+
+   /**
+* Fired via mw.track on resource loading error 
conditions.
+*
+* @event resourceloader_assert
+* @param {string} source Source of the error. Possible 
values:
+*
+*   - bug-T59567: failed to cache script due to an 
Opera function - string conversion
+* bug; see 
https://phabricator.wikimedia.org/T59567 for details
 */
 
/**
@@ -868,7 +858,6 @@
try {

styleEl.styleSheet.cssText += cssText;
} catch ( e ) {
-   log( 
'Stylesheet error', e );
mw.track( 
'resourceloader.exception', { exception: e, source: 'stylesheet' } );
}
} else {
@@ -1132,9 +1121,7 @@
} catch ( e ) {
// A user-defined 
callback raised an exception.
// Swallow it to 
protect our state machine!
-   log( 'Exception thrown 
by user callback', e );
-   mw.track( 
'resourceloader.exception',
-

[MediaWiki-commits] [Gerrit] Don't immediately request data when not saved - change (wikimedia...dash)

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

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

Change subject: Don't immediately request data when not saved
..


Don't immediately request data when not saved

Change-Id: Ie50bd52f2c3bfa4071f44a64af7e884b01239a15
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 13 insertions(+), 19 deletions(-)

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



diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 0e0dff8..2fdf2fd 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -10,12 +10,12 @@
 
self.retrievedResults   = ko.observable();
self.queryStringSQL = ko.observable('This widget hasn\'t 
been set up yet!');
-   self.config = params.configuration;
+   self.config = params.configuration || {};
self.instanceID = params.widgetInstance;
self.widgetCode = params.widgetCode;
self.preDataLoading = ko.observable(true);
-   self.dataLoading= ko.observable(!!self.config);
-   self.chartSaved = ko.observable(!!self.config);
+   self.dataLoading= 
ko.observable(!!params.configuration);
+   self.chartSaved = 
ko.observable(!!params.configuration);
self.optionStateChanged = ko.observable(false);
self.chartWidth = ko.observable('900');
self.chartHeight= ko.observable('550');
diff --git a/src/components/widgets/x-by-y/x-by-y.js 
b/src/components/widgets/x-by-y/x-by-y.js
index e12e694..7a42f96 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -13,17 +13,19 @@
WidgetBase.call( this, params );
var self = this;
 
-   var chartDataCall = 
self.getChartData(params.configuration.queryString);
+   if ( self.chartSaved() ) {
+   var chartDataCall = 
self.getChartData(self.config.queryString);
 
-   $.when( chartDataCall ).then( function( dataArray ){
-   self.retrievedResults(dataArray.results);
-   self.dataLoading(false);
-   self.preDataLoading(false);
+   $.when( chartDataCall ).then( function( dataArray ){
+   self.retrievedResults(dataArray.results);
+   self.dataLoading(false);
+   self.preDataLoading(false);
 
-   self.chartData = 
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
+   self.chartData = 
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
 
-   self.makeChart(self.chartData);
-   });
+   self.makeChart(self.chartData);
+   });
+   }
 
self.showSlice = ko.observable();
self.bySlice = ko.observable();
@@ -271,14 +273,6 @@
break;
}
};
-
-   if(params.configuration){
-   self.chartSaved(true);
-   //self.makeChart(self.retrievedResults());
-
-   } else {
-   self.chartSaved(false);
-   }
 
self.showPanelBody = function(area){
$('#'+area+'body').toggleClass('hide');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie50bd52f2c3bfa4071f44a64af7e884b01239a15
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] toss mw-logs after 90 days, not 180 - change (operations/puppet)

2015-03-11 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

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

Change subject: toss mw-logs after 90 days, not 180
..

toss mw-logs after 90 days, not 180

Change-Id: Ifcb0bcee0435ac705fa45d93258e9a670c3059eb
---
M files/misc/scripts/mw-log-cleanup
1 file changed, 2 insertions(+), 4 deletions(-)


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

diff --git a/files/misc/scripts/mw-log-cleanup 
b/files/misc/scripts/mw-log-cleanup
index d6dcb9a..4f0efde 100755
--- a/files/misc/scripts/mw-log-cleanup
+++ b/files/misc/scripts/mw-log-cleanup
@@ -4,15 +4,13 @@
 
 
 # Remove logs which are beyond the logrotate expiry time
+# or past the data retention limits
 # logrotate will miss archived logs which were deleted in the parent directory.
-find /a/mw-log/archive -mtime +180 -delete
+find /a/mw-log/archive -mtime +90 -delete
 
 # Remove API logs after 30 days since they are particularly bulky and will fill
 # fluorine's disk if left for 180 days
 find /a/mw-log/archive -name api.log-\* -mtime +30 -delete
-
-# API feature logs are similarly enormous.
-find /a/mw-log/archive -name api-feature-usage.log-\* -mtime +90 -delete
 
 # Remove XFF logs before the CheckUser expiry time
 find /a/mw-log/archive -name xff.log-\* -mtime +88 -delete

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcb0bcee0435ac705fa45d93258e9a670c3059eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add cron job to drop refined webrequest partitions and data - change (operations/puppet)

2015-03-11 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Add cron job to drop refined webrequest partitions and data
..

Add cron job to drop refined webrequest partitions and data

Change-Id: I85d26ca7fa71dc4beada7167ff71038ff09cee48
---
M manifests/role/analytics/refinery.pp
1 file changed, 12 insertions(+), 3 deletions(-)


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

diff --git a/manifests/role/analytics/refinery.pp 
b/manifests/role/analytics/refinery.pp
index f8c9ea4..18aebfa 100644
--- a/manifests/role/analytics/refinery.pp
+++ b/manifests/role/analytics/refinery.pp
@@ -72,10 +72,19 @@
 
 $log_file = 
${role::analytics::refinery::log_dir}/drop-webrequest-partitions.log
 
-# keep this many days of data
-$retention_days = 31
+# keep this many days of raw data
+$raw_retention_days = 31
 cron { 'refinery-drop-webrequest-partitions':
-command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${retention_days} -D wmf_raw -l /wmf/data/raw/webrequest  ${log_file} 21,
+command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${raw_retention_days} -D wmf_raw -l /wmf/data/raw/webrequest -w raw  
${log_file} 21,
+user= 'hdfs',
+minute  = '15',
+hour= '*/4',
+}
+
+# keep this many days of refined data
+$raw_retention_days = 62
+cron { 'refinery-drop-webrequest-partitions':
+command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${refined_retention_days} -D wmf -l /wmf/data/wmf/webrequest -w refined  
${log_file} 21,
 user= 'hdfs',
 minute  = '15',
 hour= '*/4',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85d26ca7fa71dc4beada7167ff71038ff09cee48
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Run on trusty nodes - change (labs...grrrit)

2015-03-11 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: Run on trusty nodes
..

Run on trusty nodes

They have a much better version of node. This doesn't actually
run on the precise nodes at all.

Change-Id: I2a6108597100ba96efda1fd330b8babe13f09756
---
M src/kick.bash
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/21/195921/1

diff --git a/src/kick.bash b/src/kick.bash
index c454edd..cf7348f 100755
--- a/src/kick.bash
+++ b/src/kick.bash
@@ -2,4 +2,4 @@
 # Stop current job if it exists, and start a new one
 jstop lolrrit-wm
 sleep 2s # Stupid hack to make sure the job is killed
-jsub -N lolrrit-wm -mem 1G -continuous node 
/data/project/lolrrit-wm/lolrrit-wm/src/relay.js
+jsub -l release=trusty -N lolrrit-wm -mem 1G -continuous node 
/data/project/lolrrit-wm/lolrrit-wm/src/relay.js

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a6108597100ba96efda1fd330b8babe13f09756
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix variable name conflict - change (operations/puppet)

2015-03-11 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Fix variable name conflict
..

Fix variable name conflict

Change-Id: I658283459a04d0ab8d979df6961410a8bf61e97c
---
M manifests/role/analytics/refinery.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/195923/1

diff --git a/manifests/role/analytics/refinery.pp 
b/manifests/role/analytics/refinery.pp
index 11e8f1e..59a04cf 100644
--- a/manifests/role/analytics/refinery.pp
+++ b/manifests/role/analytics/refinery.pp
@@ -82,7 +82,7 @@
 }
 
 # keep this many days of refined data
-$raw_retention_days = 62
+$refined_retention_days = 62
 cron { 'refinery-drop-webrequest-refined-partitions':
 command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${refined_retention_days} -D wmf -l /wmf/data/wmf/webrequest -w refined  
${log_file} 21,
 user= 'hdfs',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I658283459a04d0ab8d979df6961410a8bf61e97c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix variable name conflict - change (operations/puppet)

2015-03-11 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Fix variable name conflict
..


Fix variable name conflict

Change-Id: I658283459a04d0ab8d979df6961410a8bf61e97c
---
M manifests/role/analytics/refinery.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/analytics/refinery.pp 
b/manifests/role/analytics/refinery.pp
index 11e8f1e..59a04cf 100644
--- a/manifests/role/analytics/refinery.pp
+++ b/manifests/role/analytics/refinery.pp
@@ -82,7 +82,7 @@
 }
 
 # keep this many days of refined data
-$raw_retention_days = 62
+$refined_retention_days = 62
 cron { 'refinery-drop-webrequest-refined-partitions':
 command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${refined_retention_days} -D wmf -l /wmf/data/wmf/webrequest -w refined  
${log_file} 21,
 user= 'hdfs',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I658283459a04d0ab8d979df6961410a8bf61e97c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] repool cp3021, cp4004, mark amssq3[78] - change (operations/puppet)

2015-03-11 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: repool cp3021,cp4004, mark amssq3[78]
..


repool cp3021,cp4004, mark amssq3[78]

Change-Id: Ied4196ed93d510e23850deed8e0b4b4cc559e52b
---
M manifests/role/cache.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 7b1dcc5..1fa14e5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -76,8 +76,8 @@
 'amssq34.esams.wmnet', # Jessie
 'amssq35.esams.wmnet', # Jessie
 'amssq36.esams.wmnet', # Jessie
-'amssq37.esams.wmnet',
-'amssq38.esams.wmnet',
+'amssq37.esams.wmnet', # Jessie
+'amssq38.esams.wmnet', # Jessie
 'amssq39.esams.wmnet',
 'amssq40.esams.wmnet',
 'amssq41.esams.wmnet',
@@ -125,14 +125,14 @@
 ],
 'esams' = ['cp3019.esams.wikimedia.org',
 'cp3020.esams.wikimedia.org',
-# 'cp3021.esams.wmnet', # Jessie
+'cp3021.esams.wmnet', # Jessie
 'cp3022.esams.wmnet', # Jessie
 ],
 'ulsfo' = [
 'cp4001.ulsfo.wmnet', # Jessie
 'cp4002.ulsfo.wmnet', # Jessie
 'cp4003.ulsfo.wmnet', # Jessie
-# 'cp4004.ulsfo.wmnet', # Jessie
+'cp4004.ulsfo.wmnet', # Jessie
 ],
 },
 'upload' = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied4196ed93d510e23850deed8e0b4b4cc559e52b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] repool cp3021, cp4004, mark amssq3[78] - change (operations/puppet)

2015-03-11 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: repool cp3021,cp4004, mark amssq3[78]
..

repool cp3021,cp4004, mark amssq3[78]

Change-Id: Ied4196ed93d510e23850deed8e0b4b4cc559e52b
---
M manifests/role/cache.pp
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 7b1dcc5..1fa14e5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -76,8 +76,8 @@
 'amssq34.esams.wmnet', # Jessie
 'amssq35.esams.wmnet', # Jessie
 'amssq36.esams.wmnet', # Jessie
-'amssq37.esams.wmnet',
-'amssq38.esams.wmnet',
+'amssq37.esams.wmnet', # Jessie
+'amssq38.esams.wmnet', # Jessie
 'amssq39.esams.wmnet',
 'amssq40.esams.wmnet',
 'amssq41.esams.wmnet',
@@ -125,14 +125,14 @@
 ],
 'esams' = ['cp3019.esams.wikimedia.org',
 'cp3020.esams.wikimedia.org',
-# 'cp3021.esams.wmnet', # Jessie
+'cp3021.esams.wmnet', # Jessie
 'cp3022.esams.wmnet', # Jessie
 ],
 'ulsfo' = [
 'cp4001.ulsfo.wmnet', # Jessie
 'cp4002.ulsfo.wmnet', # Jessie
 'cp4003.ulsfo.wmnet', # Jessie
-# 'cp4004.ulsfo.wmnet', # Jessie
+'cp4004.ulsfo.wmnet', # Jessie
 ],
 },
 'upload' = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied4196ed93d510e23850deed8e0b4b4cc559e52b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

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

2015-03-11 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Update VE core submodule for cherry-pick
..

Update VE core submodule for cherry-pick

New changes:
7539aba Unbreak cursoring inside table cells

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


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

diff --git a/lib/ve b/lib/ve
index ecd7944..7539aba 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit ecd7944f3a4a29a784a89e3dd2e5d0133cc1e805
+Subproject commit 7539aba68b185d1eda316cc885ecc8aca715e776

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18d4a4b1a6f9a37472c0a2830a3b2eac5858cc1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix time windowing and grouping - change (wikimedia...dash)

2015-03-11 Thread Ssmith (Code Review)

Ssmith has submitted this change and it was merged.

Change subject: Fix time windowing and grouping
..


Fix time windowing and grouping

If grouping by day, also group by month and add a filter to limit
to less than one month ago.  Similarly for month/year.

Change-Id: Ia4132732dc29268a1ca9a5fd66f325a2d3726764
---
M src/app/widgetBase.js
1 file changed, 11 insertions(+), 2 deletions(-)

Approvals:
  Ssmith: Looks good to me, approved



diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 3def589..3efc24f 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -140,7 +140,16 @@
 
self.convertToQuery = function( userChoices ){
 
-   var timeBreakout = 'group=' + userChoices.timeBreakout;
+   var timeArray = ['Year', 'Month', 'Day', 'Hour'],
+   index = timeArray.indexOf( 
userChoices.timeBreakout ),
+   query = 'group=' + userChoices.timeBreakout;
+
+   // If we're grouping by anything finer than year, add a 
filter and
+   // also group by the next level up.
+   if ( index  0 ) {
+   query = query + 'group=' + timeArray[index - 
1];
+   query = query + '$filter=' + timeArray[index - 
1] + 'sAgo lt \'1\'';
+   }
//groupStr = timeBreakout + 'group=' + 
userChoices.xSlice;
 
// if( userChoices.additionalFilters.length  0 ){
@@ -174,7 +183,7 @@
// } else {
//   return groupStr;
// }
-   return timeBreakout;
+   return query;
};
 
// Generate chart label arrays for time increment types

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4132732dc29268a1ca9a5fd66f325a2d3726764
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set dropdown initial values to saved values - change (wikimedia...dash)

2015-03-11 Thread Ssmith (Code Review)

Ssmith has submitted this change and it was merged.

Change subject: Set dropdown initial values to saved values
..


Set dropdown initial values to saved values

And re-use submit function to get initial data

Change-Id: I64c74faed90923b8851695676745bca60faef85f
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 19 insertions(+), 24 deletions(-)

Approvals:
  Ssmith: Looks good to me, approved



diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 2fdf2fd..3def589 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -33,7 +33,6 @@
};
 
self.saveWidgetConfig = function(){
-
if( self.instanceID ){
$.ajax({
method: 'PUT',
@@ -207,7 +206,7 @@
self.chartSaved(false);
};
 
-   return(this);
+   return this;
}
 
return( WidgetBase );
diff --git a/src/components/widgets/x-by-y/x-by-y.js 
b/src/components/widgets/x-by-y/x-by-y.js
index 7a42f96..7a36515 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -11,22 +11,8 @@
function XByYChartViewModel( params ){
 
WidgetBase.call( this, params );
-   var self = this;
-
-   if ( self.chartSaved() ) {
-   var chartDataCall = 
self.getChartData(self.config.queryString);
-
-   $.when( chartDataCall ).then( function( dataArray ){
-   self.retrievedResults(dataArray.results);
-   self.dataLoading(false);
-   self.preDataLoading(false);
-
-   self.chartData = 
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
-
-   self.makeChart(self.chartData);
-   });
-   }
-
+   var self = this,
+   wasSaved = self.chartSaved(); //populateChoices() may 
overwrite
self.showSlice = ko.observable();
self.bySlice = ko.observable();
self.timeChoice = ko.observable();
@@ -297,9 +283,9 @@
self.groupChoices = ko.observableArray();
 
//populate user choices dynamically
-   self.populateChoices = (function(){
+   self.populateChoices = function(){
//populate y slices
-   $.get( 'metadata/x-by-y', function(reqData){
+   return $.get( 'metadata/x-by-y', function(reqData){
self.metadata = reqData;
 
var xArray = [], timeArray = ['Year', 'Month', 
'Day'], groupArray = [];
@@ -324,10 +310,9 @@
self.xSlices(xArray);
self.timeChoices(timeArray);
self.groupChoices(groupArray);
-
});
 
-   })();
+   };
 
self.submitXY = function(){
 
@@ -338,6 +323,7 @@
self.queryRequest.timeBreakout = self.timeChoice();
 
self.queryString = 
self.convertToQuery(self.queryRequest);
+   self.config.showSlice= self.showSlice();
self.config.queryString  = self.queryString;
self.config.timeBreakout = 
self.queryRequest.timeBreakout;
self.config.chartData   = self.chartData;
@@ -353,13 +339,23 @@
self.makeChart(self.chartData);
$('#loadingModal').modal('hide');
 
-   self.chartSaved(false);
});
 
 
};
 
-   return(this);
+   self.populateChoices().then(function() {
+   self.preDataLoading(false);
+   if ( wasSaved ) {
+   // restore choices and show the chart
+   self.showSlice( self.config.showSlice );
+   self.timeChoice( self.config.timeBreakout );
+   self.chartSaved( true );
+   self.submitXY();
+   }
+   });
+
+   return this;
 
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64c74faed90923b8851695676745bca60faef85f
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith

[MediaWiki-commits] [Gerrit] Revert Made JobQueueFederated no longer need checkDelay f... - change (mediawiki/core)

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

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

Change subject: Revert Made JobQueueFederated no longer need checkDelay for 
delaying
..


Revert Made JobQueueFederated no longer need checkDelay for delaying

Breaks Cirrus and Wikibase

This reverts commit c8f96384aad312e52969b81dd8ce6b8d80c3857a.

Change-Id: I15278d52806bf30d6ea6c6b9eb8586160f65c42b
---
M includes/jobqueue/JobQueue.php
M includes/jobqueue/JobQueueRedis.php
2 files changed, 21 insertions(+), 1 deletion(-)

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



diff --git a/includes/jobqueue/JobQueue.php b/includes/jobqueue/JobQueue.php
index 0492954..1a730d3 100644
--- a/includes/jobqueue/JobQueue.php
+++ b/includes/jobqueue/JobQueue.php
@@ -44,6 +44,9 @@
/** @var int Maximum number of times to try a job */
protected $maxTries;
 
+   /** @var bool Allow delayed jobs */
+   protected $checkDelay;
+
/** @var BagOStuff */
protected $dupCache;
/** @var JobQueueAggregator */
@@ -69,6 +72,10 @@
}
if ( !in_array( $this-order, $this-supportedOrders() ) ) {
throw new MWException( __CLASS__ .  does not support 
'{$this-order}' order. );
+   }
+   $this-checkDelay = !empty( $params['checkDelay'] );
+   if ( $this-checkDelay  !$this-supportsDelayedJobs() ) {
+   throw new MWException( __CLASS__ .  does not support 
delayed jobs. );
}
$this-dupCache = wfGetCache( CACHE_ANYTHING );
$this-aggr = isset( $params['aggregator'] )
@@ -96,6 +103,10 @@
 *  but not acknowledged as completed after this many 
seconds. Recycling
 *  of jobs simple means re-inserting them into the 
queue. Jobs can be
 *  attempted up to three times before being discarded.
+*   - checkDelay : If supported, respect Job::getReleaseTimestamp() in 
the push functions.
+*  This lets delayed jobs wait in a staging area until 
a given timestamp is
+*  reached, at which point they will enter the queue. 
If this is not enabled
+*  or not supported, an exception will be thrown on 
delayed job insertion.
 *
 * Queue classes should throw an exception if they do not support the 
options given.
 *
@@ -135,6 +146,14 @@
 */
final public function getOrder() {
return $this-order;
+   }
+
+   /**
+* @return bool Whether delayed jobs are enabled
+* @since 1.22
+*/
+   final public function delayedJobsEnabled() {
+   return $this-checkDelay;
}
 
/**
@@ -307,7 +326,7 @@
if ( $job-getType() !== $this-type ) {
throw new MWException(
Got '{$job-getType()}' job; expected 
a '{$this-type}' job. );
-   } elseif ( $job-getReleaseTimestamp()  
!$this-supportsDelayedJobs() ) {
+   } elseif ( $job-getReleaseTimestamp()  
!$this-checkDelay ) {
throw new MWException(
Got delayed '{$job-getType()}' job; 
delays are not supported. );
}
diff --git a/includes/jobqueue/JobQueueRedis.php 
b/includes/jobqueue/JobQueueRedis.php
index d9fe30b..243fec9 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -93,6 +93,7 @@
Non-daemonized mode is no longer supported. 
Please install the  .
mediawiki/services/jobrunner service and 
update \$wgJobTypeConf as needed. );
}
+   $this-checkDelay = true; // always enabled
}
 
protected function supportedOrders() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15278d52806bf30d6ea6c6b9eb8586160f65c42b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
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 job runner service availability during redis outages - change (mediawiki...jobrunner)

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

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

Change subject: Fix job runner service availability during redis outages
..


Fix job runner service availability during redis outages

* Also cleaned up the pending map to use a constant for the TTL

Bug: T91835
Change-Id: Ib5e4083190998b296a0d560a4abea915fe70c4c5
---
M redisJobChronService
M redisJobRunnerService
M src/RedisJobService.php
3 files changed, 180 insertions(+), 68 deletions(-)

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



diff --git a/redisJobChronService b/redisJobChronService
index 927264a..1d133aa 100755
--- a/redisJobChronService
+++ b/redisJobChronService
@@ -35,6 +35,10 @@
}
}
 
+
+   // This is randomized to scale the liveliness with the # of 
runners.
+   $lastPeriodicTime =  time() - mt_rand( 0, self::TASK_PERIOD_SEC 
);
+
$memLast = memory_get_usage();
$this-incrStats( start-chron.$host, 1 );
while ( true ) {
@@ -42,19 +46,72 @@
pcntl_signal_dispatch();
}
 
-   // Do periodic queue tasks on all queues every 5 minutes
-   $count = $this-executeReadyPeriodicTasks();
-   if ( is_int( $count ) ) {
+   // Do tasks on a simple interval cycle...
+   if ( ( time() - $lastPeriodicTime )  
self::TASK_PERIOD_SEC ) {
+   $lastPeriodicTime = time();
+
+   $count = $this-syncAggregatorRegistry();
+   $this-notice( Synced $count aggregator(s) to 
the current one. );
+   $this-incrStats( periodictasks.sync.$host, 1 
);
+
+   $count = $this-executePeriodicTasks();
$this-notice( Updated the state of $count 
job(s) (recycle/undelay/abandon). );
$this-incrStats( periodictasks.done.$host, 1 
);
}
+
sleep( 1 );
+
// Track memory usage
$memCurrent = memory_get_usage();
$this-debug( Memory usage: $memCurrent bytes. );
$this-incrStats( memory.$host, $memCurrent - 
$memLast );
$memLast = $memCurrent;
}
+   }
+
+   /**
+* Merge wiki and queue type registration data into all aggregators
+*
+* This makes sure that the data is not lost on aggregator failure
+*
+* @return integer Servers fully updated
+*/
+   private function syncAggregatorRegistry() {
+   $count = count( $this-aggrSrvs );
+
+   try {
+   $types = $this-redisCmdHA(
+   $this-aggrSrvs,
+   'hGetAll',
+   array( $this-getQueueTypesKey() )
+   );
+   if ( $types ) {
+   $okCount = $this-redisCmdBroadcast(
+   $this-aggrSrvs,
+   'hMSet',
+   array( $this-getQueueTypesKey(), 
$types )
+   );
+   $count = min( $count, $okCount );
+   }
+
+   $wikis = $this-redisCmdHA(
+   $this-aggrSrvs,
+   'sMembers',
+   array( $this-getWikiSetKey() )
+   );
+   if ( $wikis ) {
+   $okCount = $this-redisCmdBroadcast(
+   $this-aggrSrvs,
+   'sAdd',
+   array( $this-getWikiSetKey(), $wikis )
+   );
+   $count = min( $count, $okCount );
+   }
+   } catch ( RedisExceptionHA $e ) {
+   $count = 0;
+   }
+
+   return $count;
}
 
/**
@@ -66,38 +123,23 @@
 * @note: similar to JobQueueRedis.php periodic tasks method
 * @return int|bool Number of jobs recycled/deleted/undelayed/abandoned 
(false if not run)
 */
-   private function executeReadyPeriodicTasks() {
+   private function executePeriodicTasks() {
$jobs = 0;
-
-   // Run no more than every 5 minutes.
-   // This is randomized to scale the liveliness with the # of 
runners.
-   static $lastPeriodicTime = null;
-   $lastPeriodicTime = $lastPeriodicTime ?: time() -

[MediaWiki-commits] [Gerrit] Directly interface with gerrit stream-events - change (labs...grrrit)

2015-03-11 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: Directly interface with gerrit stream-events
..


Directly interface with gerrit stream-events

I recognize that the entire gerrit-to-redis concoction was a
product of my overengineering times. It would have been useful
if suchabot, my gerrit-to-github bridge, was still operational,
and if other people were using the redis queues. AFAIK nobody
is, so this is just a lot of added complexity for no good reason.

Time to simplify things. Now this bot runs standalone, and
streams events off ssh by itself. This makes it fairly stateless,
and should survive redis / other outages.

One 'negative' effect is that the bot will miss gerrit changes
when it was down. This isn't actually a negative effect, because
first the previous design meant that it would still miss messages
when gerrit-to-redis is down, and second most people did not
actually care at all.

RIP, gerrit-to-redis.

Change-Id: Id0a6d1a5c2b79e4dd76b9f50e895ad6341271f24
---
M connections.yaml.sample
M package.json
M src/relay.js
3 files changed, 49 insertions(+), 46 deletions(-)

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



diff --git a/connections.yaml.sample b/connections.yaml.sample
index 1c66283..f3d19f7 100644
--- a/connections.yaml.sample
+++ b/connections.yaml.sample
@@ -1,5 +1,5 @@
-redis:
-host: localhost
-port: 6379
-db: 7
-queue-key: lolrrit-wm
+gerrit:
+host: gerrit.wikimedia.org
+port: 29418
+username: yuvipanda
+keypath: '/Users/ypanda/.ssh/sriracha'
diff --git a/package.json b/package.json
index a8324b6..d2b3d8d 100644
--- a/package.json
+++ b/package.json
@@ -1,20 +1,20 @@
 {
   name: grrrit,
-  version: 0.1.0,
+  version: 0.2.0,
   description: Gerrit IRC bot,
   main: src/relay.js,
   dependencies: {
 js-yaml: ~2.1.0,
 irc: ~0.3.6,
 irc-colors: ~1.0.3,
-redis: ~0.8.4,
 swig: ~0.14.0,
 underscore: ~1.5.1,
-winston: ~0.7.2
+winston: ~0.7.2,
+ssh2: ~0.4.4
   },
   devDependencies: {},
   scripts: {
-test: echo \Error: no test specified\  exit 1
+start: node src/relay.js
   },
   repository: {
 type: git,
diff --git a/src/relay.js b/src/relay.js
index 4b75cfa..4aa3adc 100644
--- a/src/relay.js
+++ b/src/relay.js
@@ -1,12 +1,12 @@
 var _ = require('underscore'),
 irc = require('irc'),
-redis = require('redis'),
 swig = require('swig'),
 processors = require('./preprocess.js'),
 yaml = require('js-yaml'),
 logging = require('winston'),
 config = require('../config.yaml'),
 conns = require('../connections.yaml'),
+ssh2 = require('ssh2'),
 // Sane? defaults
 config_defaults = {
 nick: 'grrrit',
@@ -30,6 +30,28 @@
 json: false
 });
 logging.remove(logging.transports.Console);
+
+function subscribeToGerritStream(host, port, username, keypath, listener) {
+var conn = ssh2.Client();
+conn.connect({
+host: host,
+port: port,
+username: username,
+privateKey: require('fs').readFileSync(keypath),
+});
+conn.on('ready', function() {
+conn.exec('gerrit stream-events', function(err, stream) {
+if (err) {
+logging.error(err);
+throw err;
+}
+
+stream.on('data', function(data) {
+listener(err, JSON.parse(data));
+});
+});
+});
+}
 
 var allChannels = _.keys(config.channels);
 
@@ -94,46 +116,27 @@
 }
 ircClient.addListener('join', waitForChannelJoins);
 function startRelay() {
-var redisClient = redis.createClient(conns.redis.port, conns.redis.host);
-redisClient.addListener('error', errorLog);
 
-function doEcho() {
-redisClient.brpop(conns.redis['queue-key'], 0, function(err, reply) {
-var message;
+subscribeToGerritStream(conns.gerrit.host, conns.gerrit.port, 
conns.gerrit.username, conns.gerrit.keypath, function(err, message) {
+if(err) {
+logging.error(Caught error in doEcho:  + err);
+startRelay();
+return;
+}
 
-if(err) {
-logging.error(Caught error in redisClient.brpop:  + err);
-doEcho();
-return;
-}
+if(processors[message.type]) {
+var msg = processors[message.type](message);
 
-try {
-message = JSON.parse(reply[1]);
-} catch (e) {
-logging.error(Failed to parse as JSON:  + reply[1]);
-doEcho();
-return;
-}
-if(processors[message.type]) {
-var msg = processors[message.type](message);
-
-if(msg) {
-if(config.blacklist.indexOf(msg.user) === -1) {
-var relayMsg = template.render(msg).replace(/\s+/gm, ' 
');
-

[MediaWiki-commits] [Gerrit] Add cron job to drop refined webrequest partitions and data - change (operations/puppet)

2015-03-11 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Add cron job to drop refined webrequest partitions and data
..


Add cron job to drop refined webrequest partitions and data

Change-Id: I85d26ca7fa71dc4beada7167ff71038ff09cee48
---
M manifests/role/analytics/refinery.pp
1 file changed, 12 insertions(+), 3 deletions(-)

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



diff --git a/manifests/role/analytics/refinery.pp 
b/manifests/role/analytics/refinery.pp
index f8c9ea4..6e7a7d0 100644
--- a/manifests/role/analytics/refinery.pp
+++ b/manifests/role/analytics/refinery.pp
@@ -72,14 +72,23 @@
 
 $log_file = 
${role::analytics::refinery::log_dir}/drop-webrequest-partitions.log
 
-# keep this many days of data
-$retention_days = 31
+# keep this many days of raw data
+$raw_retention_days = 31
 cron { 'refinery-drop-webrequest-partitions':
-command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${retention_days} -D wmf_raw -l /wmf/data/raw/webrequest  ${log_file} 21,
+command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${raw_retention_days} -D wmf_raw -l /wmf/data/raw/webrequest -w raw  
${log_file} 21,
 user= 'hdfs',
 minute  = '15',
 hour= '*/4',
 }
+
+# keep this many days of refined data
+$raw_retention_days = 62
+cron { 'refinery-drop-webrequest-partitions':
+command = export 
PYTHONPATH=\${PYTHONPATH}:${role::analytics::refinery::path}/python  
${role::analytics::refinery::path}/bin/refinery-drop-webrequest-partitions -d 
${refined_retention_days} -D wmf -l /wmf/data/wmf/webrequest -w refined  
${log_file} 21,
+user= 'hdfs',
+minute  = '45',
+hour= '*/4',
+}
 }
 
 # == Class role::analytics::refinery::data::check::icinga

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85d26ca7fa71dc4beada7167ff71038ff09cee48
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Small fixes - follow-up to a6abef5 - change (mediawiki...Cargo)

2015-03-11 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

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

Change subject: Small fixes - follow-up to a6abef5
..

Small fixes - follow-up to a6abef5

Change-Id: I624b68de60c619c3e69e422d67d6d6b9e84a6a72
---
M formats/CargoCSVFormat.php
M specials/CargoExport.php
2 files changed, 9 insertions(+), 11 deletions(-)


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

diff --git a/formats/CargoCSVFormat.php b/formats/CargoCSVFormat.php
index beab6be..c3219a0 100644
--- a/formats/CargoCSVFormat.php
+++ b/formats/CargoCSVFormat.php
@@ -6,9 +6,9 @@
 
 class CargoCSVFormat extends CargoDeferredFormat {
 
-function allowedParameters() {
-return array( 'delimiter' );
-}
+   function allowedParameters() {
+   return array( 'delimiter', 'link text', 'filename' );
+   }
 
/**
 *
@@ -28,16 +28,16 @@
$queryParams['filename'] = $displayParams['filename'];
}
if ( array_key_exists( 'link text', $displayParams ) ) {
-   $linktext = $displayParams['link text'];
-   } else { 
-   $linktext = wfMessage( 'cargo-viewcsv' )-text();
+   $linkText = $displayParams['link text'];
+   } else {
+   $linkText = wfMessage( 'cargo-viewcsv' )-text();
}
$linkAttrs = array(
'href' = $ce-getFullURL( $queryParams ),
);
-   $text = Html::rawElement( 'a', $linkAttrs, $linktext );
+   $text = Html::rawElement( 'a', $linkAttrs, $linkText );
 
-   return $text; 
+   return $text;
}
 
 }
diff --git a/specials/CargoExport.php b/specials/CargoExport.php
index ecf1512..fc32a39 100644
--- a/specials/CargoExport.php
+++ b/specials/CargoExport.php
@@ -221,10 +221,8 @@
}
 
function displayCSVData( $sqlQueries, $delimiter, $filename ) {
-   $attachmenttext = Content-Disposition: attachment; filename=;
-   $attachmenttext .= $filename;
header( Content-Type: text/csv );
-   header( $attachmenttext );
+   header( Content-Disposition: attachment; filename=$filename );
 
// We'll only use the first query, if there's more than one.
$sqlQuery = $sqlQueries[0];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I624b68de60c619c3e69e422d67d6d6b9e84a6a72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com

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

[MediaWiki-commits] [Gerrit] Update VisualEditor for cherry-picks - change (mediawiki/core)

2015-03-11 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Update VisualEditor for cherry-picks
..

Update VisualEditor for cherry-picks

Unbreaks fatally broken code that, in a very fortunate accident, wasn't synced.

New changes:
4e30627 Add composer entry point for phpcs and linting
4f4ab81 Update JSDuck config to standard jsduck.json
5435975 Follow-up I5918367: Add new classes to jsduck.json
eac5ffe Fix broken .gitreview
3c4fa9c Follow-up 02923f694630: fix submodule
a39fce8 Update VE core submodule for cherry-pick

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


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

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 02923f6..a39fce8 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 02923f694630d9c1a30758324e661bf6fe16c00b
+Subproject commit a39fce8991e7dd29b297ca89077239f15a4b900a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic46d819ffa272fba5424415e840bdc20a66628f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com

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

[MediaWiki-commits] [Gerrit] various s/esams.wm.o/esams.wmnet/ fixups for cache hostnames - change (operations/puppet)

2015-03-11 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: various s/esams.wm.o/esams.wmnet/ fixups for cache hostnames
..


various s/esams.wm.o/esams.wmnet/ fixups for cache hostnames

Change-Id: Ifb7437b04f4d1bb9619fd0d1e3966bdfba8140b5
---
M hieradata/role/common/cache.yaml
M manifests/ganglia.pp
M manifests/role/ganglia.pp
M modules/torrus/tests/cdn.pp
4 files changed, 27 insertions(+), 27 deletions(-)

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



diff --git a/hieradata/role/common/cache.yaml b/hieradata/role/common/cache.yaml
index c66d18a..0a0e816 100644
--- a/hieradata/role/common/cache.yaml
+++ b/hieradata/role/common/cache.yaml
@@ -26,21 +26,21 @@
   - 'amssq45.esams.wmnet'
   - 'amssq46.esams.wmnet'
   - 'amssq47.esams.wmnet'
-  - 'amssq48.esams.wikimedia.org'
-  - 'amssq49.esams.wikimedia.org'
-  - 'amssq50.esams.wikimedia.org'
-  - 'amssq51.esams.wikimedia.org'
-  - 'amssq52.esams.wikimedia.org'
-  - 'amssq53.esams.wikimedia.org'
-  - 'amssq54.esams.wikimedia.org'
-  - 'amssq55.esams.wikimedia.org'
-  - 'amssq56.esams.wikimedia.org'
-  - 'amssq57.esams.wikimedia.org'
-  - 'amssq58.esams.wikimedia.org'
-  - 'amssq59.esams.wikimedia.org'
-  - 'amssq60.esams.wikimedia.org'
-  - 'amssq61.esams.wikimedia.org'
-  - 'amssq62.esams.wikimedia.org'
+  - 'amssq48.esams.wmnet'
+  - 'amssq49.esams.wmnet'
+  - 'amssq50.esams.wmnet'
+  - 'amssq51.esams.wmnet'
+  - 'amssq52.esams.wmnet'
+  - 'amssq53.esams.wmnet'
+  - 'amssq54.esams.wmnet'
+  - 'amssq55.esams.wmnet'
+  - 'amssq56.esams.wmnet'
+  - 'amssq57.esams.wmnet'
+  - 'amssq58.esams.wmnet'
+  - 'amssq59.esams.wmnet'
+  - 'amssq60.esams.wmnet'
+  - 'amssq61.esams.wmnet'
+  - 'amssq62.esams.wmnet'
 text_ulsfo:
   - 'cp4008.ulsfo.wmnet'
   - 'cp4009.ulsfo.wmnet'
@@ -56,8 +56,8 @@
 bits_esams:
   - 'cp3019.esams.wikimedia.org'
   - 'cp3020.esams.wikimedia.org'
-  - 'cp3021.esams.wikimedia.org'
-  - 'cp3022.esams.wikimedia.org'
+  - 'cp3021.esams.wmnet'
+  - 'cp3022.esams.wmnet'
 bits_ulsfo:
   - 'cp4001.ulsfo.wmnet'
   - 'cp4002.ulsfo.wmnet'
@@ -73,8 +73,8 @@
   - 'cp1063.eqiad.wmnet'
   - 'cp1064.eqiad.wmnet'
 upload_esams:
-  - 'cp3003.esams.wikimedia.org'
-  - 'cp3004.esams.wikimedia.org'
+  - 'cp3003.esams.wmnet'
+  - 'cp3004.esams.wmnet'
   - 'cp3005.esams.wikimedia.org'
   - 'cp3006.esams.wikimedia.org'
   - 'cp3007.esams.wikimedia.org'
@@ -98,8 +98,8 @@
   - 'cp1059.eqiad.wmnet'
   - 'cp1060.eqiad.wmnet'
 mobile_esams:
-  - 'cp3011.esams.wikimedia.org'
-  - 'cp3012.esams.wikimedia.org'
+#  - 'cp3011.esams.wmnet' # hardware T92306
+  - 'cp3012.esams.wmnet'
   - 'cp3013.esams.wmnet'
   - 'cp3014.esams.wmnet'
 mobile_ulsfo:
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index aaa6edb..2c6e900 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -264,7 +264,7 @@
 'Analytics cluster eqiad'= 'analytics1009.eqiad.wmnet 
analytics1010.eqiad.wmnet analytics1014.eqiad.wmnet',
 'Memcached eqiad'= 'mc1001.eqiad.wmnet 
mc1002.eqiad.wmnet',
 'Text caches esams'  = 
'hooft.esams.wikimedia.org:11669',
-'Upload caches esams'= 
'hooft.esams.wikimedia.org:11671 cp3003.esams.wikimedia.org 
cp3004.esams.wikimedia.org',
+'Upload caches esams'= 
'hooft.esams.wikimedia.org:11671 cp3003.esams.wmnet cp3004.esams.wmnet',
 'Parsoid eqiad'  = 'wtp1001.eqiad.wmnet 
wtp1002.eqiad.wmnet',
 'Parsoid Varnish eqiad'  = 'cp1045.eqiad.wmnet 
cp1058.eqiad.wmnet',
 'Redis eqiad'= 'rdb1001.eqiad.wmnet 
rdb1002.eqiad.wmnet',
diff --git a/manifests/role/ganglia.pp b/manifests/role/ganglia.pp
index 78c8b61..c8be96a 100644
--- a/manifests/role/ganglia.pp
+++ b/manifests/role/ganglia.pp
@@ -33,7 +33,7 @@
 'Analytics cluster eqiad'= 'analytics1013.eqiad.wmnet 
analytics1014.eqiad.wmnet analytics1019.eqiad.wmnet',
 'Memcached eqiad'= 'mc1001.eqiad.wmnet 
mc1002.eqiad.wmnet',
 'Text caches esams'  = 'hooft.esams.wikimedia.org:11669',
-'Upload caches esams'= 'hooft.esams.wikimedia.org:11671 
cp3003.esams.wikimedia.org cp3004.esams.wikimedia.org',
+'Upload caches esams'= 'hooft.esams.wikimedia.org:11671 
cp3003.esams.wmnet cp3004.esams.wmnet',
 'Parsoid eqiad'  = 'wtp1001.eqiad.wmnet 
wtp1002.eqiad.wmnet',
 'Parsoid Varnish eqiad'  = 'cp1045.eqiad.wmnet 
cp1058.eqiad.wmnet',
 'Redis eqiad'= 'rdb1001.eqiad.wmnet 
rdb1002.eqiad.wmnet',
diff --git a/modules/torrus/tests/cdn.pp b/modules/torrus/tests/cdn.pp
index 0d89a1d..c6d1a92 100644
--- a/modules/torrus/tests/cdn.pp
+++ b/modules/torrus/tests/cdn.pp
@@ -11,7 +11,7 @@
 ],
 'esams' = [

[MediaWiki-commits] [Gerrit] Bump src to 73bf3162 for deploy - change (mediawiki...deploy)

2015-03-11 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Bump src to 73bf3162 for deploy
..

Bump src to 73bf3162 for deploy

Change-Id: Ibbb08b2a27ec58fe455720ac82b70fe06551791b
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/49/195949/1

diff --git a/src b/src
index c8370a4..73bf316 16
--- a/src
+++ b/src
-Subproject commit c8370a480636c3a0d47ed5090dd29efcb72591e2
+Subproject commit 73bf3162b0568dbf2d38ba613654972f223a23d5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbb08b2a27ec58fe455720ac82b70fe06551791b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add some obvious repos to -releng (and scap to -operations too) - change (labs...grrrit)

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

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

Change subject: Add some obvious repos to -releng (and scap to -operations too)
..


Add some obvious repos to -releng (and scap to -operations too)

Change-Id: I4988db4bf0d79ca90bf279b2971800022434d6a4
---
M config.yaml
1 file changed, 9 insertions(+), 2 deletions(-)

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



diff --git a/config.yaml b/config.yaml
index f425751..e1cd412 100644
--- a/config.yaml
+++ b/config.yaml
@@ -129,17 +129,24 @@
 branch: ^(?!betacluster)
 },
 wikimedia/bugzilla/modifications,
-wikimedia/bots/jouncebot
+wikimedia/bots/jouncebot,
+# This is sent to #wikimedia-releng too.
+mediawiki/tools/scap
 }
 #wikimedia-releng: {
 mediawiki/selenium,
 mediawiki/ruby/.*,
 integration/.*,
 mediawiki/tools/codesniffer,
+mediawiki/tools/code-utils,
+mediawiki/tools/release,
+mediawiki/tools/releng,
 # All commits to a betacluster branch goes here
 .*: {
 branch: betacluster
-}
+},
+# This is sent to #wikimedia-operations too.
+mediawiki/tools/scap
 }
 #wikidata: {
 mediawiki/extensions/Wikibase.*,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4988db4bf0d79ca90bf279b2971800022434d6a4
Gerrit-PatchSet: 3
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Small fixes - follow-up to a6abef5 - change (mediawiki...Cargo)

2015-03-11 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Small fixes - follow-up to a6abef5
..


Small fixes - follow-up to a6abef5

Change-Id: I624b68de60c619c3e69e422d67d6d6b9e84a6a72
---
M formats/CargoCSVFormat.php
M specials/CargoExport.php
2 files changed, 9 insertions(+), 11 deletions(-)

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



diff --git a/formats/CargoCSVFormat.php b/formats/CargoCSVFormat.php
index beab6be..c3219a0 100644
--- a/formats/CargoCSVFormat.php
+++ b/formats/CargoCSVFormat.php
@@ -6,9 +6,9 @@
 
 class CargoCSVFormat extends CargoDeferredFormat {
 
-function allowedParameters() {
-return array( 'delimiter' );
-}
+   function allowedParameters() {
+   return array( 'delimiter', 'link text', 'filename' );
+   }
 
/**
 *
@@ -28,16 +28,16 @@
$queryParams['filename'] = $displayParams['filename'];
}
if ( array_key_exists( 'link text', $displayParams ) ) {
-   $linktext = $displayParams['link text'];
-   } else { 
-   $linktext = wfMessage( 'cargo-viewcsv' )-text();
+   $linkText = $displayParams['link text'];
+   } else {
+   $linkText = wfMessage( 'cargo-viewcsv' )-text();
}
$linkAttrs = array(
'href' = $ce-getFullURL( $queryParams ),
);
-   $text = Html::rawElement( 'a', $linkAttrs, $linktext );
+   $text = Html::rawElement( 'a', $linkAttrs, $linkText );
 
-   return $text; 
+   return $text;
}
 
 }
diff --git a/specials/CargoExport.php b/specials/CargoExport.php
index ecf1512..fc32a39 100644
--- a/specials/CargoExport.php
+++ b/specials/CargoExport.php
@@ -221,10 +221,8 @@
}
 
function displayCSVData( $sqlQueries, $delimiter, $filename ) {
-   $attachmenttext = Content-Disposition: attachment; filename=;
-   $attachmenttext .= $filename;
header( Content-Type: text/csv );
-   header( $attachmenttext );
+   header( Content-Disposition: attachment; filename=$filename );
 
// We'll only use the first query, if there's more than one.
$sqlQuery = $sqlQueries[0];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I624b68de60c619c3e69e422d67d6d6b9e84a6a72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix broken .gitreview file - change (VisualEditor/VisualEditor)

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

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

Change subject: Fix broken .gitreview file
..


Fix broken .gitreview file

This should have been updated by make-wmf-branch but wasn't.

Change-Id: I89528f528d70906201f1040ffdf5de3627ccc0d0
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitreview b/.gitreview
index 5b28d55..e118572 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=VisualEditor/VisualEditor.git
-defaultbranch=master
+defaultbranch=wmf/1.25wmf20
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89528f528d70906201f1040ffdf5de3627ccc0d0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] etherpad: remove SSL cert and settings frm role - change (operations/puppet)

2015-03-11 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: etherpad: remove SSL cert and settings frm role
..

etherpad: remove SSL cert and settings frm role

If we want to remove the cert per If7b878a2b20ec94b3 we need to do
this too or puppet will try to install non-existing certs.

Bug:T85788
Change-Id: Ic632b74fc3940836a709dbb189b9235e0cb5b93e
---
M manifests/role/etherpad.pp
1 file changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/195936/1

diff --git a/manifests/role/etherpad.pp b/manifests/role/etherpad.pp
index 05c9c04..4f2d8eb 100644
--- a/manifests/role/etherpad.pp
+++ b/manifests/role/etherpad.pp
@@ -12,21 +12,14 @@
 case $::realm {
 'labs': {
 $etherpad_host = $::fqdn
-$etherpad_ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-$etherpad_ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key'
 }
 'production': {
 $etherpad_host = 'etherpad.wikimedia.org'
-install_certificate{ 'etherpad.wikimedia.org': }
-$etherpad_ssl_cert = '/etc/ssl/certs/etherpad.wikimedia.org.pem'
-$etherpad_ssl_key = '/etc/ssl/private/etherpad.wikimedia.org.key'
 }
 'default': {
 fail('unknown realm, should be labs or production')
 }
 }
-
-$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
 
 class { '::etherpad':
 etherpad_host= $etherpad_host,
@@ -41,7 +34,6 @@
 include ::apache::mod::rewrite
 include ::apache::mod::proxy
 include ::apache::mod::proxy_http
-include ::apache::mod::ssl
 
 ::apache::site { 'etherpad.wikimedia.org':
 content = template('misc/etherpad.wikimedia.org.erb'),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic632b74fc3940836a709dbb189b9235e0cb5b93e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

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

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

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

Change subject: Update VE core submodule for cherry-pick
..


Update VE core submodule for cherry-pick

New changes:
7539aba Unbreak cursoring inside table cells

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

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



diff --git a/lib/ve b/lib/ve
index ecd7944..7539aba 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit ecd7944f3a4a29a784a89e3dd2e5d0133cc1e805
+Subproject commit 7539aba68b185d1eda316cc885ecc8aca715e776

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18d4a4b1a6f9a37472c0a2830a3b2eac5858cc1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Change string used by extension to identify itself - change (mediawiki...Citoid)

2015-03-11 Thread Mvolz (Code Review)

Mvolz has uploaded a new change for review.

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

Change subject: Change string used by extension to identify itself
..

Change string used by extension to identify itself

Change ve.ui.CiteFromIdInspector.static.templateDataName
from a string identifying the path to the more general
string 'citoid', which is used as a key in TemplateData
to identify the appropriate Map in the 'maps' object.

Change-Id: I8cc6b10e4e34f878c09f7290b2adefa159dc7c08
---
M modules/ve.ui.CiteFromIdInspector.js
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/modules/ve.ui.CiteFromIdInspector.js 
b/modules/ve.ui.CiteFromIdInspector.js
index 23d7d58..df4b690 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -34,9 +34,7 @@
 ve.ui.CiteFromIdInspector.static.size = 'large';
 
 // The string used in TemplateData to identify the correct Map object
-
-// TODO: Replace this to a more general string Citoid
-ve.ui.CiteFromIdInspector.static.templateDataName = 
'extension/Citoid/ve.ui.CiteFromIDDialog';
+ve.ui.CiteFromIdInspector.static.templateDataName = 'citoid';
 
 // The requested format from the citoid client, passed as a GET parameter
 ve.ui.CiteFromIdInspector.static.citoidFormat = 'mediawiki';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cc6b10e4e34f878c09f7290b2adefa159dc7c08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz mv...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update citoid submodule to master (2cd246b) - change (mediawiki...deploy)

2015-03-11 Thread Mvolz (Code Review)

Mvolz has uploaded a new change for review.

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

Change subject: Update citoid submodule to master (2cd246b)
..

Update citoid submodule to master (2cd246b)

New changes:
0d7cb7f Bug fixes: fix status response codes
40d109c Fix: anchor PMC and PMCIDs to beginning of string
d7dc97c Add Grunt with jshint and clean-up its errors
5367b52 Use html-metadata library
5d1dfe2 Create CitoidService object
2c44c4a Fix: Don't convert ISSN/ISBN in MWDeprecated
df82fe3 Make zotero.js an object
522a3ae [WIP] Convert scrape.js to Scraper.js
3306e49 Fix callback in CitoidService.prototype.scrape
119ae43 Add ability to set requesting User-Agent
ce06491 Add mocha tests
76c5339 Fix: itemType was missing in URLs with scrape err
ba07349 Fix: Change itemType of 520 citation to 'webpage'
f59613e Add ability to request AcceptLanguage
3f4b85d Allow outbound proxy config; breaking change
2cd246b Fix acceptLanguage commit a30d6be

Change-Id: I772c8010724024380138143a8d39f9460fd95603
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid/deploy 
refs/changes/12/195912/1

diff --git a/src b/src
index f52ea4d..2cd246b 16
--- a/src
+++ b/src
-Subproject commit f52ea4deab9a7353c99d27a819d320d15bfc9e5f
+Subproject commit 2cd246b99fd2f407b92c33a079a1120f0abe7117

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I772c8010724024380138143a8d39f9460fd95603
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mvolz mv...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Split mail smarthost for Labs - change (operations/puppet)

2015-03-11 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has uploaded a new change for review.

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

Change subject: Split mail smarthost for Labs
..

Split mail smarthost for Labs

Split role::mail::sender's config per realm and use a separate one for
Labs that a) rewrites to r...@wmflabs.org, not r...@wikimedia.org, b)
blackholes mail destined for root, rather than sending it to production
roots, c) drops the special-MediaWiki handling of emails.

On a later step, Labs could get its own mail relays entirely; this split
config would allow for this.

For mails in Labs to properly work after this change, wmflabs.org should
become a mail domain (MX records + a simple alias file defining at least
the root alias).

This will significantly reduce the amount of cronspam production roots
get (yay!)

Change-Id: I9c39889adfb388ed7f6fa1cba19dc643be6c2da0
---
M manifests/role/mail.pp
A templates/mail/exim4.minimal.labs.erb
R templates/mail/exim4.minimal.production.erb
3 files changed, 61 insertions(+), 7 deletions(-)


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

diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 93ccab1..41880af 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -1,7 +1,7 @@
 class role::mail::sender {
 class { 'exim4':
 queuerunner = 'queueonly',
-config  = template('mail/exim4.minimal.erb'),
+config  = template(mail/exim4.minimal.${::realm}.erb),
 }
 }
 
diff --git a/templates/mail/exim4.minimal.labs.erb 
b/templates/mail/exim4.minimal.labs.erb
new file mode 100644
index 000..e82a5d6
--- /dev/null
+++ b/templates/mail/exim4.minimal.labs.erb
@@ -0,0 +1,60 @@
+# Exim 4 configuration file for Wikimedia servers
+# Written on 2010-02-08 by Mark Bergsma m...@wikimedia.org
+
+# Main configuration options
+
+check_spool_space = 50M
+remote_max_parallel = 10
+
+# Allow the -f cli option to work
+untrusted_set_sender = *
+local_from_check = false
+
+# No frozen messages please
+ignore_bounce_errors_after = 0h
+
+# Logging
+log_selector = +address_rewrite +all_parents +delivery_size +deliver_time 
+incoming_interface +incoming_port +smtp_confirmation +smtp_protocol_error 
+smtp_syntax_error
+message_logs = false
+
+begin routers
+
+# Redirect using /etc/aliases if it exists, blackhole otherwise
+
+system_aliases:
+   driver = redirect
+   domains = @
+   data = ${lookup{$local_part}lsearch{/etc/aliases}{$value}{:blackhole:}}
+   qualify_domain = wmflabs.org
+   allow_fail
+   allow_defer
+   forbid_file
+
+# Send all mail via a set of mail relays (smart hosts)
+
+smart_route:
+   driver = manualroute
+   transport = remote_smtp
+   route_list = *  %= @mail_smarthost.join(':') %
+
+
+begin transports
+
+# Generic remote SMTP transport
+
+remote_smtp:
+   driver = smtp
+   hosts_avoid_tls = ; 0.0.0.0/0 ; 0::0/0
+
+
+begin retry
+
+*  *   F,2h,5m; F,1d,15m
+
+
+begin rewrite
+
+# Rewrite the envelope From for mails from internal servers in *.wmnet,
+# as they are usually rejected by sender domain address verification.
+
+*@$primary_hostnamer...@wmflabs.org  F
diff --git a/templates/mail/exim4.minimal.erb 
b/templates/mail/exim4.minimal.production.erb
similarity index 88%
rename from templates/mail/exim4.minimal.erb
rename to templates/mail/exim4.minimal.production.erb
index a6cff5d..547d82c 100644
--- a/templates/mail/exim4.minimal.erb
+++ b/templates/mail/exim4.minimal.production.erb
@@ -1,9 +1,3 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///templates/exim/exim4.minimal.erb
-#
-
-
 # Exim 4 configuration file for Wikimedia servers
 # Written on 2010-02-08 by Mark Bergsma m...@wikimedia.org
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c39889adfb388ed7f6fa1cba19dc643be6c2da0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix wrong parameter order in entityViewInit.js - change (mediawiki...Wikibase)

2015-03-11 Thread WMDE

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

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

Change subject: Fix wrong parameter order in entityViewInit.js
..

Fix wrong parameter order in entityViewInit.js

Ouch. Introduced in Idb8af78, reviewed and merged by me, so I have
nobody to blame. :-P

Bug: T87640
Change-Id: I42b0afb6307e87a4a6d281a30857bb73fa40adbf
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/resources/wikibase.ui.entityViewInit.js 
b/repo/resources/wikibase.ui.entityViewInit.js
index d225ae6..61e4253 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -201,7 +201,7 @@
/**
 * Update the state of the watch link if the user has watchdefault 
enabled.
 */
-   function attachWatchLinkUpdater( viewName, $entityview ) {
+   function attachWatchLinkUpdater( $entityview, viewName ) {
var update = mw.page  mw.page.watch ? 
mw.page.watch.updateWatchLink : null;
 
if( !update || !mw.user.options.get( 'watchdefault' ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42b0afb6307e87a4a6d281a30857bb73fa40adbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] redis: fix hostnames in the dhcp file as well - change (operations/puppet)

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

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: redis: fix hostnames in the dhcp file as well
..


redis: fix hostnames in the dhcp file as well

Change-Id: If83f238cda6f42d9308047778963e67eae655f6f
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index d3434b6..d06543c 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5116,28 +5116,28 @@
 
 host rdb2001 {
hardware ethernet B0:83:FE:E4:6A:74;
-   fixed-address rbd2001.codfw.wmnet;
+   fixed-address rdb2001.codfw.wmnet;
option pxelinux.pathprefix jessie-installer/;
filename jessie-installer/debian-installer/amd64/pxelinux.0;
 }
 
 host rdb2002 {
hardware ethernet B0:83:FE:E4:37:66;
-   fixed-address rbd2002.codfw.wmnet;
+   fixed-address rdb2002.codfw.wmnet;
option pxelinux.pathprefix jessie-installer/;
filename jessie-installer/debian-installer/amd64/pxelinux.0;
 }
 
 host rdb2003 {
hardware ethernet B0:83:FE:E4:38:49;
-   fixed-address rbd2003.codfw.wmnet;
+   fixed-address rdb2003.codfw.wmnet;
option pxelinux.pathprefix jessie-installer/;
filename jessie-installer/debian-installer/amd64/pxelinux.0;
 }
 
 host rdb2004 {
hardware ethernet B0:83:FE:E4:5E:1A;
-   fixed-address rbd2004.codfw.wmnet;
+   fixed-address rdb2004.codfw.wmnet;
option pxelinux.pathprefix jessie-installer/;
filename jessie-installer/debian-installer/amd64/pxelinux.0;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If83f238cda6f42d9308047778963e67eae655f6f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
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: e68e3d7..5362d4d - change (mediawiki/extensions)

2015-03-11 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: e68e3d7..5362d4d
..

Syncronize VisualEditor: e68e3d7..5362d4d

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/45/195945/1

diff --git a/VisualEditor b/VisualEditor
index e68e3d7..5362d4d 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e68e3d70fb012edc1469e6ef8491bf134605343a
+Subproject commit 5362d4d98361e8ffb8672d25cac6a825fc2755f1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0710d01a6113f093b935183de1bec9f60da3699e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Wikipedias to 1.25wmf20 - change (operations/mediawiki-config)

2015-03-11 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: Wikipedias to 1.25wmf20
..

Wikipedias to 1.25wmf20

Change-Id: I41577cb9327039bb6d356fe56e73104e9c4000d9
---
M wikiversions.json
1 file changed, 288 insertions(+), 288 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index 46bedcc..afb97f3 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
 {
-aawiki: php-1.25wmf19,
+aawiki: php-1.25wmf20,
 aawikibooks: php-1.25wmf20,
 aawiktionary: php-1.25wmf20,
-abwiki: php-1.25wmf19,
+abwiki: php-1.25wmf20,
 abwiktionary: php-1.25wmf20,
-acewiki: php-1.25wmf19,
+acewiki: php-1.25wmf20,
 advisorywiki: php-1.25wmf20,
-afwiki: php-1.25wmf19,
+afwiki: php-1.25wmf20,
 afwikibooks: php-1.25wmf20,
 afwikiquote: php-1.25wmf20,
 afwiktionary: php-1.25wmf20,
-akwiki: php-1.25wmf19,
+akwiki: php-1.25wmf20,
 akwikibooks: php-1.25wmf20,
 akwiktionary: php-1.25wmf20,
-alswiki: php-1.25wmf19,
+alswiki: php-1.25wmf20,
 alswikibooks: php-1.25wmf20,
 alswikiquote: php-1.25wmf20,
 alswiktionary: php-1.25wmf20,
-amwiki: php-1.25wmf19,
+amwiki: php-1.25wmf20,
 amwikiquote: php-1.25wmf20,
 amwiktionary: php-1.25wmf20,
-angwiki: php-1.25wmf19,
+angwiki: php-1.25wmf20,
 angwikibooks: php-1.25wmf20,
 angwikiquote: php-1.25wmf20,
 angwikisource: php-1.25wmf20,
 angwiktionary: php-1.25wmf20,
-anwiki: php-1.25wmf19,
+anwiki: php-1.25wmf20,
 anwiktionary: php-1.25wmf20,
 arbcom_dewiki: php-1.25wmf20,
 arbcom_enwiki: php-1.25wmf20,
 arbcom_fiwiki: php-1.25wmf20,
 arbcom_nlwiki: php-1.25wmf20,
-arcwiki: php-1.25wmf19,
-arwiki: php-1.25wmf19,
+arcwiki: php-1.25wmf20,
+arwiki: php-1.25wmf20,
 arwikibooks: php-1.25wmf20,
 arwikimedia: php-1.25wmf20,
 arwikinews: php-1.25wmf20,
@@ -40,135 +40,135 @@
 arwikisource: php-1.25wmf20,
 arwikiversity: php-1.25wmf20,
 arwiktionary: php-1.25wmf20,
-arzwiki: php-1.25wmf19,
-astwiki: php-1.25wmf19,
+arzwiki: php-1.25wmf20,
+astwiki: php-1.25wmf20,
 astwikibooks: php-1.25wmf20,
 astwikiquote: php-1.25wmf20,
 astwiktionary: php-1.25wmf20,
-aswiki: php-1.25wmf19,
+aswiki: php-1.25wmf20,
 aswikibooks: php-1.25wmf20,
 aswikisource: php-1.25wmf20,
 aswiktionary: php-1.25wmf20,
 auditcomwiki: php-1.25wmf20,
-avwiki: php-1.25wmf19,
+avwiki: php-1.25wmf20,
 avwiktionary: php-1.25wmf20,
-aywiki: php-1.25wmf19,
+aywiki: php-1.25wmf20,
 aywikibooks: php-1.25wmf20,
 aywiktionary: php-1.25wmf20,
-azwiki: php-1.25wmf19,
+azwiki: php-1.25wmf20,
 azwikibooks: php-1.25wmf20,
 azwikiquote: php-1.25wmf20,
 azwikisource: php-1.25wmf20,
 azwiktionary: php-1.25wmf20,
-barwiki: php-1.25wmf19,
-bat_smgwiki: php-1.25wmf19,
-bawiki: php-1.25wmf19,
+barwiki: php-1.25wmf20,
+bat_smgwiki: php-1.25wmf20,
+bawiki: php-1.25wmf20,
 bawikibooks: php-1.25wmf20,
-bclwiki: php-1.25wmf19,
+bclwiki: php-1.25wmf20,
 bdwikimedia: php-1.25wmf20,
-be_x_oldwiki: php-1.25wmf19,
+be_x_oldwiki: php-1.25wmf20,
 betawikiversity: php-1.25wmf20,
-bewiki: php-1.25wmf19,
+bewiki: php-1.25wmf20,
 bewikibooks: php-1.25wmf20,
 bewikimedia: php-1.25wmf20,
 bewikiquote: php-1.25wmf20,
 bewikisource: php-1.25wmf20,
 bewiktionary: php-1.25wmf20,
-bgwiki: php-1.25wmf19,
+bgwiki: php-1.25wmf20,
 bgwikibooks: php-1.25wmf20,
 bgwikinews: php-1.25wmf20,
 bgwikiquote: php-1.25wmf20,
 bgwikisource: php-1.25wmf20,
 bgwiktionary: php-1.25wmf20,
-bhwiki: php-1.25wmf19,
+bhwiki: php-1.25wmf20,
 bhwiktionary: php-1.25wmf20,
-biwiki: php-1.25wmf19,
+biwiki: php-1.25wmf20,
 biwikibooks: php-1.25wmf20,
 biwiktionary: php-1.25wmf20,
-bjnwiki: php-1.25wmf19,
-bmwiki: php-1.25wmf19,
+bjnwiki: php-1.25wmf20,
+bmwiki: php-1.25wmf20,
 bmwikibooks: php-1.25wmf20,
 bmwikiquote: php-1.25wmf20,
 bmwiktionary: php-1.25wmf20,
-bnwiki: php-1.25wmf19,
+bnwiki: php-1.25wmf20,
 bnwikibooks: php-1.25wmf20,
 bnwikisource: php-1.25wmf20,
 bnwiktionary: php-1.25wmf20,
 boardgovcomwiki: php-1.25wmf20,
 boardwiki: php-1.25wmf20,
-bowiki: php-1.25wmf19,
+bowiki: php-1.25wmf20,
 bowikibooks: php-1.25wmf20,
 bowiktionary: php-1.25wmf20,
-bpywiki: php-1.25wmf19,
-brwiki: php-1.25wmf19,
+bpywiki: php-1.25wmf20,
+brwiki: php-1.25wmf20,
 brwikimedia: php-1.25wmf20,
 brwikiquote: php-1.25wmf20,
 brwikisource: php-1.25wmf20,
 brwiktionary: php-1.25wmf20,
-bswiki: php-1.25wmf19,
+bswiki: php-1.25wmf20,

[MediaWiki-commits] [Gerrit] Group0 to 1.25wmf21 - change (operations/mediawiki-config)

2015-03-11 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: Group0 to 1.25wmf21
..

Group0 to 1.25wmf21

Change-Id: I4be6a4dbdcb29d9f2b6dd898e26bd840f8581af9
---
M wikiversions.json
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index afb97f3..3d07963 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -471,7 +471,7 @@
 maiwiki: php-1.25wmf20,
 map_bmswiki: php-1.25wmf20,
 mdfwiki: php-1.25wmf20,
-mediawikiwiki: php-1.25wmf20,
+mediawikiwiki: php-1.25wmf21,
 metawiki: php-1.25wmf20,
 mgwiki: php-1.25wmf20,
 mgwikibooks: php-1.25wmf20,
@@ -738,9 +738,9 @@
 tawikisource: php-1.25wmf20,
 tawiktionary: php-1.25wmf20,
 tenwiki: php-1.25wmf20,
-test2wiki: php-1.25wmf20,
-testwiki: php-1.25wmf20,
-testwikidatawiki: php-1.25wmf20,
+test2wiki: php-1.25wmf21,
+testwiki: php-1.25wmf21,
+testwikidatawiki: php-1.25wmf21,
 tetwiki: php-1.25wmf20,
 tewiki: php-1.25wmf20,
 tewikibooks: php-1.25wmf20,
@@ -869,7 +869,7 @@
 zawikiquote: php-1.25wmf20,
 zawiktionary: php-1.25wmf20,
 zeawiki: php-1.25wmf20,
-zerowiki: php-1.25wmf20,
+zerowiki: php-1.25wmf21,
 zh_classicalwiki: php-1.25wmf20,
 zh_min_nanwiki: php-1.25wmf20,
 zh_min_nanwikibooks: php-1.25wmf20,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4be6a4dbdcb29d9f2b6dd898e26bd840f8581af9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 mmod...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Adding a Last-Access cookie to text and mobile requests - change (operations/puppet)

2015-03-11 Thread Nuria (Code Review)

Nuria has uploaded a new change for review.

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

Change subject: Adding a Last-Access cookie to text and mobile requests
..

Adding a Last-Access cookie to text and mobile requests

Please take a look at for details as to what we want to accomplish here:
https://wikitech.wikimedia.org/wiki/Analytics/Unique_clients/Last_visit_solution

Needs to be tested on beta labs,
thus far only tested local changes on varnish on mediawiki vagrant

Bug: T92435
Change-Id: Iea4ceb2fb06929ced5b27b1d9c7d8951a87fca8b
---
A templates/varnish/last-access.incl.vcl.erb
M templates/varnish/mobile-frontend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
3 files changed, 51 insertions(+), 0 deletions(-)


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

diff --git a/templates/varnish/last-access.incl.vcl.erb 
b/templates/varnish/last-access.incl.vcl.erb
new file mode 100644
index 000..41dc5ff
--- /dev/null
+++ b/templates/varnish/last-access.incl.vcl.erb
@@ -0,0 +1,49 @@
+// Varnish VCL include file for WMF-Last-Access Cookie
+// Please see what this cookie is trying to acomplish:
+// 
https://wikitech.wikimedia.org/wiki/Analytics/Unique_clients/Last_visit_solution
+
+// Note: This requires import header in the including VCL
+
+C{
+#includestdio.h
+#include time.h
+#include string.h
+/*
+* Sets cookie on TOP DOMAIN in the form:
+* WMF-Last-Access=Wed, 11 Mar 2015 02:55:51 GMT;Expires=Wed, Jan 01 3000 
01:01:01 GMT;Path=/; HttpOnly
+*/
+void set_last_access_cookie(const struct sess *sp) {
+char *now = VRT_time_string(sp, VRT_r_now(sp));
+char *lacookie[200];
+strcpy(lacookie,  WMF-Last-Access=);
+strcat(lacookie, now);
+strcat(lacookie, ;Expires=Wed, Jan 01 3000 01:01:01 GMT);
+strcat(lacookie, ;Path=/;HttpOnly;);
+/* by default cookies are set on the top domain */
+/* TODO: add to Set-Cookie header, make sure to not override, How? */
+VRT_SetHdr(sp, HDR_BERESP, \013Set-Cookie:, lacookie, 
vrt_magic_string_end);
+}
+}C
+
+sub vcl_deliver {
+
+// Get value of Last-Access Cookie
+// and pass it to X-Analytics header
+
+if (req.http.Cookie~ WMF-Last-Access=(.*)) {
+// For CR: HOW do we make sure req.http.Cookie hasn't been 
cleaned up by the time we get here?
+// Regex below is trying to grab Wed, 11 Mar 2015 02:55:51 
GMT from Last-Access-Ccookie
+if (resp.http.X-Analytics == ) {
+set resp.http.X-Analytics = resp.http.X-Analytics + 
;+regsub( regsuball(req.http.Cookie, ^(.*)WMF-Last-Access= 
,),GTM(.*)$,) ;
+} else {
+set resp.http.X-Analytics = regsub( 
regsuball(req.http.Cookie, ^(.*)WMF-Last-Access= ,),GTM(.*)$,) ;
+}
+ }
+
+ // Update Last-Access Cookie to actual access date
+ // for every request for main document to text and mobile
+ C{
+ set_last_access_cookie(sp);
+ }C
+
+}
\ No newline at end of file
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb 
b/templates/varnish/mobile-frontend.inc.vcl.erb
index ddb8c45..f2e01ab 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -3,6 +3,7 @@
 include errorpage.inc.vcl;
 include zero.inc.vcl;
 include via.inc.vcl;
+include last-access.inc.vcl;
 
 // Note that via.inc.vcl will set an X-Analytics value of proxy=IORG
 // without inspecting whether there's an existing proxy=proxy key-
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index ae7fcc6..da9f182 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -3,6 +3,7 @@
 include errorpage.inc.vcl;
 include text-common.inc.vcl;
 include via.inc.vcl;
+include last-access.inc.vcl;
 
 // Note that via.inc.vcl will set an X-Analytics value of proxy=IORG
 // without inspecting whether there's an existing proxy=proxy key-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea4ceb2fb06929ced5b27b1d9c7d8951a87fca8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nuria nu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Don't put serialized uuid's into the logging table - change (mediawiki...Flow)

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

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

Change subject: Don't put serialized uuid's into the logging table
..


Don't put serialized uuid's into the logging table

Bug: T90745
Change-Id: I800ec8cf044e514b6b5d466343c54bfd1269a8f7
---
M includes/Log/ActionFormatter.php
M includes/Log/ModerationLogger.php
M tests/phpunit/api/ApiFlowModerateTopicTest.php
3 files changed, 10 insertions(+), 6 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Log/ActionFormatter.php b/includes/Log/ActionFormatter.php
index 9f31c72..d9e4eb3 100644
--- a/includes/Log/ActionFormatter.php
+++ b/includes/Log/ActionFormatter.php
@@ -81,7 +81,11 @@
$urlGenerator = Container::get( 'url_generator' );
 
// generate link that highlights the post
-   $anchor = $urlGenerator-postLink( $title, 
$params['topicId'], $params['postId'] );
+   $anchor = $urlGenerator-postLink(
+   $title,
+   UUID::create( $params['topicId'] ),
+   UUID::create( $params['postId'] )
+   );
$title = $anchor-resolveTitle();
}
 
diff --git a/includes/Log/ModerationLogger.php 
b/includes/Log/ModerationLogger.php
index 1e44b97..4b2932b 100644
--- a/includes/Log/ModerationLogger.php
+++ b/includes/Log/ModerationLogger.php
@@ -49,11 +49,11 @@
return null;
}
 
-   $params = array();
-
-   $params['topicId'] = $workflowId;
+   $params = array(
+   'topicId' = $workflowId-getAlphadecimal(),
+   );
if ( !$post-isTopicTitle() ) {
-   $params['postId'] = $post-getPostId();
+   $params['postId'] = 
$post-getPostId()-getAlphadecimal();
}
 
$logType = $this-getLogType( $post, $action );
diff --git a/tests/phpunit/api/ApiFlowModerateTopicTest.php 
b/tests/phpunit/api/ApiFlowModerateTopicTest.php
index 7604e41..74779b9 100644
--- a/tests/phpunit/api/ApiFlowModerateTopicTest.php
+++ b/tests/phpunit/api/ApiFlowModerateTopicTest.php
@@ -56,6 +56,6 @@
$debug = json_encode( $data );
$logEntry = $data[0]['query']['logevents'][0];
$this-assertArrayHasKey( 'topicId', $logEntry, $debug );
-   $this-assertEquals( $workflowId, 
$logEntry['topicId']-getAlphadecimal(), $debug );
+   $this-assertEquals( $workflowId, $logEntry['topicId'], $debug 
);
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I800ec8cf044e514b6b5d466343c54bfd1269a8f7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
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 failures when no topics exist - change (mediawiki...Flow)

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

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

Change subject: Fix failures when no topics exist
..


Fix failures when no topics exist

Change-Id: Ie963b6c575397bbf6b1478acd450fb49c1715372
---
M includes/Repository/TreeRepository.php
1 file changed, 7 insertions(+), 3 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Repository/TreeRepository.php 
b/includes/Repository/TreeRepository.php
index f74df08..3f0c918 100644
--- a/includes/Repository/TreeRepository.php
+++ b/includes/Repository/TreeRepository.php
@@ -318,12 +318,16 @@
/**
 * Fetch a node and all its descendants.
 *
-* @param UUID $root
+* @param UUID|UUID[] $roots
 * @return array Multi-dimensional tree
 * @throws DataModelException When invalid data is received from 
self::fetchSubtreeNodeList
 */
-   public function fetchSubtreeIdentityMap( $root ) {
-   $nodes = $this-fetchSubtreeNodeList( ObjectManager::makeArray( 
$root ) );
+   public function fetchSubtreeIdentityMap( $roots ) {
+   $roots = ObjectManager::makeArray( $roots );
+   if ( !$roots ) {
+   return array();
+   }
+   $nodes = $this-fetchSubtreeNodeList( $roots );
if ( !$nodes ) {
throw new DataModelException( 'subtree node list should 
have at least returned root: ' . $root, 'process-data' );
} elseif ( count( $nodes ) === 1 ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie963b6c575397bbf6b1478acd450fb49c1715372
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
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 reply API example - change (mediawiki...Flow)

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

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

Change subject: Fix reply API example
..


Fix reply API example

I guess that nt was just a leftover from copying examples
from new-topic API.

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

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



diff --git a/includes/api/ApiFlowReply.php b/includes/api/ApiFlowReply.php
index 6333b41..3f14d5d 100644
--- a/includes/api/ApiFlowReply.php
+++ b/includes/api/ApiFlowReply.php
@@ -50,7 +50,7 @@
 */
public function getExamples() {
return array(
-   
'api.php?action=flowsubmodule=replypage=Topic:S2tycnas4hcucw8wrepreplyTo=050e554490c2b269143b080027630f57repntcontent=Nice%20to20meet%20you',
+   
'api.php?action=flowsubmodule=replypage=Topic:S2tycnas4hcucw8wrepreplyTo=050e554490c2b269143b080027630f57repcontent=Nice%20to20meet%20you',
);
}
 
@@ -59,7 +59,7 @@
 */
protected function getExamplesMessages() {
return array(
-   
'action=flowsubmodule=replypage=Topic:S2tycnas4hcucw8wrepreplyTo=050e554490c2b269143b080027630f57repntcontent=Nice%20to20meet%20you'
+   
'action=flowsubmodule=replypage=Topic:S2tycnas4hcucw8wrepreplyTo=050e554490c2b269143b080027630f57repcontent=Nice%20to20meet%20you'
= 'apihelp-flow+reply-example-1',
);
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I400131f3ebb0f3ced3b147134116d8e956978659
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
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 copy/paste mistake in API param documentation - change (mediawiki...Flow)

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

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

Change subject: Fix copy/paste mistake in API param documentation
..


Fix copy/paste mistake in API param documentation

Change-Id: Iad06a33ee00c625b47cd88ccb6ac3f92c896b67f
---
M i18n/en.json
M includes/api/ApiFlowEditTitle.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index ebbf63f..db3f138 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -416,7 +416,7 @@
apihelp-flow+edit-post-example-1: Edit a post in 
[[Topic:S2tycnas4hcucw8w]],
apihelp-flow+edit-post-param-metadataonly: Whether to include only 
metadata about the new content, excluding everything else,
apihelp-flow+edit-title-description: Edits a topic's title.,
-   apihelp-flow+edit-title-param-prev_revision: Revision ID of the 
current header revision, to check for edit conflicts.,
+   apihelp-flow+edit-title-param-prev_revision: Revision ID of the 
current title revision, to check for edit conflicts.,
apihelp-flow+edit-title-param-content: Content for title.,
apihelp-flow+edit-title-param-format: Format of the summary 
(wikitext|html),
apihelp-flow+edit-title-example-1: Edit the title of 
[[Topic:S2tycnas4hcucw8w]],
diff --git a/includes/api/ApiFlowEditTitle.php 
b/includes/api/ApiFlowEditTitle.php
index 09d3de2..279616b 100644
--- a/includes/api/ApiFlowEditTitle.php
+++ b/includes/api/ApiFlowEditTitle.php
@@ -39,7 +39,7 @@
 */
public function getParamDescription() {
return array(
-   'prev_revision' = 'Revision id of the current header 
revision to check for edit conflicts',
+   'prev_revision' = 'Revision id of the current title 
revision to check for edit conflicts',
'content' = 'Content for title',
'format' = 'Format of the content (wikitext|html)',
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad06a33ee00c625b47cd88ccb6ac3f92c896b67f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Let API accept content format - change (mediawiki...Flow)

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

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

Change subject: Let API accept content format
..


Let API accept content format

Change-Id: Ie1a5f97d3df2d76a448f81098eb280cae6e427aa
---
M i18n/en.json
M includes/api/ApiFlowEditHeader.php
M includes/api/ApiFlowEditPost.php
M includes/api/ApiFlowEditTitle.php
M includes/api/ApiFlowEditTopicSummary.php
M includes/api/ApiFlowNewTopic.php
M includes/api/ApiFlowReply.php
7 files changed, 55 insertions(+), 13 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 89d65f5..ebbf63f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -405,22 +405,26 @@
apihelp-flow+edit-header-description: Edits a topic's header.,
apihelp-flow+edit-header-param-prev_revision: Revision ID of the 
current header revision, to check for edit conflicts.,
apihelp-flow+edit-header-param-content: Content for header.,
+   apihelp-flow+edit-header-param-format: Format of the summary 
(wikitext|html),
apihelp-flow+edit-header-example-1: Edit the header of 
[[Talk:Sandbox]],
apihelp-flow+edit-header-param-metadataonly: Whether to include only 
metadata about the new content, excluding everything else,
apihelp-flow+edit-post-description: Edits a post's content.,
apihelp-flow+edit-post-param-postId: Post ID.,
apihelp-flow+edit-post-param-prev_revision: Revision ID of the 
current post revision, to check for edit conflicts.,
apihelp-flow+edit-post-param-content: Content for post.,
+   apihelp-flow+edit-post-param-format: Format of the summary 
(wikitext|html),
apihelp-flow+edit-post-example-1: Edit a post in 
[[Topic:S2tycnas4hcucw8w]],
apihelp-flow+edit-post-param-metadataonly: Whether to include only 
metadata about the new content, excluding everything else,
apihelp-flow+edit-title-description: Edits a topic's title.,
apihelp-flow+edit-title-param-prev_revision: Revision ID of the 
current header revision, to check for edit conflicts.,
apihelp-flow+edit-title-param-content: Content for title.,
+   apihelp-flow+edit-title-param-format: Format of the summary 
(wikitext|html),
apihelp-flow+edit-title-example-1: Edit the title of 
[[Topic:S2tycnas4hcucw8w]],
apihelp-flow+edit-title-param-metadataonly: Whether to include only 
metadata about the new content, excluding everything else,
apihelp-flow+edit-topic-summary-description: Edits a topic summary's 
content.,
apihelp-flow+edit-topic-summary-param-prev_revision: Revision ID of 
the current topic summary revision, if any, to check for edit conflicts.,
apihelp-flow+edit-topic-summary-param-summary: Content for the 
summary.,
+   apihelp-flow+edit-topic-summary-param-format: Format of the summary 
(wikitext|html),
apihelp-flow+edit-topic-summary-example-1: Edit the summary of 
[[Topic:S2tycnas4hcucw8w]],
apihelp-flow+edit-topic-summary-param-metadataonly: Whether to 
include only metadata about the new content, excluding everything else,
apihelp-flow+lock-topic-description: Lock or unlock a Flow topic.,
@@ -442,11 +446,13 @@
apihelp-flow+new-topic-description: Creates a new Flow topic on the 
given workflow.,
apihelp-flow+new-topic-param-topic: Text for new topic title.,
apihelp-flow+new-topic-param-content: Content for the topic's 
initial reply.,
+apihelp-flow+new-topic-param-format: Format of the content 
(wikitext|html),
apihelp-flow+new-topic-example-1: Create a new topic on 
[[Talk:Sandbox]],
apihelp-flow+new-topic-param-metadataonly: Whether to include only 
metadata about the new content, excluding everything else,
apihelp-flow+reply-description: Replies to a post.,
apihelp-flow+reply-param-replyTo: Post ID to reply to.,
apihelp-flow+reply-param-content: Content for new post.,
+   apihelp-flow+reply-param-format: Format of the content 
(wikitext|html),
apihelp-flow+reply-example-1: Reply to a post on 
[[Topic:S2tycnas4hcucw8w]],
apihelp-flow+reply-param-metadataonly: Whether to include only 
metadata about the new content, excluding everything else,
apihelp-flow+view-header-description: View a board header.,
diff --git a/includes/api/ApiFlowEditHeader.php 
b/includes/api/ApiFlowEditHeader.php
index c21231c..08b8bab 100644
--- a/includes/api/ApiFlowEditHeader.php
+++ b/includes/api/ApiFlowEditHeader.php
@@ -25,6 +25,11 @@
'content' = array(
ApiBase::PARAM_REQUIRED = true,
),
+   'format' = array(
+   ApiBase::PARAM_REQUIRED = true,
+   ApiBase::PARAM_DFLT = 'wikitext',
+   ApiBase::PARAM_TYPE = array( 'html',

[MediaWiki-commits] [Gerrit] Reset container prior to running PurgeAction - change (mediawiki...Flow)

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

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

Change subject: Reset container prior to running PurgeAction
..


Reset container prior to running PurgeAction

While this works in development environments without squid, once it is enabled
the TitleSquidURLs hook will end up calling the container and initializing the
memcache services.  With the new Pimple 2.x that is an exception and needs to
be handled.  I don't have any good way to rearrange or adjust the hook, so
instead we are going to use Container::reset() to go back to the initial state.

This also means the PurgeAction was not complete before,  storage.workflow would
hold onto the old memcache and the other storage implementations receive
the memcached that PurgeAction was putting in place.

Bug: T91901
Change-Id: I7d6df59683361211ab1ae7f7ae6e11e7195963df
---
M includes/Actions/PurgeAction.php
1 file changed, 7 insertions(+), 4 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Actions/PurgeAction.php b/includes/Actions/PurgeAction.php
index 2ea9882..07726a5 100644
--- a/includes/Actions/PurgeAction.php
+++ b/includes/Actions/PurgeAction.php
@@ -32,15 +32,14 @@
 * {@inheritDoc}
 */
public function onSubmit( $data ) {
-   if ( !parent::onSubmit( array() ) ) {
-   return false;
-   }
-
// Replace $c['memcache'] with a hash bag o stuff.  This will 
look to the
// application layer like an empty cache, and as such it will 
populate this
// empty cache with all the cache keys required to reload this 
page.
// We then extract the complete list of keys updated from this 
hash bag o stuff
// and delete them from the real memcache.
+   // The container must be reset prior to this because the 
TitleSquidURLs hook
+   // will initialize memcache before this is run when UseSquid is 
enabled.
+   Container::reset();
$container = Container::getContainer();
$container-extend( 'memcache', function( $memcache, $c ) {
$c['memcache.purge_backup'] = $memcache;
@@ -49,6 +48,10 @@
$this-hashBag = $container['memcache'];
$this-realMemcache = $container['memcache.purge_backup'];
 
+   if ( !parent::onSubmit( array() ) ) {
+   return false;
+   }
+
/** @var WorkflowLoaderFactory $loader */
$loader = $container['factory.loader.workflow'];
$workflow = $loader

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d6df59683361211ab1ae7f7ae6e11e7195963df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] depool cp1052 for reinstall (text) - change (operations/puppet)

2015-03-11 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: depool cp1052 for reinstall (text)
..

depool cp1052 for reinstall (text)

Change-Id: If40a248be2f2b860c018edbbd643e21a17d4e0ec
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index df4b3d1..5cbf976 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -60,7 +60,7 @@
 'production' = {
 'text' = {
 'eqiad' = [
-'cp1052.eqiad.wmnet',
+#'cp1052.eqiad.wmnet',
 'cp1053.eqiad.wmnet', # Jessie
 'cp1054.eqiad.wmnet', # Jessie
 'cp1055.eqiad.wmnet', # Jessie

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If40a248be2f2b860c018edbbd643e21a17d4e0ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Wikipedias to 1.25wmf20 - change (operations/mediawiki-config)

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

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

Change subject: Wikipedias to 1.25wmf20
..


Wikipedias to 1.25wmf20

Change-Id: I41577cb9327039bb6d356fe56e73104e9c4000d9
---
M wikiversions.json
1 file changed, 288 insertions(+), 288 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index 46bedcc..afb97f3 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
 {
-aawiki: php-1.25wmf19,
+aawiki: php-1.25wmf20,
 aawikibooks: php-1.25wmf20,
 aawiktionary: php-1.25wmf20,
-abwiki: php-1.25wmf19,
+abwiki: php-1.25wmf20,
 abwiktionary: php-1.25wmf20,
-acewiki: php-1.25wmf19,
+acewiki: php-1.25wmf20,
 advisorywiki: php-1.25wmf20,
-afwiki: php-1.25wmf19,
+afwiki: php-1.25wmf20,
 afwikibooks: php-1.25wmf20,
 afwikiquote: php-1.25wmf20,
 afwiktionary: php-1.25wmf20,
-akwiki: php-1.25wmf19,
+akwiki: php-1.25wmf20,
 akwikibooks: php-1.25wmf20,
 akwiktionary: php-1.25wmf20,
-alswiki: php-1.25wmf19,
+alswiki: php-1.25wmf20,
 alswikibooks: php-1.25wmf20,
 alswikiquote: php-1.25wmf20,
 alswiktionary: php-1.25wmf20,
-amwiki: php-1.25wmf19,
+amwiki: php-1.25wmf20,
 amwikiquote: php-1.25wmf20,
 amwiktionary: php-1.25wmf20,
-angwiki: php-1.25wmf19,
+angwiki: php-1.25wmf20,
 angwikibooks: php-1.25wmf20,
 angwikiquote: php-1.25wmf20,
 angwikisource: php-1.25wmf20,
 angwiktionary: php-1.25wmf20,
-anwiki: php-1.25wmf19,
+anwiki: php-1.25wmf20,
 anwiktionary: php-1.25wmf20,
 arbcom_dewiki: php-1.25wmf20,
 arbcom_enwiki: php-1.25wmf20,
 arbcom_fiwiki: php-1.25wmf20,
 arbcom_nlwiki: php-1.25wmf20,
-arcwiki: php-1.25wmf19,
-arwiki: php-1.25wmf19,
+arcwiki: php-1.25wmf20,
+arwiki: php-1.25wmf20,
 arwikibooks: php-1.25wmf20,
 arwikimedia: php-1.25wmf20,
 arwikinews: php-1.25wmf20,
@@ -40,135 +40,135 @@
 arwikisource: php-1.25wmf20,
 arwikiversity: php-1.25wmf20,
 arwiktionary: php-1.25wmf20,
-arzwiki: php-1.25wmf19,
-astwiki: php-1.25wmf19,
+arzwiki: php-1.25wmf20,
+astwiki: php-1.25wmf20,
 astwikibooks: php-1.25wmf20,
 astwikiquote: php-1.25wmf20,
 astwiktionary: php-1.25wmf20,
-aswiki: php-1.25wmf19,
+aswiki: php-1.25wmf20,
 aswikibooks: php-1.25wmf20,
 aswikisource: php-1.25wmf20,
 aswiktionary: php-1.25wmf20,
 auditcomwiki: php-1.25wmf20,
-avwiki: php-1.25wmf19,
+avwiki: php-1.25wmf20,
 avwiktionary: php-1.25wmf20,
-aywiki: php-1.25wmf19,
+aywiki: php-1.25wmf20,
 aywikibooks: php-1.25wmf20,
 aywiktionary: php-1.25wmf20,
-azwiki: php-1.25wmf19,
+azwiki: php-1.25wmf20,
 azwikibooks: php-1.25wmf20,
 azwikiquote: php-1.25wmf20,
 azwikisource: php-1.25wmf20,
 azwiktionary: php-1.25wmf20,
-barwiki: php-1.25wmf19,
-bat_smgwiki: php-1.25wmf19,
-bawiki: php-1.25wmf19,
+barwiki: php-1.25wmf20,
+bat_smgwiki: php-1.25wmf20,
+bawiki: php-1.25wmf20,
 bawikibooks: php-1.25wmf20,
-bclwiki: php-1.25wmf19,
+bclwiki: php-1.25wmf20,
 bdwikimedia: php-1.25wmf20,
-be_x_oldwiki: php-1.25wmf19,
+be_x_oldwiki: php-1.25wmf20,
 betawikiversity: php-1.25wmf20,
-bewiki: php-1.25wmf19,
+bewiki: php-1.25wmf20,
 bewikibooks: php-1.25wmf20,
 bewikimedia: php-1.25wmf20,
 bewikiquote: php-1.25wmf20,
 bewikisource: php-1.25wmf20,
 bewiktionary: php-1.25wmf20,
-bgwiki: php-1.25wmf19,
+bgwiki: php-1.25wmf20,
 bgwikibooks: php-1.25wmf20,
 bgwikinews: php-1.25wmf20,
 bgwikiquote: php-1.25wmf20,
 bgwikisource: php-1.25wmf20,
 bgwiktionary: php-1.25wmf20,
-bhwiki: php-1.25wmf19,
+bhwiki: php-1.25wmf20,
 bhwiktionary: php-1.25wmf20,
-biwiki: php-1.25wmf19,
+biwiki: php-1.25wmf20,
 biwikibooks: php-1.25wmf20,
 biwiktionary: php-1.25wmf20,
-bjnwiki: php-1.25wmf19,
-bmwiki: php-1.25wmf19,
+bjnwiki: php-1.25wmf20,
+bmwiki: php-1.25wmf20,
 bmwikibooks: php-1.25wmf20,
 bmwikiquote: php-1.25wmf20,
 bmwiktionary: php-1.25wmf20,
-bnwiki: php-1.25wmf19,
+bnwiki: php-1.25wmf20,
 bnwikibooks: php-1.25wmf20,
 bnwikisource: php-1.25wmf20,
 bnwiktionary: php-1.25wmf20,
 boardgovcomwiki: php-1.25wmf20,
 boardwiki: php-1.25wmf20,
-bowiki: php-1.25wmf19,
+bowiki: php-1.25wmf20,
 bowikibooks: php-1.25wmf20,
 bowiktionary: php-1.25wmf20,
-bpywiki: php-1.25wmf19,
-brwiki: php-1.25wmf19,
+bpywiki: php-1.25wmf20,
+brwiki: php-1.25wmf20,
 brwikimedia: php-1.25wmf20,
 brwikiquote: php-1.25wmf20,
 brwikisource: php-1.25wmf20,
 brwiktionary: php-1.25wmf20,
-bswiki: php-1.25wmf19,
+bswiki: php-1.25wmf20,
 bswikibooks: php-1.25wmf20,
 bswikinews: php-1.25wmf20,

[MediaWiki-commits] [Gerrit] add loadbalancer service records for codfw - change (operations/dns)

2015-03-11 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: add loadbalancer service records for codfw
..

add loadbalancer service records for codfw

Adding the Round Robin LVS Service records as they exist for eqiad.

Bug:T92377
Change-Id: Ibd6103f2b4a0ddee4a398f75f5b0ae9b4ce403b4
---
M templates/wikimedia.org
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/69/196069/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4abcf97..8ae9694 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -266,6 +266,12 @@
 ;;; codfw
 dns-rec-lb.codfw1H  IN A208.80.153.254
 1H  IN  2620:0:860:ed1a::3:fe
+text-lb.codfw   600 IN DYNA geoip!text-addrs/codfw
+login-lb.codfw  600 IN DYNA geoip!login-addrs/codfw
+bits-lb.codfw   600 IN DYNA geoip!bits-addrs/codfw
+upload-lb.codfw 600 IN DYNA geoip!upload-addrs/codfw
+mobile-lb.codfw 600 IN DYNA geoip!mobile-addrs/codfw
+donate-lb.codfw 600 IN DYNA geoip!text-addrs-v4/codfw
 
 ; Mobile
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd6103f2b4a0ddee4a398f75f5b0ae9b4ce403b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] rename/tag cp3019+cp3020 - change (operations/puppet)

2015-03-11 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: rename/tag cp3019+cp3020
..

rename/tag cp3019+cp3020

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


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

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 5cbf976..30dc6d1 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -123,8 +123,9 @@
 'cp1069.eqiad.wmnet', # Jessie
 'cp1070.eqiad.wmnet', # Jessie
 ],
-'esams' = ['cp3019.esams.wikimedia.org',
-'cp3020.esams.wikimedia.org',
+'esams' = [
+'cp3019.esams.wmnet', # Jessie
+'cp3020.esams.wmnet', # Jessie
 'cp3021.esams.wmnet', # Jessie
 'cp3022.esams.wmnet', # Jessie
 ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I754aa47cc409ce4fe3bc782fb32a2b46c2e2b40f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Activate the RESTBase Virtual REST Service on test.wp - change (operations/mediawiki-config)

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

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

Change subject: Activate the RESTBase Virtual REST Service on test.wp
..


Activate the RESTBase Virtual REST Service on test.wp

Change-Id: Ia386b87da6d3ff20c071b8dba1d7323c681747de
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 26 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1d4af61..579e525 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1930,6 +1930,25 @@
$wgRestbaseServer = http://10.2.2.17:7231;; // restbase.svc.eqiad.wmnet
 }
 
+if ( $wmgUseRestbaseVRS ) {
+   if( !isset( $wgVirtualRestConfig ) ) {
+   $wgVirtualRestConfig = array(
+   'modules' = array(),
+   'global' = array(
+   'timeout' = 360,
+   'forwardCookies' = false,
+   'HTTPProxy' = null
+   )
+   );
+   }
+   $wgVirtualRestConfig['modules']['restbase'] = array(
+   'url' = 'http://10.2.2.17:7231',  // restbase.svc.eqiad.wmnet
+   'domain' = $wgCanonicalServer,
+   'forwardCookies' = false,
+   'parsoidCompat' = false
+   );
+}
+
 if ( $wmgUseParsoid ) {
require_once( $IP/extensions/Parsoid/Parsoid.php );
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a35f774..2f2bad2 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12236,6 +12236,13 @@
'testwiki' = true
 ),
 
+// whether to configure RESTBase as a Virtual REST Service
+// in MW Core
+'wmgUseRestbaseVRS' = array(
+   'default' = false,
+   'testwiki' = true
+),
+
 // -- RESTBase end --
 
 // -- Shared Parsoid start --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia386b87da6d3ff20c071b8dba1d7323c681747de
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] demo: Load styles before building demo widgets (not asynchro... - change (oojs/ui)

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

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

Change subject: demo: Load styles before building demo widgets (not 
asynchronously)
..


demo: Load styles before building demo widgets (not asynchronously)

Fixes a long-standing issue where autosized or labelled
TextInputWidgets render incorrectly on initial page load. Prevents an
issue where narrow toolbars (being introduced in I17d22ba6) would not
work at all.

Change-Id: Iea6a9bf7ff030ad517c100b2891a1a6ac3aa3a26
---
M demos/demo.js
M demos/index.html
M demos/pages/toolbars.js
3 files changed, 38 insertions(+), 10 deletions(-)

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



diff --git a/demos/demo.js b/demos/demo.js
index dd8cdfc..08ff2da 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -66,7 +66,6 @@
$( 'body' ).addClass( 'oo-ui-' + this.mode.direction );
$( 'head' ).append( this.stylesheetLinks );
OO.ui.theme = new ( this.constructor.static.themes[ this.mode.theme 
].theme )();
-   this.constructor.static.pages[ this.mode.page ]( this );
 };
 
 /* Setup */
@@ -178,6 +177,24 @@
 /* Methods */
 
 /**
+ * Load the demo page. Must be called after $element is attached.
+ */
+OO.ui.Demo.prototype.initialize = function () {
+   var
+   demo = this,
+   promises = $( this.stylesheetLinks ).map( function () {
+   return $( this ).data( 'load-promise' );
+   } );
+   $.when.apply( $, promises )
+   .done( function () {
+   demo.constructor.static.pages[ demo.mode.page ]( demo );
+   } )
+   .fail( function () {
+   demo.$element.append( $( 'p' ).text( 'Demo styles 
failed to load.' ) );
+   } );
+};
+
+/**
  * Handle mode change events.
  *
  * Will load a new page.
@@ -272,10 +289,9 @@
  * @return {HTMLElement[]} List of link elements
  */
 OO.ui.Demo.prototype.getStylesheetLinks = function () {
-   var i, len, link, fragments,
+   var links, fragments,
factors = this.getFactors(),
-   urls = [],
-   links = [];
+   urls = [];
 
// Translate modes to filename fragments
fragments = this.getCurrentFactorValues().map( function ( val, index ) {
@@ -288,12 +304,21 @@
urls.push( 'styles/demo' + fragments[ 3 ] + '.css' );
 
// Add link tags
-   for ( i = 0, len = urls.length; i  len; i++ ) {
-   link = document.createElement( 'link' );
+   links = urls.map( function ( url ) {
+   var
+   link = document.createElement( 'link' ),
+   $link = $( link ),
+   deferred = $.Deferred();
+   $link.data( 'load-promise', deferred.promise() );
+   $link.on( {
+   load: deferred.resolve,
+   error: deferred.reject
+   } );
link.rel = 'stylesheet';
-   link.href = urls[ i ];
-   links.push( link );
-   }
+   link.href = url;
+   return link;
+   } );
+
return links;
 };
 
diff --git a/demos/index.html b/demos/index.html
index 4e14bd4..e136a4a 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -27,6 +27,7 @@
}
demo = new OO.ui.Demo();
$( 'body' ).append( demo.$element );
+   demo.initialize();
}
 
setup();
diff --git a/demos/pages/toolbars.js b/demos/pages/toolbars.js
index e1964db..e4fca51 100644
--- a/demos/pages/toolbars.js
+++ b/demos/pages/toolbars.js
@@ -268,11 +268,13 @@
.addClass( 'oo-ui-demo-container 
oo-ui-demo-toolbars' )
);
$containers.eq( i ).append( toolbars[ i ].$element );
-   toolbars[ i ].initialize();
}
$containers.append( '' );
$demo.append(
$containers.eq( 0 ).append( 'div 
class=oo-ui-demo-toolbars-contentsToolbar/div' ),
$containers.eq( 1 ).append( 'div 
class=oo-ui-demo-toolbars-contentsToolbar with action buttons/div' )
);
+   for ( i = 0; i  toolbars.length; i++ ) {
+   toolbars[ i ].initialize();
+   }
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea6a9bf7ff030ad517c100b2891a1a6ac3aa3a26
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org

[MediaWiki-commits] [Gerrit] Add COPYING and 'license-name' matching SPDX conventions - change (mediawiki...EtherEditor)

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

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

Change subject: Add COPYING and 'license-name' matching SPDX conventions
..


Add COPYING and 'license-name' matching SPDX conventions

References:
http://spdx.org/licenses/
https://www.mediawiki.org/wiki/Manual:$wgExtensionCredits#license-name

Change-Id: Ia65bcf27f6d9e1bdb88a076fe1a1480061d37cd0
---
A COPYING
M EtherEditor.php
2 files changed, 340 insertions(+), 0 deletions(-)

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



diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have 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.
+
+GNU GENERAL PUBLIC LICENSE
+   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 work, and a work based on the Program
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term modification.)  Each licensee is addressed as you.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate

[MediaWiki-commits] [Gerrit] Don't let JS convert content to wikitext - change (mediawiki...Flow)

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

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

Change subject: Don't let JS convert content to wikitext
..


Don't let JS convert content to wikitext

Just submit in whatever format the editor has it in 
send that to API, specifying the format.
Backend will know what to do with it  roundtrip it
properly.

Change-Id: I4b9aa7c8a3249ff07879ebf26734466cdde65657
---
M modules/editor/ext.flow.editor.js
M modules/engine/components/board/base/flow-board-api-events.js
2 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/modules/editor/ext.flow.editor.js 
b/modules/editor/ext.flow.editor.js
index 70efaf7..4ee2c92 100644
--- a/modules/editor/ext.flow.editor.js
+++ b/modules/editor/ext.flow.editor.js
@@ -144,6 +144,9 @@
/**
 * Get the content, in wikitext format.
 *
+* @deprecated API now also accepts html content, as long as 
the format
+* parameter is set. It's encouraged to use getRawContent + 
getFormat.
+*
 * @param {jQuery} $node
 * @return {string}
 */
diff --git a/modules/engine/components/board/base/flow-board-api-events.js 
b/modules/engine/components/board/base/flow-board-api-events.js
index c5bf486..309ebd3 100644
--- a/modules/engine/components/board/base/flow-board-api-events.js
+++ b/modules/engine/components/board/base/flow-board-api-events.js
@@ -46,7 +46,8 @@
// Doublecheck that this textarea is actually an editor 
instance
// (the editor may have added a textarea itself...)
if ( mw.flow.editor  mw.flow.editor.exists( $editor ) 
) {
-   override[$editor.attr( 'name' )] = 
mw.flow.editor.getContent( $editor );
+   override[$editor.attr( 'name' )] = 
mw.flow.editor.getRawContent( $editor );
+   override.flow_format = 
mw.flow.editor.getFormat();
}
 
// @todo: we have to make sure we get rid of all 
unwanted data

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b9aa7c8a3249ff07879ebf26734466cdde65657
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
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 ssh::userkey for root as well - change (labs/private)

2015-03-11 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: Use ssh::userkey for root as well
..

Use ssh::userkey for root as well

Change-Id: Ib74ace7bac2eee5d456c3c73ef49d5ffa58b3a80
---
M modules/passwords/manifests/init.pp
1 file changed, 3 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/19/196019/1

diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 61ba354..a8cddb4 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -9,30 +9,9 @@
 password = '!',
 }
 
-file {
-'/etc/ssh/userkeys':
-ensure = directory,
-owner  = root,
-group  = root,
-mode   = '0700';
-'/etc/ssh/userkeys/root':
-ensure  = directory,
-owner   = root,
-group   = root,
-mode= '0700',
-require = File['/etc/ssh/userkeys'];
-'/etc/ssh/userkeys/root/.ssh':
-ensure  = directory,
-owner   = root,
-group   = root,
-mode= '0700',
-require = File['/etc/ssh/userkeys/root'];
-'/etc/ssh/userkeys/root/.ssh/authorized_keys':
-owner   = root,
-group   = root,
-mode= '0600',
-source  = 'puppet:///private/ssh/root-authorized-keys',
-require = File['/etc/ssh/userkeys/root/.ssh'];
+ssh::userkey { 'root':
+ensure = present,
+source = 'puppet:///private/ssh/root-authorized-keys',
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib74ace7bac2eee5d456c3c73ef49d5ffa58b3a80
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Make toolbar non-floatable - change (mediawiki...Flow)

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

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

Change subject: Make toolbar non-floatable
..


Make toolbar non-floatable

This doesn't make sense currently, since the VE surface doesn't
represent the whole page.  This also solves the bug where
the toolbar wasn't initially rendered correctly.

Depends on Icbcf54e98c88057e99c495c8aac0db359c65cb69
in VisualEditor/VisualEditor.

Bug: T90762
Change-Id: I7782a269dc78e4cf2789dbd70bd9309ab851160a
---
M modules/editor/editors/ext.flow.editors.visualeditor.js
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, but someone else must approve
  Matthias Mullie: Looks good to me, approved
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/editor/editors/ext.flow.editors.visualeditor.js 
b/modules/editor/editors/ext.flow.editors.visualeditor.js
index a66ab10..0548f82 100644
--- a/modules/editor/editors/ext.flow.editors.visualeditor.js
+++ b/modules/editor/editors/ext.flow.editors.visualeditor.js
@@ -59,7 +59,8 @@
//
// However, we will have to look at this later.
target = this.target = new ve.init.sa.Target(
-   'desktop'
+   'desktop',
+   { floatable: false }
);
 
htmlDoc = ve.createDocumentFromHtml( content ); // HTMLDocument

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7782a269dc78e4cf2789dbd70bd9309ab851160a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] LVS: add text and bits for codfw - change (operations/puppet)

2015-03-11 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: LVS: add text and bits for codfw
..

LVS: add text and bits for codfw

Bug:T92377
Change-Id: Ia7055bdf22ec942e1ab08d5029134f02ae8c0978
---
M manifests/role/lvs.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/196036/1

diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index e82053a..05fc199 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -50,6 +50,8 @@
 
 # codfw (should mirror eqiad above, eventually, and become merged with 
it via regex
 /^(lvs200[14])$/ = [
+$sip['text'][$::site],
+$sip['bits'][$::site],
 ],
 /^(lvs200[25])$/ = [
 $sip['dns_rec'][$::site],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7055bdf22ec942e1ab08d5029134f02ae8c0978
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Group0 to 1.25wmf21 - change (operations/mediawiki-config)

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

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

Change subject: Group0 to 1.25wmf21
..


Group0 to 1.25wmf21

Change-Id: I4be6a4dbdcb29d9f2b6dd898e26bd840f8581af9
---
M wikiversions.json
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index afb97f3..3d07963 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -471,7 +471,7 @@
 maiwiki: php-1.25wmf20,
 map_bmswiki: php-1.25wmf20,
 mdfwiki: php-1.25wmf20,
-mediawikiwiki: php-1.25wmf20,
+mediawikiwiki: php-1.25wmf21,
 metawiki: php-1.25wmf20,
 mgwiki: php-1.25wmf20,
 mgwikibooks: php-1.25wmf20,
@@ -738,9 +738,9 @@
 tawikisource: php-1.25wmf20,
 tawiktionary: php-1.25wmf20,
 tenwiki: php-1.25wmf20,
-test2wiki: php-1.25wmf20,
-testwiki: php-1.25wmf20,
-testwikidatawiki: php-1.25wmf20,
+test2wiki: php-1.25wmf21,
+testwiki: php-1.25wmf21,
+testwikidatawiki: php-1.25wmf21,
 tetwiki: php-1.25wmf20,
 tewiki: php-1.25wmf20,
 tewikibooks: php-1.25wmf20,
@@ -869,7 +869,7 @@
 zawikiquote: php-1.25wmf20,
 zawiktionary: php-1.25wmf20,
 zeawiki: php-1.25wmf20,
-zerowiki: php-1.25wmf20,
+zerowiki: php-1.25wmf21,
 zh_classicalwiki: php-1.25wmf20,
 zh_min_nanwiki: php-1.25wmf20,
 zh_min_nanwikibooks: php-1.25wmf20,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4be6a4dbdcb29d9f2b6dd898e26bd840f8581af9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
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 Kafka reader and forwarder - change (mediawiki...EventLogging)

2015-03-11 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Add Kafka reader and forwarder
..

Add Kafka reader and forwarder

This Kafka reader is based on the 0.9.3 version of kafka-python, found at
https://github.com/mumrah/kafka-python/tree/v0.9.3.

I will have to create a deb package this version.  The (unused)
kafka writer will also have to be updated to use this version.

Change-Id: I89bf383bd7cc1af603fd38b89816c68922491527
---
A server/bin/eventlogging-kafka-forwarder
M server/eventlogging/handlers.py
M server/eventlogging/streams.py
M server/eventlogging/utils.py
4 files changed, 82 insertions(+), 15 deletions(-)


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

diff --git a/server/bin/eventlogging-kafka-forwarder 
b/server/bin/eventlogging-kafka-forwarder
new file mode 100644
index 000..3cfc1e0
--- /dev/null
+++ b/server/bin/eventlogging-kafka-forwarder
@@ -0,0 +1,51 @@
+#!/usr/bin/env python -OO
+# -*- coding: utf-8 -*-
+
+  eventlogging-kafka-forwarder
+  --
+  Kafka - ZeroMQ socket forwarding. Reads messages from a Kafka Topic
+  and writes them to a ZeroMQ TCP PUB socket bound the given port number.
+
+  usage: eventlogging-kafka-forwarder [-h] kafka_url port
+
+  positional arguments:
+kafka_url   e.g. 
kafka://?brokers=broker1:9092,broker2:9092,broker3:9092topic=foogroup_id=bar
+portTCP 0mq Port to forward to
+
+  optional arguments:
+-h, --help  show this help message and exit
+
+  :copyright: (c) 2015 by Andrew Otto o...@wikimedia.org
+  :license: GNU General Public Licence 2.0 or later
+
+
+from __future__ import unicode_literals
+
+import sys
+reload(sys)
+sys.setdefaultencoding('utf-8')
+
+import argparse
+import logging
+
+from eventlogging import pub_socket, setup_logging, get_reader
+
+ap = argparse.ArgumentParser(description='Kafka = PUB Device',
+ fromfile_prefix_chars='@')
+ap.add_argument('kafka_url', type=str, help='kafka url to consume from')
+ap.add_argument('port', type=int, help='Port to forward')
+ap.add_argument('--count', action='store_true',
+help='Prepend an autoincrementing ID to each message')
+args = ap.parse_args()
+
+
+setup_logging()
+logging.info('Forwarding %s = tcp:%d...', args.kafka_url, args.port)
+
+kafka_stream = get_reader(args.kafka_url)
+sock_out = pub_socket(args.port)
+
+if args.count:
+kafka_stream = (str(id) + '\t' + msg for id, msg in 
enumerate(kafka_stream))
+for line in kafka_stream:
+sock_out.send_string(line)
diff --git a/server/eventlogging/handlers.py b/server/eventlogging/handlers.py
index b08fdd0..5065759 100644
--- a/server/eventlogging/handlers.py
+++ b/server/eventlogging/handlers.py
@@ -25,7 +25,7 @@
 
 from .utils import PeriodicThread, uri_delete_query_item
 from .factory import writes, reads
-from .streams import stream, pub_socket, sub_socket, udp_socket
+from .streams import stream, pub_socket, sub_socket, udp_socket, kafka_stream
 from .jrm import store_sql_events, DB_FLUSH_INTERVAL
 
 
@@ -66,21 +66,23 @@
 db[collection].insert(event)
 
 
-@writes('kafka')
-def kafka_writer(brokers, topic='eventlogging'):
-Write events to Kafka, keyed by SCID.
-from kafka.client import KafkaClient
-from kafka.producer import KeyedProducer
 
-kafka = KafkaClient(brokers)
-producer = KeyedProducer(kafka)
-topic = topic.encode('utf-8')
+### This needs updating to work with a newer python-kafka package.
+# @writes('kafka')
+# def kafka_writer(brokers, topic='eventlogging'):
+# Write events to Kafka, keyed by SCID.
+# from kafka.client import KafkaClient
+# from kafka.producer import KeyedProducer
 
-while 1:
-event = (yield)
-key = '%(schema)s_%(revision)s' % event  # e.g. 'EchoMail_5467650'
-key = key.encode('utf-8')
-producer.send(topic, key, json.dumps(event, sort_keys=True))
+# kafka = KafkaClient(brokers)
+# producer = KeyedProducer(kafka)
+# topic = topic.encode('utf-8')
+
+# while 1:
+# event = (yield)
+# key = '%(schema)s_%(revision)s' % event  # e.g. 'EchoMail_5467650'
+# key = key.encode('utf-8')
+# producer.send(topic, key, json.dumps(event, sort_keys=True))
 
 
 @writes('mysql', 'sqlite')
@@ -191,3 +193,9 @@
 def udp_reader(uri, raw=False):
 Reads data from a UDP socket.
 return stream(udp_socket(uri), raw)
+
+
+@reads('kafka')
+def kafka_reader(brokers, topic='eventlogging', group_id='eventlogging'):
+Reads events from Kafka
+return kafka_stream(brokers=brokers, topic=topic, group_id=group_id)
diff --git a/server/eventlogging/streams.py b/server/eventlogging/streams.py
index b3f8a71..3efeecc 100644
--- a/server/eventlogging/streams.py
+++ b/server/eventlogging/streams.py
@@ -20,7 +20,7 @@
 
 
 __all__ = ('iter_json',

[MediaWiki-commits] [Gerrit] more general s/wikimedia.org/wmnet/ fixups for cp* hosts - change (operations/puppet)

2015-03-11 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: more general s/wikimedia.org/wmnet/ fixups for cp* hosts
..


more general s/wikimedia.org/wmnet/ fixups for cp* hosts

Change-Id: I153be1f6b953fd0d880df53b50ed004790e8f8cd
---
M hieradata/role/common/cache.yaml
M manifests/ganglia.pp
M manifests/role/ganglia.pp
M modules/torrus/tests/cdn.pp
4 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/hieradata/role/common/cache.yaml b/hieradata/role/common/cache.yaml
index 0a0e816..addf99d 100644
--- a/hieradata/role/common/cache.yaml
+++ b/hieradata/role/common/cache.yaml
@@ -54,8 +54,8 @@
   - 'cp1069.eqiad.wmnet'
   - 'cp1070.eqiad.wmnet'
 bits_esams:
-  - 'cp3019.esams.wikimedia.org'
-  - 'cp3020.esams.wikimedia.org'
+  - 'cp3019.esams.wmnet'
+  - 'cp3020.esams.wmnet'
   - 'cp3021.esams.wmnet'
   - 'cp3022.esams.wmnet'
 bits_ulsfo:
@@ -75,12 +75,12 @@
 upload_esams:
   - 'cp3003.esams.wmnet'
   - 'cp3004.esams.wmnet'
-  - 'cp3005.esams.wikimedia.org'
+  - 'cp3005.esams.wmnet'
   - 'cp3006.esams.wikimedia.org'
   - 'cp3007.esams.wikimedia.org'
   - 'cp3008.esams.wikimedia.org'
   - 'cp3009.esams.wikimedia.org'
-  - 'cp3010.esams.wikimedia.org'
+  - 'cp3010.esams.wmnet'
   - 'cp3015.esams.wmnet'
   - 'cp3016.esams.wmnet'
   - 'cp3017.esams.wmnet'
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 2c6e900..3132f8d 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -258,7 +258,7 @@
 'Swift eqiad'= 'ms-fe1001.eqiad.wmnet 
ms-fe1002.eqiad.wmnet',
 'Swift esams'= 
'hooft.esams.wikimedia.org:11676',
 'Swift codfw'= 
'install2001.wikimedia.org:10676',
-'Bits caches esams'  = 
'hooft.esams.wikimedia.org:11670 cp3019.esams.wikimedia.org 
cp3020.esams.wikimedia.org',
+'Bits caches esams'  = 
'hooft.esams.wikimedia.org:11670 cp3019.esams.wmnet cp3020.esams.wmnet',
 'LVS loadbalancers esams'= 
'hooft.esams.wikimedia.org:11651 lvs3001.esams.wmnet lvs3002.esams.wmnet',
 'Miscellaneous esams'= 
'hooft.esams.wikimedia.org:11657',
 'Analytics cluster eqiad'= 'analytics1009.eqiad.wmnet 
analytics1010.eqiad.wmnet analytics1014.eqiad.wmnet',
diff --git a/manifests/role/ganglia.pp b/manifests/role/ganglia.pp
index c8be96a..a935bba 100644
--- a/manifests/role/ganglia.pp
+++ b/manifests/role/ganglia.pp
@@ -27,7 +27,7 @@
 'Swift eqiad'= 'ms-fe1001.eqiad.wmnet 
ms-fe1002.eqiad.wmnet',
 'Swift esams'= 'hooft.esams.wikimedia.org:11676',
 'Swift codfw'= 'install2001.wikimedia.org:10676',
-'Bits caches esams'  = 'hooft.esams.wikimedia.org:11670 
cp3019.esams.wikimedia.org cp3020.esams.wikimedia.org',
+'Bits caches esams'  = 'hooft.esams.wikimedia.org:11670 
cp3019.esams.wmnet cp3020.esams.wmnet',
 'LVS loadbalancers esams'= 'hooft.esams.wikimedia.org:11651 
lvs3001.esams.wmnet lvs3002.esams.wmnet',
 'Miscellaneous esams'= 'hooft.esams.wikimedia.org:11657',
 'Analytics cluster eqiad'= 'analytics1013.eqiad.wmnet 
analytics1014.eqiad.wmnet analytics1019.eqiad.wmnet',
diff --git a/modules/torrus/tests/cdn.pp b/modules/torrus/tests/cdn.pp
index c6d1a92..5c470db 100644
--- a/modules/torrus/tests/cdn.pp
+++ b/modules/torrus/tests/cdn.pp
@@ -27,7 +27,7 @@
 'eqiad' = ['cp1056.eqiad.wmnet',
 'cp1070.eqiad.wmnet',
 ],
-'esams' = ['cp3019.esams.wikimedia.org',
+'esams' = ['cp3019.esams.wmnet',
 'cp3022.esams.wmnet',
 ],
 'ulsfo' = ['cp4001.ulsfo.wmnet',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I153be1f6b953fd0d880df53b50ed004790e8f8cd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Window: Clarify descriptions of methods and configs - change (oojs/ui)

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

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

Change subject: Window: Clarify descriptions of methods and configs
..


Window: Clarify descriptions of methods and configs

Change-Id: I259fe8c092561d98411aa1f3e78569666876fe02
---
M src/Window.js
1 file changed, 96 insertions(+), 60 deletions(-)

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



diff --git a/src/Window.js b/src/Window.js
index ec75552..e22c7f9 100644
--- a/src/Window.js
+++ b/src/Window.js
@@ -40,8 +40,8 @@
  *
  * @constructor
  * @param {Object} [config] Configuration options
- * @cfg {string} [size] Symbolic name of dialog size, `small`, `medium`, 
`large`, `larger` or
- *  `full`; omit to use #static-size
+ * @cfg {string} [size] Symbolic name of the dialog size: `small`, `medium`, 
`large`, `larger` or
+ *  `full`.  If omitted, the value of the {@link #static-size static size} 
property will be used.
  */
 OO.ui.Window = function OoUiWindow( config ) {
// Configuration initialization
@@ -88,9 +88,9 @@
 /* Static Properties */
 
 /**
- * Symbolic name of size.
+ * Symbolic name of the window size: `small`, `medium`, `large`, `larger` or 
`full`.
  *
- * Size is used if no size is configured during construction.
+ * The static size is used if no #size is configured during construction.
  *
  * @static
  * @inheritable
@@ -103,6 +103,7 @@
 /**
  * Handle mouse down events.
  *
+ * @private
  * @param {jQuery.Event} e Mouse down event
  */
 OO.ui.Window.prototype.onMouseDown = function ( e ) {
@@ -113,7 +114,7 @@
 };
 
 /**
- * Check if window has been initialized.
+ * Check if the window has been initialized.
  *
  * Initialization occurs when a window is added to a manager.
  *
@@ -124,7 +125,7 @@
 };
 
 /**
- * Check if window is visible.
+ * Check if the window is visible.
  *
  * @return {boolean} Window is visible
  */
@@ -133,9 +134,10 @@
 };
 
 /**
- * Check if window is opening.
+ * Check if the window is opening.
  *
- * This is a wrapper around OO.ui.WindowManager#isOpening.
+ * This method is a wrapper around the window manager's {@link 
OO.ui.WindowManager#isOpening isOpening}
+ * method.
  *
  * @return {boolean} Window is opening
  */
@@ -144,9 +146,9 @@
 };
 
 /**
- * Check if window is closing.
+ * Check if the window is closing.
  *
- * This is a wrapper around OO.ui.WindowManager#isClosing.
+ * This method is a wrapper around the window manager's {@link 
OO.ui.WindowManager#isClosing isClosing} method.
  *
  * @return {boolean} Window is closing
  */
@@ -155,9 +157,9 @@
 };
 
 /**
- * Check if window is opened.
+ * Check if the window is opened.
  *
- * This is a wrapper around OO.ui.WindowManager#isOpened.
+ * This method is a wrapper around the window manager's {@link 
OO.ui.WindowManager#isOpened isOpened} method.
  *
  * @return {boolean} Window is opened
  */
@@ -168,6 +170,9 @@
 /**
  * Get the window manager.
  *
+ * All windows must be attached to a window manager, which is used to open
+ * and close the window and control its presentation.
+ *
  * @return {OO.ui.WindowManager} Manager of window
  */
 OO.ui.Window.prototype.getManager = function () {
@@ -175,9 +180,9 @@
 };
 
 /**
- * Get the window size.
+ * Get the symbolic name of the window size (e.g., `small` or `medium`).
  *
- * @return {string} Symbolic size name, e.g. `small`, `medium`, `large`, 
`larger`, `full`
+ * @return {string} Symbolic name of the size: `small`, `medium`, `large`, 
`larger`, `full`
  */
 OO.ui.Window.prototype.getSize = function () {
return this.size;
@@ -207,9 +212,16 @@
 };
 
 /**
- * Get the height of the dialog contents.
+ * Get the height of the full window contents (i.e., the window head, body and 
foot together).
  *
- * @return {number} Content height
+ * What consistitutes the head, body, and foot varies depending on the window 
type.
+ * A {@link OO.ui.MessageDialog message dialog} displays a title and message 
in its body,
+ * and any actions in the foot. A {@link OO.ui.ProcessDialog process dialog} 
displays a title
+ * and special actions in the head, and dialog content in the body.
+ *
+ * To get just the height of the dialog body, use the #getBodyHeight method.
+ *
+ * @return {number} The height of the window contents (the dialog head, body 
and foot) in pixels
  */
 OO.ui.Window.prototype.getContentHeight = function () {
var bodyHeight,
@@ -239,34 +251,42 @@
 };
 
 /**
- * Get the height of the dialog contents.
+ * Get the height of the window body.
  *
- * When this function is called, the dialog will temporarily have been resized
+ * To get the height of the full window contents (the window body, head, and 
foot together),
+ * use #getContentHeight.
+ *
+ * When this function is called, the window will temporarily have been resized
  * to height=1px, so .scrollHeight measurements can be taken accurately.
  *
- * @return {number} Height of content
+ * @return {number} Height of the

1 2 3 4 5 >

1 - 100 of 444 matches

Mail list logo