date:20131104

[MediaWiki-commits] [Gerrit] Add OO.ui.Element.getDir - change (mediawiki...VisualEditor)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Add OO.ui.Element.getDir
..


Add OO.ui.Element.getDir

Stop using this.$.frame.dir - a horrible hack made of duct tape
and bubble gum.

Or perhaps rather, masking tape and post-it-notes...

Change-Id: I53690e4485974b95edbdd255c0b96c2f639c5261
---
M modules/oojs-ui/OO.ui.Element.js
M modules/oojs-ui/layouts/OO.ui.GridLayout.js
M modules/oojs-ui/layouts/OO.ui.PanelLayout.js
3 files changed, 36 insertions(+), 12 deletions(-)

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



diff --git a/modules/oojs-ui/OO.ui.Element.js b/modules/oojs-ui/OO.ui.Element.js
index a212000..903ef25 100644
--- a/modules/oojs-ui/OO.ui.Element.js
+++ b/modules/oojs-ui/OO.ui.Element.js
@@ -82,22 +82,22 @@
  * Get the document of an element.
  *
  * @static
- * @param {jQuery|HTMLElement|HTMLDocument|Window} context Context to bind the 
function to
+ * @param {jQuery|HTMLElement|HTMLDocument|Window} obj Object to get the 
document for
  * @returns {HTMLDocument} Document object
  * @throws {Error} If context is invalid
  */
-OO.ui.Element.getDocument = function ( context ) {
+OO.ui.Element.getDocument = function ( obj ) {
var doc =
// jQuery - selections created offscreen won't have a 
context, so .context isn't reliable
-   ( context[0]  context[0].ownerDocument ) ||
+   ( obj[0]  obj[0].ownerDocument ) ||
// Empty jQuery selections might have a context
-   context.context ||
+   obj.context ||
// HTMLElement
-   context.ownerDocument ||
+   obj.ownerDocument ||
// Window
-   context.document ||
+   obj.document ||
// HTMLDocument
-   ( context.nodeType === 9  context );
+   ( obj.nodeType === 9  obj );
 
if ( doc ) {
return doc;
@@ -110,15 +110,39 @@
  * Get the window of an element or document.
  *
  * @static
- * @param {jQuery|HTMLElement|HTMLDocument|Window} context Context to bind the 
function to
+ * @param {jQuery|HTMLElement|HTMLDocument|Window} obj Context to get the 
window for
  * @returns {Window} Window object
  */
-OO.ui.Element.getWindow = function ( context ) {
-   var doc = this.getDocument( context );
+OO.ui.Element.getWindow = function ( obj ) {
+   var doc = this.getDocument( obj );
return doc.parentWindow || doc.defaultView;
 };
 
 /**
+ * Get the direction of an element or document.
+ *
+ * @static
+ * @param {jQuery|HTMLElement|HTMLDocument|Window} obj Context to get the 
direction for
+ * @returns {string} Text direction, either `ltr` or `rtl`
+ */
+OO.ui.Element.getDir = function ( obj ) {
+   var isDoc, isWin;
+
+   if ( obj instanceof jQuery ) {
+   obj = obj[0];
+   }
+   isDoc = obj.nodeType === 9;
+   isWin = obj.document !== undefined;
+   if ( isDoc || isWin ) {
+   if ( isWin ) {
+   obj = obj.document;
+   }
+   obj = obj.body;
+   }
+   return $( obj ).css( 'direction' );
+};
+
+/**
  * Get the offset between two frames.
  *
  * TODO: Make this function not use recursion.
diff --git a/modules/oojs-ui/layouts/OO.ui.GridLayout.js 
b/modules/oojs-ui/layouts/OO.ui.GridLayout.js
index 729dabd..fe62da9 100644
--- a/modules/oojs-ui/layouts/OO.ui.GridLayout.js
+++ b/modules/oojs-ui/layouts/OO.ui.GridLayout.js
@@ -139,7 +139,7 @@
'top': Math.round( top * 100 ) + '%'
};
// If RTL, reverse:
-   if ( this.$.frame.dir === 'rtl' ) {
+   if ( OO.ui.Element.getDir( this.$.context ) === 'rtl' ) 
{
dimensions.right = Math.round( left * 100 ) + 
'%';
} else {
dimensions.left = Math.round( left * 100 ) + 
'%';
diff --git a/modules/oojs-ui/layouts/OO.ui.PanelLayout.js 
b/modules/oojs-ui/layouts/OO.ui.PanelLayout.js
index 5c7ca61..9d9dc33 100644
--- a/modules/oojs-ui/layouts/OO.ui.PanelLayout.js
+++ b/modules/oojs-ui/layouts/OO.ui.PanelLayout.js
@@ -34,7 +34,7 @@
}
 
// Add directionality class:
-   this.$element.addClass( 'oo-ui-' + this.$.frame.dir );
+   this.$element.addClass( 'oo-ui-' + OO.ui.Element.getDir( this.$.context 
) );
 };
 
 /* Inheritance */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53690e4485974b95edbdd255c0b96c2f639c5261
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot

[MediaWiki-commits] [Gerrit] mediawikiwiki and testwikidatawiki to 1.23wmf2 - change (operations/mediawiki-config)

2013-11-04 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: mediawikiwiki and testwikidatawiki to 1.23wmf2
..

mediawikiwiki and testwikidatawiki to 1.23wmf2

Change-Id: I58513d4bce44f0da6d7d9c6e2e56bdbd4638f263
---
M wikiversions.dat
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wikiversions.dat b/wikiversions.dat
index fbcc58f..99fa904 100644
--- a/wikiversions.dat
+++ b/wikiversions.dat
@@ -465,7 +465,7 @@
 lvwiktionary php-1.23wmf1 *
 map_bmswiki php-1.23wmf1 *
 mdfwiki php-1.23wmf1 *
-mediawikiwiki php-1.23wmf1 *
+mediawikiwiki php-1.23wmf2 *
 metawiki php-1.23wmf1 *
 mgwikibooks php-1.23wmf1 *
 mgwiki php-1.23wmf1 *
@@ -733,7 +733,7 @@
 tenwiki php-1.23wmf1 *
 test2wiki php-1.23wmf2 *
 testwiki php-1.23wmf2 *
-testwikidatawiki php-1.23wmf1 *
+testwikidatawiki php-1.23wmf2 *
 tetwiki php-1.23wmf1 *
 tewikibooks php-1.23wmf1 *
 tewiki php-1.23wmf1 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58513d4bce44f0da6d7d9c6e2e56bdbd4638f263
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Non wikipedias to 1.23wmf2 - change (operations/mediawiki-config)

2013-11-04 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Non wikipedias to 1.23wmf2
..

Non wikipedias to 1.23wmf2

Change-Id: Iba24055f40dc526d0d9c212a4c1e7fb0850bfa41
---
M wikiversions.dat
1 file changed, 599 insertions(+), 599 deletions(-)


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

diff --git a/wikiversions.dat b/wikiversions.dat
index 99fa904..005a5b9 100644
--- a/wikiversions.dat
+++ b/wikiversions.dat
@@ -1,879 +1,879 @@
-aawikibooks php-1.23wmf1 *
-aawiki php-1.23wmf1 *
-aawiktionary php-1.23wmf1 *
+aawikibooks php-1.23wmf2 *
+aawiki php-1.23wmf2 *
+aawiktionary php-1.23wmf2 *
 abwiki php-1.23wmf1 *
-abwiktionary php-1.23wmf1 *
+abwiktionary php-1.23wmf2 *
 acewiki php-1.23wmf1 *
-advisorywiki php-1.23wmf1 *
-afwikibooks php-1.23wmf1 *
+advisorywiki php-1.23wmf2 *
+afwikibooks php-1.23wmf2 *
 afwiki php-1.23wmf1 *
-afwikiquote php-1.23wmf1 *
-afwiktionary php-1.23wmf1 *
-akwikibooks php-1.23wmf1 *
+afwikiquote php-1.23wmf2 *
+afwiktionary php-1.23wmf2 *
+akwikibooks php-1.23wmf2 *
 akwiki php-1.23wmf1 *
-akwiktionary php-1.23wmf1 *
-alswikibooks php-1.23wmf1 *
+akwiktionary php-1.23wmf2 *
+alswikibooks php-1.23wmf2 *
 alswiki php-1.23wmf1 *
-alswikiquote php-1.23wmf1 *
-alswiktionary php-1.23wmf1 *
+alswikiquote php-1.23wmf2 *
+alswiktionary php-1.23wmf2 *
 amwiki php-1.23wmf1 *
-amwikiquote php-1.23wmf1 *
-amwiktionary php-1.23wmf1 *
-angwikibooks php-1.23wmf1 *
+amwikiquote php-1.23wmf2 *
+amwiktionary php-1.23wmf2 *
+angwikibooks php-1.23wmf2 *
 angwiki php-1.23wmf1 *
-angwikiquote php-1.23wmf1 *
-angwikisource php-1.23wmf1 *
-angwiktionary php-1.23wmf1 *
+angwikiquote php-1.23wmf2 *
+angwikisource php-1.23wmf2 *
+angwiktionary php-1.23wmf2 *
 anwiki php-1.23wmf1 *
-anwiktionary php-1.23wmf1 *
-arbcom_dewiki php-1.23wmf1 *
-arbcom_enwiki php-1.23wmf1 *
-arbcom_fiwiki php-1.23wmf1 *
-arbcom_nlwiki php-1.23wmf1 *
+anwiktionary php-1.23wmf2 *
+arbcom_dewiki php-1.23wmf2 *
+arbcom_enwiki php-1.23wmf2 *
+arbcom_fiwiki php-1.23wmf2 *
+arbcom_nlwiki php-1.23wmf2 *
 arcwiki php-1.23wmf1 *
-arwikibooks php-1.23wmf1 *
-arwikimedia php-1.23wmf1 *
-arwikinews php-1.23wmf1 *
+arwikibooks php-1.23wmf2 *
+arwikimedia php-1.23wmf2 *
+arwikinews php-1.23wmf2 *
 arwiki php-1.23wmf1 *
-arwikiquote php-1.23wmf1 *
-arwikisource php-1.23wmf1 *
-arwikiversity php-1.23wmf1 *
-arwiktionary php-1.23wmf1 *
+arwikiquote php-1.23wmf2 *
+arwikisource php-1.23wmf2 *
+arwikiversity php-1.23wmf2 *
+arwiktionary php-1.23wmf2 *
 arzwiki php-1.23wmf1 *
-astwikibooks php-1.23wmf1 *
+astwikibooks php-1.23wmf2 *
 astwiki php-1.23wmf1 *
-astwikiquote php-1.23wmf1 *
-astwiktionary php-1.23wmf1 *
-aswikibooks php-1.23wmf1 *
+astwikiquote php-1.23wmf2 *
+astwiktionary php-1.23wmf2 *
+aswikibooks php-1.23wmf2 *
 aswiki php-1.23wmf1 *
-aswikisource php-1.23wmf1 *
-aswiktionary php-1.23wmf1 *
-auditcomwiki php-1.23wmf1 *
+aswikisource php-1.23wmf2 *
+aswiktionary php-1.23wmf2 *
+auditcomwiki php-1.23wmf2 *
 avwiki php-1.23wmf1 *
-avwiktionary php-1.23wmf1 *
-aywikibooks php-1.23wmf1 *
+avwiktionary php-1.23wmf2 *
+aywikibooks php-1.23wmf2 *
 aywiki php-1.23wmf1 *
-aywiktionary php-1.23wmf1 *
-azwikibooks php-1.23wmf1 *
+aywiktionary php-1.23wmf2 *
+azwikibooks php-1.23wmf2 *
 azwiki php-1.23wmf1 *
-azwikiquote php-1.23wmf1 *
-azwikisource php-1.23wmf1 *
-azwiktionary php-1.23wmf1 *
+azwikiquote php-1.23wmf2 *
+azwikisource php-1.23wmf2 *
+azwiktionary php-1.23wmf2 *
 barwiki php-1.23wmf1 *
 bat_smgwiki php-1.23wmf1 *
-bawikibooks php-1.23wmf1 *
+bawikibooks php-1.23wmf2 *
 bawiki php-1.23wmf1 *
 bclwiki php-1.23wmf1 *
-bdwikimedia php-1.23wmf1 *
-betawikiversity php-1.23wmf1 *
-bewikibooks php-1.23wmf1 *
-bewikimedia php-1.23wmf1 *
+bdwikimedia php-1.23wmf2 *
+betawikiversity php-1.23wmf2 *
+bewikibooks php-1.23wmf2 *
+bewikimedia php-1.23wmf2 *
 bewiki php-1.23wmf1 *
-bewikiquote php-1.23wmf1 *
-bewikisource php-1.23wmf1 *
-bewiktionary php-1.23wmf1 *
+bewikiquote php-1.23wmf2 *
+bewikisource php-1.23wmf2 *
+bewiktionary php-1.23wmf2 *
 be_x_oldwiki php-1.23wmf1 *
-bgwikibooks php-1.23wmf1 *
-bgwikinews php-1.23wmf1 *
+bgwikibooks php-1.23wmf2 *
+bgwikinews php-1.23wmf2 *
 bgwiki php-1.23wmf1 *
-bgwikiquote php-1.23wmf1 *
-bgwikisource php-1.23wmf1 *
-bgwiktionary php-1.23wmf1 *
+bgwikiquote php-1.23wmf2 *
+bgwikisource php-1.23wmf2 *
+bgwiktionary php-1.23wmf2 *
 bhwiki php-1.23wmf1 *
-bhwiktionary php-1.23wmf1 *
-biwikibooks php-1.23wmf1 *
+bhwiktionary php-1.23wmf2 *
+biwikibooks php-1.23wmf2 *
 biwiki php-1.23wmf1 *
-biwiktionary php-1.23wmf1 *
+biwiktionary php-1.23wmf2 *
 bjnwiki php-1.23wmf1 *
-bmwikibooks php-1.23wmf1 *
+bmwikibooks php-1.23wmf2 *
 bmwiki php-1.23wmf1 *
-bmwikiquote php-1.23wmf1 *
-bmwiktionary php-1.23wmf1 *
-bnwikibooks php-1.23wmf1 *
+bmwikiquote php-1.23wmf2 *
+bmwiktionary php-1.23wmf2 *
+bnwikibooks php-1.23wmf2 *
 bnwiki php-1.23wmf1 *

[MediaWiki-commits] [Gerrit] Revert Add new recentchanges field rc_source to replace rc_... - change (mediawiki/core)

2013-11-04 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Revert Add new recentchanges field rc_source to replace 
rc_type
..


Revert Add new recentchanges field rc_source to replace rc_type

Apparently the rc_source column has been added on only 158 out of 879 wikis 
total.

Needs to be merged and deployed before/at the start of todays deploy

This reverts commit 6bbd4bca6c1341395988fdfdcf4788ce187edfa9.

Change-Id: Ibcf77ed7f04c14a477d7cfd0e244929c552c3394
(cherry picked from commit 189b7364b5e48d86ec0b078c8aad7124e4d09b29)
---
M RELEASE-NOTES-1.22
M includes/changes/RecentChange.php
M includes/installer/MysqlUpdater.php
M includes/installer/PostgresUpdater.php
M includes/installer/SqliteUpdater.php
D maintenance/archives/patch-rc_source.sql
D maintenance/populateRecentChangesSource.php
M maintenance/postgres/tables.sql
M maintenance/rebuildrecentchanges.php
M maintenance/tables.sql
10 files changed, 0 insertions(+), 157 deletions(-)

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



diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 769f661..6ce2801 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -421,15 +421,6 @@
 * (bug 46751) Made Buryat (Russia) (буряад) (bxr) fallback to Russian.
 
 === Other changes in 1.22 ===
-* The rc_type field in the recentchanges table has been superseded by a new
-  rc_source field.  The rc_source field is a string representation of the
-  change type where rc_type was a numeric constant.  This field is not yet
-  queried but will be in a future point release of 1.22.  
-** Utilize update.php to create and populate this new field.  On larger wiki's
-   which do not wish to update recentchanges table in one large update please
-   review the sql and comments in maintenance/archives/patch-rc_source.sql.
-** The rc_type field of recentchanges will be deprecated in a future point
-   release.
 * BREAKING CHANGE: Implementation of MediaWiki's JS and JSON value encoding
   has changed:
 ** MediaWiki no longer supports PHP installations in which the native JSON
diff --git a/includes/changes/RecentChange.php 
b/includes/changes/RecentChange.php
index 282890f..980bd0a 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -30,7 +30,6 @@
  *  rc_namespacenamespace #
  *  rc_titlenon-prefixed db key
  *  rc_type is new entry, used to determine whether updating is 
necessary
- *  rc_source   string representation of change source
  *  rc_minoris minor
  *  rc_cur_id   page_id of associated page entry
  *  rc_user user id who made the entry
@@ -65,14 +64,6 @@
  * @todo document functions and variables
  */
 class RecentChange {
-
-   // Constants for the rc_source field.  Extensions may also have
-   // their own source constants.
-   const SRC_EDIT = 'mw.edit';
-   const SRC_NEW = 'mw.new';
-   const SRC_LOG = 'mw.log';
-   const SRC_EXTERNAL = 'mw.external'; // obsolete
-
var $mAttribs = array(), $mExtra = array();
 
/**
@@ -168,7 +159,6 @@
'rc_this_oldid',
'rc_last_oldid',
'rc_type',
-   'rc_source',
'rc_patrolled',
'rc_ip',
'rc_old_len',
@@ -499,7 +489,6 @@
'rc_namespace'  = $title-getNamespace(),
'rc_title'  = $title-getDBkey(),
'rc_type'   = RC_EDIT,
-   'rc_source' = self::SRC_EDIT,
'rc_minor'  = $minor ? 1 : 0,
'rc_cur_id' = $title-getArticleID(),
'rc_user'   = $user-getId(),
@@ -559,7 +548,6 @@
'rc_namespace'  = $title-getNamespace(),
'rc_title'  = $title-getDBkey(),
'rc_type'   = RC_NEW,
-   'rc_source' = self::SRC_NEW,
'rc_minor'  = $minor ? 1 : 0,
'rc_cur_id' = $title-getArticleID(),
'rc_user'   = $user-getId(),
@@ -669,7 +657,6 @@
'rc_namespace'  = $target-getNamespace(),
'rc_title'  = $target-getDBkey(),
'rc_type'   = RC_LOG,
-   'rc_source' = self::SRC_LOG,
'rc_minor'  = 0,
'rc_cur_id' = $target-getArticleID(),
'rc_user'   = $user-getId(),
@@ -729,7 +716,6 @@
'rc_comment' = $row-rev_comment,
'rc_minor' = $row-rev_minor_edit ? 1 : 0,
'rc_type' = $row-page_is_new ? RC_NEW : RC_EDIT,
-   'rc_source' = $row-page_is_new

[MediaWiki-commits] [Gerrit] Thanks tests now depends on Echo extension - change (integration/jenkins-job-builder-config)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Thanks tests now depends on Echo extension
..


Thanks tests now depends on Echo extension

This will be needed once Id085db7096d is merged!

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

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



diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index ff1a2da..5ae593a 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -467,6 +467,10 @@
 ext-name: Serialization
  - '{name}-{ext-name}-testextensions-{mwbranch}':
 name: mwext
+ext-name: Thanks
+dependencies: 'Echo'
+ - '{name}-{ext-name}-testextensions-{mwbranch}':
+name: mwext
 ext-name: TranslationNotifications
 dependencies: 'Translate'
  - '{name}-{ext-name}-testextensions-{mwbranch}':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ec2edf62b994da818f9a579e60e602d943dc1b5
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] unit tests for Thanks extension - change (integration/zuul-config)

2013-11-04 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: unit tests for Thanks extension
..

unit tests for Thanks extension

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


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

diff --git a/layout.yaml b/layout.yaml
index a8ba592..ca3dc23 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -2196,7 +2196,7 @@
 
   - name: mediawiki/extensions/Thanks
 template:
-  - name: extension-checks
+  - name: extension-unittests
 extname: Thanks
 
   - name: mediawiki/extensions/TimedMediaHandler

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ec2edf62b994da818f9a579e60e602d943dc1b5
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] unit tests for Thanks extension - change (integration/zuul-config)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: unit tests for Thanks extension
..


unit tests for Thanks extension

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

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



diff --git a/layout.yaml b/layout.yaml
index a8ba592..ca3dc23 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -2196,7 +2196,7 @@
 
   - name: mediawiki/extensions/Thanks
 template:
-  - name: extension-checks
+  - name: extension-unittests
 extname: Thanks
 
   - name: mediawiki/extensions/TimedMediaHandler

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ec2edf62b994da818f9a579e60e602d943dc1b5
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
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 dhcp entries for cp1021-1036, 1041-42, reclaimed (rt ... - change (operations/puppet)

2013-11-04 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

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


Change subject: remove dhcp entries for cp1021-1036, 1041-42, reclaimed (rt 
#5981)
..

remove dhcp entries for cp1021-1036, 1041-42, reclaimed (rt #5981)

Change-Id: Ia8a9e3243195d3c40363f303e7ed03a8c08b3a90
---
M files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 0 insertions(+), 91 deletions(-)


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

diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200 
b/files/dhcpd/linux-host-entries.ttyS1-115200
index bdefd3f..011126a 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -395,87 +395,6 @@
filename lucid-installer/ubuntu-installer/amd64/pxelinux.0;
 }
 
-host cp1021 {
-   hardware ethernet 84:2b:2b:fd:b9:f6;
-   fixed-address cp1021.eqiad.wmnet;
-}
-
-host cp1022 {
-   hardware ethernet 84:2b:2b:fd:bf:69;
-   fixed-address cp1022.eqiad.wmnet;
-}
-
-host cp1023 {
-   hardware ethernet 84:2b:2b:fd:bf:72;
-   fixed-address cp1023.eqiad.wmnet;
-}
-
-
-host cp1024 {
-   hardware ethernet 84:2b:2b:fd:c0:a4;
-   fixed-address cp1024.eqiad.wmnet;
-}
-
-host cp1025 {
-   hardware ethernet 84:2b:2b:fd:bd:95;
-   fixed-address cp1025.eqiad.wmnet;
-}
-
-host cp1026 {
-   hardware ethernet 84:2b:2b:fd:bd:29;
-   fixed-address cp1026.eqiad.wmnet;
-}
-
-host cp1027 {
-   hardware ethernet 84:2b:2b:fd:bf:33;
-   fixed-address cp1027.eqiad.wmnet;
-}
-
-host cp1028 {
-   hardware ethernet 84:2b:2b:fd:bf:d5;
-   fixed-address cp1028.eqiad.wmnet;
-}
-
-host cp1029 {
-   hardware ethernet 84:2b:2b:fd:ab:95;
-   fixed-address cp1029.eqiad.wmnet;
-}
-
-host cp1030 {
-   hardware ethernet 84:2b:2b:fd:bf:9f;
-   fixed-address cp1030.eqiad.wmnet;
-}
-
-host cp1031 {
-   hardware ethernet 18:03:73:f7:73:c9;
-   fixed-address cp1031.eqiad.wmnet;
-}
-
-host cp1032 {
-   hardware ethernet 84:2b:2b:fd:bd:9e;
-   fixed-address cp1032.eqiad.wmnet;
-}
-
-host cp1033 {
-   hardware ethernet 84:2b:2b:fd:bc:5a;
-   fixed-address cp1033.eqiad.wmnet;
-}
-
-host cp1034 {
-   hardware ethernet 84:2b:2b:fd:be:76;
-   fixed-address cp1034.eqiad.wmnet;
-}
-
-host cp1035 {
-   hardware ethernet 84:2b:2b:fd:c0:0b;
-   fixed-address cp1035.eqiad.wmnet;
-}
-
-host cp1036 {
-   hardware ethernet 84:2b:2b:fc:ad:79;
-   fixed-address cp1036.eqiad.wmnet;
-}
-
 host cp1037 {
hardware ethernet 84:2b:2b:fd:bf:2a;
fixed-address cp1037.eqiad.wmnet;
@@ -494,16 +413,6 @@
 host cp1040 {
hardware ethernet 84:2b:2b:fd:be:fd;
fixed-address cp1040.eqiad.wmnet;
-}
-
-host cp1041 {
-   hardware ethernet 84:2b:2b:fd:be:d9;
-   fixed-address cp1041.eqiad.wmnet;
-}
-
-host cp1042 {
-   hardware ethernet 84:2b:2b:fd:bf:18;
-   fixed-address cp1042.eqiad.wmnet;
 }
 
 host cp1043 {

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

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

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

[MediaWiki-commits] [Gerrit] remove dhcp entries for cp1021-1036, 1041-42, reclaimed (rt ... - change (operations/puppet)

2013-11-04 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: remove dhcp entries for cp1021-1036, 1041-42, reclaimed (rt 
#5981)
..


remove dhcp entries for cp1021-1036, 1041-42, reclaimed (rt #5981)

Change-Id: Ia8a9e3243195d3c40363f303e7ed03a8c08b3a90
---
M files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 0 insertions(+), 91 deletions(-)

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



diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200 
b/files/dhcpd/linux-host-entries.ttyS1-115200
index bdefd3f..011126a 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -395,87 +395,6 @@
filename lucid-installer/ubuntu-installer/amd64/pxelinux.0;
 }
 
-host cp1021 {
-   hardware ethernet 84:2b:2b:fd:b9:f6;
-   fixed-address cp1021.eqiad.wmnet;
-}
-
-host cp1022 {
-   hardware ethernet 84:2b:2b:fd:bf:69;
-   fixed-address cp1022.eqiad.wmnet;
-}
-
-host cp1023 {
-   hardware ethernet 84:2b:2b:fd:bf:72;
-   fixed-address cp1023.eqiad.wmnet;
-}
-
-
-host cp1024 {
-   hardware ethernet 84:2b:2b:fd:c0:a4;
-   fixed-address cp1024.eqiad.wmnet;
-}
-
-host cp1025 {
-   hardware ethernet 84:2b:2b:fd:bd:95;
-   fixed-address cp1025.eqiad.wmnet;
-}
-
-host cp1026 {
-   hardware ethernet 84:2b:2b:fd:bd:29;
-   fixed-address cp1026.eqiad.wmnet;
-}
-
-host cp1027 {
-   hardware ethernet 84:2b:2b:fd:bf:33;
-   fixed-address cp1027.eqiad.wmnet;
-}
-
-host cp1028 {
-   hardware ethernet 84:2b:2b:fd:bf:d5;
-   fixed-address cp1028.eqiad.wmnet;
-}
-
-host cp1029 {
-   hardware ethernet 84:2b:2b:fd:ab:95;
-   fixed-address cp1029.eqiad.wmnet;
-}
-
-host cp1030 {
-   hardware ethernet 84:2b:2b:fd:bf:9f;
-   fixed-address cp1030.eqiad.wmnet;
-}
-
-host cp1031 {
-   hardware ethernet 18:03:73:f7:73:c9;
-   fixed-address cp1031.eqiad.wmnet;
-}
-
-host cp1032 {
-   hardware ethernet 84:2b:2b:fd:bd:9e;
-   fixed-address cp1032.eqiad.wmnet;
-}
-
-host cp1033 {
-   hardware ethernet 84:2b:2b:fd:bc:5a;
-   fixed-address cp1033.eqiad.wmnet;
-}
-
-host cp1034 {
-   hardware ethernet 84:2b:2b:fd:be:76;
-   fixed-address cp1034.eqiad.wmnet;
-}
-
-host cp1035 {
-   hardware ethernet 84:2b:2b:fd:c0:0b;
-   fixed-address cp1035.eqiad.wmnet;
-}
-
-host cp1036 {
-   hardware ethernet 84:2b:2b:fc:ad:79;
-   fixed-address cp1036.eqiad.wmnet;
-}
-
 host cp1037 {
hardware ethernet 84:2b:2b:fd:bf:2a;
fixed-address cp1037.eqiad.wmnet;
@@ -494,16 +413,6 @@
 host cp1040 {
hardware ethernet 84:2b:2b:fd:be:fd;
fixed-address cp1040.eqiad.wmnet;
-}
-
-host cp1041 {
-   hardware ethernet 84:2b:2b:fd:be:d9;
-   fixed-address cp1041.eqiad.wmnet;
-}
-
-host cp1042 {
-   hardware ethernet 84:2b:2b:fd:bf:18;
-   fixed-address cp1042.eqiad.wmnet;
 }
 
 host cp1043 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8a9e3243195d3c40363f303e7ed03a8c08b3a90
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fix pluralization (is/are) - change (mediawiki...BetaFeatures)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Fix pluralization (is/are)
..


Fix pluralization (is/are)

Spotted by McDutchie
http://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Mw-ui-feature-requirements-browser/en

Change-Id: I440c1946819fcc5ad012a9c573028bf0411814ad
---
M BetaFeatures.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/BetaFeatures.i18n.php b/BetaFeatures.i18n.php
index de4f1e5..21fa6f6 100644
--- a/BetaFeatures.i18n.php
+++ b/BetaFeatures.i18n.php
@@ -32,7 +32,7 @@
'mw-ui-feature-user-count'  = '{{PLURAL:$1|One user has|$1 users 
have}} enabled this feature.',
 
'mw-ui-feature-requirements-betafeatures' = 'This feature requires the 
following {{PLURAL:$1|feature|features}} to be enabled:',
-   'mw-ui-feature-requirements-browser' = 'The following 
{{PLURAL:$1|browser|browsers}} are not supported:',
+   'mw-ui-feature-requirements-browser' = 'The following 
{{PLURAL:$1|browser is|browsers are}} not supported:',
'mw-ui-feature-requirements-javascript' = 'This feature requires 
JavaScript.',
'mw-ui-feature-requirements-skins' = 'This feature requires you to be 
using {{PLURAL:$1|the following skin|one of the following skins}}:',
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I440c1946819fcc5ad012a9c573028bf0411814ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] WIP moving code to the gem - change (mediawiki/selenium)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: WIP moving code to the gem
..

WIP moving code to the gem

Bug: 56088
Change-Id: I830ede3c1fa82e0ce307ca7ca687143a19bc76ef
---
M lib/mediawiki/selenium.rb
R lib/mediawiki/selenium/features/support/env.rb
R lib/mediawiki/selenium/features/support/hooks.rb
A lib/mediawiki/selenium/features/support/modules/url_module.rb
A lib/mediawiki/selenium/features/support/pages/login_page.rb
R lib/mediawiki/selenium/features/support/sauce.rb
6 files changed, 64 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/37/93437/1

diff --git a/lib/mediawiki/selenium.rb b/lib/mediawiki/selenium.rb
index dbdbc20..5b706e3 100644
--- a/lib/mediawiki/selenium.rb
+++ b/lib/mediawiki/selenium.rb
@@ -9,8 +9,14 @@
 https://github.com/zeljkofilipin/mediawiki-selenium/blob/master/CREDITS.
 =end
 
-require mediawiki/selenium/env
-require mediawiki/selenium/hooks
-require mediawiki/selenium/sauce
 require mediawiki/selenium/version
 
+require mediawiki/selenium/features/support/env
+require mediawiki/selenium/features/support/hooks
+require mediawiki/selenium/features/support/sauce
+
+require mediawiki/selenium/features/support/modules/url_module
+
+require mediawiki/selenium/features/support/modules/url_module
+
+
diff --git a/lib/mediawiki/selenium/env.rb 
b/lib/mediawiki/selenium/features/support/env.rb
similarity index 100%
rename from lib/mediawiki/selenium/env.rb
rename to lib/mediawiki/selenium/features/support/env.rb
diff --git a/lib/mediawiki/selenium/hooks.rb 
b/lib/mediawiki/selenium/features/support/hooks.rb
similarity index 100%
rename from lib/mediawiki/selenium/hooks.rb
rename to lib/mediawiki/selenium/features/support/hooks.rb
diff --git a/lib/mediawiki/selenium/features/support/modules/url_module.rb 
b/lib/mediawiki/selenium/features/support/modules/url_module.rb
new file mode 100644
index 000..eb8c7e4
--- /dev/null
+++ b/lib/mediawiki/selenium/features/support/modules/url_module.rb
@@ -0,0 +1,21 @@
+#
+# This file is subject to the license terms in the LICENSE file found in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
+# qa-browsertests, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the LICENSE file.
+#
+# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
+#
+module URL
+  def self.url(name)
+if ENV['MEDIAWIKI_URL']
+  mediawiki_url = ENV['MEDIAWIKI_URL']
+else
+  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
+end
+#{mediawiki_url}#{name}
+  end
+end
diff --git a/lib/mediawiki/selenium/features/support/pages/login_page.rb 
b/lib/mediawiki/selenium/features/support/pages/login_page.rb
new file mode 100644
index 000..0652827
--- /dev/null
+++ b/lib/mediawiki/selenium/features/support/pages/login_page.rb
@@ -0,0 +1,34 @@
+#
+# This file is subject to the license terms in the LICENSE file found in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
+# qa-browsertests, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the LICENSE file.
+#
+# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the
+# qa-browsertests top-level directory and at
+# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
+#
+class LoginPage
+  include PageObject
+
+  include URL
+  page_url URL.url('Special:UserLogin')
+
+  div(:feedback, class: 'errorbox')
+  button(:login, id: 'wpLoginAttempt')
+  text_field(:password, id: 'wpPassword1')
+  a(:password_strength, text: 'password strength')
+  a(:phishing, text: 'phishing')
+  text_field(:username, id: 'wpName1')
+  a(:username_displayed, title: /Your user page/)
+
+  def logged_in_as_element
+@browser.div(id: 'mw-content-text').p.b
+  end
+  def login_with(username, password)
+self.username = username
+self.password = password
+login
+  end
+end
diff --git a/lib/mediawiki/selenium/sauce.rb 
b/lib/mediawiki/selenium/features/support/sauce.rb
similarity index 100%
rename from lib/mediawiki/selenium/sauce.rb
rename to lib/mediawiki/selenium/features/support/sauce.rb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I830ede3c1fa82e0ce307ca7ca687143a19bc76ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

[MediaWiki-commits] [Gerrit] Bump patch version - change (mediawiki/selenium)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Bump patch version
..

Bump patch version

Releasing new version of the gem.

Change-Id: I84f4a1bfdd96ce2bed2b004b06e557d5e0aaf926
---
M lib/mediawiki/selenium/version.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/38/93438/1

diff --git a/lib/mediawiki/selenium/version.rb 
b/lib/mediawiki/selenium/version.rb
index 984f47b..2328e60 100644
--- a/lib/mediawiki/selenium/version.rb
+++ b/lib/mediawiki/selenium/version.rb
@@ -11,6 +11,6 @@
 
 module Mediawiki
   module Selenium
-VERSION = 0.1.10
+VERSION = 0.1.11
   end
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84f4a1bfdd96ce2bed2b004b06e557d5e0aaf926
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated to the latest version of mediawiki-selenium gem - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated to the latest version of mediawiki-selenium gem
..

Updated to the latest version of mediawiki-selenium gem

Change-Id: I60ad73add189a496d2ec92fa16f137d288d38770
---
M tests/browser/Gemfile
M tests/browser/Gemfile.lock
2 files changed, 16 insertions(+), 23 deletions(-)


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

diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 84810b9..6f2ef05 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,11 +3,4 @@
 
 source 'https://rubygems.org'
 
-gem 'cucumber'
-gem 'json'
 gem 'mediawiki-selenium'
-gem 'net-http-persistent'
-gem 'page-object'
-gem 'rest-client'
-gem 'rspec-expectations'
-gem 'syntax'
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index fa2be84..64fb59a 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,19 +16,26 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.8)
-mime-types (1.25)
+json (1.8.1)
+mediawiki-selenium (0.1.11)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
@@ -36,11 +43,11 @@
   mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 watir-webdriver (0.6.4)
@@ -52,11 +59,4 @@
   ruby
 
 DEPENDENCIES
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
-  rest-client
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60ad73add189a496d2ec92fa16f137d288d38770
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update formatting - change (mediawiki/core)

2013-11-04 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Update formatting
..

Update formatting

Change-Id: I5ec6257295261caab6cb2d9eb9d32ce76cae08a2
---
M includes/utils/ArrayUtils.php
M includes/utils/Cdb.php
M includes/utils/Cdb_PHP.php
M includes/utils/ConfEditor.php
M includes/utils/HashRing.php
M includes/utils/IP.php
M includes/utils/MWCryptRand.php
M includes/utils/MWFunction.php
M includes/utils/MappedIterator.php
M includes/utils/StringUtils.php
M includes/utils/UIDGenerator.php
M includes/utils/ZipDirectoryReader.php
12 files changed, 322 insertions(+), 241 deletions(-)


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

diff --git a/includes/utils/ArrayUtils.php b/includes/utils/ArrayUtils.php
index 97a56e1..a222f81 100644
--- a/includes/utils/ArrayUtils.php
+++ b/includes/utils/ArrayUtils.php
@@ -63,6 +63,7 @@
break;
}
}
+
return $i;
}
 }
diff --git a/includes/utils/Cdb.php b/includes/utils/Cdb.php
index 81c0afe..996b7af 100644
--- a/includes/utils/Cdb.php
+++ b/includes/utils/Cdb.php
@@ -38,6 +38,7 @@
return new CdbReader_DBA( $fileName );
} else {
wfDebug( Warning: no dba extension found, using 
emulation.\n );
+
return new CdbReader_PHP( $fileName );
}
}
@@ -55,6 +56,7 @@
if ( !in_array( 'cdb', $handlers ) || !in_array( 'cdb_make', 
$handlers ) ) {
return false;
}
+
return true;
}
 
@@ -94,6 +96,7 @@
return new CdbWriter_DBA( $fileName );
} else {
wfDebug( Warning: no dba extension found, using 
emulation.\n );
+
return new CdbWriter_PHP( $fileName );
}
}
diff --git a/includes/utils/Cdb_PHP.php b/includes/utils/Cdb_PHP.php
index a38b9a8..8c10b53 100644
--- a/includes/utils/Cdb_PHP.php
+++ b/includes/utils/Cdb_PHP.php
@@ -40,6 +40,7 @@
public static function unsignedMod( $a, $b ) {
if ( $a  0x8000 ) {
$m = ( $a  0x7fff ) % $b + 2 * ( 0x4000 % $b );
+
return $m % $b;
} else {
return $a % $b;
@@ -89,6 +90,7 @@
$h ^= ord( $s[$i] );
$h = 0x;
}
+
return $h;
}
 }
@@ -164,6 +166,7 @@
 */
protected function match( $key, $pos ) {
$buf = $this-read( strlen( $key ), $pos );
+
return $buf === $key;
}
 
@@ -193,6 +196,7 @@
throw new MWException(
'Read from CDB file failed, file ' . 
$this-fileName . ' may be corrupted.' );
}
+
return $buf;
}
 
@@ -208,6 +212,7 @@
throw new MWException(
'Error in CDB file ' . $this-fileName . ', 
integer too big.' );
}
+
return $data[1];
}
 
@@ -218,6 +223,7 @@
 */
protected function unpackSigned( $s ) {
$data = unpack( 'va/vb', $s );
+
return $data['a'] | ( $data['b']  16 );
}
 
@@ -260,10 +266,12 @@
// Found
$this-dlen = $this-unpack31( substr( 
$buf, 4 ) );
$this-dpos = $pos + 8 + $keyLen;
+
return true;
}
}
}
+
return false;
}
 
@@ -273,6 +281,7 @@
 */
protected function find( $key ) {
$this-findStart();
+
return $this-findNext( $key );
}
 }
@@ -411,7 +420,7 @@
// Calculate the number of items that will be in each hashtable
$counts = array_fill( 0, 256, 0 );
foreach ( $this-hplist as $item ) {
-   ++ $counts[255  $item['h']];
+   ++$counts[255  $item['h']];
}
 
// Fill in $starts with the *end* indexes
diff --git a/includes/utils/ConfEditor.php b/includes/utils/ConfEditor.php
index 67cb87d..163f73c 100644
--- a/includes/utils/ConfEditor.php
+++ b/includes/utils/ConfEditor.php
@@ -115,6 +115,7 @@
} catch ( ConfEditorParseError $e ) {
return $e-getMessage() . \n . $e-highlight( $text );
}
+
return OK;
}
 
@@ -174,78 +175,78 @@
$key = isset( $op['key'] ) ? $op['key'] : null;

[MediaWiki-commits] [Gerrit] Updated to the latest version of mediawiki-selenium gem - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Updated to the latest version of mediawiki-selenium gem
..


Updated to the latest version of mediawiki-selenium gem

Change-Id: I60ad73add189a496d2ec92fa16f137d288d38770
---
M tests/browser/Gemfile
M tests/browser/Gemfile.lock
2 files changed, 16 insertions(+), 23 deletions(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 84810b9..6f2ef05 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,11 +3,4 @@
 
 source 'https://rubygems.org'
 
-gem 'cucumber'
-gem 'json'
 gem 'mediawiki-selenium'
-gem 'net-http-persistent'
-gem 'page-object'
-gem 'rest-client'
-gem 'rspec-expectations'
-gem 'syntax'
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index fa2be84..64fb59a 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,19 +16,26 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.8)
-mime-types (1.25)
+json (1.8.1)
+mediawiki-selenium (0.1.11)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
@@ -36,11 +43,11 @@
   mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 watir-webdriver (0.6.4)
@@ -52,11 +59,4 @@
   ruby
 
 DEPENDENCIES
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
-  rest-client
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60ad73add189a496d2ec92fa16f137d288d38770
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Initializing toolbar controller before entity view - change (mediawiki...Wikibase)

2013-11-04 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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


Change subject: Initializing toolbar controller before entity view
..

Initializing toolbar controller before entity view

Initializing the toolbarcontroller widget before the entiyview widget allows 
catching widget
create events by the toolbarcontroller.

Change-Id: I78d81a11e5a42e0fac7d281cde83f6af3ff890dc
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
M repo/resources/wikibase.ui.entityViewInit.js
4 files changed, 23 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/60/92860/2

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 2b28686..66750fc 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -44,15 +44,12 @@
$claimsHeading =
$( mw.template( 'wb-section-heading', mw.msg( 
'wikibase-statements' ), '' ) );
 
-   this.$claims = $( 'div/' ).claimgrouplistview( {
+   this.element.append( $claimsHeading );
+
+   this.$claims = $( 'div/' ).appendTo( this.element 
).claimgrouplistview( {
value: entity.getClaims(),
entityType: entity.getType()
} );
-
-   // append all the stuff:
-   // NOTE: doing this here will prevent events from bubbling 
during widget initializations!
-   //   Shouldn't harm and will increase performance because 
DOM needs to render once only.
-   this.element.append( $claimsHeading ).append( this.$claims );
 
this._handleEditModeAffairs();
},
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 3e06089..f3570e7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -65,7 +65,7 @@
 
if( this.value() ) {
var $listview = $( 'div/' )
-   .appendTo( this.$references )
+   .prependTo( this.$references )
.listview( {
listItemAdapter: new 
$.wikibase.listview.ListItemAdapter( {
listItemWidget: 
$.wikibase.referenceview,
diff --git a/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js 
b/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
index 2bf25c1..3ab92da 100644
--- a/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
+++ b/lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
@@ -149,7 +149,8 @@
self.element.on( eventPrefix + 
'create.' + self.widgetName, function( event ) {
var $target = $( event.target ),
isWidget = !!def.widget,
-   isPending = isWidget  
!$target.data( def.widget.name ).value();
+   widget = isWidget  
$target.data( def.widget.name ),
+   isPending = isWidget  
widget.value  !$target.data( def.widget.name ).value();
 
if ( type === 'addtoolbar' ) {
// Initialize toolbars 
that are not initialized already:
diff --git a/repo/resources/wikibase.ui.entityViewInit.js 
b/repo/resources/wikibase.ui.entityViewInit.js
index b223008..7ada767 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -116,6 +116,22 @@
var $claims = $( '.wb-claims' ).first(),
$claimsParent = $claims.parent();
 
+   // The toolbars (defined per 
jquery.wikibase.toolbarcontroller.definition) that should
+   // be initialized:
+   var toolbarControllerConfig = {
+   addtoolbar: ['claimgrouplistview', 
'claimlistview', 'claim-qualifiers-snak', 'references', 
'referenceview-snakview'],
+   edittoolbar: ['statementview', 'referenceview'],
+   removetoolbar: ['claim-qualifiers-snak', 
'referenceview-snakview-remove']
+   };
+
+   if( mw.config.get(

[MediaWiki-commits] [Gerrit] Simplified toolbarcontroller.definition - change (mediawiki...Wikibase)

2013-11-04 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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


Change subject: Simplified toolbarcontroller.definition
..

Simplified toolbarcontroller.definition

This change set greatly reduces the toolbarcontroller mechanism.
Most of the toolbarcontroller.definition options are removed reducing the ways 
to defined
a toolbar for the toolbarcontroller to one. Special combinations of widget name 
with other
options are dropped which moves some logic into the particular definitions. 
(The resulting
code duplication shall be dealt within some upcoming change.)
Along with this change, the addtoolbar's eventPrefix option has become 
obsolete and is
removed.
Instead of on the node the toolbar is initialized on, now, the event handlers 
are
initialized on the toolbarcontroller's node simplifying the toolbarcontroller's 
management
mechanics (some optimization will be done in some upcoming change).

Change-Id: I8722996765273eb1dac105583008d88d5585050c
---
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.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/toolbar/addtoolbar.js
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
8 files changed, 246 insertions(+), 273 deletions(-)


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

diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
index f697a49..bc5fee4 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
@@ -315,9 +315,25 @@
 } );
 
 $.wikibase.toolbarcontroller.definition( 'addtoolbar', {
-   widgetName: 'wikibase.claimgrouplistview',
-   options: {
-   interactionWidgetName: 
$.wikibase.claimgrouplistview.prototype.widgetName
+   id: 'claimgrouplistview',
+   selector: ':' + $.wikibase.claimgrouplistview.prototype.namespace
+   + '-' + $.wikibase.claimgrouplistview.prototype.widgetName,
+   events: {
+   claimgrouplistviewcreate: function( event ) {
+   $( event.target ).addtoolbar( {
+   interactionWidgetName: 
$.wikibase.claimgrouplistview.prototype.widgetName
+   } );
+   },
+   claimgrouplistviewdestroy: function( event ) {
+   var $target = $( event.target ),
+   addtoolbar = $target.data( 'addtoolbar' );
+
+   if( addtoolbar ) {
+   addtoolbar.destroy();
+   $target.removeData( 'addtoolbar' );
+   $target.children( '.' + 
$.wikibase.addtoolbar.prototype.widgetBaseClass ).remove();
+   }
+   }
}
 } );
 
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 7bc3d3a..48784f6 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -296,15 +296,55 @@
 } );
 
 $.wikibase.toolbarcontroller.definition( 'addtoolbar', {
-   widgetName: 'wikibase.claimlistview',
-   options: {
-   interactionWidgetName: 
$.wikibase.claimlistview.prototype.widgetName
+   id: 'claimlistview',
+   selector: ':' + $.wikibase.claimlistview.prototype.namespace
+   + '-' + $.wikibase.claimlistview.prototype.widgetName,
+   events: {
+   claimlistviewcreate: function( event ) {
+   var $claimlistview = $( event.target );
+
+   $claimlistview.addtoolbar( {
+   interactionWidgetName: 
$.wikibase.claimlistview.prototype.widgetName
+   } );
+   },
+   claimlistviewdestroy: function( event ) {
+   var $target = $( event.target ),
+   addtoolbar = $target.data( 'addtoolbar' );
+
+   if( addtoolbar ) {
+   addtoolbar.destroy();
+   $target.removeData( 'addtoolbar' );
+   $target.children( '.' + 
$.wikibase.addtoolbar.prototype.widgetBaseClass ).remove();
+   }
+   }
}
 } );
 
 $.wikibase.toolbarcontroller.definition( 'edittoolbar', {
-

[MediaWiki-commits] [Gerrit] Introduced toolbarcontroller.destroyToolbar function - change (mediawiki...Wikibase)

2013-11-04 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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


Change subject: Introduced toolbarcontroller.destroyToolbar function
..

Introduced toolbarcontroller.destroyToolbar function

Passing the toolbarcontroller instance as parameter to the event handlers 
managed by the
controller allows destroying toolbars in a more appropriate way via the 
controller itself.

Change-Id: I545eefc331b9f501f79f8386c1d80f68a3920ea6
---
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.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.definitions.js
M lib/resources/jquery.wikibase/toolbar/toolbarcontroller.js
7 files changed, 43 insertions(+), 77 deletions(-)


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

diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
index bc5fee4..7727e97 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
@@ -324,15 +324,8 @@
interactionWidgetName: 
$.wikibase.claimgrouplistview.prototype.widgetName
} );
},
-   claimgrouplistviewdestroy: function( event ) {
-   var $target = $( event.target ),
-   addtoolbar = $target.data( 'addtoolbar' );
-
-   if( addtoolbar ) {
-   addtoolbar.destroy();
-   $target.removeData( 'addtoolbar' );
-   $target.children( '.' + 
$.wikibase.addtoolbar.prototype.widgetBaseClass ).remove();
-   }
+   claimgrouplistviewdestroy: function( event, toolbarController ) 
{
+   toolbarController.destroyToolbar( $( event.target 
).data( 'addtoolbar' ) );
}
}
 } );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 48784f6..ee82969 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -307,15 +307,8 @@
interactionWidgetName: 
$.wikibase.claimlistview.prototype.widgetName
} );
},
-   claimlistviewdestroy: function( event ) {
-   var $target = $( event.target ),
-   addtoolbar = $target.data( 'addtoolbar' );
-
-   if( addtoolbar ) {
-   addtoolbar.destroy();
-   $target.removeData( 'addtoolbar' );
-   $target.children( '.' + 
$.wikibase.addtoolbar.prototype.widgetBaseClass ).remove();
-   }
+   claimlistviewdestroy: function( event, toolbarcontroller ) {
+   toolbarcontroller.destroyToolbar( $( event.target 
).data( 'addtoolbar' ) );
}
}
 } );
@@ -335,15 +328,8 @@
enableRemove: !!statementview.value()
} );
},
-   statementviewdestroy: function( event ) {
-   var $statementview = $( event.target ),
-   edittoolbar = $statementview.data( 
'edittoolbar' );
-
-   if( edittoolbar ) {
-   edittoolbar.destroy();
-   $statementview.removeData( 'addtoolbar' );
-   $statementview.children( '.' + 
$.wikibase.edittoolbar.prototype.widgetBaseClass ).remove();
-   }
+   statementviewdestroy: function( event, toolbarController ) {
+   toolbarController.destroyToolbar( $( event.target 
).data( 'editoolbar' ) );
},
statementviewchange: function( event ) {
var $target = $( event.target ),
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index 7800a65..b294d72 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -715,7 +715,7 @@
} );
}
},
-   'listviewdestroy

[MediaWiki-commits] [Gerrit] Address PHP CodeSniffer errors and warnings - change (mediawiki/core)

2013-11-04 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Address PHP CodeSniffer errors and warnings
..

Address PHP CodeSniffer errors and warnings

Change-Id: I495481e3532834f1f8a45cda9402d609de7e2bd7
---
M includes/AutoLoader.php
M includes/utils/Cdb.php
M includes/utils/Cdb_PHP.php
M includes/utils/ConfEditor.php
M includes/utils/MWCryptRand.php
M includes/utils/StringUtils.php
M includes/utils/ZipDirectoryReader.php
M tests/phpunit/includes/CdbTest.php
8 files changed, 106 insertions(+), 92 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/93442/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 1417c77..a15a452 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -1046,11 +1046,11 @@
'ArrayUtils' = 'includes/utils/ArrayUtils.php',
'CdbFunctions' = 'includes/utils/Cdb_PHP.php',
'CdbReader' = 'includes/utils/Cdb.php',
-   'CdbReader_DBA' = 'includes/utils/Cdb.php',
-   'CdbReader_PHP' = 'includes/utils/Cdb_PHP.php',
+   'CdbReaderDBA' = 'includes/utils/Cdb.php',
+   'CdbReaderPHP' = 'includes/utils/Cdb_PHP.php',
'CdbWriter' = 'includes/utils/Cdb.php',
-   'CdbWriter_DBA' = 'includes/utils/Cdb.php',
-   'CdbWriter_PHP' = 'includes/utils/Cdb_PHP.php',
+   'CdbWriterDBA' = 'includes/utils/Cdb.php',
+   'CdbWriterPHP' = 'includes/utils/Cdb_PHP.php',
'ConfEditor' = 'includes/utils/ConfEditor.php',
'ConfEditorParseError' = 'includes/utils/ConfEditor.php',
'ConfEditorToken' = 'includes/utils/ConfEditor.php',
diff --git a/includes/utils/Cdb.php b/includes/utils/Cdb.php
index 996b7af..132289a 100644
--- a/includes/utils/Cdb.php
+++ b/includes/utils/Cdb.php
@@ -35,11 +35,11 @@
 */
public static function open( $fileName ) {
if ( self::haveExtension() ) {
-   return new CdbReader_DBA( $fileName );
+   return new CdbReaderDBA( $fileName );
} else {
wfDebug( Warning: no dba extension found, using 
emulation.\n );
 
-   return new CdbReader_PHP( $fileName );
+   return new CdbReaderPHP( $fileName );
}
}
 
@@ -89,15 +89,15 @@
 *
 * @param $fileName string
 *
-* @return CdbWriter_DBA|CdbWriter_PHP
+* @return CdbWriterDBA|CdbWriterPHP
 */
public static function open( $fileName ) {
if ( CdbReader::haveExtension() ) {
-   return new CdbWriter_DBA( $fileName );
+   return new CdbWriterDBA( $fileName );
} else {
wfDebug( Warning: no dba extension found, using 
emulation.\n );
 
-   return new CdbWriter_PHP( $fileName );
+   return new CdbWriterPHP( $fileName );
}
}
 
@@ -125,8 +125,8 @@
 /**
  * Reader class which uses the DBA extension
  */
-class CdbReader_DBA {
-   var $handle;
+class CdbReaderDBA {
+   public $handle;
 
function __construct( $fileName ) {
$this-handle = dba_open( $fileName, 'r-', 'cdb' );
@@ -150,8 +150,8 @@
 /**
  * Writer class which uses the DBA extension
  */
-class CdbWriter_DBA {
-   var $handle, $realFileName, $tmpFileName;
+class CdbWriterDBA {
+   public $handle, $realFileName, $tmpFileName;
 
function __construct( $fileName ) {
$this-realFileName = $fileName;
diff --git a/includes/utils/Cdb_PHP.php b/includes/utils/Cdb_PHP.php
index 8c10b53..e9a75fd 100644
--- a/includes/utils/Cdb_PHP.php
+++ b/includes/utils/Cdb_PHP.php
@@ -73,7 +73,8 @@
 */
public static function hash( $s ) {
$h = 5381;
-   for ( $i = 0; $i  strlen( $s ); $i++ ) {
+   $len = strlen( $s );
+   for ( $i = 0; $i  $len; $i++ ) {
$h5 = ( $h  5 )  0x;
// Do a 32-bit sum
// Inlined here for speed
@@ -98,33 +99,33 @@
 /**
  * CDB reader class
  */
-class CdbReader_PHP extends CdbReader {
+class CdbReaderPHP extends CdbReader {
/** The filename */
-   var $fileName;
+   public $fileName;
 
/** The file handle */
-   var $handle;
+   public $handle;
 
/* number of hash slots searched under this key */
-   var $loop;
+   public $loop;
 
/* initialized if loop is nonzero */
-   var $khash;
+   public $khash;
 
/* initialized if loop is nonzero */
-   var $kpos;
+   public $kpos;
 
/* initialized if loop is nonzero */
-   var $hpos;
+   public $hpos;
 
/* initialized if loop is nonzero */
-   var $hslots;
+   public $hslots;
 
/* initialized if

[MediaWiki-commits] [Gerrit] Bump patch version - change (mediawiki/selenium)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Bump patch version
..

Bump patch version

Change-Id: Ic900ed84139e397c03c51e3a699c4dc193088a76
---
M lib/mediawiki/selenium/version.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/44/93444/1

diff --git a/lib/mediawiki/selenium/version.rb 
b/lib/mediawiki/selenium/version.rb
index 2328e60..0ccef4c 100644
--- a/lib/mediawiki/selenium/version.rb
+++ b/lib/mediawiki/selenium/version.rb
@@ -11,6 +11,6 @@
 
 module Mediawiki
   module Selenium
-VERSION = 0.1.11
+VERSION = 0.1.12
   end
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic900ed84139e397c03c51e3a699c4dc193088a76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Introduce new variable that points to the variable that hold... - change (mediawiki/selenium)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Introduce new variable that points to the variable that holds 
the password
..

Introduce new variable that points to the variable that holds the password

Paired with Nikerabbit niklas.laxst...@gmail.com

The existing solution works only if one environment variable is set.
Jenkins machine has all four environment variables set, so we had to
find another solution.

Change-Id: I3927321f08777196aae2cffcf180d34aa095
---
M docs/jobs.md
M docs/template.md
M lib/mediawiki/selenium/hooks.rb
3 files changed, 10 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/43/93443/1

diff --git a/docs/jobs.md b/docs/jobs.md
index f074c0a..b47fbbd 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -5,9 +5,13 @@
 - Branch: master
 - MediaWiki URL:
 - Folder:
-- MediaWiki user:
-- MediaWiki password:
 - Repository URL:
+- MediaWiki user:
+- MediaWiki password variable:
+MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
+MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
+MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG
 
 
 
diff --git a/docs/template.md b/docs/template.md
index a592ca9..4b3fcac 100644
--- a/docs/template.md
+++ b/docs/template.md
@@ -131,10 +131,10 @@
 - Display Name: MediaWiki user
 - Type: Text-field
 
-## MediaWiki password
+## MediaWiki password variable
 
-- ID: MEDIAWIKI_PASSWORD
-- Display Name: MediaWiki password
+- ID: MEDIAWIKI_PASSWORD_VARIABLE
+- Display Name: MediaWiki password variable
 - Type: Text-field
 
 ## Jelly-based transformation
@@ -221,8 +221,6 @@
 hudson.tasks.Shell
   command
 export MEDIAWIKI_USER=${MEDIAWIKI_USER}
-export MEDIAWIKI_PASSWORD=${MEDIAWIKI_PASSWORD}
-
 export BROWSER_LABEL=${BROWSER_LABEL}
 export MEDIAWIKI_URL=http://${MEDIAWIKI_URL}/wiki/
 
diff --git a/lib/mediawiki/selenium/hooks.rb b/lib/mediawiki/selenium/hooks.rb
index bfc3b4b..3d62ad0 100644
--- a/lib/mediawiki/selenium/hooks.rb
+++ b/lib/mediawiki/selenium/hooks.rb
@@ -12,11 +12,7 @@
 config = YAML.load_file('config/config.yml')
 
 Before('@login') do
-  ENV['MEDIAWIKI_PASSWORD'] = 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET'] if 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET']
-  ENV['MEDIAWIKI_PASSWORD'] = 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG'] if 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG']
-  ENV['MEDIAWIKI_PASSWORD'] = 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG'] if 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG']
-  ENV['MEDIAWIKI_PASSWORD'] = ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG'] if 
ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG']
-
+  ENV['MEDIAWIKI_PASSWORD'] = ENV[ENV['MEDIAWIKI_PASSWORD_VARIABLE']] if 
ENV['MEDIAWIKI_PASSWORD_VARIABLE']
   puts MEDIAWIKI_USER environment variable is not defined! Please export a 
value for that variable before proceeding. unless ENV['MEDIAWIKI_USER']
   puts MEDIAWIKI_PASSWORD environment variable is not defined! Please export 
a value for that variable before proceeding. unless ENV['MEDIAWIKI_PASSWORD']
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3927321f08777196aae2cffcf180d34aa095
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated to the new version of mediawiki-selenium gem - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated to the new version of mediawiki-selenium gem
..

Updated to the new version of mediawiki-selenium gem

Needed to fix security problem with passwords being visible at Jenkins
machine.

Change-Id: Id828486113804bdc9e4afeba50d74c11bbb57d57
---
M tests/browser/Gemfile.lock
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 64fb59a..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -21,7 +21,7 @@
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
-mediawiki-selenium (0.1.11)
+mediawiki-selenium (0.1.12)
   cucumber
   json
   net-http-persistent

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id828486113804bdc9e4afeba50d74c11bbb57d57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated to the new version of mediawiki-selenium gem - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Updated to the new version of mediawiki-selenium gem
..


Updated to the new version of mediawiki-selenium gem

Needed to fix security problem with passwords being visible at Jenkins
machine.

Change-Id: Id828486113804bdc9e4afeba50d74c11bbb57d57
---
M tests/browser/Gemfile.lock
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 64fb59a..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -21,7 +21,7 @@
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
-mediawiki-selenium (0.1.11)
+mediawiki-selenium (0.1.12)
   cucumber
   json
   net-http-persistent

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id828486113804bdc9e4afeba50d74c11bbb57d57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] add T_PRINT operator and PHP constants - change (mediawiki...Foxway)

2013-11-04 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review.

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


Change subject: add T_PRINT operator and PHP constants
..

add T_PRINT operator and PHP constants

* fix for use Foxway\Runtime::$time instead of $GLOBALS['wgFoxwayTime']
* fix for use self::getNextToken
* fix for pcre functions, add namespace Foxway before ExceptionFoxway

Change-Id: I3cef8f07f5fe3f541dc819f9e449597483f50c23
---
M Foxway.body.php
M Settings.php
M includes/Compiler.php
M includes/Runtime.php
A includes/constants.php
M includes/functions/pcre.php
M tests/phpunit/includes/RuntimeTest.php
7 files changed, 338 insertions(+), 219 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Foxway 
refs/changes/46/93446/1

diff --git a/Foxway.body.php b/Foxway.body.php
index 5deaac3..c076b61 100644
--- a/Foxway.body.php
+++ b/Foxway.body.php
@@ -54,7 +54,7 @@
$return = $exc-getTraceAsString();
}
 
-   $GLOBALS['wgFoxwayTime'] += microtime(true) - self::$startTime;
+   \Foxway\Runtime::$time += microtime(true) - self::$startTime;
return \UtfNormal::cleanUp($return);
}
 
@@ -84,7 +84,7 @@
self::getScope($frame)
);
} catch (Exception $exc) {
-   $GLOBALS['wgFoxwayTime'] += microtime(true) - 
self::$startTime;
+   \Foxway\Runtime::$time += microtime(true) - 
self::$startTime;
return $exc-getTraceAsString();
}
 
@@ -101,7 +101,7 @@
$return .= self::insertGeneral( $parser, 
$parser-recursiveTagParse(implode($result),$frame) );
}
 
-   $GLOBALS['wgFoxwayTime'] += microtime(true) - self::$startTime;
+   \Foxway\Runtime::$time += microtime(true) - self::$startTime;
return \UtfNormal::cleanUp($return);
}
 
@@ -110,7 +110,7 @@
if( \Foxway\Runtime::$allowedNamespaces !== true  
empty(\Foxway\Runtime::$allowedNamespaces[$frame-getTitle()-getNamespace()]) 
) {
return Html::element( 'span', array('class'='error'), 
wfMessage('foxway-disabled-for-namespace', 
$frame-getTitle()-getNsText())-escaped() );
}
-   if( $wgFoxway_max_execution_time !== false  
$GLOBALS['wgFoxwayTime'] = $wgFoxway_max_execution_time) {
+   if( $wgFoxway_max_execution_time !== false  
\Foxway\Runtime::$time = $wgFoxway_max_execution_time) {
return Html::element( 'span', array('class'='error'),
wfMessage( 
'foxway-php-fatal-error-max-execution-time' )
-numParams( 
$wgFoxway_max_execution_time )
diff --git a/Settings.php b/Settings.php
index 0527d31..9d5b44c 100644
--- a/Settings.php
+++ b/Settings.php
@@ -38,159 +38,17 @@
  */
 // Foxway\Runtime::$allowedNamespaces = true; // true by default
 
-Foxway\Runtime::$functions = array_merge( Foxway\Runtime::$functions
-   , include __DIR__ . '/includes/functions/strings.php' // String 
Functions @see http://php.net/manual/en/ref.strings.php
-   , include __DIR__ . '/includes/functions/array.php' // Array 
Functions @see http://www.php.net/manual/en/ref.array.php
-   , include __DIR__ . '/includes/functions/math.php' // Math 
Functions @see http://www.php.net/manual/en/ref.math.php
-   , include __DIR__ . '/includes/functions/var.php' // Variable 
handling Functions @see http://www.php.net/manual/en/ref.var.php
-   , include __DIR__ . '/includes/functions/pcre.php' // PCRE 
Functions @see http://www.php.net/manual/en/ref.pcre.php
+Foxway\Runtime::$functions = array_merge(
+   include __DIR__ . '/includes/functions/strings.php', // String 
Functions @see http://php.net/manual/en/ref.strings.php
+   include __DIR__ . '/includes/functions/array.php', // Array 
Functions @see http://www.php.net/manual/en/ref.array.php
+   include __DIR__ . '/includes/functions/math.php', // Math 
Functions @see http://www.php.net/manual/en/ref.math.php
+   include __DIR__ . '/includes/functions/var.php', // Variable 
handling Functions @see http://www.php.net/manual/en/ref.var.php
+   include __DIR__ . '/includes/functions/pcre.php', // PCRE 
Functions @see http://www.php.net/manual/en/ref.pcre.php
+   Foxway\Runtime::$functions
 );
 
-$wgFoxwayAllowedPHPConstants = array(
-   'CASE_UPPER',
-   'CASE_LOWER',
-   'SORT_ASC',
-   'SORT_DESC',
-   'SORT_REGULAR',
-   'SORT_NUMERIC',
-   'SORT_STRING',
-   'SORT_LOCALE_STRING',
-   'SORT_NATURAL', // PHP = 5.4.0
-   'SORT_FLAG_CASE', // PHP = 5.4.0
-   'COUNT_RECURSIVE',
-   'CRYPT_STD_DES',
-

[MediaWiki-commits] [Gerrit] RL for json messages - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: RL for json messages
..

RL for json messages

Change-Id: Ic39dec1c484982fb07edd167e83794c0b5f470ee
---
A ResourceLoaderULSJsonMessageModule.php
M Resources.php
M UniversalLanguageSelector.php
M api/ApiULSLocalization.php
M resources/js/ext.uls.i18n.js
5 files changed, 76 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/47/93447/1

diff --git a/ResourceLoaderULSJsonMessageModule.php 
b/ResourceLoaderULSJsonMessageModule.php
new file mode 100644
index 000..0f2160b
--- /dev/null
+++ b/ResourceLoaderULSJsonMessageModule.php
@@ -0,0 +1,50 @@
+?php
+/**
+ * ResourceLoaderModule subclass for loading the json
+ * based localization to client-side code.
+ *
+ * @file
+ *
+ * @ingroup Extensions
+ *
+ * @author Santhosh Thottingal
+ */
+
+/**
+ * Packages a remote schema as a JavaScript ResourceLoader module.
+ */
+class ResourceLoaderULSJsonMessageModule extends ResourceLoaderModule {
+
+   protected $targets = array( 'desktop', 'mobile' );
+
+   /**
+* Part of the ResourceLoader module interface.
+* Declares the core ext.uls.i18n module as a dependency.
+* @return array: Module names.
+*/
+   function getDependencies() {
+   return array( 'ext.uls.i18n' );
+   }
+
+   /**
+* Gets the last modified timestamp of this module.
+* The last modified timestamp controls caching.
+* @param ResourceLoaderContext $context
+* @return integer: Unix timestamp.
+*/
+   function getModifiedTime( ResourceLoaderContext $context ) {
+   return filemtime( __DIR__ . '/i18n/' . $context-getLanguage() 
. '.json' );
+   }
+
+   /**
+* Ge the message strings for the current UI language, and pass to the 
client
+* side mw.uls.loadLocalization call.
+* @param ResourceLoaderContext $context
+* @return string: JavaScript code.
+*/
+   function getScript( ResourceLoaderContext $context ) {
+   $language = $context-getLanguage();
+   $params = array( $language, ApiULSLocalization::getMessages( 
$language ) );
+   return Xml::encodeJsCall( 'mw.uls.loadLocalization', $params );
+   }
+}
diff --git a/Resources.php b/Resources.php
index 41ae36d..7edce26 100644
--- a/Resources.php
+++ b/Resources.php
@@ -15,6 +15,10 @@
'class' = 'ResourceLoaderULSModule'
 );
 
+$wgResourceModules['ext.uls.messages'] = array(
+   'class' = 'ResourceLoaderULSJsonMessageModule'
+);
+
 $wgResourceModules['ext.uls.buttons'] = array(
'styles' = 'resources/css/ext.uls.buttons.css',
 ) + $resourcePaths;
@@ -68,7 +72,7 @@
'jquery.json',
'jquery.cookie',
'jquery.uls',
-   'ext.uls.i18n',
+   'ext.uls.messages',
),
'position' = 'top',
 ) + $resourcePaths;
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 35a39c8..61f8504 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -153,6 +153,7 @@
 $wgAutoloadClasses += array(
'UniversalLanguageSelectorHooks' = __DIR__ . 
'/UniversalLanguageSelector.hooks.php',
'ResourceLoaderULSModule' = __DIR__ . '/ResourceLoaderULSModule.php',
+   'ResourceLoaderULSJsonMessageModule' = __DIR__ . 
'/ResourceLoaderULSJsonMessageModule.php',
'ApiLanguageSearch' = __DIR__ . '/api/ApiLanguageSearch.php',
'ApiULSLocalization' = __DIR__ . '/api/ApiULSLocalization.php',
'LanguageNameSearch' = __DIR__ . '/data/LanguageNameSearch.php',
diff --git a/api/ApiULSLocalization.php b/api/ApiULSLocalization.php
index 17504ac..e00ae07 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -32,19 +32,27 @@
if ( !Language::isValidCode( $language ) ) {
$this-dieUsage( 'Invalid language', 'invalidlanguage' 
);
}
-
-   $contents = array();
-   // jQuery.uls localization
-   $contents += $this-loadI18nFile( __DIR__ . 
'/../lib/jquery.uls/i18n', $language );
-   // mediaWiki.uls localization
-   $contents += $this-loadI18nFile( __DIR__ . '/../i18n', 
$language );
-
+   $contents = self::getMessages( $language );
// Output the file's contents raw
$this-getResult()-addValue( null, 'text', json_encode( 
$contents ) );
$this-getResult()-addValue( null, 'mime', 'application/json' 
);
}
 
/**
+* Get messages for the given language
+* @param string $language Language code.
+* @return array
+*/
+   public static function getMessages( $language ) {
+

[MediaWiki-commits] [Gerrit] Updated to the new version of mediawiki-selenium gem - change (mediawiki...Translate)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated to the new version of mediawiki-selenium gem
..

Updated to the new version of mediawiki-selenium gem

Needed to fix security problem with passwords being visible at Jenkins
machine.

Also updated other Ruby gems too and deleted unneeded gems from the
Gemfile.

Change-Id: I5eab96f9b310f4e089df02378aed8ffce2aa99fd
---
M tests/browser/Gemfile
M tests/browser/Gemfile.lock
2 files changed, 16 insertions(+), 23 deletions(-)


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

diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 220327a..aabcbc7 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,11 +3,4 @@
 
 source 'https://rubygems.org'
 
-gem 'cucumber'
-gem 'json'
 gem 'mediawiki-selenium'
-gem 'net-http-persistent'
-gem 'page-object'
-gem 'rest-client'
-gem 'rspec-expectations'
-gem 'syntax'
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index fa2be84..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,19 +16,26 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.8)
-mime-types (1.25)
+json (1.8.1)
+mediawiki-selenium (0.1.12)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
@@ -36,11 +43,11 @@
   mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 watir-webdriver (0.6.4)
@@ -52,11 +59,4 @@
   ruby
 
 DEPENDENCIES
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
-  rest-client
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eab96f9b310f4e089df02378aed8ffce2aa99fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated to the new version of mediawiki-selenium gem - change (mediawiki...TwnMainPage)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated to the new version of mediawiki-selenium gem
..

Updated to the new version of mediawiki-selenium gem

Needed to fix security problem with passwords being visible at Jenkins
machine.

Also updated other Ruby gems too.

Change-Id: I320c48ba981fbad82062dd5101cd568c34a2576f
---
M tests/browser/Gemfile.lock
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index a9a7aaa..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,12 +16,12 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
-mediawiki-selenium (0.1.10)
+mediawiki-selenium (0.1.12)
   cucumber
   json
   net-http-persistent
@@ -29,7 +29,7 @@
   rest-client
   rspec-expectations
   syntax
-mime-types (1.25)
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I320c48ba981fbad82062dd5101cd568c34a2576f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated to the new version of mediawiki-selenium gem - change (mediawiki...TwnMainPage)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Updated to the new version of mediawiki-selenium gem
..


Updated to the new version of mediawiki-selenium gem

Needed to fix security problem with passwords being visible at Jenkins
machine.

Also updated other Ruby gems too.

Change-Id: I320c48ba981fbad82062dd5101cd568c34a2576f
---
M tests/browser/Gemfile.lock
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index a9a7aaa..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,12 +16,12 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
-mediawiki-selenium (0.1.10)
+mediawiki-selenium (0.1.12)
   cucumber
   json
   net-http-persistent
@@ -29,7 +29,7 @@
   rest-client
   rspec-expectations
   syntax
-mime-types (1.25)
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I320c48ba981fbad82062dd5101cd568c34a2576f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated to the new version of mediawiki-selenium gem - change (mediawiki...Translate)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Updated to the new version of mediawiki-selenium gem
..


Updated to the new version of mediawiki-selenium gem

Needed to fix security problem with passwords being visible at Jenkins
machine.

Also updated other Ruby gems too and deleted unneeded gems from the
Gemfile.

Change-Id: I5eab96f9b310f4e089df02378aed8ffce2aa99fd
---
M tests/browser/Gemfile
M tests/browser/Gemfile.lock
2 files changed, 16 insertions(+), 23 deletions(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 220327a..aabcbc7 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,11 +3,4 @@
 
 source 'https://rubygems.org'
 
-gem 'cucumber'
-gem 'json'
 gem 'mediawiki-selenium'
-gem 'net-http-persistent'
-gem 'page-object'
-gem 'rest-client'
-gem 'rspec-expectations'
-gem 'syntax'
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index fa2be84..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,19 +16,26 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.8)
-mime-types (1.25)
+json (1.8.1)
+mediawiki-selenium (0.1.12)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
@@ -36,11 +43,11 @@
   mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 watir-webdriver (0.6.4)
@@ -52,11 +59,4 @@
   ruby
 
 DEPENDENCIES
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
-  rest-client
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5eab96f9b310f4e089df02378aed8ffce2aa99fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] add T_PRINT operator and PHP constants - change (mediawiki...Foxway)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: add T_PRINT operator and PHP constants
..


add T_PRINT operator and PHP constants

* fix for use Foxway\Runtime::$time instead of $GLOBALS['wgFoxwayTime']
* fix for use self::getNextToken
* fix for pcre functions, add namespace Foxway before ExceptionFoxway

Time: 385 ms, Memory: 24.75Mb
OK (402 tests, 408 assertions)

Change-Id: I3cef8f07f5fe3f541dc819f9e449597483f50c23
---
M Foxway.body.php
M Settings.php
M includes/Compiler.php
M includes/Runtime.php
A includes/constants.php
M includes/functions/pcre.php
M tests/phpunit/includes/RuntimeTest.php
7 files changed, 326 insertions(+), 219 deletions(-)

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



diff --git a/Foxway.body.php b/Foxway.body.php
index 5deaac3..c076b61 100644
--- a/Foxway.body.php
+++ b/Foxway.body.php
@@ -54,7 +54,7 @@
$return = $exc-getTraceAsString();
}
 
-   $GLOBALS['wgFoxwayTime'] += microtime(true) - self::$startTime;
+   \Foxway\Runtime::$time += microtime(true) - self::$startTime;
return \UtfNormal::cleanUp($return);
}
 
@@ -84,7 +84,7 @@
self::getScope($frame)
);
} catch (Exception $exc) {
-   $GLOBALS['wgFoxwayTime'] += microtime(true) - 
self::$startTime;
+   \Foxway\Runtime::$time += microtime(true) - 
self::$startTime;
return $exc-getTraceAsString();
}
 
@@ -101,7 +101,7 @@
$return .= self::insertGeneral( $parser, 
$parser-recursiveTagParse(implode($result),$frame) );
}
 
-   $GLOBALS['wgFoxwayTime'] += microtime(true) - self::$startTime;
+   \Foxway\Runtime::$time += microtime(true) - self::$startTime;
return \UtfNormal::cleanUp($return);
}
 
@@ -110,7 +110,7 @@
if( \Foxway\Runtime::$allowedNamespaces !== true  
empty(\Foxway\Runtime::$allowedNamespaces[$frame-getTitle()-getNamespace()]) 
) {
return Html::element( 'span', array('class'='error'), 
wfMessage('foxway-disabled-for-namespace', 
$frame-getTitle()-getNsText())-escaped() );
}
-   if( $wgFoxway_max_execution_time !== false  
$GLOBALS['wgFoxwayTime'] = $wgFoxway_max_execution_time) {
+   if( $wgFoxway_max_execution_time !== false  
\Foxway\Runtime::$time = $wgFoxway_max_execution_time) {
return Html::element( 'span', array('class'='error'),
wfMessage( 
'foxway-php-fatal-error-max-execution-time' )
-numParams( 
$wgFoxway_max_execution_time )
diff --git a/Settings.php b/Settings.php
index 0527d31..9d5b44c 100644
--- a/Settings.php
+++ b/Settings.php
@@ -38,159 +38,17 @@
  */
 // Foxway\Runtime::$allowedNamespaces = true; // true by default
 
-Foxway\Runtime::$functions = array_merge( Foxway\Runtime::$functions
-   , include __DIR__ . '/includes/functions/strings.php' // String 
Functions @see http://php.net/manual/en/ref.strings.php
-   , include __DIR__ . '/includes/functions/array.php' // Array 
Functions @see http://www.php.net/manual/en/ref.array.php
-   , include __DIR__ . '/includes/functions/math.php' // Math 
Functions @see http://www.php.net/manual/en/ref.math.php
-   , include __DIR__ . '/includes/functions/var.php' // Variable 
handling Functions @see http://www.php.net/manual/en/ref.var.php
-   , include __DIR__ . '/includes/functions/pcre.php' // PCRE 
Functions @see http://www.php.net/manual/en/ref.pcre.php
+Foxway\Runtime::$functions = array_merge(
+   include __DIR__ . '/includes/functions/strings.php', // String 
Functions @see http://php.net/manual/en/ref.strings.php
+   include __DIR__ . '/includes/functions/array.php', // Array 
Functions @see http://www.php.net/manual/en/ref.array.php
+   include __DIR__ . '/includes/functions/math.php', // Math 
Functions @see http://www.php.net/manual/en/ref.math.php
+   include __DIR__ . '/includes/functions/var.php', // Variable 
handling Functions @see http://www.php.net/manual/en/ref.var.php
+   include __DIR__ . '/includes/functions/pcre.php', // PCRE 
Functions @see http://www.php.net/manual/en/ref.pcre.php
+   Foxway\Runtime::$functions
 );
 
-$wgFoxwayAllowedPHPConstants = array(
-   'CASE_UPPER',
-   'CASE_LOWER',
-   'SORT_ASC',
-   'SORT_DESC',
-   'SORT_REGULAR',
-   'SORT_NUMERIC',
-   'SORT_STRING',
-   'SORT_LOCALE_STRING',
-   'SORT_NATURAL', // PHP = 5.4.0
-   'SORT_FLAG_CASE', // PHP = 5.4.0
-   'COUNT_RECURSIVE',
-   'CRYPT_STD_DES',

[MediaWiki-commits] [Gerrit] Disable rule Squiz.WhiteSpace.OperatorSpacing - change (mediawiki...codesniffer)

2013-11-04 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Disable rule Squiz.WhiteSpace.OperatorSpacing
..

Disable rule Squiz.WhiteSpace.OperatorSpacing

There's no consensus on line breaks for ternary operator constructions, so
to avoid discussions in Gerrit about it, disable this rule until some sort
of consensus arises, or leave it up to each coder.

Change-Id: I0965998b19e468c25de71c8fadaee9890d12655c
---
M MediaWiki/ruleset.xml
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/50/93450/1

diff --git a/MediaWiki/ruleset.xml b/MediaWiki/ruleset.xml
index 1327279..6de5dbf 100644
--- a/MediaWiki/ruleset.xml
+++ b/MediaWiki/ruleset.xml
@@ -90,7 +90,8 @@
-quux();
rule ref=Squiz.WhiteSpace.ObjectOperatorSpacing /
--
-   rule ref=Squiz.WhiteSpace.OperatorSpacing /
+   !-- There is no consensus on how to apply this rule, so disabled --
+   !--rule ref=Squiz.WhiteSpace.OperatorSpacing /--
rule ref=Squiz.WhiteSpace.ScopeClosingBrace /
rule ref=Squiz.WhiteSpace.ScopeKeywordSpacing /
rule ref=Squiz.WhiteSpace.SemicolonSpacing /

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0965998b19e468c25de71c8fadaee9890d12655c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Define autonym css class - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Define autonym css class
..


Define autonym css class

Follow up: I10b8658e29c03b136b4475c4c69ace33e5628a98 and
I48b0cc4a19c3ddd8d00f585faf31046d8ba6bf9c

Define this class in MW ULS since jquery.uls removed this class
definition

Change-Id: I5e52feb6a53362378b382b06727ac6e671e0f91a
---
M resources/css/ext.uls.css
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index 620691a..812865c 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -138,6 +138,7 @@
 }
 
 /* Interlanguage links */
-#p-lang ul {
+#p-lang ul,
+.autonym {
font-family: 'Autonym', sans-serif;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e52feb6a53362378b382b06727ac6e671e0f91a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] (bug 56130) Icons need tooltips - change (mediawiki...Flow)

2013-11-04 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 56130) Icons need tooltips
..

(bug 56130) Icons need tooltips

Bug: 56130
Change-Id: Iac650630a6c8058b1cd4387615ca01175379a56c
---
M Flow.i18n.php
M includes/View/PostActionMenu.php
M templates/header.html.php
M templates/post.html.php
M templates/topic.html.php
M templates/topiclist.html.php
6 files changed, 11 insertions(+), 6 deletions(-)


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

diff --git a/Flow.i18n.php b/Flow.i18n.php
index 17cdedd..ee5937f 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -31,8 +31,8 @@
'flow-post-deleted-by' = '{{GENDER:$1|Deleted}} by $1 $2',
'flow-post-censored' = '[post censored]',
'flow-post-censored-by' = '{{GENDER:$1|Censored}} by $1 $2',
-   'flow-post-actions' = 'actions',
-   'flow-topic-actions' = 'actions',
+   'flow-post-actions' = 'Actions',
+   'flow-topic-actions' = 'Actions',
'flow-cancel' = 'Cancel',
 
'flow-newtopic-title-placeholder' = 'Message subject',
diff --git a/includes/View/PostActionMenu.php b/includes/View/PostActionMenu.php
index 056506c..a9da067 100644
--- a/includes/View/PostActionMenu.php
+++ b/includes/View/PostActionMenu.php
@@ -116,6 +116,7 @@
'type' = 'submit',
'class' = $class,
'value' = $content,
+   'title' = strip_tags( $content ),
) ) .
$output[] = Html::closeElement( 'form' );
 
@@ -143,6 +144,7 @@
array(
'href' = $url,
'class' = $class,
+   'title' = strip_tags( $content ),
),
$content
);
diff --git a/templates/header.html.php b/templates/header.html.php
index efb1b39..b46ab04 100644
--- a/templates/header.html.php
+++ b/templates/header.html.php
@@ -37,6 +37,7 @@
array(
'href' = $this-generateUrl( $workflow, 'edit-header' ),
'class' = 'flow-header-edit-link flow-icon 
flow-icon-bottom-aligned',
+   'title' = wfMessage( 'flow-edit-header-link' )-text()
),
wfMessage( 'flow-edit-header-link' )-text()
 );
diff --git a/templates/post.html.php b/templates/post.html.php
index 25d0caa..08929f1 100644
--- a/templates/post.html.php
+++ b/templates/post.html.php
@@ -124,7 +124,7 @@
 
?php if ( $postActionMenu-isAllowedAny( 'hide-post', 
'delete-post', 'censor-post', 'restore-post' ) ): ?
div class=flow-actions
-   a class=flow-actions-link flow-icon 
flow-icon-bottom-aligned href=#?php echo wfMessage( 'flow-post-actions' 
)-escaped(); ?/a
+   a class=flow-actions-link flow-icon 
flow-icon-bottom-aligned href=# title=?php echo wfMessage( 
'flow-post-actions' )-escaped(); ??php echo wfMessage( 'flow-post-actions' 
)-escaped(); ?/a
div class=flow-actions-flyout
ul
?php
diff --git a/templates/topic.html.php b/templates/topic.html.php
index a0212d7..bef2278 100644
--- a/templates/topic.html.php
+++ b/templates/topic.html.php
@@ -18,13 +18,14 @@
 div class=flow-element-container
div class=flow-titlebar mw-ui-button
?php
-   echo Html::rawElement(
+   echo Html::element(
'a',
array(
'href' = $this-generateUrl( 
$root-getPostId(), 'edit-title' ),
'class' = 'flow-edit-topic-link flow-icon 
flow-icon-top-aligned',
+   'title' = wfMessage( 
'flow-topic-action-edit-title' )-text(),
),
-   wfMessage( 'flow-topic-action-edit-title' )
+   wfMessage( 'flow-topic-action-edit-title' )-text()
);
?
 
diff --git a/templates/topiclist.html.php b/templates/topiclist.html.php
index bd7e017..2196459 100644
--- a/templates/topiclist.html.php
+++ b/templates/topiclist.html.php
@@ -21,7 +21,8 @@
 // @Todo - Update href to a real link for no-js support
 echo Html::element( 'a', array(
'class' = array( 'flow-new-topic-link', 'flow-icon', 
'flow-icon-bottom-aligned' ),
-   'href' = '#'
+   'href' = '#',
+   'title' = wfMessage( 'flow-newtopic-start-placeholder' )-text(),
 ), wfMessage( 'flow-newtopic-start-placeholder' )-text() );
 
 if ( $block-hasErrors( 'content' ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id:

[MediaWiki-commits] [Gerrit] wmf: soften requirements - change (integration/zuul)

2013-11-04 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: wmf: soften requirements
..

wmf: soften requirements

WebOb and paramiko have a minimal version which is enforced by OpenStack
but is most probably not needed.

ordereddict is for python 2.6, the feature is included in python 2.7.

Change-Id: I1aa1e3ae496d68d25dd64e8b21d2057c473342f4
---
M requirements.txt
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/52/93452/1

diff --git a/requirements.txt b/requirements.txt
index 7b43b96..27fa238 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,11 +4,10 @@
 python-jenkins
 PyYAML=3.1.0
 Paste
-WebOb=1.2.3,1.3
-paramiko=1.8.0
+WebOb
+paramiko
 GitPython=0.3.2.RC1
 lockfile=0.8
-ordereddict
 python-daemon
 extras
 statsd=1.0.0,3.0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aa1e3ae496d68d25dd64e8b21d2057c473342f4
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: labs
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] wmf: soften requirements - change (integration/zuul)

2013-11-04 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: wmf: soften requirements
..


wmf: soften requirements

WebOb and paramiko have a minimal version which is enforced by OpenStack
but is most probably not needed.

ordereddict is for python 2.6, the feature is included in python 2.7.

Change-Id: I1aa1e3ae496d68d25dd64e8b21d2057c473342f4
---
M requirements.txt
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/requirements.txt b/requirements.txt
index 7b43b96..27fa238 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,11 +4,10 @@
 python-jenkins
 PyYAML=3.1.0
 Paste
-WebOb=1.2.3,1.3
-paramiko=1.8.0
+WebOb
+paramiko
 GitPython=0.3.2.RC1
 lockfile=0.8
-ordereddict
 python-daemon
 extras
 statsd=1.0.0,3.0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1aa1e3ae496d68d25dd64e8b21d2057c473342f4
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: labs
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] (bug 56335) Timestamp jumps to the left on hover - change (mediawiki...Flow)

2013-11-04 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 56335) Timestamp jumps to the left on hover
..

(bug 56335) Timestamp jumps to the left on hover

Bug: 56335
Change-Id: I51e9ed4015dab8948283baa1f2f50274b4e4cfc2
---
M modules/base/styles/container.less
M modules/discussion/styles/post.less
2 files changed, 10 insertions(+), 3 deletions(-)


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

diff --git a/modules/base/styles/container.less 
b/modules/base/styles/container.less
index ec45ad4..2b64eb9 100644
--- a/modules/base/styles/container.less
+++ b/modules/base/styles/container.less
@@ -2,7 +2,6 @@
 
 // all UI container elements should have this class, which will preserve some
 // space on the right for icons.
-// @todo: more comment?
 .flow-element-container {
position: relative;
 
@@ -11,7 +10,7 @@
 
.flow-icon {
// only display when hovered
-   display: none;
+   visibility: hidden;
 
clear: both;
float: right;
@@ -44,7 +43,7 @@
 
:hover {
.flow-icon {
-   display: block;
+   visibility: visible;
}
}
 }
diff --git a/modules/discussion/styles/post.less 
b/modules/discussion/styles/post.less
index c8041ca..aecbc71 100644
--- a/modules/discussion/styles/post.less
+++ b/modules/discussion/styles/post.less
@@ -70,6 +70,14 @@
float: right;
padding-right: 22px;
 
+   // right next to the datestamp is the moderation actions 
icon, which
+   // is also floated right, but then moved to the right side via a
+   // negative right-padding. This move to the right via negative 
padding
+   // does not affect the surrounding elements, thus we're 
manually moving
+   // this one to the right (over the icon's original position) 
via a
+   // similar trick.
+   margin-right: -40px;
+
a.flow-action-history-link {
color: inherit;
}

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

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

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

[MediaWiki-commits] [Gerrit] zuul: dependencies for Gearman based version - change (operations/puppet)

2013-11-04 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: zuul: dependencies for Gearman based version
..

zuul: dependencies for Gearman based version

The new version of Zuul requires a few more packages: pbr, gear and
apsscheduler. All of them have been uploaded on apt.wikimedia.org over
the last few months.

Change-Id: I38e71600d00516ffe6c8e144c7c36e83b2e008f5
---
M modules/zuul/manifests/init.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/93454/1

diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index e13d42f..04d5660 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -45,6 +45,11 @@
 'python-statsd',
 
 'python-setuptools',
+
+# For Zuul post v1.3.0
+'python-pbr',
+'python-gear',
+'python-apscheduler',
   ]
 
   package { $packages:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38e71600d00516ffe6c8e144c7c36e83b2e008f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Correct the path to the font in test file - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Correct the path to the font in test file
..

Correct the path to the font in test file

Change-Id: I134be7f625464ab3d895535cc18d19930e67e447
---
M tests/autonym.html
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/tests/autonym.html b/tests/autonym.html
index 896225f..95ceb8a 100644
--- a/tests/autonym.html
+++ b/tests/autonym.html
@@ -8,10 +8,10 @@
 
 @font-face {
font-family: 'Autonym';
-   src: url('../lib/jquery.uls/css/font/Autonym.eot');
+   src: url('../data/fontrepo/fonts/Autonym/Autonym.eot');
src: local('Autonym'),
-   url('../lib/jquery.uls/css/font/Autonym.woff') format('woff'),
-   url('../lib/jquery.uls/css/font/Autonym.ttf') 
format('truetype');
+   url('../data/fontrepo/fonts/Autonym/Autonym.woff') 
format('woff'),
+   url('../data/fontrepo/fonts/Autonym/Autonym.ttf') 
format('truetype');
font-style: normal;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I134be7f625464ab3d895535cc18d19930e67e447
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com

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

[MediaWiki-commits] [Gerrit] WIP moving code to the gem - change (qa/browsertests)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: WIP moving code to the gem
..

WIP moving code to the gem

Change-Id: I9fade95d346191b67ea36037f5aaa584524f0f63
---
D features/support/modules/url_module.rb
D features/support/pages/login_page.rb
2 files changed, 0 insertions(+), 55 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/56/93456/1

diff --git a/features/support/modules/url_module.rb 
b/features/support/modules/url_module.rb
deleted file mode 100644
index eb8c7e4..000
--- a/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This file is subject to the license terms in the LICENSE file found in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
-# qa-browsertests, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the LICENSE file.
-#
-# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
-#
-module URL
-  def self.url(name)
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-#{mediawiki_url}#{name}
-  end
-end
diff --git a/features/support/pages/login_page.rb 
b/features/support/pages/login_page.rb
deleted file mode 100644
index 0652827..000
--- a/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This file is subject to the license terms in the LICENSE file found in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
-# qa-browsertests, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the LICENSE file.
-#
-# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
-#
-class LoginPage
-  include PageObject
-
-  include URL
-  page_url URL.url('Special:UserLogin')
-
-  div(:feedback, class: 'errorbox')
-  button(:login, id: 'wpLoginAttempt')
-  text_field(:password, id: 'wpPassword1')
-  a(:password_strength, text: 'password strength')
-  a(:phishing, text: 'phishing')
-  text_field(:username, id: 'wpName1')
-  a(:username_displayed, title: /Your user page/)
-
-  def logged_in_as_element
-@browser.div(id: 'mw-content-text').p.b
-  end
-  def login_with(username, password)
-self.username = username
-self.password = password
-login
-  end
-end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fade95d346191b67ea36037f5aaa584524f0f63
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Keep track of reference's index in referenceview - change (mediawiki...Wikibase)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Keep track of reference's index in referenceview
..


Keep track of reference's index in referenceview

Keeping track of the reference's index within a statementview's list of 
referenceviews
allows determining whether the referenceview's value still matches the initial 
one.

Change-Id: I14d2a6ba86dcd9c8619e2eff5b60d81df287ae1b
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
2 files changed, 61 insertions(+), 2 deletions(-)

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



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 95ab7d2..4d50db9 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -15,6 +15,12 @@
  *
  * @option statementGuid {string} (REQUIRED) The GUID of the statement the 
reference belongs to.
  *
+ * @option index {number|null} The reference's index within the list of 
references (if the reference
+ * is contained within such a list).
+ * Default: null
+ * TODO: This option should be removed and a proper mechanism 
independent from referenceview
+ * should be implemented to manage and store the indices of references 
(bug #56050).
+ *
  * @option helpMessage {string} End-user message explaining how to use the 
referenceview widget. The
  * message is most likely to be used inside the tooltip of the toolbar 
corresponding to
  * the referenceview.
@@ -76,6 +82,7 @@
};
}
} ),
+   index: null,
helpMessage: mw.msg( 'wikibase-claimview-snak-new-tooltip' )
},
 
@@ -94,6 +101,14 @@
 * @type {wikibase.SnakList}
 */
_initialSnakList: null,
+
+   /**
+* The reference's initial index within the list of references (if it 
is contained within a list
+* of references). The initial index is stored to be able to detect 
whether the index has
+* changed and the reference does not feature its initial value.
+* @type {number|null}
+*/
+   _initialIndex: null,
 
/**
 * @see jQuery.wikibase.snaklistview._create
@@ -117,6 +132,8 @@
this._initialSnakList = new wb.SnakList();
}
 
+   this._initialIndex = this.option( 'index' );
+
PARENT.prototype._create.call( this );
 
// Whenever entering a new referenceview item, a single 
snaklistview needs to be created
@@ -127,6 +144,21 @@
} );
 
this._updateReferenceHashClass( this.value() );
+   },
+
+   /**
+* @see jQuery.Widget.option
+*
+* @triggers change
+*/
+   option: function( key, value ) {
+   var val = PARENT.prototype.option.apply( this, arguments );
+
+   if( key === 'index'  value !== undefined ) {
+   this._trigger( 'change' );
+   }
+
+   return val;
},
 
/**
@@ -426,6 +458,10 @@
 * @return {boolean}
 */
isInitialValue: function() {
+   if( this.option( 'index' ) !== this._initialIndex ) {
+   return false;
+   }
+
var $snaklistviews = this.items(),
snakList = new wb.SnakList();
 
@@ -474,7 +510,8 @@
guid,
this.value().getSnaks(),
revStore.getClaimRevision( guid ),
-   this.value().getHash() || null
+   this.value().getHash() || null,
+   this.option( 'index' )
).done( function( savedReference, pageInfo ) {
// update revision store
revStore.setClaimRevision( pageInfo.lastrevid, guid );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 1c513c7..9c571ca 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -63,6 +63,11 @@
statement = this.value(),
refs = statement ? statement.getReferences() : [];
 
+   function indexOf( element, array ) {
+   var index = $.inArray( element, array );
+   return ( index !== -1 ) ? index : null;
+   }
+
if( this.value() ) {
var $listview = $( 'div/' )

[MediaWiki-commits] [Gerrit] Implemented referenceview movetoolbar definition - change (mediawiki...Wikibase)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Implemented referenceview movetoolbar definition
..


Implemented referenceview movetoolbar definition

This allows moving/ordering references.

Change-Id: Ibe09729491c9fc79a974498e66115b86f8d15a3c
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M repo/resources/wikibase.ui.entityViewInit.js
3 files changed, 127 insertions(+), 3 deletions(-)

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



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 4d50db9..3fee4cb 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -162,6 +162,16 @@
},
 
/**
+* Returns the reference's initial index within the list of references 
(if in any).
+* @since 0.5
+*
+* @return {number|null}
+*/
+   getInitialIndex: function() {
+   return this._initialIndex;
+   },
+
+   /**
 * Attaches event listeners needed during edit mode.
 */
_attachEditModeEventHandlers: function() {
@@ -760,8 +770,14 @@
},
'movetoolbarup movetoolbardown': function( event ) {
var $snakview = $( event.target ),
-   $snaklistview = $snakview.closest( 
':wikibase-snaklistview' ),
-   $referenceview = $snaklistview.closest( 
':wikibase-referenceview' ),
+   $snaklistview = $snakview.closest( 
':wikibase-snaklistview' );
+
+   if( !$snaklistview.length ) {
+   // Event belongs to another movetoolbar.
+   return;
+   }
+
+   var $referenceview = $snaklistview.closest( 
':wikibase-referenceview' ),
referenceview = $referenceview.data( 
'referenceview' ),
snaklistview = 
referenceview.options.listItemAdapter.liInstance( $snaklistview ),
snakview = 
snaklistview._listview.listItemAdapter().liInstance( $snakview ),
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 9c571ca..3ae57ca 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -93,6 +93,18 @@
self.drawReferencesCounter();
self._updateReferenceIndices();
} )
+   .on( 'referenceviewafterstopediting', function( event, 
dropValue ) {
+   if( dropValue ) {
+   // Re-order claims according to their 
initial indices:
+   var referenceListview = 
self.$references.data( 'listview' ),
+   $referenceviews = 
referenceListview.items();
+
+   for( var i = 0; i  
$referenceviews.length; i++ ) {
+   var referenceview = 
self._referenceviewLia.liInstance( $referenceviews.eq( i ) );
+   referenceListview.move( 
$referenceviews.eq( i ), referenceview.getInitialIndex() );
+   }
+   }
+   } )
.on( 'listviewenternewitem', function( event, $newLi ) {
// Enter first item into the referenceview.
self._referenceviewLia.liInstance( $newLi 
).enterNewItem();
@@ -347,4 +359,96 @@
}
 } );
 
+$.wikibase.toolbarcontroller.definition( 'movetoolbar', {
+   id: 'statementview-referenceview',
+   selector: '.wb-referenceview',
+   events: {
+   'referenceviewstartediting': function( event ) {
+   // Initialize movetoolbar.
+
+   var $referenceview = $( event.target ),
+   referenceview = $referenceview.data( 
'referenceview' ),
+   $statementview = $referenceview.closest( 
':wikibase-statementview' ),
+   statementview = $statementview.data( 
'statementview' ),
+   referencesListview = 
statementview.$references.data( 'listview' );
+
+   if( !referenceview.value() ) {
+   // Prevent creating the

[MediaWiki-commits] [Gerrit] zuul: configuration for gearman - change (operations/puppet)

2013-11-04 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: zuul: configuration for gearman
..

zuul: configuration for gearman

The next Zuul version we are going to deploy rely on gearman to trigger
jobs. The Jenkins master being a gearman worker.

This change is loosely based on OpenStack Foundation configuration and
brings:
- gearman_server and gearman_server_start paramaters
- logging configuration for the gearman server integrated in Zuul and
  for its client side

Change-Id: Ibb146442870c0409988a0728769887dbccef9b3c
---
M files/zuul/logging.conf
M manifests/role/zuul.pp
M manifests/zuul.pp
A modules/zuul/files/gearman-logging.conf
M modules/zuul/manifests/init.pp
M modules/zuul/templates/zuul.conf.erb
6 files changed, 96 insertions(+), 33 deletions(-)


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

diff --git a/files/zuul/logging.conf b/files/zuul/logging.conf
index 622cc8f..8d084ee 100644
--- a/files/zuul/logging.conf
+++ b/files/zuul/logging.conf
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,zuul,gerrit
+keys=root,zuul,gerrit,gear
 
 [handlers]
 keys=console,debug,normal
@@ -21,6 +21,11 @@
 handlers=debug,normal
 qualname=gerrit
 
+[logger_gear]
+level=DEBUG
+handlers=debug,normal
+qualname=gear
+
 [handler_console]
 level=WARNING
 class=StreamHandler
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index c1672c3..6db8bd7 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -27,16 +27,18 @@
 
 # Setup the instance for labs usage
 zuulwikimedia::instance { 'zuul-labs':
-jenkins_server   = 'http://10.4.0.172:8080/ci',
-jenkins_user = 'zuul',
-gerrit_server= '10.4.0.172',
-gerrit_user  = 'jenkins',
-url_pattern  = 
'http://integration.wmflabs.org/ci/job/{job.name}/{build.number}/console',
-status_url   = 'http://integration.wmflabs.org/zuul/status',
-git_branch   = 'labs',
-git_dir  = $role::zuul::configuration::zuul_git_dir,
-push_change_refs = false,
-statsd_host  = '',
+gearman_server   = '127.0.0.1',
+gearman_server_start = true,
+jenkins_server   = 'http://10.4.0.172:8080/ci',
+jenkins_user = 'zuul',
+gerrit_server= '10.4.0.172',
+gerrit_user  = 'jenkins',
+url_pattern  = 
'http://integration.wmflabs.org/ci/job/{job.name}/{build.number}/console',
+status_url   = 'http://integration.wmflabs.org/zuul/status',
+git_branch   = 'labs',
+git_dir  = $role::zuul::configuration::zuul_git_dir,
+push_change_refs = false,
+statsd_host  = '',
 }
 
 } # /role::zuul::labs
@@ -67,16 +69,18 @@
 
 # TODO: should require Mount['/srv/ssd']
 zuulwikimedia::instance { 'zuul-production':
-jenkins_server   = 'http://127.0.0.1:8080/ci',
-jenkins_user = 'zuul-bot',
-gerrit_server= 'ytterbium.wikimedia.org',
-gerrit_user  = 'jenkins-bot',
-url_pattern  = 
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console',
-status_url   = 'https://integration.wikimedia.org/zuul/',
-git_branch   = 'master',
-git_dir  = $role::zuul::configuration::zuul_git_dir,
-push_change_refs = false,
-statsd_host  = '10.64.0.18',  # tungsten.eqiad.wmnet
+gearman_server   = '127.0.0.1',
+gearman_server_start = true,
+jenkins_server   = 'http://127.0.0.1:8080/ci',
+jenkins_user = 'zuul-bot',
+gerrit_server= 'ytterbium.wikimedia.org',
+gerrit_user  = 'jenkins-bot',
+url_pattern  = 
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console',
+status_url   = 'https://integration.wikimedia.org/zuul/',
+git_branch   = 'master',
+git_dir  = $role::zuul::configuration::zuul_git_dir,
+push_change_refs = false,
+statsd_host  = '10.64.0.18',  # tungsten.eqiad.wmnet
 }
 
 class { 'contint::zuul::git-daemon':
diff --git a/manifests/zuul.pp b/manifests/zuul.pp
index 6981c76..93c7fba 100644
--- a/manifests/zuul.pp
+++ b/manifests/zuul.pp
@@ -7,6 +7,8 @@
define instance(
$jenkins_server,
$jenkins_user,
+   $gearman_server,
+   $gearman_server_start,
$gerrit_server,
$gerrit_user,
$url_pattern,
@@ -23,18 +25,20 @@
 
# Load class from the Zuul module:
class { 'zuul':
-   name = $name,
-   jenkins_server   = $jenkins_server,
-

[MediaWiki-commits] [Gerrit] TimeInput expert: Updating input extender content only when ... - change (mediawiki...DataValues)

2013-11-04 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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


Change subject: TimeInput expert: Updating input extender content only when 
active
..

TimeInput expert: Updating input extender content only when active

Removed obsolete eachchange event handler since its actions were redundant 
with the
timeinputupdate event handler. The input extender contents are updated only 
when the
input extender is active preventing running into errors when the input extender 
contents
could not be accessed.

Change-Id: Icb8474dc4995b2b02dbf52a42626947b15961c1a
---
M ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
1 file changed, 7 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/59/93459/1

diff --git 
a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js 
b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
index 8748438..2c50c9d 100644
--- 
a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
+++ 
b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
@@ -101,13 +101,6 @@
'class': this.uiBaseClass + '-input 
valueview-input'
} )
.appendTo( this.$viewPort )
-   .eachchange( function( event, oldValue ) {
-   var value = self.$input.data( 'timeinput' 
).value();
-   if( oldValue === ''  value === null || 
self.$input.val() === '' ) {
-   self._updatePreview();
-   self._updateCalendarHint();
-   }
-   } )
.timeinput( { mediaWiki: this._options.mediaWiki } )
.inputextender( {
initCallback: function( $extension ) {
@@ -127,14 +120,16 @@
contentAnimationEvents: 'toggleranimation'
} )
.on( 'timeinputupdate.' + this.uiBaseClass, function( 
event, value ) {
-   self._updateCalendarHint( value );
-   if( value ) {
-   self.$precision.data( 'listrotator' 
).rotate( value.precision() );
-   self.$calendar.data( 'listrotator' 
).rotate( value.calendar() );
+   if( self.$input.data( 'inputextender' 
).extensionIsActive() ) {
+   self._updateCalendarHint( value );
+   if( value ) {
+   self.$precision.data( 
'listrotator' ).rotate( value.precision() );
+   self.$calendar.data( 
'listrotator' ).rotate( value.calendar() );
+   }
+   self._updatePreview();
}
self._newValue = false; // value, not yet 
handled by draw(), is outdated now
self._viewNotifier.notify( 'change' );
-   self._updatePreview();
} );
 
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb8474dc4995b2b02dbf52a42626947b15961c1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] role::zuul::labs::gearman to test out in labs - change (operations/puppet)

2013-11-04 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: role::zuul::labs::gearman to test out in labs
..

role::zuul::labs::gearman to test out in labs

This temporary role would let me try out Gearman on labs instance
integration-zuul-gearman.pmtpa.wmflabs

Change-Id: Ibc21846611222f39ffe43755cc5cc39f37b78430
---
M manifests/role/zuul.pp
1 file changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/93458/1

diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 6db8bd7..c0a6351 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -43,6 +43,31 @@
 
 } # /role::zuul::labs
 
+# Temporary role to test out the migration of Zuul to be gearman based
+class role::zuul::labs::gearman {
+system::role { 'role::zuul::labs::gearman': description = 'Zuul on labs 
with gearman!' }
+
+include contint::proxy_zuul,
+role::zuul::configuration
+
+# Setup the instance for labs usage
+zuulwikimedia::instance { 'zuul-labs-gearman':
+gearman_server   = '127.0.0.1',
+gearman_server_start = true,
+jenkins_server   = 'http://127.0.0.1:8080/ci',
+jenkins_user = 'zuul',
+gerrit_server= '127.0.0.1',
+gerrit_user  = 'jenkins',
+url_pattern  = 
'http://integration.wmflabs.org/ci/job/{job.name}/{build.number}/console',
+status_url   = 'http://integration.wmflabs.org/zuul/status',
+git_branch   = 'labs',
+git_dir  = $role::zuul::configuration::zuul_git_dir,
+push_change_refs = false,
+statsd_host  = '',
+}
+
+} # /role::zuul::labs::gearman
+
 # Class: role::zuul::production
 #
 # Install the continuous integration Zuul instance for production usage.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc21846611222f39ffe43755cc5cc39f37b78430
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Changes to use multiple IPv6 addresses - change (translatewiki)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Changes to use multiple IPv6 addresses
..


Changes to use multiple IPv6 addresses

Change-Id: I5cf884d9474dab27f697311f2693b9aace0c638d
---
M puppet/modules/awstats/files/stats.translatewiki.net
M puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
R puppet/modules/nginx/files/translatewiki.net
M puppet/modules/nginx/manifests/init.pp
4 files changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/puppet/modules/awstats/files/stats.translatewiki.net 
b/puppet/modules/awstats/files/stats.translatewiki.net
index 0f0d7ac..41928df 100644
--- a/puppet/modules/awstats/files/stats.translatewiki.net
+++ b/puppet/modules/awstats/files/stats.translatewiki.net
@@ -1,7 +1,8 @@
 # file managed by puppet
 
 server {
-   listen 443 ssl;
+   listen *:443 ssl;
+   listen [2a03:4000:6:55::1]:443 ssl;
ssl_certificate /etc/ssl/private/translatewiki.net.pem;
ssl_certificate_key /etc/ssl/private/translatewiki.net.key;
 
diff --git a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net 
b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
index f5dbde5..70166ba 100644
--- a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
+++ b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
@@ -4,7 +4,8 @@
 # http://people.adams.edu/~cdmiller/posts/Ubuntu-Mailman-Nginx-Fcgipass/
 
 server {
-   listen 443 ssl;
+   listen *:443 ssl;
+   listen [2a03:4000:6:55::2]:443 ssl;
server_name lists.translatewiki.net;
 
ssl_certificate /etc/ssl/private/translatewiki.net.pem;
diff --git a/puppet/modules/nginx/files/sites/translatewiki.net 
b/puppet/modules/nginx/files/translatewiki.net
similarity index 93%
rename from puppet/modules/nginx/files/sites/translatewiki.net
rename to puppet/modules/nginx/files/translatewiki.net
index 7790d8a..2981e8c 100644
--- a/puppet/modules/nginx/files/sites/translatewiki.net
+++ b/puppet/modules/nginx/files/translatewiki.net
@@ -2,9 +2,9 @@
 
 server {
listen 80 default_server;
-   listen [::]:80;
+   listen [2a03:4000:6:55::1]:80;
listen 443 ssl default_server;
-   listen [::]:443 ssl;
+   listen [2a03:4000:6:55::1]:443 ssl;
 
ssl_certificate /etc/ssl/private/translatewiki.net.pem;
ssl_certificate_key /etc/ssl/private/translatewiki.net.key;
diff --git a/puppet/modules/nginx/manifests/init.pp 
b/puppet/modules/nginx/manifests/init.pp
index 4311fbb..c941725 100644
--- a/puppet/modules/nginx/manifests/init.pp
+++ b/puppet/modules/nginx/manifests/init.pp
@@ -28,7 +28,7 @@
   }
 
   file { '/etc/nginx/sites-available/translatewiki.net':
-source  = 'puppet:///modules/nginx/sites/translatewiki.net',
+source  = 'puppet:///modules/nginx/translatewiki.net',
   }
 
   file { '/etc/nginx/sites-enabled/translatewiki.net':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5cf884d9474dab27f697311f2693b9aace0c638d
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] nginx: caching improvements - change (translatewiki)

2013-11-04 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: nginx: caching improvements
..

nginx: caching improvements

* Include svg and fonts
* Bump time to 2 months (we have timestamps for invalidation)
* Removed json as we are no longer serving raw json files

Change-Id: I5e95af19c18bc68849d29d28a56f4c591889e89d
---
M puppet/modules/nginx/files/nginx.conf
M puppet/modules/nginx/files/translatewiki.net
2 files changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/61/93461/1

diff --git a/puppet/modules/nginx/files/nginx.conf 
b/puppet/modules/nginx/files/nginx.conf
index 353a988..713d1ff 100644
--- a/puppet/modules/nginx/files/nginx.conf
+++ b/puppet/modules/nginx/files/nginx.conf
@@ -28,7 +28,7 @@
   gzip on;
   gzip_comp_level 8;
   gzip_disable msie6;
-  gzip_types text/plain text/css application/json application/javascript 
text/javascript text/xml application/atom+xml;
+  gzip_types text/plain text/css application/json application/javascript 
text/javascript text/xml application/atom+xml image/svg+xml;
   gzip_buffers 16 8k;
 
   include /etc/nginx/sites-enabled/*;
diff --git a/puppet/modules/nginx/files/translatewiki.net 
b/puppet/modules/nginx/files/translatewiki.net
index 2981e8c..b0bbba7 100644
--- a/puppet/modules/nginx/files/translatewiki.net
+++ b/puppet/modules/nginx/files/translatewiki.net
@@ -39,11 +39,8 @@
fastcgi_param SCRIPT_FILENAME 
$document_root$fastcgi_script_name;
}
 
-   location ~* \.(png|jpg|jpeg|gif|ico)$ {
-   expires 7d;
+   location ~* \.(png|jpg|jpeg|gif|ico|svg|woff|eot|ttf)$ {
+   expires 2M;
}
 
-   location ~* \.(json)$ {
-   expires 12h;
-   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e95af19c18bc68849d29d28a56f4c591889e89d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Install newer version of git-review from pip - change (translatewiki)

2013-11-04 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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


Change subject: Install newer version of git-review from pip
..

Install newer version of git-review from pip

git review -d failing if the branch already exists is just too
big productivity killer.

Change-Id: Ia23c2e748603a2d7cb04433d11ddba32f1595049
---
M puppet/modules/base/manifests/init.pp
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/62/93462/1

diff --git a/puppet/modules/base/manifests/init.pp 
b/puppet/modules/base/manifests/init.pp
index f0904e8..57e9a98 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -26,9 +26,9 @@
 'subversion',
 
 # Development extras
-'git-review',
-'optipng',
 'jpegoptim',
+'optipng',
+'python-pip',
 
 # Other
 'mysqltuner',
@@ -40,6 +40,12 @@
 ]: ensure = present,
   }
 
+  # Download git-review from pip, the version in current LTS has annoying bugs
+  package { 'git-review':
+ensure   = present,
+provider = pip,
+  }
+
   file { '/etc/environment':
 content = 
'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/home/betawiki/config/bin',
   }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia23c2e748603a2d7cb04433d11ddba32f1595049
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (mediawiki...Wikibase)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated Ruby gems
..

Updated Ruby gems

Change-Id: I0a2f01b2d321b35997f832b744f1b3818e52ae80
---
M selenium_cuc/Gemfile
M selenium_cuc/Gemfile.lock
2 files changed, 19 insertions(+), 30 deletions(-)


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

diff --git a/selenium_cuc/Gemfile b/selenium_cuc/Gemfile
index b0df5af..453e36e 100644
--- a/selenium_cuc/Gemfile
+++ b/selenium_cuc/Gemfile
@@ -3,13 +3,6 @@
 
 source 'https://rubygems.org'
 
-gem 'page-object'
-gem 'require_all'
-gem 'rspec-expectations'
-gem 'syntax'
-gem 'cucumber'
-gem 'json'
 gem 'activesupport'
-gem 'net-http-persistent'
-gem 'rest-client'
 gem 'mediawiki-selenium'
+gem 'require_all'
diff --git a/selenium_cuc/Gemfile.lock b/selenium_cuc/Gemfile.lock
index 1bb1e8e..24949d5 100644
--- a/selenium_cuc/Gemfile.lock
+++ b/selenium_cuc/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-activesupport (4.0.0)
+activesupport (4.0.1)
   i18n (~ 0.6, = 0.6.4)
   minitest (~ 4.2)
   multi_json (~ 1.3)
@@ -23,36 +23,40 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
-ffi (1.9.0-x86-mingw32)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
-gherkin (2.12.2-x86-mingw32)
-  multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.8)
-mime-types (1.25)
+json (1.8.1)
+mediawiki-selenium (0.1.12)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
 minitest (4.7.5)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
-require_all (1.3.1)
+require_all (1.3.2)
 rest-client (1.6.7)
   mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 thread_safe (0.1.3)
@@ -65,16 +69,8 @@
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   activesupport
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
   require_all
-  rest-client
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a2f01b2d321b35997f832b744f1b3818e52ae80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Install newer version of git-review from pip - change (translatewiki)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Install newer version of git-review from pip
..


Install newer version of git-review from pip

git review -d failing if the branch already exists is just too
big productivity killer.

Change-Id: Ia23c2e748603a2d7cb04433d11ddba32f1595049
---
M puppet/modules/base/manifests/init.pp
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/base/manifests/init.pp 
b/puppet/modules/base/manifests/init.pp
index f0904e8..57e9a98 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -26,9 +26,9 @@
 'subversion',
 
 # Development extras
-'git-review',
-'optipng',
 'jpegoptim',
+'optipng',
+'python-pip',
 
 # Other
 'mysqltuner',
@@ -40,6 +40,12 @@
 ]: ensure = present,
   }
 
+  # Download git-review from pip, the version in current LTS has annoying bugs
+  package { 'git-review':
+ensure   = present,
+provider = pip,
+  }
+
   file { '/etc/environment':
 content = 
'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/home/betawiki/config/bin',
   }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia23c2e748603a2d7cb04433d11ddba32f1595049
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] nginx: caching improvements - change (translatewiki)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: nginx: caching improvements
..


nginx: caching improvements

* Include svg and fonts
* Bump time to 2 months (we have timestamps for invalidation)
* Removed json as we are no longer serving raw json files

Change-Id: I5e95af19c18bc68849d29d28a56f4c591889e89d
---
M puppet/modules/nginx/files/nginx.conf
M puppet/modules/nginx/files/translatewiki.net
2 files changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/puppet/modules/nginx/files/nginx.conf 
b/puppet/modules/nginx/files/nginx.conf
index 353a988..713d1ff 100644
--- a/puppet/modules/nginx/files/nginx.conf
+++ b/puppet/modules/nginx/files/nginx.conf
@@ -28,7 +28,7 @@
   gzip on;
   gzip_comp_level 8;
   gzip_disable msie6;
-  gzip_types text/plain text/css application/json application/javascript 
text/javascript text/xml application/atom+xml;
+  gzip_types text/plain text/css application/json application/javascript 
text/javascript text/xml application/atom+xml image/svg+xml;
   gzip_buffers 16 8k;
 
   include /etc/nginx/sites-enabled/*;
diff --git a/puppet/modules/nginx/files/translatewiki.net 
b/puppet/modules/nginx/files/translatewiki.net
index 2981e8c..b0bbba7 100644
--- a/puppet/modules/nginx/files/translatewiki.net
+++ b/puppet/modules/nginx/files/translatewiki.net
@@ -39,11 +39,8 @@
fastcgi_param SCRIPT_FILENAME 
$document_root$fastcgi_script_name;
}
 
-   location ~* \.(png|jpg|jpeg|gif|ico)$ {
-   expires 7d;
+   location ~* \.(png|jpg|jpeg|gif|ico|svg|woff|eot|ttf)$ {
+   expires 2M;
}
 
-   location ~* \.(json)$ {
-   expires 12h;
-   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e95af19c18bc68849d29d28a56f4c591889e89d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Revoke Yuri's shell access - change (operations/puppet)

2013-11-04 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

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


Change subject: Revoke Yuri's shell access
..

Revoke Yuri's shell access

Change-Id: If6fac2c08142b059791895fc0b0dc70422783ca8
---
M manifests/admins.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/93464/1

diff --git a/manifests/admins.pp b/manifests/admins.pp
index 9b90659..430f419 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -2838,6 +2838,7 @@
$username = yurik
$realname = Yuri Astrakhan
$uid = 636
+   $enabled = false
 
unixaccount { $realname: username = $username, uid = $uid, 
gid = $gid }
 
@@ -2846,7 +2847,7 @@
 
ssh_authorized_key {
yastrak...@wikimedia.org:
-   ensure = present,
+   ensure = absent,
user   = $username,
type   = ssh-rsa,
key= 
B3NzaC1yc2EBJQAAAgEAks66YFTBrrC9Wv/rPwIf9cTJO1RxsXHMEcWJjosn9fxvUS57KAw2UrCwinu1T1Hng59V+grHxp2wY7Bke3NmYng2OQacH2HKekPFP3fG82OQlj0YRE52deNwlrfBIx7Yg915zpXjXSQi9D5DIncYN/8jE7Q3Shlw0yRfFLmP02zpiX0Vm1d+g8FM0aMaIPR80KlIFSADEYoo2LD9b9gKsIJQ3643geAlzjye7VTr+ojGaPrW7w+tB5ikPgtx8jQnve5UpfKaQHJcdS1of3GNy3/08i+gScog3oxkneBPIW0Wkb3sNwPZ2Y+vxYSIKzO6z/V/HGSNOYQJy7QJRApBav6sKZxdBSPGi3+6vgHxf4IgUVtikJGzTZ2jtWoqNv/j4h4gfehPkr5hQBJIkJQwTM/JPPbWPGOiWmFQkZeDTsoZGgi5B9hmM3UlelN7egyDZXCEvCirR9moviYI9Dr8VQsT/koyRX3kYdEQV19bHiou+ze6mmKO3OI4EmHkdtR55J1cR3/+7Q8GCAfTiD2KKj7yUEjZMewdOcbZzn29AXkc+90wiuWUWxqan7T5iePRvNPfjHg6ntJDs3tG/WdgF8HluXcWGZHa1Fk2kobK+/WFkGz4CuW9asbUgg+2TOLjvYFzEKgKqS8194nf0WZvRnjy3oFeuj0wwdALmuZDnus=,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6fac2c08142b059791895fc0b0dc70422783ca8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revoke Yuri's shell access - change (operations/puppet)

2013-11-04 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Revoke Yuri's shell access
..


Revoke Yuri's shell access

Change-Id: If6fac2c08142b059791895fc0b0dc70422783ca8
---
M manifests/admins.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/admins.pp b/manifests/admins.pp
index 9b90659..430f419 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -2838,6 +2838,7 @@
$username = yurik
$realname = Yuri Astrakhan
$uid = 636
+   $enabled = false
 
unixaccount { $realname: username = $username, uid = $uid, 
gid = $gid }
 
@@ -2846,7 +2847,7 @@
 
ssh_authorized_key {
yastrak...@wikimedia.org:
-   ensure = present,
+   ensure = absent,
user   = $username,
type   = ssh-rsa,
key= 
B3NzaC1yc2EBJQAAAgEAks66YFTBrrC9Wv/rPwIf9cTJO1RxsXHMEcWJjosn9fxvUS57KAw2UrCwinu1T1Hng59V+grHxp2wY7Bke3NmYng2OQacH2HKekPFP3fG82OQlj0YRE52deNwlrfBIx7Yg915zpXjXSQi9D5DIncYN/8jE7Q3Shlw0yRfFLmP02zpiX0Vm1d+g8FM0aMaIPR80KlIFSADEYoo2LD9b9gKsIJQ3643geAlzjye7VTr+ojGaPrW7w+tB5ikPgtx8jQnve5UpfKaQHJcdS1of3GNy3/08i+gScog3oxkneBPIW0Wkb3sNwPZ2Y+vxYSIKzO6z/V/HGSNOYQJy7QJRApBav6sKZxdBSPGi3+6vgHxf4IgUVtikJGzTZ2jtWoqNv/j4h4gfehPkr5hQBJIkJQwTM/JPPbWPGOiWmFQkZeDTsoZGgi5B9hmM3UlelN7egyDZXCEvCirR9moviYI9Dr8VQsT/koyRX3kYdEQV19bHiou+ze6mmKO3OI4EmHkdtR55J1cR3/+7Q8GCAfTiD2KKj7yUEjZMewdOcbZzn29AXkc+90wiuWUWxqan7T5iePRvNPfjHg6ntJDs3tG/WdgF8HluXcWGZHa1Fk2kobK+/WFkGz4CuW9asbUgg+2TOLjvYFzEKgKqS8194nf0WZvRnjy3oFeuj0wwdALmuZDnus=,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6fac2c08142b059791895fc0b0dc70422783ca8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (mediawiki...Wikibase)

2013-11-04 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Updated Ruby gems
..


Updated Ruby gems

Change-Id: I0a2f01b2d321b35997f832b744f1b3818e52ae80
---
M selenium_cuc/Gemfile
M selenium_cuc/Gemfile.lock
2 files changed, 19 insertions(+), 30 deletions(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved



diff --git a/selenium_cuc/Gemfile b/selenium_cuc/Gemfile
index b0df5af..453e36e 100644
--- a/selenium_cuc/Gemfile
+++ b/selenium_cuc/Gemfile
@@ -3,13 +3,6 @@
 
 source 'https://rubygems.org'
 
-gem 'page-object'
-gem 'require_all'
-gem 'rspec-expectations'
-gem 'syntax'
-gem 'cucumber'
-gem 'json'
 gem 'activesupport'
-gem 'net-http-persistent'
-gem 'rest-client'
 gem 'mediawiki-selenium'
+gem 'require_all'
diff --git a/selenium_cuc/Gemfile.lock b/selenium_cuc/Gemfile.lock
index 1bb1e8e..24949d5 100644
--- a/selenium_cuc/Gemfile.lock
+++ b/selenium_cuc/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-activesupport (4.0.0)
+activesupport (4.0.1)
   i18n (~ 0.6, = 0.6.4)
   minitest (~ 4.2)
   multi_json (~ 1.3)
@@ -23,36 +23,40 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
-ffi (1.9.0-x86-mingw32)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
-gherkin (2.12.2-x86-mingw32)
-  multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.8)
-mime-types (1.25)
+json (1.8.1)
+mediawiki-selenium (0.1.12)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
 minitest (4.7.5)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
-require_all (1.3.1)
+require_all (1.3.2)
 rest-client (1.6.7)
   mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 thread_safe (0.1.3)
@@ -65,16 +69,8 @@
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   activesupport
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
   require_all
-  rest-client
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a2f01b2d321b35997f832b744f1b3818e52ae80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
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 Ruby gems - change (mediawiki...Wikibase)

2013-11-04 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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


Change subject: Update Ruby gems
..

Update Ruby gems

Follow-up to I0a2f01b2d321b35997f832b744f1b3818e52ae80

Change-Id: Ife257b4435883e147c60720cf3acf54aa1a04c66
---
M selenium_cuc/Gemfile.lock
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/selenium_cuc/Gemfile.lock b/selenium_cuc/Gemfile.lock
index 24949d5..1cf52bb 100644
--- a/selenium_cuc/Gemfile.lock
+++ b/selenium_cuc/Gemfile.lock
@@ -26,6 +26,8 @@
 ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
+gherkin (2.12.2-x86-mingw32)
+  multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
 mediawiki-selenium (0.1.12)
@@ -69,6 +71,7 @@
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   activesupport

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife257b4435883e147c60720cf3acf54aa1a04c66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Further constrain W0 X-CS setting to mobile Wikipedia, for now. - change (operations/puppet)

2013-11-04 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: Further constrain W0 X-CS setting to mobile Wikipedia, for now.
..


Further constrain W0 X-CS setting to mobile Wikipedia, for now.

* In a future state this will be updated to support more projects.
* But for now, the X-CS fallthrough should only be set if it's a mobile 
Wikipedia.

Change-Id: I2d912409e48d367431d5afb63f8994c2aeb2c9db
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/varnish/zero.inc.vcl.erb 
b/templates/varnish/zero.inc.vcl.erb
index 26c4253..5a8bfe6 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -188,7 +188,7 @@
if (req.http.host ~ 
(^(ru|kk|en)\.(zero|m)|^(zero|m))\.wikipedia\.) {
set req.http.X-CS = 401-01;
}
-   } else {
+   } else if (req.http.host ~ (zero|m)\.wikipedia\.)  {
// Any new carriers are signed up as both m  zero for all 
languages
set req.http.X-CS = req.http.X-CS2;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d912409e48d367431d5afb63f8994c2aeb2c9db
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Diederik dvanli...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Enable mobile redirect for wikimania2014.wikimedia.org - change (operations/puppet)

2013-11-04 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: Enable mobile redirect for wikimania2014.wikimedia.org
..


Enable mobile redirect for wikimania2014.wikimedia.org

Change-Id: Iab4535eff1bb6469bc440d2ab215ad9584e1f6e9
---
M templates/squid/redirector.conf.erb
M templates/varnish/text-frontend.inc.vcl.erb
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/templates/squid/redirector.conf.erb 
b/templates/squid/redirector.conf.erb
index 87999be..a0d98ab 100644
--- a/templates/squid/redirector.conf.erb
+++ b/templates/squid/redirector.conf.erb
@@ -4,7 +4,7 @@
 # redirector configuration file
 
 # URL parsing regex
-pattern=^http://(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania2012|wikimania2013)\.(?=wikimedia)|\w+\.(?!wikimedia|mediawiki)|(?=mediawiki|wikimediafoundation))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki|wikimediafoundation)\.%=
 Regexp.escape(squid_redirector_tld) %[:\d]*/wiki/(.*)
+pattern=^http://(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania201[234])\.(?=wikimedia)|\w+\.(?!wikimedia|mediawiki)|(?=mediawiki|wikimediafoundation))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki|wikimediafoundation)\.%=
 Regexp.escape(squid_redirector_tld) %[:\d]*/wiki/(.*)
 
 # What to replace the matching URLs with
 replacement=302:http://%sm.%s.%= squid_redirector_tld %/wiki/%s
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 95f742a..c493288 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -9,7 +9,7 @@
 req.http.User-Agent !~ 
(iPad|Android.3|(?i)tablet|(?i)(?!google)bot|PlayBook|Wii)
 req.http.Cookie !~ 
(stopMobileRedirect=true|mf_useformat=desktop)
 req.url ~ ^/wiki/) {
-   set req.http.MobileHost = regsub(req.http.Host, 
^(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania2012|wikimania2013)\.(?=wikimedia)|\w+\.(?!wikimedia|mediawiki)|(?=mediawiki|wikimediafoundation))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki|wikimediafoundation)\.,
 \1m.\2.);
+   set req.http.MobileHost = regsub(req.http.Host, 
^(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania201[234])\.(?=wikimedia)|\w+\.(?!wikimedia|mediawiki)|(?=mediawiki|wikimediafoundation))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki|wikimediafoundation)\.,
 \1m.\2.);
if (req.http.Host != req.http.MobileHost) {
if (req.http.X-Forwarded-Proto) {
set req.http.Location = 
req.http.X-Forwarded-Proto + :// + req.http.MobileHost + req.url;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab4535eff1bb6469bc440d2ab215ad9584e1f6e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update Ruby gems - change (mediawiki...Wikibase)

2013-11-04 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Update Ruby gems
..


Update Ruby gems

Follow-up to I0a2f01b2d321b35997f832b744f1b3818e52ae80

Change-Id: Ife257b4435883e147c60720cf3acf54aa1a04c66
---
M selenium_cuc/Gemfile.lock
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/selenium_cuc/Gemfile.lock b/selenium_cuc/Gemfile.lock
index 24949d5..1cf52bb 100644
--- a/selenium_cuc/Gemfile.lock
+++ b/selenium_cuc/Gemfile.lock
@@ -26,6 +26,8 @@
 ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
+gherkin (2.12.2-x86-mingw32)
+  multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
 mediawiki-selenium (0.1.12)
@@ -69,6 +71,7 @@
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   activesupport

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife257b4435883e147c60720cf3acf54aa1a04c66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] TimeInput expert: Updating input extender content only when ... - change (mediawiki...DataValues)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: TimeInput expert: Updating input extender content only when 
active
..


TimeInput expert: Updating input extender content only when active

Removed obsolete eachchange event handler since its actions were redundant 
with the
timeinputupdate event handler. The input extender contents are updated only 
when the
input extender is active preventing running into errors when the input extender 
contents
could not be accessed.

Change-Id: Icb8474dc4995b2b02dbf52a42626947b15961c1a
---
M ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
1 file changed, 7 insertions(+), 12 deletions(-)

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



diff --git 
a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js 
b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
index 8748438..2c50c9d 100644
--- 
a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
+++ 
b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeInput.js
@@ -101,13 +101,6 @@
'class': this.uiBaseClass + '-input 
valueview-input'
} )
.appendTo( this.$viewPort )
-   .eachchange( function( event, oldValue ) {
-   var value = self.$input.data( 'timeinput' 
).value();
-   if( oldValue === ''  value === null || 
self.$input.val() === '' ) {
-   self._updatePreview();
-   self._updateCalendarHint();
-   }
-   } )
.timeinput( { mediaWiki: this._options.mediaWiki } )
.inputextender( {
initCallback: function( $extension ) {
@@ -127,14 +120,16 @@
contentAnimationEvents: 'toggleranimation'
} )
.on( 'timeinputupdate.' + this.uiBaseClass, function( 
event, value ) {
-   self._updateCalendarHint( value );
-   if( value ) {
-   self.$precision.data( 'listrotator' 
).rotate( value.precision() );
-   self.$calendar.data( 'listrotator' 
).rotate( value.calendar() );
+   if( self.$input.data( 'inputextender' 
).extensionIsActive() ) {
+   self._updateCalendarHint( value );
+   if( value ) {
+   self.$precision.data( 
'listrotator' ).rotate( value.precision() );
+   self.$calendar.data( 
'listrotator' ).rotate( value.calendar() );
+   }
+   self._updatePreview();
}
self._newValue = false; // value, not yet 
handled by draw(), is outdated now
self._viewNotifier.notify( 'change' );
-   self._updatePreview();
} );
 
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb8474dc4995b2b02dbf52a42626947b15961c1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Re-focus add button after having added/cancelled adding a ... - change (mediawiki...Wikibase)

2013-11-04 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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


Change subject: Re-focus add button after having added/cancelled adding a 
claim
..

Re-focus add button after having added/cancelled adding a claim

Change-Id: Iabf2c05b5e11801b582dfb99604ea9a69407d8e2
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/65/93465/2

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index ed78ce5..5b63012 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -306,6 +306,12 @@
$claimlistview.addtoolbar( {
addButtonAction: function() {
$claimlistview.data( 'claimlistview' 
).enterNewItem();
+
+   // Re-focus add button after having 
added or having cancelled adding a claim:
+   var eventName = 
'claimlistviewafterstopediting.addtoolbar';
+   $claimlistview.one( eventName, 
function( event ) {
+   $claimlistview.data( 
'addtoolbar' ).toolbar.$btnAdd.focus();
+   } );
}
} );
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabf2c05b5e11801b582dfb99604ea9a69407d8e2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
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 for lead section properly - change (apps...wikipedia)

2013-11-04 Thread Brion VIBBER (Code Review)

Brion VIBBER has submitted this change and it was merged.

Change subject: Check for lead section properly
..


Check for lead section properly

Sections with id=0 will always be treated as the lead
Change-Id: Ib641e0438c42879ffe6b4e872aa8cc58518733d5
---
A wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SectionTests.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java
2 files changed, 23 insertions(+), 1 deletion(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SectionTests.java 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SectionTests.java
new file mode 100644
index 000..18d59af
--- /dev/null
+++ b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SectionTests.java
@@ -0,0 +1,22 @@
+package org.wikimedia.wikipedia.test;
+
+import android.test.AndroidTestCase;
+import org.junit.Test;
+import org.wikimedia.wikipedia.Section;
+
+public class SectionTests extends AndroidTestCase {
+@Test
+public void testSectionLead() {
+// Section 0 is the lead
+Section section = new Section(0, 0, Heading, Heading, Content);
+assertTrue(section.isLead());
+
+// Section 1 is not
+section = new Section(1, 1, Heading, Heading, Content);
+assertFalse(section.isLead());
+
+// Section 1 is not, even if it's somehow at level 0
+section = new Section(1, 0, Heading, Heading, Content);
+assertFalse(section.isLead());
+}
+}
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java
index 75f1768..7512aa7 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/Section.java
@@ -37,7 +37,7 @@
 }
 
 public boolean isLead() {
-return level == 0;
+return id == 0;
 }
 
 public int getId() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib641e0438c42879ffe6b4e872aa8cc58518733d5
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Split memcached for Wikibase diff view body content by lang - change (mediawiki...Wikibase)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Split memcached for Wikibase diff view body content by lang
..


Split memcached for Wikibase diff view body content by lang

Bug: 55667
Change-Id: I3af6be0813ad1e4f1febb1fb16ec16f0bf76c050
---
M repo/includes/EntityContentDiffView.php
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/repo/includes/EntityContentDiffView.php 
b/repo/includes/EntityContentDiffView.php
index 7968141..9a05b62 100644
--- a/repo/includes/EntityContentDiffView.php
+++ b/repo/includes/EntityContentDiffView.php
@@ -40,7 +40,7 @@
//TODO: proper injection
$options = new FormatterOptions( array(
//TODO: fallback chain
-   ValueFormatter::OPT_LANG = 
$this-getContext()-getLanguage()-getCode()
+   ValueFormatter::OPT_LANG = 
$this-getLanguage()-getCode()
) );
 
$this-propertyNameFormatter = new EntityIdLabelFormatter( 
$options, WikibaseRepo::getDefaultInstance()-getEntityLookup() );
@@ -155,4 +155,15 @@
return $parserOutput;
}
 
+   /**
+* Returns the cache key for diff body text or content.
+*
+* @return string
+*/
+   protected function getDiffBodyCacheKey() {
+   return wfMemcKey( 'diff', 'version', MW_DIFF_VERSION,
+   'oldid', $this-getOldid(), 'newid', $this-getNewid(),
+   'lang', $this-getLanguage()-getCode() );
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3af6be0813ad1e4f1febb1fb16ec16f0bf76c050
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
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 neighbor blocks for eqiad/esams link - change (operations/dns)

2013-11-04 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

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


Change subject: Add neighbor blocks for eqiad/esams link
..

Add neighbor blocks for eqiad/esams link

Change-Id: I0f309d3ca9849e7e23866e9a99edeb2bda75294a
---
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
2 files changed, 10 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/68/93468/1

diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index 03206c0..b19795f 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -184,10 +184,10 @@
 2461H IN PTR   cr2-knams.wikimedia.org.
 2471H IN PTR   csw1-esams.wikimedia.org.
 
-; Neighbor block between cr2-knams and csw1-esams (91.198.174.248/30)
+; Neighbor block between cr1-eqiad and cr2-knams (91.198.174.250/31)
 
-2491H IN PTR   xe-0-0-0.cr2-knams.wikimedia.org.
-2501H IN PTR   ve7.te-8-1.csw1-esams.wikimedia.org.
+2501H IN PTR   xe-4-2-2.cr1-eqiad.wikimedia.org.
+2511H IN PTR   xe-1-1-0.cr2-knams.wikimedia.org.
 
 ; Neighbor block between cr2-knams and cr1-esams (91.198.174.252/31)
 
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 1f19998..6c47640 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -207,6 +207,13 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.01H IN PTR   
xe-0-0-3-0.cr1-esams.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.01H IN PTR   
te-6-1.csw1-esams.wikimedia.org.
 
+; cr1-eqiad -- cr2-knams (2620:0:862:fe06::/64)
+
+$ORIGIN 6.0.e.f.{{ zonename }}.
+
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.01H IN PTR   
xe-4-2-2.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.01H IN PTR   
xe-1-1-0.cr2-knams.wikimedia.org.
+
 ; Loopback IPs
 
 $ORIGIN f.f.f.f.{{ zonename }}.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f309d3ca9849e7e23866e9a99edeb2bda75294a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add neighbor blocks for eqiad/esams link - change (operations/dns)

2013-11-04 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Add neighbor blocks for eqiad/esams link
..


Add neighbor blocks for eqiad/esams link

Change-Id: I0f309d3ca9849e7e23866e9a99edeb2bda75294a
---
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
2 files changed, 10 insertions(+), 3 deletions(-)

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



diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index 03206c0..b19795f 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -184,10 +184,10 @@
 2461H IN PTR   cr2-knams.wikimedia.org.
 2471H IN PTR   csw1-esams.wikimedia.org.
 
-; Neighbor block between cr2-knams and csw1-esams (91.198.174.248/30)
+; Neighbor block between cr1-eqiad and cr2-knams (91.198.174.250/31)
 
-2491H IN PTR   xe-0-0-0.cr2-knams.wikimedia.org.
-2501H IN PTR   ve7.te-8-1.csw1-esams.wikimedia.org.
+2501H IN PTR   xe-4-2-2.cr1-eqiad.wikimedia.org.
+2511H IN PTR   xe-1-1-0.cr2-knams.wikimedia.org.
 
 ; Neighbor block between cr2-knams and cr1-esams (91.198.174.252/31)
 
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 1f19998..6c47640 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -207,6 +207,13 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.01H IN PTR   
xe-0-0-3-0.cr1-esams.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.01H IN PTR   
te-6-1.csw1-esams.wikimedia.org.
 
+; cr1-eqiad -- cr2-knams (2620:0:862:fe06::/64)
+
+$ORIGIN 6.0.e.f.{{ zonename }}.
+
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.01H IN PTR   
xe-4-2-2.cr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.01H IN PTR   
xe-1-1-0.cr2-knams.wikimedia.org.
+
 ; Loopback IPs
 
 $ORIGIN f.f.f.f.{{ zonename }}.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f309d3ca9849e7e23866e9a99edeb2bda75294a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] use LanguageFallbackChainFacotry option key - change (mediawiki...Wikibase)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: use LanguageFallbackChainFacotry option key
..


use LanguageFallbackChainFacotry option key

Change-Id: I6879c86983732bc16141ae0f85d7fa7613808875
---
M lib/includes/serializers/SerializationOptions.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/includes/serializers/SerializationOptions.php 
b/lib/includes/serializers/SerializationOptions.php
index bc23356..b6a99e0 100644
--- a/lib/includes/serializers/SerializationOptions.php
+++ b/lib/includes/serializers/SerializationOptions.php
@@ -398,7 +398,7 @@
 * @return LanguageFallbackChainFactory
 */
public function getLanguageFallbackChainFactory() {
-   $factory = $this-getOption( self::OPT_LANGUAGES );
+   $factory = $this-getOption( 
self::OPT_LANGUAGE_FALLBACK_CHAIN_FACTORY );
 
if ( $factory === null ) {
$factory = new LanguageFallbackChainFactory();
@@ -416,6 +416,6 @@
 * @param LanguageFallbackChainFactory $factory
 */
public function setLanguageFallbackChainFactory( 
LanguageFallbackChainFactory $factory ) {
-   $this-setOption( self::OPT_LANGUAGES, $factory );
+   $this-setOption( self::OPT_LANGUAGE_FALLBACK_CHAIN_FACTORY, 
$factory );
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6879c86983732bc16141ae0f85d7fa7613808875
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Bump patch version - change (mediawiki/selenium)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Bump patch version
..


Bump patch version

Change-Id: Ic900ed84139e397c03c51e3a699c4dc193088a76
---
M lib/mediawiki/selenium/version.rb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/mediawiki/selenium/version.rb 
b/lib/mediawiki/selenium/version.rb
index 2328e60..0ccef4c 100644
--- a/lib/mediawiki/selenium/version.rb
+++ b/lib/mediawiki/selenium/version.rb
@@ -11,6 +11,6 @@
 
 module Mediawiki
   module Selenium
-VERSION = 0.1.11
+VERSION = 0.1.12
   end
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic900ed84139e397c03c51e3a699c4dc193088a76
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Introduce new variable that points to the variable that hold... - change (mediawiki/selenium)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Introduce new variable that points to the variable that holds 
the password
..


Introduce new variable that points to the variable that holds the password

Paired with Nikerabbit niklas.laxst...@gmail.com

The existing solution works only if one environment variable is set.
Jenkins machine has all four environment variables set, so we had to
find another solution.

Change-Id: I3927321f08777196aae2cffcf180d34aa095
---
M docs/jobs.md
M docs/template.md
M lib/mediawiki/selenium/hooks.rb
3 files changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/docs/jobs.md b/docs/jobs.md
index f074c0a..b47fbbd 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -5,9 +5,13 @@
 - Branch: master
 - MediaWiki URL:
 - Folder:
-- MediaWiki user:
-- MediaWiki password:
 - Repository URL:
+- MediaWiki user:
+- MediaWiki password variable:
+MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
+MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
+MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG
 
 
 
diff --git a/docs/template.md b/docs/template.md
index a592ca9..7958822 100644
--- a/docs/template.md
+++ b/docs/template.md
@@ -131,10 +131,10 @@
 - Display Name: MediaWiki user
 - Type: Text-field
 
-## MediaWiki password
+## MediaWiki password variable
 
-- ID: MEDIAWIKI_PASSWORD
-- Display Name: MediaWiki password
+- ID: MEDIAWIKI_PASSWORD_VARIABLE
+- Display Name: MediaWiki password variable
 - Type: Text-field
 
 ## Jelly-based transformation
@@ -221,7 +221,7 @@
 hudson.tasks.Shell
   command
 export MEDIAWIKI_USER=${MEDIAWIKI_USER}
-export MEDIAWIKI_PASSWORD=${MEDIAWIKI_PASSWORD}
+export MEDIAWIKI_PASSWORD_VARIABLE=${MEDIAWIKI_PASSWORD_VARIABLE}
 
 export BROWSER_LABEL=${BROWSER_LABEL}
 export MEDIAWIKI_URL=http://${MEDIAWIKI_URL}/wiki/
diff --git a/lib/mediawiki/selenium/hooks.rb b/lib/mediawiki/selenium/hooks.rb
index bfc3b4b..3d62ad0 100644
--- a/lib/mediawiki/selenium/hooks.rb
+++ b/lib/mediawiki/selenium/hooks.rb
@@ -12,11 +12,7 @@
 config = YAML.load_file('config/config.yml')
 
 Before('@login') do
-  ENV['MEDIAWIKI_PASSWORD'] = 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET'] if 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET']
-  ENV['MEDIAWIKI_PASSWORD'] = 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG'] if 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG']
-  ENV['MEDIAWIKI_PASSWORD'] = 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG'] if 
ENV['MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG']
-  ENV['MEDIAWIKI_PASSWORD'] = ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG'] if 
ENV['MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG']
-
+  ENV['MEDIAWIKI_PASSWORD'] = ENV[ENV['MEDIAWIKI_PASSWORD_VARIABLE']] if 
ENV['MEDIAWIKI_PASSWORD_VARIABLE']
   puts MEDIAWIKI_USER environment variable is not defined! Please export a 
value for that variable before proceeding. unless ENV['MEDIAWIKI_USER']
   puts MEDIAWIKI_PASSWORD environment variable is not defined! Please export 
a value for that variable before proceeding. unless ENV['MEDIAWIKI_PASSWORD']
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3927321f08777196aae2cffcf180d34aa095
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Bump patch version - change (mediawiki/selenium)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Bump patch version
..


Bump patch version

Releasing new version of the gem.

Change-Id: I84f4a1bfdd96ce2bed2b004b06e557d5e0aaf926
---
M lib/mediawiki/selenium/version.rb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/mediawiki/selenium/version.rb 
b/lib/mediawiki/selenium/version.rb
index 984f47b..2328e60 100644
--- a/lib/mediawiki/selenium/version.rb
+++ b/lib/mediawiki/selenium/version.rb
@@ -11,6 +11,6 @@
 
 module Mediawiki
   module Selenium
-VERSION = 0.1.10
+VERSION = 0.1.11
   end
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84f4a1bfdd96ce2bed2b004b06e557d5e0aaf926
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (qa/browsertests)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated Ruby gems
..

Updated Ruby gems

Change-Id: Ia11eb10d7a08d5557023be48937c6fd56f56635a
---
M Gemfile.lock
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/69/93469/1

diff --git a/Gemfile.lock b/Gemfile.lock
index afcf3b0..ffcdadc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,15 +17,14 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
-ffi (1.9.0-x86-mingw32)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 gherkin (2.12.2-x86-mingw32)
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
-mediawiki-selenium (0.1.10)
+mediawiki-selenium (0.1.12)
   cucumber
   json
   net-http-persistent
@@ -33,13 +32,13 @@
   rest-client
   rspec-expectations
   syntax
-mime-types (1.25)
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia11eb10d7a08d5557023be48937c6fd56f56635a
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (mediawiki...Flow)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated Ruby gems
..

Updated Ruby gems

Change-Id: I69304e94327492db8e2872b269925a109a45dea2
---
M tests/browser/Gemfile
M tests/browser/Gemfile.lock
2 files changed, 16 insertions(+), 23 deletions(-)


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

diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 5b79a90..0891841 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,11 +3,4 @@
 
 source 'https://rubygems.org'
 
-gem 'cucumber'
-gem 'json'
 gem 'mediawiki-selenium'
-gem 'net-http-persistent'
-gem 'page-object'
-gem 'rest-client'
-gem 'rspec-expectations'
-gem 'syntax'
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index fa2be84..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,19 +16,26 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.8)
-mime-types (1.25)
+json (1.8.1)
+mediawiki-selenium (0.1.12)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
@@ -36,11 +43,11 @@
   mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 watir-webdriver (0.6.4)
@@ -52,11 +59,4 @@
   ruby
 
 DEPENDENCIES
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
-  rest-client
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69304e94327492db8e2872b269925a109a45dea2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (qa/browsertests)

2013-11-04 Thread Cmcmahon (Code Review)

Cmcmahon has submitted this change and it was merged.

Change subject: Updated Ruby gems
..


Updated Ruby gems

Change-Id: Ia11eb10d7a08d5557023be48937c6fd56f56635a
---
M Gemfile.lock
1 file changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/Gemfile.lock b/Gemfile.lock
index afcf3b0..ffcdadc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,15 +17,14 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
-ffi (1.9.0-x86-mingw32)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 gherkin (2.12.2-x86-mingw32)
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
-mediawiki-selenium (0.1.10)
+mediawiki-selenium (0.1.12)
   cucumber
   json
   net-http-persistent
@@ -33,13 +32,13 @@
   rest-client
   rspec-expectations
   syntax
-mime-types (1.25)
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia11eb10d7a08d5557023be48937c6fd56f56635a
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (mediawiki...MobileFrontend)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Updated Ruby gems
..

Updated Ruby gems

Change-Id: I023c8615517aff8cf7a2da3b2e3c3d9d673efdda
---
M tests/browser/Gemfile
M tests/browser/Gemfile.lock
2 files changed, 20 insertions(+), 22 deletions(-)


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

diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 62f893e..3715f37 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,10 +3,4 @@
 
 source 'https://rubygems.org'
 
-gem 'cucumber'
-gem 'json'
 gem 'mediawiki-selenium'
-gem 'net-http-persistent'
-gem 'page-object'
-gem 'rspec-expectations'
-gem 'syntax'
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index eea25a7..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,28 +16,38 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
-gherkin (2.12.1)
+ffi (1.9.3)
+gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.7)
-multi_json (1.8.0)
+json (1.8.1)
+mediawiki-selenium (0.1.12)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
+multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
+rest-client (1.6.7)
+  mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 watir-webdriver (0.6.4)
@@ -49,10 +59,4 @@
   ruby
 
 DEPENDENCIES
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I023c8615517aff8cf7a2da3b2e3c3d9d673efdda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [browser test] Updated Ruby gems - change (mediawiki...VisualEditor)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: [browser test] Updated Ruby gems
..

[browser test] Updated Ruby gems

Change-Id: I8c298efe8dd1abbb42b5c42ee0b8075a0aad9acf
---
M modules/ve-mw/test/browser/Gemfile.lock
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/test/browser/Gemfile.lock 
b/modules/ve-mw/test/browser/Gemfile.lock
index a9a7aaa..d838dfd 100644
--- a/modules/ve-mw/test/browser/Gemfile.lock
+++ b/modules/ve-mw/test/browser/Gemfile.lock
@@ -16,12 +16,12 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
-mediawiki-selenium (0.1.10)
+mediawiki-selenium (0.1.12)
   cucumber
   json
   net-http-persistent
@@ -29,7 +29,7 @@
   rest-client
   rspec-expectations
   syntax
-mime-types (1.25)
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c298efe8dd1abbb42b5c42ee0b8075a0aad9acf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Adding palladium/strontium (new puppetmasters) IPs - change (operations/dns)

2013-11-04 Thread Akosiaris (Code Review)

Akosiaris has uploaded a new change for review.

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


Change subject: Adding palladium/strontium (new puppetmasters) IPs
..

Adding palladium/strontium (new puppetmasters) IPs

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/75/93475/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 385a89d..6399898 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1357,6 +1357,7 @@
 1611H IN PTR   lanthanum.eqiad.wmnet.
 
 1631H IN PTR   oxygen.eqiad.wmnet.
+1641H IN PTR   strontium.eqiad.wmnet.
 
 1671H IN PTR   ms-fe1001.eqiad.wmnet.
 1681H IN PTR   ms-fe1002.eqiad.wmnet.
@@ -1588,7 +1589,7 @@
 157 1H IN PTR   pc1002.eqiad.wmnet.
 158 1H IN PTR   pc1003.eqiad.wmnet.
 159 1H IN PTR   solr1003.eqiad.wmnet.
-
+160 1H IN PTR   palladium.eqiad.wmnet.
 161 1H IN PTR   osm-cp1003.eqiad.wmnet.
 162 1H IN PTR   osm-cp1004.eqiad.wmnet.
 163 1H IN PTR   mw1208.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 93c9bfe..f6d41b2 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1324,6 +1324,7 @@
 osm-web10031H  IN A10.64.32.95
 osm-web10041H  IN A10.64.32.96
 oxygen 1H  IN A10.64.0.163
+palladium  1H  IN A10.64.16.160
 pc1001  1H  IN A10.64.16.156
 pc1002  1H  IN A10.64.16.157
 pc1003  1H  IN A10.64.16.158
@@ -1368,6 +1369,7 @@
 solr1002   1H  IN A10.64.0.199
 solr1003   1H  IN A10.64.16.159
 stat1002   1H  IN A10.64.0.16
+strontium  1H  IN A10.64.0.164
 puppet 1H  IN CNAMEstafford.pmtpa.wmnet.
 tin1H  IN A10.64.0.196
 terbium1H  IN A10.64.32.13

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21f5eeda50beaa079f3fcdd063b80958ada17529
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Akosiaris akosia...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [browser test] Updated Ruby gems - change (mediawiki...VisualEditor)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: [browser test] Updated Ruby gems
..


[browser test] Updated Ruby gems

Change-Id: I8c298efe8dd1abbb42b5c42ee0b8075a0aad9acf
---
M modules/ve-mw/test/browser/Gemfile.lock
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/test/browser/Gemfile.lock 
b/modules/ve-mw/test/browser/Gemfile.lock
index a9a7aaa..d838dfd 100644
--- a/modules/ve-mw/test/browser/Gemfile.lock
+++ b/modules/ve-mw/test/browser/Gemfile.lock
@@ -16,12 +16,12 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
 json (1.8.1)
-mediawiki-selenium (0.1.10)
+mediawiki-selenium (0.1.12)
   cucumber
   json
   net-http-persistent
@@ -29,7 +29,7 @@
   rest-client
   rspec-expectations
   syntax
-mime-types (1.25)
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c298efe8dd1abbb42b5c42ee0b8075a0aad9acf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (mediawiki...Flow)

2013-11-04 Thread Cmcmahon (Code Review)

Cmcmahon has submitted this change and it was merged.

Change subject: Updated Ruby gems
..


Updated Ruby gems

Change-Id: I69304e94327492db8e2872b269925a109a45dea2
---
M tests/browser/Gemfile
M tests/browser/Gemfile.lock
2 files changed, 16 insertions(+), 23 deletions(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 5b79a90..0891841 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,11 +3,4 @@
 
 source 'https://rubygems.org'
 
-gem 'cucumber'
-gem 'json'
 gem 'mediawiki-selenium'
-gem 'net-http-persistent'
-gem 'page-object'
-gem 'rest-client'
-gem 'rspec-expectations'
-gem 'syntax'
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index fa2be84..d838dfd 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -16,19 +16,26 @@
 diff-lcs (1.2.4)
 faker (1.2.0)
   i18n (~ 0.5)
-ffi (1.9.0)
+ffi (1.9.3)
 gherkin (2.12.2)
   multi_json (~ 1.3)
 i18n (0.6.5)
-json (1.8.0)
-mediawiki-selenium (0.1.8)
-mime-types (1.25)
+json (1.8.1)
+mediawiki-selenium (0.1.12)
+  cucumber
+  json
+  net-http-persistent
+  page-object
+  rest-client
+  rspec-expectations
+  syntax
+mime-types (2.0)
 multi_json (1.8.2)
 multi_test (0.0.2)
 net-http-persistent (2.9)
-page-object (0.9.2)
+page-object (0.9.3)
   page_navigation (= 0.8)
-  selenium-webdriver (= 2.35.0)
+  selenium-webdriver (= 2.37.0)
   watir-webdriver (= 0.6.4)
 page_navigation (0.9)
   data_magic (= 0.14)
@@ -36,11 +43,11 @@
   mime-types (= 1.16)
 rspec-expectations (2.14.3)
   diff-lcs (= 1.1.3,  2.0)
-rubyzip (0.9.9)
-selenium-webdriver (2.35.1)
+rubyzip (1.0.0)
+selenium-webdriver (2.37.0)
   childprocess (= 0.2.5)
   multi_json (~ 1.0)
-  rubyzip ( 1.0.0)
+  rubyzip (~ 1.0.0)
   websocket (~ 1.0.4)
 syntax (1.0.0)
 watir-webdriver (0.6.4)
@@ -52,11 +59,4 @@
   ruby
 
 DEPENDENCIES
-  cucumber
-  json
   mediawiki-selenium
-  net-http-persistent
-  page-object
-  rest-client
-  rspec-expectations
-  syntax

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69304e94327492db8e2872b269925a109a45dea2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Spage sp...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Merge upstream 'v0.7.1' into master - change (operations...jenkins-debian-glue)

2013-11-04 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: Merge upstream 'v0.7.1' into master
..

Merge upstream 'v0.7.1' into master

New upstream release 0.7.1:

* [80057b0] Drop jenkins-debian-glue-repoenv package + add dependency
  on reprepro | freight to jenkins-debian-glue instead
* [7588e3e] Add jenkins-debian-glue-buildenv-git to Recommends

Change-Id: Ibb684c48ffd32805d6016cbcff5c3b1df23b33f6
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/jenkins-debian-glue 
refs/changes/76/93476/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb684c48ffd32805d6016cbcff5c3b1df23b33f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/jenkins-debian-glue
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Moved Selenium tests from tests/acceptance to tests/browser ... - change (mediawiki...MobileFrontend)

2013-11-04 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Moved Selenium tests from tests/acceptance to tests/browser 
folder
..

Moved Selenium tests from tests/acceptance to tests/browser folder

Change-Id: I07966d9085b995a06847012cb5468ccf85b62c2b
---
R tests/browser/features/external_links.feature
R tests/browser/features/image_resolves.feature
R tests/browser/features/step_definitions/external_links_steps.rb
R tests/browser/features/step_definitions/image_resolves_steps.rb
R tests/browser/features/support/pages/article_page.rb
5 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/tests/acceptance/features/external_links.feature 
b/tests/browser/features/external_links.feature
similarity index 100%
rename from tests/acceptance/features/external_links.feature
rename to tests/browser/features/external_links.feature
diff --git a/tests/acceptance/features/image_resolves.feature 
b/tests/browser/features/image_resolves.feature
similarity index 100%
rename from tests/acceptance/features/image_resolves.feature
rename to tests/browser/features/image_resolves.feature
diff --git a/tests/acceptance/features/step_definitions/external_links_steps.rb 
b/tests/browser/features/step_definitions/external_links_steps.rb
similarity index 100%
rename from tests/acceptance/features/step_definitions/external_links_steps.rb
rename to tests/browser/features/step_definitions/external_links_steps.rb
diff --git a/tests/acceptance/features/step_definitions/image_resolves_page.rb 
b/tests/browser/features/step_definitions/image_resolves_steps.rb
similarity index 100%
rename from tests/acceptance/features/step_definitions/image_resolves_page.rb
rename to tests/browser/features/step_definitions/image_resolves_steps.rb
diff --git a/tests/acceptance/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
similarity index 100%
rename from tests/acceptance/features/support/pages/article_page.rb
rename to tests/browser/features/support/pages/article_page.rb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07966d9085b995a06847012cb5468ccf85b62c2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix metadata issues in newFromDocumentReplace - change (mediawiki...VisualEditor)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Fix metadata issues in newFromDocumentReplace
..


Fix metadata issues in newFromDocumentReplace

* Our metadata insertions now need to be the same length as the data
  insertion, not one more, so:
** Remove the +1 in the listMetadata splice
** Shorten the metadata variable by dropping the merging of the
   metadata right before and right after the internal list; it was
   also including the metadata right after the internal list twice
*** We still need to deal with this in some way though, left a TODO
** Fix the metadata insertion test for these changes
* Fix null reference keys in the test data; we made all references
  keyed a while ago, but this test data was never updated for that
** The remapping of reference data doesn't remap auto/N keys yet,
   left a FIXME for that

Change-Id: I8ef4e6ee7c1808574d81d0b83294848afd400cd7
---
M modules/ve-mw/test/dm/ve.dm.Transaction.test.js
M modules/ve-mw/test/dm/ve.dm.mwExample.js
M modules/ve/dm/ve.dm.Transaction.js
3 files changed, 10 insertions(+), 12 deletions(-)

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



diff --git a/modules/ve-mw/test/dm/ve.dm.Transaction.test.js 
b/modules/ve-mw/test/dm/ve.dm.Transaction.test.js
index abfc924..279be32 100644
--- a/modules/ve-mw/test/dm/ve.dm.Transaction.test.js
+++ b/modules/ve-mw/test/dm/ve.dm.Transaction.test.js
@@ -21,7 +21,7 @@
'about': '#mwt4',
'listIndex': 0,
'listGroup': 'mwReference/',
-   'listKey': null,
+   'listKey': 'auto/1', // FIXME reference 
insertions should be renumbered correctly
'refGroup': '',
'contentsUsed': true
} },
@@ -55,7 +55,7 @@
'removeMetadata': 
complexDoc.getMetadata( new ve.Range( 0, 7 ) ),
'insertMetadata': 
complexDoc.getMetadata( new ve.Range( 0, 5 ) )
.concat( [ [ comment ] 
] )
-   .concat( 
complexDoc.getMetadata( new ve.Range( 6, 8 ) ) )
+   .concat( 
complexDoc.getMetadata( new ve.Range( 6, 7 ) ) )
},
{ 'type': 'retain', 'length': 1 },
{
diff --git a/modules/ve-mw/test/dm/ve.dm.mwExample.js 
b/modules/ve-mw/test/dm/ve.dm.mwExample.js
index 3030abf..dceb573 100644
--- a/modules/ve-mw/test/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/test/dm/ve.dm.mwExample.js
@@ -675,7 +675,7 @@
'about': '#mwt1',
'listIndex': 0,
'listGroup': 'mwReference/',
-   'listKey': null,
+   'listKey': 'auto/0',
'refGroup': '',
'contentsUsed': true
} },
diff --git a/modules/ve/dm/ve.dm.Transaction.js 
b/modules/ve/dm/ve.dm.Transaction.js
index 80bef8c..3571dca 100644
--- a/modules/ve/dm/ve.dm.Transaction.js
+++ b/modules/ve/dm/ve.dm.Transaction.js
@@ -190,15 +190,13 @@
);
metadata = new ve.dm.MetaLinearData( doc.getStore(),
newDoc.getMetadata( new ve.Range( 0, 
newListNodeOuterRange.start ), true ).concat(
-   // Merge the metadata immediately before and 
immediately after the internal list
-   ve.copy( ve.dm.MetaLinearData.static.merge( [
-   newDoc.metadata.getData( 
newListNodeOuterRange.start ),
-   newDoc.metadata.getData( 
newListNodeOuterRange.end )
-   ] ) )
-   ).concat( newDoc.getMetadata(
-   new ve.Range( newListNodeOuterRange.end, 
newDoc.data.getLength() ), true
-   ) )
+   newListNodeOuterRange.end  newDoc.data.getLength() ? 
newDoc.getMetadata(
+   new ve.Range( newListNodeOuterRange.end + 1, 
newDoc.data.getLength() ), true
+   ) : []
+   )
);
+   // TODO deal with metadata right before and right after the internal 
list
+
// Merge the stores
merge = doc.getStore().merge( newDoc.getStore() );
// Remap the store indexes in the data
@@ -261,7 +259,7 @@
ve.batchSplice( listData, range.start - listNodeRange.start,
range.end - range.start, data.data );
ve.batchSplice( listMetadata, range.start - listNodeRange.start,
-   range.end - range.start + 1, metadata.data );
+   range.end - range.start, metadata.data );

[MediaWiki-commits] [Gerrit] Moved Selenium tests from tests/acceptance to tests/browser ... - change (mediawiki...MobileFrontend)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Moved Selenium tests from tests/acceptance to tests/browser 
folder
..


Moved Selenium tests from tests/acceptance to tests/browser folder

Change-Id: I07966d9085b995a06847012cb5468ccf85b62c2b
---
R tests/browser/features/external_links.feature
R tests/browser/features/image_resolves.feature
R tests/browser/features/step_definitions/external_links_steps.rb
R tests/browser/features/step_definitions/image_resolves_steps.rb
R tests/browser/features/support/pages/article_page.rb
5 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/tests/acceptance/features/external_links.feature 
b/tests/browser/features/external_links.feature
similarity index 100%
rename from tests/acceptance/features/external_links.feature
rename to tests/browser/features/external_links.feature
diff --git a/tests/acceptance/features/image_resolves.feature 
b/tests/browser/features/image_resolves.feature
similarity index 100%
rename from tests/acceptance/features/image_resolves.feature
rename to tests/browser/features/image_resolves.feature
diff --git a/tests/acceptance/features/step_definitions/external_links_steps.rb 
b/tests/browser/features/step_definitions/external_links_steps.rb
similarity index 100%
rename from tests/acceptance/features/step_definitions/external_links_steps.rb
rename to tests/browser/features/step_definitions/external_links_steps.rb
diff --git a/tests/acceptance/features/step_definitions/image_resolves_page.rb 
b/tests/browser/features/step_definitions/image_resolves_steps.rb
similarity index 100%
rename from tests/acceptance/features/step_definitions/image_resolves_page.rb
rename to tests/browser/features/step_definitions/image_resolves_steps.rb
diff --git a/tests/acceptance/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
similarity index 100%
rename from tests/acceptance/features/support/pages/article_page.rb
rename to tests/browser/features/support/pages/article_page.rb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07966d9085b995a06847012cb5468ccf85b62c2b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Mgrover mgro...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update Autonym font to latest version(20131104) - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Update Autonym font to latest version(20131104)
..

Update Autonym font to latest version(20131104)

Release: https://github.com/santhoshtr/AutonymFont/releases/tag/20131104
Changes:
* Remove Tamil GSUB rules, use GPOS alone
* Autohint Latin glyphs
* Dont strip hints for eot format
* Glyph simplifications and misc cleanup

Bug: 56552
Bug: 56346

Change-Id: Ib2014e0606983dbf33391e479f96c75fab79075f
---
M data/fontrepo/fonts/Autonym/Autonym.eot
M data/fontrepo/fonts/Autonym/Autonym.ttf
M data/fontrepo/fonts/Autonym/Autonym.woff
M data/fontrepo/fonts/Autonym/font.ini
M resources/js/ext.uls.webfonts.repository.js
5 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/data/fontrepo/fonts/Autonym/Autonym.eot 
b/data/fontrepo/fonts/Autonym/Autonym.eot
index b88cffc..00e036c 100644
--- a/data/fontrepo/fonts/Autonym/Autonym.eot
+++ b/data/fontrepo/fonts/Autonym/Autonym.eot
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/Autonym.ttf 
b/data/fontrepo/fonts/Autonym/Autonym.ttf
index b339457..6e5fb54 100644
--- a/data/fontrepo/fonts/Autonym/Autonym.ttf
+++ b/data/fontrepo/fonts/Autonym/Autonym.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/Autonym.woff 
b/data/fontrepo/fonts/Autonym/Autonym.woff
index ec4db1f..25f7c43 100644
--- a/data/fontrepo/fonts/Autonym/Autonym.woff
+++ b/data/fontrepo/fonts/Autonym/Autonym.woff
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/font.ini 
b/data/fontrepo/fonts/Autonym/font.ini
index 9963978..914505d 100644
--- a/data/fontrepo/fonts/Autonym/font.ini
+++ b/data/fontrepo/fonts/Autonym/font.ini
@@ -1,6 +1,6 @@
 [Autonym]
 languages=mul
-version=1.0
+version=20131104
 license=OFL-1.1
 licensefile=OFL.txt
 url=http://scripts.sil.org/CharisSIL
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index a8cf66f..b192013 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Do not edit! This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{base:..\/data\/fontrepo\/fonts\/,languages:{adx:[Jomolhari],af:[system,OpenDyslexic],ahr:[Lohit
 
Marathi],akk:[Akkadian],am:[AbyssinicaSIL],ang:[system,Junicode],ar:[Amiri],arb:[Amiri],arc:[Estrangelo
 Edessa,East Syriac Adiabene,SertoUrhoy],as:[system,Lohit 
Assamese],bbc:[system,Pangururan],bh:[Lohit 
Devanagari],bho:[Lohit 
Devanagari],bk:[system,OpenDyslexic],bn:[Siyam Rupali,Lohit 
Bengali],bo:[Jomolhari],bod:[Jomolhari],bpy:[Siyam Rupali,Lohit 
Bengali],btk:[system,Pangururan],bug:[Saweri],ca:[system,OpenDyslexic],cdo:[CharisSIL],cr:[OskiEast],cy:[system,OpenDyslexic],da:[system,OpenDyslexic],de:[system,OpenDyslexic],dre:[Jomolhari],dv:[FreeFont-Thaana],dz:[Jomolhari],en:[system,OpenDyslexic],es:[system,OpenDyslexic],et:[system,OpenDyslexic],fa:[system,Iranian
 
Sans,Nazli,Amiri],fi:[system,OpenDyslexic],fo:[system,OpenDyslexic],fr:[system,OpenDyslexic],fy:[system,OpenDyslexic],ga:[system,OpenDyslexic],gd:[system,OpenDyslexic],gez:[AbyssinicaSIL],gl:[system,OpenDyslexic],goe:[Jomolhari],gom:[Lohit
 Devanagari],grc:[system,GentiumPlus],gu:[Lohit 
Gujarati],hbo:[Taamey Frank CLM,Alef],he:[system,Alef,Miriam 
CLM,Taamey Frank CLM],hi:[Lohit 
Devanagari],hu:[system,OpenDyslexic],hut:[Jomolhari],id:[system,OpenDyslexic],ii:[Nuosu
 
SIL],is:[system,OpenDyslexic],it:[system,OpenDyslexic],iu:[system,OskiEast],jv:[system,Tuladha
 Jejeg],jv-java:[Tuladha 
Jejeg],kbg:[Jomolhari],khg:[Jomolhari],km:[KhmerOSbattambang,Hanuman,KhmerOS,Nokora
 Regular,Suwannaphum],kn:[Lohit Kannada,Gubbi],kok:[Lohit 
Devanagari],kte:[Jomolhari],lb:[system,OpenDyslexic],lbj:[Jomolhari],lhm:[Jomolhari],li:[system,OpenDyslexic],lo:[Phetsarath],loy:[Jomolhari],luk:[Jomolhari],lya:[Jomolhari],mai:[Lohit
 
Devanagari],mak:[Saweri],mi:[system,OpenDyslexic],ml:[system,AnjaliOldLipi,Meera],mr:[Lohit
 
Marathi],ms:[system,OpenDyslexic],muk:[Jomolhari],mul:[system,Autonym],my:[TharLon,Myanmar3,Padauk],nan:[Doulos
 SIL,CharisSIL],nb:[system,OpenDyslexic],ne:[Lohit 
Nepali,Madan],nl:[system,OpenDyslexic],oc:[system,OpenDyslexic],ola:[Jomolhari],or:[Lohit
 Oriya,Utkal],otb:[Jomolhari],pa:[Lohit 
Punjabi,Saab],pal:[Shapour],peo:[Xerxes],pt:[system,OpenDyslexic],sa:[Lohit
 
Devanagari],saz:[Pagul],si:[system,lklug],sq:[system,OpenDyslexic],sux:[Akkadian],sv:[system,OpenDyslexic],sw:[system,OpenDyslexic],syc:[Estrangelo
 Edessa,East Syriac Adiabene,SertoUrhoy],ta:[system,Lohit 
Tamil,Lohit Tamil 
Classical,Thendral,Thenee],tcn:[Jomolhari],tcy:[Lohit 
Kannada,Gubbi],te:[Lohit 
Telugu],thw:[Jomolhari],ti:[AbyssinicaSIL],tig

[MediaWiki-commits] [Gerrit] Re-focus add button after having added/cancelled adding a ... - change (mediawiki...Wikibase)

2013-11-04 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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


Change subject: Re-focus add button after having added/cancelled adding a 
reference
..

Re-focus add button after having added/cancelled adding a reference

Change-Id: Ic133dd439d41ccff57f16ff10d6fc38dd30537bc
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/66/93466/3

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 99db57e..f322379 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -338,6 +338,8 @@
events: {
listviewcreate: function( event ) {
var $listview = $( event.target ),
+   listview = $listview.data( 'listview' ),
+   lia = listview.listItemAdapter(),
$node = $listview.parent();
 
if( !$node.hasClass( 'wb-statement-references' ) ) {
@@ -346,7 +348,14 @@
 
$node.addtoolbar( {
addButtonAction: function() {
-   $listview.data( 'listview' 
).enterNewItem();
+   listview.enterNewItem();
+
+   // Re-focus add button after having 
added or having cancelled adding a
+   // reference:
+   var eventName = lia.prefixedEvent( 
'afterstopediting.addtoolbar' );
+   $listview.one( eventName, function( 
event ) {
+   $node.data( 'addtoolbar' 
).toolbar.$btnAdd.focus();
+   } );
},
addButtonLabel: mw.msg( 'wikibase-addreference' 
)
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic133dd439d41ccff57f16ff10d6fc38dd30537bc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Trigger re-enabling EditableValue after saving successfully - change (mediawiki...Wikibase)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Trigger re-enabling EditableValue after saving successfully
..


Trigger re-enabling EditableValue after saving successfully

(bug 51307)
By re-enabling the EditableValue after saving, the state of the toolbar items 
is set appropriately.

Change-Id: I65a9e706a84d17ec10d4d80fdfa6fcad92fc9f9b
---
M lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
M repo/tests/selenium/item/editonoff_spec.rb
2 files changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js 
b/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
index 43a90c3..285967c 100644
--- a/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
+++ b/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
@@ -597,6 +597,8 @@
self.setValue( responseVal );
}
 
+   self.enable();
+
if( mw.config.get( 'wbEntityId' ) === null ) {
// if the 'save' process will create a 
new item, trigger the event!
$( window.wikibase ).triggerHandler( 
'newItemCreated', response.entity );
diff --git a/repo/tests/selenium/item/editonoff_spec.rb 
b/repo/tests/selenium/item/editonoff_spec.rb
index 3ecfc67..a329069 100644
--- a/repo/tests/selenium/item/editonoff_spec.rb
+++ b/repo/tests/selenium/item/editonoff_spec.rb
@@ -141,11 +141,20 @@
 page.editDescriptionLink?.should be_false
 page.addAliases?.should be_false
 page.addSitelinkLink?.should be_false
+page.removeSitelinkLink?.should be_true
 page.cancelSitelinkLink
 page.editLabelLink?.should be_true
 page.editDescriptionLink?.should be_true
 page.addAliases?.should be_true
 page.addSitelinkLink?.should be_true
+page.editSitelinkLink
+page.pageInputFieldExistingSiteLink=England
+page.saveSitelinkLink
+ajax_wait
+page.wait_for_api_callback
+page.editSitelinkLink
+# Check that remove button is enabled after editing (bug #51307):
+page.removeSitelinkLink?.should be_true
   end
 end
   end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65a9e706a84d17ec10d4d80fdfa6fcad92fc9f9b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
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 appearance and messages on demo page - change (mediawiki...VisualEditor)

2013-11-04 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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


Change subject: Fix appearance and messages on demo page
..

Fix appearance and messages on demo page

Some 've-ui-toolbar-bar' classes hadn't been converted to OO.ui so the
toolbar had no border. Also removed a useless rule in mw.ViewPageTarget.css.

SA platform didn't override OO.ui.msg to use the ve.msg so no messages
were getting through.

Change-Id: Ieb5bc3c98d1c435ec194b201b517a688cd9b02b9
---
M demos/ve/demo.css
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve/init/sa/ve.init.sa.Platform.js
3 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index cea5b75..2fd9bf2 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -143,7 +143,7 @@
margin: 0 2em;
 }
 
-.ve-init-sa-target-toolbar .ve-ui-toolbar-bar {
+.ve-init-sa-target-toolbar .oo-ui-toolbar-bar {
border: solid 1px #ccc;
border-radius: 0;
-webkit-border-top-right-radius: 0.25em;
@@ -156,7 +156,7 @@
border-top-left-radius: 0.25em;
 }
 
-.ve-init-sa-target-toolbar.ve-ui-toolbar-floating .ve-ui-toolbar-bar {
+.ve-init-sa-target-toolbar.ve-ui-toolbar-floating .oo-ui-toolbar-bar {
border-top: none;
border-radius: 0;
 }
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 4002375..bf5935d 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -46,10 +46,6 @@
padding: 0.25em;
 }
 
-.ve-init-mw-viewPageTarget-toolbar-utilites .ve-ui-toolbar-bar {
-   border: none;
-}
-
 .ve-init-mw-viewPageTarget-toolbar-utilites  .oo-ui-iconButtonWidget {
margin-right: 0.2em;
margin-top: 0.2em;
diff --git a/modules/ve/init/sa/ve.init.sa.Platform.js 
b/modules/ve/init/sa/ve.init.sa.Platform.js
index 4c70884..947f1bf 100644
--- a/modules/ve/init/sa/ve.init.sa.Platform.js
+++ b/modules/ve/init/sa/ve.init.sa.Platform.js
@@ -125,3 +125,7 @@
 /* Initialization */
 
 ve.init.platform = new ve.init.sa.Platform();
+
+/* Extension */
+
+OO.ui.msg = ve.bind( ve.init.platform.getMessage, ve.init.platform );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb5bc3c98d1c435ec194b201b517a688cd9b02b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Adding palladium/strontium (new puppetmasters) IPs - change (operations/dns)

2013-11-04 Thread Akosiaris (Code Review)

Akosiaris has submitted this change and it was merged.

Change subject: Adding palladium/strontium (new puppetmasters) IPs
..


Adding palladium/strontium (new puppetmasters) IPs

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

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 385a89d..6399898 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1357,6 +1357,7 @@
 1611H IN PTR   lanthanum.eqiad.wmnet.
 
 1631H IN PTR   oxygen.eqiad.wmnet.
+1641H IN PTR   strontium.eqiad.wmnet.
 
 1671H IN PTR   ms-fe1001.eqiad.wmnet.
 1681H IN PTR   ms-fe1002.eqiad.wmnet.
@@ -1588,7 +1589,7 @@
 157 1H IN PTR   pc1002.eqiad.wmnet.
 158 1H IN PTR   pc1003.eqiad.wmnet.
 159 1H IN PTR   solr1003.eqiad.wmnet.
-
+160 1H IN PTR   palladium.eqiad.wmnet.
 161 1H IN PTR   osm-cp1003.eqiad.wmnet.
 162 1H IN PTR   osm-cp1004.eqiad.wmnet.
 163 1H IN PTR   mw1208.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 93c9bfe..f6d41b2 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1324,6 +1324,7 @@
 osm-web10031H  IN A10.64.32.95
 osm-web10041H  IN A10.64.32.96
 oxygen 1H  IN A10.64.0.163
+palladium  1H  IN A10.64.16.160
 pc1001  1H  IN A10.64.16.156
 pc1002  1H  IN A10.64.16.157
 pc1003  1H  IN A10.64.16.158
@@ -1368,6 +1369,7 @@
 solr1002   1H  IN A10.64.0.199
 solr1003   1H  IN A10.64.16.159
 stat1002   1H  IN A10.64.0.16
+strontium  1H  IN A10.64.0.164
 puppet 1H  IN CNAMEstafford.pmtpa.wmnet.
 tin1H  IN A10.64.0.196
 terbium1H  IN A10.64.32.13

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21f5eeda50beaa079f3fcdd063b80958ada17529
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Akosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Akosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Remove pointless pass-by-reference - change (mediawiki/core)

2013-11-04 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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


Change subject: Remove pointless pass-by-reference
..

Remove pointless pass-by-reference

Change-Id: I80541a627af89f4f84734014c0e211c322e87d45
---
M includes/specials/SpecialSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/93479/1

diff --git a/includes/specials/SpecialSearch.php 
b/includes/specials/SpecialSearch.php
index 8609c74..d5a6b29 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -738,7 +738,7 @@
 *
 * @return string
 */
-   protected function showInterwiki( $matches, $query ) {
+   protected function showInterwiki( $matches, $query ) {
global $wgContLang;
wfProfileIn( __METHOD__ );
$terms = $wgContLang-convertForSearchResult( 
$matches-termMatches() );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80541a627af89f4f84734014c0e211c322e87d45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix appearance and messages on demo page - change (mediawiki...VisualEditor)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Fix appearance and messages on demo page
..


Fix appearance and messages on demo page

Some 've-ui-toolbar-bar' classes hadn't been converted to OO.ui so the
toolbar had no border. Also removed a useless rule in mw.ViewPageTarget.css.

SA platform didn't override OO.ui.msg to use the ve.msg so no messages
were getting through.

Change-Id: Ieb5bc3c98d1c435ec194b201b517a688cd9b02b9
---
M demos/ve/demo.css
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve/init/sa/ve.init.sa.Platform.js
3 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index cea5b75..2fd9bf2 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -143,7 +143,7 @@
margin: 0 2em;
 }
 
-.ve-init-sa-target-toolbar .ve-ui-toolbar-bar {
+.ve-init-sa-target-toolbar .oo-ui-toolbar-bar {
border: solid 1px #ccc;
border-radius: 0;
-webkit-border-top-right-radius: 0.25em;
@@ -156,7 +156,7 @@
border-top-left-radius: 0.25em;
 }
 
-.ve-init-sa-target-toolbar.ve-ui-toolbar-floating .ve-ui-toolbar-bar {
+.ve-init-sa-target-toolbar.ve-ui-toolbar-floating .oo-ui-toolbar-bar {
border-top: none;
border-radius: 0;
 }
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 4002375..bf5935d 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -46,10 +46,6 @@
padding: 0.25em;
 }
 
-.ve-init-mw-viewPageTarget-toolbar-utilites .ve-ui-toolbar-bar {
-   border: none;
-}
-
 .ve-init-mw-viewPageTarget-toolbar-utilites  .oo-ui-iconButtonWidget {
margin-right: 0.2em;
margin-top: 0.2em;
diff --git a/modules/ve/init/sa/ve.init.sa.Platform.js 
b/modules/ve/init/sa/ve.init.sa.Platform.js
index 4c70884..947f1bf 100644
--- a/modules/ve/init/sa/ve.init.sa.Platform.js
+++ b/modules/ve/init/sa/ve.init.sa.Platform.js
@@ -125,3 +125,7 @@
 /* Initialization */
 
 ve.init.platform = new ve.init.sa.Platform();
+
+/* Extension */
+
+OO.ui.msg = ve.bind( ve.init.platform.getMessage, ve.init.platform );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb5bc3c98d1c435ec194b201b517a688cd9b02b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Recursive function should also perform callback on initial e... - change (mediawiki...Flow)

2013-11-04 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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


Change subject: Recursive function should also perform callback on initial 
element (usually topic title)
..

Recursive function should also perform callback on initial element (usually 
topic title)

Change-Id: I984387221eda04b007802c2f2312574f9368122c
---
M includes/Model/PostRevision.php
1 file changed, 25 insertions(+), 26 deletions(-)


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

diff --git a/includes/Model/PostRevision.php b/includes/Model/PostRevision.php
index 553681e..caea822 100644
--- a/includes/Model/PostRevision.php
+++ b/includes/Model/PostRevision.php
@@ -242,36 +242,34 @@
return;
}
 
-   foreach ( $this-getChildren() as $child ) {
-   $continue = false;
+   $continue = false;
+   foreach ( $callbacks as $i = $callback ) {
+   if ( is_callable( $callback ) ) {
+   $return = $callback( $this, $results[$i] );
 
-   foreach ( $callbacks as $i = $callback ) {
-   if ( is_callable( $callback ) ) {
-   $return = $callback( $child, 
$results[$i] );
+   // Callbacks respond with: [ result, continue ]
+   // Continue can be set to false if a callback 
has completed
+   // what it set out to do, then we can stop 
running it.
+   $results[$i] = $return[0];
+   $continue |= $return[1];
 
-   // Callbacks respond with: [ result, 
continue ]
-   // Continue can be set to false if a 
callback has completed
-   // what it set out to do, then we can 
stop running it.
-   $results[$i] = $return[0];
-   $continue |= $return[1];
-
-   // If this specific callback has 
responded it should no longer
-   // continue, get rid of it.
-   if ( $return[1] === false ) {
-   $callbacks[$i] = null;
-   }
+   // If this specific callback has responded it 
should no longer
+   // continue, get rid of it.
+   if ( $return[1] === false ) {
+   $callbacks[$i] = null;
}
}
-
-   // All of the callbacks have completed what they set 
out to do = quit
-   if ( !$continue ) {
-   break;
-   }
-
-   // Also fetch callbacks from children, some may have 
been nulled to
-   // prevent further execution.
-   list( $callbacks, $results ) = 
$child-descendRecursive( $callbacks, $results, $maxDepth - 1 );
}
+
+   // All of the callbacks have completed what they set out to do 
= quit
+   if ( $continue ) {
+   foreach ( $this-getChildren() as $child ) {
+   // Also fetch callbacks from children, some may 
have been nulled to
+   // prevent further execution.
+   list( $callbacks, $results ) = 
$child-descendRecursive( $callbacks, $results, $maxDepth - 1 );
+   }
+   }
+
 
return array( $callbacks, $results );
}
@@ -294,7 +292,8 @@
return array( $result + 1, true );
};
 
-   return $this-registerRecursive( $callback, 0, 'count' );
+   // Start at -1 because parent doesn't count as descendant
+   return $this-registerRecursive( $callback, -1, 'count' );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Post topic without comment - change (mediawiki...Flow)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Post topic without comment
..


Post topic without comment

Allows creation of new topic without creating a related first post

Change-Id: I6b37cb130bff14d94303f545d38fe1676776ff02
---
M includes/Block/TopicList.php
M includes/Notifications/Controller.php
M modules/discussion/forms.js
3 files changed, 24 insertions(+), 23 deletions(-)

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



diff --git a/includes/Block/TopicList.php b/includes/Block/TopicList.php
index 75fe251..7285d3c 100644
--- a/includes/Block/TopicList.php
+++ b/includes/Block/TopicList.php
@@ -35,9 +35,6 @@
if ( !isset( $this-submitted['topic'] ) ) {
$this-errors['topic'] = wfMessage( 
'flow-error-missing-title' );
}
-   if ( !isset( $this-submitted['content'] ) ) {
-   $this-errors['content'] = wfMessage( 
'flow-error-missing-content' );
-   }
}
 
public function commit() {
@@ -57,15 +54,22 @@
// Should we really have a top level post for the topic title?  
Simplifies allowing
// a revisioned title.
$topicPost = PostRevision::create( $topicWorkflow, 
$this-submitted['topic'] );
-   $firstPost = $topicPost-reply( $this-user, 
$this-submitted['content'] );
+   $topicChildren = array();
+   $firstPost = null;
+   if ( !empty( $this-submitted['content'] ) ) {
+   $firstPost = $topicPost-reply( $this-user, 
$this-submitted['content'] );
+   $firstPost-setChildren( array() );
+   $topicChildren[] = $firstPost;
+   }
$topicListEntry = TopicListEntry::create( $this-workflow, 
$topicWorkflow );
-   $topicPost-setChildren( array( $firstPost ) );
-   $firstPost-setChildren( array() );
+   $topicPost-setChildren( $topicChildren );
 
$storage-put( $topicWorkflow );
$storage-put( $topicListEntry );
$storage-put( $topicPost );
-   $storage-put( $firstPost );
+   if ( $firstPost !== null ) {
+   $storage-put( $firstPost );
+   }
 
$this-notificationController-notifyNewTopic( array(
'board-workflow' = $this-workflow,
@@ -79,7 +83,7 @@
$notificationController = $this-notificationController;
$output = array(
'created-topic-id' = $topicWorkflow-getId(),
-   'created-post-id' = $firstPost-getRevisionId(),
+   'created-post-id' = $firstPost ? 
$firstPost-getRevisionId() : null,
'render-function' = function( $templating )
use ( $topicWorkflow, $firstPost, 
$topicPost, $storage, $user, $notificationController )
{
diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index 8abc2e5..7ca9da0 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -125,7 +125,7 @@
 * * topic-workflow: Workflow object for the new Topic.
 * * title-post: PostRevision object for the topic post, containing 
the
 *title.
-* * first-post: PostRevision object for the first post.
+* * first-post: PostRevision object for the first post, or null when 
no first post.
 * * user: The User who created the topic.
 * @return array Array of created EchoEvent objects.
 */
@@ -148,9 +148,9 @@
'extra' = array(
'board-workflow' = $boardWorkflow-getId(),
'topic-workflow' = $topicWorkflow-getId(),
-   'post-id' = $firstPost-getRevisionId(),
+   'post-id' = $firstPost ? 
$firstPost-getRevisionId() : null,
'topic-title' = $topicPost-getContentRaw(),
-   'content' = $firstPost-getContent(),
+   'content' = $firstPost ? 
$firstPost-getContent() : null,
)
) );
 
@@ -185,16 +185,16 @@
$topicWorkflow = $data['topic-workflow'];
$events = array();
 
-   $mentionedUsers = $this-getMentionedUsers( $newRevision, 
$title );
+   $mentionedUsers = $newRevision ? $this-getMentionedUsers( 
$newRevision, $title ) : array();
 
if ( count( $mentionedUsers ) ) {
$events[] = EchoEvent::create( array(
'type' = 'flow-mention',
'title' =

[MediaWiki-commits] [Gerrit] More CSS fixes to the demo page. - change (mediawiki...VisualEditor)

2013-11-04 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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


Change subject: More CSS fixes to the demo page.
..

More CSS fixes to the demo page.

Some ve-ui classes not converted to oo-ui, and toolbar - surfaceToolbar.

Change-Id: I4b40ae6154c3ba619a266b7586983dd259853f6d
---
M demos/ve/demo.css
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index 2fd9bf2..636fb2f 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -46,13 +46,13 @@
box-shadow: 0 0.25em 1.5em 0 #ddd;
 }
 
-.ve-demo-utilities-commands .ve-ui-widget,
+.ve-demo-utilities-commands .oo-ui-widget,
 .ve-demo-utilities-commands-divider {
display: inline-block;
margin-right: 1em;
 }
 
-.ve-demo-utilities-commands .ve-ui-textInputWidget {
+.ve-demo-utilities-commands .oo-ui-textInputWidget {
width: 4em;
 }
 
@@ -156,7 +156,7 @@
border-top-left-radius: 0.25em;
 }
 
-.ve-init-sa-target-toolbar.ve-ui-toolbar-floating .oo-ui-toolbar-bar {
+.ve-init-sa-target-toolbar.ve-ui-surfaceToolbar-floating .oo-ui-toolbar-bar {
border-top: none;
border-radius: 0;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b40ae6154c3ba619a266b7586983dd259853f6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] More CSS fixes to the demo page. - change (mediawiki...VisualEditor)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: More CSS fixes to the demo page.
..


More CSS fixes to the demo page.

Some ve-ui classes not converted to oo-ui, and toolbar - surfaceToolbar.

Change-Id: I4b40ae6154c3ba619a266b7586983dd259853f6d
---
M demos/ve/demo.css
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index 2fd9bf2..636fb2f 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -46,13 +46,13 @@
box-shadow: 0 0.25em 1.5em 0 #ddd;
 }
 
-.ve-demo-utilities-commands .ve-ui-widget,
+.ve-demo-utilities-commands .oo-ui-widget,
 .ve-demo-utilities-commands-divider {
display: inline-block;
margin-right: 1em;
 }
 
-.ve-demo-utilities-commands .ve-ui-textInputWidget {
+.ve-demo-utilities-commands .oo-ui-textInputWidget {
width: 4em;
 }
 
@@ -156,7 +156,7 @@
border-top-left-radius: 0.25em;
 }
 
-.ve-init-sa-target-toolbar.ve-ui-toolbar-floating .oo-ui-toolbar-bar {
+.ve-init-sa-target-toolbar.ve-ui-surfaceToolbar-floating .oo-ui-toolbar-bar {
border-top: none;
border-radius: 0;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b40ae6154c3ba619a266b7586983dd259853f6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update Mifos configuration - change (translatewiki)

2013-11-04 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Update Mifos configuration
..

Update Mifos configuration

Change-Id: Ie49f2dd11a8e1207bee1c2726b9eb9977979de3c
---
M REPOCONF
M REPOCONF.siebrand
M TranslateSettings.php
M bin/stats-mifos
D groups/Mifos/Checker.php
M groups/Mifos/Mifos.yaml
D groups/Mifos/README
7 files changed, 12 insertions(+), 1,153 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/83/93483/1

diff --git a/REPOCONF b/REPOCONF
index 7f61153..527e65b 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -23,7 +23,7 @@
 REPO_MANTIS=git://github.com/mantisbt/mantisbt.git
 REPO_MANTIS_BRANCH=master-1.2.x
 REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git
-REPO_MIFOS=git://github.com/mifos/head.git
+REPO_MIFOS=git://github.com/openMF/community-app.git
 REPO_MOZILLA_SOURCELANG=http://hg.mozilla.org/releases/mozilla-aurora/
 REPO_MOZILLA_SUPPORTEDLANG=he gu-IN
 REPO_MWLIB=git://github.com/pediapress/mwlib.git
diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand
index f7c1d7c..f7857e2 100644
--- a/REPOCONF.siebrand
+++ b/REPOCONF.siebrand
@@ -24,7 +24,7 @@
 REPO_MANTIS=g...@github.com:mantisbt/mantisbt.git
 REPO_MANTIS_BRANCH=master-1.2.x
 REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git
-REPO_MIFOS=g...@github.com:mifos/head.git
+REPO_MIFOS=g...@github.com:openMF/community-app.git
 REPO_MWLIB=g...@github.com:pediapress/mwlib.git
 REPO_MWLIBRL=g...@github.com:pediapress/mwlib.rl.git
 
REPO_OKAWIX=svn+ssh://siebr...@svn.code.sf.net/p/okawix/code/trunk/okawix/chrome/locale
diff --git a/TranslateSettings.php b/TranslateSettings.php
index adb03cd..7bd4062 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -368,7 +368,6 @@
 $wgTranslateGroupFiles[] = $GROUPS/IHRIS/IHRIS.yaml;
 
 wfAddNamespace( 1230, 'Mifos' );
-# Disabled translation of old version of Mifos. Waiting for Mifos X.
 # $wgTranslateGroupFiles[] = $GROUPS/Mifos/Mifos.yaml;
 
 wfAddNamespace( 1232, 'Wikia' );
diff --git a/bin/stats-mifos b/bin/stats-mifos
index fc576d8..d3a05b3 100755
--- a/bin/stats-mifos
+++ b/bin/stats-mifos
@@ -1,6 +1,6 @@
 # Siebrand / 2008-02-09
 
-COMMAND=/usr/bin/php groupStatistics.php --skipzero --groups=out-mifos-0-all 
--skiplanguages=test,qqq,als,be-x-old,crh,de-at,de-ch,de-formal,dk,en-gb,fiu-vro,gan,got,hif,kbd,kk,kk-cn,iu,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-sg,zh-hk,zh-min-nan,zh-mo,zh-my,zh-tw,zh-yue,ady,bbc
+COMMAND=/usr/bin/php groupStatistics.php --skipzero --groups=out-mifos 
--skiplanguages=test,qqq,als,be-x-old,crh,de-at,de-ch,de-formal,dk,en-gb,fiu-vro,gan,got,hif,kbd,kk,kk-cn,iu,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-sg,zh-hk,zh-min-nan,zh-mo,zh-my,zh-tw,zh-yue,ady,bbc
 STATSPAGE=$HOME/temp/mifos
 
 # create basic stats file for groups 'most used', 'core', 'Wikimedia 
extensions', and 'All extensions'
diff --git a/groups/Mifos/Checker.php b/groups/Mifos/Checker.php
deleted file mode 100644
index 994d000..000
--- a/groups/Mifos/Checker.php
+++ /dev/null
@@ -1,21 +0,0 @@
-?php
-
-/**
- * Implements MessageChecker for Mifos.
- *
- * @file
- * @author Niklas Laxström
- * @copyright Copyright © 2010, Niklas Laxström
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-/**
- * Message checks for Mifos
- *
- * @ingroup MessageCheckers
- */
-class MifosMessageChecker extends MessageChecker {
-   protected function MifosVariablesCheck( $messages, $code, $warnings ) {
-   return parent::parameterCheck( $messages, $code, $warnings, 
'/{[0-9]}/' );
-   }
-}
diff --git a/groups/Mifos/Mifos.yaml b/groups/Mifos/Mifos.yaml
index 7d81107..f03c1ac 100644
--- a/groups/Mifos/Mifos.yaml
+++ b/groups/Mifos/Mifos.yaml
@@ -1,1117 +1,17 @@
-TEMPLATE:
-  BASIC:
-icon: wiki://Mifos-logo.jpg
-description: {{int:translate-group-desc-mifos}}
-namespace: NS_MIFOS
-class: FileBasedMessageGroup
-
-  FILES:
-class: JavaFFS
-codeMap:
-  zh-hans: zh_CN
-
-  CHECKER:
-class: MifosMessageChecker
-checks:
-  - MifosVariablesCheck
-
-  AUTOLOAD:
-MifosMessageChecker: Checker.php
-
-

 BASIC:
-  id: out-mifos-0-all
-  label: Mifos
-  meta: yes
-  class: AggregateMessageGroup
-
-GROUPS:
-  - out-mifos-*
-

-BASIC:
-  id: out-mifos-core
-  label: Mifos - Core
+  id: out-mifos
+  label: Mifos - X
+  namespace: NS_MIFOS
+  class: FileBasedMessageGroup
 
 FILES:
-  sourcePattern: 
%GROUPROOT%/mifos/userInterface/src/main/resources/org/mifos/ui/localizedProperties/messages_%CODE%.properties
-  definitionFile: 
%GROUPROOT%/mifos/userInterface/src/main/resources/org/mifos/ui/localizedProperties/messages.properties
-  targetPattern: 
mifos/userInterface/src/main/resources/org/mifos/ui/localizedProperties/messages_%CODE%.properties
-
-TAGS:
-  optional:
--

[MediaWiki-commits] [Gerrit] ResourceLoader Module for serving json based localization me... - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: ResourceLoader Module for serving json based localization 
messages
..


ResourceLoader Module for serving json based localization messages

ApiULSLocalization is still present since we have to provide live
language preview feature.

Moved the loading of json file to includes/JsonMessageLoader.php

Also moved all RL modules to includes folder.

Bug: 56509
Change-Id: Ic39dec1c484982fb07edd167e83794c0b5f470ee
---
M Resources.php
M UniversalLanguageSelector.php
M api/ApiULSLocalization.php
A includes/JsonMessageLoader.php
A includes/ResourceLoaderULSJsonMessageModule.php
R includes/ResourceLoaderULSModule.php
M resources/js/ext.uls.i18n.js
7 files changed, 165 insertions(+), 39 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index 41ae36d..7edce26 100644
--- a/Resources.php
+++ b/Resources.php
@@ -15,6 +15,10 @@
'class' = 'ResourceLoaderULSModule'
 );
 
+$wgResourceModules['ext.uls.messages'] = array(
+   'class' = 'ResourceLoaderULSJsonMessageModule'
+);
+
 $wgResourceModules['ext.uls.buttons'] = array(
'styles' = 'resources/css/ext.uls.buttons.css',
 ) + $resourcePaths;
@@ -68,7 +72,7 @@
'jquery.json',
'jquery.cookie',
'jquery.uls',
-   'ext.uls.i18n',
+   'ext.uls.messages',
),
'position' = 'top',
 ) + $resourcePaths;
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 35a39c8..5334d28 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -152,9 +152,12 @@
 // Register auto load for the page class
 $wgAutoloadClasses += array(
'UniversalLanguageSelectorHooks' = __DIR__ . 
'/UniversalLanguageSelector.hooks.php',
-   'ResourceLoaderULSModule' = __DIR__ . '/ResourceLoaderULSModule.php',
+   'ResourceLoaderULSModule' = __DIR__ . 
'/includes/ResourceLoaderULSModule.php',
+   'ResourceLoaderULSJsonMessageModule' =
+   __DIR__ . '/includes/ResourceLoaderULSJsonMessageModule.php',
'ApiLanguageSearch' = __DIR__ . '/api/ApiLanguageSearch.php',
'ApiULSLocalization' = __DIR__ . '/api/ApiULSLocalization.php',
+   'JsonMessageLoader' = __DIR__ . '/includes/JsonMessageLoader.php',
'LanguageNameSearch' = __DIR__ . '/data/LanguageNameSearch.php',
 );
 
diff --git a/api/ApiULSLocalization.php b/api/ApiULSLocalization.php
index 17504ac..ff96ce0 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -32,45 +32,10 @@
if ( !Language::isValidCode( $language ) ) {
$this-dieUsage( 'Invalid language', 'invalidlanguage' 
);
}
-
-   $contents = array();
-   // jQuery.uls localization
-   $contents += $this-loadI18nFile( __DIR__ . 
'/../lib/jquery.uls/i18n', $language );
-   // mediaWiki.uls localization
-   $contents += $this-loadI18nFile( __DIR__ . '/../i18n', 
$language );
-
+   $contents = JsonMessageLoader::getMessages( $language );
// Output the file's contents raw
$this-getResult()-addValue( null, 'text', json_encode( 
$contents ) );
$this-getResult()-addValue( null, 'mime', 'application/json' 
);
-   }
-
-   /**
-* Load messages from the jquery.i18n json file and from
-* fallback languages.
-* @param string $dir Directory of the json file.
-* @param string $language Language code.
-* @return array
-*/
-   protected function loadI18nFile( $dir, $language ) {
-   $languages = Language::getFallbacksFor( $language );
-   // Prepend the requested language code
-   // to load them all in one loop
-   array_unshift( $languages, $language );
-   $messages = array();
-
-   foreach ( $languages as $language ) {
-   $filename = $dir/$language.json;
-
-   if ( !file_exists( $filename ) ) {
-   continue;
-   }
-
-   $contents = file_get_contents( $filename );
-   $messagesForLanguage = json_decode( $contents, true );
-   $messages = array_merge( $messagesForLanguage, 
$messages );
-   }
-
-   return $messages;
}
 
public function getCustomPrinter() {
diff --git a/includes/JsonMessageLoader.php b/includes/JsonMessageLoader.php
new file mode 100644
index 000..0c509a6
--- /dev/null
+++ b/includes/JsonMessageLoader.php
@@ -0,0 +1,79 @@
+?php
+/**
+ * Json formatted MessageLoader for ULS
+ *
+ * Copyright (C) 2013 Alolita Sharma,

[MediaWiki-commits] [Gerrit] Correct the path to the font in test file - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Correct the path to the font in test file
..


Correct the path to the font in test file

Change-Id: I134be7f625464ab3d895535cc18d19930e67e447
---
M tests/autonym.html
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/tests/autonym.html b/tests/autonym.html
index 896225f..95ceb8a 100644
--- a/tests/autonym.html
+++ b/tests/autonym.html
@@ -8,10 +8,10 @@
 
 @font-face {
font-family: 'Autonym';
-   src: url('../lib/jquery.uls/css/font/Autonym.eot');
+   src: url('../data/fontrepo/fonts/Autonym/Autonym.eot');
src: local('Autonym'),
-   url('../lib/jquery.uls/css/font/Autonym.woff') format('woff'),
-   url('../lib/jquery.uls/css/font/Autonym.ttf') 
format('truetype');
+   url('../data/fontrepo/fonts/Autonym/Autonym.woff') 
format('woff'),
+   url('../data/fontrepo/fonts/Autonym/Autonym.ttf') 
format('truetype');
font-style: normal;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I134be7f625464ab3d895535cc18d19930e67e447
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Remove the Autonym font from the lib/jquery.uls - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Remove the Autonym font from the lib/jquery.uls
..


Remove the Autonym font from the lib/jquery.uls

Followup I10b8658e29c03b136b4475c4c69ace33e5628a98

Change-Id: I25992159fd5b999cfa0e4861196850d36eb5890e
---
D lib/jquery.uls/css/font/Autonym.eot
D lib/jquery.uls/css/font/Autonym.ttf
D lib/jquery.uls/css/font/Autonym.woff
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/jquery.uls/css/font/Autonym.eot 
b/lib/jquery.uls/css/font/Autonym.eot
deleted file mode 100644
index d88dfe5..000
--- a/lib/jquery.uls/css/font/Autonym.eot
+++ /dev/null
Binary files differ
diff --git a/lib/jquery.uls/css/font/Autonym.ttf 
b/lib/jquery.uls/css/font/Autonym.ttf
deleted file mode 100644
index 127b84d..000
--- a/lib/jquery.uls/css/font/Autonym.ttf
+++ /dev/null
Binary files differ
diff --git a/lib/jquery.uls/css/font/Autonym.woff 
b/lib/jquery.uls/css/font/Autonym.woff
deleted file mode 100644
index 041c3a7..000
--- a/lib/jquery.uls/css/font/Autonym.woff
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25992159fd5b999cfa0e4861196850d36eb5890e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update manual steps - change (translatewiki)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Update manual steps
..


Update manual steps

Probably still incomplete, but better than it was...

Change-Id: Ifcef0d18d1ed0bb07e067da969b72b8766d587e5
---
M puppet/README
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/puppet/README b/puppet/README
index 935480c..a2b2c04 100644
--- a/puppet/README
+++ b/puppet/README
@@ -1,5 +1,20 @@
 == Manual steps ==
 
+* From a clean server, do this:
+apt-get update
+apt-get dist-upgrade
+apt-get install -y git puppet make
+cd root
+git clone https://gerrit.wikimedia.org/r/translatewiki
+* Create a user and an authorized_keys file for that user
+* User must have sudo rights (see sudo module)
+* Execute:
+cd /root/translatewiki/puppet
+make test
+make noop
+make apply
+
+--
 Create /etc/webauth
 
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcef0d18d1ed0bb07e067da969b72b8766d587e5
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update Autonym font to latest version(20131104) - change (mediawiki...UniversalLanguageSelector)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Update Autonym font to latest version(20131104)
..


Update Autonym font to latest version(20131104)

Release: https://github.com/santhoshtr/AutonymFont/releases/tag/20131104
Changes:
* Remove Tamil GSUB rules, use GPOS alone
* Autohint Latin glyphs
* Dont strip hints for eot format
* Glyph simplifications and misc cleanup

Bug: 56552
Bug: 56346

Change-Id: Ib2014e0606983dbf33391e479f96c75fab79075f
---
M data/fontrepo/fonts/Autonym/Autonym.eot
M data/fontrepo/fonts/Autonym/Autonym.ttf
M data/fontrepo/fonts/Autonym/Autonym.woff
M data/fontrepo/fonts/Autonym/font.ini
M resources/js/ext.uls.webfonts.repository.js
5 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/data/fontrepo/fonts/Autonym/Autonym.eot 
b/data/fontrepo/fonts/Autonym/Autonym.eot
index b88cffc..00e036c 100644
--- a/data/fontrepo/fonts/Autonym/Autonym.eot
+++ b/data/fontrepo/fonts/Autonym/Autonym.eot
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/Autonym.ttf 
b/data/fontrepo/fonts/Autonym/Autonym.ttf
index b339457..6e5fb54 100644
--- a/data/fontrepo/fonts/Autonym/Autonym.ttf
+++ b/data/fontrepo/fonts/Autonym/Autonym.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/Autonym.woff 
b/data/fontrepo/fonts/Autonym/Autonym.woff
index ec4db1f..25f7c43 100644
--- a/data/fontrepo/fonts/Autonym/Autonym.woff
+++ b/data/fontrepo/fonts/Autonym/Autonym.woff
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/font.ini 
b/data/fontrepo/fonts/Autonym/font.ini
index 9963978..914505d 100644
--- a/data/fontrepo/fonts/Autonym/font.ini
+++ b/data/fontrepo/fonts/Autonym/font.ini
@@ -1,6 +1,6 @@
 [Autonym]
 languages=mul
-version=1.0
+version=20131104
 license=OFL-1.1
 licensefile=OFL.txt
 url=http://scripts.sil.org/CharisSIL
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index a8cf66f..b192013 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Do not edit! This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{base:..\/data\/fontrepo\/fonts\/,languages:{adx:[Jomolhari],af:[system,OpenDyslexic],ahr:[Lohit
 
Marathi],akk:[Akkadian],am:[AbyssinicaSIL],ang:[system,Junicode],ar:[Amiri],arb:[Amiri],arc:[Estrangelo
 Edessa,East Syriac Adiabene,SertoUrhoy],as:[system,Lohit 
Assamese],bbc:[system,Pangururan],bh:[Lohit 
Devanagari],bho:[Lohit 
Devanagari],bk:[system,OpenDyslexic],bn:[Siyam Rupali,Lohit 
Bengali],bo:[Jomolhari],bod:[Jomolhari],bpy:[Siyam Rupali,Lohit 
Bengali],btk:[system,Pangururan],bug:[Saweri],ca:[system,OpenDyslexic],cdo:[CharisSIL],cr:[OskiEast],cy:[system,OpenDyslexic],da:[system,OpenDyslexic],de:[system,OpenDyslexic],dre:[Jomolhari],dv:[FreeFont-Thaana],dz:[Jomolhari],en:[system,OpenDyslexic],es:[system,OpenDyslexic],et:[system,OpenDyslexic],fa:[system,Iranian
 
Sans,Nazli,Amiri],fi:[system,OpenDyslexic],fo:[system,OpenDyslexic],fr:[system,OpenDyslexic],fy:[system,OpenDyslexic],ga:[system,OpenDyslexic],gd:[system,OpenDyslexic],gez:[AbyssinicaSIL],gl:[system,OpenDyslexic],goe:[Jomolhari],gom:[Lohit
 Devanagari],grc:[system,GentiumPlus],gu:[Lohit 
Gujarati],hbo:[Taamey Frank CLM,Alef],he:[system,Alef,Miriam 
CLM,Taamey Frank CLM],hi:[Lohit 
Devanagari],hu:[system,OpenDyslexic],hut:[Jomolhari],id:[system,OpenDyslexic],ii:[Nuosu
 
SIL],is:[system,OpenDyslexic],it:[system,OpenDyslexic],iu:[system,OskiEast],jv:[system,Tuladha
 Jejeg],jv-java:[Tuladha 
Jejeg],kbg:[Jomolhari],khg:[Jomolhari],km:[KhmerOSbattambang,Hanuman,KhmerOS,Nokora
 Regular,Suwannaphum],kn:[Lohit Kannada,Gubbi],kok:[Lohit 
Devanagari],kte:[Jomolhari],lb:[system,OpenDyslexic],lbj:[Jomolhari],lhm:[Jomolhari],li:[system,OpenDyslexic],lo:[Phetsarath],loy:[Jomolhari],luk:[Jomolhari],lya:[Jomolhari],mai:[Lohit
 
Devanagari],mak:[Saweri],mi:[system,OpenDyslexic],ml:[system,AnjaliOldLipi,Meera],mr:[Lohit
 
Marathi],ms:[system,OpenDyslexic],muk:[Jomolhari],mul:[system,Autonym],my:[TharLon,Myanmar3,Padauk],nan:[Doulos
 SIL,CharisSIL],nb:[system,OpenDyslexic],ne:[Lohit 
Nepali,Madan],nl:[system,OpenDyslexic],oc:[system,OpenDyslexic],ola:[Jomolhari],or:[Lohit
 Oriya,Utkal],otb:[Jomolhari],pa:[Lohit 
Punjabi,Saab],pal:[Shapour],peo:[Xerxes],pt:[system,OpenDyslexic],sa:[Lohit
 
Devanagari],saz:[Pagul],si:[system,lklug],sq:[system,OpenDyslexic],sux:[Akkadian],sv:[system,OpenDyslexic],sw:[system,OpenDyslexic],syc:[Estrangelo
 Edessa,East Syriac Adiabene,SertoUrhoy],ta:[system,Lohit 
Tamil,Lohit Tamil 
Classical,Thendral,Thenee],tcn:[Jomolhari],tcy:[Lohit 
Kannada,Gubbi],te:[Lohit 
Telugu],thw:[Jomolhari],ti:[AbyssinicaSIL],tig:[AbyssinicaSIL],tl:[system,OpenDyslexic],tr:[system,OpenDyslexic],tsk

[MediaWiki-commits] [Gerrit] Update Mifos configuration - change (translatewiki)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Update Mifos configuration
..


Update Mifos configuration

Change-Id: Ie49f2dd11a8e1207bee1c2726b9eb9977979de3c
---
M REPOCONF
M REPOCONF.siebrand
M TranslateSettings.php
M bin/stats-mifos
D groups/Mifos/Checker.php
M groups/Mifos/Mifos.yaml
D groups/Mifos/README
7 files changed, 12 insertions(+), 1,153 deletions(-)

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



diff --git a/REPOCONF b/REPOCONF
index 7f61153..527e65b 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -23,7 +23,7 @@
 REPO_MANTIS=git://github.com/mantisbt/mantisbt.git
 REPO_MANTIS_BRANCH=master-1.2.x
 REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git
-REPO_MIFOS=git://github.com/mifos/head.git
+REPO_MIFOS=git://github.com/openMF/community-app.git
 REPO_MOZILLA_SOURCELANG=http://hg.mozilla.org/releases/mozilla-aurora/
 REPO_MOZILLA_SUPPORTEDLANG=he gu-IN
 REPO_MWLIB=git://github.com/pediapress/mwlib.git
diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand
index f7c1d7c..f7857e2 100644
--- a/REPOCONF.siebrand
+++ b/REPOCONF.siebrand
@@ -24,7 +24,7 @@
 REPO_MANTIS=g...@github.com:mantisbt/mantisbt.git
 REPO_MANTIS_BRANCH=master-1.2.x
 REPO_MATHJAX=g...@github.com:mathjax/MathJax-i18n.git
-REPO_MIFOS=g...@github.com:mifos/head.git
+REPO_MIFOS=g...@github.com:openMF/community-app.git
 REPO_MWLIB=g...@github.com:pediapress/mwlib.git
 REPO_MWLIBRL=g...@github.com:pediapress/mwlib.rl.git
 
REPO_OKAWIX=svn+ssh://siebr...@svn.code.sf.net/p/okawix/code/trunk/okawix/chrome/locale
diff --git a/TranslateSettings.php b/TranslateSettings.php
index adb03cd..7bd4062 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -368,7 +368,6 @@
 $wgTranslateGroupFiles[] = $GROUPS/IHRIS/IHRIS.yaml;
 
 wfAddNamespace( 1230, 'Mifos' );
-# Disabled translation of old version of Mifos. Waiting for Mifos X.
 # $wgTranslateGroupFiles[] = $GROUPS/Mifos/Mifos.yaml;
 
 wfAddNamespace( 1232, 'Wikia' );
diff --git a/bin/stats-mifos b/bin/stats-mifos
index fc576d8..d3a05b3 100755
--- a/bin/stats-mifos
+++ b/bin/stats-mifos
@@ -1,6 +1,6 @@
 # Siebrand / 2008-02-09
 
-COMMAND=/usr/bin/php groupStatistics.php --skipzero --groups=out-mifos-0-all 
--skiplanguages=test,qqq,als,be-x-old,crh,de-at,de-ch,de-formal,dk,en-gb,fiu-vro,gan,got,hif,kbd,kk,kk-cn,iu,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-sg,zh-hk,zh-min-nan,zh-mo,zh-my,zh-tw,zh-yue,ady,bbc
+COMMAND=/usr/bin/php groupStatistics.php --skipzero --groups=out-mifos 
--skiplanguages=test,qqq,als,be-x-old,crh,de-at,de-ch,de-formal,dk,en-gb,fiu-vro,gan,got,hif,kbd,kk,kk-cn,iu,kk-kz,kk-tr,ko-kp,ku,ku-arab,no,ruq,simple,sr,tg,tp,tt,ug,zh,zh-classical,zh-cn,zh-sg,zh-hk,zh-min-nan,zh-mo,zh-my,zh-tw,zh-yue,ady,bbc
 STATSPAGE=$HOME/temp/mifos
 
 # create basic stats file for groups 'most used', 'core', 'Wikimedia 
extensions', and 'All extensions'
diff --git a/groups/Mifos/Checker.php b/groups/Mifos/Checker.php
deleted file mode 100644
index 994d000..000
--- a/groups/Mifos/Checker.php
+++ /dev/null
@@ -1,21 +0,0 @@
-?php
-
-/**
- * Implements MessageChecker for Mifos.
- *
- * @file
- * @author Niklas Laxström
- * @copyright Copyright © 2010, Niklas Laxström
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-/**
- * Message checks for Mifos
- *
- * @ingroup MessageCheckers
- */
-class MifosMessageChecker extends MessageChecker {
-   protected function MifosVariablesCheck( $messages, $code, $warnings ) {
-   return parent::parameterCheck( $messages, $code, $warnings, 
'/{[0-9]}/' );
-   }
-}
diff --git a/groups/Mifos/Mifos.yaml b/groups/Mifos/Mifos.yaml
index 7d81107..f03c1ac 100644
--- a/groups/Mifos/Mifos.yaml
+++ b/groups/Mifos/Mifos.yaml
@@ -1,1117 +1,17 @@
-TEMPLATE:
-  BASIC:
-icon: wiki://Mifos-logo.jpg
-description: {{int:translate-group-desc-mifos}}
-namespace: NS_MIFOS
-class: FileBasedMessageGroup
-
-  FILES:
-class: JavaFFS
-codeMap:
-  zh-hans: zh_CN
-
-  CHECKER:
-class: MifosMessageChecker
-checks:
-  - MifosVariablesCheck
-
-  AUTOLOAD:
-MifosMessageChecker: Checker.php
-
-

 BASIC:
-  id: out-mifos-0-all
-  label: Mifos
-  meta: yes
-  class: AggregateMessageGroup
-
-GROUPS:
-  - out-mifos-*
-

-BASIC:
-  id: out-mifos-core
-  label: Mifos - Core
+  id: out-mifos
+  label: Mifos - X
+  namespace: NS_MIFOS
+  class: FileBasedMessageGroup
 
 FILES:
-  sourcePattern: 
%GROUPROOT%/mifos/userInterface/src/main/resources/org/mifos/ui/localizedProperties/messages_%CODE%.properties
-  definitionFile: 
%GROUPROOT%/mifos/userInterface/src/main/resources/org/mifos/ui/localizedProperties/messages.properties
-  targetPattern: 
mifos/userInterface/src/main/resources/org/mifos/ui/localizedProperties/messages_%CODE%.properties
-
-TAGS:
-  optional:
-- login.chinese.translation.attribution
-  ignored:
-

[MediaWiki-commits] [Gerrit] Add codeMap - change (translatewiki)

2013-11-04 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Add codeMap
..

Add codeMap

Change-Id: Ic304825803bdfc8d2776ca7105b21793e7725997
---
M groups/Mifos/Mifos.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/84/93484/1

diff --git a/groups/Mifos/Mifos.yaml b/groups/Mifos/Mifos.yaml
index f03c1ac..772cefd 100644
--- a/groups/Mifos/Mifos.yaml
+++ b/groups/Mifos/Mifos.yaml
@@ -9,6 +9,10 @@
   sourcePattern: %GROUPROOT%/mifos/app/global-translations/%CODE%.json
   definitionFile: %GROUPROOT%/mifos/app/global-translations/%CODE%.json
   targetPattern: mifos/app/global-translations/%CODE%.json
+  codeMap:
+pt-br:   pt_BR
+zh-hans: zh_CN
+zh-hant: zh_TW
 
 MANGLER:
   class: StringMatcher

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic304825803bdfc8d2776ca7105b21793e7725997
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add codeMap - change (translatewiki)

2013-11-04 Thread jenkins-bot (Code Review)

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

Change subject: Add codeMap
..


Add codeMap

Change-Id: Ic304825803bdfc8d2776ca7105b21793e7725997
---
M groups/Mifos/Mifos.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/groups/Mifos/Mifos.yaml b/groups/Mifos/Mifos.yaml
index f03c1ac..772cefd 100644
--- a/groups/Mifos/Mifos.yaml
+++ b/groups/Mifos/Mifos.yaml
@@ -9,6 +9,10 @@
   sourcePattern: %GROUPROOT%/mifos/app/global-translations/%CODE%.json
   definitionFile: %GROUPROOT%/mifos/app/global-translations/%CODE%.json
   targetPattern: mifos/app/global-translations/%CODE%.json
+  codeMap:
+pt-br:   pt_BR
+zh-hans: zh_CN
+zh-hant: zh_TW
 
 MANGLER:
   class: StringMatcher

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic304825803bdfc8d2776ca7105b21793e7725997
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fix editing of posts - change (mediawiki...Flow)

2013-11-04 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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


Change subject: Fix editing of posts
..

Fix editing of posts

https://gerrit.wikimedia.org/r/#/c/91306/ has introduced a small regression
because data-post-id is no longer duplicated on both .flow-post-container and
.flow-post elements.

This JS was still looking at the one where the data attribute was now removed.

Change-Id: I7593f8515bfcec7ddf74e22942efeb3ebdc2928b
---
M modules/discussion/forms.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/discussion/forms.js b/modules/discussion/forms.js
index 50b0da4..9c68571 100644
--- a/modules/discussion/forms.js
+++ b/modules/discussion/forms.js
@@ -128,7 +128,7 @@
$contentContainer = $postContainer.find( 
'.flow-post-content' ),
workflowId = $( this ).flow( 
'getTopicWorkflowId' ),
pageName = $( this ).closest( '.flow-container' 
).data( 'page-title' ),
-   postId = $postContainer.data( 'post-id' );
+   postId = $postContainer.closest( 
'.flow-post-container' ).data( 'post-id' );
 
if ( $postContainer.find( '.flow-edit-post-form' 
).length ) {
return;

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

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

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

1 2 3 >

1 - 100 of 298 matches

Mail list logo