date:20140902

[MediaWiki-commits] [Gerrit] There is no welcome notification - change (mediawiki...Echo)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: There is no welcome notification
..


There is no welcome notification

Bug: 70139
Change-Id: Ice565a23073dac0c39d61801cad34c9c9419b2dc
---
M Hooks.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
index 3043c07..de8fa19 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -515,6 +515,10 @@
EchoEvent::create( array(
'type' => 'welcome',
'agent' => $user,
+   // welcome email is sent to agent
+   'extra' => array (
+   'notifyAgent' => true
+   )
) );
 
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice565a23073dac0c39d61801cad34c9c9419b2dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Spage 
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 pcre overflow patch that should prevent beta from crashi... - change (operations...hhvm)

2014-09-02 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Add pcre overflow patch that should prevent beta from crashing 
regularly
..

Add pcre overflow patch that should prevent beta from crashing regularly

Change-Id: I6420b1066b2bca3a5f056dd3628c38a4b08178d5
---
A debian/patches/Fix-handling-of-pcre-overflow-expressions.patch
M debian/patches/series
2 files changed, 130 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm 
refs/changes/90/157790/1

diff --git a/debian/patches/Fix-handling-of-pcre-overflow-expressions.patch 
b/debian/patches/Fix-handling-of-pcre-overflow-expressions.patch
new file mode 100644
index 000..ce7d2db
--- /dev/null
+++ b/debian/patches/Fix-handling-of-pcre-overflow-expressions.patch
@@ -0,0 +1,129 @@
+From 968dfa256cef0f48c7b574857f105d5d8dd54703 Mon Sep 17 00:00:00 2001
+From: aravind 
+Date: Mon, 18 Aug 2014 14:10:34 -0700
+Subject: [PATCH] Fix handling of pcre overflow expressions
+
+Summary: Couple of fixes to the handling of pcre compiled expressions that 
overflow the default pcre cache:
+
+s_pcre_globals should smart-free m_overflow at the end of the request, and 
should free() the set of overflow expressions themselves.
+
+Reviewed By: @markw65
+
+Differential Revision: D1503955
+---
+ hphp/runtime/base/preg.cpp  | 13 -
+ hphp/runtime/base/preg.h|  1 +
+ hphp/runtime/base/program-functions.cpp |  3 +++
+ hphp/runtime/base/program-functions.h   |  1 +
+ hphp/test/slow/ext_preg/preg_cache_overflow.php | 17 +
+ hphp/test/slow/ext_preg/preg_cache_overflow.php.expectf |  5 +
+ hphp/test/slow/ext_preg/preg_cache_overflow.php.opts|  1 +
+ 7 files changed, 40 insertions(+), 1 deletion(-)
+ create mode 100644 hphp/test/slow/ext_preg/preg_cache_overflow.php
+ create mode 100644 hphp/test/slow/ext_preg/preg_cache_overflow.php.expectf
+ create mode 100644 hphp/test/slow/ext_preg/preg_cache_overflow.php.opts
+
+diff --git a/hphp/runtime/base/preg.cpp b/hphp/runtime/base/preg.cpp
+index f0fe7c6..54e4011 100644
+--- a/hphp/runtime/base/preg.cpp
 b/hphp/runtime/base/preg.cpp
+@@ -58,8 +58,19 @@ pcre_cache_entry::~pcre_cache_entry() {
+   pcre_free(re);
+ }
+ 
++void PCREglobals::onSessionExit() {
++  for (auto entry: m_overflow) {
++delete entry;
++  }
++  smart::vector().swap(m_overflow);
++}
++
+ PCREglobals::~PCREglobals() {
+-  m_overflow.clear();
++  onSessionExit();
++}
++
++void pcre_session_exit() {
++  s_pcre_globals->onSessionExit();
+ }
+ 
+ void PCREglobals::cleanupOnRequestEnd(const pcre_cache_entry* ent) {
+diff --git a/hphp/runtime/base/preg.h b/hphp/runtime/base/preg.h
+index da2c1a6..4699214 100644
+--- a/hphp/runtime/base/preg.h
 b/hphp/runtime/base/preg.h
+@@ -70,6 +70,7 @@ class PCREglobals {
+   PCREglobals() { }
+   ~PCREglobals();
+   void cleanupOnRequestEnd(const pcre_cache_entry* ent);
++  void onSessionExit();
+   // pcre ini_settings
+   int64_t m_preg_backtrace_limit;
+   int64_t m_preg_recursion_limit;
+diff --git a/hphp/runtime/base/program-functions.cpp 
b/hphp/runtime/base/program-functions.cpp
+index 502daa3..63d1860 100644
+--- a/hphp/runtime/base/program-functions.cpp
 b/hphp/runtime/base/program-functions.cpp
+@@ -1854,6 +1854,9 @@ void hphp_session_exit() {
+ // reinitialize g_context here.
+ g_context.getCheck();
+ 
++// Clean up pcre state at the end of the request.
++pcre_session_exit();
++
+ mm.sweep();
+ 
+ // Destroy g_context again because ExecutionContext has
+diff --git a/hphp/runtime/base/program-functions.h 
b/hphp/runtime/base/program-functions.h
+index c623fa5..9c3e053 100644
+--- a/hphp/runtime/base/program-functions.h
 b/hphp/runtime/base/program-functions.h
+@@ -83,6 +83,7 @@ class ExecutionContext;
+ 
+ void pcre_init();
+ void pcre_reinit();
++void pcre_session_exit();
+ void hphp_process_init();
+ void hphp_session_init();
+ 
+diff --git a/hphp/test/slow/ext_preg/preg_cache_overflow.php 
b/hphp/test/slow/ext_preg/preg_cache_overflow.php
+new file mode 100644
+index 000..4106efe
+--- /dev/null
 b/hphp/test/slow/ext_preg/preg_cache_overflow.php
+@@ -0,0 +1,17 @@
++https://gerrit.wikimedia.org/r/157790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6420b1066b2bca3a5f056dd3628c38a4b08178d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/hhvm
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Update or remove outdated urls - change (mediawiki...Translate)

2014-09-02 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Update or remove outdated urls
..

Update or remove outdated urls

Change-Id: I4d138e55fdc34d8357b3fed9343c2442ce50ba69
---
M README
M Translate.php
M messagegroups/MessageGroupBase.php
3 files changed, 3 insertions(+), 5 deletions(-)


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

diff --git a/README b/README
index fecfa69..a2cfe11 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@
 == Contributing ==
 * Translations? Go to https://translatewiki.net and sign up.
 * Code? File format handlers? New message groups? Graphics? Suggestions?
-  Bug reports? Please start a thread at http://translatewiki.net/wiki/Support,
+  Bug reports? Please start a thread at https://translatewiki.net/wiki/Support,
   report a bug in https://bugzilla.wikimedia.org or join us at #mediawiki-i18n
   and let us know what you have in mind.
 
@@ -30,5 +30,3 @@
 
 Documentation for the extension is at:
  https://www.mediawiki.org/wiki/Help:Extension:Translate
-And for the code at:
- https://translatewiki.net/docs/Translate/html/
diff --git a/Translate.php b/Translate.php
index a1957ce..599fb89 100644
--- a/Translate.php
+++ b/Translate.php
@@ -381,7 +381,7 @@
  * with simple markup and automatic tracking of changes.
  *
  * @defgroup PageTranslation Page Translation
- * @see http://translatewiki.net/wiki/Translating:Page_translation_feature
+ * @see 
https://www.mediawiki.org/wiki/Help:Extension:Translate/Page_translation_administration
  */
 $GLOBALS['wgEnablePageTranslation'] = true;
 
diff --git a/messagegroups/MessageGroupBase.php 
b/messagegroups/MessageGroupBase.php
index 4a07d5b..2a6cffc 100644
--- a/messagegroups/MessageGroupBase.php
+++ b/messagegroups/MessageGroupBase.php
@@ -14,7 +14,7 @@
  * and are managed with Special:ManageMessageGroups and
  * processMessageChanges.php.
  *
- * @see http://translatewiki.net/wiki/Translating:Group_configuration
+ * @see 
https://www.mediawiki.org/wiki/Help:Extension:Translate/Group_configuration
  * @ingroup MessageGroup
  */
 abstract class MessageGroupBase implements MessageGroup {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d138e55fdc34d8357b3fed9343c2442ce50ba69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] Check Gadget name is a valid ResourceLoader module name - change (mediawiki...Gadgets)

2014-09-02 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Check Gadget name is a valid ResourceLoader module name
..

Check Gadget name is a valid ResourceLoader module name

When loading the Gadget list, check against ResourceLoader::isValidModuleName
to avoid MWExceptions being thrown.

This will lower the max length of a gadget name from 248 bytes to
244.

Change-Id: Ib74c0866bb333885c747d318418e2c8685ae339c
---
M Gadgets_body.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/Gadgets_body.php b/Gadgets_body.php
index 6f17af9..cd10f75 100644
--- a/Gadgets_body.php
+++ b/Gadgets_body.php
@@ -50,6 +50,11 @@
//  Also, title-normalization applies.
$gadget = new Gadget();
$gadget->name = trim( str_replace( ' ', '_', $m[1] ) );
+   // If the name is too long, then RL will throw an MWException 
when
+   // we try to register the module
+   if ( !ResourceLoader::isValidModuleName( 
$gadget->getModuleName() ) ) {
+   return false;
+   }
$gadget->definition = $definition;
$options = trim( $m[2], ' []' );
 

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

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

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

[MediaWiki-commits] [Gerrit] WikidataBot as subclass of Bot without 'always' option - change (pywikibot/core)

2014-09-02 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: WikidataBot as subclass of Bot without 'always' option
..

WikidataBot as subclass of Bot without 'always' option

to make advantage of new methods such as quit(), etc.

Change-Id: Icecd762cd44092129106800ac93e772dde3913ef
---
M pywikibot/bot.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/93/157793/1

diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index d0a20f9..22ff6ac 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -914,14 +914,14 @@
  self.__class__.__name__)
 
 
-class WikidataBot:
+class WikidataBot(Bot):
 
 """
 Generic Wikidata Bot to be subclassed.
-
-Used in claimit.py, coordinate_import.py and harvest_template.py
 """
 
+availableOptions = {}
+
 def cacheSources(self):
 """
 Fetch the sources from the list on Wikidata.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icecd762cd44092129106800ac93e772dde3913ef
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 

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

[MediaWiki-commits] [Gerrit] Eliminated global events - change (mediawiki...Wikibase)

2014-09-02 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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

Change subject: Eliminated global events
..

Eliminated global events

The change removes all global events triggered on the JavaScript "wikibase" 
object, most
prominently "startItemPageEditMode" and "stopItemPageEditMode".
Removing the events required consolidating state (disable/enable) handling 
across the widget
hierarchy. This is achieved by applying a "disable" event to TemplatedWidget.

Change-Id: Id9ed0ea51064f2ce295cb1b3f1a23cb36a850442
---
M lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
M lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintview.js
M lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M lib/resources/jquery.wikibase/jquery.wikibase.listview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/jquery.wikibase/toolbar/edittoolbar.js
M lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js
M lib/resources/wikibase.css
M lib/resources/wikibase.js
M lib/tests/qunit/data/testrunner.js
M repo/resources/wikibase.ui.entityViewInit.js
26 files changed, 688 insertions(+), 700 deletions(-)


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

diff --git a/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js 
b/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
index 4b73002..0bf704a 100644
--- a/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
+++ b/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
@@ -1,9 +1,8 @@
 /**
- *
  * @licence GNU GPL v2+
  * @author Daniel Werner < daniel.wer...@wikimedia.de >
  */
-( function( $, util ) {
+( function( $ ) {
'use strict';
 
var PARENT =  $.Widget;
@@ -43,6 +42,12 @@
 *   modified on the base prototype. Our workaround for this only 
worked for one level of
 *   inheritance (doing the copy manually in the prototype's 
constructor, can't define the
 *   constructor of the new prototype created by jQuery.widget() 
though).
+*
+* @event disable
+*Triggered whenever the widget is disabled (after disabled 
state has been set).
+*- {jQuery.Event}
+*- {boolean} Whether widget has been dis- oder enabled.
+*
 */
$.widget( 'ui.TemplatedWidget', PARENT, {
/**
@@ -70,6 +75,8 @@
}
 
this._createTemplateShortCuts();
+
+   PARENT.prototype._create.apply( this );
},
 
_applyTemplate: function() {
@@ -127,8 +134,7 @@
},
 
/**
-* @see jQuery.widget._setOption
-* We are using this to disallow changing the 'template' option 
afterwards
+* @see jQuery.Widget._setOption
 */
_setOption: function( key, value ) {
switch( key ) {
@@ -137,10 +143,17 @@
case 'templateShortCuts':
throw new Error( 'Can not set template 
related options after initialization' );
}
-   PARENT.prototype._setOption.call( this, key, value );
+
+   var response = PARENT.prototype._setOption.apply( this, 
arguments );
+
+   if( key === 'disabled' ) {
+   this._trigger( 'disable', null, [value] );
+   }
+
+   return response;
}
} );
 
$.TemplatedWidget = $.ui.TemplatedWidget;
 
-}( jQuery, util ) );
+}( jQuery ) );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
index 9444375..40f4173 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.al

[MediaWiki-commits] [Gerrit] Add ImageMetrics and PdfHandler to the gerrit dashboard - change (mediawiki...MultimediaViewer)

2014-09-02 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Add ImageMetrics and PdfHandler to the gerrit dashboard
..

Add ImageMetrics and PdfHandler to the gerrit dashboard

Also fixes a bug in the WIP logic

Change-Id: If3ac1adb3db461f1172741457c6be4d37fce0c34
---
M default
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/96/157796/1

diff --git a/default b/default
index bf3a76d..fe3947d 100644
--- a/default
+++ b/default
@@ -10,12 +10,12 @@
 [section "Config"]
   query = (project:operations/mediawiki-config OR project:operations/puppet OR 
project:mediawiki/vagrant OR project:mediawiki/extensions/MultimediaViewer AND 
(ref:refs/meta/dashboards/custom OR ref:refs/meta/config)) status:open 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
 [section "Metrics"]
-  query = (project:analytics/multimedia OR 
project:analytics/multimedia/config) status:open limit:10
-[section "Other (CMD/TMH/GWT)"]
-  query = (project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset) status:open -message:wip limit:15
+  query = (project:analytics/multimedia OR project:analytics/multimedia/config 
OR project:mediawiki/extensions/ImageMetrics) status:open limit:10
+[section "Other (CMD/TMH/GWT/PDF)"]
+  query = (project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset OR 
project:mediawiki/extensions/PdfHandler) status:open -message:wip limit:15
 [section "BetaFeatures"]
   query = project:mediawiki/extensions/BetaFeatures status:open limit:5
 [section "WIP"]
-  query = (project:mediawiki/extensions/MultimediaViewer OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset (project:mediawiki/core AND 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles))) status:open 
message:wip limit:10
+  query = (project:mediawiki/extensions/MultimediaViewer OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset OR 
project:mediawiki/extensions/ImageMetrics OR 
project:mediawiki/extensions/PdfHandler OR (project:mediawiki/core AND 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles))) status:open 
message:wip limit:10
 [section "Recently merged"]
-  query = status:merged NOT owner:L10n-bot ( 
project:mediawiki/extensions/MultimediaViewer OR (owner:MarkTraceur OR 
owner:{Gergő Tisza} OR owner:Gilles) AND (project:mediawiki/core OR 
project:operations/mediawiki-config) OR project:analytics/multimedia OR 
project:analytics/multimedia/config OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/BetaFeatures) limit:20 
+  query = status:merged NOT owner:L10n-bot ( 
project:mediawiki/extensions/MultimediaViewer OR (owner:MarkTraceur OR 
owner:{Gergő Tisza} OR owner:Gilles) AND (project:mediawiki/core OR 
project:operations/mediawiki-config) OR project:analytics/multimedia OR 
project:analytics/multimedia/config OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/BetaFeatures OR 
project:mediawiki/extensions/ImageMetrics OR 
project:mediawiki/extensions/PdfHandler) limit:20 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3ac1adb3db461f1172741457c6be4d37fce0c34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Add ImageMetrics and PdfHandler to the gerrit dashboard - change (mediawiki...MultimediaViewer)

2014-09-02 Thread Code Review

Gergő Tisza has submitted this change and it was merged.

Change subject: Add ImageMetrics and PdfHandler to the gerrit dashboard
..


Add ImageMetrics and PdfHandler to the gerrit dashboard

Also fixes a bug in the WIP logic

Change-Id: If3ac1adb3db461f1172741457c6be4d37fce0c34
---
M default
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Gergő Tisza: Verified; Looks good to me, approved



diff --git a/default b/default
index bf3a76d..fe3947d 100644
--- a/default
+++ b/default
@@ -10,12 +10,12 @@
 [section "Config"]
   query = (project:operations/mediawiki-config OR project:operations/puppet OR 
project:mediawiki/vagrant OR project:mediawiki/extensions/MultimediaViewer AND 
(ref:refs/meta/dashboards/custom OR ref:refs/meta/config)) status:open 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
 [section "Metrics"]
-  query = (project:analytics/multimedia OR 
project:analytics/multimedia/config) status:open limit:10
-[section "Other (CMD/TMH/GWT)"]
-  query = (project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset) status:open -message:wip limit:15
+  query = (project:analytics/multimedia OR project:analytics/multimedia/config 
OR project:mediawiki/extensions/ImageMetrics) status:open limit:10
+[section "Other (CMD/TMH/GWT/PDF)"]
+  query = (project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset OR 
project:mediawiki/extensions/PdfHandler) status:open -message:wip limit:15
 [section "BetaFeatures"]
   query = project:mediawiki/extensions/BetaFeatures status:open limit:5
 [section "WIP"]
-  query = (project:mediawiki/extensions/MultimediaViewer OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset (project:mediawiki/core AND 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles))) status:open 
message:wip limit:10
+  query = (project:mediawiki/extensions/MultimediaViewer OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset OR 
project:mediawiki/extensions/ImageMetrics OR 
project:mediawiki/extensions/PdfHandler OR (project:mediawiki/core AND 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles))) status:open 
message:wip limit:10
 [section "Recently merged"]
-  query = status:merged NOT owner:L10n-bot ( 
project:mediawiki/extensions/MultimediaViewer OR (owner:MarkTraceur OR 
owner:{Gergő Tisza} OR owner:Gilles) AND (project:mediawiki/core OR 
project:operations/mediawiki-config) OR project:analytics/multimedia OR 
project:analytics/multimedia/config OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/BetaFeatures) limit:20 
+  query = status:merged NOT owner:L10n-bot ( 
project:mediawiki/extensions/MultimediaViewer OR (owner:MarkTraceur OR 
owner:{Gergő Tisza} OR owner:Gilles) AND (project:mediawiki/core OR 
project:operations/mediawiki-config) OR project:analytics/multimedia OR 
project:analytics/multimedia/config OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/BetaFeatures OR 
project:mediawiki/extensions/ImageMetrics OR 
project:mediawiki/extensions/PdfHandler) limit:20 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3ac1adb3db461f1172741457c6be4d37fce0c34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] releases: do not include hostname in sudoers.d - change (operations/puppet)

2014-09-02 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: releases: do not include hostname in sudoers.d
..

releases: do not include hostname in sudoers.d

as it turns out, "#includedir" has a behaviour similar to run-parts, i.e. it
will ignore files that contain dots or tilde:

  sudo will read each file in /etc/sudoers.d, skipping file names that end in ~
  or contain a . character to avoid causing problems with package manager
  or editor temporary/backup files

also depend on dput for deb-upload

Change-Id: Ie7cee653726633026d5730f94396ef3958b8dd6d
---
M modules/releases/manifests/reprepro.pp
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/157797/1

diff --git a/modules/releases/manifests/reprepro.pp 
b/modules/releases/manifests/reprepro.pp
index 3fed293..53d4e47 100644
--- a/modules/releases/manifests/reprepro.pp
+++ b/modules/releases/manifests/reprepro.pp
@@ -146,7 +146,11 @@
 source  => 'puppet:///modules/releases/deb-upload',
 }
 
-admin::sudo { "releases_dput_${upload_host}":
+package { 'dput':
+before => File['/usr/local/bin/deb-upload'],
+}
+
+admin::sudo { "releases_dput":
 user => $sudo_user,
 privs => ["ALL = (${user}) NOPASSWD: dput"],
 }

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

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

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

[MediaWiki-commits] [Gerrit] Fix startup of hhvm - change (operations...hhvm)

2014-09-02 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Fix startup of hhvm
..

Fix startup of hhvm

There was some duplication of configs, and one outdated config
parameter, that would prevent HHVM from starting. In detail:

* Fixed default parameters
* Fixed init/upstart scripts to create a private /tmp/hhvm dir
* Install an ini file that will set the bytecode repo path

Change-Id: I27dc9321a61442632c59c0889bf85a1afa9b2c0f
Signed-off-by: Giuseppe Lavagetto 
---
M debian/hhvm.default
A debian/hhvm.dirs
A debian/hhvm.ini
M debian/hhvm.init
M debian/hhvm.upstart
M debian/rules
6 files changed, 23 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm 
refs/changes/98/157798/1

diff --git a/debian/hhvm.default b/debian/hhvm.default
index 48882cc..8c2fe8c 100644
--- a/debian/hhvm.default
+++ b/debian/hhvm.default
@@ -1,5 +1,5 @@
 HHVM_USER="www-data"
 HHVM_GROUP="www-data"
 HHVM_PORT=9000
-DAEMON_OPTS="${DAEMON_OPTS} -m server -vServer.Type=fastcgi 
-vServer.Port=${HHVM_PORT} -vServer.FileSocket=/run/hhvm/hhvm.sock --user 
${HHVM_USER} --php --php-ini=/etc/hhvm/php.ini"
+DAEMON_OPTS="${DAEMON_OPTS} -m server -vServer.Type=fastcgi 
-vServer.Port=${HHVM_PORT} --user ${HHVM_USER} --php --config=/etc/hhvm/php.ini"
 export DAEMON_OPTS HHVM_USER HHVM_GROUP
diff --git a/debian/hhvm.dirs b/debian/hhvm.dirs
new file mode 100644
index 000..1b9ee24
--- /dev/null
+++ b/debian/hhvm.dirs
@@ -0,0 +1 @@
+/etc/hhvm
diff --git a/debian/hhvm.ini b/debian/hhvm.ini
new file mode 100644
index 000..8f2343d
--- /dev/null
+++ b/debian/hhvm.ini
@@ -0,0 +1,7 @@
+# This is not a thoroughly commented configuration file; 
+# it just ensures that hhvm will run on first run.
+#
+# Set the path for the bytecode repo to a private directory under /tmp
+# as the bytecode can contain sensitive, private data.
+#
+repo.central.path = "/tmp/hhvm/hhvm.sq3"
diff --git a/debian/hhvm.init b/debian/hhvm.init
index df1e5e6..feb0f78 100755
--- a/debian/hhvm.init
+++ b/debian/hhvm.init
@@ -24,7 +24,7 @@
 
 
 # set default values for default variables
-DAEMON_OPTS="-m server"
+DAEMON_OPTS=""
 HHVM_USER="www-data"
 HHVM_GROUP="www-data"
 HHVM_PORT=9000
@@ -59,6 +59,10 @@
 #
 do_start()
 {
+mkdir -p -m0755 /run/hhvm/
+mkdir -p -m0700 /tmp/hhvm
+chown ${HHVM_USER}:${HHVM_GROUP} /run/hhvm/
+chown ${HHVM_USER}:${HHVM_GROUP} /tmp/hhvm/
# Return
#   0 if daemon has been started
#   1 if daemon was already running
diff --git a/debian/hhvm.upstart b/debian/hhvm.upstart
index b313eef..f622c51 100644
--- a/debian/hhvm.upstart
+++ b/debian/hhvm.upstart
@@ -11,14 +11,16 @@
HHVM_GROUP="www-data"
[ -r /etc/default/hhvm ] && . /etc/default/hhvm
mkdir -p -m0755 /run/hhvm/
+   mkdir -p -m0700 /tmp/hhvm
chown ${HHVM_USER}:${HHVM_GROUP} /run/hhvm/
+   chown ${HHVM_USER}:${HHVM_GROUP} /tmp/hhvm/
 end script
 
 respawn
 script
 HHVM_USER="www-data"
 HHVM_GROUP="www-data"
-DAEMON_OPTS="-m server"
+DAEMON_OPTS=""
 [ -r /etc/default/hhvm ] && . /etc/default/hhvm
 /sbin/start-stop-daemon --quiet --start \
 --chuid $HHVM_USER:$HHVM_GROUP \
diff --git a/debian/rules b/debian/rules
index 9ac4508..fd5d128 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,4 +36,9 @@
[ -n "$${hhvmapi}" ] && echo 
"hhvm:ApiVersion=hhvm-api-$${hhvmapi}" >> debian/hhvm.substvars
dh_gencontrol
 
-.PHONY: override_dh_auto_build override_dh_auto_configure 
override_dh_auto_test override_dh_strip
+override_dh_auto_install:
+   dh_auto_install
+   # Install the default ini file.
+   install -m644 $(CURDIR)/debian/hhvm.php.ini 
$(CURDIR)/debian/hhvm/etc/hhvm/php.ini
+
+.PHONY: override_dh_auto_build override_dh_auto_configure 
override_dh_auto_test override_dh_strip override_dh_gencontrol 
override_dh_auto_install

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27dc9321a61442632c59c0889bf85a1afa9b2c0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/hhvm
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Log user messages after login - change (pywikibot/core)

2014-09-02 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Log user messages after login
..

Log user messages after login

43cf1be932e11a82922695cb9f69e870a01584ca added a check to prevent
user login during initalisation in order to log whether the user
has unread messages on their talk page.

The check used Site.logged_in, however that method will always be
false at initialisation as _userinfo has not been fetched.
(see 43cf1be932e11a82922695cb9f69e870a01584ca)

Move the user talk check to within Site.login, which has been split
so allow actions that should only occur once after login, and not
be repeated each time pywikibot checks that the bot is logged in.

Change-Id: Id2c2321a8ebdd4edccb6c6f1731d7461dfd4fbd9
---
M pywikibot/bot.py
M pywikibot/site.py
2 files changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/99/157799/1

diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 3f97014..c3505d5 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -315,16 +315,6 @@
 
 log(u'SITE VERSION: %s' % unicode(site.live_version()))
 
-# messages on bot discussion page?
-if site.logged_in():
-if site.messages():
-messagestate = 'unanswered'
-else:
-messagestate = 'none'
-else:
-messagestate = 'unknown (not logged in)'
-log(u'MESSAGES: %s' % messagestate)
-
 log(u'=== ' * 14)
 
 
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 8e42f27..aa06b4b 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -1308,7 +1308,17 @@
 if self.logged_in(sysop):
 self._loginstatus = (LoginStatus.AS_SYSOP
  if sysop else LoginStatus.AS_USER)
-return
+else:
+self._login(sysop)
+if site.logged_in():
+if self.messages():
+messagestate = 'unanswered'
+else:
+messagestate = 'none'
+pywikibot.log(u'%s messages: %s' % (self, messagestate))
+
+def _login(self, sysop=False):
+"""Log the user in."""
 # check whether a login cookie already exists for this user
 self._loginstatus = LoginStatus.IN_PROGRESS
 if hasattr(self, "_userinfo"):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2c2321a8ebdd4edccb6c6f1731d7461dfd4fbd9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 02/09/2014 10:00 - change (mediawiki...Wikidata)

2014-09-02 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 02/09/2014 10:00
..

New Wikidata Build - 02/09/2014 10:00

Change-Id: I7fec475cb625fc695fd5672b26614e28944f5642
---
M composer.lock
M extensions/Wikibase/.jshintignore
M extensions/Wikibase/client/WikibaseClient.i18n.magic.php
M extensions/Wikibase/client/i18n/ro.json
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
M extensions/Wikibase/lib/WikibaseLib.hooks.php
M extensions/Wikibase/lib/i18n/et.json
M extensions/Wikibase/lib/i18n/nl.json
M extensions/Wikibase/lib/i18n/ro.json
M extensions/Wikibase/lib/includes/ReferencedEntitiesFinder.php
M extensions/Wikibase/lib/includes/Term.php
M extensions/Wikibase/lib/includes/changes/ItemChange.php
M extensions/Wikibase/lib/resources/Resources.php
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.aliasesview.css
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.labelview.css
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css
M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js
M 
extensions/Wikibase/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
M extensions/Wikibase/lib/resources/wikibase.css
M extensions/Wikibase/lib/resources/wikibase.js
D extensions/Wikibase/lib/resources/wikibase.ui.Base.js
D 
extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.Interface.js
D 
extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
D extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.css
D extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js
D extensions/Wikibase/lib/resources/wikibase.ui.js
D 
extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.ObservableObject.js
M 
extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata/wikibase.utilities.jQuery.ui.tagadata.css
M extensions/Wikibase/lib/tests/phpunit/ChangesTableTest.php
M extensions/Wikibase/lib/tests/phpunit/ReferencedEntitiesFinderTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/DiffChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php
M 
extensions/Wikibase/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/ItemSerializerTest.php
M extensions/Wikibase/lib/tests/qunit/wikibase.tests.js
D 
extensions/Wikibase/lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.Interface.tests.js
D 
extensions/Wikibase/lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.tests.js
D extensions/Wikibase/lib/tests/qunit/wikibase.ui.PropertyEditTool.tests.js
D 
extensions/Wikibase/lib/tests/qunit/wikibase.utilities/wikibase.utilities.ObservableObject.tests.js
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/fa.json
M extensions/Wikibase/repo/i18n/gl.json
M extensions/Wikibase/repo/i18n/nl.json
M extensions/Wikibase/repo/i18n/oc.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/i18n/ro.json
M extensions/Wikibase/repo/includes/ClaimDifference.php
M extensions/Wikibase/repo/includes/ClaimDifferenceVisualizer.php
M extensions/Wikibase/repo/includes/EntityContentDiffView.php
M extensions/Wikibase/repo/includes/EntityDiffVisualizer.php
M extensions/Wikibase/repo/includes/EntityView.php
M extensions/Wikibase/repo/includes/ParserOutputJsConfigBuilder.php
M extensions/Wikibase/repo/includes/actions/EditEntityAction.php
M extensions/Wikibase/repo/includes/api/SetClaim.php
M extensions/Wikibase/repo/includes/content/EntityContent.php
D 
extensions/Wikibase/repo/includes/serializers/EntityRevisionSerializationOptions.php
D extensions/Wikibase/repo/includes/serializers/EntityRevisionSerializer.php
M extensions/Wikibase/repo/resources/Resources.php
R extensions/Wikibase/repo/resources/wikibase.initTermBox.js
M extensions/Wikibase/repo/resources/wikibase.ui.

[MediaWiki-commits] [Gerrit] Fix lost html section tag in MT API input - change (mediawiki...ContentTranslation)

2014-09-02 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Fix lost html section tag in MT API input
..

Fix lost html section tag in MT API input

The parent tag of the section html was getting lost in
getSimplifiedHTMLForMT method.

While doing that, simplified the code that replace placeholder with MT
output

Bug: 70165
Change-Id: I26736ceb358391fa15015c613962a465cb8c1d06
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 7 insertions(+), 10 deletions(-)


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

diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 2ba007b..626143f 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -39,7 +39,7 @@
MTControlCard.provider = disableMT;
} else {
// TODO Consider user preferences
-   MTControlCard.provider = 
MTControlCard.providers[0];
+   MTControlCard.provider = 
MTControlCard.providers[ 0 ];
}
} )
.fail( function ( response ) {
@@ -81,11 +81,10 @@
 * @retun {string}
 */
function getSimplifiedHTMLForMT( $section ) {
-   return $( '' ).append( $section.clone() )
-   .find( '*' )
-   .removeAttr( 'data-parsoid' )
-   .removeAttr( 'data-mw' )
-   .html();
+   var $wrapper = $( '' ).append( $section.clone() );
+
+   $wrapper.find( '*' ).removeAttr( 'data-parsoid data-mw' );
+   return $wrapper.html();
}
 
/**
@@ -113,9 +112,8 @@
doMT( mw.cx.sourceLanguage, mw.cx.targetLanguage, 
sourceContent )
.done( function ( translation ) {
if ( translation ) {
-   // Replace the placeholder with 
the source section
-   $section.replaceWith( 
$sourceSection
-   .clone()
+   $section.replaceWith( $( 
translation )
+   .children()
.attr( {
id: 'cx' + 
sourceId,
'data-source': 
sourceId
@@ -123,7 +121,6 @@
);
// $section was replaced. Get 
the updated instance.
$section = $( '#cx' + sourceId 
);
-   $section.html( $( translation 
).html() );
}
} )
.fail( function () {

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

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

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

[MediaWiki-commits] [Gerrit] Fix reuse panel layout issues - change (mediawiki...MultimediaViewer)

2014-09-02 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix reuse panel layout issues
..

Fix reuse panel layout issues

The OOUI inline menu widget does not use ul/li anymore; user
class name to target CSS instead.

Change-Id: Ia23f6c130145b411cb0c76a8448d725e51d5e700
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/838
---
M resources/mmv/ui/mmv.ui.reuse.dialog.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/02/157802/1

diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.less 
b/resources/mmv/ui/mmv.ui.reuse.dialog.less
index e2834ea..495a545 100644
--- a/resources/mmv/ui/mmv.ui.reuse.dialog.less
+++ b/resources/mmv/ui/mmv.ui.reuse.dialog.less
@@ -30,7 +30,7 @@
display: none;
}
 
-   li {
+  .oo-ui-optionWidget {
@tab-border-height: 3px;
@highlighted-tab-color: rgb(225, 243, 255);
@selected-tab-color: rgb(0, 113, 188);

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

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

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

[MediaWiki-commits] [Gerrit] pdns: qualify vars - change (operations/puppet)

2014-09-02 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: pdns: qualify vars
..


pdns: qualify vars

Change-Id: Id77db8b766a40e29ad4bab80f6b12762c38cf671
---
M templates/powerdns/pdns-ldap.conf.erb
M templates/powerdns/recursor.conf.erb
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/templates/powerdns/pdns-ldap.conf.erb 
b/templates/powerdns/pdns-ldap.conf.erb
index 7db86e5..5811677 100644
--- a/templates/powerdns/pdns-ldap.conf.erb
+++ b/templates/powerdns/pdns-ldap.conf.erb
@@ -5,11 +5,11 @@
 
 # Always bind to specific addresses - pdns complains when using INADDR_ANY.
 # Change this to the external interface address
-local-address=<%= dns_auth_ipaddress %>
-query-local-address=<% if has_variable?("dns_auth_query_address") then %><%= 
dns_auth_query_address %><% else %><%= dns_auth_ipaddress %><% end %>
+local-address=<%= @dns_auth_ipaddress %>
+query-local-address=<% if has_variable?("dns_auth_query_address") then %><%= 
@dns_auth_query_address %><% else %><%= @dns_auth_ipaddress %><% end %>
 
 # Change this to the actual SOA name:
-default-soa-name=<%= dns_auth_soa_name %>
+default-soa-name=<%= @dns_auth_soa_name %>
 
 # A backend like geobackend can't make use of caching, since returned
 # results will be different depending on "who's asking".
@@ -41,8 +41,8 @@
 # Backends to load
 launch=ldap
 
-ldap-host=<%= ldap_hosts.join(" ") %>
+ldap-host=<%= @ldap_hosts.join(" ") %>
 ldap-method=strict
-ldap-basedn=ou=hosts,<%= ldap_base_dn %>
-ldap-binddn=<%= ldap_user_dn %>
-ldap-secret=<%= ldap_user_pass %>
+ldap-basedn=ou=hosts,<%= @ldap_base_dn %>
+ldap-binddn=<%= @ldap_user_dn %>
+ldap-secret=<%= @ldap_user_pass %>
diff --git a/templates/powerdns/recursor.conf.erb 
b/templates/powerdns/recursor.conf.erb
index f265bf8..75d590b 100644
--- a/templates/powerdns/recursor.conf.erb
+++ b/templates/powerdns/recursor.conf.erb
@@ -91,7 +91,7 @@
 #
 # local-addressIP addresses to listen on, separated by spaces or commas
 #
-local-address=<%= flatten_ips(listen_addresses).sort.join(" ") %>
+local-address=<%= flatten_ips(@listen_addresses).sort.join(" ") %>
 
 #
 # local-port   port to listen on

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id77db8b766a40e29ad4bab80f6b12762c38cf671
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove bogus jquery dependencies - change (mediawiki...SemanticForms)

2014-09-02 Thread Legoktm (Code Review)

Legoktm has submitted this change and it was merged.

Change subject: Remove bogus jquery dependencies
..


Remove bogus jquery dependencies

They throw errors in recent MediaWikis

Change-Id: I257ccf30a916a3c22d60d7a23861a114687cbc14
---
M SemanticForms.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/SemanticForms.php b/SemanticForms.php
index 476bc42..ff90783 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -275,7 +275,6 @@
'ext.semanticforms.autoedit' => $sfgResourceTemplate + array(
'scripts' => 'libs/SF_autoedit.js',
'styles' => 'skins/SF_autoedit.css',
-   'dependencies' => array( 'jquery' ),
'messages' => array(
'sf-autoedit-wait',
'sf_autoedit_anoneditwarning',
@@ -284,7 +283,6 @@
'ext.semanticforms.submit' => $sfgResourceTemplate + array(
'scripts' => 'libs/SF_submit.js',
'styles' => 'skins/SF_submit.css',
-   'dependencies' => array( 'jquery' ),
'messages' => array(
'sf_formedit_saveandcontinue_summary',
'sf_formedit_saveandcontinueediting',
@@ -293,7 +291,6 @@
'ext.semanticforms.collapsible' => $sfgResourceTemplate + array(
'scripts' => 'libs/SF_collapsible.js',
'styles' => 'skins/SF_collapsible.css',
-   'dependencies' => array( 'jquery' ),
),
'ext.semanticforms.wikieditor' => $sfgResourceTemplate + array(
'scripts' => 'libs/SF_wikieditor.js',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I257ccf30a916a3c22d60d7a23861a114687cbc14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Echo now has browser tests - change (mediawiki/selenium)

2014-09-02 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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

Change subject: Echo now has browser tests
..

Echo now has browser tests

Change-Id: I08522fc114dde0a1e34bc56d6926c8691c37ea53
---
M README.md
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/03/157803/1

diff --git a/README.md b/README.md
index c6259ee..0be15a0 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,7 @@
 1. ArticleFeedbackv5: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/ArticleFeedbackv5),
 [GitHub](https://github.com/wikimedia/mediawiki-extensions-ArticleFeedbackv5), 
[Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-ArticleFeedbackv5)
 1. CirrusSearch: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/CirrusSearch),
 [GitHub](https://github.com/wikimedia/mediawiki-extensions-CirrusSearch), 
[Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-CirrusSearch)
 1. ContentTranslation: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/ContentTranslation),
 
[GitHub](https://github.com/wikimedia/mediawiki-extensions-ContentTranslation), 
[Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-ContentTranslation)
+1. Echo: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Echo),
 [GitHub](https://github.com/wikimedia/mediawiki-extensions-Echo), [Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Echo)
 1. Flow: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Flow),
 [GitHub](https://github.com/wikimedia/mediawiki-extensions-Flow), [Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Flow)
 1. GettingStarted: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/GettingStarted),
 [GitHub](https://github.com/wikimedia/mediawiki-extensions-GettingStarted), 
[Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-GettingStarted)
 1. Math: 
[Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Math),
 [GitHub](https://github.com/wikimedia/mediawiki-extensions-Math), [Code 
Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Math)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08522fc114dde0a1e34bc56d6926c8691c37ea53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] Run Ruby syntax check for Echo - change (integration/zuul-config)

2014-09-02 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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

Change subject: Run Ruby syntax check for Echo
..

Run Ruby syntax check for Echo

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/04/157804/1

diff --git a/layout.yaml b/layout.yaml
index dedb451..5923986 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -2964,6 +2964,7 @@
 template:
   - name: extension-unittests
   - name: extension-qunit
+  - name: extension-rubylint
 
   - name: mediawiki/extensions/Editcount
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34a718fe97ba5ee11c5ba5f365b270ef6187b71c
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] WikidataBot as subclass of Bot - change (pywikibot/core)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: WikidataBot as subclass of Bot
..


WikidataBot as subclass of Bot

to take advantage of new methods such as quit(), etc.

The 'always' option is not used by Wikidata bots currently,
but has been retained for future usage.

Change-Id: Icecd762cd44092129106800ac93e772dde3913ef
---
M pywikibot/bot.py
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index d0a20f9..e42b71c 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -914,12 +914,10 @@
  self.__class__.__name__)
 
 
-class WikidataBot:
+class WikidataBot(Bot):
 
 """
 Generic Wikidata Bot to be subclassed.
-
-Used in claimit.py, coordinate_import.py and harvest_template.py
 """
 
 def cacheSources(self):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icecd762cd44092129106800ac93e772dde3913ef
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] elasticsearch: handle request timeout and increase timeout - change (operations/puppet)

2014-09-02 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: elasticsearch: handle request timeout and increase timeout
..

elasticsearch: handle request timeout and increase timeout

apparently requests doesn't do explicit max_retries on purpose, see
https://github.com/kennethreitz/requests/pull/1219 and
https://stackoverflow.com/questions/15431044/can-i-set-max-retries-for-requests-request

also increase timeout to something higher than a multiple of 3 as suggested
here: http://docs.python-requests.org/en/latest/user/advanced/#timeouts

Change-Id: I57f25489a46f46832b09a6e7dab6b1e72e82a87d
---
M modules/elasticsearch/files/nagios/check_elasticsearch.py
1 file changed, 22 insertions(+), 4 deletions(-)


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

diff --git a/modules/elasticsearch/files/nagios/check_elasticsearch.py 
b/modules/elasticsearch/files/nagios/check_elasticsearch.py
index f84e985..eb5b260 100644
--- a/modules/elasticsearch/files/nagios/check_elasticsearch.py
+++ b/modules/elasticsearch/files/nagios/check_elasticsearch.py
@@ -106,12 +106,28 @@
 return EX_CRITICAL
 
 
+def fetch_url(url, timeout, retries):
+exception = None
+
+for i in range(retries):
+try:
+cluster_health_url = options.url + '/_cluster/health'
+response = requests.get(url, timeout=timeout)
+response.raise_for_status()
+return response
+except requests.exceptions.Timeout, e:
+exception = e
+continue
+else:
+if exception:
+raise exception
+
+
 def check_elasticsearch(options):
 try:
 cluster_health_url = options.url + '/_cluster/health'
-response = requests.get(cluster_health_url,
-timeout=options.timeout)
-response.raise_for_status()
+response = fetch_url(cluster_health_url, options.timeout,
+options.retries)
 except requests.exceptions.RequestException, e:
 log_critical('%s error while fetching: %s' % (cluster_health_url, e))
 return EX_CRITICAL
@@ -141,8 +157,10 @@
 formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 parser.add_argument('--url', default='http://localhost:9200',
 help='Elasticsearch endpoint')
-parser.add_argument('--timeout', default=2, type=int, metavar='SECONDS',
+parser.add_argument('--timeout', default=4, type=int, metavar='SECONDS',
 help='Timeout for the request to complete')
+parser.add_argument('--retries', default=2, type=int, metavar='INTEGER',
+help='How many times to retry a request on timeout')
 parser.add_argument('--shards-inactive', default='>=0.1%',
 dest='shards_inactive', metavar='THRESHOLD',
 help='Threshold to check for inactive shards '

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

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

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

[MediaWiki-commits] [Gerrit] Run Ruby syntax check for Echo - change (integration/jenkins-job-builder-config)

2014-09-02 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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

Change subject: Run Ruby syntax check for Echo
..

Run Ruby syntax check for Echo

Change-Id: I8e7709c0996ac7ddd3c79c5773a983d4ba00be6e
---
M mediawiki-extensions.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/06/157806/1

diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 7309a55..55462c0 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -1145,6 +1145,11 @@
  - python-jobs
 
 - project:
+name: 'mwext-Echo'
+jobs:
+ - '{name}-ruby1.9.3lint'
+
+- project:
 name: 'mwext-EventLogging'
 toxenv:
  - flake8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e7709c0996ac7ddd3c79c5773a983d4ba00be6e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] Update tagfile.xml URL for doxygen - change (translatewiki)

2014-09-02 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

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

Change subject: Update tagfile.xml URL for doxygen
..

Update tagfile.xml URL for doxygen

Change-Id: I07bef414d2981674fe8c0d4d2fcef9d1211ef2f1
---
M bin/generate-translation-documentation
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/07/157807/1

diff --git a/bin/generate-translation-documentation 
b/bin/generate-translation-documentation
index edef94b..1356351 100755
--- a/bin/generate-translation-documentation
+++ b/bin/generate-translation-documentation
@@ -2,7 +2,7 @@
 
 TAGFILE="/home/betawiki/doxygen-tagfile.xml"
 
-wget -nv -O "$TAGFILE" http://svn.wikimedia.org/doc/tagfile.xml
+wget -nv -O "$TAGFILE" 
https://doc.wikimedia.org/mediawiki-core/master/php/html/tagfile.xml
 sudo -u betawiki doxygen /home/betawiki/config/doxygen.conf
 
 rm "$TAGFILE"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07bef414d2981674fe8c0d4d2fcef9d1211ef2f1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

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

[MediaWiki-commits] [Gerrit] Update tagfile.xml URL for doxygen - change (translatewiki)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Update tagfile.xml URL for doxygen
..


Update tagfile.xml URL for doxygen

Change-Id: I07bef414d2981674fe8c0d4d2fcef9d1211ef2f1
---
M bin/generate-translation-documentation
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/bin/generate-translation-documentation 
b/bin/generate-translation-documentation
index edef94b..1356351 100755
--- a/bin/generate-translation-documentation
+++ b/bin/generate-translation-documentation
@@ -2,7 +2,7 @@
 
 TAGFILE="/home/betawiki/doxygen-tagfile.xml"
 
-wget -nv -O "$TAGFILE" http://svn.wikimedia.org/doc/tagfile.xml
+wget -nv -O "$TAGFILE" 
https://doc.wikimedia.org/mediawiki-core/master/php/html/tagfile.xml
 sudo -u betawiki doxygen /home/betawiki/config/doxygen.conf
 
 rm "$TAGFILE"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07bef414d2981674fe8c0d4d2fcef9d1211ef2f1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [FIX] Support branched svn directories - change (pywikibot/core)

2014-09-02 Thread XZise (Code Review)

XZise has uploaded a new change for review.

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

Change subject: [FIX] Support branched svn directories
..

[FIX] Support branched svn directories

Bug: 61310
Change-Id: I1fe2aa0c2cec2b569af5bf0f8b2e0e8f863ee358
---
M pywikibot/version.py
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/08/157808/1

diff --git a/pywikibot/version.py b/pywikibot/version.py
index 1c77acb..c81bfbd 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -56,6 +56,8 @@
 _program_dir = _get_program_dir()
 if os.path.isdir(os.path.join(_program_dir, '.svn')):
 (tag, rev, date, hsh) = getversion_svn(_program_dir)
+elif os.path.isdir(os.path.join(_program_dir, '../.svn')):
+(tag, rev, date, hsh) = getversion_svn(os.path.join(_program_dir, 
'..'))
 else:
 (tag, rev, date, hsh) = getversion_git(_program_dir)
 except Exception:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fe2aa0c2cec2b569af5bf0f8b2e0e8f863ee358
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise 

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

[MediaWiki-commits] [Gerrit] Translators are read in on request - change (mediawiki...BlueSpiceFoundation)

2014-09-02 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Translators are read in on request
..

Translators are read in on request

 - Removed maintenance script to generate JSON translatorsfile
 - Translators are cached for one day
 - Removed key when list was created

Change-Id: Ibb69083152e6297e7d0936f182ce837fb93c029d
---
M i18n/credits/en.json
M includes/specials/SpecialCredits.class.php
D maintenance/generateTranslators.php
3 files changed, 54 insertions(+), 83 deletions(-)


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

diff --git a/i18n/credits/en.json b/i18n/credits/en.json
index 3c6e342..439c3c6 100644
--- a/i18n/credits/en.json
+++ b/i18n/credits/en.json
@@ -10,6 +10,5 @@
"bs-credits-contributors": "Contributors",
"bs-credits-translators": "Translators",
"bs-credits-translation": "Translation",
-   "bs-credits-th": "Thanks to all translators from $1.",
-   "bs-credits-createdon": "List created on: $1."
+   "bs-credits-th": "Thanks to all translators from $1."
 }
diff --git a/includes/specials/SpecialCredits.class.php 
b/includes/specials/SpecialCredits.class.php
index 2a100f5..d3c66a9 100644
--- a/includes/specials/SpecialCredits.class.php
+++ b/includes/specials/SpecialCredits.class.php
@@ -14,6 +14,8 @@
 
 class SpecialCredits extends BsSpecialPage {
 
+   private $aTranslators = array();
+
public function __construct() {
parent::__construct( 'SpecialCredits' );
}
@@ -64,7 +66,23 @@
$sOlContributors = '' . $sLiContributors . '';
$sOlTl = '' . $sLiTranslation . '';
 
-   $aTranslators = $this->generateTranslatorsList();
+   $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Credits', 
'Translators' );
+   $aData = BsCacheHelper::get( $sKey );
+
+   if ( $aData !== false ) {
+   wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetching 
translators from cache' );
+   $this->aTranslators = $aData;
+   } else {
+   wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetching 
translators from DB' );
+   $this->generateTranslatorsList();
+   // Keep list for one day
+   BsCacheHelper::set( $sKey, $this->aTranslators, 86400 );
+   }
+
+   $sLiTranslators = '';
+   foreach ( $this->aTranslators as $sTranslator ) {
+   $sLiTranslators .= Html::element( 'li', array(), 
$sTranslator );
+   }
 
$sLink = 'https://translatewiki.net";>translatewiki.net';
$aOut = array();
@@ -89,8 +107,7 @@
$aOut[] = '';
$aOut[] = '';
$aOut[] = '' . wfMessage( 'bs-credits-th', $sLink 
)->text() . '';
-   $aOut[] = ''. implode( '', 
$aTranslators['translators'] ) .'';
-   $aOut[] = ''. wfMessage( 'bs-credits-createdon', 
$aTranslators['ts'] )->plain();
+   $aOut[] = ''. $sLiTranslators .'';
$aOut[] = '';
$aOut[] = ''. $sOlTl .'';
$aOut[] = '';
@@ -99,23 +116,43 @@
$this->getOutput()->addHtml(implode( "\n", $aOut ) );
}
 
-   public function generateTranslatorsList() {
-   $vTranslators = file_get_contents( BSROOTDIR . 
'/includes/specials/translators.json' );
-   $vTranslators = FormatJson::decode( $vTranslators );
-   $aTranslators = array();
-   $vTs = 0;
+   private function generateTranslatorsList() {
+   global $IP;
+   $aPaths = array(
+   $IP . '/extensions/BlueSpiceExtensions/',
+   $IP . '/extensions/BlueSpiceFoundation/',
+   $IP . '/skins/BlueSpiceSkin/'
+   );
 
-   foreach ( $vTranslators as $aData ) {
-   if ( $aData instanceof StdClass ) {
-   foreach ( $aData as $key => $sTranslator ) {
-   $aTranslators['translators'][] = 
$sTranslator;
+   foreach ( $aPaths as $sPath ) {
+   $this->readInTranslators( $sPath );
+   }
+
+   $this->aTranslators = array_map( 'trim', $this->aTranslators );
+   $this->aTranslators = array_unique( $this->aTranslators );
+   asort( $this->aTranslators );
+   }
+
+   private function readInTranslators( $sDir ) {
+   $oCurrentDirectory = new DirectoryIterator( $sDir );
+   foreach ( $oCurrentDirectory as $oFileinfo ) {
+   if ( $oFileinfo->isFile() && strpos( 
$oFileinfo->getFilename(), '.json' ) !== false ) {
+

[MediaWiki-commits] [Gerrit] Improved documentation - change (mediawiki...BlueSpiceFoundation)

2014-09-02 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Improved documentation
..

Improved documentation

Change-Id: I97ea7b1dec8b1b14c4390ceb923b5f927e587637
---
M includes/utility/CacheHelper.class.php
1 file changed, 8 insertions(+), 7 deletions(-)


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

diff --git a/includes/utility/CacheHelper.class.php 
b/includes/utility/CacheHelper.class.php
index c2e057a..14f41d3 100644
--- a/includes/utility/CacheHelper.class.php
+++ b/includes/utility/CacheHelper.class.php
@@ -9,6 +9,7 @@
 class BsCacheHelper {
 
protected static $aCacheKeys = array();
+
protected static $oCache = null;
 
/**
@@ -16,7 +17,7 @@
 * @return BagOStuff
 */
public static function getCache() {
-   if( self::$oCache === null ) {
+   if ( self::$oCache === null ) {
self::$oCache = wfGetCache( CACHE_ANYTHING );
}
 
@@ -38,8 +39,8 @@
 
/**
 * Get the value of a given key or returns false
-* @param type $sKey
-* @return type
+* @param string $sKey
+* @return mixed
 */
public static function get( $sKey ) {
return self::getCache()->get( $sKey );
@@ -47,10 +48,10 @@
 
/**
 * Sets the value to the given key
-* @param type $sKey
-* @param type $mData
-* @param type $iExpiryTime
-* @return type
+* @param string $sKey
+* @param mixed $mData
+* @param int $iExpiryTime Either an interval in seconds or a unix 
timestamp for expiry
+* @return bool
 */
public static function set( $sKey, $mData, $iExpiryTime = 0 ) {
return self::getCache()->set( $sKey, $mData, $iExpiryTime );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97ea7b1dec8b1b14c4390ceb923b5f927e587637
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli 

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

[MediaWiki-commits] [Gerrit] Improved documentation - change (mediawiki...BlueSpiceFoundation)

2014-09-02 Thread Swidmann (Code Review)

Swidmann has submitted this change and it was merged.

Change subject: Improved documentation
..


Improved documentation

Change-Id: I97ea7b1dec8b1b14c4390ceb923b5f927e587637
---
M includes/utility/CacheHelper.class.php
1 file changed, 8 insertions(+), 7 deletions(-)

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



diff --git a/includes/utility/CacheHelper.class.php 
b/includes/utility/CacheHelper.class.php
index c2e057a..14f41d3 100644
--- a/includes/utility/CacheHelper.class.php
+++ b/includes/utility/CacheHelper.class.php
@@ -9,6 +9,7 @@
 class BsCacheHelper {
 
protected static $aCacheKeys = array();
+
protected static $oCache = null;
 
/**
@@ -16,7 +17,7 @@
 * @return BagOStuff
 */
public static function getCache() {
-   if( self::$oCache === null ) {
+   if ( self::$oCache === null ) {
self::$oCache = wfGetCache( CACHE_ANYTHING );
}
 
@@ -38,8 +39,8 @@
 
/**
 * Get the value of a given key or returns false
-* @param type $sKey
-* @return type
+* @param string $sKey
+* @return mixed
 */
public static function get( $sKey ) {
return self::getCache()->get( $sKey );
@@ -47,10 +48,10 @@
 
/**
 * Sets the value to the given key
-* @param type $sKey
-* @param type $mData
-* @param type $iExpiryTime
-* @return type
+* @param string $sKey
+* @param mixed $mData
+* @param int $iExpiryTime Either an interval in seconds or a unix 
timestamp for expiry
+* @return bool
 */
public static function set( $sKey, $mData, $iExpiryTime = 0 ) {
return self::getCache()->set( $sKey, $mData, $iExpiryTime );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97ea7b1dec8b1b14c4390ceb923b5f927e587637
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pigpen 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Swidmann 
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 DataModel 1.0 - change (mediawiki...Wikibase)

2014-09-02 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Use DataModel 1.0
..


Use DataModel 1.0

Change-Id: I1ec5ac5c8f7b4a6793edd058882685ad0818d26d
---
M composer.json
M lib/includes/serializers/LegacyInternalClaimSerializer.php
M lib/includes/serializers/LegacyInternalEntitySerializer.php
M lib/tests/phpunit/NoBadDependencyUsageTest.php
D lib/tests/phpunit/serializers/LegacyInternalEntitySerializerTest.php
M repo/config/Wikibase.default.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
7 files changed, 8 insertions(+), 114 deletions(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, but someone else must approve
  Bene: Looks good to me, but someone else must approve
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/composer.json b/composer.json
index 93a2d19..ca670a6 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
"data-values/javascript": "~0.5.1",
"data-values/value-view": "~0.6.5",
 
-   "wikibase/data-model": "~0.9.0",
+   "wikibase/data-model": "~1.0@dev",
"wikibase/data-model-javascript": "~0.3.0",
"wikibase/data-model-serialization": "~1.0.1",
"wikibase/internal-serialization": "~1.1",
diff --git a/lib/includes/serializers/LegacyInternalClaimSerializer.php 
b/lib/includes/serializers/LegacyInternalClaimSerializer.php
index d3fe17b..9bdcdf7 100644
--- a/lib/includes/serializers/LegacyInternalClaimSerializer.php
+++ b/lib/includes/serializers/LegacyInternalClaimSerializer.php
@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use Wikibase\DataModel\Claim\Claim;
+use Wikibase\Repo\WikibaseRepo;
 
 class LegacyInternalClaimSerializer implements \Serializers\Serializer {
 
@@ -20,7 +21,7 @@
throw new InvalidArgumentException( '$claim must be an 
Claim' );
}
 
-   return $claim->toArray();
+   return 
WikibaseRepo::getDefaultInstance()->getInternalClaimSerializer()->serialize( 
$claim );
}
 
 }
diff --git a/lib/includes/serializers/LegacyInternalEntitySerializer.php 
b/lib/includes/serializers/LegacyInternalEntitySerializer.php
index 062bbf3..c33bea2 100644
--- a/lib/includes/serializers/LegacyInternalEntitySerializer.php
+++ b/lib/includes/serializers/LegacyInternalEntitySerializer.php
@@ -5,6 +5,7 @@
 use InvalidArgumentException;
 use Serializers\Serializer as NewStyleSerializer;
 use Wikibase\DataModel\Entity\Entity;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * Serializer for generating the legacy serialization of an Entity.
@@ -31,7 +32,7 @@
throw new InvalidArgumentException( '$entity must be an 
Entity' );
}
 
-   return $entity->toArray();
+   return 
WikibaseRepo::getDefaultInstance()->getInternalEntitySerializer()->serialize( 
$entity );
}
 
/**
diff --git a/lib/tests/phpunit/NoBadDependencyUsageTest.php 
b/lib/tests/phpunit/NoBadDependencyUsageTest.php
index b74eda6..b33e3d0 100644
--- a/lib/tests/phpunit/NoBadDependencyUsageTest.php
+++ b/lib/tests/phpunit/NoBadDependencyUsageTest.php
@@ -16,8 +16,8 @@
 
public function testNoRepoUsageInLib() {
// Increasing this allowance is forbidden
-   $this->assertStringNotInLib( 'WikibaseRepo' . '::', 2 );
-   $this->assertStringNotInLib( 'Wikibase\\Repo\\', 2 );
+   $this->assertStringNotInLib( 'WikibaseRepo' . '::', 4 );
+   $this->assertStringNotInLib( 'Wikibase\\Repo\\', 4 );
}
 
public function testNoClientUsageInLib() {
diff --git 
a/lib/tests/phpunit/serializers/LegacyInternalEntitySerializerTest.php 
b/lib/tests/phpunit/serializers/LegacyInternalEntitySerializerTest.php
deleted file mode 100644
index c2eb039..000
--- a/lib/tests/phpunit/serializers/LegacyInternalEntitySerializerTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-setId( new ItemId( 'Q12' ) );
-   $entity->setLabel( 'en', 'Test' );
-
-   // make legacy blob
-   $legacySerializer = new LegacyInternalEntitySerializer();
-   $oldBlob = json_encode( $legacySerializer->serialize( $entity ) 
);
-
-   // fake ancient legacy blob:
-   // replace "entity":["item",7] with "entity":"q7"
-   $id = $entity->getId()->getSerialization();
-   $veryOldBlob = preg_replace( '/"entity":\["\w+",\d+\]/', 
'"entity":"' . strtolower( $id ) . '"', $oldBlob );
-
-   // sanity
-   if ( $oldBlob == $veryOldBlob ) {
-   throw new RuntimeException( 'Failed to fake very old 
serialization format based on oldish serialization format.' );
-   }
-
-   // make new style blob
-   $newSerializerFactory = new SerializerFactory( new 
DataValueSerializer() );
-

[MediaWiki-commits] [Gerrit] New Wikidata Build - 02/09/2014 10:00 - change (mediawiki...Wikidata)

2014-09-02 Thread Aude (Code Review)

Aude has submitted this change and it was merged.

Change subject: New Wikidata Build - 02/09/2014 10:00
..


New Wikidata Build - 02/09/2014 10:00

Change-Id: I7fec475cb625fc695fd5672b26614e28944f5642
---
M composer.lock
M extensions/Wikibase/.jshintignore
M extensions/Wikibase/client/WikibaseClient.i18n.magic.php
M extensions/Wikibase/client/i18n/ro.json
M 
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
M extensions/Wikibase/lib/WikibaseLib.hooks.php
M extensions/Wikibase/lib/i18n/et.json
M extensions/Wikibase/lib/i18n/nl.json
M extensions/Wikibase/lib/i18n/ro.json
M extensions/Wikibase/lib/includes/ReferencedEntitiesFinder.php
M extensions/Wikibase/lib/includes/Term.php
M extensions/Wikibase/lib/includes/changes/ItemChange.php
M extensions/Wikibase/lib/resources/Resources.php
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.aliasesview.css
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.labelview.css
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css
M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js
M 
extensions/Wikibase/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
M extensions/Wikibase/lib/resources/wikibase.css
M extensions/Wikibase/lib/resources/wikibase.js
D extensions/Wikibase/lib/resources/wikibase.ui.Base.js
D 
extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.Interface.js
D 
extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
D extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.css
D extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js
D extensions/Wikibase/lib/resources/wikibase.ui.js
D 
extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.ObservableObject.js
M 
extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata/wikibase.utilities.jQuery.ui.tagadata.css
M extensions/Wikibase/lib/tests/phpunit/ChangesTableTest.php
M extensions/Wikibase/lib/tests/phpunit/ReferencedEntitiesFinderTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/DiffChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php
M 
extensions/Wikibase/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
M extensions/Wikibase/lib/tests/phpunit/serializers/ItemSerializerTest.php
M extensions/Wikibase/lib/tests/qunit/wikibase.tests.js
D 
extensions/Wikibase/lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.Interface.tests.js
D 
extensions/Wikibase/lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.tests.js
D extensions/Wikibase/lib/tests/qunit/wikibase.ui.PropertyEditTool.tests.js
D 
extensions/Wikibase/lib/tests/qunit/wikibase.utilities/wikibase.utilities.ObservableObject.tests.js
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/fa.json
M extensions/Wikibase/repo/i18n/gl.json
M extensions/Wikibase/repo/i18n/nl.json
M extensions/Wikibase/repo/i18n/oc.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/i18n/ro.json
M extensions/Wikibase/repo/includes/ClaimDifference.php
M extensions/Wikibase/repo/includes/ClaimDifferenceVisualizer.php
M extensions/Wikibase/repo/includes/EntityContentDiffView.php
M extensions/Wikibase/repo/includes/EntityDiffVisualizer.php
M extensions/Wikibase/repo/includes/EntityView.php
M extensions/Wikibase/repo/includes/ParserOutputJsConfigBuilder.php
M extensions/Wikibase/repo/includes/actions/EditEntityAction.php
M extensions/Wikibase/repo/includes/api/SetClaim.php
M extensions/Wikibase/repo/includes/content/EntityContent.php
D 
extensions/Wikibase/repo/includes/serializers/EntityRevisionSerializationOptions.php
D extensions/Wikibase/repo/includes/serializers/EntityRevisionSerializer.php
M extensions/Wikibase/repo/resources/Resources.php
R extensions/Wikibase/repo/resources/wikibase.initTermBox.js
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M extensions/Wikibase/repo

[MediaWiki-commits] [Gerrit] Translators are read in on request - change (mediawiki...BlueSpiceFoundation)

2014-09-02 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Translators are read in on request
..


Translators are read in on request

 - Removed maintenance script to generate JSON translatorsfile
 - Translators are cached for one day
 - Removed key when list was created

Change-Id: Ibb69083152e6297e7d0936f182ce837fb93c029d
---
M i18n/credits/en.json
M includes/specials/SpecialCredits.class.php
D maintenance/generateTranslators.php
3 files changed, 54 insertions(+), 83 deletions(-)

Approvals:
  Smuggli: Verified; Looks good to me, approved
  Swidmann: Checked; Looks good to me, but someone else must approve
  Raimond Spekking: Looks good to me, but someone else must approve



diff --git a/i18n/credits/en.json b/i18n/credits/en.json
index 3c6e342..439c3c6 100644
--- a/i18n/credits/en.json
+++ b/i18n/credits/en.json
@@ -10,6 +10,5 @@
"bs-credits-contributors": "Contributors",
"bs-credits-translators": "Translators",
"bs-credits-translation": "Translation",
-   "bs-credits-th": "Thanks to all translators from $1.",
-   "bs-credits-createdon": "List created on: $1."
+   "bs-credits-th": "Thanks to all translators from $1."
 }
diff --git a/includes/specials/SpecialCredits.class.php 
b/includes/specials/SpecialCredits.class.php
index 2a100f5..d3c66a9 100644
--- a/includes/specials/SpecialCredits.class.php
+++ b/includes/specials/SpecialCredits.class.php
@@ -14,6 +14,8 @@
 
 class SpecialCredits extends BsSpecialPage {
 
+   private $aTranslators = array();
+
public function __construct() {
parent::__construct( 'SpecialCredits' );
}
@@ -64,7 +66,23 @@
$sOlContributors = '' . $sLiContributors . '';
$sOlTl = '' . $sLiTranslation . '';
 
-   $aTranslators = $this->generateTranslatorsList();
+   $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Credits', 
'Translators' );
+   $aData = BsCacheHelper::get( $sKey );
+
+   if ( $aData !== false ) {
+   wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetching 
translators from cache' );
+   $this->aTranslators = $aData;
+   } else {
+   wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetching 
translators from DB' );
+   $this->generateTranslatorsList();
+   // Keep list for one day
+   BsCacheHelper::set( $sKey, $this->aTranslators, 86400 );
+   }
+
+   $sLiTranslators = '';
+   foreach ( $this->aTranslators as $sTranslator ) {
+   $sLiTranslators .= Html::element( 'li', array(), 
$sTranslator );
+   }
 
$sLink = 'https://translatewiki.net";>translatewiki.net';
$aOut = array();
@@ -89,8 +107,7 @@
$aOut[] = '';
$aOut[] = '';
$aOut[] = '' . wfMessage( 'bs-credits-th', $sLink 
)->text() . '';
-   $aOut[] = ''. implode( '', 
$aTranslators['translators'] ) .'';
-   $aOut[] = ''. wfMessage( 'bs-credits-createdon', 
$aTranslators['ts'] )->plain();
+   $aOut[] = ''. $sLiTranslators .'';
$aOut[] = '';
$aOut[] = ''. $sOlTl .'';
$aOut[] = '';
@@ -99,23 +116,43 @@
$this->getOutput()->addHtml(implode( "\n", $aOut ) );
}
 
-   public function generateTranslatorsList() {
-   $vTranslators = file_get_contents( BSROOTDIR . 
'/includes/specials/translators.json' );
-   $vTranslators = FormatJson::decode( $vTranslators );
-   $aTranslators = array();
-   $vTs = 0;
+   private function generateTranslatorsList() {
+   global $IP;
+   $aPaths = array(
+   $IP . '/extensions/BlueSpiceExtensions/',
+   $IP . '/extensions/BlueSpiceFoundation/',
+   $IP . '/skins/BlueSpiceSkin/'
+   );
 
-   foreach ( $vTranslators as $aData ) {
-   if ( $aData instanceof StdClass ) {
-   foreach ( $aData as $key => $sTranslator ) {
-   $aTranslators['translators'][] = 
$sTranslator;
+   foreach ( $aPaths as $sPath ) {
+   $this->readInTranslators( $sPath );
+   }
+
+   $this->aTranslators = array_map( 'trim', $this->aTranslators );
+   $this->aTranslators = array_unique( $this->aTranslators );
+   asort( $this->aTranslators );
+   }
+
+   private function readInTranslators( $sDir ) {
+   $oCurrentDirectory = new DirectoryIterator( $sDir );
+   foreach ( $oCurrentDirectory as $oFileinfo ) {
+   if ( $oFileinfo->isFile() && strpos( 
$oFileinfo

[MediaWiki-commits] [Gerrit] Removed translators.json - change (mediawiki...BlueSpiceFoundation)

2014-09-02 Thread Smuggli (Code Review)

Smuggli has uploaded a new change for review.

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

Change subject: Removed translators.json
..

Removed translators.json

 - legacy

Change-Id: I3d8a09b9e9e638443a4a918bd05a445ed151c2fd
---
D includes/specials/translators.json
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/includes/specials/translators.json 
b/includes/specials/translators.json
deleted file mode 100644
index f2b3f94..000
--- a/includes/specials/translators.json
+++ /dev/null
@@ -1 +0,0 @@
-{"translators":{"273":"2nd-player","2":"Aftab1995","52":"Agilight","138":"Alan 
ffm","309":"Amankel'dy","1252":"Amire80","1228":"Andriykopanytsia","540":"Ankabel","230":"Arg","24":"Arifin.wijaya","1177":"Arystanbek","32":"Aurora","54":"Base","25":"Beta16","1136":"Bishnu
 
Saikia","31":"Bjankuloski06","497":"Bluedeck","33":"Botuzhaleny-sodamo","23":"C5st4wr6ch","1199":"Cedric31","39":"Chrumps","1300":"Cocu","1135":"Codex
 
Sinaiticus","117":"Constructeur","163":"Csega","944":"Cwek","1239":"Cwlin0416","1139":"DCLXVI","1175":"David1010","1258":"Dude1717","360":"EagerLin","5":"Edinwiki","194":"Eladk","1224":"ElangoRamanujam","19":"Elisardojm","93":"Eroha","1222":"Fader","161":"Fany","326":"Fengchao","7":"Fitoschido","4":"Fohanno","700":"Frammm","43":"F\u00falvio","240":"Gertakapllani","1184":"Ghybu","69":"Gomoko","1097":"Gorizon","1164":"Gregra","238":"HarpyWar","723":"Hudafu","852":"Ihojose","1183":"Iltever","999":"Iluvatar","42":"Imperadeiro98","187":"Impersonator
 1","1148":"Indoril","1162":"Inkbug","143":"Joetaras","1217":"John 
Reid","95":"Jopparn","1220":"Josve05a","101":"Justincheng12345","6":"KWiki","47":"Kaganer","1201":"Kaliforwomen","1225":"Kalyanasundar","475":"Kc
 
kennylau","1169":"Kenrick95","1180":"Keysuck","299":"Kghbln","50":"Kiranmayee","1237":"Kuailong","56":"Liuxinyu970226","1029":"Lloffiwr","182":"Lokal
 Profil","41":"Luckas","159":"Macofe","1196":"Mar(c)","106":"Marc Reymann 
","11":"Marmase","1163":"Matanya","313":"Matik7","137":"Matma
 
Rex","22":"McDutchie","15":"Mcervera","92":"Meshkov.a","64":"Metalhead64","114":"Miguel2706","48":"Milicevic01","1279":"Minh
 
Nguyen","1182":"Miri-Nae","12":"Mirzali","750":"Mogoeilor","186":"Mywood","28":"Namoroka","243":"NataChe","75":"Nemo
 
bis","529":"Nepaboy","234":"NigelSoft","304":"Nike","35":"Niknetniko","46":"Okras","948":"Oldstoneage","307":"Orikrin1998","30":"Papuass","125":"PeppeAeco","994":"Pio387","192":"ProtoplasmaKid","483":"Psubhashish","715":"Raymond","1170":"Raynasution","1155":"Reza1615","38":"Ribert","29":"Robby","468":"Robert
 Vogel 
","121":"Ronel1","16":"Rtemis","153":"S8321414","476":"SGTTechnologicBunny","84":"SPQRobin","51":"Sayginer","10":"Sebastian
 
Wallroth","522":"Sengwan","279":"Servien","375":"Shield-9","26":"Shirayuki","237":"Shuba","1194":"Siebrand","36":"Sjoerddebruin","298":"Smuggli","510":"SnowedEarth","1231":"Sociologist","134":"Southparkfan","1320":"Ssola","1309":"Stens51","9":"Stephan
 Muggli 
","17":"Stryn","755":"SuperPuperSteve","560":"Swidmann","1212":"Szonja","0":"Test
 Create 
account","115":"Themasterriot","472":"Tlustulimu","1462":"Toadino2","361":"Tobias
 Weichart 
","20":"Toli\u00f1o","984":"Toniher","127":"Tyey","131":"V.narsikar","27":"VASANTH
 
S.N.","166":"Valepert","355":"Veeven","86":"Vengir","139":"Vitorvicentevalente","1159":"Vivaelcelta","725":"Wertuose","49":"WikiPhoenix","40":"Wiochman","18":"Wladek92","746":"Wyz","1213":"XXN","1233":"Xiaomingyan","1":"Xuacu","3":"Y-M
 
D","635":"Yekrats","1235":"Zhangjintao","98":"\u0410\u0442\u0430","1176":"\u0413\u0430\u0431\u0434\u0443\u043b\u0433\u0430\u043d\u0438
 \u041d\u0418\u0428 
\u0425\u0411\u041d","1392":"\u041c\u0430\u043a\u0441\u0438\u043c 
\u041f\u0456\u0434\u043b\u0456\u0441\u043d\u044e\u043a","1138":"\u0420\u0443\u0441\u0442\u0430\u043c
 
\u041d\u0443\u0440\u044b\u0435\u0432","8":"\u0423\u043c\u0430\u0440","21":"\u05d0\u05d9\u05ea\u05df96","55":"\u05e4\u05d5\u05d9\u05dc\u05d9\u05e9\u05e2\u05e8","982":"\u062a\u0631\u062c\u0645\u0627\u064605","34":"\u0938\u0930\u094b\u091c
 \u0915\u0941\u092e\u093e\u0930 
\u0922\u0915\u093e\u0932","1179":"\uad00\uc778\uc0dd\ub7b5","79":"\uc544\ub77c"},"ts":"20140725121150"}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d8a09b9e9e638443a4a918bd05a445ed151c2fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli 

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

[MediaWiki-commits] [Gerrit] Removed translators.json - change (mediawiki...BlueSpiceFoundation)

2014-09-02 Thread Smuggli (Code Review)

Smuggli has submitted this change and it was merged.

Change subject: Removed translators.json
..


Removed translators.json

 - legacy

Change-Id: I3d8a09b9e9e638443a4a918bd05a445ed151c2fd
---
D includes/specials/translators.json
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/includes/specials/translators.json 
b/includes/specials/translators.json
deleted file mode 100644
index f2b3f94..000
--- a/includes/specials/translators.json
+++ /dev/null
@@ -1 +0,0 @@
-{"translators":{"273":"2nd-player","2":"Aftab1995","52":"Agilight","138":"Alan 
ffm","309":"Amankel'dy","1252":"Amire80","1228":"Andriykopanytsia","540":"Ankabel","230":"Arg","24":"Arifin.wijaya","1177":"Arystanbek","32":"Aurora","54":"Base","25":"Beta16","1136":"Bishnu
 
Saikia","31":"Bjankuloski06","497":"Bluedeck","33":"Botuzhaleny-sodamo","23":"C5st4wr6ch","1199":"Cedric31","39":"Chrumps","1300":"Cocu","1135":"Codex
 
Sinaiticus","117":"Constructeur","163":"Csega","944":"Cwek","1239":"Cwlin0416","1139":"DCLXVI","1175":"David1010","1258":"Dude1717","360":"EagerLin","5":"Edinwiki","194":"Eladk","1224":"ElangoRamanujam","19":"Elisardojm","93":"Eroha","1222":"Fader","161":"Fany","326":"Fengchao","7":"Fitoschido","4":"Fohanno","700":"Frammm","43":"F\u00falvio","240":"Gertakapllani","1184":"Ghybu","69":"Gomoko","1097":"Gorizon","1164":"Gregra","238":"HarpyWar","723":"Hudafu","852":"Ihojose","1183":"Iltever","999":"Iluvatar","42":"Imperadeiro98","187":"Impersonator
 1","1148":"Indoril","1162":"Inkbug","143":"Joetaras","1217":"John 
Reid","95":"Jopparn","1220":"Josve05a","101":"Justincheng12345","6":"KWiki","47":"Kaganer","1201":"Kaliforwomen","1225":"Kalyanasundar","475":"Kc
 
kennylau","1169":"Kenrick95","1180":"Keysuck","299":"Kghbln","50":"Kiranmayee","1237":"Kuailong","56":"Liuxinyu970226","1029":"Lloffiwr","182":"Lokal
 Profil","41":"Luckas","159":"Macofe","1196":"Mar(c)","106":"Marc Reymann 
","11":"Marmase","1163":"Matanya","313":"Matik7","137":"Matma
 
Rex","22":"McDutchie","15":"Mcervera","92":"Meshkov.a","64":"Metalhead64","114":"Miguel2706","48":"Milicevic01","1279":"Minh
 
Nguyen","1182":"Miri-Nae","12":"Mirzali","750":"Mogoeilor","186":"Mywood","28":"Namoroka","243":"NataChe","75":"Nemo
 
bis","529":"Nepaboy","234":"NigelSoft","304":"Nike","35":"Niknetniko","46":"Okras","948":"Oldstoneage","307":"Orikrin1998","30":"Papuass","125":"PeppeAeco","994":"Pio387","192":"ProtoplasmaKid","483":"Psubhashish","715":"Raymond","1170":"Raynasution","1155":"Reza1615","38":"Ribert","29":"Robby","468":"Robert
 Vogel 
","121":"Ronel1","16":"Rtemis","153":"S8321414","476":"SGTTechnologicBunny","84":"SPQRobin","51":"Sayginer","10":"Sebastian
 
Wallroth","522":"Sengwan","279":"Servien","375":"Shield-9","26":"Shirayuki","237":"Shuba","1194":"Siebrand","36":"Sjoerddebruin","298":"Smuggli","510":"SnowedEarth","1231":"Sociologist","134":"Southparkfan","1320":"Ssola","1309":"Stens51","9":"Stephan
 Muggli 
","17":"Stryn","755":"SuperPuperSteve","560":"Swidmann","1212":"Szonja","0":"Test
 Create 
account","115":"Themasterriot","472":"Tlustulimu","1462":"Toadino2","361":"Tobias
 Weichart 
","20":"Toli\u00f1o","984":"Toniher","127":"Tyey","131":"V.narsikar","27":"VASANTH
 
S.N.","166":"Valepert","355":"Veeven","86":"Vengir","139":"Vitorvicentevalente","1159":"Vivaelcelta","725":"Wertuose","49":"WikiPhoenix","40":"Wiochman","18":"Wladek92","746":"Wyz","1213":"XXN","1233":"Xiaomingyan","1":"Xuacu","3":"Y-M
 
D","635":"Yekrats","1235":"Zhangjintao","98":"\u0410\u0442\u0430","1176":"\u0413\u0430\u0431\u0434\u0443\u043b\u0433\u0430\u043d\u0438
 \u041d\u0418\u0428 
\u0425\u0411\u041d","1392":"\u041c\u0430\u043a\u0441\u0438\u043c 
\u041f\u0456\u0434\u043b\u0456\u0441\u043d\u044e\u043a","1138":"\u0420\u0443\u0441\u0442\u0430\u043c
 
\u041d\u0443\u0440\u044b\u0435\u0432","8":"\u0423\u043c\u0430\u0440","21":"\u05d0\u05d9\u05ea\u05df96","55":"\u05e4\u05d5\u05d9\u05dc\u05d9\u05e9\u05e2\u05e8","982":"\u062a\u0631\u062c\u0645\u0627\u064605","34":"\u0938\u0930\u094b\u091c
 \u0915\u0941\u092e\u093e\u0930 
\u0922\u0915\u093e\u0932","1179":"\uad00\uc778\uc0dd\ub7b5","79":"\uc544\ub77c"},"ts":"20140725121150"}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d8a09b9e9e638443a4a918bd05a445ed151c2fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli 
Gerrit-Reviewer: Smuggli 
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 highlighting tag (v 1.10.0) - change (mediawiki...CodeMirror)

2014-09-02 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review.

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

Change subject: add highlighting tag  (v 1.10.0)
..

add highlighting tag  (v 1.10.0)

* remove state.allowWikimarkup

Change-Id: Ic34d8be7e10b2e829cf76d5e5c0f40da3c943961
---
M CodeMirror.php
M resources/mode/mediawiki/mediawiki.js
2 files changed, 22 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/13/157813/1

diff --git a/CodeMirror.php b/CodeMirror.php
index ecc2f05..7312027 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry 
point.' );
 }
 
-const EXT_CODEMIRROR_VERSION = '1.9.2';
+const EXT_CODEMIRROR_VERSION = '1.10.0';
 
 // Register this extension on Special:Version
 $wgExtensionCredits['parserhook'][] = array(
diff --git a/resources/mode/mediawiki/mediawiki.js 
b/resources/mode/mediawiki/mediawiki.js
index 8fbb6ab..d5e864e 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -179,7 +179,7 @@
style.push( 'string-2' );
break;
case 'TagName':
-   var tmp = stream.eatWhile( 
/[^>\/\s\u00a0<\{\&]/ );
+   var tmp = stream.match( /[^>\/\s\u00a0<\{\&]*/ 
)[0];
if ( tmp ) {
if ( stream.eatSpace() || 
/[>\/\s\u00a0]/.test( stream.peek() ) ) {
state.ImInBlock.pop();
@@ -202,6 +202,7 @@
}
if ( stream.eat( '>' ) ) {
state.ImInBlock.pop();
+   state.ImInBlock.push( 'InsideTag' );
return 'tag bracket';
}
break;
@@ -218,9 +219,26 @@
case 'TagCloseEnd':
if ( stream.eat( '>' ) ) {
state.ImInBlock.pop();
+   state.ImInTag.pop();
return 'tag bracket';
}
return 'error';
+   case 'InsideTag':
+   var tag = state.ImInTag[ state.ImInTag.length - 
1 ];
+   if ( tag === 'pre' ) {
+   if ( stream.eatWhile( /[^&<]/ ) ) {
+   return 'qualifier';
+   } else if ( stream.peek() === '&' ) {
+   style = ['qualifier'];
+   } else if ( stream.match( '') ) {
+   stream.backUp( 6 );
+   state.ImInBlock.pop();
+   } else {
+   stream.next();
+   return 'qualifier';
+   }
+   }
+   break;
case null:
if ( sol ) {
state.isBold = false;
@@ -263,7 +281,7 @@
mnemonicStyle.push( 'atom' );
return mnemonicStyle.join(' ');
}
-   } else if ( state.allowWikimarkup ) {
+   } else {
state.bTempArgName = false;
switch ( ch ) {
case '{':
@@ -328,9 +346,6 @@
 // if ( state.skipFormatting ) {
 // style.push( 'mw-skipformatting' );
 // }
-   } else {
-   stream.eatWhile( /[^&]/ );
-   style.push( 'qualifier' );
}
 
if ( style.length > 0 ) {
@@ -354,7 +369,7 @@
 
return {
startState: function() {
-   return { tokenize: inWikitext, ImInBlock: [], 
ImInTag:[], allowWikimarkup: true, skipFormatting: false, bTempArgName: false, 
isBold: false, isItalic: false };
+   return { tokenize: inWikitext, ImInBlock: [], 
ImInTag:[], skipFormatting: false, bTempArgName: false, isBold: false, 
isItalic: false };
},
token: function( stream, state ) {
return state.tokenize( stream, state );

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

[MediaWiki-commits] [Gerrit] add highlighting tag (v 1.10.0) - change (mediawiki...CodeMirror)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: add highlighting tag  (v 1.10.0)
..


add highlighting tag  (v 1.10.0)

* remove state.allowWikimarkup

Change-Id: Ic34d8be7e10b2e829cf76d5e5c0f40da3c943961
---
M CodeMirror.php
M resources/mode/mediawiki/mediawiki.js
2 files changed, 22 insertions(+), 7 deletions(-)

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



diff --git a/CodeMirror.php b/CodeMirror.php
index ecc2f05..7312027 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry 
point.' );
 }
 
-const EXT_CODEMIRROR_VERSION = '1.9.2';
+const EXT_CODEMIRROR_VERSION = '1.10.0';
 
 // Register this extension on Special:Version
 $wgExtensionCredits['parserhook'][] = array(
diff --git a/resources/mode/mediawiki/mediawiki.js 
b/resources/mode/mediawiki/mediawiki.js
index 8fbb6ab..d5e864e 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -179,7 +179,7 @@
style.push( 'string-2' );
break;
case 'TagName':
-   var tmp = stream.eatWhile( 
/[^>\/\s\u00a0<\{\&]/ );
+   var tmp = stream.match( /[^>\/\s\u00a0<\{\&]*/ 
)[0];
if ( tmp ) {
if ( stream.eatSpace() || 
/[>\/\s\u00a0]/.test( stream.peek() ) ) {
state.ImInBlock.pop();
@@ -202,6 +202,7 @@
}
if ( stream.eat( '>' ) ) {
state.ImInBlock.pop();
+   state.ImInBlock.push( 'InsideTag' );
return 'tag bracket';
}
break;
@@ -218,9 +219,26 @@
case 'TagCloseEnd':
if ( stream.eat( '>' ) ) {
state.ImInBlock.pop();
+   state.ImInTag.pop();
return 'tag bracket';
}
return 'error';
+   case 'InsideTag':
+   var tag = state.ImInTag[ state.ImInTag.length - 
1 ];
+   if ( tag === 'pre' ) {
+   if ( stream.eatWhile( /[^&<]/ ) ) {
+   return 'qualifier';
+   } else if ( stream.peek() === '&' ) {
+   style = ['qualifier'];
+   } else if ( stream.match( '') ) {
+   stream.backUp( 6 );
+   state.ImInBlock.pop();
+   } else {
+   stream.next();
+   return 'qualifier';
+   }
+   }
+   break;
case null:
if ( sol ) {
state.isBold = false;
@@ -263,7 +281,7 @@
mnemonicStyle.push( 'atom' );
return mnemonicStyle.join(' ');
}
-   } else if ( state.allowWikimarkup ) {
+   } else {
state.bTempArgName = false;
switch ( ch ) {
case '{':
@@ -328,9 +346,6 @@
 // if ( state.skipFormatting ) {
 // style.push( 'mw-skipformatting' );
 // }
-   } else {
-   stream.eatWhile( /[^&]/ );
-   style.push( 'qualifier' );
}
 
if ( style.length > 0 ) {
@@ -354,7 +369,7 @@
 
return {
startState: function() {
-   return { tokenize: inWikitext, ImInBlock: [], 
ImInTag:[], allowWikimarkup: true, skipFormatting: false, bTempArgName: false, 
isBold: false, isItalic: false };
+   return { tokenize: inWikitext, ImInBlock: [], 
ImInTag:[], skipFormatting: false, bTempArgName: false, isBold: false, 
isItalic: false };
},
token: function( stream, state ) {
return state.tokenize( stream, state );

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

Gerrit-M

[MediaWiki-commits] [Gerrit] Add missing i18n for a word in the legend - change (mediawiki...Interwiki)

2014-09-02 Thread Mormegil (Code Review)

Mormegil has uploaded a new change for review.

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

Change subject: Add missing i18n for a word in the legend
..

Add missing i18n for a word in the legend

The "Transclude" word in the Special:Interwiki legend was
passed verbatim, i.e. not translated. Fixed by wrapping in
{{int:}} just like the rest.

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


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

diff --git a/i18n/en.json b/i18n/en.json
index 7ef1225..054ad4c 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,7 +12,7 @@
 "interwiki_intro": "This is an overview of the interwiki table.",
 "interwiki-legend-show": "Show legend",
 "interwiki-legend-hide": "Hide legend",
-"interwiki_legend": "{| 
class=\"wikitable\"\n|-\n!{{int:interwiki_prefix}}\n|colspan=2|{{int:interwiki_prefix_intro}}\n|-\n!{{int:interwiki_url}}\n|colspan=2|{{int:interwiki_url_intro}}\n|-\n!rowspan=2|{{int:interwiki_local}}\n!{{int:interwiki_1}}\n|{{int:interwiki_local_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_local_0_intro}}\n|-\n!rowspan=2|Transclude\n!{{int:interwiki_1}}\n|{{int:interwiki_trans_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_trans_0_intro}}\n|-\n|}",
+"interwiki_legend": "{| 
class=\"wikitable\"\n|-\n!{{int:interwiki_prefix}}\n|colspan=2|{{int:interwiki_prefix_intro}}\n|-\n!{{int:interwiki_url}}\n|colspan=2|{{int:interwiki_url_intro}}\n|-\n!rowspan=2|{{int:interwiki_local}}\n!{{int:interwiki_1}}\n|{{int:interwiki_local_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_local_0_intro}}\n|-\n!rowspan=2|{{int:interwiki_trans}}\n!{{int:interwiki_1}}\n|{{int:interwiki_trans_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_trans_0_intro}}\n|-\n|}",
 "interwiki_prefix": "Prefix",
 "interwiki-prefix-label": "Prefix:",
 "interwiki_prefix_intro": "Interwiki prefix to be used in [[prefix:pagename]] wikitext syntax.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf55857530d4200eb2e179ce9a15121a1d371c90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Mormegil 

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

[MediaWiki-commits] [Gerrit] varnish: add a php engine token - change (operations/puppet)

2014-09-02 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: varnish: add a php engine token
..


varnish: add a php engine token

As we're going to roll HHVM into production, it will be crucial to make
the two pool easily distinguishable in the data stream analytics
processes, so that useful metrics can be extracted and performance can
be properly measured.

Change-Id: I46ff99c198892ade54eef6ffae7ebd264304a681
Signed-off-by: Giuseppe Lavagetto 
---
M templates/varnish/bits.inc.vcl.erb
M templates/varnish/hhvm.inc.vcl.erb
M templates/varnish/mobile-frontend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
4 files changed, 23 insertions(+), 0 deletions(-)

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



diff --git a/templates/varnish/bits.inc.vcl.erb 
b/templates/varnish/bits.inc.vcl.erb
index e8b783e..62a3c05 100644
--- a/templates/varnish/bits.inc.vcl.erb
+++ b/templates/varnish/bits.inc.vcl.erb
@@ -107,3 +107,7 @@
call errorpage;
return(deliver);
 }
+
+sub vcl_deliver {
+   call php_mark_engine;
+}
diff --git a/templates/varnish/hhvm.inc.vcl.erb 
b/templates/varnish/hhvm.inc.vcl.erb
index 0843a10..5e5a0e1 100644
--- a/templates/varnish/hhvm.inc.vcl.erb
+++ b/templates/varnish/hhvm.inc.vcl.erb
@@ -19,3 +19,20 @@
set beresp.ttl = 0s;
}
 }
+
+/* Manage X-Analytics token for HHVM/Zend tracking */
+sub php_mark_engine {  
+   if (resp.http.X-Analytics) {
+   if (resp.http.X-Powered-By ~ "^HHVM") {
+   set resp.http.X-Analytics = resp.http.X-Analytics + 
";php=hhvm";
+   } else {
+   set resp.http.X-Analytics = resp.http.X-Analytics + 
";php=zend";
+   }
+   } else {
+   if (resp.http.X-Powered-By ~ "^HHVM") {
+   set resp.http.X-Analytics = "php=hhvm";
+   } else {
+   set resp.http.X-Analytics = "php=zend";
+   }
+   }
+}
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb 
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 192b1cd..d225846 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -192,6 +192,7 @@
set resp.http.Cache-Control = "s-maxage=3600, max-age=3600";
}
 
+   call php_mark_engine;
 /* TODO: this block of VCL code is copypasta from text-frontend. Some 
consolidation is in order. */
 <% if cluster_options.fetch( "enable_geoiplookup", false ) -%>
 /* Perform GeoIP look-up and send the result as a session 
cookie */
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index ed88a69..00f775e 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -167,6 +167,7 @@
&& req.url !~ "(?i)bcache=1") {
set resp.http.Cache-Control = "private, s-maxage=0, max-age=0, 
must-revalidate";
}
+   call php_mark_engine;
 <% if cluster_options.fetch( "enable_geoiplookup", false ) -%>
/* Perform GeoIP look-up and send the result as a session cookie */
if (req.http.Orig-Cookie !~ "(^|;\s*)GeoIP=[^;]"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46ff99c198892ade54eef6ffae7ebd264304a681
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make the main script load on-demand - change (mediawiki...ImageMetrics)

2014-09-02 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Make the main script load on-demand
..

Make the main script load on-demand

Change-Id: I93bb46e6589f0496b5b7cdecddd45fec62201d87
---
M ImageMetrics.php
M resources/ext.imageMetrics.js
A resources/ext.imageMetrics.loader.js
3 files changed, 37 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageMetrics 
refs/changes/15/157815/1

diff --git a/ImageMetrics.php b/ImageMetrics.php
index 0eab471..e93ea2c 100644
--- a/ImageMetrics.php
+++ b/ImageMetrics.php
@@ -41,7 +41,13 @@
'remoteExtPath' => 'ImageMetrics/resources',
'dependencies'  => 'schema.ImageMetricsLoadingTime',
'targets'   => array( 'desktop', 'mobile' ),
-   )
+   ),
+   'ext.imageMetrics.loader' => array(
+   'scripts'   => 'ext.imageMetrics.loader.js',
+   'localBasePath' => __DIR__ . '/resources',
+   'remoteExtPath' => 'ImageMetrics/resources',
+   'targets'   => array( 'desktop', 'mobile' ),
+   ),
 );
 
 /**
@@ -51,7 +57,7 @@
  */
 $wgHooks['BeforePageDisplay'][] = function ( &$out, &$skin ) {
if ( $out->getTitle()->inNamespace( NS_FILE ) && Action::getActionName( 
$out->getContext() ) === 'view' ) {
-   $out->addModules( 'ext.imageMetrics' );
+   $out->addModules( 'ext.imageMetrics.loader' );
}
return true;
 };
diff --git a/resources/ext.imageMetrics.js b/resources/ext.imageMetrics.js
index 927a2be..e8bdac8 100644
--- a/resources/ext.imageMetrics.js
+++ b/resources/ext.imageMetrics.js
@@ -75,19 +75,6 @@
};
 
/**
-* Makes a random decision (based on the sampling factor configuration 
setting) whether the current
-* request should be logged.
-* @return {boolean}
-*/
-   ImageMetrics.prototype.isInSample = function () {
-   var factor = this.mwConfig.get( 'wgImageMetricsSamplingFactor', 
false );
-   if ( !$.isNumeric( factor ) || factor < 1 ) {
-   return false;
-   }
-   return Math.floor( Math.random() * factor ) === 0;
-   };
-
-   /**
 * Adds information provided by MediaWiki.
 * @param {Object} data
 * @param {jQuery} $file jQuery object containing the img element
@@ -158,9 +145,6 @@
var $file,
data = {};
 
-   if ( !this.isInSample() || !this.eventLog ) {
-   return;
-   }
data.samplingFactor = this.mwConfig.get( 
'wgImageMetricsSamplingFactor' );
 
data.isHttps = this.location.protocol === 'https:';
@@ -176,5 +160,4 @@
};
 
mw.ImageMetrics = ImageMetrics;
-   ImageMetrics.install();
 } ( mediaWiki, jQuery ) );
diff --git a/resources/ext.imageMetrics.loader.js 
b/resources/ext.imageMetrics.loader.js
new file mode 100644
index 000..942433e
--- /dev/null
+++ b/resources/ext.imageMetrics.loader.js
@@ -0,0 +1,29 @@
+/**
+ * JavaScript module for image-related metrics.
+ * @see https://mediawiki.org/wiki/Extension:ImageMetrics
+ *
+ * @licence GNU GPL v2 or later
+ * @author Tisza Gergő 
+ */
+( function ( mw, $ ) {
+   'use strict';
+
+   /**
+* Makes a random decision (based on the sampling factor configuration 
setting) whether the current
+* request should be logged.
+* @return {boolean}
+*/
+   function isInSample() {
+   var factor = mw.config.get( 'wgImageMetricsSamplingFactor', 
false );
+   if ( !$.isNumeric( factor ) || factor < 1 ) {
+   return false;
+   }
+   return Math.floor( Math.random() * factor ) === 0;
+   }
+
+   if ( isInSample() ) {
+   mw.loader.using( 'ext.imageMetrics', function () {
+   mw.ImageMetrics.install();
+   } );
+   }
+} ( mediaWiki, jQuery ) );

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

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

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

[MediaWiki-commits] [Gerrit] [FIX] Improved flake8/flake8-docstring handling - change (pywikibot/core)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: [FIX] Improved flake8/flake8-docstring handling
..


[FIX] Improved flake8/flake8-docstring handling

In 5426720bfe83e37aec032e8afcd9470294293ac4 the textlib redirects
have been dynamically deprecated, but because flake8 is unable to
detect that __all__ gets concatinated a workaround was used which
'fixed' flake8. But pep257 throws an AllError as soon as __all__
appears somewhere else. pep257 also throws an AllError, when the
content of the list doesn't begin in the same line as the __all__.

This also fixes the warning pep257 returned, when __all__ wasn't
a tuple in tests/__init__.

Change-Id: I6dc66f0082ae594c63b99c8c022ab38cdc705dec
---
M pywikibot/__init__.py
M tests/__init__.py
2 files changed, 21 insertions(+), 20 deletions(-)

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



diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 6804291..add9a33 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -57,28 +57,29 @@
 'replaceCategoryInPlace', 'compileLinkR', 'extract_templates_and_params',
 )
 
-__all__ = (
-'config', 'ui', 'UnicodeMixin', 'translate',
-'Page', 'FilePage', 'ImagePage', 'Category', 'Link', 'User',
-'ItemPage', 'PropertyPage', 'Claim', 'TimeStripper',
-'html2unicode', 'url2unicode', 'unicode2html',
-'stdout', 'output', 'warning', 'error', 'critical', 'debug', 'exception',
-'input', 'inputChoice', 'handleArgs', 'showHelp', 'ui', 'log',
-'calledModuleName', 'Bot', 'WikidataBot',
-'Error', 'InvalidTitle', 'BadTitle', 'NoPage', 'SectionError',
-'NoSuchSite', 'NoUsername', 'UserBlocked',
-'PageRelatedError', 'IsRedirectPage', 'IsNotRedirectPage',
-'PageNotSaved', 'UploadWarning', 'LockedPage', 'EditConflict',
-'ServerError', 'FatalServerError', 'Server504Error',
-'CaptchaError', 'SpamfilterError', 'CircularRedirect',
-'WikiBaseError', 'CoordinateGlobeUnknownException',
-'QuitKeyboardInterrupt',
-)
+# pep257 doesn't understand when the first entry is on the next line
+__all__ = ('config', 'ui', 'UnicodeMixin', 'translate',
+   'Page', 'FilePage', 'ImagePage', 'Category', 'Link', 'User',
+   'ItemPage', 'PropertyPage', 'Claim', 'TimeStripper',
+   'html2unicode', 'url2unicode', 'unicode2html',
+   'stdout', 'output', 'warning', 'error', 'critical', 'debug', 
'exception',
+   'input', 'inputChoice', 'handleArgs', 'showHelp', 'ui', 'log',
+   'calledModuleName', 'Bot', 'WikidataBot',
+   'Error', 'InvalidTitle', 'BadTitle', 'NoPage', 'SectionError',
+   'NoSuchSite', 'NoUsername', 'UserBlocked',
+   'PageRelatedError', 'IsRedirectPage', 'IsNotRedirectPage',
+   'PageNotSaved', 'UploadWarning', 'LockedPage', 'EditConflict',
+   'ServerError', 'FatalServerError', 'Server504Error',
+   'CaptchaError', 'SpamfilterError', 'CircularRedirect',
+   'WikiBaseError', 'CoordinateGlobeUnknownException',
+   'QuitKeyboardInterrupt',
+   )
 # flake8 is unable to detect concatenation in the same operation
 # like:
 # ) + textlib_methods
+# pep257 also doesn't support __all__ multiple times in a document
 # so instead use this trick
-globals()['__all__'] = __all__ + textlib_methods
+globals()['__all__'] = globals()['__all__'] + textlib_methods
 
 for _name in textlib_methods:
 target = getattr(textlib, _name)
diff --git a/tests/__init__.py b/tests/__init__.py
index 96c3f95..4670c9b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -9,8 +9,8 @@
 import os
 import sys
 
-__all__ = ['httplib2', 'OrderedDict', '_cache_dir', 'TestRequest',
-   'patch_request', 'unpatch_request']
+__all__ = ('httplib2', 'OrderedDict', '_cache_dir', 'TestRequest',
+   'patch_request', 'unpatch_request')
 
 # Verify that the unit tests have a base working environment:
 # - httplib2 is mandatory

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6dc66f0082ae594c63b99c8c022ab38cdc705dec
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Nullzero 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Labs: provide saner nscd defaults - change (operations/puppet)

2014-09-02 Thread coren (Code Review)

coren has uploaded a new change for review.

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

Change subject: Labs: provide saner nscd defaults
..

Labs: provide saner nscd defaults

Labs has different use cases, and several assumptions about
resolving can be made that impact the best settings for nscd:

- users are very rarely removed
- groups are slightly more mutable
- DNS entries tend to have long lifetimes

Accordingly, some of the caching values have been tweaked to
reflect that reality and greatly reduce the load on the LDAP and
DNS services, which are not all that robust under load.

Note that this turns host caching back on, despite it being
turned off by default in recent Ubuntu releases because of a
known issue:

https://sourceware.org/bugzilla/show_bug.cgi?id=4428

This bug has essentially no impact in Labs because the TTL of
Openstack-created entries in dnsmasq is not normally tunable.

Also, the worst case scenario is that some library calls returned
cached values with a lifetime of the greater of the DNS TTL and
that of the cache (which is incorrect, but mostly harmless since
we keep our cache lifetime at 1h).  In practice, this means that
/if/ we have the TTL of a hostname under one hour, /and/ it
changes while cached, it may persist for up to 1h more than it
should or until the cache is manually invalidated.  This seems
to be acceptable.

Bug: 70076
Change-Id: Ic41a10d2fbafabdd50c7db49580ace717499c829
---
A modules/ldap/files/nscd-labs.conf
M modules/ldap/manifests/client.pp
2 files changed, 77 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/157816/1

diff --git a/modules/ldap/files/nscd-labs.conf 
b/modules/ldap/files/nscd-labs.conf
new file mode 100644
index 000..294154c
--- /dev/null
+++ b/modules/ldap/files/nscd-labs.conf
@@ -0,0 +1,73 @@
+#
+# /etc/nscd.conf
+#
+# An example Name Service Cache config file.  This file is needed by nscd.
+#
+# Legal entries are:
+#
+#   logfile 
+#   debug-level  
+#   threads 
+#   max-threads  
+#   server-user 
+#  server-user is ignored if nscd is started with -S parameters
+#   stat-user   
+#   reload-count  unlimited|
+#   paranoia  
+#   restart-interval   
+#
+#   enable-cache   
+#   positive-time-to-live
+#   negative-time-to-live
+#   suggested-size   
+#   check-files   
+#   persistent   
+#   shared  
+#   max-db-size   
+#   auto-propagate   
+#
+# Currently supported cache names (services): passwd, group, hosts, services
+#
+
+
+   debug-level   0
+   paranoia  no
+
+   enable-cache  passwd   yes
+   positive-time-to-live passwd   3600
+   negative-time-to-live passwd   30
+   suggested-sizepasswd   3001
+   check-files   passwd   yes
+   persistentpasswd   yes
+   sharedpasswd   yes
+   max-db-size   passwd   67108864
+   auto-propagatepasswd   yes
+
+   enable-cache  groupyes
+   positive-time-to-live group60
+   negative-time-to-live group60
+   suggested-sizegroup3001
+   check-files   groupyes
+   persistentgroupyes
+   sharedgroupyes
+   max-db-size   group67108864
+   auto-propagategroupyes
+
+   enable-cache  hostsyes
+   positive-time-to-live hosts3600
+   negative-time-to-live hosts30
+   suggested-sizehosts983
+   check-files   hostsyes
+   persistenthostsyes
+   sharedhostsyes
+   max-db-size   hosts33554432
+
+   enable-cache  services yes
+   positive-time-to-live services 3600
+   negative-time-to-live services 10
+   suggested-sizeservices 211
+   check-files   services yes
+   persistentservices yes
+   sharedservices yes
+   max-db-size   services 33554432
+
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 1ec4d10..53efecc 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -62,7 +62,10 @@
 
 file { '/etc/nscd.conf':
 notify => Service['nscd'],
-source => 'puppet:///modules/ldap/nscd.conf',
+source => $::realm ? {
+'labs'  => 'puppet:///modules/ldap/nscd-labs.conf',
+default => 'puppet:///modules/ldap/nscd.conf',
+}
 }
 
 file { '/etc/nsswitch.conf':

-- 
To view, visit https://g

[MediaWiki-commits] [Gerrit] Fix lost html section tag in MT API input - change (mediawiki...ContentTranslation)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Fix lost html section tag in MT API input
..


Fix lost html section tag in MT API input

The parent tag of the section html was getting lost in
getSimplifiedHTMLForMT method.

While doing that, simplified the code that replace placeholder with MT
output

Bug: 70165
Change-Id: I26736ceb358391fa15015c613962a465cb8c1d06
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 7 insertions(+), 10 deletions(-)

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



diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 2ba007b..626143f 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -39,7 +39,7 @@
MTControlCard.provider = disableMT;
} else {
// TODO Consider user preferences
-   MTControlCard.provider = 
MTControlCard.providers[0];
+   MTControlCard.provider = 
MTControlCard.providers[ 0 ];
}
} )
.fail( function ( response ) {
@@ -81,11 +81,10 @@
 * @retun {string}
 */
function getSimplifiedHTMLForMT( $section ) {
-   return $( '' ).append( $section.clone() )
-   .find( '*' )
-   .removeAttr( 'data-parsoid' )
-   .removeAttr( 'data-mw' )
-   .html();
+   var $wrapper = $( '' ).append( $section.clone() );
+
+   $wrapper.find( '*' ).removeAttr( 'data-parsoid data-mw' );
+   return $wrapper.html();
}
 
/**
@@ -113,9 +112,8 @@
doMT( mw.cx.sourceLanguage, mw.cx.targetLanguage, 
sourceContent )
.done( function ( translation ) {
if ( translation ) {
-   // Replace the placeholder with 
the source section
-   $section.replaceWith( 
$sourceSection
-   .clone()
+   $section.replaceWith( $( 
translation )
+   .children()
.attr( {
id: 'cx' + 
sourceId,
'data-source': 
sourceId
@@ -123,7 +121,6 @@
);
// $section was replaced. Get 
the updated instance.
$section = $( '#cx' + sourceId 
);
-   $section.html( $( translation 
).html() );
}
} )
.fail( function () {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26736ceb358391fa15015c613962a465cb8c1d06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Moved edit functionality to fingerprintgroupview - change (mediawiki...Wikibase)

2014-09-02 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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

Change subject: Moved edit functionality to fingerprintgroupview
..

Moved edit functionality to fingerprintgroupview

Removed edittoolbar definition from fingerprintview and added definition for
fingerprintgroupview. Necessary edit functionality has been implemented
in fingerprintlistview and fingerprintgroupview.

Change-Id: I19c1bbda6a06b8b2147c266540b63a7f6de195d1
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintview.js
M lib/resources/jquery.wikibase/resources.php
M 
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.fingerprintgroupview.css
M lib/resources/templates.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintlistview.tests.js
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/View/TermBoxView.php
M repo/resources/wikibase.ui.entityViewInit.js
13 files changed, 512 insertions(+), 98 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index f9a47a5..14925e8 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -207,7 +207,8 @@
this.$fingerprints.fingerprintgroupview( {
value: value,
entityId: this.options.value.getId(),
-   api: this.options.api
+   api: this.options.api,
+   helpMessage: mw.msg( 
'wikibase-fingerprintgroupview-input-help-message' )
} );
},
 
diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
index 42f252d..207a316 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
@@ -21,6 +21,28 @@
  * @options {string} entityId
  *
  * @option {wikibase.RepoApi} api
+ *
+ * @option {string} [helpMessage]
+ *  Default: 'Edit label, description and aliases per 
language.'
+ *
+ * @event change
+ *- {jQuery.Event}
+ *
+ * @event afterstartediting
+ *   - [jQuery.Event}
+ *
+ * @event stopediting
+ *- {jQuery.Event}
+ *- {boolean} Whether to drop the value.
+ *- {Function} Callback function.
+ *
+ * @event afterstopediting
+ *- {jQuery.Event}
+ *- {boolean} Whether to drop the value.
+ *
+ * @event toggleerror
+ *- {jQuery.Event}
+ *- {Error|null}
  */
 $.widget( 'wikibase.fingerprintgroupview', PARENT, {
options: {
@@ -36,8 +58,14 @@
},
value: [],
entityId: null,
-   api: null
+   api: null,
+   helpMessage: 'Edit label, description and aliases per language.'
},
+
+   /**
+* @type {boolean}
+*/
+   _isInEditMode: false,
 
/**
 * @type {jQuery}
@@ -89,11 +117,121 @@
 * Creates and initializes the fingerprintlistview widget.
 */
_createFingerprintlistview: function() {
-   this.$fingerprintlistview.fingerprintlistview( {
+   var self = this,
+   prefix = 
$.wikibase.fingerprintlistview.prototype.widgetEventPrefix;
+
+   this.$fingerprintlistview
+   .fingerprintlistview( {
value: this.options.value,
entityId: this.options.entityId,
api: this.options.api
-   } );
+   } )
+   .on( prefix + 'change', function( event ) {
+   event.stopPropagation();
+   self._trigger( 'change' );
+   } )
+   .on( prefix + 'toggleerror.' + self.widgetName, function( 
event, error ) {
+   event.stopPropagation();
+   self.setError( error );
+   } )
+   .on(
+   [
+   prefix + 'create.' + self.widgetName,
+   prefix + 'afterstartediting.' + self.widgetName,
+   prefix + 'stopediting.' + self.widgetName,
+   prefix + 'afterstopediting.' + self.widgetName,
+   prefix + 'disable.' + self.widgetName
+

[MediaWiki-commits] [Gerrit] Add a jQuery promise lib around indexedDB - change (mediawiki/core)

2014-09-02 Thread TheDJ (Code Review)

TheDJ has uploaded a new change for review.

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

Change subject: Add a jQuery promise lib around indexedDB
..

Add a jQuery promise lib around indexedDB

Added ed5507cd49ee93fbdec449341306b81507db8f41
of https://github.com/axemclion/jquery-indexeddb

Will use this to improve change: I38372e4ae38

Change-Id: I9b5ccc018ad19ae3abcc95e879e9c4a467533d71
---
M resources/Resources.php
A resources/lib/jquery/jquery.indexeddb.js
2 files changed, 548 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/157818/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 3073152..827ef21 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -249,6 +249,9 @@
'jquery.hoverIntent' => array(
'scripts' => 'resources/lib/jquery/jquery.hoverIntent.js',
),
+   'jquery.indexeddb' => array(
+   'scripts' => 'resources/lib/jquery/jquery.indexeddb.js',
+   },
'jquery.json' => array(
// @deprecated since 1.24: Use the 'json' module and global 
JSON object instead.
'scripts' => array(
diff --git a/resources/lib/jquery/jquery.indexeddb.js 
b/resources/lib/jquery/jquery.indexeddb.js
new file mode 100644
index 000..0001ed6
--- /dev/null
+++ b/resources/lib/jquery/jquery.indexeddb.js
@@ -0,0 +1,545 @@
+/*
+ * Copyright 2012 Parashuram N and other contributors
+ * http://nparashuram.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+(function($, undefined) {
+   'use strict';
+   var indexedDB = window.indexedDB || window.mozIndexedDB || 
window.webkitIndexedDB || window.msIndexedDB;
+   var IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange;
+   var IDBCursor = window.IDBCursor || window.webkitIDBCursor || {};
+   if (typeof IDBCursor.PREV === "undefined") {
+IDBCursor.PREV = "prev";
+}
+   if (typeof IDBCursor.NEXT === "undefined") {
+IDBCursor.NEXT = "next";
+}
+
+   /**
+* Best to use the constant IDBTransaction since older version support 
numeric types while the latest spec
+* supports strings
+*/
+   var IDBTransaction = window.IDBTransaction || 
window.webkitIDBTransaction;
+
+   function getDefaultTransaction(mode) {
+   var result = null;
+   switch (mode) {
+   case 0:
+   case 1:
+   case "readwrite":
+   case "readonly":
+   result = mode;
+   break;
+   default:
+   result = IDBTransaction.READ_WRITE || 
"readwrite";
+   }
+   return result;
+   }
+
+   $.extend({
+   /**
+* The IndexedDB object used to open databases
+* @param {Object} dbName - name of the database
+* @param {Object} config - version, onupgradeneeded, 
onversionchange, schema
+*/
+   "indexedDB": function(dbName, config) {
+   if (config) {
+   // Parse the config argument
+   if (typeof config === "number") config = {
+   "version": config
+   };
+
+   var version = config.version;
+   if (config.schema && !version) {
+   var max = -1;
+   for (var key in config.schema) {
+   max = max > key ? max : key;
+   }
+   version = config.version || max;
+

[MediaWiki-commits] [Gerrit] Fix dependency for lastedited message - change (mediawiki...GettingStarted)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Fix dependency for lastedited message
..


Fix dependency for lastedited message

Change-Id: Ie47938deb5258b66b3fe1afe90a790db4d27270a
---
M GettingStarted.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/GettingStarted.php b/GettingStarted.php
index 64ed62e..6deb87b 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -177,7 +177,6 @@
),
'messages' => array(
'gettingstarted-lightbulb-notification-body',
-   'gettingstarted-lightbulb-notification-body-lastedited',
),
 ) + $gettingStartedModuleInfo;
 
@@ -223,6 +222,9 @@
'schema.TaskRecommendation',
'schema.TaskRecommendationClick',
),
+   'messages' => array(
+   'gettingstarted-lightbulb-notification-body-lastedited',
+   ),
 ) + $gettingStartedModuleInfo;
 
 $wgResourceModules[ 'ext.gettingstarted.logging' ] = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie47938deb5258b66b3fe1afe90a790db4d27270a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Robmoen 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Robmoen 
Gerrit-Reviewer: Swalling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update ToC icon (with directionality). - change (apps...wikipedia)

2014-09-02 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Update ToC icon (with directionality).
..

Update ToC icon (with directionality).

Change-Id: I474944181e52aba800ea025b92ae0962f4d72442
---
D icon-svgs/24/ic_toc.svg
A icon-svgs/32/toc_collapsed.svg
A icon-svgs/32/toc_expanded.svg
D wikipedia/res/drawable-hdpi/ic_toc.png
A wikipedia/res/drawable-hdpi/toc_collapsed.png
A wikipedia/res/drawable-hdpi/toc_expanded.png
D wikipedia/res/drawable-ldpi/ic_toc.png
A wikipedia/res/drawable-ldpi/toc_collapsed.png
A wikipedia/res/drawable-ldpi/toc_expanded.png
D wikipedia/res/drawable-ldrtl-hdpi/ic_toc.png
A wikipedia/res/drawable-ldrtl-hdpi/toc_collapsed.png
A wikipedia/res/drawable-ldrtl-hdpi/toc_expanded.png
D wikipedia/res/drawable-ldrtl-ldpi/ic_toc.png
A wikipedia/res/drawable-ldrtl-ldpi/toc_collapsed.png
A wikipedia/res/drawable-ldrtl-ldpi/toc_expanded.png
D wikipedia/res/drawable-ldrtl-mdpi/ic_toc.png
A wikipedia/res/drawable-ldrtl-mdpi/toc_collapsed.png
A wikipedia/res/drawable-ldrtl-mdpi/toc_expanded.png
D wikipedia/res/drawable-ldrtl-xhdpi/ic_toc.png
A wikipedia/res/drawable-ldrtl-xhdpi/toc_collapsed.png
A wikipedia/res/drawable-ldrtl-xhdpi/toc_expanded.png
D wikipedia/res/drawable-ldrtl-xxhdpi/ic_toc.png
A wikipedia/res/drawable-ldrtl-xxhdpi/toc_collapsed.png
A wikipedia/res/drawable-ldrtl-xxhdpi/toc_expanded.png
D wikipedia/res/drawable-mdpi/ic_toc.png
A wikipedia/res/drawable-mdpi/toc_collapsed.png
A wikipedia/res/drawable-mdpi/toc_expanded.png
D wikipedia/res/drawable-xhdpi/ic_toc.png
A wikipedia/res/drawable-xhdpi/toc_collapsed.png
A wikipedia/res/drawable-xhdpi/toc_expanded.png
D wikipedia/res/drawable-xxhdpi/ic_toc.png
A wikipedia/res/drawable-xxhdpi/toc_collapsed.png
A wikipedia/res/drawable-xxhdpi/toc_expanded.png
M wikipedia/res/layout/fragment_search.xml
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
35 files changed, 144 insertions(+), 11 deletions(-)


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

diff --git a/icon-svgs/24/ic_toc.svg b/icon-svgs/24/ic_toc.svg
deleted file mode 100644
index 77644da..000
--- a/icon-svgs/24/ic_toc.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
-width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 
0 0 24 24" xml:space="preserve">
-
-
diff --git a/icon-svgs/32/toc_collapsed.svg b/icon-svgs/32/toc_collapsed.svg
new file mode 100644
index 000..b194f49
--- /dev/null
+++ b/icon-svgs/32/toc_collapsed.svg
@@ -0,0 +1,66 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   sodipodi:docname="e958_IOS_WIKIGLYPH_TOC_COLLAPSED_0_0_-150.svg"
+   inkscape:version="0.48.1 "
+   xml:space="preserve"
+   enable-background="new -523.5 -199 512 512"
+   viewBox="-523.5 -199 512 512"
+   height="512px"
+   width="512px"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>
\ No newline at end of file
diff --git a/icon-svgs/32/toc_expanded.svg b/icon-svgs/32/toc_expanded.svg
new file mode 100644
index 000..37f6100
--- /dev/null
+++ b/icon-svgs/32/toc_expanded.svg
@@ -0,0 +1,69 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   sodipodi:docname="e959_IOS_WIKIGLYPH_TOC_EXPANDED_0_0_-150.svg"
+   inkscape:version="0.48.1 "
+   xml:space="preserve"
+   enable-background="new -523.5 -199 512 512"
+   viewBox="-523.5 -199 512 512"
+   height="512px"
+   width="512px"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1"
+   
inkscape:export-filename="E:\Desktop\e959_IOS_WIKIGLYPH_TOC_EXPANDED_0_0_-150.png"
+   inkscape:export-xdpi="11.25"
+   inkscape:export-ydpi="11.25">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>
\ No newline at end of file
diff --git a/wikipedia/res/drawable-hdpi/ic_toc.png 
b/wikipedia/res/drawable-hdpi/ic_toc.png
deleted file mode 100644
index e085631..000
--- a/wikipedia/res/drawable-hdpi/ic_toc.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/res/drawable-hdpi/toc_collapsed.png 
b/wikipedia/res/drawable-hdpi/toc_collapsed.png
new file mode 100644
index 000..ec2e21f
--- /dev/null
+

[MediaWiki-commits] [Gerrit] Revert "Toolbar: Only show on WikiText pages" - change (mediawiki/core)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Toolbar: Only show on WikiText pages"
..


Revert "Toolbar: Only show on WikiText pages"

Classical toolbar no longer appears in Page namespace on Wikisources.

This reverts commit 7263ef1e002786b27fa06db43aa7a6fca00461fb.

Bug: 69447
Change-Id: Ifafe41f7bc91183e0db4c10d8340a8b620b380bc
---
M includes/EditPage.php
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index 70eb909..c7cece6 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2425,9 +2425,7 @@
 
$wgOut->addHTML( $this->editFormTextBeforeContent );
 
-   if ( $this->contentModel === CONTENT_MODEL_WIKITEXT &&
-   $showToolbar && $wgUser->getOption( 'showtoolbar' ) )
-   {
+   if ( !$this->isCssJsSubpage && $showToolbar && 
$wgUser->getOption( 'showtoolbar' ) ) {
$wgOut->addHTML( EditPage::getEditToolbar() );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifafe41f7bc91183e0db4c10d8340a8b620b380bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf18
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Helder.wiki 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Toolbar: Only show on WikiText pages" - change (mediawiki/core)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Toolbar: Only show on WikiText pages"
..


Revert "Toolbar: Only show on WikiText pages"

Classical toolbar no longer appears in Page namespace on Wikisources.

This reverts commit 7263ef1e002786b27fa06db43aa7a6fca00461fb.

Bug: 69447
Change-Id: Ifafe41f7bc91183e0db4c10d8340a8b620b380bc
---
M includes/EditPage.php
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index b83569d..1873c72 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2425,9 +2425,7 @@
 
$wgOut->addHTML( $this->editFormTextBeforeContent );
 
-   if ( $this->contentModel === CONTENT_MODEL_WIKITEXT &&
-   $showToolbar && $wgUser->getOption( 'showtoolbar' ) )
-   {
+   if ( !$this->isCssJsSubpage && $showToolbar && 
$wgUser->getOption( 'showtoolbar' ) ) {
$wgOut->addHTML( EditPage::getEditToolbar() );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifafe41f7bc91183e0db4c10d8340a8b620b380bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf19
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Helder.wiki 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Labs: provide saner nscd defaults - change (operations/puppet)

2014-09-02 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: Labs: provide saner nscd defaults
..


Labs: provide saner nscd defaults

Labs has different use cases, and several assumptions about
resolving can be made that impact the best settings for nscd:

- users are very rarely removed
- groups are slightly more mutable
- DNS entries tend to have long lifetimes

Accordingly, some of the caching values have been tweaked to
reflect that reality and greatly reduce the load on the LDAP and
DNS services, which are not all that robust under load.

Note that this turns host caching back on, despite it being
turned off by default in recent Ubuntu releases because of a
known issue:

https://sourceware.org/bugzilla/show_bug.cgi?id=4428

This bug has essentially no impact in Labs because the TTL of
Openstack-created entries in dnsmasq is not normally tunable.

Also, the worst case scenario is that some library calls returned
cached values with a lifetime of the greater of the DNS TTL and
that of the cache (which is incorrect, but mostly harmless since
we keep our cache lifetime at 1h).  In practice, this means that
/if/ we have the TTL of a hostname under one hour, /and/ it
changes while cached, it may persist for up to 1h more than it
should or until the cache is manually invalidated.  This seems
to be acceptable.

Bug: 70076
Change-Id: Ic41a10d2fbafabdd50c7db49580ace717499c829
---
A modules/ldap/files/nscd-labs.conf
M modules/ldap/manifests/client.pp
2 files changed, 77 insertions(+), 1 deletion(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  coren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ldap/files/nscd-labs.conf 
b/modules/ldap/files/nscd-labs.conf
new file mode 100644
index 000..294154c
--- /dev/null
+++ b/modules/ldap/files/nscd-labs.conf
@@ -0,0 +1,73 @@
+#
+# /etc/nscd.conf
+#
+# An example Name Service Cache config file.  This file is needed by nscd.
+#
+# Legal entries are:
+#
+#   logfile 
+#   debug-level  
+#   threads 
+#   max-threads  
+#   server-user 
+#  server-user is ignored if nscd is started with -S parameters
+#   stat-user   
+#   reload-count  unlimited|
+#   paranoia  
+#   restart-interval   
+#
+#   enable-cache   
+#   positive-time-to-live
+#   negative-time-to-live
+#   suggested-size   
+#   check-files   
+#   persistent   
+#   shared  
+#   max-db-size   
+#   auto-propagate   
+#
+# Currently supported cache names (services): passwd, group, hosts, services
+#
+
+
+   debug-level   0
+   paranoia  no
+
+   enable-cache  passwd   yes
+   positive-time-to-live passwd   3600
+   negative-time-to-live passwd   30
+   suggested-sizepasswd   3001
+   check-files   passwd   yes
+   persistentpasswd   yes
+   sharedpasswd   yes
+   max-db-size   passwd   67108864
+   auto-propagatepasswd   yes
+
+   enable-cache  groupyes
+   positive-time-to-live group60
+   negative-time-to-live group60
+   suggested-sizegroup3001
+   check-files   groupyes
+   persistentgroupyes
+   sharedgroupyes
+   max-db-size   group67108864
+   auto-propagategroupyes
+
+   enable-cache  hostsyes
+   positive-time-to-live hosts3600
+   negative-time-to-live hosts30
+   suggested-sizehosts983
+   check-files   hostsyes
+   persistenthostsyes
+   sharedhostsyes
+   max-db-size   hosts33554432
+
+   enable-cache  services yes
+   positive-time-to-live services 3600
+   negative-time-to-live services 10
+   suggested-sizeservices 211
+   check-files   services yes
+   persistentservices yes
+   sharedservices yes
+   max-db-size   services 33554432
+
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 1ec4d10..53efecc 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -62,7 +62,10 @@
 
 file { '/etc/nscd.conf':
 notify => Service['nscd'],
-source => 'puppet:///modules/ldap/nscd.conf',
+source => $::realm ? {
+'labs'  => 'puppet:///modules/ldap/nscd-labs.conf',
+default => 'puppet:///modules/ldap/nscd.conf',
+}
 }
 
 file { '/etc/nsswitch.conf':

-- 
To view,

[MediaWiki-commits] [Gerrit] Enable TemplateData GUI on Norwegian Bokmål (nowiki) - change (operations/mediawiki-config)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Enable TemplateData GUI on Norwegian Bokmål (nowiki)
..


Enable TemplateData GUI on Norwegian Bokmål (nowiki)

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

Approvals:
  MarkTraceur: Looks good to me, approved
  John F. Lewis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2bf7995..f8752d7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11461,6 +11461,7 @@
'hewiki' => true, // Bug 66538
'itwiki' => true, // Bug 67376
'nlwiki' => true, // Bug 68795
+   'nowiki' => true, // Bug 70216
'ptwiki' => true, // Bug 66255
'ruwiki' => true, // Bug 67704
 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21ffcc500c0cfbe92ae448f56184d0331d2a1803
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: John F. Lewis 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix reuse panel layout issues - change (mediawiki...MultimediaViewer)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Fix reuse panel layout issues
..


Fix reuse panel layout issues

The OOUI inline menu widget does not use ul/li anymore; user
class name to target CSS instead.

Change-Id: Ia23f6c130145b411cb0c76a8448d725e51d5e700
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/838
---
M resources/mmv/ui/mmv.ui.reuse.dialog.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.less 
b/resources/mmv/ui/mmv.ui.reuse.dialog.less
index e2834ea..495a545 100644
--- a/resources/mmv/ui/mmv.ui.reuse.dialog.less
+++ b/resources/mmv/ui/mmv.ui.reuse.dialog.less
@@ -30,7 +30,7 @@
display: none;
}
 
-   li {
+  .oo-ui-optionWidget {
@tab-border-height: 3px;
@highlighted-tab-color: rgb(225, 243, 255);
@selected-tab-color: rgb(0, 113, 188);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia23f6c130145b411cb0c76a8448d725e51d5e700
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] SpecialCite is now CiteThisPage - change (operations/mediawiki-config)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: SpecialCite is now CiteThisPage
..


SpecialCite is now CiteThisPage

Change-Id: I7570734e61cd8d7c10944bf0c532c141dea501aa
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
4 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 06ee65b..e9dfab4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -569,9 +569,16 @@
 
 if ( $wmgUseCite ) {
require( $IP . '/extensions/Cite/Cite.php' );
+}
+
+if ( $wmgUseCite && !$wmgUseCiteThisPage ) {
require( $IP . '/extensions/Cite/SpecialCite.php' );
 }
 
+if ( $wmgUseCiteThisPage ) {
+   require( $IP . '/extensions/CiteThisPage/CiteThisPage.php' );
+}
+
 if ( $wmgUseInputBox ) {
include( $IP . '/extensions/InputBox/InputBox.php' );
 }
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c06b7b0..690e9e2 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -370,6 +370,10 @@
'zhwiki' => true,
),
 
+   'wmgUseCiteThisPage' => array(
+   'default' => true,
+   ),
+
'wmgUseFlow' => array(
'enwiki' => true,
'en_rtlwiki' => true,
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2bf7995..6245415 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13657,6 +13657,12 @@
'votewiki' => false,
 ),
 
+'wmgUseCiteThisPage' => array(
+   'default' => false,
+   'loginwiki' => false,
+   'votewiki' => false,
+),
+
 'wmgUsePoem' => array(
'default' => true,
'loginwiki' => false,
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 66691b4..8970f4d 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -15,6 +15,7 @@
 $IP/extensions/CirrusSearch/CirrusSearch.php
 $IP/extensions/Cite/Cite.php
 $IP/extensions/Cite/SpecialCite.php
+$IP/extensions/CiteThisPage/CiteThisPage.php
 $IP/extensions/cldr/cldr.php
 $IP/extensions/CleanChanges/CleanChanges.php
 $IP/extensions/CodeEditor/CodeEditor.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7570734e61cd8d7c10944bf0c532c141dea501aa
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Mailman: Fix a few encoding issues for languages - change (operations/puppet)

2014-09-02 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: Mailman: Fix a few encoding issues for languages
..


Mailman: Fix a few encoding issues for languages

A few fixes to how files are encoded. Not sure how this will
play out once merged.

Change-Id: I2c1f6b56f6da1c0d5f1b2ab27bfef2adff930c71
---
M files/mailman/templates/ca/listinfo.html
M files/mailman/templates/de/listinfo.html
M files/mailman/templates/en/listinfo.html
M files/mailman/templates/es/listinfo.html
M files/mailman/templates/fi/listinfo.html
M files/mailman/templates/fr/listinfo.html
M files/mailman/templates/id/listinfo.html
7 files changed, 47 insertions(+), 54 deletions(-)

Approvals:
  Stryn: Looks good to me, but someone else must approve
  coren: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/files/mailman/templates/ca/listinfo.html 
b/files/mailman/templates/ca/listinfo.html
index 0abd6b2..7a7645c 100644
--- a/files/mailman/templates/ca/listinfo.html
+++ b/files/mailman/templates/ca/listinfo.html
@@ -1,7 +1,6 @@
 
-
+
 
-
   
  Llista de correu: Wikimedia

[MediaWiki-commits] [Gerrit] Add autovalue to TemplateData editor - change (mediawiki...TemplateData)

2014-09-02 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Add autovalue to TemplateData editor
..

Add autovalue to TemplateData editor

Add 'autovalue' as a parameter property to both the editor and the
templatedata extension validation.

Change-Id: Iffb376a804d39388d2b5b6ea3583ef2a292eea41
---
M TemplateData.php
M TemplateDataBlob.php
M i18n/en.json
M i18n/qqq.json
M modules/ext.templateDataGenerator.core.js
M tests/ext.templateData.tests.js
6 files changed, 46 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData 
refs/changes/20/157820/1

diff --git a/TemplateData.php b/TemplateData.php
index bba6229..20e8831 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -95,6 +95,7 @@
'templatedata-modal-notice-import-numparams',
'templatedata-modal-table-param-actions',
'templatedata-modal-table-param-aliases',
+   'templatedata-modal-table-param-autovalue',
'templatedata-modal-table-param-default',
'templatedata-modal-table-param-desc',
'templatedata-modal-table-param-label',
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index 3aff5b3..921066b 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -88,6 +88,7 @@
'description',
'deprecated',
'aliases',
+   'autovalue',
'default',
'inherits',
'type',
@@ -252,6 +253,20 @@
}
} else {
$paramObj->aliases = array();
+   }
+
+   // Param.autovalue
+   if ( isset( $paramObj->autovalue ) ) {
+   if ( !is_string( $paramObj->autovalue ) ) {
+   // TODO: Validate the autovalue values.
+   return Status::newFatal(
+   'templatedata-invalid-type',
+   "params.{$paramName}.autovalue",
+   'string'
+   );
+   }
+   } else {
+   $paramObj->autovalue = '';
}
 
// Param.default
@@ -589,6 +604,11 @@
. Html::element(
'th',
array(),
+   wfMessage( 'templatedata-doc-param-autovalue' 
)->inLanguage( $lang )->text()
+   )
+   . Html::element(
+   'th',
+   array(),
wfMessage( 'templatedata-doc-param-status' 
)->inLanguage( $lang )->text()
)
. ''
@@ -659,6 +679,16 @@
$paramObj->default :
wfMessage( 
'templatedata-doc-param-default-empty' )->inLanguage( $lang )->text()
)
+   // Auto value
+   . Html::element( 'td', array(
+   'class' => array(
+   'mw-templatedata-doc-muted' => 
$paramObj->autovalue === ''
+   )
+   ),
+   $paramObj->autovalue !== '' ?
+   $paramObj->autovalue :
+   wfMessage( 
'templatedata-doc-param-autovalue-empty' )->inLanguage( $lang )->text()
+   )
// Status
. Html::element( 'td', array(), wfMessage( $status 
)->inLanguage( $lang )->text() )
. '';
diff --git a/i18n/en.json b/i18n/en.json
index 4892973..5575019 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,6 +7,8 @@
},
"templatedata-desc": "Implement data storage for template parameters 
(using JSON)",
"templatedata-doc-desc-empty": "No description.",
+   "templatedata-doc-param-autovalue": "Auto fill",
+   "templatedata-doc-param-autovalue-empty": "empty",
"templatedata-doc-param-default": "Default",
"templatedata-doc-param-default-empty": "empty",
"templatedata-doc-param-desc": "Description",
@@ -41,6 +43,7 @@
"templatedata-modal-notice-import-numparams": "$1 new 
{{PLURAL:$1|parameter was|parameters were}} imported.",
"templatedata-modal-table-param-actions": "Actions",
"templatedata-m

[MediaWiki-commits] [Gerrit] Overhauled tagadata widget - change (mediawiki...Wikibase)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Overhauled tagadata widget
..


Overhauled tagadata widget

- Moved tagadata widget from jquery.ui.wikibase.utilities.jQuery.ui.tagadata to 
jquery.ui.tagadata.
- Applied major refactoring.
- Added/edited documentation.
- Added proper support for editableTags: false
- Disable "Remove" functionality when disabled

Change-Id: Icc751b2d6dc0513ffe5dd8d61f190204057a02da
---
M .jshintignore
M lib/WikibaseLib.hooks.php
M lib/resources/Resources.php
R lib/resources/jquery.ui/jquery.ui.tagadata.LICENSE
R lib/resources/jquery.ui/jquery.ui.tagadata.css
A lib/resources/jquery.ui/jquery.ui.tagadata.js
M lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
D 
lib/resources/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata/wikibase.utilities.jQuery.ui.tagadata.js
A lib/tests/qunit/jquery.ui/jquery.ui.tagadata.tests.js
D 
lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata.tests.js
10 files changed, 832 insertions(+), 738 deletions(-)

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



diff --git a/.jshintignore b/.jshintignore
index 510115a..7a9e49d 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -12,7 +12,6 @@
 
./lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.NativeEventHandler.testsOnWidget.js
 
./lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.PersistentPromisor.tests.js
 ./lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.tests.js
-./lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata.tests.js
 ./lib/tests/qunit/wikibase.utilities/wikibase.utilities.newExtension.tests.js
 
./lib/tests/qunit/wikibase.utilities/wikibase.utilities.ui.StatableObject.tests.js
 ./tests/browser/vendor/
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index efd887f..4f48440 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -89,7 +89,6 @@

'tests/qunit/wikibase.utilities/wikibase.utilities.ui.StatableObject.tests.js',

'tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.tests.js',

'tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.PersistentPromisor.tests.js',
-   
'tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata.tests.js',
 

'tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js',

'tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js',
@@ -115,6 +114,15 @@
)
);
 
+   $testModules['qunit']['jquery.ui.tagadata.tests'] = $moduleBase 
+ array(
+   'scripts' => array(
+   
'tests/qunit/jquery.ui/jquery.ui.tagadata.tests.js',
+   ),
+   'dependencies' => array(
+   'jquery.ui.tagadata',
+   ),
+   );
+
$testModules['qunit']['jquery.wikibase.aliasesview.tests'] = 
$moduleBase + array(
'scripts' => array(

'tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js',
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 604cbf5..b44de93 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -271,12 +271,12 @@
)
),
 
-   'wikibase.utilities.jQuery.ui.tagadata' => $moduleTemplate + 
array(
+   'jquery.ui.tagadata' => $moduleTemplate + array(
'scripts' => array(
-   
'wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata/wikibase.utilities.jQuery.ui.tagadata.js',
+   'jquery.ui/jquery.ui.tagadata.js',
),
'styles' => array(
-   
'wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata/wikibase.utilities.jQuery.ui.tagadata.css',
+   'jquery.ui/jquery.ui.tagadata.css',
),
'dependencies' => array(
'jquery.event.special.eachchange',
@@ -406,12 +406,12 @@
),
'dependencies' => array(
'jquery.inputautoexpand',
+   'jquery.ui.tagadata',
'jquery.ui.TemplatedWidget',
'jquery.wikibase.edittoolbar',
'jquery.wikibase.toolbarcontroller',
'wikibase.RepoApiError',
'wikibase.templates',
-

[MediaWiki-commits] [Gerrit] Remove most amslvs[1-4] references - change (operations/puppet)

2014-09-02 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Remove most amslvs[1-4] references
..

Remove most amslvs[1-4] references

Change-Id: I86aa8c79711a28404a7c8e2bfbd06255f70cd630
---
M manifests/ganglia.pp
M manifests/role/lvs.pp
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/lvs/manifests/configuration.pp
5 files changed, 14 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/157821/1

diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index d30d653..7544985 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -323,7 +323,7 @@
 'Swift eqiad'=> 'ms-fe1001.eqiad.wmnet 
ms-fe1002.eqiad.wmnet',
 'Search eqiad'   => 
'search1001.eqiad.wmnet search1002.eqiad.wmnet',
 'Bits caches esams'  => 
'hooft.esams.wikimedia.org:11670 cp3019.esams.wikimedia.org 
cp3020.esams.wikimedia.org',
-'LVS loadbalancers esams'=> 
'hooft.esams.wikimedia.org:11651 amslvs1.esams.wikimedia.org 
amslvs2.esams.wikimedia.org',
+'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',
 'Memcached eqiad'=> 'mc1001.eqiad.wmnet 
mc1002.eqiad.wmnet',
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 2566599..e70478c 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -20,14 +20,19 @@
 $sip = $lvs::configuration::lvs_service_ips[$::realm]
 
 $lvs_balancer_ips = $::hostname ? {
-/^(lvs300[13]|amslvs[13]|lvs100[14]|lvs400[13])$/ => [
+/^(lvs[34]00[13])$/ => [
 $sip['text'][$::site],
 $sip['bits'][$::site],
 $sip['mobile'][$::site],
 ],
-/^(lvs300[24]|amslvs[24]|lvs400[24])$/ => [
+/^(lvs[34]00[24])$/ => [
 $sip['upload'][$::site],
 ],
+/^(lvs100[14])$/ => [
+$sip['text'][$::site],
+$sip['bits'][$::site],
+$sip['mobile'][$::site],
+],
 /^(lvs100[25])$/ => [
 $sip['upload'][$::site],
 $sip['payments'][$::site],
diff --git a/manifests/site.pp b/manifests/site.pp
index ecdfbc2..a8012d3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -57,30 +57,13 @@
 
 # Node definitions (alphabetic order)
 
+# To be decommissioned/reused, not presently serving traffic
 node /^amslvs[1-4]\.esams\.wikimedia\.org$/ {
 include admin
-
-if $::hostname =~ /^amslvs[12]$/ {
-$ganglia_aggregator = true
-}
-
-$cluster = 'lvs'
-include role::lvs::balancer
-include role::diamond
 
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
-
-# Make sure GRO is off
-interface::offload { 'eth0 gro':
-interface => 'eth0',
-setting   => 'gro',
-value => 'off',
-}
-
-# RPS/RSS config for interface performance
-interface::rps { 'eth0': rss_pattern => 'eth0-%d' }
 }
 
 # amssq31-62 are text varnish (and the only nodes with this legacy prefix)
diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 7d297d0..e42b717 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -47,7 +47,6 @@
esac; \
\
case $(debconf-get netcfg/get_hostname) in \
-   amslvs*) echo partman/raid1-squid.cfg ;; \
amssq3[1-9]|amssq4[0-9]|amssq[56][0-9]) echo 
partman/raid1-varnish.cfg ;; \
amssq*|sq[6][7-9]|sq70) echo partman/raid1-squid.cfg ;; \
analytics100[1-9]) echo partman/analytics-cisco.cfg ;; \
diff --git a/modules/lvs/manifests/configuration.pp 
b/modules/lvs/manifests/configuration.pp
index 346e05e..b78ad32 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -7,7 +7,7 @@
 'production' => $::site ? {
 'eqiad' => [ "lvs1001", "lvs1004" ],
 'codfw' => [ "lvs2001", "lvs2004" ],
-'esams' => [ "amslvs1", "amslvs3", "lvs3001", "lvs3003" ],
+'esams' => [ "lvs3001", "lvs3003" ],
 'ulsfo' => [ "lvs4001", "lvs4003" ],
 default => undef,
 },
@@ -21,7 +21,7 @@
 'production' => $::site ? {
 'eqiad' => [ "lvs1002", "lvs1005" ],
 'codfw' => [ "lvs2002", "lvs

[MediaWiki-commits] [Gerrit] Add app edit reports back to mobile report card - change (analytics/limn-mobile-data)

2014-09-02 Thread BearND (Code Review)

BearND has uploaded a new change for review.

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

Change subject: Add app edit reports back to mobile report card
..

Add app edit reports back to mobile report card

Change-Id: I3278586fb4709e0141504d9c93b235a3a3490f0c
---
M dashboards/reportcard.json
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data 
refs/changes/22/157822/1

diff --git a/dashboards/reportcard.json b/dashboards/reportcard.json
index 9bce056..2bda37a 100644
--- a/dashboards/reportcard.json
+++ b/dashboards/reportcard.json
@@ -44,6 +44,10 @@
 "app-edit-funnel-total",
 "app-edit-funnel-android",
 "app-edit-funnel-ios",
+"app-edits-starts",
+"app-edits-preview",
+"app-edits-save-attempt",
+"app-edits-success",
 "app-user-blocks-en"
 ]
 },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3278586fb4709e0141504d9c93b235a3a3490f0c
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: BearND 

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

[MediaWiki-commits] [Gerrit] shared.css: Limit .plainlinks styling to .external links - change (mediawiki/core)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: shared.css: Limit .plainlinks styling to .external links
..


shared.css: Limit .plainlinks styling to .external links

Overriding the background of all links on the page can have unexpected
results, for example causing the "Enlarge" icons under thumbnails to
disappear when the entire page is wrapped in .
https://en.wikipedia.org/wiki/Wikipedia:Wikipedia_Signpost/2014-08-27/In_the_media

Change-Id: I6fb15c5de39419993d37d9f5dd31ecb7ae6503fa
---
M resources/src/mediawiki.legacy/shared.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.legacy/shared.css 
b/resources/src/mediawiki.legacy/shared.css
index 67f7ca6..a3ad1e8 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -487,7 +487,7 @@
 
 /* Plainlinks - this can be used to switch
  * off special external link styling */
-.plainlinks a {
+.plainlinks a.external {
background: none !important;
padding: 0 !important;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fb15c5de39419993d37d9f5dd31ecb7ae6503fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Edit method and exception upon edit failures - change (mediawiki...api)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Edit method and exception upon edit failures
..


Edit method and exception upon edit failures

Implemented a Client#edit method that performs an additional check for
edit failures.

Change-Id: I22754b1b4c7cf20cec296e39611b9526c204d75c
---
M lib/mediawiki_api/client.rb
M lib/mediawiki_api/exceptions.rb
M spec/client_spec.rb
M spec/support/request_helpers.rb
4 files changed, 53 insertions(+), 10 deletions(-)

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



diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb
index 146e5c6..03784d9 100644
--- a/lib/mediawiki_api/client.rb
+++ b/lib/mediawiki_api/client.rb
@@ -40,7 +40,7 @@
   raise HttpError, response.status if response.status >= 400
 
   if response.headers.include?("mediawiki-api-error")
-raise ApiError.new(Response.new(response, ["error"]))
+raise ApiError, Response.new(response, ["error"])
   end
 
   Response.new(response, envelope)
@@ -66,13 +66,19 @@
 end
 
 def create_page(title, content)
-  action(:edit, title: title, text: content)
+  edit(title: title, text: content)
 end
 
 def delete_page(title, reason)
   action(:delete, title: title, reason: reason)
 end
 
+def edit(params = {})
+  response = action(:edit, params)
+  raise EditError, response if response.data["result"] == "Failure"
+  response
+end
+
 def get_wikitext(title)
   @conn.get "/w/index.php", { action: "raw", title: title }
 end
diff --git a/lib/mediawiki_api/exceptions.rb b/lib/mediawiki_api/exceptions.rb
index aec622c..571f95f 100644
--- a/lib/mediawiki_api/exceptions.rb
+++ b/lib/mediawiki_api/exceptions.rb
@@ -40,6 +40,12 @@
 end
   end
 
+  class EditError < ApiError
+def to_s
+  "check the response data for details"
+end
+  end
+
   class LoginError < StandardError
   end
 
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 3e7dc8b..760e830 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -206,17 +206,21 @@
   end
 
   describe "#create_page" do
+subject { client.create_page(title, text) }
+
+let(:title) { "Test" }
+let(:text) { "test123" }
+let(:response) { {} }
+
 before do
-  stub_request(:get, api_url).
-with(query: { format: "json", action: "tokens", type: "edit" }).
-to_return(body: { tokens: { edittoken: "t123" } }.to_json )
-  @edit_req = stub_request(:post, api_url).
-with(body: { format: "json", action: "edit", title: "Test", text: 
"test123", token: "t123" })
+  stub_token_request(:edit)
+  @edit_request = stub_action_request(:edit, title: title, text: text).
+to_return(body: response.to_json)
 end
 
-it "creates a page using an edit token" do
-  subject.create_page("Test", "test123")
-  expect(@edit_req).to have_been_requested
+it "makes the right request" do
+  subject
+  expect(@edit_request).to have_been_requested
 end
   end
 
@@ -237,6 +241,31 @@
 # evaluate results
   end
 
+  describe "#edit" do
+subject { client.edit(params) }
+
+let(:params) { {} }
+let(:response) { { edit: {} } }
+
+before do
+  stub_token_request(:edit)
+  @edit_request = stub_action_request(:edit).to_return(body: 
response.to_json)
+end
+
+it "makes the request" do
+  subject
+  expect(@edit_request).to have_been_requested
+end
+
+context "upon an edit failure" do
+  let(:response) { { edit: { result: "Failure" } } }
+
+  it "raises an EditError" do
+expect { subject }.to raise_error(MediawikiApi::EditError)
+  end
+end
+  end
+
   describe "#get_wikitext" do
 before do
   @get_req = stub_request(:get, index_url).with(query: { action: "raw", 
title: "Test" })
diff --git a/spec/support/request_helpers.rb b/spec/support/request_helpers.rb
index 5dcdf24..28f59c4 100644
--- a/spec/support/request_helpers.rb
+++ b/spec/support/request_helpers.rb
@@ -12,6 +12,8 @@
   end
 
   def stub_api_request(method, params)
+params = params.each.with_object({}) { |(k, v), p| p[k] = v.to_s }
+
 stub_request(method, api_url).
   with((method == :post ? :body : :query) => params.merge(format: "json"))
   end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22754b1b4c7cf20cec296e39611b9526c204d75c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/ruby/api
Gerrit-Branch: master
Gerrit-Owner: Dduvall 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Commons getting Cirrus as primary - change (operations/mediawiki-config)

2014-09-02 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Commons getting Cirrus as primary
..

Commons getting Cirrus as primary

Change-Id: If634e555c897158b3c67a62e5b72b97c67fc599a
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6189560..6369e62 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13534,7 +13534,6 @@
 
 'wmgUseCirrus' => array(
'default' => true,
-   'commonswiki' => false,
'dewiki' => false,
'enwiki' => false,
'eswiki' => false,

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

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

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

[MediaWiki-commits] [Gerrit] Commons getting Cirrus as primary - change (operations/mediawiki-config)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Commons getting Cirrus as primary
..


Commons getting Cirrus as primary

Change-Id: If634e555c897158b3c67a62e5b72b97c67fc599a
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6189560..6369e62 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13534,7 +13534,6 @@
 
 'wmgUseCirrus' => array(
'default' => true,
-   'commonswiki' => false,
'dewiki' => false,
'enwiki' => false,
'eswiki' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If634e555c897158b3c67a62e5b72b97c67fc599a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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 some flow events for funnel logging - change (mediawiki...UploadWizard)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Add some flow events for funnel logging
..


Add some flow events for funnel logging

Also track events for upload batch additions and errors seen in each
step.

Change-Id: I376e8b0a742ce69e7ff09e8de7705f6cc495ec5f
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/305
---
M UploadWizard.php
M UploadWizardHooks.php
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardUpload.js
M resources/mw.UploadWizardUploadInterface.js
M resources/uw.EventFlowLogger.js
M tests/qunit/uw.EventFlowLogger.test.js
7 files changed, 93 insertions(+), 19 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UploadWizard.php b/UploadWizard.php
index b393116..db9d8da 100644
--- a/UploadWizard.php
+++ b/UploadWizard.php
@@ -134,8 +134,6 @@
'position' => 'top'
 ) + $uploadWizardModuleInfo;
 
-$wgEventLoggingSchemas[ 'UploadWizardStep' ] = 8851805;
-
 // Campaign hook handlers
 $wgHooks[ 'BeforePageDisplay' ][] = 'CampaignHooks::onBeforePageDisplay';
 $wgHooks[ 'EditFilterMerged' ][] = 'CampaignHooks::onEditFilterMerged';
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index 3fb8b50..b43ff80 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -543,6 +543,11 @@
}
 
if ( class_exists( 'ResourceLoaderSchemaModule' ) ) {
+   $wgEventLoggingSchemas[ 'UploadWizardUploadActions' ] = 
5811620;
+   $wgEventLoggingSchemas[ 'UploadWizardStep' ] = 8851805;
+   $wgEventLoggingSchemas[ 'UploadWizardFlowEvent' ] = 
8851807;
+   $wgEventLoggingSchemas[ 'UploadWizardUploadFlowEvent' ] 
= 9609883;
+
$resourceLoader->register( 
'schema.UploadWizardTutorialActions', array(
'class' => 'ResourceLoaderSchemaModule',
'schema' => 
'UploadWizardTutorialActions',
@@ -551,14 +556,11 @@
 

self::$modules['ext.uploadWizard.events']['dependencies'] = array(
'ext.eventLogging',
-   'schema.UploadWizardTutorialActions',
);
 
self::$modules['uw.EventFlowLogger']['dependencies'] += 
array(
'ext.eventLogging',
-   'schema.UploadWizardStep',
);
-
}
 
foreach ( self::$modules as $name => $resources ) {
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index f509ce8..7187f9b 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -117,9 +117,11 @@
 
.on( 'flickr-ui-init', function () {
wizard.flickrInterfaceInit();
+   wizard.eventFlowLogger.logEvent( 
'flickr-upload-button-clicked' );
} )
 
.on( 'retry-uploads', function () {
+   wizard.eventFlowLogger.logEvent( 
'retry-uploads-button-clicked' );
wizard.ui.hideFileEndButtons();
wizard.startUploads();
} )
@@ -387,7 +389,8 @@
 if ( selectedStepName === 'file' && !this.currentStepName ) { // 
tutorial was skipped
 this.eventFlowLogger.logSkippedStep( 'tutorial' );
 }
-this.eventFlowLogger.logStep( selectedStepName );
+
+   this.eventFlowLogger.logStep( selectedStepName );
 
 this.currentStepName = selectedStepName;
 
@@ -441,16 +444,22 @@
}
 
upload = new mw.UploadWizardUpload( this, 
'#mwe-upwiz-filelist', providedFile, reservedIndex )
+   .on( 'file-changed', function ( files ) {
+   wizard.eventFlowLogger.logUploadEvent( 
'uploads-added', { quantity: files.length } );
+   } )
+
.on( 'filled', function () {
wizard.setUploadFilled( upload );
} );
+
this.uploadToAdd = upload;
 
// we explicitly move the file input to cover the upload button
upload.ui.moveFileInputToCover( '#mwe-upwiz-add-file', 'poll' );
 
// we bind to the ui div since unbind doesn't work for non-DOM 
objects
-   $( upload.ui.div ).bind( 'filenameAccepted', function(e) { 
wizard.updateFileCounts();  e.stopPropagation(); } );
+   $( upload.ui.div ).bind( 'filenameAccepted', function(e) { 
wizard.updateFileCounts(); e.stopPropagation(); } );
+
$( upload.ui.div ).bind( 'removeUploadEvent', function(e) { 
wizard.removeUpload( up

[MediaWiki-commits] [Gerrit] Bumping version number with recent source change - change (analytics/webstatscollector)

2014-09-02 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Bumping version number with recent source change
..

Bumping version number with recent source change

Change-Id: Ib42b060381367648f53d7afa455b4be5071b0094
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/webstatscollector 
refs/changes/25/157825/1

diff --git a/debian/changelog b/debian/changelog
index 012e01c..ef13efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+webstatscollector (0.3-1) precise-wikimedia; urgency=low
+
+  * Omit requests from ULSFO internal IPs.
+
+ -- Andrew Otto (WMF)   Thu, 28 Aug 2014 20:45:00 +
+
 webstatscollector (0.2-1) precise-wikimedia; urgency=low
 
   * Omit hits to Special:CentralAutoLogin/.* .

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib42b060381367648f53d7afa455b4be5071b0094
Gerrit-PatchSet: 1
Gerrit-Project: analytics/webstatscollector
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] Bumping version number with recent source change - change (analytics/webstatscollector)

2014-09-02 Thread QChris (Code Review)

QChris has submitted this change and it was merged.

Change subject: Bumping version number with recent source change
..


Bumping version number with recent source change

Change-Id: Ib42b060381367648f53d7afa455b4be5071b0094
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 012e01c..ef13efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+webstatscollector (0.3-1) precise-wikimedia; urgency=low
+
+  * Omit requests from ULSFO internal IPs.
+
+ -- Andrew Otto (WMF)   Thu, 28 Aug 2014 20:45:00 +
+
 webstatscollector (0.2-1) precise-wikimedia; urgency=low
 
   * Omit hits to Special:CentralAutoLogin/.* .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib42b060381367648f53d7afa455b4be5071b0094
Gerrit-PatchSet: 1
Gerrit-Project: analytics/webstatscollector
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: QChris 
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 wikitech config. - change (operations/mediawiki-config)

2014-09-02 Thread Chad (Code Review)

Chad has submitted this change and it was merged.

Change subject: Add wikitech config.
..


Add wikitech config.

bug: 68751
bug: 62496
Change-Id: I2b9322c6dbb43375c420c064e20a129df5a7cfaf
---
M all.dblist
A docroot/bits/favicon/wikitech.ico
M echowikis.dblist
M multiversion/MWMultiVersion.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/db-eqiad.php
A wmf-config/extension-list-wikitech
A wmf-config/wikitech.php
9 files changed, 233 insertions(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Andrew Bogott: Looks good to me, approved
  Aude: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/all.dblist b/all.dblist
index 8f28176..22be61e 100644
--- a/all.dblist
+++ b/all.dblist
@@ -428,6 +428,7 @@
 kywikibooks
 kywikiquote
 kywiktionary
+labswiki
 ladwiki
 lawiki
 lawikibooks
diff --git a/docroot/bits/favicon/wikitech.ico 
b/docroot/bits/favicon/wikitech.ico
new file mode 100644
index 000..962750c
--- /dev/null
+++ b/docroot/bits/favicon/wikitech.ico
Binary files differ
diff --git a/echowikis.dblist b/echowikis.dblist
index bbdddcc..090a085 100644
--- a/echowikis.dblist
+++ b/echowikis.dblist
@@ -428,6 +428,7 @@
 kywikibooks
 kywikiquote
 kywiktionary
+labswiki
 ladwiki
 lawiki
 lawikibooks
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 27a3392..09b2378 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -141,6 +141,7 @@
'www.mediawiki.org' => 'mediawiki',
'www.wikidata.org' => 'wikidata',
'wikisource.org' => 'sources',
+   'wikitech.wikimedia.org' => 'labswiki',
);
 
$site = "wikipedia";
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e9dfab4..28baad5 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2613,6 +2613,9 @@
 // might be build as "aawikibooks" or something that does not have Wikibase.
 $wgExtensionEntryPointListFiles[] = 
"$IP/extensions/Wikidata/extension-list-wikidata";
 
+// Tell localization cache builder about extensions used in wikitech
+$wgExtensionEntryPointListFiles[] = "$wmfConfigDir/extension-list-wikitech";
+
 if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
if ( $wmgUseWikibaseRepo && $wmfRealm === 'labs' ) {
// enable on beta only
@@ -2622,6 +2625,11 @@
include( "$wmfConfigDir/Wikibase.php" );
 }
 
+if ( $wgDBname == 'labswiki' ) {
+   // A zillion wikitech-specific settings
+   include( "$wmfConfigDir/wikitech.php" );
+}
+
 // put this here to ensure it is available for localisation cache rebuild
 $wgWBClientSettings['repoSiteName'] = 'wikibase-repo-name';
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6369e62..5ede01b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -556,6 +556,7 @@
'kwwiki' => '$stdlogo',
'kywiki' => 
'//upload.wikimedia.org/wikipedia/commons/3/3c/Wikipedia-logo-v2-ky.png', // 
bug 46589
'lawiki' => '$stdlogo',
+   'labswiki' => 
"https://wikitech.wikimedia.org/w/images/thumb/6/60/Wikimedia_labs_logo.svg/120px-Wikimedia_labs_logo.svg.png";,
'ladwiki' => '$stdlogo',
'lbwiki' => 
'//upload.wikimedia.org/wikipedia/commons/9/9f/Wikipedia-logo-v2-lb.png',
'lbewiki' => 
'//upload.wikimedia.org/wikipedia/commons/9/95/Wikipedia-logo-v2-lbe.png', // 
bug 40285
@@ -1251,6 +1252,7 @@
'iegcomwiki' => '//iegcom.wikimedia.org',
'incubatorwiki' => '//incubator.wikimedia.org',
'internalwiki' => '//internal.wikimedia.org',
+   'labswiki' => "https://wikitech.wikimedia.org";,
'legalteamwiki' => '//legalteam.wikimedia.org',
'loginwiki' => '//login.wikimedia.org',
'mediawikiwiki' => '//www.mediawiki.org',
@@ -1623,6 +1625,7 @@
'kowiktionary' => '위키낱말사전',
'krcwiki'  => 'Википедия',
'kuwiki' => 'Wîkîpediya',
+   'labswiki' => 'Wikitech',
'lawiki' => 'Vicipaedia',
'lawikibooks' => 'Vicilibri',
'lawikiquote' => 'Vicicitatio',
@@ -1837,6 +1840,7 @@
 'execwiki' => '/mnt/upload7/private/execwiki',
 'transitionteamwiki' => '/mnt/upload7/private/transitionteamwiki',
 'iegcomwiki' => '/mnt/upload7/private/iegcomwiki',
+'labswiki' => '/srv/org/wikimedia/controller/wikis/images',
 ),
 
 'wgImgAuthUrlPathMap' => array(
@@ -3646,6 +3650,7 @@
'+grantswiki' => array( 0 => 1, 6 => 0, 8 => 0, 10 => 0 ),
'+incubatorwiki' => array( 0 => 1, 6 => 0, 14 => 1 ),
'+internalwiki' => array( 0 => 1, 6 => 0, 8 => 0, 10 => 0 ),
+   '+labswiki' => array( 0 => 1, 110 => 1, 112 => 1, 113 => 1, 498 => 1 ),
'+legalteamwiki'

[MediaWiki-commits] [Gerrit] hhvm: do not autoupdate packages - change (operations/puppet)

2014-09-02 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: hhvm: do not autoupdate packages
..

hhvm: do not autoupdate packages

HHVM state is stable and mature enough; we don't need to immediately
apply the latest package version anymore.

Change-Id: I9aae1aad40b7a7193b19a84c3e34465ecacdb760
Signed-off-by: Giuseppe Lavagetto 
---
M modules/hhvm/manifests/init.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/157826/1

diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 1ed8f07..5591360 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -169,12 +169,12 @@
 ## Packages
 
 package { [ 'hhvm', 'hhvm-dbg' ]:
-ensure => latest,
+ensure => present,
 before => Service['hhvm'],
 }
 
 package { [ 'hhvm-fss', 'hhvm-luasandbox', 'hhvm-wikidiff2' ]:
-ensure => latest,
+ensure => present,
 before => Service['hhvm'],
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aae1aad40b7a7193b19a84c3e34465ecacdb760
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Puppet LVS cleanup - change (operations/puppet)

2014-09-02 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Puppet LVS cleanup
..

Puppet LVS cleanup

Remove outdated pmtpa LVS and associated IPs (all confirmed dead)
Remove payments LVS stuff (dead pmpta + eqiad stuff,
  replaced by pay-lvs on frack puppet)
Re-order and comment bgp peer addrs

Change-Id: I13edf9aa880f8e390de517071c85566c30a2a18c
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 10 insertions(+), 38 deletions(-)


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

diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index f1c1110..0209790 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -28,7 +28,6 @@
 ],
 /^(lvs100[25])$/ => [
 $sip['upload'][$::site],
-$sip['payments'][$::site],
 $sip['dns_rec'][$::site],
 $sip['osm'][$::site],
 $sip['misc_web'][$::site],
@@ -73,7 +72,7 @@
 site => $::site
 }
 
-if $::site in ['pmtpa', 'eqiad'] {
+if $::site in ['eqiad'] {
 include ::lvs::balancer::runcommand
 }
 
diff --git a/modules/lvs/manifests/configuration.pp 
b/modules/lvs/manifests/configuration.pp
index b78ad32..ff75089 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -71,16 +71,14 @@
 $pybal = {
 'bgp' => "yes",
 'bgp-peer-address' => $hostname ? {
-/^lvs[1-3]$/ => "208.80.152.197",
-/^lvs[4-6]$/ => "208.80.152.196",
-/^lvs100[1-3]$/ => "208.80.154.196",
-/^lvs100[4-6]$/ => "208.80.154.197",
+/^lvs100[1-3]$/ => "208.80.154.196", # cr1-eqiad
+/^lvs100[4-6]$/ => "208.80.154.197", # cr2-eqiad
 /^lvs200[1-3]$/ => "208.80.153.192", # cr1-codfw
 /^lvs200[4-6]$/ => "208.80.153.193", # cr2-codfw
-/^lvs400[12]$/ => "198.35.26.192",
-/^lvs400[34]$/ => "198.35.26.193",
-/^lvs300[12]$/ => "91.198.174.245",
-/^lvs300[34]$/ => "91.198.174.246",
+/^lvs300[12]$/ => "91.198.174.245",  # cr1-esams
+/^lvs300[34]$/ => "91.198.174.246",  # cr2-knams
+/^lvs400[12]$/ => "198.35.26.192",   # cr1-ulsfo
+/^lvs400[34]$/ => "198.35.26.193",   # cr2-ulsfo
 default => "(unspecified)"
 },
 'bgp-nexthop-ipv4' => $::ipaddress_eth0,
@@ -221,10 +219,6 @@
 'esams' => { 'uploadlb' => '91.198.174.208', 'uploadlb6' => 
'2620:0:862:ed1a::2:b', 'uploadsvc' => '10.2.3.24' },
 'ulsfo' => { 'uploadlb' => '198.35.26.112', 'uploadlb6' => 
'2620:0:863:ed1a::2:b' },
 },
-'payments' => {
-'pmtpa' => "208.80.152.213",
-'eqiad' => {},
-},
 'apaches' => {
 'eqiad' => "10.2.2.1",
 },
@@ -261,7 +255,6 @@
 'ulsfo' => { 'mobilelb' => '198.35.26.108', 'mobilelb6' => 
'2620:0:863:ed1a::1:c', 'mobilesvc' => '10.2.4.26'},
 },
 'swift' => {
-'pmtpa' => "10.2.1.27",
 'eqiad' => "10.2.2.27",
 },
 'dns_auth' => {
@@ -269,15 +262,12 @@
 'eqiad' => "208.80.154.238",
 },
 'dns_rec' => {
-'pmtpa' => { 'dns_rec' => "208.80.152.215", 'dns_rec6' => 
"2620:0:860:ed1a::f" },
 'eqiad' => { 'dns_rec' => "208.80.154.239", 'dns_rec6' => 
"2620:0:861:ed1a::f" },
 },
 'osm' => {
-'pmtpa' => "208.80.152.216",
 'eqiad' => "208.80.154.244",
 },
 'misc_web' => {
-'pmtpa' => { 'misc_web' => '208.80.152.217', 'misc_web6' => 
'2620:0:860:ed1a::11' },
 'eqiad' => { 'misc_web' => '208.80.154.241', 'misc_web6' => 
'2620:0:861:ed1a::11' },
 },
 'parsoid' => {
@@ -342,7 +332,6 @@
 'eqiad' => '10.68.16.189',  # deployment-upload.eqiad.wmflabs
 'pmtpa' => '10.4.1.103',  # deployment-upload.pmtpa.wmflabs
 },
-'payments' => {},
 'upload' => {
 'pmtpa' => {
 'uploadlb'  => [ '10.4.0.166', '10.4.0.187', ],
@@ -605,26 +594,10 @@
 'IdleConnection' => $idleconnection_monitor_options
 },
 },
-"payments" => {
-'description' => "Payments cluster, HTTPS payments.wikimedia.org",
-'class' => "high-traffic2",
-'sites' => [ "pmtpa" ],
-'ip' => $service_ips['payments'][$::site],
-'port' => 443,
-'scheduler' => 'sh',
-'bgp' => "yes",
-'depool-threshold' => ".5",
-'monitors' => {
-'ProxyFetch' =>

[MediaWiki-commits] [Gerrit] hhvm: do not autoupdate packages - change (operations/puppet)

2014-09-02 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: hhvm: do not autoupdate packages
..


hhvm: do not autoupdate packages

HHVM state is stable and mature enough; we don't need to immediately
apply the latest package version anymore.

Change-Id: I9aae1aad40b7a7193b19a84c3e34465ecacdb760
Signed-off-by: Giuseppe Lavagetto 
---
M modules/hhvm/manifests/init.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 1ed8f07..5591360 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -169,12 +169,12 @@
 ## Packages
 
 package { [ 'hhvm', 'hhvm-dbg' ]:
-ensure => latest,
+ensure => present,
 before => Service['hhvm'],
 }
 
 package { [ 'hhvm-fss', 'hhvm-luasandbox', 'hhvm-wikidiff2' ]:
-ensure => latest,
+ensure => present,
 before => Service['hhvm'],
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Reorder extensions in an attempt to avoid dependency errors. - change (operations/mediawiki-config)

2014-09-02 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Reorder extensions in an attempt to avoid dependency errors.
..

Reorder extensions in an attempt to avoid dependency errors.

Change-Id: I6b21d0a5cddc2b275bd872911f096d9c0329dcc2
---
M wmf-config/extension-list-wikitech
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/extension-list-wikitech 
b/wmf-config/extension-list-wikitech
index ae245a1..7c58eb2 100644
--- a/wmf-config/extension-list-wikitech
+++ b/wmf-config/extension-list-wikitech
@@ -2,7 +2,7 @@
 $IP/extensions/LdapAuthentication/LdapAuthentication.php
 $IP/extensions/OATHAuth/OATHAuth.php
 $IP/extensions/OpenStackManager/OpenStackManager.php
-$IP/extensions/SemanticForms/SemanticForms.php
-$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php
-$IP/extensions/SemanticResultFormats/SemanticResultFormats.php
 $IP/extensions/Validator/Validator.php
+$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php
+$IP/extensions/SemanticForms/SemanticForms.php
+$IP/extensions/SemanticResultFormats/SemanticResultFormats.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b21d0a5cddc2b275bd872911f096d9c0329dcc2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Ensure the browser test environment is set up - change (mediawiki...GettingStarted)

2014-09-02 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Ensure the browser test environment is set up
..

Ensure the browser test environment is set up

ENV['MEDIAWIKI_PASSWORD'], which is required in the first step of the
"User sees modal call to action after registration" scenario, is only
set if the login hook is fired.

Change-Id: I9dad281fdc7e1d094b536f53996fbcc2688429bb
---
M tests/browser/features/modal_on_editable_returnto.feature
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/modal_on_editable_returnto.feature 
b/tests/browser/features/modal_on_editable_returnto.feature
index 17927c2..8e7abe9 100644
--- a/tests/browser/features/modal_on_editable_returnto.feature
+++ b/tests/browser/features/modal_on_editable_returnto.feature
@@ -1,4 +1,4 @@
-@en.wikipedia.beta.wmflabs.org @firefox
+@en.wikipedia.beta.wmflabs.org @firefox @login
 Feature: Modal on editable returnto page
 
Scenario: User sees modal call to action after registration

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dad281fdc7e1d094b536f53996fbcc2688429bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Phuedx 

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

[MediaWiki-commits] [Gerrit] Reorder extensions in an attempt to avoid dependency errors. - change (operations/mediawiki-config)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Reorder extensions in an attempt to avoid dependency errors.
..


Reorder extensions in an attempt to avoid dependency errors.

Change-Id: I6b21d0a5cddc2b275bd872911f096d9c0329dcc2
---
M wmf-config/extension-list-wikitech
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/extension-list-wikitech 
b/wmf-config/extension-list-wikitech
index ae245a1..7c58eb2 100644
--- a/wmf-config/extension-list-wikitech
+++ b/wmf-config/extension-list-wikitech
@@ -2,7 +2,7 @@
 $IP/extensions/LdapAuthentication/LdapAuthentication.php
 $IP/extensions/OATHAuth/OATHAuth.php
 $IP/extensions/OpenStackManager/OpenStackManager.php
-$IP/extensions/SemanticForms/SemanticForms.php
-$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php
-$IP/extensions/SemanticResultFormats/SemanticResultFormats.php
 $IP/extensions/Validator/Validator.php
+$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php
+$IP/extensions/SemanticForms/SemanticForms.php
+$IP/extensions/SemanticResultFormats/SemanticResultFormats.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b21d0a5cddc2b275bd872911f096d9c0329dcc2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove most amslvs[1-4] references - change (operations/puppet)

2014-09-02 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Remove most amslvs[1-4] references
..


Remove most amslvs[1-4] references

Change-Id: I86aa8c79711a28404a7c8e2bfbd06255f70cd630
---
M manifests/ganglia.pp
M manifests/role/lvs.pp
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/lvs/manifests/configuration.pp
5 files changed, 19 insertions(+), 29 deletions(-)

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



diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index d30d653..7544985 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -323,7 +323,7 @@
 'Swift eqiad'=> 'ms-fe1001.eqiad.wmnet 
ms-fe1002.eqiad.wmnet',
 'Search eqiad'   => 
'search1001.eqiad.wmnet search1002.eqiad.wmnet',
 'Bits caches esams'  => 
'hooft.esams.wikimedia.org:11670 cp3019.esams.wikimedia.org 
cp3020.esams.wikimedia.org',
-'LVS loadbalancers esams'=> 
'hooft.esams.wikimedia.org:11651 amslvs1.esams.wikimedia.org 
amslvs2.esams.wikimedia.org',
+'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',
 'Memcached eqiad'=> 'mc1001.eqiad.wmnet 
mc1002.eqiad.wmnet',
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 2566599..f1c1110 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -20,13 +20,11 @@
 $sip = $lvs::configuration::lvs_service_ips[$::realm]
 
 $lvs_balancer_ips = $::hostname ? {
-/^(lvs300[13]|amslvs[13]|lvs100[14]|lvs400[13])$/ => [
+# eqiad
+/^(lvs100[14])$/ => [
 $sip['text'][$::site],
 $sip['bits'][$::site],
 $sip['mobile'][$::site],
-],
-/^(lvs300[24]|amslvs[24]|lvs400[24])$/ => [
-$sip['upload'][$::site],
 ],
 /^(lvs100[25])$/ => [
 $sip['upload'][$::site],
@@ -53,6 +51,16 @@
 $sip['parsoid'][$::site],
 $sip['search'][$::site],
 ],
+
+# esams + ulsfo
+/^(lvs[34]00[13])$/ => [
+$sip['text'][$::site],
+$sip['bits'][$::site],
+$sip['mobile'][$::site],
+],
+/^(lvs[34]00[24])$/ => [
+$sip['upload'][$::site],
+],
 }
 
 include standard
diff --git a/manifests/site.pp b/manifests/site.pp
index ecdfbc2..a8012d3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -57,30 +57,13 @@
 
 # Node definitions (alphabetic order)
 
+# To be decommissioned/reused, not presently serving traffic
 node /^amslvs[1-4]\.esams\.wikimedia\.org$/ {
 include admin
-
-if $::hostname =~ /^amslvs[12]$/ {
-$ganglia_aggregator = true
-}
-
-$cluster = 'lvs'
-include role::lvs::balancer
-include role::diamond
 
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
-
-# Make sure GRO is off
-interface::offload { 'eth0 gro':
-interface => 'eth0',
-setting   => 'gro',
-value => 'off',
-}
-
-# RPS/RSS config for interface performance
-interface::rps { 'eth0': rss_pattern => 'eth0-%d' }
 }
 
 # amssq31-62 are text varnish (and the only nodes with this legacy prefix)
diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 7d297d0..e42b717 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -47,7 +47,6 @@
esac; \
\
case $(debconf-get netcfg/get_hostname) in \
-   amslvs*) echo partman/raid1-squid.cfg ;; \
amssq3[1-9]|amssq4[0-9]|amssq[56][0-9]) echo 
partman/raid1-varnish.cfg ;; \
amssq*|sq[6][7-9]|sq70) echo partman/raid1-squid.cfg ;; \
analytics100[1-9]) echo partman/analytics-cisco.cfg ;; \
diff --git a/modules/lvs/manifests/configuration.pp 
b/modules/lvs/manifests/configuration.pp
index 346e05e..b78ad32 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -7,7 +7,7 @@
 'production' => $::site ? {
 'eqiad' => [ "lvs1001", "lvs1004" ],
 'codfw' => [ "lvs2001", "lvs2004" ],
-'esams' => [ "amslvs1", "amslvs3", "lvs3001", "lvs3003" ],
+'esams' => [ "lvs3001", "lvs3003" ],
 'ulsfo' => [ "lvs4001", "lvs4003" ],
 default => undef,
 },
@@ -21,7 +21,7 @@

[MediaWiki-commits] [Gerrit] Move CiteThisPage to extension-list-labs - change (operations/mediawiki-config)

2014-09-02 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Move CiteThisPage to extension-list-labs
..

Move CiteThisPage to extension-list-labs

Change-Id: I4f6cc155ae689e1e0ec3defbe5011285d97206ca
---
M wmf-config/extension-list
M wmf-config/extension-list-labs
2 files changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 8970f4d..66691b4 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -15,7 +15,6 @@
 $IP/extensions/CirrusSearch/CirrusSearch.php
 $IP/extensions/Cite/Cite.php
 $IP/extensions/Cite/SpecialCite.php
-$IP/extensions/CiteThisPage/CiteThisPage.php
 $IP/extensions/cldr/cldr.php
 $IP/extensions/CleanChanges/CleanChanges.php
 $IP/extensions/CodeEditor/CodeEditor.php
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 7624659..087aef9 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,4 +1,5 @@
 $IP/extensions/BounceHandler/BounceHandler.php
+$IP/extensions/CiteThisPage/CiteThisPage.php
 $IP/extensions/GlobalCssJs/GlobalCssJs.php
 $IP/extensions/ContentTranslation/ContentTranslation.php
 $IP/extensions/FundraisingTranslateWorkflow/FundraisingTranslateWorkflow.php

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

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

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

[MediaWiki-commits] [Gerrit] Alphasort extension-list-labs - change (operations/mediawiki-config)

2014-09-02 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Alphasort extension-list-labs
..

Alphasort extension-list-labs

$ocd++;

Change-Id: I1029e7f26a0f4f6504647af076c440851d9eeca4
---
M wmf-config/extension-list-labs
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 087aef9..e76b982 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,7 +1,7 @@
 $IP/extensions/BounceHandler/BounceHandler.php
 $IP/extensions/CiteThisPage/CiteThisPage.php
-$IP/extensions/GlobalCssJs/GlobalCssJs.php
 $IP/extensions/ContentTranslation/ContentTranslation.php
 $IP/extensions/FundraisingTranslateWorkflow/FundraisingTranslateWorkflow.php
+$IP/extensions/GlobalCssJs/GlobalCssJs.php
 $IP/skins/MonoBook/MonoBook.php
 $IP/skins/Vector/Vector.php

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

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

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

[MediaWiki-commits] [Gerrit] beta: use HHVM for all requests - change (operations/puppet)

2014-09-02 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: beta: use HHVM for all requests
..

beta: use HHVM for all requests

We want to serve all php requests through HHVM in beta (where we default
to trusty now). So we introduce two new functions that can be used in
templates:

* mw_hhvm_proxy() that outputs the apache config to proxy the standard
  mediawiki requests to HHVM
* mw_hhvm_catchall() which outputs an apache snippet proxying all PHP
  and hack files to HHVM

Change-Id: I46c1439e7e7705c432002ab0ec5ef9767f89f748
Signed-off-by: Giuseppe Lavagetto 
---
A modules/mediawiki/lib/puppet/parser/functions/mw_hhvm_catchall.rb
A modules/mediawiki/lib/puppet/parser/functions/mw_hhvm_proxy.rb
M modules/mediawiki/manifests/web/beta_sites.pp
R modules/mediawiki/templates/apache/beta/sites/www.wikipedia.conf.erb
4 files changed, 182 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/157823/3

diff --git a/modules/mediawiki/lib/puppet/parser/functions/mw_hhvm_catchall.rb 
b/modules/mediawiki/lib/puppet/parser/functions/mw_hhvm_catchall.rb
new file mode 100644
index 000..370db37
--- /dev/null
+++ b/modules/mediawiki/lib/puppet/parser/functions/mw_hhvm_catchall.rb
@@ -0,0 +1,90 @@
+# == Function: mw_hhvm_catchall
+#
+# === Description
+#
+# Outputs the apache configuration directives that set up proxying of
+# most requests to the HHVM backend.
+#
+# === Arguments
+#
+# Takes two optional arguments:
+#
+# - The HHVM server host (defaults to 127.0.0.1)
+# - The HHVM server port (defaults to 9000)
+#
+# Whenever called, this function will output a string that can be
+# directly used in your template
+#
+# == Examples
+#
+# mw_hhvm_catchall()
+#
+# == License
+#
+# Author: Giuseppe Lavagetto
+# Copyright 2014 Wikimedia Foundation
+#
+# 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 3 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, see .
+#
+
+require 'puppet/util/package'
+
+module Puppet::Parser::Functions
+  newfunction(
+  :mw_hhvm_catchall,
+  :type => :rvalue,
+  :doc => <<-END
+Outputs the apache configuration for proxying all PHP files to HHVM.
+Function parameters are:
+
+ hhvm_host - the HHVM fastcgi server host
+ hhvm_port - the HHVM fastcgi server port
+
+Examples:
+
+   mw_hhvm_catchall() # sets up proxying to fcgi://127.0.0.1:9000
+END
+  ) do |args|
+if args.length > 2
+  raise Puppet::ParseError, 'mw_hhvm_catchall() takes at most 2 arguments'
+end
+
+if args.length >= 1
+  hhvm_host = args.shift
+else
+  hhvm_host = '127.0.0.1'
+end
+
+if args.length == 1
+  hhvm_port = args.shift
+else
+  hhvm_port = '9000'
+end
+
+hhvm_host_port = [hhvm_host, hhvm_port].join(':')
+
+return <<-VHOST
+
+RewriteEngine On
+# Execute all PHP and Hack files via HHVM
+
+RewriteRule ^(.*)$ fcgi://#{hhvm_host_port}$1 [P]
+
+
+
+php_admin_flag engine on
+
+VHOST
+  end
+end
diff --git a/modules/mediawiki/lib/puppet/parser/functions/mw_hhvm_proxy.rb 
b/modules/mediawiki/lib/puppet/parser/functions/mw_hhvm_proxy.rb
new file mode 100644
index 000..15e2049
--- /dev/null
+++ b/modules/mediawiki/lib/puppet/parser/functions/mw_hhvm_proxy.rb
@@ -0,0 +1,89 @@
+# == Function: mw_hhvm_proxy
+#
+# === Description
+#
+# Outputs the apache configuration directives that set up proxying of
+# most requests to the HHVM backend.
+#
+# === Arguments
+#
+# Takes three arguments:
+#
+# - The document root of the current VirtualHost stanza
+# - The HHVM server host (defaults to localhost)
+# - The HHVM server port (defaults to 9000)
+#
+# Whenever called, this function will output a string that can be
+# directly used in your template
+#
+# == Examples
+#
+# mw_hhvm_proxy('/var/www')
+#
+# == License
+#
+# Author: Giuseppe Lavagetto
+# Copyright 2014 Wikimedia Foundation
+#
+# 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 3 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 war

[MediaWiki-commits] [Gerrit] Move CiteThisPage to extension-list-labs - change (operations/mediawiki-config)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Move CiteThisPage to extension-list-labs
..


Move CiteThisPage to extension-list-labs

Change-Id: I4f6cc155ae689e1e0ec3defbe5011285d97206ca
---
M wmf-config/extension-list
M wmf-config/extension-list-labs
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 8970f4d..66691b4 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -15,7 +15,6 @@
 $IP/extensions/CirrusSearch/CirrusSearch.php
 $IP/extensions/Cite/Cite.php
 $IP/extensions/Cite/SpecialCite.php
-$IP/extensions/CiteThisPage/CiteThisPage.php
 $IP/extensions/cldr/cldr.php
 $IP/extensions/CleanChanges/CleanChanges.php
 $IP/extensions/CodeEditor/CodeEditor.php
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 7624659..087aef9 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,4 +1,5 @@
 $IP/extensions/BounceHandler/BounceHandler.php
+$IP/extensions/CiteThisPage/CiteThisPage.php
 $IP/extensions/GlobalCssJs/GlobalCssJs.php
 $IP/extensions/ContentTranslation/ContentTranslation.php
 $IP/extensions/FundraisingTranslateWorkflow/FundraisingTranslateWorkflow.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f6cc155ae689e1e0ec3defbe5011285d97206ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Andrew Bogott 
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 CiteThisPage - change (mediawiki/core)

2014-09-02 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Add CiteThisPage
..

Add CiteThisPage

Change-Id: I161eb5a52d2087482fbf6b3280599741e4c4cf7a
---
M .gitmodules
A extensions/CiteThisPage
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/157832/1

diff --git a/.gitmodules b/.gitmodules
index b14d8df..b86c60a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -478,3 +478,6 @@
 [submodule "vendor"]
path = vendor
url = https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git
+[submodule "extensions/CiteThisPage"]
+   path = extensions/CiteThisPage
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CiteThisPage.git
diff --git a/extensions/CiteThisPage b/extensions/CiteThisPage
new file mode 16
index 000..7c705db
--- /dev/null
+++ b/extensions/CiteThisPage
+Subproject commit 7c705dbac3ad2f37e0810e2aae970bead0d5681a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I161eb5a52d2087482fbf6b3280599741e4c4cf7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf18
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Fix variable access deprecation warning - change (operations...jmxtrans)

2014-09-02 Thread Plucas (Code Review)

Plucas has uploaded a new change for review.

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

Change subject: Fix variable access deprecation warning
..

Fix variable access deprecation warning

Change-Id: I9f833144650cfc60b6956470032db30d311ff6a3
---
M templates/jmxtrans.json.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/jmxtrans 
refs/changes/33/157833/1

diff --git a/templates/jmxtrans.json.erb b/templates/jmxtrans.json.erb
index 7ec9bc0..3bad337 100644
--- a/templates/jmxtrans.json.erb
+++ b/templates/jmxtrans.json.erb
@@ -1,5 +1,5 @@
 <%
-(jmx_host, jmx_port) = jmx.split(':')
+(jmx_host, jmx_port) = @jmx.split(':')
 # if an attribute has these settings, they will be added to any
 # Ganglia output writter settings.
 valid_ganglia_settings = ['slope', 'units', 'tmax', 'dmax', 'sendMetadata']

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f833144650cfc60b6956470032db30d311ff6a3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/jmxtrans
Gerrit-Branch: master
Gerrit-Owner: Plucas 

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

[MediaWiki-commits] [Gerrit] Add CiteThisPage - change (mediawiki/core)

2014-09-02 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Add CiteThisPage
..

Add CiteThisPage

Change-Id: I2334cdd9b6c18b52e263a2553a4ae93e62f29ac2
---
M .gitmodules
A extensions/CiteThisPage
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/157834/1

diff --git a/.gitmodules b/.gitmodules
index b14d8df..b86c60a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -478,3 +478,6 @@
 [submodule "vendor"]
path = vendor
url = https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git
+[submodule "extensions/CiteThisPage"]
+   path = extensions/CiteThisPage
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CiteThisPage.git
diff --git a/extensions/CiteThisPage b/extensions/CiteThisPage
new file mode 16
index 000..7c705db
--- /dev/null
+++ b/extensions/CiteThisPage
+Subproject commit 7c705dbac3ad2f37e0810e2aae970bead0d5681a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2334cdd9b6c18b52e263a2553a4ae93e62f29ac2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf19
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Do not load SMW for l10n in beta - change (operations/mediawiki-config)

2014-09-02 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: Do not load SMW for l10n in beta
..

Do not load SMW for l10n in beta

In production we used pinned branches for SMW components vs beta's use
of master. This caused problems with the l10n build and SMW is not used
in beta.

Change-Id: I7380e90b20be1b2c3dfcd48b97371295f5c85125
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 28baad5..0fa6918 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2613,9 +2613,6 @@
 // might be build as "aawikibooks" or something that does not have Wikibase.
 $wgExtensionEntryPointListFiles[] = 
"$IP/extensions/Wikidata/extension-list-wikidata";
 
-// Tell localization cache builder about extensions used in wikitech
-$wgExtensionEntryPointListFiles[] = "$wmfConfigDir/extension-list-wikitech";
-
 if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
if ( $wmgUseWikibaseRepo && $wmfRealm === 'labs' ) {
// enable on beta only
@@ -2625,6 +2622,12 @@
include( "$wmfConfigDir/Wikibase.php" );
 }
 
+// Do not attempt to load SMW for l10n in beta.
+if ( $wmfRealm != 'labs' ) {
+   // Tell localization cache builder about extensions used in wikitech
+   $wgExtensionEntryPointListFiles[] = 
"$wmfConfigDir/extension-list-wikitech";
+}
+
 if ( $wgDBname == 'labswiki' ) {
// A zillion wikitech-specific settings
include( "$wmfConfigDir/wikitech.php" );

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

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

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

[MediaWiki-commits] [Gerrit] Do not load SMW for l10n in beta - change (operations/mediawiki-config)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Do not load SMW for l10n in beta
..


Do not load SMW for l10n in beta

In production we used pinned branches for SMW components vs beta's use
of master. This caused problems with the l10n build and SMW is not used
in beta.

Change-Id: I7380e90b20be1b2c3dfcd48b97371295f5c85125
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 28baad5..0fa6918 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2613,9 +2613,6 @@
 // might be build as "aawikibooks" or something that does not have Wikibase.
 $wgExtensionEntryPointListFiles[] = 
"$IP/extensions/Wikidata/extension-list-wikidata";
 
-// Tell localization cache builder about extensions used in wikitech
-$wgExtensionEntryPointListFiles[] = "$wmfConfigDir/extension-list-wikitech";
-
 if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
if ( $wmgUseWikibaseRepo && $wmfRealm === 'labs' ) {
// enable on beta only
@@ -2625,6 +2622,12 @@
include( "$wmfConfigDir/Wikibase.php" );
 }
 
+// Do not attempt to load SMW for l10n in beta.
+if ( $wmfRealm != 'labs' ) {
+   // Tell localization cache builder about extensions used in wikitech
+   $wgExtensionEntryPointListFiles[] = 
"$wmfConfigDir/extension-list-wikitech";
+}
+
 if ( $wgDBname == 'labswiki' ) {
// A zillion wikitech-specific settings
include( "$wmfConfigDir/wikitech.php" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7380e90b20be1b2c3dfcd48b97371295f5c85125
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Reedy 
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 temporary virt1000.wikimedia.org.erb for wikitech migrat... - change (operations/puppet)

2014-09-02 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Add temporary virt1000.wikimedia.org.erb for wikitech migration 
to multiversion
..


Add temporary virt1000.wikimedia.org.erb for wikitech migration to multiversion

Change-Id: Idbac6bf7802e0dcd69c8602fd9e350791a3722d7
---
M manifests/site.pp
A templates/apache/sites/virt1000.wikimedia.org.erb
2 files changed, 96 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a8012d3..2281f0c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2940,6 +2940,12 @@
 include role::deployment::salt_masters::labs
 if $use_neutron == true {
 include role::neutron::controller
+
+}
+
+# temporary for Wikitech migration to multiversion
+apache::site { 'virt1000.wikimedia.org':
+content => template("apache/sites/virt1000.wikimedia.org.erb"),
 }
 }
 
diff --git a/templates/apache/sites/virt1000.wikimedia.org.erb 
b/templates/apache/sites/virt1000.wikimedia.org.erb
new file mode 100644
index 000..463cba1
--- /dev/null
+++ b/templates/apache/sites/virt1000.wikimedia.org.erb
@@ -0,0 +1,90 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+### puppet:///templates/apache/sites/virt1000.wikimedia.org
+#
+# vim: filetype=apache
+
+
+ServerAdmin n...@wikimedia.org
+ServerName virt1000.wikimedia.org
+
+DocumentRoot /usr/local/apache/common/docroot/wikimedia.org
+
+Options FollowSymLinks
+AllowOverride None
+
+
+Options Indexes FollowSymLinks MultiViews
+AllowOverride None
+Order allow,deny
+allow from all
+
+
+RewriteEngine on
+RewriteCond %{SERVER_PORT} !^443$
+RewriteRule ^/(.*)$ https://virt1000.wikimedia.org/$1 [L,R]
+
+ErrorLog /var/log/apache2/error.log
+
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+LogLevel warn
+
+CustomLog /var/log/apache2/access.log combined
+ServerSignature Off
+
+
+
+ServerAdmin n...@wikimedia.org
+ServerName virt1000.wikimedia.org
+
+SSLEngine on
+SSLCertificateFile /etc/ssl/certs/<%= @certificate %>.pem
+SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
+SSLCACertificatePath /etc/ssl/certs/
+<%= @ssl_settings.join("\n") %>
+
+RedirectMatch ^/$ https://virt1000.wikimedia.org/wiki/
+
+RewriteEngine on
+RewriteRule ^/view/(.*)$ https://virt1000.wikimedia.org/wiki/$1 [L,R]
+RewriteCond %{HTTP_HOST}   !^virt1001\.wikimedia\.org [NC]
+RewriteRule ^/(.*) https://virt1000.wikimedia.org/$1 [L,R]
+
+DocumentRoot /usr/local/apache/common/docroot/wikimedia.org
+
+Options FollowSymLinks
+AllowOverride None
+
+
+Options Indexes FollowSymLinks MultiViews
+AllowOverride None
+Order allow,deny
+allow from all
+
+
+php_flag engine off
+
+
+SetHandler server-status
+Order deny,allow
+Deny from all
+Allow from 208.80.154.18
+Allow from 208.80.152.32
+
+
+Alias /w/images /srv/org/wikimedia/controller/wikis/images
+Alias /w /usr/local/apache/common/docroot/wikimedia.org/w
+Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
+Alias /dumps /a/backup/public
+
+ErrorLog /var/log/apache2/error.log
+
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+LogLevel warn
+
+CustomLog /var/log/apache2/access.log combined
+ServerSignature Off
+
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbac6bf7802e0dcd69c8602fd9e350791a3722d7
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Puppet LVS cleanup - change (operations/puppet)

2014-09-02 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Puppet LVS cleanup
..


Puppet LVS cleanup

Remove outdated pmtpa LVS and associated IPs (all confirmed dead)
Remove payments LVS stuff (dead pmpta + eqiad stuff,
  replaced by pay-lvs on frack puppet)
Re-order and comment bgp peer addrs

Change-Id: I13edf9aa880f8e390de517071c85566c30a2a18c
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 10 insertions(+), 38 deletions(-)

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



diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index f1c1110..0209790 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -28,7 +28,6 @@
 ],
 /^(lvs100[25])$/ => [
 $sip['upload'][$::site],
-$sip['payments'][$::site],
 $sip['dns_rec'][$::site],
 $sip['osm'][$::site],
 $sip['misc_web'][$::site],
@@ -73,7 +72,7 @@
 site => $::site
 }
 
-if $::site in ['pmtpa', 'eqiad'] {
+if $::site in ['eqiad'] {
 include ::lvs::balancer::runcommand
 }
 
diff --git a/modules/lvs/manifests/configuration.pp 
b/modules/lvs/manifests/configuration.pp
index b78ad32..ff75089 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -71,16 +71,14 @@
 $pybal = {
 'bgp' => "yes",
 'bgp-peer-address' => $hostname ? {
-/^lvs[1-3]$/ => "208.80.152.197",
-/^lvs[4-6]$/ => "208.80.152.196",
-/^lvs100[1-3]$/ => "208.80.154.196",
-/^lvs100[4-6]$/ => "208.80.154.197",
+/^lvs100[1-3]$/ => "208.80.154.196", # cr1-eqiad
+/^lvs100[4-6]$/ => "208.80.154.197", # cr2-eqiad
 /^lvs200[1-3]$/ => "208.80.153.192", # cr1-codfw
 /^lvs200[4-6]$/ => "208.80.153.193", # cr2-codfw
-/^lvs400[12]$/ => "198.35.26.192",
-/^lvs400[34]$/ => "198.35.26.193",
-/^lvs300[12]$/ => "91.198.174.245",
-/^lvs300[34]$/ => "91.198.174.246",
+/^lvs300[12]$/ => "91.198.174.245",  # cr1-esams
+/^lvs300[34]$/ => "91.198.174.246",  # cr2-knams
+/^lvs400[12]$/ => "198.35.26.192",   # cr1-ulsfo
+/^lvs400[34]$/ => "198.35.26.193",   # cr2-ulsfo
 default => "(unspecified)"
 },
 'bgp-nexthop-ipv4' => $::ipaddress_eth0,
@@ -221,10 +219,6 @@
 'esams' => { 'uploadlb' => '91.198.174.208', 'uploadlb6' => 
'2620:0:862:ed1a::2:b', 'uploadsvc' => '10.2.3.24' },
 'ulsfo' => { 'uploadlb' => '198.35.26.112', 'uploadlb6' => 
'2620:0:863:ed1a::2:b' },
 },
-'payments' => {
-'pmtpa' => "208.80.152.213",
-'eqiad' => {},
-},
 'apaches' => {
 'eqiad' => "10.2.2.1",
 },
@@ -261,7 +255,6 @@
 'ulsfo' => { 'mobilelb' => '198.35.26.108', 'mobilelb6' => 
'2620:0:863:ed1a::1:c', 'mobilesvc' => '10.2.4.26'},
 },
 'swift' => {
-'pmtpa' => "10.2.1.27",
 'eqiad' => "10.2.2.27",
 },
 'dns_auth' => {
@@ -269,15 +262,12 @@
 'eqiad' => "208.80.154.238",
 },
 'dns_rec' => {
-'pmtpa' => { 'dns_rec' => "208.80.152.215", 'dns_rec6' => 
"2620:0:860:ed1a::f" },
 'eqiad' => { 'dns_rec' => "208.80.154.239", 'dns_rec6' => 
"2620:0:861:ed1a::f" },
 },
 'osm' => {
-'pmtpa' => "208.80.152.216",
 'eqiad' => "208.80.154.244",
 },
 'misc_web' => {
-'pmtpa' => { 'misc_web' => '208.80.152.217', 'misc_web6' => 
'2620:0:860:ed1a::11' },
 'eqiad' => { 'misc_web' => '208.80.154.241', 'misc_web6' => 
'2620:0:861:ed1a::11' },
 },
 'parsoid' => {
@@ -342,7 +332,6 @@
 'eqiad' => '10.68.16.189',  # deployment-upload.eqiad.wmflabs
 'pmtpa' => '10.4.1.103',  # deployment-upload.pmtpa.wmflabs
 },
-'payments' => {},
 'upload' => {
 'pmtpa' => {
 'uploadlb'  => [ '10.4.0.166', '10.4.0.187', ],
@@ -605,26 +594,10 @@
 'IdleConnection' => $idleconnection_monitor_options
 },
 },
-"payments" => {
-'description' => "Payments cluster, HTTPS payments.wikimedia.org",
-'class' => "high-traffic2",
-'sites' => [ "pmtpa" ],
-'ip' => $service_ips['payments'][$::site],
-'port' => 443,
-'scheduler' => 'sh',
-'bgp' => "yes",
-'depool-threshold' => ".5",
-'monitors' => {
-'ProxyFetch' => {
-'url' => [ 
'https://payments.wikimedi

[MediaWiki-commits] [Gerrit] Add missing space to autodoc of meta=siteinfo&siprop=languages - change (mediawiki/core)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Add missing space to autodoc of meta=siteinfo&siprop=languages
..


Add missing space to autodoc of meta=siteinfo&siprop=languages

Change-Id: I56ba3b3282ea747b47016558513f96ca597e28d7
---
M includes/api/ApiQuerySiteinfo.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/api/ApiQuerySiteinfo.php 
b/includes/api/ApiQuerySiteinfo.php
index 04892a1..522c7c0 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -843,7 +843,7 @@
' fileextensions- Returns list of file 
extensions allowed to be uploaded',
' rightsinfo- Returns wiki rights 
(license) information if available',
' restrictions  - Returns information 
on available restriction (protection) types',
-   ' languages - Returns a list of 
languages MediaWiki supports' .
+   ' languages - Returns a list of 
languages MediaWiki supports ' .
"(optionally localised by using 
{$p}inlanguagecode)",
' skins - Returns a list of all 
enabled skins',
' extensiontags - Returns a list of 
parser extension tags',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56ba3b3282ea747b47016558513f96ca597e28d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Anomie 
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 'mw-disambig' CSS class to disambiguation pages - change (mediawiki...Disambiguator)

2014-09-02 Thread Code Review

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

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

Change subject: Add 'mw-disambig' CSS class to disambiguation pages
..

Add 'mw-disambig' CSS class to disambiguation pages

Finally, users and tools for fixing links to disambiguation pages will
be able to distinguish these links without additional API queries.
No styles are provided, just the class, just like for 'mw-redirect'
in core.

We only use a single, fast query to get the status of all links on a
page.

The GetLinkColours links was used, which lets an extension provide
additional classes for all links in the currently parsed page. I'm not
entirely happy with how we have to convert back-and-forth between DB
keys and Title objects, but we can live with this.

The class probably won't be added on any special pages and so on, as
the only code path to the hook leads through the Parser.

Bug: 8339
Change-Id: I72768bf44e0bb34e17e223a74e3eec72f545eba7
---
M Disambiguator.hooks.php
M Disambiguator.php
2 files changed, 60 insertions(+), 19 deletions(-)


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

diff --git a/Disambiguator.hooks.php b/Disambiguator.hooks.php
index bffc3d9..c78c098 100644
--- a/Disambiguator.hooks.php
+++ b/Disambiguator.hooks.php
@@ -15,7 +15,7 @@
$doubleUnderscoreIDs[] = 'disambiguation';
return true;
}
-   
+
/**
 * Add the Disambiguator special pages to the list of QueryPages. This
 * allows direct access via the API.
@@ -50,27 +50,67 @@
 * @return bool
 */
public static function isDisambiguationPage( Title $title ) {
+   $res = static::filterDisambiguationPages( array( $title ) );
+   return (bool)count( $res );
+   }
+
+   /**
+* Convenience function for testing whether or not pages are 
disambiguation pages
+* @param Title[] $titles
+* @return Title[] The titles corresponding to pages that are 
disambiguations
+*/
+   public static function filterDisambiguationPages( array $titles ) {
wfProfileIn( __METHOD__ );
-   // Exclude disambiguation templates
-   if ( $title->getNamespace() === NS_TEMPLATE ) {
-   wfProfileOut( __METHOD__ );
-   return false;
-   }
-   $pageId = $title->getArticleID();
-   if ( $pageId ) {
-   $dbr = wfGetDB( DB_SLAVE );
-   $isDisambiguationPage = $dbr->selectField(
-   'page_props',
-   'pp_propname',
-   array( 'pp_page' => $pageId, 'pp_propname' => 
'disambiguation' )
-   );
-   if ( $isDisambiguationPage ) {
-   wfProfileOut( __METHOD__ );
-   return true;
+
+   $pageIds = array();
+   $pageIdToTitle = array();
+   foreach ( $titles as $title ) {
+   // Exclude disambiguation templates
+   if ( $title->getNamespace() !== NS_TEMPLATE ) {
+   $pageId = $title->getArticleID();
+   // Don't needlessly check non-existent and 
special pages
+   if ( $pageId > 0 ) {
+   $pageIds[] = $pageId;
+   $pageIdToTitle[ $pageId ] = $title;
+   }
}
}
+
+   $output = array();
+   if ( $pageIds ) {
+   $dbr = wfGetDB( DB_SLAVE );
+   $res = $dbr->select(
+   'page_props',
+   'pp_page',
+   array( 'pp_page' => $pageIds, 'pp_propname' => 
'disambiguation' ),
+   __METHOD__
+   );
+
+   foreach ( $res as $row ) {
+   $output[] = $pageIdToTitle[ $row->pp_page ];
+   }
+   }
+
wfProfileOut( __METHOD__ );
-   return false;
+   return $output;
+   }
+
+   /**
+* Add 'mw-disambig' CSS class to links to disambiguation pages.
+* @param array $pageIdToDbKey Prefixed DB keys of the pages linked to, 
indexed by page_id
+* @param array $colours CSS classes, indexed by prefixed DB keys
+* @return bool true
+*/
+   public static function onGetLinkColours( $pageIdToDbKey, &$colours ) {
+   $titles = array();
+   foreach ( $pageIdToDbKey as $pageId => $dbKey ) {
+   $titles[] = T

[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...XAnalytics)

2014-09-02 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Add .gitreview
..

Add .gitreview

Change-Id: Iacbf8b5f8e6a43cd53a934c76f98f12e0eb6f0db
---
A .gitreview
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..ff878f6
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/XAnalytics.git
+defaultbranch=master
+defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacbf8b5f8e6a43cd53a934c76f98f12e0eb6f0db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/XAnalytics
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Stab in the dark: Move the virt1000 vhost to openstack.pp - change (operations/puppet)

2014-09-02 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Stab in the dark:  Move the virt1000 vhost to openstack.pp
..

Stab in the dark:  Move the virt1000 vhost to openstack.pp

In hopes that required vars are defined here.

Change-Id: Ic78a14fe30a16900b19ee2d807a9b5d31baf2a56
---
M manifests/openstack.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 6662a77..e4f54c4 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -368,6 +368,11 @@
 content => template("apache/sites/${webserver_hostname}.erb"),
 }
 
+# temporary for Wikitech migration to multiversion
+apache::site { 'virt1000.wikimedia.org':
+content => template("apache/sites/virt1000.wikimedia.org.erb"),
+}
+
 # ::mediawiki::sync supports syncing the wikitech wiki from tin.
 #  It also defines /a which is used later on in this manifest for backups.
 include ::mediawiki::sync
diff --git a/manifests/site.pp b/manifests/site.pp
index 2281f0c..560f78b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2942,11 +2942,6 @@
 include role::neutron::controller
 
 }
-
-# temporary for Wikitech migration to multiversion
-apache::site { 'virt1000.wikimedia.org':
-content => template("apache/sites/virt1000.wikimedia.org.erb"),
-}
 }
 
 node 'virt0.wikimedia.org' {

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

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

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

[MediaWiki-commits] [Gerrit] put standard class back on amslvs[1-4] - change (operations/puppet)

2014-09-02 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: put standard class back on amslvs[1-4]
..


put standard class back on amslvs[1-4]

Change-Id: I883a78b819410766ccb14a52853372ee123f6468
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 2281f0c..e0b5457 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -60,6 +60,7 @@
 # To be decommissioned/reused, not presently serving traffic
 node /^amslvs[1-4]\.esams\.wikimedia\.org$/ {
 include admin
+include standard
 
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',

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

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

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

[MediaWiki-commits] [Gerrit] put standard class back on amslvs[1-4] - change (operations/puppet)

2014-09-02 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: put standard class back on amslvs[1-4]
..

put standard class back on amslvs[1-4]

Change-Id: I883a78b819410766ccb14a52853372ee123f6468
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/157839/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2281f0c..e0b5457 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -60,6 +60,7 @@
 # To be decommissioned/reused, not presently serving traffic
 node /^amslvs[1-4]\.esams\.wikimedia\.org$/ {
 include admin
+include standard
 
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',

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

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

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

[MediaWiki-commits] [Gerrit] Stab in the dark: Move the virt1000 vhost to openstack.pp - change (operations/puppet)

2014-09-02 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Stab in the dark:  Move the virt1000 vhost to openstack.pp
..


Stab in the dark:  Move the virt1000 vhost to openstack.pp

In hopes that required vars are defined here.

Change-Id: Ic78a14fe30a16900b19ee2d807a9b5d31baf2a56
---
M manifests/openstack.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 6662a77..e4f54c4 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -368,6 +368,11 @@
 content => template("apache/sites/${webserver_hostname}.erb"),
 }
 
+# temporary for Wikitech migration to multiversion
+apache::site { 'virt1000.wikimedia.org':
+content => template("apache/sites/virt1000.wikimedia.org.erb"),
+}
+
 # ::mediawiki::sync supports syncing the wikitech wiki from tin.
 #  It also defines /a which is used later on in this manifest for backups.
 include ::mediawiki::sync
diff --git a/manifests/site.pp b/manifests/site.pp
index e0b5457..4f3d862 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2943,11 +2943,6 @@
 include role::neutron::controller
 
 }
-
-# temporary for Wikitech migration to multiversion
-apache::site { 'virt1000.wikimedia.org':
-content => template("apache/sites/virt1000.wikimedia.org.erb"),
-}
 }
 
 node 'virt0.wikimedia.org' {

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

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

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

[MediaWiki-commits] [Gerrit] remove commented-out ref to dead pmtpa addr - change (operations/dns)

2014-09-02 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: remove commented-out ref to dead pmtpa addr
..

remove commented-out ref to dead pmtpa addr

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/40/157840/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 5ab3c57..f8765fc 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -496,8 +496,6 @@
 observium   1H  IN CNAMElibrenms
 librenms1H  IN CNAMEnetmon1001
 
-; in theory we can run with both live, but eqiad-only is preferred
-;payments   5M  IN A208.80.152.213 ; pmtpa
 payments5M  IN A208.80.155.5 ; eqiad
 
 payments-listener   1H  IN CNAMEthulium

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

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

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

[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...XAnalytics)

2014-09-02 Thread Ori.livneh (Code Review)

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

Change subject: Add .gitreview
..


Add .gitreview

Change-Id: Iacbf8b5f8e6a43cd53a934c76f98f12e0eb6f0db
---
A .gitreview
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..ff878f6
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/XAnalytics.git
+defaultbranch=master
+defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacbf8b5f8e6a43cd53a934c76f98f12e0eb6f0db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/XAnalytics
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] remove commented-out ref to dead pmtpa addr - change (operations/dns)

2014-09-02 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: remove commented-out ref to dead pmtpa addr
..


remove commented-out ref to dead pmtpa addr

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

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 5ab3c57..f8765fc 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -496,8 +496,6 @@
 observium   1H  IN CNAMElibrenms
 librenms1H  IN CNAMEnetmon1001
 
-; in theory we can run with both live, but eqiad-only is preferred
-;payments   5M  IN A208.80.152.213 ; pmtpa
 payments5M  IN A208.80.155.5 ; eqiad
 
 payments-listener   1H  IN CNAMEthulium

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

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

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

[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...XAnalytics)

2014-09-02 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Initial commit
..

Initial commit

This commit introduces a trivial MediaWiki extension for emitting an
X-Analytics headers from a MediaWiki configuration variable.

Once this extension is deployed, we'll be able to set the PHP engine by
declaring the follow configuration:

$wgXAnalyticsHeaderItems['php'] = defined( 'HHVM_VERSION' ) ? 'HHVM' : 'PHP5';

See 

Change-Id: I9137b255a105b6b6cf16764225252b0bc288b737
---
A XAnalytics.i18n.php
A XAnalytics.php
A i18n/en.json
A i18n/qqq.json
4 files changed, 93 insertions(+), 0 deletions(-)


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

diff --git a/XAnalytics.i18n.php b/XAnalytics.i18n.php
new file mode 100644
index 000..3cfe434
--- /dev/null
+++ b/XAnalytics.i18n.php
@@ -0,0 +1,35 @@
+https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
+$messages = array();
+if ( !function_exists( 'wfJsonI18nShim0a38893030701ff0' ) ) {
+   function wfJsonI18nShim0a38893030701ff0( $cache, $code, &$cachedData ) {
+   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
+   foreach ( $codeSequence as $csCode ) {
+   $fileName = dirname( __FILE__ ) . 
"/extensions/XAnalytics/i18n/$csCode.json";
+   if ( is_readable( $fileName ) ) {
+   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
+   foreach ( array_keys( $data ) as $key ) {
+   if ( $key === '' || $key[0] === '@' ) {
+   unset( $data[$key] );
+   }
+   }
+   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
+   }
+
+   $cachedData['deps'][] = new FileDependency( $fileName );
+   }
+   return true;
+   }
+
+   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim0a38893030701ff0';
+}
diff --git a/XAnalytics.php b/XAnalytics.php
new file mode 100644
index 000..f5d0e1a
--- /dev/null
+++ b/XAnalytics.php
@@ -0,0 +1,42 @@
+https://wikitech.wikimedia.org/wiki/X-Analytics
+ * @author Ori Livneh 
+ * @license GPLv2
+ * @version 0.1
+ */
+
+$wgExtensionCredits['other'][] = array(
+   'path' => __FILE__,
+   'name' => 'XAnalytics',
+   'version' => '0.1',
+   'url' => 'https://wikitech.wikimedia.org/wiki/X-Analytics',
+   'author' => 'Ori Livneh',
+   'descriptionmsg' => 'xanalytics-desc',
+);
+
+// Messages
+
+$wgMessagesDirs['XAnalytics'] = __DIR__ . '/i18n';
+$wgExtensionMessagesFiles['XAnalytics'] = __DIR__ . '/XAnalytics.i18n.php';
+
+// Hooks
+
+/**
+ * On SetupAfterCache, set X-Analytics header.
+ *
+ * X-Analytics items can be declared by adding items to the configuration
+ * variable $wgXAnalyticsHeaderItems.
+ *
+ * @see https://wikitech.wikimedia.org/wiki/X-Analytics
+ */
+$wgHooks['SetupAfterCache'][] = function () {
+   global $wgRequest, $wgXAnalyticsHeaderItems;
+
+   $headerValue = http_build_query( (array)$wgXAnalyticsHeaderItems, null, 
';' );
+   if ( $headerValue ) {
+   $wgRequest->response()->header( 'X-Analytics: ' . $headerValue 
);
+   }
+};
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..0ead301
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,8 @@
+{
+"@metadata": {
+"authors": [
+"Ori Livneh"
+]
+},
+"xanalytics-desc": "Emit analytics data via an X-Analytics header"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..429aa22
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+   "@metadata": {
+   "authors": [
+   "Ori Livneh"
+   ]
+   },
+   "xanalytics-desc": 
"{{desc|name=XAnalytics|url=https://wikitech.wikimedia.org/wiki/X-Analytics}}";
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9137b255a105b6b6cf16764225252b0bc288b737
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/XAnalytics
Gerrit-Branch: master
Gerrit-Owner: Ori.l

[MediaWiki-commits] [Gerrit] Remove virt1000 from wgLBFactoryConf['sectionLoads'] - change (operations/mediawiki-config)

2014-09-02 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: Remove virt1000 from wgLBFactoryConf['sectionLoads']
..

Remove virt1000 from wgLBFactoryConf['sectionLoads']

"all servers which are down or do not replicate should be removed"

Change-Id: I00ff13eb6bd767b88691ef43f652812e792cb5d3
---
M wmf-config/db-eqiad.php
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8a29585..cae3d5d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -153,9 +153,6 @@
'db1034' => 400, # 1.4TB  64GB
'db1039' => 400, # 1.4TB  64GB
),
-   'virt1000' => array(
-   'virt1000' => 100,   # I have no idea if this is right
-   ),
 ),
 
 'serverTemplate' => array(

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

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

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

[MediaWiki-commits] [Gerrit] QA: make Feature names easy to read - change (mediawiki...Echo)

2014-09-02 Thread Cmcmahon (Code Review)

Cmcmahon has uploaded a new change for review.

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

Change subject: QA: make Feature names easy to read
..

QA: make Feature names easy to read

Don't duplicate "Notification types" Feature between tests. I
guess this was a copy/paste issue.

Change-Id: I032130024113bb326f0cfbbe09cd7455bdaf7ab5
---
M tests/browser/features/messages.feature
M tests/browser/features/notifications_userrights.feature
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/tests/browser/features/messages.feature 
b/tests/browser/features/messages.feature
index bb43b52..91fa249 100644
--- a/tests/browser/features/messages.feature
+++ b/tests/browser/features/messages.feature
@@ -1,5 +1,5 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
-Feature: Notification types
+Feature: Unread messages
 
   # Scenarios which trigger notifications
   Scenario: Mark all as unread
diff --git a/tests/browser/features/notifications_userrights.feature 
b/tests/browser/features/notifications_userrights.feature
index f287d1c..0e947e7 100644
--- a/tests/browser/features/notifications_userrights.feature
+++ b/tests/browser/features/notifications_userrights.feature
@@ -1,5 +1,5 @@
 @chrome @firefox @login
-Feature: Notification types
+Feature: User rights
 
   Scenario: Change in user rights
 Given I am logged in as a new user with no notifications

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

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

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

[MediaWiki-commits] [Gerrit] Fix a typo -- s/virt1001/virt1000 - change (operations/puppet)

2014-09-02 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Fix a typo -- s/virt1001/virt1000
..

Fix a typo -- s/virt1001/virt1000

Change-Id: I0211762074da1ec820ac0ae25ac3d428bf170944
---
M templates/apache/sites/virt1000.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/templates/apache/sites/virt1000.wikimedia.org.erb 
b/templates/apache/sites/virt1000.wikimedia.org.erb
index 463cba1..5a13620 100644
--- a/templates/apache/sites/virt1000.wikimedia.org.erb
+++ b/templates/apache/sites/virt1000.wikimedia.org.erb
@@ -48,7 +48,7 @@
 
 RewriteEngine on
 RewriteRule ^/view/(.*)$ https://virt1000.wikimedia.org/wiki/$1 [L,R]
-RewriteCond %{HTTP_HOST}   !^virt1001\.wikimedia\.org [NC]
+RewriteCond %{HTTP_HOST}   !^virt1000\.wikimedia\.org [NC]
 RewriteRule ^/(.*) https://virt1000.wikimedia.org/$1 [L,R]
 
 DocumentRoot /usr/local/apache/common/docroot/wikimedia.org

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

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

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

[MediaWiki-commits] [Gerrit] Fix a typo -- s/virt1001/virt1000 - change (operations/puppet)

2014-09-02 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Fix a typo -- s/virt1001/virt1000
..


Fix a typo -- s/virt1001/virt1000

Change-Id: I0211762074da1ec820ac0ae25ac3d428bf170944
---
M templates/apache/sites/virt1000.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/apache/sites/virt1000.wikimedia.org.erb 
b/templates/apache/sites/virt1000.wikimedia.org.erb
index 463cba1..5a13620 100644
--- a/templates/apache/sites/virt1000.wikimedia.org.erb
+++ b/templates/apache/sites/virt1000.wikimedia.org.erb
@@ -48,7 +48,7 @@
 
 RewriteEngine on
 RewriteRule ^/view/(.*)$ https://virt1000.wikimedia.org/wiki/$1 [L,R]
-RewriteCond %{HTTP_HOST}   !^virt1001\.wikimedia\.org [NC]
+RewriteCond %{HTTP_HOST}   !^virt1000\.wikimedia\.org [NC]
 RewriteRule ^/(.*) https://virt1000.wikimedia.org/$1 [L,R]
 
 DocumentRoot /usr/local/apache/common/docroot/wikimedia.org

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0211762074da1ec820ac0ae25ac3d428bf170944
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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 app edit reports back to mobile report card - change (analytics/limn-mobile-data)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Add app edit reports back to mobile report card
..


Add app edit reports back to mobile report card

Change-Id: I3278586fb4709e0141504d9c93b235a3a3490f0c
---
M dashboards/reportcard.json
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/dashboards/reportcard.json b/dashboards/reportcard.json
index 9bce056..2bda37a 100644
--- a/dashboards/reportcard.json
+++ b/dashboards/reportcard.json
@@ -44,6 +44,10 @@
 "app-edit-funnel-total",
 "app-edit-funnel-android",
 "app-edit-funnel-ios",
+"app-edits-starts",
+"app-edits-preview",
+"app-edits-save-attempt",
+"app-edits-success",
 "app-user-blocks-en"
 ]
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3278586fb4709e0141504d9c93b235a3a3490f0c
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix for title case sensitivity bug. - change (apps...wikipedia)

2014-09-02 Thread Brion VIBBER (Code Review)

Brion VIBBER has submitted this change and it was merged.

Change subject: Fix for title case sensitivity bug.
..


Fix for title case sensitivity bug.

Ferris Wheel and Ferris wheel were not seen as distinct, for example.

Change-Id: I16f77ffd189227a807b284507db60fc3ab5744b3
---
M wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m 
b/wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
index ff263c4..b8814e5 100644
--- a/wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
+++ b/wikipedia/Categories/NSManagedObjectContext+SimpleFetch.m
@@ -40,7 +40,7 @@
 -(NSManagedObjectID *)getArticleIDForTitle:(NSString *)title domain:(NSString 
*)domain
 {
 Article *article = (Article *)[self getEntityForName: @"Article" 
withPredicateFormat: @"\
-   title ==[c] %@ \
+   title == %@ \
AND \
site == %@ \
AND \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16f77ffd189227a807b284507db60fc3ab5744b3
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd 
Gerrit-Reviewer: Brion VIBBER 
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 virt1000.wikimedia.org static mapping for wikitech migra... - change (operations/mediawiki-config)

2014-09-02 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Add virt1000.wikimedia.org static mapping for wikitech migration
..


Add virt1000.wikimedia.org static mapping for wikitech migration

Change-Id: I60e5e13c736a9098841fb69b0e3fae95b86f9744
---
M multiversion/MWMultiVersion.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved



diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 09b2378..c238255 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -142,6 +142,7 @@
'www.wikidata.org' => 'wikidata',
'wikisource.org' => 'sources',
'wikitech.wikimedia.org' => 'labswiki',
+   'virt1000.wikimedia.org' => 'labswiki' // Temporary for 
wikitech migration to multiversion
);
 
$site = "wikipedia";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60e5e13c736a9098841fb69b0e3fae95b86f9744
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Check Gadget name is a valid ResourceLoader module name - change (mediawiki...Gadgets)

2014-09-02 Thread jenkins-bot (Code Review)

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

Change subject: Check Gadget name is a valid ResourceLoader module name
..


Check Gadget name is a valid ResourceLoader module name

When loading the Gadget list, check against ResourceLoader::isValidModuleName
to avoid MWExceptions being thrown.

This will lower the max length of a gadget name from 248 bytes to
244 since ResourceLoader requires <= 255 bytes, and we add a
"ext.gadget." prefix in front of the name.

Bug: 19410
Change-Id: Ib74c0866bb333885c747d318418e2c8685ae339c
---
M Gadgets_body.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/Gadgets_body.php b/Gadgets_body.php
index 6f17af9..cd10f75 100644
--- a/Gadgets_body.php
+++ b/Gadgets_body.php
@@ -50,6 +50,11 @@
//  Also, title-normalization applies.
$gadget = new Gadget();
$gadget->name = trim( str_replace( ' ', '_', $m[1] ) );
+   // If the name is too long, then RL will throw an MWException 
when
+   // we try to register the module
+   if ( !ResourceLoader::isValidModuleName( 
$gadget->getModuleName() ) ) {
+   return false;
+   }
$gadget->definition = $definition;
$options = trim( $m[2], ' []' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib74c0866bb333885c747d318418e2c8685ae339c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 4 >

1 - 100 of 347 matches

Mail list logo