date:20130627

[MediaWiki-commits] [Gerrit] Add missing qqq messages - change (mediawiki...GettingStarted)

2013-06-27 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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


Change subject: Add missing qqq messages
..

Add missing qqq messages

Change-Id: I58cda4a2f6c3750c8272238bc294890f96e980a1
---
M GettingStarted.i18n.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/GettingStarted.i18n.php b/GettingStarted.i18n.php
index f71cdc3..47c7139 100644
--- a/GettingStarted.i18n.php
+++ b/GettingStarted.i18n.php
@@ -150,6 +150,14 @@
'gettingstarted-task-addlinks-toolbar-try-another-title' = 'Used as 
tooltip for the link to try another article for the link-adding task.
 
 The label for the link is 
{{msg-mw|Gettingstarted-task-toolbar-try-another-text}}.',
+   'guidedtour-tour-gettingstartedtasktoolbarintro-title' = 'Title of 
step shown when they choose a GettingStarted task for the first time.',
+   'guidedtour-tour-gettingstartedtasktoolbarintro-description' = 
'Description of step shown when they choose a GettingStarted task for the first 
time.',
+   'guidedtour-tour-gettingstartedtasktoolbar-ambox-title' = 'Title of 
step pointing to article message box (which states suggested improvements).',
+   'guidedtour-tour-gettingstartedtasktoolbar-ambox-description' = 
'Description of step pointing to article message box (which states suggested 
improvements).',
+   'guidedtour-tour-gettingstartedtasktoolbar-edit-article-title' = 
'Title of step showing user where to click {{msg-mw|vector-view-edit}}',
+   'guidedtour-tour-gettingstartedtasktoolbar-edit-article-description' = 
'Description of step showing user where to click {{msg-mw|vector-view-edit}}',
+   'guidedtour-tour-gettingstartedtasktoolbar-edit-section-title' = 
'Title of step showing user how to edit a section',
+   'guidedtour-tour-gettingstartedtasktoolbar-edit-section-description' = 
'Description of step showing user how to edit a section',
'notification-gettingstarted-start-editing' = 'Text shown on web when 
someone confirms their email but has not yet edited the main namespace:
 * $1 - username (unused); GENDER is supported',
'notification-gettingstarted-start-editing-email-subject' = 'Subject 
of email sent when someone confirms their email but has not yet edited the main 
namespace:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58cda4a2f6c3750c8272238bc294890f96e980a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Get rid of NS_VISUALEDITOR make VE user-toggleable - change (mediawiki/vagrant)

2013-06-27 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Get rid of NS_VISUALEDITOR  make VE user-toggleable
..

Get rid of NS_VISUALEDITOR  make VE user-toggleable

Change-Id: I80c235a1be92bf26fc73f2a54c1639395eae3dbb
---
M puppet/templates/ve-config.php.erb
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/99/70799/1

diff --git a/puppet/templates/ve-config.php.erb 
b/puppet/templates/ve-config.php.erb
index ed6a817..bda60ac 100644
--- a/puppet/templates/ve-config.php.erb
+++ b/puppet/templates/ve-config.php.erb
@@ -1,13 +1,4 @@
 // 
http://www.mediawiki.org/wiki/Extension:VisualEditor#Basic_setup_instructions
-
-define( 'NS_VISUALEDITOR', 2500 );
-define( 'NS_VISUALEDITOR_TALK', 2501 );
-$wgExtraNamespaces[NS_VISUALEDITOR] = 'VisualEditor';
-$wgExtraNamespaces[NS_VISUALEDITOR_TALK] = 'VisualEditor_talk';
-
-$wgVisualEditorNamespaces = array( NS_MAIN, NS_USER, NS_VISUALEDITOR );
-
+$wgVisualEditorNamespaces = array( NS_MAIN );
 $wgDefaultUserOptions['visualeditor-enable'] = 1;
-$wgHiddenPrefs[] = 'visualeditor-enable';
-
 $wgVisualEditorParsoidURL = 'http://localhost:%= 
scope.lookupvar(mediawiki::parsoid::port) %';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80c235a1be92bf26fc73f2a54c1639395eae3dbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Get rid of NS_VISUALEDITOR make VE user-toggleable - change (mediawiki/vagrant)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Get rid of NS_VISUALEDITOR  make VE user-toggleable
..


Get rid of NS_VISUALEDITOR  make VE user-toggleable

Change-Id: I80c235a1be92bf26fc73f2a54c1639395eae3dbb
---
M puppet/templates/ve-config.php.erb
1 file changed, 1 insertion(+), 10 deletions(-)

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



diff --git a/puppet/templates/ve-config.php.erb 
b/puppet/templates/ve-config.php.erb
index ed6a817..bda60ac 100644
--- a/puppet/templates/ve-config.php.erb
+++ b/puppet/templates/ve-config.php.erb
@@ -1,13 +1,4 @@
 // 
http://www.mediawiki.org/wiki/Extension:VisualEditor#Basic_setup_instructions
-
-define( 'NS_VISUALEDITOR', 2500 );
-define( 'NS_VISUALEDITOR_TALK', 2501 );
-$wgExtraNamespaces[NS_VISUALEDITOR] = 'VisualEditor';
-$wgExtraNamespaces[NS_VISUALEDITOR_TALK] = 'VisualEditor_talk';
-
-$wgVisualEditorNamespaces = array( NS_MAIN, NS_USER, NS_VISUALEDITOR );
-
+$wgVisualEditorNamespaces = array( NS_MAIN );
 $wgDefaultUserOptions['visualeditor-enable'] = 1;
-$wgHiddenPrefs[] = 'visualeditor-enable';
-
 $wgVisualEditorParsoidURL = 'http://localhost:%= 
scope.lookupvar(mediawiki::parsoid::port) %';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80c235a1be92bf26fc73f2a54c1639395eae3dbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fix incorrect qqq descriptions, improve a couple others - change (mediawiki...GuidedTour)

2013-06-27 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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


Change subject: Fix incorrect qqq descriptions, improve a couple others
..

Fix incorrect qqq descriptions, improve a couple others

Change-Id: I75fa598875e5e44a8527ded807cc9f37faf4c2a2
---
M GuidedTour.i18n.php
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour 
refs/changes/00/70800/1

diff --git a/GuidedTour.i18n.php b/GuidedTour.i18n.php
index c8c66e3..1cc905d 100644
--- a/GuidedTour.i18n.php
+++ b/GuidedTour.i18n.php
@@ -80,19 +80,19 @@
'guidedtour-tour-test-launch-tour' = 'Title of fifth step in test 
tour',
'guidedtour-tour-test-launch-tour-description' = 'Description of fifth 
step in test tour',
'guidedtour-tour-test-launch-using-tours' = 'Button text for launching 
a tour on making tours',
-   'guidedtour-tour-gettingstarted-start-title' = 'Title of first step of 
Getting Started tour.
+   'guidedtour-tour-gettingstarted-start-title' = 'Title of intro step of 
Getting Started tour.
 
 See also:
 * {{msg-mw|Notification-new-user}}',
-   'guidedtour-tour-gettingstarted-start-description' = 'Description of 
first step of Getting Started tour',
+   'guidedtour-tour-gettingstarted-start-description' = 'Description of 
intro step of Getting Started tour',
'guidedtour-tour-gettingstarted-click-edit-title' = 'Title of step 
showing user where to click {{msg-mw|vector-view-edit}}',
-   'guidedtour-tour-gettingstarted-click-edit-description' = 'Description 
of step showing user where to click edit',
+   'guidedtour-tour-gettingstarted-click-edit-description' = 'Description 
of step showing user where to click {{msg-mw|vector-view-edit}}',
'guidedtour-tour-gettingstarted-click-preview-title' = 'Title of step 
showing user where to click {{msg-mw|showpreview}}',
-   'guidedtour-tour-gettingstarted-click-preview-description' = 'Click 
preview to preview your changes',
+   'guidedtour-tour-gettingstarted-click-preview-description' = 
'Description of step showing user where to click {{msg-mw|showpreview}}',
'guidedtour-tour-gettingstarted-click-save-title' = 'Title of step 
showing user where to click {{msg-mw|savearticle}}',
-   'guidedtour-tour-gettingstarted-click-save-description' = 'Click save 
to save your work',
-   'guidedtour-tour-gettingstarted-end-title' = 'Title of last step of 
Getting Started tour!',
-   'guidedtour-tour-gettingstarted-end-description' = 'You can find other 
interesting things to work on',
+   'guidedtour-tour-gettingstarted-click-save-description' = 'Description 
of step showing user where to click {{msg-mw|savearticle}}',
+   'guidedtour-tour-gettingstarted-end-title' = 'Title of final step of 
Getting Started tour',
+   'guidedtour-tour-gettingstarted-end-description' = 'Description of 
final step of Getting Started tour',
 );
 
 /** Arabic (العربية)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75fa598875e5e44a8527ded807cc9f37faf4c2a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] changed the remote ext path to Annotator instead of prototyp... - change (mediawiki...Annotator)

2013-06-27 Thread Rjain (Code Review)

Rjain has uploaded a new change for review.

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


Change subject: changed the remote ext path to Annotator instead of prototyping 
inline comments
..

changed the remote ext path to Annotator instead of prototyping inline comments

Change-Id: I2f8c7fea03d451d0a974e86f420e1c71e15ebd5d
---
M Annotator.php
M README.md
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/Annotator.php b/Annotator.php
index 750f94d..b8fcce4 100755
--- a/Annotator.php
+++ b/Annotator.php
@@ -9,7 +9,7 @@
 //Resource Modules
 $wgAnnotatorResourcePaths = array(
'localBasePath' = __DIR__ . '/modules',
-   'remoteExtPath' = Prototyping-inline-comments/modules,
+   'remoteExtPath' = Annotator/modules,
 );
 $wgResourceModules['ext.annotator'] = array(
'scripts' = array(
diff --git a/README.md b/README.md
index 1879f97..414f366 100644
--- a/README.md
+++ b/README.md
@@ -6,5 +6,5 @@
 
 Installation
 ===
-Install it by adding 
require_once($IP/extensions/Prototyping-inline-comments/Annotator.php); to 
your Localsettings.php
+Install it by adding require_once($IP/extensions/Annotator/Annotator.php); 
to your Localsettings.php
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f8c7fea03d451d0a974e86f420e1c71e15ebd5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Annotator
Gerrit-Branch: master
Gerrit-Owner: Rjain richa.jain1...@gmail.com

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

[MediaWiki-commits] [Gerrit] Support for multiple definitions per term - change (mediawiki...Lingo)

2013-06-27 Thread Euvl (Code Review)

Euvl has uploaded a new change for review.

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


Change subject: Support for multiple definitions per term
..

Support for multiple definitions per term

Change-Id: I4e1d0651b3d66bada92db9c3a1c76cdd6de1529c
---
M LingoBasicBackend.php
M LingoElement.php
2 files changed, 27 insertions(+), 15 deletions(-)


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

diff --git a/LingoBasicBackend.php b/LingoBasicBackend.php
index 09072dc..cab7084 100644
--- a/LingoBasicBackend.php
+++ b/LingoBasicBackend.php
@@ -53,6 +53,7 @@
}
 
$content = $rev-getText();
+
}
 
$this-mArticleLines = array_reverse(explode( \n, $content ));
@@ -71,8 +72,8 @@
wfProfileIn( __METHOD__ );

$ret = null;
-   $term = null;
-   static $definition = null;
+   static $term = null;
+   static $definitions = null;
 
// find next valid line (yes, the assignation is intended)
while ( ( $ret == null )  ( $entry = each( 
$this-mArticleLines ) ) ) {
@@ -83,25 +84,31 @@
 
$chunks = explode( ':', $entry[1], 2 );
 
-   // found a new term?
-   if ( count( $chunks ) = 1  strlen( $chunks[0] ) = 1 
) {
-   $term = trim( substr( $chunks[0], 1 ) );
-   }
+// found a new definition?
+if ( count ( $chunks ) == 2 ) {
+// if definitions and term are already set, and now goes 
definition again,
+// it means that we work with a totally new term and have to 
remove previous data
+// from static variables
+if ($definitions  $term) {
+$definitions = [];
+$term = null;
+}
+$definitions[] = trim( $chunks[1] );
+}
 
-   // found a new definition?
-   if ( count ( $chunks ) == 2 ) {
-   $definition = trim( $chunks[1] );
+   // found a new term?
+   if (count( $chunks ) = 1  strlen( $chunks[0] ) = 1 
) {
+   $term = trim( substr( $chunks[0], 1 ) );
}
 
if ( $term !== null ) {
$ret = array(
LingoElement::ELEMENT_TERM = $term,
-   LingoElement::ELEMENT_DEFINITION = 
$definition,
+   LingoElement::ELEMENT_DEFINITIONS = 
$definitions,
LingoElement::ELEMENT_LINK = null,
LingoElement::ELEMENT_SOURCE = null
);
}
-
}
 
wfProfileOut( __METHOD__ );
diff --git a/LingoElement.php b/LingoElement.php
index 0a2733f..e1d1b36 100644
--- a/LingoElement.php
+++ b/LingoElement.php
@@ -20,7 +20,7 @@
  */
 class LingoElement {
const ELEMENT_TERM = 0;
-   const ELEMENT_DEFINITION = 1;
+   const ELEMENT_DEFINITIONS = 1;
const ELEMENT_SOURCE = 2;
const ELEMENT_LINK = 3;
 
@@ -60,7 +60,7 @@
 
// if there is only one link available, just insert the 
link
if ( count( $this-mDefinitions ) === 1
-!is_string( 
$this-mDefinitions[0][self::ELEMENT_DEFINITION] )
+!is_string( 
$this-mDefinitions[0][self::ELEMENT_DEFINITIONS] )
 is_string( 
$this-mDefinitions[0][self::ELEMENT_LINK] ) ) {
 
// create Title object for target page
@@ -112,6 +112,7 @@
// Wrap term in span tag, hidden
wfSuppressWarnings();
$spanTerm = $doc-createElement( 'span', 
htmlentities( $this-mTerm, ENT_COMPAT, 'UTF-8' ) );
+
wfRestoreWarnings();
$spanTerm-setAttribute( 'class', 
'tooltip_abbr' );
 
@@ -124,7 +125,11 @@
 
foreach ( $this-mDefinitions as $definition ) {
wfSuppressWarnings();
-   $element = $doc-createElement( 'span', 
htmlentities( $definition[self::ELEMENT_DEFINITION], ENT_COMPAT, 'UTF-8' ) );
+$definitions = null;
+foreach ($definition[self::ELEMENT_DEFINITIONS] as $def) {
+$definitions .= $def . ', ';
+}
+   $element =

[MediaWiki-commits] [Gerrit] Ignore now empty message for translation - change (mediawiki/core)

2013-06-27 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

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


Change subject: Ignore now empty message for translation
..

Ignore now empty message for translation

Folloup to I2622b35e712120dc171ea44a887d6b42286f2a06

Change-Id: I235fe77381e2ef2c763de33b59373649b3b8a50b
---
M languages/messages/MessagesEn.php
M maintenance/language/messageTypes.inc
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/70803/1

diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 8629a4f..0e8e75a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4599,7 +4599,7 @@
 'semicolon-separator' = ';#32;', # only translate this message to other 
languages if you have to change it
 'comma-separator' = ',#32;', # only translate this message to other 
languages if you have to change it
 'colon-separator' = ':#32;', # only translate this message to other 
languages if you have to change it
-'autocomment-prefix'  = '', # only translate this message to other languages 
if you have to change it
+'autocomment-prefix'  = '', # do not translate or duplicate this message to 
other languages
 'pipe-separator'  = '#32;|#32;', # only translate this message to other 
languages if you have to change it
 'word-separator'  = '#32;', # only translate this message to other 
languages if you have to change it
 'ellipsis'= '...', # only translate this message to other 
languages if you have to change it
diff --git a/maintenance/language/messageTypes.inc 
b/maintenance/language/messageTypes.inc
index 0ec22e0..8c6b3a4 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -258,6 +258,7 @@
'today-at',
'redirect-text',
'edithelppage',
+   'autocomment-prefix',
 );
 
 /** Optional messages, which may be translated only if changed in the target 
language. */
@@ -454,7 +455,6 @@
'percent',
'parentheses',
'brackets',
-   'autocomment-prefix',
'listgrouprights-right-display',
'listgrouprights-right-revoked',
'timezone-utc',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I235fe77381e2ef2c763de33b59373649b3b8a50b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] fix bug (method name mis-spelled) - change (mediawiki...Less)

2013-06-27 Thread Foxtrott (Code Review)

Foxtrott has submitted this change and it was merged.

Change subject: fix bug (method name mis-spelled)
..


fix bug (method name mis-spelled)

Change-Id: I9c0da0ee88fd6a87eb39589e6e2cb3f87801c59d
---
M ResourceLoaderLessFileModule.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/ResourceLoaderLessFileModule.php b/ResourceLoaderLessFileModule.php
index 9c5d1a6..56bb30d 100644
--- a/ResourceLoaderLessFileModule.php
+++ b/ResourceLoaderLessFileModule.php
@@ -41,7 +41,7 @@
 * @return array
 */
public function getStyleURLsForDebug( ResourceLoaderContext $context ) {
-   return ResourceLoaderModule::getStylURLsForDebug( $context );
+   return ResourceLoaderModule::getStyleURLsForDebug( $context );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c0da0ee88fd6a87eb39589e6e2cb3f87801c59d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Less
Gerrit-Branch: master
Gerrit-Owner: Foxtrott s7ep...@gmail.com
Gerrit-Reviewer: Foxtrott s7ep...@gmail.com
Gerrit-Reviewer: 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] fix bug (autoedit does never finish on error) - change (mediawiki...SemanticForms)

2013-06-27 Thread Foxtrott (Code Review)

Foxtrott has submitted this change and it was merged.

Change subject: fix bug (autoedit does never finish on error)
..


fix bug (autoedit does never finish on error)

Added an error handler.

Change-Id: Ib433027469fbe8143ac4eb27f38eca0dabbeb4df
---
M libs/SF_autoedit.js
1 file changed, 13 insertions(+), 1 deletion(-)

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



diff --git a/libs/SF_autoedit.js b/libs/SF_autoedit.js
index 3e2c4dd..a41e50d 100644
--- a/libs/SF_autoedit.js
+++ b/libs/SF_autoedit.js
@@ -61,7 +61,19 @@
jresult.removeClass( 
'autoedit-result-wait' ).addClass( 'autoedit-result-error' );
jtrigger.removeClass( 
'autoedit-trigger-wait' ).addClass( 'autoedit-trigger-error' );
}
-   } // function to be called if the request succeeds
+   }, // function to be called if the request succeeds
+   error:  function ( jqXHR, textStatus, errorThrown ) {
+   var result = 
jQuery.parseJSON(jqXHR.responseText);
+   var text = result.responseText;
+
+   for ( var i = 0; i  result.errors.length; i++ 
) {
+   text += ' ' + result.errors[i].message;
+   }
+
+   jresult.empty().append( text );
+   jresult.removeClass( 'autoedit-result-wait' 
).addClass( 'autoedit-result-error' );
+   jtrigger.removeClass( 'autoedit-trigger-wait' 
).addClass( 'autoedit-trigger-error' );
+   } // function to be called if the request fails
} );
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib433027469fbe8143ac4eb27f38eca0dabbeb4df
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Foxtrott s7ep...@gmail.com
Gerrit-Reviewer: Foxtrott s7ep...@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] beta: removes incubator wiki - change (operations/mediawiki-config)

2013-06-27 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: beta: removes incubator wiki
..

beta: removes incubator wiki

I am not sure what the incubator wiki on beta was meant to be, but it is
no more accessible since I reduced the number of wikis on beta.  Since
the wiki is registed for autologin and is not reacheable, that produce a
console error and a missing icon whenever someone login.

Change-Id: I9021c815fcfc14eed121c6900bd061b3aa2cd43f
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/wgConfVHosts-labs.php
3 files changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9ebe00e..1826681 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1217,7 +1217,6 @@
// wmflabs beta cluster
$wmgSecondLevelDomainRegex = '/^\w+\.\w+\.\w+\.\w+\./';
$wgCentralAuthAutoLoginWikis = array(
-   'incubator.wikimedia.beta.wmflabs.org' = 
'incubatorwiki',
'.wikipedia.beta.wmflabs.org' = 'enwiki',
'.wikisource.beta.wmflabs.org' = 'enwikisource',
'.wikibooks.beta.wmflabs.org' = 'enwikibooks',
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index ff017cf..4d2f1bd 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -54,7 +54,6 @@
 
'wgServer' = array(
'default' = '//$lang.wikipedia.beta.wmflabs.org',
-   'incubatorwiki' = '//incubator.wikimedia.beta.wmflabs.org',
'wiktionary'= '//$lang.wiktionary.beta.wmflabs.org',
'wikipedia' = '//$lang.wikipedia.beta.wmflabs.org',
'wikiversity'   = '//$lang.wikiversity.beta.wmflabs.org',
@@ -85,7 +84,6 @@
'wikispecies' = 
'http://$lang.wikispecies.beta.wmflabs.org',
'wikivoyage'= 'http://$lang.wikivoyage.beta.wmflabs.org',
 
-   'incubatorwiki' = 
'http://incubator.wikimedia.beta.wmflabs.org',
'metawiki'  = 'http://meta.wikimedia.beta.wmflabs.org',
'ee_prototypewiki' = 
'http://ee-prototype.wikipedia.beta.wmflabs.org',
'commonswiki'   = 'http://commons.wikimedia.beta.wmflabs.org',
diff --git a/wmf-config/wgConfVHosts-labs.php b/wmf-config/wgConfVHosts-labs.php
index 0239aa4..978218c 100644
--- a/wmf-config/wgConfVHosts-labs.php
+++ b/wmf-config/wgConfVHosts-labs.php
@@ -9,6 +9,5 @@
'wikiversity.beta.wmflabs.org',
'wikivoyage.beta.wmflabs.org',
'meta.wikimedia.beta.wmflabs.org',
-   'incubator.wikimedia.beta.wmflabs.org',
'commons.wikimedia.beta.wmflabs.org',
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9021c815fcfc14eed121c6900bd061b3aa2cd43f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-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] Revert Register resources with absolute path - change (mediawiki...MwEmbedSupport)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Revert Register resources with absolute path
..


Revert Register resources with absolute path

The change broke beta with exception such as:

exception 'MWException' with message
'ResourceLoaderFileModule::readScriptFiles: script file not found:
/usr/local/apache/common-local/php-master/er/extensions/MwEmbedSupport/MwEmbedModules/MediaWikiSupport/MediaWikiSupport.loader.js'
in
/data/project/apache/common-local/php-master/includes/resourceloader/ResourceLoaderFileModule.php:574

bug: 50264
This reverts commit aadc1d0dd503ebb30ef4180d75b887c764b75fd3

Change-Id: Ie373d1f407788a8e2456c3d8a34cc79ac9ed8bb6
---
M MwEmbedResourceManager.php
M MwEmbedSupport.php
2 files changed, 4 insertions(+), 7 deletions(-)

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



diff --git a/MwEmbedResourceManager.php b/MwEmbedResourceManager.php
index 5ca4fe9..ada082b 100644
--- a/MwEmbedResourceManager.php
+++ b/MwEmbedResourceManager.php
@@ -19,15 +19,12 @@
 * @param $mwEmbedResourcePath string
 * @throws MWException
 */
-   public static function register( $localResourcePath ) {
+   public static function register( $mwEmbedResourcePath ) {
global $IP, $wgExtensionMessagesFiles;
-
-   $mwEmbedResourcePath = substr( $localResourcePath, strlen( $IP 
. '/') );
-
+   $localResourcePath = $IP .'/' . $mwEmbedResourcePath;
// Get the module name from the end of the path:
$modulePathParts = explode( '/', $mwEmbedResourcePath );
$moduleName =  array_pop ( $modulePathParts );
-
if( !is_dir( $localResourcePath ) ){
throw new MWException( __METHOD__ .  not given 
readable path:   . htmlspecialchars( $localResourcePath ) );
}
diff --git a/MwEmbedSupport.php b/MwEmbedSupport.php
index baf74c4..da93165 100644
--- a/MwEmbedSupport.php
+++ b/MwEmbedSupport.php
@@ -53,7 +53,7 @@
 $wgHooks['ResourceLoaderGetConfigVars'][] =  
'MwEmbedResourceManager::registerConfigVars';
 
 // Register the core MwEmbed Support Module:
-MwEmbedResourceManager::register( dirname(__FILE__) . 
'/MwEmbedModules/MwEmbedSupport' );
+MwEmbedResourceManager::register( 
'extensions/MwEmbedSupport/MwEmbedModules/MwEmbedSupport' );
 
 // Register the MwEmbed 'mediaWiki' Module:
-MwEmbedResourceManager::register( dirname(__FILE__) . 
'/MwEmbedModules/MediaWikiSupport' );
+MwEmbedResourceManager::register( 
'extensions/MwEmbedSupport/MwEmbedModules/MediaWikiSupport' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie373d1f407788a8e2456c3d8a34cc79ac9ed8bb6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MwEmbedSupport
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] Revert Register resources with absolute path - change (mediawiki...TimedMediaHandler)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Revert Register resources with absolute path
..


Revert Register resources with absolute path

The change broke beta with exception such as:

2013-06-26 22:39:51 deployment-jobrunner08 aawiki: [ff75b05a] [no req]  
Exception from line 32 of
/data/project/apache/common-local/php-master/extensions/MwEmbedSupport/MwEmbedResourceManager.php:
MwEmbedResourceManager::register not given readable path:
extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer


bug: 50264

This reverts commit c100236f7164c8d6366a090e8fb2066a590aee1f

Change-Id: I02ed22e324435e362cabdfc67e69c224ad9e2550
---
M TimedMediaHandler.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 928bc40..0f3202b 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -26,8 +26,8 @@
}
 
// Register the Timed Media Handler javascript resources ( 
MwEmbed modules )
-   MwEmbedResourceManager::register( dirname(__FILE__) . 
'/MwEmbedModules/EmbedPlayer' );
-   MwEmbedResourceManager::register( dirname(__FILE__) . 
'/MwEmbedModules/TimedText' );
+   MwEmbedResourceManager::register( 
'extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer' );
+   MwEmbedResourceManager::register( 
'extensions/TimedMediaHandler/MwEmbedModules/TimedText' );
 
// Set the default webPath for this embed player extension
$wgMwEmbedModuleConfig['EmbedPlayer.WebPath'] = 
$wgExtensionAssetsPath .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02ed22e324435e362cabdfc67e69c224ad9e2550
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
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] improvements for 8e9bd87ede91cc5e07bcf79480bb31b34522ff67 co... - change (mediawiki...Lingo)

2013-06-27 Thread Euvl (Code Review)

Euvl has uploaded a new change for review.

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


Change subject: improvements for 8e9bd87ede91cc5e07bcf79480bb31b34522ff67 commit
..

improvements for 8e9bd87ede91cc5e07bcf79480bb31b34522ff67 commit

Change-Id: I1b73c35d91e8a7f7a7412e75d219bf71d985326a
---
M Lingo.php
M LingoBasicBackend.php
M LingoElement.php
M LingoHooks.php
4 files changed, 38 insertions(+), 38 deletions(-)


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

diff --git a/Lingo.php b/Lingo.php
index 605a8aa..4e29ab4 100644
--- a/Lingo.php
+++ b/Lingo.php
@@ -81,7 +81,7 @@
 
 $wgHooks['ArticlePurge'][] = 'LingoBasicBackend::purgeCache';
 $wgHooks['ArticleSave'][] = 'LingoBasicBackend::purgeCache';
-$wgHooks['ParserFirstCallInit'][] = 'LingoBasicBackend::registerTags';
+$wgHooks['ParserFirstCallInit'][] = 'LingoHooks::registerTags';
 
 // register resource modules with the Resource Loader
 $wgResourceModules['ext.Lingo.Styles'] = array(
diff --git a/LingoBasicBackend.php b/LingoBasicBackend.php
index cab7084..6635464 100644
--- a/LingoBasicBackend.php
+++ b/LingoBasicBackend.php
@@ -84,17 +84,17 @@
 
$chunks = explode( ':', $entry[1], 2 );
 
-// found a new definition?
-if ( count ( $chunks ) == 2 ) {
-// if definitions and term are already set, and now goes 
definition again,
-// it means that we work with a totally new term and have to 
remove previous data
-// from static variables
-if ($definitions  $term) {
-$definitions = [];
-$term = null;
-}
-$definitions[] = trim( $chunks[1] );
-}
+   // found a new definition?
+   if ( count ( $chunks ) == 2 ) {
+   // if definitions and term are already set, and 
now goes definition again,
+   // it means that we work with a totally new 
term and have to remove previous data
+   // from static variables
+   if ($definitions  $term) {
+   $definitions = [];
+   $term = null;
+   }
+   $definitions[] = trim( $chunks[1] );
+   }
 
// found a new term?
if (count( $chunks ) = 1  strlen( $chunks[0] ) = 1 
) {
@@ -146,26 +146,5 @@
public function useCache() {
return true;
}
-
-/**
- * Creates tag hook(s)
- */
-public static function registerTags(Parser $parser) {
-$parser-setHook( 'noglossary',  
'LingoBasicBackend::noglossaryTagRenderer');
-return true;
-}
-
-/**
- * Sets hook on 'noglossary' tag
- * @static
- * @param $input
- * @param array $args
- * @param Parser $parser
- * @param PPFrame $frame
- * @return string
- */
-public static function noglossaryTagRenderer( $input, array $args, Parser 
$parser, PPFrame $frame ) {
-return 'span class=noglossary'.$input.'/span';
-}
 }
 
diff --git a/LingoElement.php b/LingoElement.php
index e1d1b36..30d1cc9 100644
--- a/LingoElement.php
+++ b/LingoElement.php
@@ -125,11 +125,11 @@
 
foreach ( $this-mDefinitions as $definition ) {
wfSuppressWarnings();
-$definitions = null;
-foreach ($definition[self::ELEMENT_DEFINITIONS] as $def) {
-$definitions .= $def . ', ';
-}
-   $element = $doc-createElement( 'span', 
htmlentities(trim($definitions, ', '), ENT_COMPAT, 'UTF-8' ) );
+   $definitions = null;
+   foreach ( 
$definition[self::ELEMENT_DEFINITIONS] as $def ) {
+   $definitions .= $def . ', ';
+   }
+   $element = $doc-createElement( 'span', 
htmlentities( trim($definitions, ', ' ), ENT_COMPAT, 'UTF-8' ) );
wfRestoreWarnings();
if ( $definition[self::ELEMENT_LINK] ) {
$linkedTitle = 
Title::newFromText( $definition[self::ELEMENT_LINK] );
diff --git a/LingoHooks.php b/LingoHooks.php
index 464c5a5..413d005 100644
--- a/LingoHooks.php
+++ b/LingoHooks.php
@@ -66,5 +66,26 @@
return true;
}
 
+   /**
+* Creates tag hook(s)
+*/
+   public static function registerTags(Parser $parser) {
+   $parser-setHook(

[MediaWiki-commits] [Gerrit] Further improve load order of RC and watchlist styling - change (mediawiki/core)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Further improve load order of RC and watchlist styling
..


Further improve load order of RC and watchlist styling

This mainly addresses a regression in
I639a5ccbc3b7b2794e7b12ecb64e5ee6b10a640a, causing the bolding of
unread titles to be applied trough JS loading of the CSS.

Bug: 49610
Change-Id: I5cc20a342ebb566262e3aa1e9fe2cdf866a662c3
---
M includes/ChangesList.php
M resources/Resources.php
M resources/mediawiki.special/mediawiki.special.changeslist.css
A resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css
4 files changed, 68 insertions(+), 52 deletions(-)

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



diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 02c02e0..57c8f0b 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -194,7 +194,7 @@
$this-rcCacheIndex = 0;
$this-lastdate = '';
$this-rclistOpen = false;
-   $this-getOutput()-addModules( 'mediawiki.special.changeslist' 
);
+   $this-getOutput()-addModuleStyles( 
'mediawiki.special.changeslist' );
return '';
}
 
@@ -703,7 +703,14 @@
$this-rcCacheIndex = 0;
$this-lastdate = '';
$this-rclistOpen = false;
-   $this-getOutput()-addModules( 'mediawiki.special.changeslist' 
);
+   $this-getOutput()-addModuleStyles( array(
+   'mediawiki.special.changeslist',
+   'mediawiki.special.changeslist.enhanced',
+   ) );
+   $this-getOutput()-addModules( array(
+   'jquery.makeCollapsible',
+   'mediawiki.icon',
+   ) );
return '';
}
/**
diff --git a/resources/Resources.php b/resources/Resources.php
index 90c6c95..73c73a4 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -913,7 +913,9 @@
),
'mediawiki.special.changeslist' = array(
'styles' = 
'resources/mediawiki.special/mediawiki.special.changeslist.css',
-   'dependencies' = array( 'jquery.makeCollapsible', 
'mediawiki.icon' ),
+   ),
+   'mediawiki.special.changeslist.enhanced' = array(
+   'styles' = 
'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
),
'mediawiki.special.movePage' = array(
'scripts' = 
'resources/mediawiki.special/mediawiki.special.movePage.js',
diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.css 
b/resources/mediawiki.special/mediawiki.special.changeslist.css
index 7b3740e..5e4af7b 100644
--- a/resources/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.css
@@ -2,54 +2,6 @@
  * Styling for Special:Watchlist and Special:RecentChanges
  */
 
-table.mw-enhanced-rc {
-   border: 0;
-   border-spacing: 0;
-}
-
-table.mw-enhanced-rc th,
-table.mw-enhanced-rc td {
-   padding: 0;
-   vertical-align: top;
-}
-
-td.mw-enhanced-rc {
-   white-space: nowrap;
-   font-family: monospace;
-}
-
-.mw-enhanced-rc-time {
-   font-family: monospace;
-}
-
-table.mw-enhanced-rc td.mw-enhanced-rc-nested {
-   padding-left: 1em;
-}
-
-/* Show/hide arrows in enhanced changeslist */
-.mw-enhanced-rc .collapsible-expander {
-   float: none;
-}
-
-/* If JS is disabled, the arrows or the placeholder space shouldn't be shown */
-.client-nojs .mw-enhancedchanges-arrow-space {
-   display: none;
-}
-
-.mw-enhancedchanges-arrow-space {
-   display: inline-block;
-   *display: inline; /* IE7 and below */
-   zoom: 1;
-   width: 15px;
-   height: 15px;
-}
-
-/* let it look like it is clickable */
-.mw-enhancedchanges-arrow.mw-collapsible-toggle {
-   cursor: pointer;
-}
-
-.mw-changeslist-line-watched .mw-title,
-.mw-enhanced-watched .mw-enhanced-rc-time {
+.mw-changeslist-line-watched .mw-title {
font-weight: bold;
 }
diff --git 
a/resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css 
b/resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css
new file mode 100644
index 000..2632c78
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css
@@ -0,0 +1,55 @@
+/**
+ * Styling for Special:Watchlist and Special:RecentChanges when preference 
'usenewrc'
+ * a.k.a. Enhanced Recent Changes is enabled.
+ */
+
+table.mw-enhanced-rc {
+   border: 0;
+   border-spacing: 0;
+}
+
+table.mw-enhanced-rc th,
+table.mw-enhanced-rc td {
+   padding: 0;
+   vertical-align: top;
+}
+
+td.mw-enhanced-rc {
+   white-space: nowrap;
+   font-family: monospace;
+}
+
+.mw-enhanced-rc-time {
+   font-family: monospace;
+}
+

[MediaWiki-commits] [Gerrit] Beginning of Page pages refactoring. - change (mediawiki...ProofreadPage)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Beginning of Page pages refactoring.
..


Beginning of Page pages refactoring.

Added ProofreadPagePage and ProofreadPageValue classes.

Change-Id: I52f69ac806929f4cba0f1c9399d2519165d96086
---
M ProofreadPage.php
A includes/page/ProofreadPageContent.php
A includes/page/ProofreadPagePage.php
3 files changed, 433 insertions(+), 2 deletions(-)

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



diff --git a/ProofreadPage.php b/ProofreadPage.php
index f989e27..ef346b1 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -40,16 +40,19 @@
 $wgExtensionMessagesFiles['ProofreadPageAlias'] = $dir . 
'ProofreadPage.alias.php';
 
 $wgAutoloadClasses['ProofreadPage'] = $dir . 'ProofreadPage.body.php';
-$wgAutoloadClasses['ProofreadPageDbConnector'] = $dir . 
'includes/page/ProofreadPageDbConnector.php';
 $wgAutoloadClasses['ProofreadPageInit'] = $dir . 
'includes/ProofreadPageInit.php';
 
 $wgAutoloadClasses['EditProofreadIndexPage'] = $dir . 
'includes/index/EditProofreadIndexPage.php';
-$wgAutoloadClasses['EditProofreadPagePage'] = $dir . 
'includes/page/EditProofreadPagePage.php';
 $wgAutoloadClasses['ProofreadIndexEntry'] = $dir . 
'includes/index/ProofreadIndexEntry.php';
 $wgAutoloadClasses['ProofreadIndexValue'] = $dir . 
'includes/index/ProofreadIndexValue.php';
 $wgAutoloadClasses['ProofreadIndexPage'] = $dir . 
'includes/index/ProofreadIndexPage.php';
 $wgAutoloadClasses['ProofreadIndexDbConnector'] = $dir . 
'includes/index/ProofreadIndexDbConnector.php';
 
+$wgAutoloadClasses['ProofreadPageDbConnector'] = $dir . 
'includes/page/ProofreadPageDbConnector.php';
+$wgAutoloadClasses['EditProofreadPagePage'] = $dir . 
'includes/page/EditProofreadPagePage.php';
+$wgAutoloadClasses['ProofreadPagePage'] = 
$dir.'includes/page/ProofreadPagePage.php';
+$wgAutoloadClasses['ProofreadPageValue'] = 
$dir.'includes/page/ProofreadPageValue.php';
+
 $wgExtensionCredits['other'][] = array(
'path'   = __FILE__,
'name'   = 'ProofreadPage',
diff --git a/includes/page/ProofreadPageContent.php 
b/includes/page/ProofreadPageContent.php
new file mode 100644
index 000..15a60f3
--- /dev/null
+++ b/includes/page/ProofreadPageContent.php
@@ -0,0 +1,258 @@
+?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+ /**
+  * A value of a page entry
+  */
+
+class ProofreadPageContent {
+
+   /**
+* @var string header of the page
+*/
+   private $header;
+
+   /**
+* @var string body of the page
+*/
+   private $body;
+
+   /**
+* @var string footer of the page
+*/
+   private $footer;
+
+   /**
+* @var User|null last proofreader of the page
+*/
+   protected $proofreader;
+
+   /**
+* @var integer proofreading level of the page
+*/
+   protected $level = 1;
+
+   /**
+* Constructor
+* @param $header string
+* @param $body string
+* @param $footer string
+* @param $level integer
+* @param $proofreader User|string
+*/
+   public function __construct( $header = '', $body = '', $footer = '', 
$level = 1, $proofreader = null ) {
+   $this-setHeader( $header );
+   $this-setBody( $body );
+   $this-setFooter( $footer );
+   $this-setLevel( $level );
+   if ( is_string( $proofreader ) ) {
+   $this-setProofreaderFromName( $proofreader );
+   } else {
+   $this-setProofreader( $proofreader );
+   }
+   }
+
+   /**
+* returns the header of the page
+* @return string
+*/
+   public function getHeader() {
+   return $this-header;
+   }
+
+   /**
+* returns the body of the page
+* @return string
+*/
+   public function getBody(){
+   return $this-body;
+   }
+
+   /**
+* returns the footer of the page
+* @return string
+*/
+   public function getFooter() {
+   return $this-footer;
+

[MediaWiki-commits] [Gerrit] Refactoring of globeCoordinate.js - change (mediawiki...DataValues)

2013-06-27 Thread Henning Snater (Code Review)

Henning Snater has uploaded a new change for review.

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


Change subject: Refactoring of globeCoordinate.js
..

Refactoring of globeCoordinate.js

Moved settings to GlobeCoordinate object as well as some GlobeCoordinate object 
specific functions.
Put precisions into a constant, cleaned up GlobeCoordinate's method structure, 
removed currently
unused precisionTextEarth() function.

Change-Id: Ib35451626c094624603497a0f62943134802333c
---
M DataValues/resources/globeCoordinate.js/src/globeCoordinate.GlobeCoordinate.js
M DataValues/resources/globeCoordinate.js/src/globeCoordinate.js
M 
DataValues/resources/globeCoordinate.js/tests/globeCoordinate.GlobeCoordinate.tests.js
M DataValues/resources/globeCoordinate.js/tests/globeCoordinate.tests.js
M 
ValueView/resources/jquery.valueview/valueview.experts/experts.GlobeCoordinateInput.js
5 files changed, 417 insertions(+), 507 deletions(-)


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

diff --git 
a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.GlobeCoordinate.js
 
b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.GlobeCoordinate.js
index 38b6da4..b33710b 100644
--- 
a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.GlobeCoordinate.js
+++ 
b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.GlobeCoordinate.js
@@ -14,6 +14,26 @@
 globeCoordinate.GlobeCoordinate = ( function( globeCoordinate ) {
'use strict';
 
+   var defaultOptions = {
+   north: 'N',
+   east: 'E',
+   south: 'S',
+   west: 'W',
+   dot: '.',
+   latLongCombinator: ', ',
+   degree: '°',
+   minute: '\'',
+   second: '',
+   precisionTexts: [
+   { precision: 1, text: 'to a degree' },
+   { precision: 1 / 60, text: 'to an arcminute' },
+   { precision: 1 / 3600, text: 'to an arcsecond' },
+   { precision: 1 / 36000, text: 'to 1/10 of an arcsecond' 
},
+   { precision: 1 / 36, text: 'to 1/100 of an 
arcsecond' },
+   { precision: 1 / 360, text: 'to 1/1000 of an 
arcsecond' }
+   ]
+   };
+
/**
 * Constructor for an object representing a globe coordinate with a 
certain precision.
 *
@@ -21,16 +41,31 @@
 * - {number} latitude
 * - {number} longitude
 * - {number} precision
+* @param {Object} [options]
 *
 * @constructor
 */
-   function GlobeCoordinate( gcDef ) {
+   function GlobeCoordinate( gcDef, options ) {
+   options = options || {};
+
+   this._options = defaultOptions;
+
+   for( var key in options ) {
+   if( options.hasOwnProperty( key )  this._options[key] 
) {
+   this._options[key] = options[key];
+   }
+   }
+
if( !gcDef || typeof gcDef !== 'object'
|| gcDef.latitude === undefined
|| gcDef.longitude === undefined
|| gcDef.precision === undefined
) {
throw new Error( 'No proper globe coordinate definition 
given' );
+   }
+
+   if( !isValidPrecision( gcDef.precision ) ) {
+   throw new Error( 'No valid precision given' );
}
 
this._latitude = gcDef.latitude;
@@ -48,19 +83,6 @@
throw new Error( 'Longitude (' + this._longitude + ') 
is out of bounds' );
}
 
-   // Keep precision boundaries:
-   // TODO: get definition of precisions out of global settings 
and put them into
-   //  a globeCoordinate.GlobeCoordinate.PRECISION constant.
-   var precisions = globeCoordinate.settings.precisions,
-   minPrecision = precisions[0].level,
-   maxPrecision = precisions[precisions.length - 1].level;
-
-   if( this._precision  minPrecision ) {
-   this._precision = minPrecision;
-   } else if( this._precision  maxPrecision ) {
-   this._precision = maxPrecision;
-   }
-
this._globe = 'http://www.wikidata.org/entity/Q2'; // TODO: 
Support other globes
}
 
@@ -69,16 +91,16 @@
constructor: GlobeCoordinate,
 
/**
+* Options
+* @type {Object}
+*/
+   _options: null,
+
+   /**
 * Globe URI
 * @type {string}

[MediaWiki-commits] [Gerrit] wbsetsitelink: Use normalized page name in summaries - change (mediawiki...Wikibase)

2013-06-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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


Change subject: wbsetsitelink: Use normalized page name in summaries
..

wbsetsitelink: Use normalized page name in summaries

Bug: 50280
Change-Id: Ib1fb573c088cb80c5f837e31afb0c35287534082
---
M repo/includes/api/SetSiteLink.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/api/SetSiteLink.php 
b/repo/includes/api/SetSiteLink.php
index de6db59..6d5392b 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -115,7 +115,7 @@
$this-addSiteLinksToResult( array( $link ), 'entity', 
'sitelinks', 'sitelink', array( 'url' ) );
 
$summary-setAction( 'set' );
-   $summary-addAutoSummaryArgs( $params['linktitle'] );
+   $summary-addAutoSummaryArgs( $page );
 
wfProfileOut( __METHOD__ );
return $summary;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1fb573c088cb80c5f837e31afb0c35287534082
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] Fix the repo Autocomment tests broken by a core change - change (mediawiki...Wikibase)

2013-06-27 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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


Change subject: Fix the repo Autocomment tests broken by a core change
..

Fix the repo Autocomment tests broken by a core change

These have been broken with I2622b35e712120dc171ea44a887d6b42286f2a06

Change-Id: Id7d51b6ff2187c460246d89bb949dff0ca5de4c8
---
M repo/tests/phpunit/includes/AutocommentTest.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/AutocommentTest.php 
b/repo/tests/phpunit/includes/AutocommentTest.php
index ab022d2..6790f4f 100644
--- a/repo/tests/phpunit/includes/AutocommentTest.php
+++ b/repo/tests/phpunit/includes/AutocommentTest.php
@@ -61,7 +61,7 @@
'foo', 'wbeditentity', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?/spanbar/span!'
+   '!foo ‎span dir=autospan 
class=autocomment.*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -69,7 +69,7 @@
'foo', 'wbsetlabel-set:1|en', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[en\].*?/spanbar/span!'
+   '!foo ‎span dir=autospan 
class=autocomment.*?\[en\].*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -77,7 +77,7 @@
'foo', 'wbsetlabel-set:1|', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[lt;gt;\].*?/spanbar/span!'
+   '!foo ‎span dir=autospan 
class=autocomment.*?\[lt;gt;\].*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -85,7 +85,7 @@
'foo', 'wbsetlabel-set:1|lt;gt;', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[lt;gt;\].*?/spanbar/span!'
+   '!foo ‎span dir=autospan 
class=autocomment.*?\[lt;gt;\].*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -93,7 +93,7 @@
'foo', 'wbsetlabel-set:1|', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[amp;\].*?/spanbar/span!'
+   '!foo ‎span dir=autospan 
class=autocomment.*?\[amp;\].*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -101,7 +101,7 @@
'foo', 'wbsetlabel-set:1|…', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[…\].*?/spanbar/span!'
+   '!foo ‎span dir=autospan 
class=autocomment.*?\[…\].*?/spanbar/span!'
)
);
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7d51b6ff2187c460246d89bb949dff0ca5de4c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] No longer allow falures on php 5.5 - change (mediawiki...Wikibase)

2013-06-27 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

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


Change subject: No longer allow falures on php 5.5
..

No longer allow falures on php 5.5

Change-Id: I35c51decec101dd9eb080fb0a4a090b0dee9d41f
---
M .travis.yml
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/.travis.yml b/.travis.yml
index da39b0e..7258408 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@
 - env: TRAVISASSUMESWRONGSTUFF=FAIL
   allow_failures:
 - env: DBTYPE=postgres EXTENSION=repo
-- php: 5.5
 
 before_script:
   - bash .travis.sh $EXTENSION

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35c51decec101dd9eb080fb0a4a090b0dee9d41f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix the repo Autocomment tests broken by a core change - change (mediawiki...Wikibase)

2013-06-27 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Fix the repo Autocomment tests broken by a core change
..


Fix the repo Autocomment tests broken by a core change

These have been broken with I2622b35e712120dc171ea44a887d6b42286f2a06

Change-Id: Id7d51b6ff2187c460246d89bb949dff0ca5de4c8
---
M repo/tests/phpunit/includes/AutocommentTest.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/repo/tests/phpunit/includes/AutocommentTest.php 
b/repo/tests/phpunit/includes/AutocommentTest.php
index ab022d2..6aa9256 100644
--- a/repo/tests/phpunit/includes/AutocommentTest.php
+++ b/repo/tests/phpunit/includes/AutocommentTest.php
@@ -61,7 +61,7 @@
'foo', 'wbeditentity', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?/spanbar/span!'
+   '!foo‎span dir=autospan 
class=autocomment.*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -69,7 +69,7 @@
'foo', 'wbsetlabel-set:1|en', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[en\].*?/spanbar/span!'
+   '!foo‎span dir=autospan 
class=autocomment.*?\[en\].*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -77,7 +77,7 @@
'foo', 'wbsetlabel-set:1|', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[lt;gt;\].*?/spanbar/span!'
+   '!foo‎span dir=autospan 
class=autocomment.*?\[lt;gt;\].*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -85,7 +85,7 @@
'foo', 'wbsetlabel-set:1|lt;gt;', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[lt;gt;\].*?/spanbar/span!'
+   '!foo‎span dir=autospan 
class=autocomment.*?\[lt;gt;\].*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -93,7 +93,7 @@
'foo', 'wbsetlabel-set:1|', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[amp;\].*?/spanbar/span!'
+   '!foo‎span dir=autospan 
class=autocomment.*?\[amp;\].*?/spanbar/span!'
),
array(
CONTENT_MODEL_WIKIBASE_ITEM,
@@ -101,7 +101,7 @@
'foo', 'wbsetlabel-set:1|…', 'bar',
'Title',
false,
-   '!foo- ‎span dir=autospan 
class=autocomment.*?\[…\].*?/spanbar/span!'
+   '!foo‎span dir=autospan 
class=autocomment.*?\[…\].*?/spanbar/span!'
)
);
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7d51b6ff2187c460246d89bb949dff0ca5de4c8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.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] No longer allow falures on php 5.5 - change (mediawiki...Wikibase)

2013-06-27 Thread Jeroen De Dauw (Code Review)

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

Change subject: No longer allow falures on php 5.5
..


No longer allow falures on php 5.5

Change-Id: I35c51decec101dd9eb080fb0a4a090b0dee9d41f
---
M .travis.yml
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Jeroen De Dauw: Verified; Looks good to me, approved



diff --git a/.travis.yml b/.travis.yml
index da39b0e..7258408 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@
 - env: TRAVISASSUMESWRONGSTUFF=FAIL
   allow_failures:
 - env: DBTYPE=postgres EXTENSION=repo
-- php: 5.5
 
 before_script:
   - bash .travis.sh $EXTENSION

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35c51decec101dd9eb080fb0a4a090b0dee9d41f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com

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

[MediaWiki-commits] [Gerrit] wbsetsitelink: Use normalized page name in summaries - change (mediawiki...Wikibase)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: wbsetsitelink: Use normalized page name in summaries
..


wbsetsitelink: Use normalized page name in summaries

Bug: 50280
Change-Id: Ib1fb573c088cb80c5f837e31afb0c35287534082
---
M repo/includes/api/SetSiteLink.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/repo/includes/api/SetSiteLink.php 
b/repo/includes/api/SetSiteLink.php
index de6db59..6d5392b 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -115,7 +115,7 @@
$this-addSiteLinksToResult( array( $link ), 'entity', 
'sitelinks', 'sitelink', array( 'url' ) );
 
$summary-setAction( 'set' );
-   $summary-addAutoSummaryArgs( $params['linktitle'] );
+   $summary-addAutoSummaryArgs( $page );
 
wfProfileOut( __METHOD__ );
return $summary;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1fb573c088cb80c5f837e31afb0c35287534082
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
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] Allow to create new SVG files using SVGEdit - change (mediawiki...SVGEdit)

2013-06-27 Thread VitaliyFilippov (Code Review)

VitaliyFilippov has uploaded a new change for review.

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


Change subject: Allow to create new SVG files using SVGEdit
..

Allow to create new SVG files using SVGEdit

Change-Id: I34a40c935313549fe1b271d61080d4007b7fe979
---
M SVGEdit.hooks.php
M SVGEdit.i18n.php
M SVGEdit.php
M modules/ext.svgedit.editButton.js
M modules/ext.svgedit.editor.js
5 files changed, 29 insertions(+), 6 deletions(-)


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

diff --git a/SVGEdit.hooks.php b/SVGEdit.hooks.php
index a90d719..39e7073 100644
--- a/SVGEdit.hooks.php
+++ b/SVGEdit.hooks.php
@@ -66,4 +66,19 @@
$title-userCan( 'edit' )  $title-userCan( 'upload' 
);
}
 
+   /**
+* UploadForm:initial hook, suggests creating non-existing SVG files 
with SVGEdit
+*/
+   public static function uploadFormInitial( $upload ) {
+   if ( strtolower( substr( $upload-mDesiredDestName, -4 ) ) == 
'.svg' ) {
+   $title = Title::newFromText( $upload-mDesiredDestName, 
NS_FILE );
+   if ( $title ) {
+   $upload-uploadFormTextTop .= wfMsgNoTrans(
+   'svgedit-suggest-create', 
$title-getFullUrl().'#!action=svgedit'
+   );
+   }
+   }
+   return true;
+   }
+
 }
diff --git a/SVGEdit.i18n.php b/SVGEdit.i18n.php
index 3e527a8..3a3d616 100644
--- a/SVGEdit.i18n.php
+++ b/SVGEdit.i18n.php
@@ -20,7 +20,9 @@
'svgedit-desc' = 'In-browser editing of SVG drawings with 
[http://code.google.com/p/svg-edit/ SVG-Edit]',
'svgedit-edit-tab' = 'Edit drawing',
'svgedit-edit-tab-tooltip' = 'You can edit this SVG drawing in your 
browser',
-   'svgedit-toolbar-insert' = 'SVG drawing'
+   'svgedit-toolbar-insert' = 'SVG drawing',
+   'svgedit-editbutton-create' = 'Create image with SVGEdit',
+   'svgedit-suggest-create' = 'div style=display: inline-block; border: 
1px dashed blue; padding: 4px; background: #f8f8ffAlso, you can a 
href=$1create/edit this SVG file with SVGEdit/a./div',
 );
 
 /** Message documentation (Message documentation)
@@ -38,6 +40,8 @@
 {{Identical|Cancel}}',
'svgedit-desc' = '{{desc|name=SVG 
Edit|url=http://www.mediawiki.org/wiki/Extension:SVGEdit}}
 {{doc-important|Do not alter the link target URL 
codehttp://code.google.com/p/svg-edit//code.}}',
+   'svgedit-editbutton-create' = 'Text label on create button on 
non-existing SVG File: pages',
+   'svgedit-suggest-create' = 'HTML message displayed on the upload form 
initially opened for an SVG file',
 );
 
 /** Arabic (العربية)
@@ -746,6 +750,8 @@
'svgedit-edit-tab' = 'Править рисунок',
'svgedit-edit-tab-tooltip' = 'Вы можете редактировать этот SVG-рисунок 
в вашем браузере',
'svgedit-toolbar-insert' = 'Рисование SVG',
+   'svgedit-editbutton-create' = 'Создать рисунок в SVGEdit',
+   'svgedit-suggest-create' = 'div style=display: inline-block; border: 
1px dashed blue; padding: 4px; background: #f8f8ffТакже вы можете a 
href=$1создать/изменить этот SVG-файл с помощью SVGEdit/a./div',
 );
 
 /** Sinhala (සිංහල)
diff --git a/SVGEdit.php b/SVGEdit.php
index 91c5764..83fa713 100644
--- a/SVGEdit.php
+++ b/SVGEdit.php
@@ -22,6 +22,7 @@
 
 $wgHooks['BeforePageDisplay'][] = 'SVGEditHooks::beforePageDisplay';
 $wgHooks['MakeGlobalVariablesScript'][] = 
'SVGEditHooks::makeGlobalVariablesScript';
+$wgHooks['UploadForm:initial'][] = 'SVGEditHooks::uploadFormInitial';
 
 $wgAutoloadClasses['SVGEditHooks'] = dirname( __FILE__ ) . 
'/SVGEdit.hooks.php';
 
@@ -59,6 +60,7 @@
),
'messages' = array(
'svgedit-editbutton-edit',
+   'svgedit-editbutton-create',
'svgedit-edit-tab',
'svgedit-edit-tab-tooltip'
),
diff --git a/modules/ext.svgedit.editButton.js 
b/modules/ext.svgedit.editButton.js
index beb6129..689bb91 100644
--- a/modules/ext.svgedit.editButton.js
+++ b/modules/ext.svgedit.editButton.js
@@ -22,7 +22,7 @@
var trigger = function() {
mw.svgedit.open({
filename: wgTitle,
-   replace: '#file',
+   replace: (wgArticleId ? '#file' : 
'#mw-imagepage-nofile'),
onclose: function(filename) {
if (filename) {
// Saved! Refresh parent 
window...
@@ -48,11 +48,11 @@
});
 
var button = $('button/button')
-   .text(mw.msg('svgedit-editbutton-edit'))
+   .text(mw.msg(wgArticleId ?

[MediaWiki-commits] [Gerrit] Show SVGEdit WikiEditor SVG drawing button on preview, not... - change (mediawiki...SVGEdit)

2013-06-27 Thread VitaliyFilippov (Code Review)

VitaliyFilippov has uploaded a new change for review.

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


Change subject: Show SVGEdit WikiEditor SVG drawing button on preview, not 
only on the initial edit.
..

Show SVGEdit WikiEditor SVG drawing button on preview, not only on the 
initial edit.

Change-Id: Ib498a6d31d9c40371cc8b62af278153e8f4bbe1e
---
M SVGEdit.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/SVGEdit.hooks.php b/SVGEdit.hooks.php
index a90d719..5495cad 100644
--- a/SVGEdit.hooks.php
+++ b/SVGEdit.hooks.php
@@ -29,7 +29,7 @@
$modules[] = 'ext.svgedit.inline';
}
}
-   if ($wgRequest-getVal('action') == 'edit') {
+   if ( $wgRequest-getVal('action') == 'edit' || 
$wgRequest-getVal('action') == 'submit' ) {
if( $wgUser-isAllowed( 'upload' ) ) {
$modules[] = 'ext.svgedit.toolbar';
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib498a6d31d9c40371cc8b62af278153e8f4bbe1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SVGEdit
Gerrit-Branch: master
Gerrit-Owner: VitaliyFilippov vita...@yourcmc.ru

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

[MediaWiki-commits] [Gerrit] Impl isWriteMode() for claim modules. - change (mediawiki...Wikibase)

2013-06-27 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

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


Change subject: Impl isWriteMode() for claim modules.
..

Impl isWriteMode() for claim modules.

All API modules that change the database should return true from isWriteMode().

Change-Id: If989c34bfd4ca3e50beb888507a774351e7c46b4
---
M repo/includes/api/ModifyClaim.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/SetClaim.php
3 files changed, 23 insertions(+), 5 deletions(-)


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

diff --git a/repo/includes/api/ModifyClaim.php 
b/repo/includes/api/ModifyClaim.php
index a7892a8..624254d 100644
--- a/repo/includes/api/ModifyClaim.php
+++ b/repo/includes/api/ModifyClaim.php
@@ -58,4 +58,12 @@
return $summary;
}
 
+   /**
+* @see ApiBase::isWriteMode
+* @return bool true
+*/
+   public function isWriteMode() {
+   return true;
+   }
+
 }
diff --git a/repo/includes/api/RemoveClaims.php 
b/repo/includes/api/RemoveClaims.php
index 155db87..4883629 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -44,9 +44,13 @@
  */
 class RemoveClaims extends ApiWikibase {
 
-   // TODO: example
-   // TODO: rights
-   // TODO: conflict detection
+   /**
+* @see ApiBase::isWriteMode
+* @return bool true
+*/
+   public function isWriteMode() {
+   return true;
+   }
 
/**
 * @see \ApiBase::execute
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index b724df3..bd4f131 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -48,8 +48,6 @@
  */
 class SetClaim extends ApiWikibase {
 
-   // TODO: rights
-
/**
 * @var SnakValidationHelper
 */
@@ -74,6 +72,14 @@
}
 
/**
+* @see ApiBase::isWriteMode
+* @return bool true
+*/
+   public function isWriteMode() {
+   return true;
+   }
+
+   /**
 * @see ApiBase::execute
 *
 * @since 0.4

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If989c34bfd4ca3e50beb888507a774351e7c46b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Query user for the filename of SVGs inserted via WikiEditor ... - change (mediawiki...SVGEdit)

2013-06-27 Thread VitaliyFilippov (Code Review)

VitaliyFilippov has uploaded a new change for review.

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


Change subject: Query user for the filename of SVGs inserted via WikiEditor 
button.
..

Query user for the filename of SVGs inserted via WikiEditor button.

Also don't strip non-ascii chars from the filename (JS regexes
don't support UTF-8 character classes), but strip '/' and ':' -
only these characters yield an error in Title creation for files.
Other characters will be sanitized and the corrected title will
be inserted in the editbox.

Change-Id: I77c2782bdf6b53ed26435b4e02100c19a7116d1d
---
M SVGEdit.i18n.php
M SVGEdit.php
M modules/ext.svgedit.toolbar.js
3 files changed, 23 insertions(+), 17 deletions(-)


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

diff --git a/SVGEdit.i18n.php b/SVGEdit.i18n.php
index 3e527a8..ea24519 100644
--- a/SVGEdit.i18n.php
+++ b/SVGEdit.i18n.php
@@ -15,6 +15,7 @@
'svgedit-editbutton-edit' = 'Edit drawing',
'svgedit-summary-label' = 'Edit summary',
'svgedit-summary-default' = '/* Modified in svg-edit */',
+   'svgedit-editor-new-filename' = 'Enter file name: ',
'svgedit-editor-save-close' = 'Save and close',
'svgedit-editor-close' = 'Cancel',
'svgedit-desc' = 'In-browser editing of SVG drawings with 
[http://code.google.com/p/svg-edit/ SVG-Edit]',
@@ -740,6 +741,7 @@
'svgedit-editbutton-edit' = 'Редактировать рисунок',
'svgedit-summary-label' = 'Описание изменений',
'svgedit-summary-default' = '/* Изменено в svg-edit */',
+   'svgedit-editor-new-filename' = 'Введите имя файла: ',
'svgedit-editor-save-close' = 'Сохранить и закрыть',
'svgedit-editor-close' = 'Отмена',
'svgedit-desc' = 'Редактирование SVG-изображений в браузере с помощью 
[http://code.google.com/p/svg-edit/ SVG-Edit]',
diff --git a/SVGEdit.php b/SVGEdit.php
index 91c5764..2e8a09d 100644
--- a/SVGEdit.php
+++ b/SVGEdit.php
@@ -46,6 +46,7 @@
'svgedit-summary-default',
'svgedit-editor-save-close',
'svgedit-editor-close',
+   'svgedit-editor-new-filename',
),
'dependencies' = array(
'jquery.ui.resizable'
diff --git a/modules/ext.svgedit.toolbar.js b/modules/ext.svgedit.toolbar.js
index f08f9aa..ea847f0 100644
--- a/modules/ext.svgedit.toolbar.js
+++ b/modules/ext.svgedit.toolbar.js
@@ -7,7 +7,7 @@
 
var safeFilename = function(str) {
// hack hack
-   return str.replace(/[^A-Za-z0-9\- ]/, '').replace(/[\s_]+/, ' 
');
+   return str.replace(/[:\\\/]+/g, '').replace(/[\s_]+/g, ' ');
};
var handyDate = function() {
var now = new Date();
@@ -31,23 +31,26 @@
pad2(now.getUTCSeconds());
};
var callback = function(context) {
-   var filename = safeFilename(wgTitle) + ' drawing ' + 
handyDate() + '.svg';
-   var form = context.$ui.closest('form');
-   mediaWiki.svgedit.open({
-   filename: filename,
-   replace: form[0],
-   onclose: function(filename) {
-   if (filename) {
-   // Saved! Insert a [[File:foo]]
-   
context.$textarea.textSelection('encapsulateSelection', {
-   'pre': '[[File:',
-   'peri': filename,
-   'post': ']]',
-   'replace': true
-   });
+   var filename = safeFilename(wgTitle) + ' drawing ' + 
handyDate();
+   if (filename = 
prompt(mediaWiki.msg('svgedit-editor-new-filename'), filename)) {
+   filename = safeFilename(filename + '.svg');
+   var form = context.$ui.closest('form');
+   mediaWiki.svgedit.open({
+   filename: filename,
+   replace: form[0],
+   onclose: function(filename) {
+   if (filename) {
+   // Saved! Insert a [[File:foo]]
+   
context.$textarea.textSelection('encapsulateSelection', {
+   'pre': '[[File:',
+   'peri': filename,
+   'post': ']]',
+   'replace': true
+

[MediaWiki-commits] [Gerrit] Impl isWriteMode() for claim modules. - change (mediawiki...Wikibase)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Impl isWriteMode() for claim modules.
..


Impl isWriteMode() for claim modules.

All API modules that change the database should return true from isWriteMode().

Change-Id: If989c34bfd4ca3e50beb888507a774351e7c46b4
---
M repo/includes/api/ModifyClaim.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetClaimValue.php
4 files changed, 31 insertions(+), 10 deletions(-)

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



diff --git a/repo/includes/api/ModifyClaim.php 
b/repo/includes/api/ModifyClaim.php
index a7892a8..624254d 100644
--- a/repo/includes/api/ModifyClaim.php
+++ b/repo/includes/api/ModifyClaim.php
@@ -58,4 +58,12 @@
return $summary;
}
 
+   /**
+* @see ApiBase::isWriteMode
+* @return bool true
+*/
+   public function isWriteMode() {
+   return true;
+   }
+
 }
diff --git a/repo/includes/api/RemoveClaims.php 
b/repo/includes/api/RemoveClaims.php
index 155db87..4883629 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -44,9 +44,13 @@
  */
 class RemoveClaims extends ApiWikibase {
 
-   // TODO: example
-   // TODO: rights
-   // TODO: conflict detection
+   /**
+* @see ApiBase::isWriteMode
+* @return bool true
+*/
+   public function isWriteMode() {
+   return true;
+   }
 
/**
 * @see \ApiBase::execute
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index b724df3..bd4f131 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -48,8 +48,6 @@
  */
 class SetClaim extends ApiWikibase {
 
-   // TODO: rights
-
/**
 * @var SnakValidationHelper
 */
@@ -74,6 +72,14 @@
}
 
/**
+* @see ApiBase::isWriteMode
+* @return bool true
+*/
+   public function isWriteMode() {
+   return true;
+   }
+
+   /**
 * @see ApiBase::execute
 *
 * @since 0.4
diff --git a/repo/includes/api/SetClaimValue.php 
b/repo/includes/api/SetClaimValue.php
index c22f0b3..4204ccc 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -47,11 +47,6 @@
  */
 class SetClaimValue extends ApiWikibase implements IAutocomment{
 
-   // TODO: example
-   // TODO: rights
-   // TODO: conflict detection
-   // TODO: claim uniqueness
-
/**
 * @var SnakValidationHelper
 */
@@ -76,6 +71,14 @@
}
 
/**
+* @see ApiBase::isWriteMode
+* @return bool true
+*/
+   public function isWriteMode() {
+   return true;
+   }
+
+   /**
 * @see \ApiBase::execute
 *
 * @since 0.3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If989c34bfd4ca3e50beb888507a774351e7c46b4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Denny Vrandecic denny.vrande...@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] beta: adapt role::cache::varnish::upload - change (operations/puppet)

2013-06-27 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: beta: adapt role::cache::varnish::upload
..

beta: adapt role::cache::varnish::upload

* pass the top and upload domains down to varnish VCL via the
  cluster_options.
* points swift backend to the upload instance created by Ariel

Change-Id: I2b4231281bd224b4892c8767f98f772666397668
---
M manifests/lvs.pp
M manifests/role/cache.pp
M templates/varnish/upload-backend.inc.vcl.erb
M templates/varnish/upload-frontend.inc.vcl.erb
4 files changed, 31 insertions(+), 4 deletions(-)


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

diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index ab94e23..0f0edc9 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -413,7 +413,9 @@
'search_pool5' = {},
'search_poolbeta' = {},
'search_prefix' = {},
-   'swift' = {},
+   'swift' = {
+   'pmtpa' = '10.4.1.103',  # 
deployment-upload.pmtpa.wmflabs
+   },
'payments' = {},
'upload' = {
'pmtpa' = {
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 85d40b2..d69d306 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -681,6 +681,21 @@
 
class { varnish::htcppurger: varnish_instances = [ 
127.0.0.1:80, 127.0.0.1:3128 ] }
 
+   case $::realm {
+   'production': {
+   $cluster_options = {
+   'upload_domain' = 
'upload.wikimedia.org',
+   'top_domain'= 'org',
+   }
+   }
+   'labs': {
+   $cluster_options = {
+   'upload_domain' = 
'upload.beta.wmflabs.org',
+   'top_domain'= 'beta.wmflabs.org',
+   }
+   }
+   }
+
varnish::instance { upload-backend:
name = ,
vcl = upload-backend,
@@ -731,6 +746,7 @@
'max_connections' = 1000,
'weight' = $backend_weight,
}],
+   cluster_options = $cluster_options,
wikimedia_networks = $wikimedia_networks,
xff_sources = $network::constants::all_networks
}
@@ -772,6 +788,7 @@
'probe' = varnish,
'weight' = $backend_weight,
}],
+   cluster_options = $cluster_options,
xff_sources = $network::constants::all_networks,
}
 
diff --git a/templates/varnish/upload-backend.inc.vcl.erb 
b/templates/varnish/upload-backend.inc.vcl.erb
index 31d8722..0b62383 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -1,3 +1,7 @@
+%
+top_domain= cluster_options.fetch( 'top_domain', 'org' )
+upload_domain = cluster_options.fetch( 'upload_domain', 'upload.wikimedia.org' 
)
+-%
 # Varnish VCL include file for upload backends
 
 sub pick_main_stevedore {
@@ -62,7 +66,7 @@
else {
if (req.backend == rendering  req.url ~ 
^/[^-/]+/[^/]+/thumb/(.+)$) {
set bereq.url = regsub(req.url, 
^/[^-/]+/[^/]+/thumb/(.+)$, /w/thumb_handler.php/\1);
-   set bereq.http.host = regsub(req.url, 
^/([^-/]+)/([^/]+)/thumb/.+$, \2.\1.org);
+   set bereq.http.host = regsub(req.url, 
^/([^-/]+)/([^/]+)/thumb/.+$, \2.\1.%= Regexp.escape(top_domain) %);
set bereq.http.X-Original-URI = req.url;
 
# Exceptions
@@ -85,7 +89,7 @@
call vcl_recv_purge;
call restrict_access;
 
-   if ( req.http.host != upload.wikimedia.org) {
+   if ( req.http.host != %= upload_domain %) {
error 403 Requested target domain not allowed.;
}
 
diff --git a/templates/varnish/upload-frontend.inc.vcl.erb 
b/templates/varnish/upload-frontend.inc.vcl.erb
index 8bc6d24..beb0e1b 100644
--- a/templates/varnish/upload-frontend.inc.vcl.erb
+++ b/templates/varnish/upload-frontend.inc.vcl.erb
@@ -1,3 +1,7 @@
+%
+top_domain = cluster_options.fetch( 'top_domain', 'org' )
+upload_domain = cluster_options.fetch( 'upload_domain', 'upload.wikimedia.org' 
)
+-%
 # Varnish VCL include file for upload frontends
 
 sub vcl_recv {
@@ -8,7 +12,7 @@
error 403 HTTP

[MediaWiki-commits] [Gerrit] Prepare the bits cache manifests for the new eqiad servers - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

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


Change subject: Prepare the bits cache manifests for the new eqiad servers
..

Prepare the bits cache manifests for the new eqiad servers

Change-Id: Ic08c9d71773e19b26f3bc37807356ef1c56d0c4f
---
M manifests/role/cache.pp
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 85d40b2..9363478 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -840,6 +840,12 @@
}
}
$cluster_options = merge($common_cluster_options, 
$realm_cluster_options)
+   
+   if regsubst($::memorytotal, ^([0-9]+)\.[0-9]* GB$, \1)  96 
{
+   $memory_storage_size = 32
+   } else {
+   $memory_storage_size = 2
+   }
 
system_role { role::cache::bits: description = bits Varnish 
cache server }
 
@@ -853,7 +859,7 @@
vcl = bits,
port = 80,
admin_port = 6082,
-   storage = -s malloc,2G,
+   storage = -s malloc,${memory_storage_size}G,
directors = $varnish_directors[$cluster_tier],
director_type = random,
vcl_config = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic08c9d71773e19b26f3bc37807356ef1c56d0c4f
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] Prepare the bits cache manifests for the new eqiad servers - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Prepare the bits cache manifests for the new eqiad servers
..


Prepare the bits cache manifests for the new eqiad servers

Change-Id: Ic08c9d71773e19b26f3bc37807356ef1c56d0c4f
---
M manifests/role/cache.pp
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 85d40b2..f2490d9 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -841,6 +841,12 @@
}
$cluster_options = merge($common_cluster_options, 
$realm_cluster_options)
 
+   if regsubst($::memorytotal, ^([0-9]+)\.[0-9]* GB$, \1)  96 
{
+   $memory_storage_size = 32
+   } else {
+   $memory_storage_size = 2
+   }
+
system_role { role::cache::bits: description = bits Varnish 
cache server }
 
require geoip
@@ -853,7 +859,7 @@
vcl = bits,
port = 80,
admin_port = 6082,
-   storage = -s malloc,2G,
+   storage = -s malloc,${memory_storage_size}G,
directors = $varnish_directors[$cluster_tier],
director_type = random,
vcl_config = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic08c9d71773e19b26f3bc37807356ef1c56d0c4f
Gerrit-PatchSet: 2
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] Install cp1056/57, cp1069/70 as bits caches - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

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


Change subject: Install cp1056/57, cp1069/70 as bits caches
..

Install cp1056/57, cp1069/70 as bits caches

Change-Id: I4547fbf54d9fb4a2be21e412ac78ee42ebf7d5fa
---
M manifests/site.pp
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 2f17ce5..d886414 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -394,6 +394,16 @@
include role::cache::upload
 }
 
+node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet', 
'cp1070.eqiad.wmnet' {
+   if $::hostname =~ /^cp10[56]$/ {
+   $ganglia_aggregator = true
+   }
+
+   interface_add_ip6_mapped { main: }
+
+   include role::cache::bits
+}
+
 node /^cp300[12]\.esams\.wikimedia\.org$/ {
interface_aggregate { bond0: orig_interface = eth0, members = [ 
eth0, eth1 ] }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4547fbf54d9fb4a2be21e412ac78ee42ebf7d5fa
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] Install cp1056/57, cp1069/70 as bits caches - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Install cp1056/57, cp1069/70 as bits caches
..


Install cp1056/57, cp1069/70 as bits caches

Change-Id: I4547fbf54d9fb4a2be21e412ac78ee42ebf7d5fa
---
M manifests/site.pp
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 2f17ce5..d886414 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -394,6 +394,16 @@
include role::cache::upload
 }
 
+node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet', 
'cp1070.eqiad.wmnet' {
+   if $::hostname =~ /^cp10[56]$/ {
+   $ganglia_aggregator = true
+   }
+
+   interface_add_ip6_mapped { main: }
+
+   include role::cache::bits
+}
+
 node /^cp300[12]\.esams\.wikimedia\.org$/ {
interface_aggregate { bond0: orig_interface = eth0, members = [ 
eth0, eth1 ] }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4547fbf54d9fb4a2be21e412ac78ee42ebf7d5fa
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] (bug 44441) Testing bugzilla comments - change (test/gerrit-ping)

2013-06-27 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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


Change subject: (bug 1) Testing bugzilla comments
..

(bug 1) Testing bugzilla comments

Change-Id: I2f182643972a74364f68aac29183ece7338836d3
---
A testFile
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/test/gerrit-ping 
refs/changes/21/70821/1

diff --git a/testFile b/testFile
new file mode 100644
index 000..022ea97
--- /dev/null
+++ b/testFile
@@ -0,0 +1 @@
+testFile

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f182643972a74364f68aac29183ece7338836d3
Gerrit-PatchSet: 1
Gerrit-Project: test/gerrit-ping
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at

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

[MediaWiki-commits] [Gerrit] Update caching proxy list - change (operations/mediawiki-config)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

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


Change subject: Update caching proxy list
..

Update caching proxy list

Change-Id: I23cd6f3f84e8aca079789606c302e6dfbfae3030
---
M wmf-config/squid.php
1 file changed, 14 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/squid.php b/wmf-config/squid.php
index 81f4845..26a3555 100644
--- a/wmf-config/squid.php
+++ b/wmf-config/squid.php
@@ -121,14 +121,18 @@
# pmtpa
'208.80.152.77',# sq67
'208.80.152.78',# sq68
+   '208.80.152.79',# sq69
+   '208.80.152.80',# sq70
 
# eqiad
'208.80.154.62',# arsenic
'208.80.154.143',   # niobium
+   '10.64.32.133', # cp1056
+   '10.64.32.134', # cp1057
+   '10.64.0.106',  # cp1069
+   '10.64.0.107',  # cp1070 
 
# esams
-   '91.198.174.100',   # cp3001
-   '91.198.174.100',   # cp3002
'91.198.174.89',# cp3019
'91.198.174.90',# cp3020
'91.198.174.91',# cp3021
@@ -179,6 +183,14 @@
'10.64.0.157',  # cp1035
'10.64.0.158',  # cp1036
'10.64.32.81',  # dysprosium
+   '10.64.32.100', # cp1048
+   '10.64.32.101', # cp1049
+   '10.64.32.102', # cp1050
+   '10.64.32.103', # cp1051
+   '10.64.0.98',   # cp1061
+   '10.64.0.99',   # cp1062
+   '10.64.0.100',  # cp1063
+   '10.64.0.101',  # cp1064
 
# esams
'91.198.174.73',# cp3003
@@ -208,10 +220,6 @@
'91.198.174.84',# cp3014
 
# OTHERS - Currently unused..?
-   '10.64.0.159',  # cp1037
-   '10.64.0.160',  # cp1038
-   '10.64.0.161',  # cp1039
-   '10.64.0.162',  # cp1040
 );
 
 # IP addresses that aren't proxies, regardless of what the other sources might 
say

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23cd6f3f84e8aca079789606c302e6dfbfae3030
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] Update caching proxy list - change (operations/mediawiki-config)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Update caching proxy list
..


Update caching proxy list

Change-Id: I23cd6f3f84e8aca079789606c302e6dfbfae3030
---
M wmf-config/squid.php
1 file changed, 14 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/squid.php b/wmf-config/squid.php
index 81f4845..d4dffd9 100644
--- a/wmf-config/squid.php
+++ b/wmf-config/squid.php
@@ -121,14 +121,18 @@
# pmtpa
'208.80.152.77',# sq67
'208.80.152.78',# sq68
+   '208.80.152.79',# sq69
+   '208.80.152.80',# sq70
 
# eqiad
'208.80.154.62',# arsenic
'208.80.154.143',   # niobium
+   '10.64.32.133', # cp1056
+   '10.64.32.134', # cp1057
+   '10.64.0.106',  # cp1069
+   '10.64.0.107',  # cp1070
 
# esams
-   '91.198.174.100',   # cp3001
-   '91.198.174.100',   # cp3002
'91.198.174.89',# cp3019
'91.198.174.90',# cp3020
'91.198.174.91',# cp3021
@@ -179,6 +183,14 @@
'10.64.0.157',  # cp1035
'10.64.0.158',  # cp1036
'10.64.32.81',  # dysprosium
+   '10.64.32.100', # cp1048
+   '10.64.32.101', # cp1049
+   '10.64.32.102', # cp1050
+   '10.64.32.103', # cp1051
+   '10.64.0.98',   # cp1061
+   '10.64.0.99',   # cp1062
+   '10.64.0.100',  # cp1063
+   '10.64.0.101',  # cp1064
 
# esams
'91.198.174.73',# cp3003
@@ -208,10 +220,6 @@
'91.198.174.84',# cp3014
 
# OTHERS - Currently unused..?
-   '10.64.0.159',  # cp1037
-   '10.64.0.160',  # cp1038
-   '10.64.0.161',  # cp1039
-   '10.64.0.162',  # cp1040
 );
 
 # IP addresses that aren't proxies, regardless of what the other sources might 
say

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23cd6f3f84e8aca079789606c302e6dfbfae3030
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
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] Add the new bits servers to the $active_nodes list - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

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


Change subject: Add the new bits servers to the $active_nodes list
..

Add the new bits servers to the $active_nodes list

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


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

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index f2490d9..0ab5a49 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -123,7 +123,8 @@
},
bits = {
pmtpa = [sq67.wikimedia.org, 
sq68.wikimedia.org, sq69.wikimedia.org, sq70.wikimedia.org],
-   eqiad = [arsenic.wikimedia.org, 
niobium.wikimedia.org, strontium.eqiad.wmnet, palladium.eqiad.wmnet, ],
+   eqiad = [arsenic.wikimedia.org, 
niobium.wikimedia.org, strontium.eqiad.wmnet, palladium.eqiad.wmnet,
+   'cp1056.eqiad.wmnet', 
'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet', 'cp1070.eqiad.wmnet'],
esams = 
[cp3019.esams.wikimedia.org, cp3020.esams.wikimedia.org, 
cp3021.esams.wikimedia.org, cp3022.esams.wikimedia.org],
},
upload = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1202117a882f903c3a761254dc0aab3ed44ee19d
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] Take advantage of hook-bugzillas new event mechanism - change (operations/puppet)

2013-06-27 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: Take advantage of hook-bugzillas new event mechanism
..


Take advantage of hook-bugzillas new event mechanism

Change-Id: I12ed85cfcff51f422256768159494e6b91d198c1
---
A files/gerrit/its/action.config
A files/gerrit/its/templates/DraftPublished.vm
M manifests/gerrit.pp
3 files changed, 46 insertions(+), 0 deletions(-)

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



diff --git a/files/gerrit/its/action.config b/files/gerrit/its/action.config
new file mode 100644
index 000..c0ff55d
--- /dev/null
+++ b/files/gerrit/its/action.config
@@ -0,0 +1,18 @@
+[rule standardItsComments]
+   event-type = change-merged,change-abandoned,change-restored
+   status = !,DRAFT
+   is-draft = !,true
+   association = subject,footer-Bug
+   action = add-standard-comment
+
+[rule patchSetCreated]
+   event-type = patchset-created
+   status = !,DRAFT
+   is-draft = !,true
+   association = added@subject,added@footer-Bug
+   action = add-standard-comment
+
+[rule changeDraftPublished]
+   event-type = draft-published
+   association = subject,footer-Bug
+   action = add-velocity-comment DraftPublished
diff --git a/files/gerrit/its/templates/DraftPublished.vm 
b/files/gerrit/its/templates/DraftPublished.vm
new file mode 100644
index 000..f3821d1
--- /dev/null
+++ b/files/gerrit/its/templates/DraftPublished.vm
@@ -0,0 +1,4 @@
+Change $change-number had a related patch set (by $author-name) published:
+$subject
+
+${its.formatLink($change-url)}
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 438ea3f..2911ef7 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -181,6 +181,30 @@
group = gerrit2,
mode = 0444,
source = 
puppet:///files/gerrit/skin/GerritSiteHeader.html;
+   /var/lib/gerrit2/review_site/etc/its:
+   ensure = directory,
+   owner = gerrit2,
+   group = gerrit2,
+   mode = 0755,
+   require = File[/var/lib/gerrit2/review_site/etc];
+   /var/lib/gerrit2/review_site/etc/its/action.config:
+   source = puppet:///files/gerrit/its/action.config,
+   owner = gerrit2,
+   group = gerrit2,
+   mode = 0755,
+   require = File[/var/lib/gerrit2/review_site/etc/its];
+   /var/lib/gerrit2/review_site/etc/its/templates:
+   ensure = directory,
+   owner = gerrit2,
+   group = gerrit2,
+   mode = 0755,
+   require = File[/var/lib/gerrit2/review_site/etc/its];
+   
/var/lib/gerrit2/review_site/etc/its/templates/DraftPublished.vm:
+   source = 
puppet:///files/gerrit/its/templates/DraftPublished.vm,
+   owner = gerrit2,
+   group = gerrit2,
+   mode = 0755,
+   require = 
File[/var/lib/gerrit2/review_site/etc/its/templates];
/var/lib/gerrit2/review_site/static/page-bkg.jpg:
owner = gerrit2,
group = gerrit2,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12ed85cfcff51f422256768159494e6b91d198c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Demon ch...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add the new bits servers to the $active_nodes list - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Add the new bits servers to the $active_nodes list
..


Add the new bits servers to the $active_nodes list

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

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



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index f2490d9..0ab5a49 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -123,7 +123,8 @@
},
bits = {
pmtpa = [sq67.wikimedia.org, 
sq68.wikimedia.org, sq69.wikimedia.org, sq70.wikimedia.org],
-   eqiad = [arsenic.wikimedia.org, 
niobium.wikimedia.org, strontium.eqiad.wmnet, palladium.eqiad.wmnet, ],
+   eqiad = [arsenic.wikimedia.org, 
niobium.wikimedia.org, strontium.eqiad.wmnet, palladium.eqiad.wmnet,
+   'cp1056.eqiad.wmnet', 
'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet', 'cp1070.eqiad.wmnet'],
esams = 
[cp3019.esams.wikimedia.org, cp3020.esams.wikimedia.org, 
cp3021.esams.wikimedia.org, cp3022.esams.wikimedia.org],
},
upload = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1202117a882f903c3a761254dc0aab3ed44ee19d
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] Turn off hooks-bugzilla legacy event handling - change (operations/puppet)

2013-06-27 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: Turn off hooks-bugzilla legacy event handling
..


Turn off hooks-bugzilla legacy event handling

Change-Id: I25ad7331f058a3710f357f7f2b027d1d6bd504d1
---
M templates/gerrit/gerrit.config.erb
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/templates/gerrit/gerrit.config.erb 
b/templates/gerrit/gerrit.config.erb
index ec6e8c6..365e4be 100644
--- a/templates/gerrit/gerrit.config.erb
+++ b/templates/gerrit/gerrit.config.erb
@@ -117,10 +117,10 @@
 [bugzilla]
url = https://bugzilla.wikimedia.org
username = gerritad...@wikimedia.org
-   commentOnChangeAbandoned = true
-   commentOnChangeMerged = true
-   commentOnChangeRestored = true
-   commentOnChangeCreated = true
+   commentOnChangeAbandoned = false
+   commentOnChangeMerged = false
+   commentOnChangeRestored = false
+   commentOnChangeCreated = false
commentOnCommentAdded = false
commentOnPatchSetCreated = false
commentOnRefUpdatedGitWeb = false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25ad7331f058a3710f357f7f2b027d1d6bd504d1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Demon ch...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
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 logging in for upload wizard tests - change (qa/browsertests)

2013-06-27 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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


Change subject: Fix logging in for upload wizard tests
..

Fix logging in for upload wizard tests

Bug: 50130
Change-Id: I9ca509a2ee549549540abe53e833a4367bf2a27d
---
M features/step_definitions/upload_wizard_steps.rb
M features/support/pages/login_page.rb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/24/70824/1

diff --git a/features/step_definitions/upload_wizard_steps.rb 
b/features/step_definitions/upload_wizard_steps.rb
index 2b19ce6..66e790f 100644
--- a/features/step_definitions/upload_wizard_steps.rb
+++ b/features/step_definitions/upload_wizard_steps.rb
@@ -28,8 +28,7 @@
   on(DescribePage).title = Title #{Random.new.rand}
 end
 When(/^I navigate to Upload Wizard$/) do
-  # TODO: add more checks for this page
-  visit(UploadWizardPage).tutorial_map.should be_true
+  visit UploadWizardPage
 end
 When(/^thumbnail should be visible$/) do
   on(ReleaseRightsPage).thumbnail_element.should be_visible
diff --git a/features/support/pages/login_page.rb 
b/features/support/pages/login_page.rb
index 6890050..8993cc5 100644
--- a/features/support/pages/login_page.rb
+++ b/features/support/pages/login_page.rb
@@ -19,5 +19,6 @@
 self.username = username
 self.password = password
 login
+username_displayed_element.wait_until_present
   end
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ca509a2ee549549540abe53e833a4367bf2a27d
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] Update ganglia aggregators for bits upload caches - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Update ganglia aggregators for bits  upload caches
..


Update ganglia aggregators for bits  upload caches

Change-Id: If203a96db57279807b46f380bff13f1f592e773f
---
M manifests/ganglia.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index ac20789..465c488 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -304,8 +304,8 @@
LVS loadbalancers eqiad = 
lvs1001.wikimedia.org lvs1002.wikimedia.org,
Miscellaneous eqiad = 
carbon.wikimedia.org ms1004.eqiad.wmnet,
Mobile caches eqiad = 
cp1046.eqiad.wmnet cp1047.eqiad.wmnet,
-   Bits caches eqiad = 
arsenic.wikimedia.org niobium.wikimedia.org,
-   Upload caches eqiad = 
cp1021.eqiad.wmnet cp1022.eqiad.wmnet,
+   Bits caches eqiad = 
cp1056.eqiad.wmnet cp1057.eqiad.wmnet,
+   Upload caches eqiad = 
cp1048.eqiad.wmnet cp1049.eqiad.wmnet,
SSL cluster eqiad = 
ssl1001.wikimedia.org ssl1002.wikimedia.org,
Swift eqiad = 
ms-fe1001.eqiad.wmnet ms-fe1002.eqiad.wmnet,
Text squids eqiad = 
cp1001.eqiad.wmnet cp1002.eqiad.wmnet,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If203a96db57279807b46f380bff13f1f592e773f
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] Use force push when replicating gerrit repos to antimony (gi... - change (operations/puppet)

2013-06-27 Thread Akosiaris (Code Review)

Akosiaris has submitted this change and it was merged.

Change subject: Use force push when replicating gerrit repos to antimony 
(gitblit)
..


Use force push when replicating gerrit repos to antimony (gitblit)

We experienced error messages that replication failed due to pushed
changes not allowing fast forward.

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

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



diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index 89b8e75..0378828 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -36,7 +36,7 @@
url = 
'gerritsl...@antimony.wikimedia.org:/var/lib/git/${name}.git',
threads = 4,
authGroup = mediawiki-replication,
-   push = refs/*:refs/*,
+   push = +refs/*:refs/*,
mirror = true,
},
github = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id270d5e9faf81c2c96ca86e97013e0a24a56fa73
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Akosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Demon ch...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] Run colon escape tests in all modes - change (mediawiki...Parsoid)

2013-06-27 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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


Change subject: Run colon escape tests in all modes
..

Run colon escape tests in all modes

With a bit of tweaking these tests can actually run in all modes, so that we
get better test coverage out of them.

Change-Id: I57de0ca8eee8348d5ab1c2d9c83a986e9e40b450
---
M js/tests/parserTests.txt
1 file changed, 9 insertions(+), 12 deletions(-)


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

diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index 0b69e79..2f0c471 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -8516,46 +8516,43 @@
 !! test
 Parsoid: Serialize link to category page with colon escape
 !! options
-parsoid=html2wt
+parsoid
 !! input
 
 [[:Category:Foo]]
 [[:Category:Foo|Bar]]
 !! result
 p
-a href=Category:Foo rel=mw:WikiLinkCategory:Foo/a
-a href=Category:Foo rel=mw:WikiLinkBar/a
+a rel=mw:WikiLink href=Category:FooCategory:Foo/a
+a rel=mw:WikiLink href=Category:FooBar/a
 /p
 !! end
 
 !! test
 Parsoid: Serialize link to file page with colon escape
 !! options
-parsoid=html2wt
+parsoid
 !! input
 
 [[:File:Foo.png]]
 [[:File:Foo.png|Bar]]
 !! result
 p
-a href=File:Foo.png rel=mw:WikiLinkFile:Foo.png/a
-a href=File:Foo.png rel=mw:WikiLinkBar/a
+a rel=mw:WikiLink href=File:Foo.pngFile:Foo.png/a
+a rel=mw:WikiLink href=File:Foo.pngBar/a
 /p
 !! end
 
 !! test
 Parsoid: Serialize a genuine category link without colon escape
 !! options
-parsoid=html2wt
+parsoid
 !! input
-
 [[Category:Foo]]
 [[Category:Foo|Bar]]
 !! result
-p
-link href=Category:Foo rel=mw:WikiLink/Category
-link href=Category:Foo#Bar rel=mw:WikiLink/Category
-/p
+link rel=mw:WikiLink/Category href=Category:Foo
+link rel=mw:WikiLink/Category href=Category:Foo#Bar
 !! end
 
 ###

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57de0ca8eee8348d5ab1c2d9c83a986e9e40b450
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update ganglia aggregators for bits upload caches - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

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


Change subject: Update ganglia aggregators for bits  upload caches
..

Update ganglia aggregators for bits  upload caches

Change-Id: If203a96db57279807b46f380bff13f1f592e773f
---
M manifests/ganglia.pp
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index ac20789..465c488 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -304,8 +304,8 @@
LVS loadbalancers eqiad = 
lvs1001.wikimedia.org lvs1002.wikimedia.org,
Miscellaneous eqiad = 
carbon.wikimedia.org ms1004.eqiad.wmnet,
Mobile caches eqiad = 
cp1046.eqiad.wmnet cp1047.eqiad.wmnet,
-   Bits caches eqiad = 
arsenic.wikimedia.org niobium.wikimedia.org,
-   Upload caches eqiad = 
cp1021.eqiad.wmnet cp1022.eqiad.wmnet,
+   Bits caches eqiad = 
cp1056.eqiad.wmnet cp1057.eqiad.wmnet,
+   Upload caches eqiad = 
cp1048.eqiad.wmnet cp1049.eqiad.wmnet,
SSL cluster eqiad = 
ssl1001.wikimedia.org ssl1002.wikimedia.org,
Swift eqiad = 
ms-fe1001.eqiad.wmnet ms-fe1002.eqiad.wmnet,
Text squids eqiad = 
cp1001.eqiad.wmnet cp1002.eqiad.wmnet,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If203a96db57279807b46f380bff13f1f592e773f
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] fixes the namespace edits problem - change (analytics/wikimetrics)

2013-06-27 Thread Milimetric (Code Review)

Milimetric has uploaded a new change for review.

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


Change subject: fixes the namespace edits problem
..

fixes the namespace edits problem

Change-Id: I4b0ef46fbd67d1c39b780e8019ab25cfc316cb23
---
M wikimetrics/metrics/namespace_edits.py
M wikimetrics/static/js/jobCreate.js
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics 
refs/changes/27/70827/1

diff --git a/wikimetrics/metrics/namespace_edits.py 
b/wikimetrics/metrics/namespace_edits.py
index d3a431d..7a15627 100644
--- a/wikimetrics/metrics/namespace_edits.py
+++ b/wikimetrics/metrics/namespace_edits.py
@@ -1,7 +1,6 @@
 from flask.ext import wtf
 from sqlalchemy import func
 from metric import Metric
-from bytes_added import BytesAdded
 from wikimetrics.models import *
 import logging
 
@@ -12,7 +11,7 @@
 ]
 
 
-class NamespaceEdits(BytesAdded):
+class NamespaceEdits(Metric):
 
 This class implements namespace edits logic.
 An instance of the class is callable and will compute the number of edits
@@ -30,7 +29,7 @@
   group by rev_user
 
 
-show_in_ui  = False
+show_in_ui  = True
 id  = 'edits'
 label   = 'Edits'
 description = 'Compute the number of edits in a specific namespace of a 
mediawiki project'
@@ -42,6 +41,7 @@
 Parameters:
 namespaces  : list of namespaces to look for edits in
 
+super(Metric, self).__init__()
 self.namespaces = namespaces
 
 def __call__(self, user_ids, session):
diff --git a/wikimetrics/static/js/jobCreate.js 
b/wikimetrics/static/js/jobCreate.js
index 9cc667d..63e3c4b 100644
--- a/wikimetrics/static/js/jobCreate.js
+++ b/wikimetrics/static/js/jobCreate.js
@@ -79,7 +79,7 @@
 ko.utils.arrayForEach(request.metrics(), function(metric){
 ko.utils.arrayForEach(request.cohorts(), function(cohort){
 response = {
-name: metric.name + ' - ' + cohort.name,
+name: metric.label + ' - ' + cohort.name,
 cohort: cohort,
 metric: metric,
 tabId: 'response-to-' + metric.id + '-for-' + cohort.id,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b0ef46fbd67d1c39b780e8019ab25cfc316cb23
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] fixes the namespace edits problem - change (analytics/wikimetrics)

2013-06-27 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged.

Change subject: fixes the namespace edits problem
..


fixes the namespace edits problem

Change-Id: I4b0ef46fbd67d1c39b780e8019ab25cfc316cb23
---
M wikimetrics/metrics/namespace_edits.py
M wikimetrics/static/js/jobCreate.js
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/wikimetrics/metrics/namespace_edits.py 
b/wikimetrics/metrics/namespace_edits.py
index d3a431d..7a15627 100644
--- a/wikimetrics/metrics/namespace_edits.py
+++ b/wikimetrics/metrics/namespace_edits.py
@@ -1,7 +1,6 @@
 from flask.ext import wtf
 from sqlalchemy import func
 from metric import Metric
-from bytes_added import BytesAdded
 from wikimetrics.models import *
 import logging
 
@@ -12,7 +11,7 @@
 ]
 
 
-class NamespaceEdits(BytesAdded):
+class NamespaceEdits(Metric):
 
 This class implements namespace edits logic.
 An instance of the class is callable and will compute the number of edits
@@ -30,7 +29,7 @@
   group by rev_user
 
 
-show_in_ui  = False
+show_in_ui  = True
 id  = 'edits'
 label   = 'Edits'
 description = 'Compute the number of edits in a specific namespace of a 
mediawiki project'
@@ -42,6 +41,7 @@
 Parameters:
 namespaces  : list of namespaces to look for edits in
 
+super(Metric, self).__init__()
 self.namespaces = namespaces
 
 def __call__(self, user_ids, session):
diff --git a/wikimetrics/static/js/jobCreate.js 
b/wikimetrics/static/js/jobCreate.js
index 9cc667d..63e3c4b 100644
--- a/wikimetrics/static/js/jobCreate.js
+++ b/wikimetrics/static/js/jobCreate.js
@@ -79,7 +79,7 @@
 ko.utils.arrayForEach(request.metrics(), function(metric){
 ko.utils.arrayForEach(request.cohorts(), function(cohort){
 response = {
-name: metric.name + ' - ' + cohort.name,
+name: metric.label + ' - ' + cohort.name,
 cohort: cohort,
 metric: metric,
 tabId: 'response-to-' + metric.id + '-for-' + cohort.id,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b0ef46fbd67d1c39b780e8019ab25cfc316cb23
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update branch for Wikidata - change (mediawiki...release)

2013-06-27 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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


Change subject: Update branch for Wikidata
..

Update branch for Wikidata

Change-Id: I7e644e9b8d844ad61ff78bfea3a5ce29ef9069f0
---
M make-wmf-branch/default.conf
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf
index 2f07978..b3af766 100644
--- a/make-wmf-branch/default.conf
+++ b/make-wmf-branch/default.conf
@@ -161,10 +161,11 @@
 # a string (use that exact commit hash)
 $specialExtensions = array(
'CentralNotice' = 'wmf_deploy',
-   'DataValues' = 'mw1.22-wmf6',
-   'Diff' = 'mw1.22-wmf6',
+   'DataValues' = 'mw1.22-wmf9',
+   'Diff' = 'mw1.22-wmf9',
'MobileFrontend' = 'production',
-   'Wikibase' = 'mw1.22-wmf6',
+   'Wikibase' = 'mw1.22-wmf9',
+   'WikibaseDataModel' = 'mw1.22-wmf9',
 
// For wikitech use only!
'SemanticMediaWiki' = '1.8.x',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e644e9b8d844ad61ff78bfea3a5ce29ef9069f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] add WikibaseDataModel extension to extension-list - change (operations/mediawiki-config)

2013-06-27 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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


Change subject: add WikibaseDataModel extension to extension-list
..

add WikibaseDataModel extension to extension-list

this was split out from the Wikibase extension and is not new code

Change-Id: Ia8a612acd98e4e3ffdf4eab2c56a0d7e1df30b9b
---
M wmf-config/extension-list
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index aae9d32..ca36e63 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -142,6 +142,7 @@
 $IP/extensions/Wikibase/client/WikibaseClient.php
 $IP/extensions/Wikibase/lib/WikibaseLib.php
 $IP/extensions/Wikibase/repo/Wikibase.php
+$IP/extensions/WikibaseDataModel/WikibaseDataModel.php
 $IP/extensions/WikiEditor/WikiEditor.php
 $IP/extensions/wikihiero/wikihiero.php
 $IP/extensions/WikiLove/WikiLove.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8a612acd98e4e3ffdf4eab2c56a0d7e1df30b9b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] (bug 35607) Fix OXML type detection - change (mediawiki/core)

2013-06-27 Thread VitaliyFilippov (Code Review)

VitaliyFilippov has uploaded a new change for review.

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


Change subject: (bug 35607) Fix OXML type detection
..

(bug 35607) Fix OXML type detection

Unzip [Content_Types].xml and match its content instead of just searching
first 1024 bytes of a file for [Content_Types].xml and then detecting
individual types based on the extension.

This is needed because Open/LibreOffice saves [Content_Types].xml in the
end of OXML file. MSWord opens such files correctly, but without this patch
MW detects them as application/zip.

Side changes:
* Fix reading $tail - it couldn't be read if file size was  65558 bytes.
* Fall back to external MIME type detection after unsuccessful ZIP type
  detection instead of just returning 'application/zip' (maybe fileinfo
  knows something we don't :))

Change-Id: I3bf1d5e9d2a5521739f4f73c45ef67090931b420
---
M includes/MimeMagic.php
1 file changed, 50 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/70830/1

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 44fafcaf..696a80b 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -591,7 +591,8 @@
return 'unknown/unknown';
}
$head = fread( $f, 1024 );
-   fseek( $f, -65558, SEEK_END );
+   fseek( $f, 0, SEEK_END );
+   fseek( $f, max( 0, ftell( $f ) - 65558 ), SEEK_SET );
$tail = fread( $f, 65558 ); // 65558 = maximum size of a zip 
EOCDR
fclose( $f );
 
@@ -726,7 +727,7 @@
// Check for ZIP variants (before getimagesize)
if ( strpos( $tail, PK\x05\x06 ) !== false ) {
wfDebug( __METHOD__ . : ZIP header present in $file\n 
);
-   return $this-detectZipType( $head, $tail, $ext );
+   return $this-detectZipType( $file, $head, $tail, $ext 
);
}
 
wfSuppressWarnings();
@@ -754,6 +755,7 @@
 * header data.  Currently works for OpenDocument and OpenXML types...
 * If can't tell, returns 'application/zip'.
 *
+* @param $file   String: filename
 * @param string $header some reasonably-sized chunk of file header
 * @param $tail   String: the tail of the file
 * @param $ext Mixed: the file extension, or true to extract it from 
the filename.
@@ -762,13 +764,14 @@
 *
 * @return string
 */
-   function detectZipType( $header, $tail = null, $ext = false ) {
+   function detectZipType( $file, $header, $tail = null, $ext = false ) {
if ( $ext ) { # TODO: remove $ext param
wfDebug( __METHOD__ . : WARNING: use of the \$ext 
parameter is deprecated.  .
Use improveTypeFromExtension(\$mime, \$ext) 
instead.\n );
}
 
-   $mime = 'application/zip';
+   // Fall back to external type detection by default
+   $mime = false;
$opendocTypes = array(
'chart-template',
'chart',
@@ -793,9 +796,47 @@
 
$openxmlRegex = /^\[Content_Types\].xml/;
 
+   $openxmlTypeRegex = 
'/ContentType=[\\']?(application\/vnd\.(?:'.
+   
'openxmlformats-officedocument\.wordprocessingml\.document|'.
+   
'openxmlformats-officedocument\.wordprocessingml\.template|'.
+   'ms-word\.document\.macroEnabled\.12|'.
+   'ms-word\.template\.macroEnabled\.12|'.
+   
'openxmlformats-officedocument\.presentationml\.template|'.
+   
'openxmlformats-officedocument\.presentationml\.slideshow|'.
+   
'openxmlformats-officedocument\.presentationml\.presentation|'.
+   'ms-powerpoint\.addin\.macroEnabled\.12|'.
+   'ms-powerpoint\.presentation\.macroEnabled\.12|'.
+   'ms-powerpoint\.presentation\.macroEnabled\.12|'.
+   'ms-powerpoint\.slideshow\.macroEnabled\.12|'.
+   'openxmlformats-officedocument\.spreadsheetml\.sheet|'.
+   
'openxmlformats-officedocument\.spreadsheetml\.template|'.
+   'ms-excel\.sheet\.macroEnabled\.12|'.
+   'ms-excel\.template\.macroEnabled\.12|'.
+   'ms-excel\.addin\.macroEnabled\.12|'.
+   'ms-excel\.sheet\.binary\.macroEnabled\.12|'.
+   'ms-xpsdocument))/';
+
if ( preg_match( $opendocRegex, substr( $header, 30 ), $matches 
) ) {
+   // 'mimetype' entry is ALWAYS stored in the beginning 
of an ODF file
$mime = $matches[1];

[MediaWiki-commits] [Gerrit] JavaScript file compatibility improvements - change (mediawiki...CryoKey)

2013-06-27 Thread CryoKey (Code Review)

CryoKey has uploaded a new change for review.

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


Change subject: JavaScript file compatibility improvements
..

JavaScript file compatibility improvements

The JavaScript file now works fine for IE. Also, we're using
BeforePageDisplay and GetLocalURL::Internal (mainly for logout link
handling).

Change-Id: Ic784a576393283831b4944d53d47edf3db89efeb
---
M cryokey.js
M cryokey.php
2 files changed, 59 insertions(+), 21 deletions(-)


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

diff --git a/cryokey.js b/cryokey.js
index 92e0fb9..8a329f8 100644
--- a/cryokey.js
+++ b/cryokey.js
@@ -21,7 +21,6 @@
   throw new Error(Could not create HTTP request object.);
 }
 
-
 // Attempt to clear cached authentication information.
 function ck_logout(_url)
 {
@@ -39,28 +38,42 @@
   if (/(iPad|iPhone|iPod)/.test(navigator.userAgent))
   {
 CK_ATTEMPTS = 1;
-ck_ticket(_url, _ip, _pass);
+ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
+return;
   }
-  else
+  if (/MSIE ([0-9]{1,}[\.0-9]{0,})/.test(navigator.userAgent))
   {
-var flush = ck_get_connector();
-flush.onreadystatechange = function()
-{
-  if (flush.readyState == 4)
-  {
-CK_ATTEMPTS = 3;
-ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
-  }
-};
-flush.open(GET, https://www.cryokey.com/public/flush;, true);
-flush.send();
+document.execCommand('ClearAuthenticationCache');
+CK_ATTEMPTS = 3;
+ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
+return;
   }
+  if (window.crypto  window.crypto.logout)
+  {
+window.crypto.logout();
+CK_ATTEMPTS = 3;
+ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
+return;
+  }
+
+  var flush = ck_get_connector();
+  flush.onreadystatechange = function()
+  {
+ if (flush.readyState == 4)
+ {
+   CK_ATTEMPTS = 3;
+   ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
+ }
+  }
+  flush.open(GET, https://www.cryokey.com/public/flush;, true);
+  flush.send();
 }
 
 // Acquire a ticket from CryoKey's ticketing module.
 function ck_ticket(_url, _ip, _pass, _start, _abort, _fail)
 {
-  var ticketer = https://www.cryokey.com/private/ticket.php?mode=jsurl=; + 
escape(_url) + ip= + escape(_ip);
+  var now = new Date().getTime() / 1000;
+  var ticketer = https://www.cryokey.com/private/ticket.php?mode=jsurl=; + 
escape(_url) + ip= + escape(_ip) + skew= + now;
   var status = document.getElementById(ck_message);
 
   status.innerHTML = _start;
diff --git a/cryokey.php b/cryokey.php
index 921edb8..b90c852 100644
--- a/cryokey.php
+++ b/cryokey.php
@@ -21,6 +21,19 @@
 $wgCKAutoRegister = false;
 
 /**
+ * The CryoKey JavaScript should always be available to handle
+ * additional logout behavior. Also, the script should be in the head
+ * for the sake of logging in. In any case, the script is small, so
+ * the impact should be small as well.
+ */
+function wgck_enscript($_page, $_skin)
+{
+  $js = wgck_locate(cryokey.js);
+  $_page-addHeadItem(cryokey, script type='text/javascript' 
src='{$js}'/script);
+  return true;
+}
+
+/**
  * Check a CryoKey ticket to see if it's valid. If it's still valid,
  * then we can use it to grant access to a user.
  */
@@ -82,18 +95,17 @@
 
 /**
  * Given the current UserLogin Template module instance, add a link
- * that authenticates using CryoKey (using the Lite mechanism).
+ * that authenticates using CryoKey (using the Lite mechanism). The
+ * UserLogin Template is a direct derivative of QuickTemplate.
  */
 function wgck_form($_template)
 {
   global $wgScriptPath;
-  //global $wgRequest, $wgOut;
 
   $ip = $_SERVER['REMOTE_ADDR'];
   $icon = wgck_locate('ckicon.png');
   $service = $wgScriptPath;
   $pass = $_SERVER['PHP_SELF'];
-  $script = wgck_locate('cryokey.js');
 
   $msg_start = wfMessage('cryokey-start');
   $msg_abort = wfMessage('cryokey-abort');
@@ -104,10 +116,21 @@
   // scrubbing.
   $action = javascript:ck_initiate('{$service}', '{$ip}', '{$pass}', 
'{$msg_start}', '{$msg_abort}', '{$msg_fail}');;
   $message = span id='ck_message' . wfMessage('cryokey-label') . /span;
-  $extras = @$_template-data['extrafields'];
-  $extras .= script type='text/javascript' src='{$script}'/script;
-  $extras .= a href=\{$action}\img src='{$icon}' width='16' 
height='16'/{$message}/a;
+  $extras = @$_template-data['extrafields'] . a href=\{$action}\img 
src='{$icon}' width='16' height='16'/{$message}/a;
   $_template-set('extrafields', $extras);
+
+  return true;
+}
+
+/**
+ * Change the link URL to log out using JavaScript, if possible.
+ */
+function wgck_logout_link($_title, $_url, $_query)
+{
+  if (($_title-isSpecial(UserLogout)) || ($_title-isSpecial(Userlogout)))
+  {
+$_url = javascript:ck_logout(' . $_url . ');;
+  }
 
   return true;
 }
@@ -155,6 +178,8 @@
 return

[MediaWiki-commits] [Gerrit] JavaScript file compatibility improvements - change (mediawiki...CryoKey)

2013-06-27 Thread CryoKey (Code Review)

CryoKey has submitted this change and it was merged.

Change subject: JavaScript file compatibility improvements
..


JavaScript file compatibility improvements

The JavaScript file now works fine for IE. Also, we're using
BeforePageDisplay and GetLocalURL::Internal (mainly for logout link
handling).

Change-Id: Ic784a576393283831b4944d53d47edf3db89efeb
---
M cryokey.js
M cryokey.php
2 files changed, 59 insertions(+), 21 deletions(-)

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



diff --git a/cryokey.js b/cryokey.js
index 92e0fb9..8a329f8 100644
--- a/cryokey.js
+++ b/cryokey.js
@@ -21,7 +21,6 @@
   throw new Error(Could not create HTTP request object.);
 }
 
-
 // Attempt to clear cached authentication information.
 function ck_logout(_url)
 {
@@ -39,28 +38,42 @@
   if (/(iPad|iPhone|iPod)/.test(navigator.userAgent))
   {
 CK_ATTEMPTS = 1;
-ck_ticket(_url, _ip, _pass);
+ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
+return;
   }
-  else
+  if (/MSIE ([0-9]{1,}[\.0-9]{0,})/.test(navigator.userAgent))
   {
-var flush = ck_get_connector();
-flush.onreadystatechange = function()
-{
-  if (flush.readyState == 4)
-  {
-CK_ATTEMPTS = 3;
-ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
-  }
-};
-flush.open(GET, https://www.cryokey.com/public/flush;, true);
-flush.send();
+document.execCommand('ClearAuthenticationCache');
+CK_ATTEMPTS = 3;
+ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
+return;
   }
+  if (window.crypto  window.crypto.logout)
+  {
+window.crypto.logout();
+CK_ATTEMPTS = 3;
+ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
+return;
+  }
+
+  var flush = ck_get_connector();
+  flush.onreadystatechange = function()
+  {
+ if (flush.readyState == 4)
+ {
+   CK_ATTEMPTS = 3;
+   ck_ticket(_url, _ip, _pass, _start, _abort, _fail);
+ }
+  }
+  flush.open(GET, https://www.cryokey.com/public/flush;, true);
+  flush.send();
 }
 
 // Acquire a ticket from CryoKey's ticketing module.
 function ck_ticket(_url, _ip, _pass, _start, _abort, _fail)
 {
-  var ticketer = https://www.cryokey.com/private/ticket.php?mode=jsurl=; + 
escape(_url) + ip= + escape(_ip);
+  var now = new Date().getTime() / 1000;
+  var ticketer = https://www.cryokey.com/private/ticket.php?mode=jsurl=; + 
escape(_url) + ip= + escape(_ip) + skew= + now;
   var status = document.getElementById(ck_message);
 
   status.innerHTML = _start;
diff --git a/cryokey.php b/cryokey.php
index 921edb8..b90c852 100644
--- a/cryokey.php
+++ b/cryokey.php
@@ -21,6 +21,19 @@
 $wgCKAutoRegister = false;
 
 /**
+ * The CryoKey JavaScript should always be available to handle
+ * additional logout behavior. Also, the script should be in the head
+ * for the sake of logging in. In any case, the script is small, so
+ * the impact should be small as well.
+ */
+function wgck_enscript($_page, $_skin)
+{
+  $js = wgck_locate(cryokey.js);
+  $_page-addHeadItem(cryokey, script type='text/javascript' 
src='{$js}'/script);
+  return true;
+}
+
+/**
  * Check a CryoKey ticket to see if it's valid. If it's still valid,
  * then we can use it to grant access to a user.
  */
@@ -82,18 +95,17 @@
 
 /**
  * Given the current UserLogin Template module instance, add a link
- * that authenticates using CryoKey (using the Lite mechanism).
+ * that authenticates using CryoKey (using the Lite mechanism). The
+ * UserLogin Template is a direct derivative of QuickTemplate.
  */
 function wgck_form($_template)
 {
   global $wgScriptPath;
-  //global $wgRequest, $wgOut;
 
   $ip = $_SERVER['REMOTE_ADDR'];
   $icon = wgck_locate('ckicon.png');
   $service = $wgScriptPath;
   $pass = $_SERVER['PHP_SELF'];
-  $script = wgck_locate('cryokey.js');
 
   $msg_start = wfMessage('cryokey-start');
   $msg_abort = wfMessage('cryokey-abort');
@@ -104,10 +116,21 @@
   // scrubbing.
   $action = javascript:ck_initiate('{$service}', '{$ip}', '{$pass}', 
'{$msg_start}', '{$msg_abort}', '{$msg_fail}');;
   $message = span id='ck_message' . wfMessage('cryokey-label') . /span;
-  $extras = @$_template-data['extrafields'];
-  $extras .= script type='text/javascript' src='{$script}'/script;
-  $extras .= a href=\{$action}\img src='{$icon}' width='16' 
height='16'/{$message}/a;
+  $extras = @$_template-data['extrafields'] . a href=\{$action}\img 
src='{$icon}' width='16' height='16'/{$message}/a;
   $_template-set('extrafields', $extras);
+
+  return true;
+}
+
+/**
+ * Change the link URL to log out using JavaScript, if possible.
+ */
+function wgck_logout_link($_title, $_url, $_query)
+{
+  if (($_title-isSpecial(UserLogout)) || ($_title-isSpecial(Userlogout)))
+  {
+$_url = javascript:ck_logout(' . $_url . ');;
+  }
 
   return true;
 }
@@ -155,6 +178,8 @@
 return 
file_get_contents(https://www.cryokey.com/public/redeem.php?mode=nametid=; . 
urlencode($_tid) . from= .

[MediaWiki-commits] [Gerrit] Don't prefix an empty transclusion parameter value with a space - change (mediawiki...Parsoid)

2013-06-27 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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


Change subject: Don't prefix an empty transclusion parameter value with a space
..

Don't prefix an empty transclusion parameter value with a space

Change-Id: I225dcf06eadd57512ed2a96856604b9db7b73bae
---
M js/lib/mediawiki.WikitextSerializer.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/js/lib/mediawiki.WikitextSerializer.js 
b/js/lib/mediawiki.WikitextSerializer.js
index afdeb7f..c455a6f 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -2698,7 +2698,7 @@
if 
(!/\s$/.test(k)) {

kStr = kStr + ' ';
}
-   if 
(!/^\s/.test(v)) {
+   if 
(vStr  !/^\s/.test(v)) {

vStr = ' ' + vStr;
}
} else if 
(k.match(/\s$/)  !v.match(/^\s/)) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I225dcf06eadd57512ed2a96856604b9db7b73bae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org

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

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

2013-06-27 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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


Change subject: Update Wikidata extensions
..

Update Wikidata extensions

Change-Id: I9cb982d624433c026573a4251e75c76527f6d6ab
---
M extensions/DataValues
M extensions/Diff
M extensions/Wikibase
3 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/70833/1

diff --git a/extensions/DataValues b/extensions/DataValues
index fd5ad87..986d0b9 16
--- a/extensions/DataValues
+++ b/extensions/DataValues
-Subproject commit fd5ad877e8d7e4144c8e1e5ceb405eced2509a5d
+Subproject commit 986d0b9872c69aa51d55925d239691d03008b435
diff --git a/extensions/Diff b/extensions/Diff
index ef749a3..ff65735 16
--- a/extensions/Diff
+++ b/extensions/Diff
-Subproject commit ef749a32f4e771766cb0b0e9c4b8a1afb754770d
+Subproject commit ff65735a125e0da078f3c91d38895d6b352fb207
diff --git a/extensions/Wikibase b/extensions/Wikibase
index d14cb59..2ea52c1 16
--- a/extensions/Wikibase
+++ b/extensions/Wikibase
-Subproject commit d14cb59b6386f9e3109d34a69660338530060c34
+Subproject commit 2ea52c185c45b8996b0d0d75351f27edc709fd5c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cb982d624433c026573a4251e75c76527f6d6ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf9
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix misconfiguring of a bunch of extensions. - change (mediawiki/extensions)

2013-06-27 Thread Demon (Code Review)

Demon has submitted this change and it was merged.

Change subject: Fix misconfiguring of a bunch of extensions.
..


Fix misconfiguring of a bunch of extensions.

The format of this file is very simple, you need to add a branch = .
when adding a new extension to it.

Like every other entry.

Please copy+paste if need be.

Change-Id: I2397751c33fc06ae41a6f8690a04cc882779a004
---
M .gitmodules
1 file changed, 26 insertions(+), 0 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index cb7b711..d310663 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2139,78 +2139,104 @@
 [submodule AddMetaAndTitle]
path = AddMetaAndTitle
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AddMetaAndTitle.git
+   branch = .
 [submodule Ads]
path = Ads
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Ads.git
+   branch = .
 [submodule Annotator]
path = Annotator
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Annotator.git
+   branch = .
 [submodule AutoCreateCategoryPages]
path = AutoCreateCategoryPages
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AutoCreateCategoryPages.git
+   branch = .
 [submodule BlockAndNuke]
path = BlockAndNuke
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BlockAndNuke.git
+   branch = .
 [submodule BlueSpiceExtensions]
path = BlueSpiceExtensions
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BlueSpiceExtensions.git
+   branch = .
 [submodule BlueSpiceFoundation]
path = BlueSpiceFoundation
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BlueSpiceFoundation.git
+   branch = .
 [submodule Bootstrap]
path = Bootstrap
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Bootstrap.git
+   branch = .
 [submodule Campaigns]
path = Campaigns
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Campaigns.git
+   branch = .
 [submodule CirrusSearch]
path = CirrusSearch
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CirrusSearch.git
+   branch = .
 [submodule CommunityTwitter]
path = CommunityTwitter
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CommunityTwitter.git
+   branch = .
 [submodule CoreEvents]
path = CoreEvents
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CoreEvents.git
+   branch = .
 [submodule Duplicator]
path = Duplicator
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Duplicator.git
+   branch = .
 [submodule ExtensionStatus]
path = ExtensionStatus
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ExtensionStatus.git
+   branch = .
 [submodule ExternalArticles]
path = ExternalArticles
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ExternalArticles.git
+   branch = .
 [submodule Less]
path = Less
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Less.git
+   branch = .
 [submodule MetaDescriptionTag]
path = MetaDescriptionTag
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/MetaDescriptionTag.git
+   branch = .
 [submodule MultiAudioVideo]
path = MultiAudioVideo
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/MultiAudioVideo.git
+   branch = .
 [submodule OracleTextSearch]
path = OracleTextSearch
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/OracleTextSearch.git
+   branch = .
 [submodule QuickResponse]
path = QuickResponse
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/QuickResponse.git
+   branch = .
 [submodule RealNames]
path = RealNames
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/RealNames.git
+   branch = .
 [submodule SearchRealnames]
path = SearchRealnames
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SearchRealnames.git
+   branch = .
 [submodule WikibaseDataModel]
path = WikibaseDataModel
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseDataModel.git
+   branch = .
 [submodule WikibaseDatabase]
path = WikibaseDatabase
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseDatabase.git
+   branch = .
 [submodule WikibaseQuery]
path = WikibaseQuery
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseQuery.git
+   branch = .
 [submodule WikibaseQueryEngine]
path = WikibaseQueryEngine
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseQueryEngine.git
+   branch = .

-- 
To view, visit

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

2013-06-27 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Update Wikidata extensions
..


Update Wikidata extensions

Change-Id: I9cb982d624433c026573a4251e75c76527f6d6ab
---
M extensions/DataValues
M extensions/Diff
M extensions/Wikibase
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/DataValues b/extensions/DataValues
index fd5ad87..986d0b9 16
--- a/extensions/DataValues
+++ b/extensions/DataValues
-Subproject commit fd5ad877e8d7e4144c8e1e5ceb405eced2509a5d
+Subproject commit 986d0b9872c69aa51d55925d239691d03008b435
diff --git a/extensions/Diff b/extensions/Diff
index ef749a3..ff65735 16
--- a/extensions/Diff
+++ b/extensions/Diff
-Subproject commit ef749a32f4e771766cb0b0e9c4b8a1afb754770d
+Subproject commit ff65735a125e0da078f3c91d38895d6b352fb207
diff --git a/extensions/Wikibase b/extensions/Wikibase
index d14cb59..2ea52c1 16
--- a/extensions/Wikibase
+++ b/extensions/Wikibase
-Subproject commit d14cb59b6386f9e3109d34a69660338530060c34
+Subproject commit 2ea52c185c45b8996b0d0d75351f27edc709fd5c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cb982d624433c026573a4251e75c76527f6d6ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf9
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Reedy re...@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] script to verify Gerrit synchronization - change (mediawiki/extensions)

2013-06-27 Thread Demon (Code Review)

Demon has submitted this change and it was merged.

Change subject: script to verify Gerrit synchronization
..


script to verify Gerrit synchronization

We sometime have extensions improperly configured in either Gerrit or
the submodule file.  The check-sync.sh script would pull all extensions
from Gerrit and verify that there is no commits between their HEAD and
origin/master.

Example output with mediawiki/extensions.git at d0680b9 :

ERROR!
AutoCreateCategoryPages is lagging behind.
ERROR! Bootstrap is lagging behind.
ERROR! Campaigns is lagging behind.
ERROR! CirrusSearch is lagging behind.
ERROR! CommunityTwitter is lagging behind.
ERROR! CoreEvents is lagging behind.
ERROR! EImage is lagging behind.
ERROR! JsonData is lagging behind.
ERROR! Less is lagging behind.
ERROR! OpenStreetMapSlippyMap is lagging behind.
ERROR! PerPageLicense is lagging behind.
ERROR! QuickResponse is lagging behind.
ERROR! TimelineTable is lagging behind.
ERROR! VisualEditor is lagging behind.
ERROR! WikibaseDataModel is lagging behind.
ERROR! WikibaseQueryEngine is lagging behind.

bug: 49906
Change-Id: I1d294afb92c08f1268934eed84f0e53ab8f8dbf1
---
A check-sync.sh
1 file changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/check-sync.sh b/check-sync.sh
new file mode 100755
index 000..4c1cda8
--- /dev/null
+++ b/check-sync.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo Refreshing remote
+git pull
+echo Refreshing submodules
+git submodule update --init
+
+echo Still there? Check each modules is up to date
+git submodule --quiet foreach 'test $(git rev-list HEAD..origin/master 
--count) = 0 || echo ERROR! $path is lagging behind.'
+
+echo Done! Any ERROR! up this line should be reported in bugzilla

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d294afb92c08f1268934eed84f0e53ab8f8dbf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Demon ch...@wikimedia.org

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

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

2013-06-27 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Add WikibaseDataModel
..


Add WikibaseDataModel

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

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



diff --git a/.gitmodules b/.gitmodules
index c873dbc..c218c89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -460,3 +460,6 @@
 [submodule extensions/Validator]
path = extensions/Validator
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Validator.git
+[submodule extensions/WikibaseDataModel]
+   path = extensions/WikibaseDataModel
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseDataModel.git
diff --git a/extensions/WikibaseDataModel b/extensions/WikibaseDataModel
new file mode 16
index 000..26b7178
--- /dev/null
+++ b/extensions/WikibaseDataModel
+Subproject commit 26b7178fd2df58e73ba59e62ef6555c6d71ede46

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cafcb595220afa5e7adf417c7c34815c6047962
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf9
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

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

2013-06-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Add WikibaseDataModel
..

Add WikibaseDataModel

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


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

diff --git a/.gitmodules b/.gitmodules
index c873dbc..c218c89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -460,3 +460,6 @@
 [submodule extensions/Validator]
path = extensions/Validator
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Validator.git
+[submodule extensions/WikibaseDataModel]
+   path = extensions/WikibaseDataModel
+   url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseDataModel.git
diff --git a/extensions/WikibaseDataModel b/extensions/WikibaseDataModel
new file mode 16
index 000..26b7178
--- /dev/null
+++ b/extensions/WikibaseDataModel
+Subproject commit 26b7178fd2df58e73ba59e62ef6555c6d71ede46

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cafcb595220afa5e7adf417c7c34815c6047962
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf9
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] Fixed link URL in README - change (mediawiki...CryoKey)

2013-06-27 Thread CryoKey (Code Review)

CryoKey has uploaded a new change for review.

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


Change subject: Fixed link URL in README
..

Fixed link URL in README

The Facebook link was broken.

Change-Id: I76fa66e20048f93b7ef0217b00ad92d651baaec4
---
M README
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/README b/README
index 4686d97..23a40eb 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@
   https://www.cryokey.com
 
 On Facebook:
-  http://www.facebook.com/pages/CryoKey
+  http://www.facebook.com/CryoKey
 
 On Twitter:
   https://twitter.com/CryoKey

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76fa66e20048f93b7ef0217b00ad92d651baaec4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CryoKey
Gerrit-Branch: master
Gerrit-Owner: CryoKey cryo...@gmail.com

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

[MediaWiki-commits] [Gerrit] Correct regex - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has uploaded a new change for review.

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


Change subject: Correct regex
..

Correct regex

Change-Id: I3136eb7d5d984ac21e2fab639882a41c439ab6e2
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index d886414..1cf45f8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -395,7 +395,7 @@
 }
 
 node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet', 
'cp1070.eqiad.wmnet' {
-   if $::hostname =~ /^cp10[56]$/ {
+   if $::hostname =~ /^cp105[67]$/ {
$ganglia_aggregator = true
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3136eb7d5d984ac21e2fab639882a41c439ab6e2
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] Fixed link URL in README - change (mediawiki...CryoKey)

2013-06-27 Thread CryoKey (Code Review)

CryoKey has submitted this change and it was merged.

Change subject: Fixed link URL in README
..


Fixed link URL in README

The Facebook link was broken.

Change-Id: I76fa66e20048f93b7ef0217b00ad92d651baaec4
---
M README
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/README b/README
index 4686d97..23a40eb 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@
   https://www.cryokey.com
 
 On Facebook:
-  http://www.facebook.com/pages/CryoKey
+  http://www.facebook.com/CryoKey
 
 On Twitter:
   https://twitter.com/CryoKey

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76fa66e20048f93b7ef0217b00ad92d651baaec4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CryoKey
Gerrit-Branch: master
Gerrit-Owner: CryoKey cryo...@gmail.com
Gerrit-Reviewer: CryoKey cryo...@gmail.com

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

[MediaWiki-commits] [Gerrit] Correct regex - change (operations/puppet)

2013-06-27 Thread Mark Bergsma (Code Review)

Mark Bergsma has submitted this change and it was merged.

Change subject: Correct regex
..


Correct regex

Change-Id: I3136eb7d5d984ac21e2fab639882a41c439ab6e2
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index d886414..1cf45f8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -395,7 +395,7 @@
 }
 
 node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet', 
'cp1070.eqiad.wmnet' {
-   if $::hostname =~ /^cp10[56]$/ {
+   if $::hostname =~ /^cp105[67]$/ {
$ganglia_aggregator = true
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3136eb7d5d984ac21e2fab639882a41c439ab6e2
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] Fixup writing of newlines and done to make output consistent... - change (operations/puppet)

2013-06-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Fixup writing of newlines and done to make output consistent 
and sensible
..

Fixup writing of newlines and done to make output consistent and sensible

Updating ExtensionMessages-1.22wmf8.php...

Updating LocalisationCache for 1.22wmf8... done

becomes

Updating ExtensionMessages-1.22wmf8.php... done
Updating LocalisationCache for 1.22wmf8... done

Change-Id: Ic5e8f37975a8826482494a72fd0f3b35ce5d82cb
---
M files/scap/mw-update-l10n
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/files/scap/mw-update-l10n b/files/scap/mw-update-l10n
index 8f03f55..b0a93a5 100755
--- a/files/scap/mw-update-l10n
+++ b/files/scap/mw-update-l10n
@@ -38,13 +38,14 @@
 for i in ${mwExtVerDbSets[@]}; do
mwVerNum=${i%=*}
mwDbName=${i#*=}
-   echo Updating ExtensionMessages-$mwVerNum.php...
+   echo -n Updating ExtensionMessages-$mwVerNum.php...
mwTempDest=$(sudo -u apache mktemp)
sudo -u apache $BINDIR/mwscript mergeMessageFileList.php 
--wiki=$mwDbName \
--list-file=$MW_COMMON_SOURCE/wmf-config/extension-list $QUIET 
--output=$mwTempDest
sudo -u apache chmod a+r $mwTempDest
cp $mwTempDest 
$MW_COMMON_SOURCE/wmf-config/ExtensionMessages-$mwVerNum.php
sudo -u apache rm $mwTempDest
+   echo done
 
# Update ExtensionMessages-*.php in the local copy
sudo -u mwdeploy cp 
$MW_COMMON_SOURCE/wmf-config/ExtensionMessages-$mwVerNum.php 
$MW_COMMON/wmf-config/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5e8f37975a8826482494a72fd0f3b35ce5d82cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Add missing done to syntax/lint checking - change (operations/puppet)

2013-06-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Add missing done to syntax/lint checking
..

Add missing done to syntax/lint checking

Change-Id: I51ac8923ca2064c9ee9f1482283c72e493ead492
---
M files/scap/scap
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/files/scap/scap b/files/scap/scap
index 90f0de2..af87000 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -22,7 +22,7 @@
fi
 
# Perform syntax check
-   echo Checking syntax...
+   echo -n Checking syntax...
if ( ! ( $BINDIR/lint $MW_COMMON_SOURCE/wmf-config  $BINDIR/lint 
$MW_COMMON_SOURCE/multiversion ) ); then
echo Found syntax errors, cannot sync.
exit 1
@@ -35,6 +35,7 @@
exit 1
fi
done
+   echo  done
 
# Update the current machine so that serialization works.
# Push wikiversions.cdb changes so mwversionsinuse, set-group-write,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51ac8923ca2064c9ee9f1482283c72e493ead492
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Remove superfluous comment which is repeated in sync-wikiver... - change (operations/puppet)

2013-06-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Remove superfluous comment which is repeated in 
sync-wikiversions
..

Remove superfluous comment which is repeated in sync-wikiversions

Change-Id: Id2c16ee05698d3c83c5d8d22f2c42edabc66b577
---
M files/scap/scap
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/files/scap/scap b/files/scap/scap
index 90f0de2..1e31cdb 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -49,11 +49,10 @@
# Notify
$BINDIR/dologmsg !log $USER Started syncing Wikimedia installation... 
: $*
 
-
# Disable logging
export DOLOGMSGNOLOG=1
 
-   echo 'Copying wikiversions.dat to apaches...'
+   # Builds wikiversions.cdb and syncs it to the apaches with the dat file
sync-wikiversions
 
echo 'Copying style sheets to apaches...'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2c16ee05698d3c83c5d8d22f2c42edabc66b577
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Fix misconfiguring of a bunch of extensions. - change (mediawiki/extensions)

2013-06-27 Thread Demon (Code Review)

Demon has uploaded a new change for review.

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


Change subject: Fix misconfiguring of a bunch of extensions.
..

Fix misconfiguring of a bunch of extensions.

The format of this file is very simple, you need to add a branch = .
when adding a new extension to it.

Like every other entry.

Please copy+paste if need be.

Change-Id: I2397751c33fc06ae41a6f8690a04cc882779a004
---
M .gitmodules
1 file changed, 26 insertions(+), 0 deletions(-)


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

diff --git a/.gitmodules b/.gitmodules
index cb7b711..d310663 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2139,78 +2139,104 @@
 [submodule AddMetaAndTitle]
path = AddMetaAndTitle
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AddMetaAndTitle.git
+   branch = .
 [submodule Ads]
path = Ads
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Ads.git
+   branch = .
 [submodule Annotator]
path = Annotator
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Annotator.git
+   branch = .
 [submodule AutoCreateCategoryPages]
path = AutoCreateCategoryPages
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AutoCreateCategoryPages.git
+   branch = .
 [submodule BlockAndNuke]
path = BlockAndNuke
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BlockAndNuke.git
+   branch = .
 [submodule BlueSpiceExtensions]
path = BlueSpiceExtensions
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BlueSpiceExtensions.git
+   branch = .
 [submodule BlueSpiceFoundation]
path = BlueSpiceFoundation
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/BlueSpiceFoundation.git
+   branch = .
 [submodule Bootstrap]
path = Bootstrap
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Bootstrap.git
+   branch = .
 [submodule Campaigns]
path = Campaigns
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Campaigns.git
+   branch = .
 [submodule CirrusSearch]
path = CirrusSearch
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CirrusSearch.git
+   branch = .
 [submodule CommunityTwitter]
path = CommunityTwitter
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CommunityTwitter.git
+   branch = .
 [submodule CoreEvents]
path = CoreEvents
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CoreEvents.git
+   branch = .
 [submodule Duplicator]
path = Duplicator
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Duplicator.git
+   branch = .
 [submodule ExtensionStatus]
path = ExtensionStatus
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ExtensionStatus.git
+   branch = .
 [submodule ExternalArticles]
path = ExternalArticles
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ExternalArticles.git
+   branch = .
 [submodule Less]
path = Less
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Less.git
+   branch = .
 [submodule MetaDescriptionTag]
path = MetaDescriptionTag
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/MetaDescriptionTag.git
+   branch = .
 [submodule MultiAudioVideo]
path = MultiAudioVideo
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/MultiAudioVideo.git
+   branch = .
 [submodule OracleTextSearch]
path = OracleTextSearch
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/OracleTextSearch.git
+   branch = .
 [submodule QuickResponse]
path = QuickResponse
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/QuickResponse.git
+   branch = .
 [submodule RealNames]
path = RealNames
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/RealNames.git
+   branch = .
 [submodule SearchRealnames]
path = SearchRealnames
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SearchRealnames.git
+   branch = .
 [submodule WikibaseDataModel]
path = WikibaseDataModel
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseDataModel.git
+   branch = .
 [submodule WikibaseDatabase]
path = WikibaseDatabase
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseDatabase.git
+   branch = .
 [submodule WikibaseQuery]
path = WikibaseQuery
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseQuery.git
+   branch = .
 [submodule WikibaseQueryEngine]
path = WikibaseQueryEngine
url =

[MediaWiki-commits] [Gerrit] script to verify Gerrit synchronization - change (mediawiki/extensions)

2013-06-27 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: script to verify Gerrit synchronization
..

script to verify Gerrit synchronization

We sometime have extensions improperly configured in either Gerrit or
the submodule file.  The check-sync.sh script would pull all extensions
from Gerrit and verify that there is no commits between their HEAD and
origin/master.

Example output with mediawiki/extensions.git at d0680b9 :

ERROR!
AutoCreateCategoryPages is lagging behind.
ERROR! Bootstrap is lagging behind.
ERROR! Campaigns is lagging behind.
ERROR! CirrusSearch is lagging behind.
ERROR! CommunityTwitter is lagging behind.
ERROR! CoreEvents is lagging behind.
ERROR! EImage is lagging behind.
ERROR! JsonData is lagging behind.
ERROR! Less is lagging behind.
ERROR! OpenStreetMapSlippyMap is lagging behind.
ERROR! PerPageLicense is lagging behind.
ERROR! QuickResponse is lagging behind.
ERROR! TimelineTable is lagging behind.
ERROR! VisualEditor is lagging behind.
ERROR! WikibaseDataModel is lagging behind.
ERROR! WikibaseQueryEngine is lagging behind.

bug: 49906
Change-Id: I1d294afb92c08f1268934eed84f0e53ab8f8dbf1
---
A check-sync.sh
1 file changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/check-sync.sh b/check-sync.sh
new file mode 100755
index 000..4c1cda8
--- /dev/null
+++ b/check-sync.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo Refreshing remote
+git pull
+echo Refreshing submodules
+git submodule update --init
+
+echo Still there? Check each modules is up to date
+git submodule --quiet foreach 'test $(git rev-list HEAD..origin/master 
--count) = 0 || echo ERROR! $path is lagging behind.'
+
+echo Done! Any ERROR! up this line should be reported in bugzilla

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d294afb92c08f1268934eed84f0e53ab8f8dbf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
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] mw.ViewPageTarget: Performance improvements for section edit... - change (mediawiki...VisualEditor)

2013-06-27 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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


Change subject: mw.ViewPageTarget: Performance improvements for section edit 
links
..

mw.ViewPageTarget: Performance improvements for section edit links

Follows-up I4b9c47fd65a700a:
* Minor optimisation for closingBracketSymbol by re-using the
  reference we already have (this.lastChild) instead of digging
  into $brackets again and creating a new jQuery object for the
  second element (eq=1) and getting the text.
* Moving veSectionEditUri and sectionEditUri inline as it is
  only used once. This will allow it to be easily dereferenced
  (instead of likely staying in memory due to being claimed by
  remaining closures expand and expandSoon which will
  continue to claim and enjoy access to this scope.
  Also changed it to use the attr() callback so that we
  don't access `$editLink.attr( 'href' )` twice.
* Add various comments explaining this non-obvious approach.
  Though it makes sense (eventually) and more elaborate details
  are in the original commitmsg, that is no excuse for a 100 line
  function without a single comment, especially with all these
  things going on.
* Use shrink instead of contract (seems more common in
  context of web UI elements and less ambgiuous in English).
* Remove redundant toString in `new mw.Uri( veEditUri )`.
  Aside from redundant, it also had more overhead (serialising
  uri object to string and re-parsing). It revoked its ability
  to make an efficient clone by taking the mw.Uri object as input
  as opposed to having to parse it again. mw.Uri#clone does the
  same internally.
* Avoid variable names like $this, that or self. Using a more
  descriptive name instead.
* Re-use $closingBracket instead of using last() 3 times which
  makes 3 clones of the jQuery object with the same last element
  in it.

Change-Id: I5f093f2927b769fed0c6d1a40f99e73f9b653b9a
---
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 43 insertions(+), 35 deletions(-)


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

diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index cceba19..81afd6f 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -1070,37 +1070,40 @@
$editsections = $( '#mw-content-text .mw-editsection' ),
handler = ve.bind( this.onEditSectionLinkClick, this );
 
+   // The visibility css construct ensures we always occupy the same 
space in the layout.
+   // This prevents the heading from changing its wrap when the user 
toggles editSourceLink.
$editsections.each( function () {
-   var $brackets, $expandedOnly, $middleBracket, $hiddenBracket, 
closingBracketSymbol,
-   expandTimeout, contractTimeout,
-   $this = $( this ),
-   $heading = $this.closest( 'h1,h2,h3,h4,h5,h6' ),
-   $edit = $this.find( 'a' ).eq( 0 ),
-   $editSource = $edit.clone(),
-   $links = $edit.add( $editSource ),
+   var $expandedOnly, $middleBracket, $hiddenBracket, 
$closingBracket, closingBracketText,
+   expandTimeout, shrinkTimeout,
+   $editsection = $( this ),
+   $heading = $editsection.closest( 'h1, h2, h3, h4, h5, 
h6' ),
+   $editLink = $editsection.find( 'a' ).eq( 0 ),
+   $editSourceLink = $editLink.clone(),
+   $links = $editLink.add( $editSourceLink ),
$divider = $( 'span' ),
-   dividerSymbol = $.trim( ve.msg( 'pipe-separator' ) ),
-   veSectionEditUri = new mw.Uri( veEditUri.toString() ),
-   sectionEditUri = new mw.Uri( $edit.attr( 'href' ) );
+   dividerText = $.trim( ve.msg( 'pipe-separator' ) ),
+   $brackets = $( [ this.firstChild, this.lastChild ] );
 
function expandSoon() {
-   clearTimeout( contractTimeout );
+   // Cancel pending shrink, schedule expansion instead
+   clearTimeout( shrinkTimeout );
expandTimeout = setTimeout( expand, 100 );
}
 
-   function contractSoon() {
-   clearTimeout( expandTimeout );
-   contractTimeout = setTimeout( contract, 100 );
-   }
-
function expand() {
-   clearTimeout( contractTimeout );
+   clearTimeout( shrinkTimeout );
$middleBracket.css( 'visibility', 'hidden' );

[MediaWiki-commits] [Gerrit] triggers for pywikibot-* - change (integration/zuul-config)

2013-06-27 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: triggers for pywikibot-*
..

triggers for pywikibot-*

Only run pep8 and pyflakes for now and let them non voting.

Change-Id: I6b0b9095a7e2454953d22105782293f1b73b59e3
---
M layout.yaml
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/layout.yaml b/layout.yaml
index d389b25..e29ba46 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -2213,6 +2213,21 @@
 gate-and-submit:
   - php-wmerrors-build
 
+  - name: pywikibot/compat
+template:
+  - name: 'python-lint'
+prefix: 'pywikibot-compat'
+
+  - name: pywikibot/core
+template:
+  - name: 'python-lint'
+prefix: 'pywikibot-compat'
+
+  - name: pywikibot/i18n
+template:
+  - name: 'python-lint'
+prefix: 'pywikibot-compat'
+
   - name: qa/browsertests
 check-voter:
   - qa-browsertests-ruby1.9.3lint

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b0b9095a7e2454953d22105782293f1b73b59e3
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] triggers for pywikibot-* - change (integration/zuul-config)

2013-06-27 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: triggers for pywikibot-*
..


triggers for pywikibot-*

Only run pep8 and pyflakes for now and let them non voting.

Change-Id: I6b0b9095a7e2454953d22105782293f1b73b59e3
---
M layout.yaml
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/layout.yaml b/layout.yaml
index d389b25..e29ba46 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -2213,6 +2213,21 @@
 gate-and-submit:
   - php-wmerrors-build
 
+  - name: pywikibot/compat
+template:
+  - name: 'python-lint'
+prefix: 'pywikibot-compat'
+
+  - name: pywikibot/core
+template:
+  - name: 'python-lint'
+prefix: 'pywikibot-compat'
+
+  - name: pywikibot/i18n
+template:
+  - name: 'python-lint'
+prefix: 'pywikibot-compat'
+
   - name: qa/browsertests
 check-voter:
   - qa-browsertests-ruby1.9.3lint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b0b9095a7e2454953d22105782293f1b73b59e3
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] Convert swift's rsyncd from generic::rsyncd to the new rsync... - change (operations/puppet)

2013-06-27 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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


Change subject: Convert swift's rsyncd from generic::rsyncd to the new rsync 
module.
..

Convert swift's rsyncd from generic::rsyncd to the new rsync module.

Change-Id: I1b7d4ce3b85c4a98f0d2b2083d821f79c5960f06
---
D files/rsync/rsyncd.conf.swift
M manifests/swift.pp
2 files changed, 24 insertions(+), 23 deletions(-)


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

diff --git a/files/rsync/rsyncd.conf.swift b/files/rsync/rsyncd.conf.swift
deleted file mode 100644
index 97b9878..000
--- a/files/rsync/rsyncd.conf.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-uid = swift
-gid = swift
-log file = /var/log/rsyncd.log
-pid file = /var/run/rsyncd.pid
-
-[account]
-max connections = 2
-path = /srv/swift-storage/
-read only = false
-lock file = /var/lock/account.lock
-
-[container]
-max connections = 2
-path = /srv/swift-storage/
-read only = false
-lock file = /var/lock/container.lock
-
-[object]
-max connections = 3
-path = /srv/swift-storage/
-read only = false
-lock file = /var/lock/object.lock
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 1424fce..5afd7da 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -330,7 +330,30 @@
class config {
require swift::storage::packages
 
-   class { generic::rsyncd: config = swift }
+   include rsync::server
+   rsync::server::module {
+   account:
+   uid = 'swift',
+   gid = 'swift',
+   max_connections = '2',
+   path= '/srv/swift-storage/',
+   read_only   = 'false',
+   lock_file = '/var/lock/account.lock';
+   container:
+   uid = 'swift',
+   gid = 'swift',
+   max_connections = '2',
+   path= '/srv/swift-storage/',
+   read_only   = 'false',
+   lock_file = '/var/lock/container.lock';
+   object:
+   uid = 'swift',
+   gid = 'swift',
+   max_connections = '3',
+   path= '/srv/swift-storage/',
+   read_only   = 'false',
+   lock_file = '/var/lock/object.lock';
+   }
 
# set up swift specific configs
File { owner = swift, group = swift, mode = 0440 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b7d4ce3b85c4a98f0d2b2083d821f79c5960f06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (pywikibot/core)

2013-06-27 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


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

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I71e3f559ad18a05909fcf4d93ebaccd7dd1c8037
---
A JENKINS
A foo.py
2 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/45/70845/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/foo.py b/foo.py
new file mode 100644
index 000..e652432
--- /dev/null
+++ b/foo.py
@@ -0,0 +1 @@
+import os, sys

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71e3f559ad18a05909fcf4d93ebaccd7dd1c8037
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
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] pywikibot/* : fix gerrit names - change (integration/jenkins-job-builder-config)

2013-06-27 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: pywikibot/* : fix gerrit names
..

pywikibot/* : fix gerrit names

Change-Id: I8135e8b6ca147d36a3e30b77ab9f087998ad8d7e
---
M pywikibot.yaml
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/pywikibot.yaml b/pywikibot.yaml
index 09f5c14..60f94ed 100644
--- a/pywikibot.yaml
+++ b/pywikibot.yaml
@@ -1,6 +1,6 @@
 - project:
 name: pywikibot-compat
-gerrit-name: pywikibot-compat
+gerrit-name: pywikibot/compat
 
 jobs:
  - '{name}-pep8'
@@ -8,7 +8,7 @@
 
 - project:
 name: pywikibot-core
-gerrit-name: pywikibot-core
+gerrit-name: pywikibot/core
 
 jobs:
  - '{name}-pep8'
@@ -16,7 +16,7 @@
 
 - project:
 name: pywikibot-i18n
-gerrit-name: pywikibot-i18n
+gerrit-name: pywikibot/i18n
 
 jobs:
  - '{name}-pep8'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8135e8b6ca147d36a3e30b77ab9f087998ad8d7e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] pywikibot/* : fix gerrit names - change (integration/jenkins-job-builder-config)

2013-06-27 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: pywikibot/* : fix gerrit names
..


pywikibot/* : fix gerrit names

Change-Id: I8135e8b6ca147d36a3e30b77ab9f087998ad8d7e
---
M pywikibot.yaml
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/pywikibot.yaml b/pywikibot.yaml
index 09f5c14..60f94ed 100644
--- a/pywikibot.yaml
+++ b/pywikibot.yaml
@@ -1,6 +1,6 @@
 - project:
 name: pywikibot-compat
-gerrit-name: pywikibot-compat
+gerrit-name: pywikibot/compat
 
 jobs:
  - '{name}-pep8'
@@ -8,7 +8,7 @@
 
 - project:
 name: pywikibot-core
-gerrit-name: pywikibot-core
+gerrit-name: pywikibot/core
 
 jobs:
  - '{name}-pep8'
@@ -16,7 +16,7 @@
 
 - project:
 name: pywikibot-i18n
-gerrit-name: pywikibot-i18n
+gerrit-name: pywikibot/i18n
 
 jobs:
  - '{name}-pep8'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8135e8b6ca147d36a3e30b77ab9f087998ad8d7e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] Fix permissions of ExtensionMessages-1.XXwmfX.php (needs gro... - change (operations/puppet)

2013-06-27 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: Fix permissions of ExtensionMessages-1.XXwmfX.php (needs group 
write)
..


Fix permissions of ExtensionMessages-1.XXwmfX.php (needs group write)

Change-Id: I01b685e6bd3e2de167590b26cd4db99e04d30c08
---
M files/scap/mw-update-l10n
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/files/scap/mw-update-l10n b/files/scap/mw-update-l10n
index 8f03f55..32bb77c 100755
--- a/files/scap/mw-update-l10n
+++ b/files/scap/mw-update-l10n
@@ -42,7 +42,7 @@
mwTempDest=$(sudo -u apache mktemp)
sudo -u apache $BINDIR/mwscript mergeMessageFileList.php 
--wiki=$mwDbName \
--list-file=$MW_COMMON_SOURCE/wmf-config/extension-list $QUIET 
--output=$mwTempDest
-   sudo -u apache chmod a+r $mwTempDest
+   sudo -u apache chmod 664 $mwTempDest
cp $mwTempDest 
$MW_COMMON_SOURCE/wmf-config/ExtensionMessages-$mwVerNum.php
sudo -u apache rm $mwTempDest
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I01b685e6bd3e2de167590b26cd4db99e04d30c08
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: coren mpellet...@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] allow removing non-existing sitelinks. - change (mediawiki...Wikibase)

2013-06-27 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

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


Change subject: allow removing non-existing sitelinks.
..

allow removing non-existing sitelinks.

wbsitelinks should not report an error when trying to remove a link that isn't 
there.

Change-Id: I4d11fd89345191baf8ea4874d9fbf32e173bcf32
---
M repo/includes/api/ModifyEntity.php
M repo/includes/api/SetSiteLink.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
3 files changed, 35 insertions(+), 19 deletions(-)


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

diff --git a/repo/includes/api/ModifyEntity.php 
b/repo/includes/api/ModifyEntity.php
index fe9528b..2719811 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -191,6 +191,8 @@
$summary = $this-modifyEntity( $entityContent, $params );
 
if ( !$summary ) {
+   //XXX: This could rather be used for silent failure, 
i.e. in cases where
+   // there was simply nothing to do.
wfProfileOut( __METHOD__ );
$this-dieUsage( $this-msg( 
'wikibase-api-modify-failed' )-text(), 'modify-failed' );
}
diff --git a/repo/includes/api/SetSiteLink.php 
b/repo/includes/api/SetSiteLink.php
index 6d5392b..ca4be9a 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -75,22 +75,29 @@
$summary = $this-createSummary( $params );
$summary-setLanguage( $params['linksite'] ); //XXX: not really 
a language!
 
+   if ( !( $entityContent instanceof ItemContent ) ) {
+   wfProfileOut( __METHOD__ );
+   $this-dieUsage( The given entity is not an item, 
not-and-item );
+   }
+
+   /* @var Item $item */
+   $item = $entityContent-getItem();
+
if ( isset( $params['linksite'] )  ( $params['linktitle'] === 
'' ) ) {
+   $linksite = Utils::trimToNFC( $params['linksite'] );
+
try {
-   $link = 
$entityContent-getItem()-getSimpleSiteLink( Utils::trimToNFC( 
$params['linksite'] ) );
-   }
-   catch ( \OutOfBoundsException $exception ) {
-   wfProfileOut( __METHOD__ );
-   $this-dieUsage( $this-msg( 
'wikibase-api-remove-sitelink-failed' )-text(), 'remove-sitelink-failed' );
-   }
+   $link = $item-getSimpleSiteLink( $linksite );
+   $item-removeSiteLink( $params['linksite'] );
+   $this-addSiteLinksToResult( array( $link ), 
'entity', 'sitelinks', 'sitelink', array( 'removed' ) );
 
-   $entityContent-getItem()-removeSiteLink( 
$params['linksite'] );
-   $this-addSiteLinksToResult( array( $link ), 'entity', 
'sitelinks', 'sitelink', array( 'removed' ) );
-
-   $summary-setAction( 'remove' );
+   $summary-setAction( 'remove' );
+   } catch ( \OutOfBoundsException $exception ) {
+   // never mind then
+   }
 
wfProfileOut( __METHOD__ );
-   return $summary;
+   return $summary; // would be nice to signal nothing to 
do somehow
}
else {
$sites = $this-getSiteLinkTargetSites();
@@ -110,7 +117,7 @@
 
$link = new SimpleSiteLink( $site-getGlobalId(), $page 
);
 
-   $entityContent-getEntity()-addSimpleSiteLink( $link );
+   $item-addSimpleSiteLink( $link );
 
$this-addSiteLinksToResult( array( $link ), 'entity', 
'sitelinks', 'sitelink', array( 'url' ) );
 
diff --git a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php 
b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
index 579a0c4..082ab62 100644
--- a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
@@ -36,6 +36,7 @@
  * @group WikibaseAPI
  * @group SetSiteLinkTest
  * @group BreakingTheSlownessBarrier
+ * @group XXX
  *
  * The database group has as a side effect that temporal database tables are 
created. This makes
  * it possible to test without poisoning a production database.
@@ -186,8 +187,7 @@
array( 'site' = 'dewiki', 'title' = 'London' 
), // by sitelink
'svwiki', // not set
'', // remove the entry
-   false, // will fail
-   'should

[MediaWiki-commits] [Gerrit] remove force-message got removed from Gerrit - change (integration/zuul-config)

2013-06-27 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: remove force-message got removed from Gerrit
..

remove force-message got removed from Gerrit

Gerrit removed the force-message option which is no more needed. The
messages are always shown regardless of the Change status.

That caused any gate-and-submit to fail merging :(

bug: 50300
Change-Id: I52f0998a208eece63f5b6b84894f288b29066de8
---
M layout.yaml
1 file changed, 0 insertions(+), 8 deletions(-)


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

diff --git a/layout.yaml b/layout.yaml
index e29ba46..5a1de7d 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -166,8 +166,6 @@
 success:
   verified: 2
   code-review: 0
-  # Since people sometime force merge, force message reporting
-  force-message: True
 failure:
   verified: -1
   code-review: 0
@@ -189,8 +187,6 @@
 success:
   verified: 2
   code-review: 0
-  # Since people sometime force merge, force message reporting
-  force-message: True
   # Let Zuul merge the change \O/
   submit: true
 failure:
@@ -202,10 +198,6 @@
 manager: IndependentPipelineManager
 trigger:
   - event: change-merged
-success:
-  force-message: True
-failure:
-  force-message: True
 
   # Pipeline reacting whenever some reference is updated
   - name: post

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52f0998a208eece63f5b6b84894f288b29066de8
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] remove force-message got removed from Gerrit - change (integration/zuul-config)

2013-06-27 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged.

Change subject: remove force-message got removed from Gerrit
..


remove force-message got removed from Gerrit

Gerrit removed the force-message option which is no more needed. The
messages are always shown regardless of the Change status.

That caused any gate-and-submit to fail merging :(

bug: 50300
Change-Id: I52f0998a208eece63f5b6b84894f288b29066de8
---
M layout.yaml
1 file changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/layout.yaml b/layout.yaml
index e29ba46..5a1de7d 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -166,8 +166,6 @@
 success:
   verified: 2
   code-review: 0
-  # Since people sometime force merge, force message reporting
-  force-message: True
 failure:
   verified: -1
   code-review: 0
@@ -189,8 +187,6 @@
 success:
   verified: 2
   code-review: 0
-  # Since people sometime force merge, force message reporting
-  force-message: True
   # Let Zuul merge the change \O/
   submit: true
 failure:
@@ -202,10 +198,6 @@
 manager: IndependentPipelineManager
 trigger:
   - event: change-merged
-success:
-  force-message: True
-failure:
-  force-message: True
 
   # Pipeline reacting whenever some reference is updated
   - name: post

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52f0998a208eece63f5b6b84894f288b29066de8
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] Revert Change AbuseFilter to use UserCache instead of user_... - change (mediawiki...AbuseFilter)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Revert Change AbuseFilter to use UserCache instead of 
user_text fields
..


Revert Change AbuseFilter to use UserCache instead of user_text fields

This reverts commit aaa256aa942899c5c9cc942c2129f030476254b5.

Bug: 49918
Change-Id: I597cbc03e2ecc45cfcca632232d5bbb1ef7be9d8
---
M AbuseFilter.class.php
M Views/AbuseFilterViewDiff.php
M Views/AbuseFilterViewEdit.php
M Views/AbuseFilterViewHistory.php
M Views/AbuseFilterViewList.php
M Views/AbuseFilterViewRevert.php
M api/ApiQueryAbuseFilters.php
M api/ApiQueryAbuseLog.php
M special/SpecialAbuseLog.php
9 files changed, 32 insertions(+), 95 deletions(-)

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



diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index d7de952..46a41a0 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -957,13 +957,6 @@
 
$local_log_ids = array();
global $wgAbuseFilterNotifications, 
$wgAbuseFilterNotificationsPrivate;
-
-   $userIds = array();
-   foreach ( $log_rows as $index = $data ) {
-   $userIds[] = $data['afl_user'];
-   }
-   UserCache::singleton()-doQuery( $userIds, array(), __METHOD__ 
);
-
foreach ( $log_rows as $index = $data ) {
$data['afl_var_dump'] = $var_dump;
$data['afl_id'] = $dbw-nextSequenceValue( 
'abuse_filter_log_afl_id_seq' );
@@ -978,7 +971,7 @@
// Construct a user object
$user = new User();
$user-setId( $data['afl_user'] );
-   $user-setName( 
UserCache::singleton()-getUserName( $data['afl_user'], $data['afl_user_text'] 
) );
+   $user-setName( $data['afl_user_text'] );
$entry-setPerformer( $user );
// Set action target
$entry-setTarget( Title::makeTitle( 
$data['afl_namespace'], $data['afl_title'] ) );
diff --git a/Views/AbuseFilterViewDiff.php b/Views/AbuseFilterViewDiff.php
index af530d0..6382dba 100644
--- a/Views/AbuseFilterViewDiff.php
+++ b/Views/AbuseFilterViewDiff.php
@@ -185,7 +185,7 @@
'meta' = array(
'history_id' = $row-afh_id,
'modified_by' = $row-afh_user,
-   'modified_by_text' = 
UserCache::singleton()-getUserName( $row-afh_user, $row-afh_user_text ),
+   'modified_by_text' = $row-afh_user_text,
'modified' = $row-afh_timestamp,
),
'info' = array(
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index 8c094a4..7aab7bd 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -477,11 +477,10 @@
)
);
// Last modification details
-   $userName = UserCache::singleton()-getUserName( 
$row-af_user, $row-af_user_text );
-
$userLink =
-   Linker::userLink( $row-af_user, $userName ) .
-   Linker::userToolLinks( $row-af_user, $userName 
);
+   Linker::userLink( $row-af_user, 
$row-af_user_text ) .
+   Linker::userToolLinks( $row-af_user, 
$row-af_user_text );
+   $userName = $row-af_user_text;
$fields['abusefilter-edit-lastmod'] =
$this-msg( 'abusefilter-edit-lastmod-text' )
-rawParams(
diff --git a/Views/AbuseFilterViewHistory.php b/Views/AbuseFilterViewHistory.php
index a63e27e..60301c0 100644
--- a/Views/AbuseFilterViewHistory.php
+++ b/Views/AbuseFilterViewHistory.php
@@ -115,15 +115,6 @@
return $headers;
}
 
-   function doBatchLookups() {
-   $userIds = array();
-   foreach ( $this-mResult as $row ) {
-   $userIds[] = $row-afh_user;
-   }
-
-   UserCache::singleton()-doQuery( $userIds, array( 'userpage', 
'usertalk' ), __METHOD__ );
-   }
-
function formatValue( $name, $value ) {
$lang = $this-getLanguage();
 
@@ -139,10 +130,9 @@
$formatted = Linker::link( $title, 
$lang-timeanddate( $row-afh_timestamp, true ) );
break;
case 'afh_user_text':
-   $name = UserCache::singleton()-getUserName( 
$row-afh_user, $row-afh_user_text

[MediaWiki-commits] [Gerrit] Clean up colon escaping for wiki links - change (mediawiki...Parsoid)

2013-06-27 Thread GWicke (Code Review)

GWicke has submitted this change and it was merged.

Change subject: Clean up colon escaping for wiki links
..


Clean up colon escaping for wiki links

* Systematically colon-escape new wikilinks to pages in the category and file
  namespaces.
* Add html2wt tests for this
* Run html2wt tests by default 

Change-Id: Ib6e2cb9e8417fea21486e5143a03724831dd649e
---
M js/lib/mediawiki.WikitextSerializer.js
M js/tests/parserTests.js
M js/tests/parserTests.txt
3 files changed, 74 insertions(+), 11 deletions(-)

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



diff --git a/js/lib/mediawiki.WikitextSerializer.js 
b/js/lib/mediawiki.WikitextSerializer.js
index e405f63..afdeb7f 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -1398,6 +1398,26 @@
cb( wikitext, node );
 };
 
+/**
+ * Add a colon escape to a wikilink target string if needed.
+ */
+WSP._addColonEscape = function (linkTarget, linkData) {
+   if (linkData.target.fromsrc) {
+   return linkTarget;
+   }
+   var linkTitle = Title.fromPrefixedText(this.env, linkTarget);
+   if (linkTitle 
+   (linkTitle.ns.isCategory() || linkTitle.ns.isFile()) 
+   linkData.type === 'mw:WikiLink' 
+   !/^:/.test(linkTarget))
+   {
+   // Escape category and file links
+   return ':' + linkTarget;
+   } else {
+   return linkTarget;
+   }
+};
+
 // SSS FIXME: This doesn't deal with auto-inserted start/end tags.
 // To handle that, we have to split every 'return ...' statement into
 // openTagSrc = ...; endTagSrc = ...; and at the end of the function,
@@ -1537,22 +1557,18 @@
//console.log(linkData.content.string, canUsePipeTrick);
 
// Get nowiki/ escapes to protect against unwanted 
prefix / tail
-   var escapes = this.getLinkPrefixTailEscapes(node, env);
+   var escapes = this.getLinkPrefixTailEscapes(node, env),
+   linkTarget;
+
+
 
if ( canUseSimple ) {
// Simple case
-   var linkTarget;
if (!target.modified) {
linkTarget = target.value;
} else {
linkTarget = 
escapeWikiLinkContentString(linkData.content.string, state);
-   var linkTitle = 
Title.fromPrefixedText(env, linkData.content.string);
-   if (linkTitle 
-   
(linkTitle.ns.isCategory() || linkTitle.ns.isFile()))
-   {
-   // Escape category and file 
links
-   linkTarget = ':' + linkTarget;
-   }
+   linkTarget = 
this._addColonEscape(linkTarget, linkData);
}
 
cb( escapes.prefix + linkData.prefix + '[[' + 
linkTarget + ']]' +
@@ -1586,9 +1602,11 @@
// Protect empty link content from PST 
pipe trick
contentSrc = 'nowiki/';
}
+   linkTarget = linkData.target.value;
+   linkTarget = this._addColonEscape(linkTarget, 
linkData);
 
cb( escapes.prefix + linkData.prefix +
-   '[[' + linkData.target.value + 
'|' + contentSrc + ']]' +
+   '[[' + linkTarget + '|' + 
contentSrc + ']]' +
linkData.tail + escapes.tail, 
node );
return;
}
diff --git a/js/tests/parserTests.js b/js/tests/parserTests.js
index 5dcc2c9..b64f7d0 100755
--- a/js/tests/parserTests.js
+++ b/js/tests/parserTests.js
@@ -1354,9 +1354,9 @@
options.wt2wt = true;
options.wt2html = true;
options.html2html = true;
+   options.html2wt = true;
if ( booleanOption( options['rewrite-blacklist'] ) ) {
// turn on all modes by default for --rewrite-blacklist
-   options.html2wt = true;
options.selser = true;
// force use of the exhaustive changes file when 
creating blacklist.
options.changesin = BLACKLIST_CHANGESIN;
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index

[MediaWiki-commits] [Gerrit] New script for breakdown of uploaders per month 'new/repeat ... - change (analytics/wikistats)

2013-06-27 Thread Erik Zachte (Code Review)

Erik Zachte has uploaded a new change for review.

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


Change subject: New script for breakdown of uploaders per month 'new/repeat 
uploaders' plus 'edited earlier on other wikis or not'
..

New script for breakdown of uploaders per month 'new/repeat uploaders' plus 
'edited earlier on other wikis or not'

Change-Id: I344f6dddcf6948a82cf8a14fac8403eeb6a22ffa
---
A dumps/perl/WikiCountsOriginsUploadersCommons.pl
1 file changed, 314 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats 
refs/changes/50/70850/1

diff --git a/dumps/perl/WikiCountsOriginsUploadersCommons.pl 
b/dumps/perl/WikiCountsOriginsUploadersCommons.pl
new file mode 100644
index 000..eb51753
--- /dev/null
+++ b/dumps/perl/WikiCountsOriginsUploadersCommons.pl
@@ -0,0 +1,314 @@
+#!/usr/bin/perl
+
+  use warnings ;
+  use strict ;
+
+  our $true  = 1 ;
+  our $false = 0 ;
+
+  my $time_format = '%2d hrs %2d min %2d sec' ;
+
+# in this script 'uploads' (and, derived from that, 'uploaders') refers to new 
articles on commons, created in namespace 6
+# re-uploads are ignored (sometimes an image is uploaded again after cropping 
or other small adjustment)
+
+  my $dir_in = w:/# Out Stat1/csv_wx/ ; # QD script, hard coded path
+
+  my $file_creates_commons  = 
$dir_in/CommonsUploadersStats/CreatesCommons.csv ;
+  my $file_uploaders_per_month  = 
$dir_in/CommonsUploadersStats/CommonsUploadersPerMonth.csv ;
+  my $file_meta = 
$dir_in/CommonsUploadersStats/CommonsUploadersPerMonthMeta.txt ;
+  my $file_edits_except_commons = 
$dir_in/CommonsUploadersStats/EditsBreakdownPerUserPerMonthAllProjectsExceptCommons.csv
 ;
+  my $file_first_month_non_commons_per_user = 
$dir_in/CommonsUploadersStats/FirstEditPerUser ;
+  my $file_bots = $dir_in/CommonsUploadersStats/BotsAll.csv ;
+
+  my @bots = ReadBots ($file_bots) ;
+
+# CollectFirstEditsPerUser ($file_edits_except_commons, 
$file_first_month_non_commons_per_user) ;
+  CollectUploadersPerMonth ($file_creates_commons, $file_uploaders_per_month, 
$file_edits_except_commons, $file_first_month_non_commons_per_user, $file_meta, 
@bots) ;
+
+  print \n\nReady\n\n ;
+  exit ;
+
+
+sub ReadBots
+{
+  print ReadBots - ;
+
+  my ($file_bots) = @_ ; # function arguments
+
+  my $wiki = 'commons' ;
+  my ($line,$bots,$lang,@bots,%bots) ;
+
+  open FILE_BOTS, '', $file_bots ;
+  binmode FILE_BOTS ;
+  while ($line = FILE_BOTS)
+  {
+if ($line =~ /^$wiki/)
+{ $bots = $line ; last ; }
+  }
+  close FILE_BOTS ;
+
+  if ($bots eq '')
+  { print No line found for '$wiki' in '$file_bots'\n ; }
+  else
+  {
+chomp $bots ; # remove eol char
+($lang,$bots) = split (,, $bots,2) ;
+@bots = split ('\|', $bots) ; # split into array
+foreach my $bot (@bots)
+{ $bot =~ s/\comma;/,/g ; } # comma's in user name were encoded
+  }
+
+  print $#bots .  bots found on commons\n\n ;
+
+  return (@bots) ;
+}
+
+sub CollectFirstEditsPerUser
+{
+  my ($file_edits_except_commons, $file_first_month_non_commons_per_user) = @_ 
;
+  my ($line, $user, $month, $user_prev) ;
+
+  die File not found: '$file_edits_except_commons' if ! -e 
$file_edits_except_commons ;
+
+  open CSV_IN,  '', $file_edits_except_commons ;
+  open CSV_OUT, '', $file_first_month_non_commons_per_user || die Could not 
open '$file_first_month_non_commons_per_user' ;
+
+  $file_edits_except_commons =~ s/^.*\//..\// ; # greedy: replace all till 
last slash with '../'
+  print CSV_OUT #data based on $file_edits_except_commons\n ;
+  print CSV_OUT #user,month\n ;
+
+  $user_prev = '' ;
+  while ($line = CSV_IN)
+  {
+next if $line =~ /^#/ ;
+next if $line =~ /^\s*$/ ;
+
+($user,$month) = split (',', $line) ;
+
+if (($user ne $user_prev)  ($user_prev ne ''))
+{ print CSV_OUT $user,$month\n ; }
+$user_prev = $user ;
+  }
+
+  close CSV_IN ;
+  close CSV_OUT ;
+}
+
+sub CollectUploadersPerMonth
+{
+  my ($file_creates_commons, $file_uploaders_per_month, 
$file_edits_except_commons, $file_first_month_non_commons_per_user, $file_meta, 
@bots) = @_ ;
+
+  my 
($article_type,$mmddhhnn,$namespace,$usertype,$user,$title,$uploadwizard,
+ $line,$lines,$month, $timestart,
+ %months, %uploads_per_user_per_month, %uploads_per_month_per_user, 
%uploads_this_month_per_user,
+ %uploads_per_anonymous_user, %uploads_per_bot,
+ %first_month_on_commons_per_user, %first_month_non_commons_per_user, 
%bots) ;
+
+  # array - hash
+  foreach my $bot (@bots)
+  { $bots {$bot} = $true ; }
+
+# fields: article type,mmddhhnn,namespace,usertype,user,title,uploadwizard
+# usertype  = [A:anonymous|B:bot|R:registered user]
+# article type = [-:page contains no internal link|R:page is redirect|S:(link 
list, deprecated)|S:stub|+:normal article]
+# when processing full archive dump: count article only when it contains an 
internal link (official article

[MediaWiki-commits] [Gerrit] New script for breakdown of uploaders per month 'new/repeat ... - change (analytics/wikistats)

2013-06-27 Thread Erik Zachte (Code Review)

Erik Zachte has submitted this change and it was merged.

Change subject: New script for breakdown of uploaders per month 'new/repeat 
uploaders' plus 'edited earlier on other wikis or not'
..


New script for breakdown of uploaders per month 'new/repeat uploaders' plus 
'edited earlier on other wikis or not'

Change-Id: I344f6dddcf6948a82cf8a14fac8403eeb6a22ffa
---
A dumps/perl/WikiCountsOriginsUploadersCommons.pl
1 file changed, 314 insertions(+), 0 deletions(-)

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



diff --git a/dumps/perl/WikiCountsOriginsUploadersCommons.pl 
b/dumps/perl/WikiCountsOriginsUploadersCommons.pl
new file mode 100644
index 000..eb51753
--- /dev/null
+++ b/dumps/perl/WikiCountsOriginsUploadersCommons.pl
@@ -0,0 +1,314 @@
+#!/usr/bin/perl
+
+  use warnings ;
+  use strict ;
+
+  our $true  = 1 ;
+  our $false = 0 ;
+
+  my $time_format = '%2d hrs %2d min %2d sec' ;
+
+# in this script 'uploads' (and, derived from that, 'uploaders') refers to new 
articles on commons, created in namespace 6
+# re-uploads are ignored (sometimes an image is uploaded again after cropping 
or other small adjustment)
+
+  my $dir_in = w:/# Out Stat1/csv_wx/ ; # QD script, hard coded path
+
+  my $file_creates_commons  = 
$dir_in/CommonsUploadersStats/CreatesCommons.csv ;
+  my $file_uploaders_per_month  = 
$dir_in/CommonsUploadersStats/CommonsUploadersPerMonth.csv ;
+  my $file_meta = 
$dir_in/CommonsUploadersStats/CommonsUploadersPerMonthMeta.txt ;
+  my $file_edits_except_commons = 
$dir_in/CommonsUploadersStats/EditsBreakdownPerUserPerMonthAllProjectsExceptCommons.csv
 ;
+  my $file_first_month_non_commons_per_user = 
$dir_in/CommonsUploadersStats/FirstEditPerUser ;
+  my $file_bots = $dir_in/CommonsUploadersStats/BotsAll.csv ;
+
+  my @bots = ReadBots ($file_bots) ;
+
+# CollectFirstEditsPerUser ($file_edits_except_commons, 
$file_first_month_non_commons_per_user) ;
+  CollectUploadersPerMonth ($file_creates_commons, $file_uploaders_per_month, 
$file_edits_except_commons, $file_first_month_non_commons_per_user, $file_meta, 
@bots) ;
+
+  print \n\nReady\n\n ;
+  exit ;
+
+
+sub ReadBots
+{
+  print ReadBots - ;
+
+  my ($file_bots) = @_ ; # function arguments
+
+  my $wiki = 'commons' ;
+  my ($line,$bots,$lang,@bots,%bots) ;
+
+  open FILE_BOTS, '', $file_bots ;
+  binmode FILE_BOTS ;
+  while ($line = FILE_BOTS)
+  {
+if ($line =~ /^$wiki/)
+{ $bots = $line ; last ; }
+  }
+  close FILE_BOTS ;
+
+  if ($bots eq '')
+  { print No line found for '$wiki' in '$file_bots'\n ; }
+  else
+  {
+chomp $bots ; # remove eol char
+($lang,$bots) = split (,, $bots,2) ;
+@bots = split ('\|', $bots) ; # split into array
+foreach my $bot (@bots)
+{ $bot =~ s/\comma;/,/g ; } # comma's in user name were encoded
+  }
+
+  print $#bots .  bots found on commons\n\n ;
+
+  return (@bots) ;
+}
+
+sub CollectFirstEditsPerUser
+{
+  my ($file_edits_except_commons, $file_first_month_non_commons_per_user) = @_ 
;
+  my ($line, $user, $month, $user_prev) ;
+
+  die File not found: '$file_edits_except_commons' if ! -e 
$file_edits_except_commons ;
+
+  open CSV_IN,  '', $file_edits_except_commons ;
+  open CSV_OUT, '', $file_first_month_non_commons_per_user || die Could not 
open '$file_first_month_non_commons_per_user' ;
+
+  $file_edits_except_commons =~ s/^.*\//..\// ; # greedy: replace all till 
last slash with '../'
+  print CSV_OUT #data based on $file_edits_except_commons\n ;
+  print CSV_OUT #user,month\n ;
+
+  $user_prev = '' ;
+  while ($line = CSV_IN)
+  {
+next if $line =~ /^#/ ;
+next if $line =~ /^\s*$/ ;
+
+($user,$month) = split (',', $line) ;
+
+if (($user ne $user_prev)  ($user_prev ne ''))
+{ print CSV_OUT $user,$month\n ; }
+$user_prev = $user ;
+  }
+
+  close CSV_IN ;
+  close CSV_OUT ;
+}
+
+sub CollectUploadersPerMonth
+{
+  my ($file_creates_commons, $file_uploaders_per_month, 
$file_edits_except_commons, $file_first_month_non_commons_per_user, $file_meta, 
@bots) = @_ ;
+
+  my 
($article_type,$mmddhhnn,$namespace,$usertype,$user,$title,$uploadwizard,
+ $line,$lines,$month, $timestart,
+ %months, %uploads_per_user_per_month, %uploads_per_month_per_user, 
%uploads_this_month_per_user,
+ %uploads_per_anonymous_user, %uploads_per_bot,
+ %first_month_on_commons_per_user, %first_month_non_commons_per_user, 
%bots) ;
+
+  # array - hash
+  foreach my $bot (@bots)
+  { $bots {$bot} = $true ; }
+
+# fields: article type,mmddhhnn,namespace,usertype,user,title,uploadwizard
+# usertype  = [A:anonymous|B:bot|R:registered user]
+# article type = [-:page contains no internal link|R:page is redirect|S:(link 
list, deprecated)|S:stub|+:normal article]
+# when processing full archive dump: count article only when it contains an 
internal link (official article definition), and is not a redirect

[MediaWiki-commits] [Gerrit] Fix comparison of MW internal links - change (mediawiki...VisualEditor)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Fix comparison of MW internal links
..


Fix comparison of MW internal links

We need to normalise titles so 'user:foo_bar' == 'User:Foo bar', and
we also need to some HTML attribute removal as links from Parsoid
will have href and rel set (again, this should be fixed in by Parsoid
when the do the merging at their end).

Bug: 49985
Change-Id: I5fb5bfc69c344ca4ce4803d7b6116074648a8d7e
---
M modules/ve/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
M modules/ve/test/dm/ve.dm.mwExample.js
M modules/ve/ui/inspectors/ve.ui.MWLinkInspector.js
M modules/ve/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
4 files changed, 40 insertions(+), 4 deletions(-)

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



diff --git a/modules/ve/dm/annotations/ve.dm.MWInternalLinkAnnotation.js 
b/modules/ve/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index 9715fd6..f0368dc 100644
--- a/modules/ve/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -5,6 +5,8 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 
+/*global mw */
+
 /**
  * DataModel MediaWiki internal link annotation.
  *
@@ -36,12 +38,15 @@
// The href is simply the title, unless we're dealing with a page that 
has slashes in its name
// in which case it's preceded by one or more instances of ./ or 
../, so strip those
/*jshint regexp:false */
-   var matches = domElements[0].getAttribute( 'href' ).match( 
/^((?:\.\.?\/)*)(.*)$/ );
+   var matches = domElements[0].getAttribute( 'href' ).match( 
/^((?:\.\.?\/)*)(.*)$/ ),
+   // Normalize capitalisation and underscores
+   normalizedTitle = 
ve.dm.MWInternalLinkAnnotation.static.normalizeTitle( matches[2] );
return {
'type': 'link/mwInternal',
'attributes': {
'hrefPrefix': matches[1],
'title': decodeURIComponent( matches[2] ).replace( 
/_/g, ' ' ),
+   'normalizedTitle': normalizedTitle,
'origTitle': matches[2]
}
};
@@ -67,15 +72,35 @@
return [ domElement ];
 };
 
+/**
+ * Normalize title for comparison purposes
+ * @param {string} title Original title
+ * @returns {string} Normalized title
+ */
+ve.dm.MWInternalLinkAnnotation.static.normalizeTitle = function ( title ) {
+   var normalizedTitle = title;
+   try {
+   normalizedTitle = new mw.Title( title ).getPrefixedText();
+   } catch ( e ) {}
+   return normalizedTitle;
+};
+
 /* Methods */
 
 ve.dm.MWInternalLinkAnnotation.prototype.getComparableObject = function () {
return {
'type': this.getType(),
-   'title': this.getAttribute( 'title' )
+   'normalizedTitle': this.getAttribute( 'normalizedTitle' )
};
 };
 
+ve.dm.MWInternalLinkAnnotation.prototype.getComparableHtmlAttributes = 
function () {
+   var attributes = 
ve.dm.Annotation.prototype.getComparableHtmlAttributes.call( this );
+   delete attributes.href;
+   delete attributes.rel;
+   return attributes;
+};
+
 /* Registration */
 
 ve.dm.modelRegistry.register( ve.dm.MWInternalLinkAnnotation );
diff --git a/modules/ve/test/dm/ve.dm.mwExample.js 
b/modules/ve/test/dm/ve.dm.mwExample.js
index b06db96..480d968 100644
--- a/modules/ve/test/dm/ve.dm.mwExample.js
+++ b/modules/ve/test/dm/ve.dm.mwExample.js
@@ -497,6 +497,7 @@
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
+   'normalizedTitle': 'Bar',
'hrefPrefix': './'
},
'htmlAttributes': [ { 'values': {
@@ -512,6 +513,7 @@
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
+   'normalizedTitle': 'Bar',
'hrefPrefix': './'
},
'htmlAttributes': [ { 'values': {
@@ -527,6 +529,7 @@
'attributes': {
'title': 'Bar',
'origTitle': 'Bar',
+   'normalizedTitle': 'Bar',
'hrefPrefix': './'
},

[MediaWiki-commits] [Gerrit] Make local overlays local to surface and remove insane z-ind... - change (mediawiki...VisualEditor)

2013-06-27 Thread Robmoen (Code Review)

Robmoen has uploaded a new change for review.

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


Change subject: Make local overlays local to surface and remove insane z-indexes
..

Make local overlays local to surface and remove insane z-indexes

ve.ui.Surface.js
* Make local overlay a child of ve-ui-surface and a sibling to ve-ce-surface 
elements.
** This keeps local overlays relative to their surface and eliminates the need 
for insane
z-indexes.

ve.ui.PopupWidget.js
* PopupWidget boundaries are now relative to ve-ce-surface and no longer 
protrude out

ve.ce.Node.css, ve.ui.Window.css
* Removal or replacement of insane z-indexes.

ve.ce.FocusableNode.js, ve.ce.ProtectedNode.js, ve.ce.ResizableNode.js, 
ve.ui.Context.js
* Translate offsets from local overlay

ve.init.mw.ViewPageTarget-monobook.css, ve.init.mw.ViewPageTarget-vector.css
* Skin specific z-indexes for global overlay

ve.init.mw.ViewPageTarget.js
* Applied direction specific mw class to ce.Surface vs ui.Surface to prevent mw 
content styles
from being applied to ui elements.

ve.ui.Dialog.css
* Adjustments to surface inside of dialog so that relative offsets for local 
overlays can be
properly calculated.

ve.ui.Surface.css
* Explicitly force .ve-ui-surface to be relative so that it's children can be 
relatively positioned.

ve.ui.Widget.css
* Removal of unnecessary font-size properties now that local overlay is sibling 
of surface.

ve.js
* Added get relative position helper method to translate position offsets from 
target parent

Bug: 50241
Change-Id: Ibadce404a2286bc5dcec48f0d9da89004dbbd867
---
M modules/ve/ce/styles/ve.ce.Node.css
M modules/ve/ce/ve.ce.FocusableNode.js
M modules/ve/ce/ve.ce.ProtectedNode.js
M modules/ve/ce/ve.ce.ResizableNode.js
M modules/ve/init/mw/styles/ve.init.mw.ViewPageTarget-monobook.css
M modules/ve/init/mw/styles/ve.init.mw.ViewPageTarget-vector.css
M modules/ve/init/mw/styles/ve.init.mw.ViewPageTarget.css
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
M modules/ve/ui/styles/ve.ui.Dialog.css
M modules/ve/ui/styles/ve.ui.Surface.css
M modules/ve/ui/styles/ve.ui.Tool.css
M modules/ve/ui/styles/ve.ui.Widget.css
M modules/ve/ui/styles/ve.ui.Window.css
M modules/ve/ui/ve.ui.Context.js
M modules/ve/ui/ve.ui.Surface.js
M modules/ve/ui/widgets/ve.ui.PopupWidget.js
M modules/ve/ui/widgets/ve.ui.TextInputMenuWidget.js
M modules/ve/ve.js
18 files changed, 61 insertions(+), 31 deletions(-)


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

diff --git a/modules/ve/ce/styles/ve.ce.Node.css 
b/modules/ve/ce/styles/ve.ce.Node.css
index fb17953..1cab4fd 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -80,7 +80,7 @@
 }
 
 .ve-ce-resizableNode-handles-resizing {
-   z-index: 1;
+   z-index: 2;
 }
 
 .ve-ce-resizableNode-handles div {
diff --git a/modules/ve/ce/ve.ce.FocusableNode.js 
b/modules/ve/ce/ve.ce.FocusableNode.js
index 9b7c7ca..5178062 100644
--- a/modules/ve/ce/ve.ce.FocusableNode.js
+++ b/modules/ve/ce/ve.ce.FocusableNode.js
@@ -126,7 +126,7 @@
 
this.$.find( '*' ).add( this.$ ).each(
ve.bind( function( i, element ) {
-   elementOffset = $( element ).offset();
+   elementOffset = ve.getRelativePosition( $( element ), 
this.getRoot().getSurface().getSurface().$ );
this.$highlights = this.$highlights.add(
$( 'div' )
.css( {
diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js 
b/modules/ve/ce/ve.ce.ProtectedNode.js
index e01befb..a14cbf0 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -232,7 +232,7 @@
this.$.find( '.ve-ce-protectedNode-shield' ).each(
ve.bind( function ( i, element ) {
var $shield = $( element ),
-   offset = $shield.offset();
+   offset = ve.getRelativePosition( $shield, 
this.getRoot().getSurface().getSurface().$ );
this.$phantoms.eq( i ).css( {
'top': offset.top,
'left': offset.left,
diff --git a/modules/ve/ce/ve.ce.ResizableNode.js 
b/modules/ve/ce/ve.ce.ResizableNode.js
index 3d0c91a..56dfee3 100644
--- a/modules/ve/ce/ve.ce.ResizableNode.js
+++ b/modules/ve/ce/ve.ce.ResizableNode.js
@@ -59,7 +59,7 @@
  * @method
  */
 ve.ce.ResizableNode.prototype.onResizableFocus = function () {
-   var offset = this.$resizable.offset();
+   var offset = ve.getRelativePosition( this.$resizable, 
this.getRoot().getSurface().getSurface().$ );
 
this.$resizeHandles
.css( {
diff --git a/modules/ve/init/mw/styles/ve.init.mw.ViewPageTarget-monobook.css

[MediaWiki-commits] [Gerrit] Update Wikibase to head of mw1.22-wmf6 - change (mediawiki/core)

2013-06-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Update Wikibase to head of mw1.22-wmf6
..

Update Wikibase to head of mw1.22-wmf6

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/70852/1

diff --git a/extensions/Wikibase b/extensions/Wikibase
index 3edae87..d14cb59 16
--- a/extensions/Wikibase
+++ b/extensions/Wikibase
-Subproject commit 3edae87d47eefb2c93a637850c830d0e66a9
+Subproject commit d14cb59b6386f9e3109d34a69660338530060c34

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib88a2194e2d149fab7f7b62ab0f370a810673faa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf7
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] Update Wikibase to head of mw1.22-wmf6 - change (mediawiki/core)

2013-06-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Update Wikibase to head of mw1.22-wmf6
..

Update Wikibase to head of mw1.22-wmf6

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


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

diff --git a/extensions/Wikibase b/extensions/Wikibase
index 3edae87..d14cb59 16
--- a/extensions/Wikibase
+++ b/extensions/Wikibase
-Subproject commit 3edae87d47eefb2c93a637850c830d0e66a9
+Subproject commit d14cb59b6386f9e3109d34a69660338530060c34

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dcca3236d3ecb53442bccbc8756f8c69fd96957
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf8
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] Update Wikibase to head of mw1.22-wmf6 - change (mediawiki/core)

2013-06-27 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Update Wikibase to head of mw1.22-wmf6
..


Update Wikibase to head of mw1.22-wmf6

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

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



diff --git a/extensions/Wikibase b/extensions/Wikibase
index 3edae87..d14cb59 16
--- a/extensions/Wikibase
+++ b/extensions/Wikibase
-Subproject commit 3edae87d47eefb2c93a637850c830d0e66a9
+Subproject commit d14cb59b6386f9e3109d34a69660338530060c34

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib88a2194e2d149fab7f7b62ab0f370a810673faa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf7
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update Wikibase to head of mw1.22-wmf6 - change (mediawiki/core)

2013-06-27 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Update Wikibase to head of mw1.22-wmf6
..


Update Wikibase to head of mw1.22-wmf6

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

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



diff --git a/extensions/Wikibase b/extensions/Wikibase
index 3edae87..d14cb59 16
--- a/extensions/Wikibase
+++ b/extensions/Wikibase
-Subproject commit 3edae87d47eefb2c93a637850c830d0e66a9
+Subproject commit d14cb59b6386f9e3109d34a69660338530060c34

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dcca3236d3ecb53442bccbc8756f8c69fd96957
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf8
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Run colon escape tests in all modes - change (mediawiki...Parsoid)

2013-06-27 Thread GWicke (Code Review)

GWicke has submitted this change and it was merged.

Change subject: Run colon escape tests in all modes
..


Run colon escape tests in all modes

With a bit of tweaking these tests can actually run in all modes, so that we
get better test coverage out of them. 

Change-Id: I57de0ca8eee8348d5ab1c2d9c83a986e9e40b450
---
M js/tests/parserTests.txt
1 file changed, 9 insertions(+), 12 deletions(-)

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



diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index 0b69e79..2f0c471 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -8516,46 +8516,43 @@
 !! test
 Parsoid: Serialize link to category page with colon escape
 !! options
-parsoid=html2wt
+parsoid
 !! input
 
 [[:Category:Foo]]
 [[:Category:Foo|Bar]]
 !! result
 p
-a href=Category:Foo rel=mw:WikiLinkCategory:Foo/a
-a href=Category:Foo rel=mw:WikiLinkBar/a
+a rel=mw:WikiLink href=Category:FooCategory:Foo/a
+a rel=mw:WikiLink href=Category:FooBar/a
 /p
 !! end
 
 !! test
 Parsoid: Serialize link to file page with colon escape
 !! options
-parsoid=html2wt
+parsoid
 !! input
 
 [[:File:Foo.png]]
 [[:File:Foo.png|Bar]]
 !! result
 p
-a href=File:Foo.png rel=mw:WikiLinkFile:Foo.png/a
-a href=File:Foo.png rel=mw:WikiLinkBar/a
+a rel=mw:WikiLink href=File:Foo.pngFile:Foo.png/a
+a rel=mw:WikiLink href=File:Foo.pngBar/a
 /p
 !! end
 
 !! test
 Parsoid: Serialize a genuine category link without colon escape
 !! options
-parsoid=html2wt
+parsoid
 !! input
-
 [[Category:Foo]]
 [[Category:Foo|Bar]]
 !! result
-p
-link href=Category:Foo rel=mw:WikiLink/Category
-link href=Category:Foo#Bar rel=mw:WikiLink/Category
-/p
+link rel=mw:WikiLink/Category href=Category:Foo
+link rel=mw:WikiLink/Category href=Category:Foo#Bar
 !! end
 
 ###

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57de0ca8eee8348d5ab1c2d9c83a986e9e40b450
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Adding Adam Baso to stats group on analytics nodes - change (operations/puppet)

2013-06-27 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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


Change subject: Adding Adam Baso to stats group on analytics nodes
..

Adding Adam Baso to stats group on analytics nodes

Change-Id: Ic3b55dbb5df8d284e03b4ebc22ad2e7ae951b336
---
M manifests/role/analytics.pp
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 7738e0d..9a8bfc5 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -70,6 +70,7 @@
 User|title == olivneh| { groups + [ stats ] }
 User|title == otto|{ groups + [ stats ] }
 User|title == spetrea| { groups + [ stats ] }
+User|title == abaso|   { groups + [ stats ] }
 
 # Diederik, David and Otto have sudo privileges on Analytics nodes.
 sudo_user { [ diederik, dsc, otto ]: privileges = ['ALL = (ALL) 
NOPASSWD: ALL'] }

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

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

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

[MediaWiki-commits] [Gerrit] Adding Adam Baso to stats group on analytics nodes - change (operations/puppet)

2013-06-27 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Adding Adam Baso to stats group on analytics nodes
..


Adding Adam Baso to stats group on analytics nodes

Change-Id: Ic3b55dbb5df8d284e03b4ebc22ad2e7ae951b336
---
M manifests/role/analytics.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 7738e0d..9a8bfc5 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -70,6 +70,7 @@
 User|title == olivneh| { groups + [ stats ] }
 User|title == otto|{ groups + [ stats ] }
 User|title == spetrea| { groups + [ stats ] }
+User|title == abaso|   { groups + [ stats ] }
 
 # Diederik, David and Otto have sudo privileges on Analytics nodes.
 sudo_user { [ diederik, dsc, otto ]: privileges = ['ALL = (ALL) 
NOPASSWD: ALL'] }

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

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

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

[MediaWiki-commits] [Gerrit] Adding diff link to talk page notifications for email - change (mediawiki...Echo)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Adding diff link to talk page notifications for email
..


Adding diff link to talk page notifications for email

We'll also be adding diff links for the flyout and archive, but
not in this change.

Bug: 48183
Change-Id: Iacd269a489c93b4fc4d28306915658fad372f50d
---
M Echo.i18n.php
M Echo.php
2 files changed, 13 insertions(+), 10 deletions(-)

Approvals:
  Bsitu: Looks good to me, approved
  EBernhardson (WMF): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/Echo.i18n.php b/Echo.i18n.php
index 31ef5fc..2f7de57 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -87,15 +87,17 @@
'notification-reverted2' = 'Your {{PLURAL:$4|edit on [[:$2]] has|edits 
on [[:$2]] have}} been {{GENDER:$1|reverted}} by [[User:$1|$1]] $3',
'notification-reverted-flyout2' = 'Your {{PLURAL:$4|edit on b$2/b 
has|edits on b$2/b have}} been {{GENDER:$1|reverted}} by b$1/b $3',
'notification-edit-talk-page-email-subject2' = 'You have a new 
talkpage message on {{SITENAME}}',
-   'notification-edit-talk-page-email-body2' = '$1
+   'notification-edit-talk-page-email-body3' = '$1
 
 $3
 
-View more:
-
+View your talk page:
 $2
 
-$4',
+View this change:
+$4
+
+$5',
'notification-edit-talk-page-email-batch-body2' = '$1 
{{GENDER:$1|posted}} on your talk page',
'notification-page-linked-email-subject' = 'A page you started was 
linked on {{SITENAME}}',
'notification-page-linked-email-body' = '$1
@@ -288,7 +290,7 @@
'notification-edit-talk-page2' = Format for displaying notifications 
of a user talk page being edited
 * $1 is the username of the person who edited, plain text. Can be used for 
GENDER.
 * $2 is the current user's name, used in the link to their talk page.
-* $3 is the section title of the discussion, if any, used in the link to their 
talk page
+* $3 is the section title of the discussion, if any, used in the link to their 
talk page.
 See also:
 * {{msg-mw|Notification-edit-talk-page-flyout2}}
 * {{msg-mw|Notification-add-talkpage-topic2}},
@@ -379,11 +381,12 @@
 * $4 is the number of edits that were reverted. NOTE: This will only be set to 
1 or 2, with 2 actually meaning 'an unknown number greater than 0'.
 {{Related|Notification-reverted}},
'notification-edit-talk-page-email-subject2' = 'E-mail subject.',
-   'notification-edit-talk-page-email-body2' = 'E-mail notification. 
Parameters:
+   'notification-edit-talk-page-email-body3' = E-mail notification. 
Parameters:
 * $1 - the email intro, could be 
{{msg-mw|notification-edit-talk-page-email-batch-body2}} or 
{{msg-mw|notification-edit-user-talk-email-batch-bundle-body}}
-* $2 - a link to a change
+* $2 - a link to the user's talk page
 * $3 - the edit summary
-* $4 - the e-mail footer, {{msg-mw|echo-email-footer-default}}',
+* $4 - a link to the 'diff view' of the changes that were made
+* $5 - the e-mail footer, {{msg-mw|echo-email-footer-default}},
'notification-edit-talk-page-email-batch-body2' = 'E-mail notification 
for talk page edit
 * $1 is a username
 
diff --git a/Echo.php b/Echo.php
index 6fdfb93..bbe29fa 100755
--- a/Echo.php
+++ b/Echo.php
@@ -432,8 +432,8 @@
'flyout-message' = 'notification-edit-talk-page-flyout2',
'flyout-params' = array( 'agent', 'user', 'subject-anchor' ),
'email-subject-message' = 
'notification-edit-talk-page-email-subject2',
-   'email-body-message' = 
'notification-edit-talk-page-email-body2',
-   'email-body-params' = array( 'email-intro', 'titlelink', 
'summary', 'email-footer' ),
+   'email-body-message' = 
'notification-edit-talk-page-email-body3',
+   'email-body-params' = array( 'email-intro', 'titlelink', 
'summary', 'difflink', 'email-footer' ),
'email-body-batch-message' = 
'notification-edit-talk-page-email-batch-body2',
'email-body-batch-params' = array( 'agent' ),
'email-body-batch-bundle-message' = 
'notification-edit-user-talk-email-batch-bundle-body',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacd269a489c93b4fc4d28306915658fad372f50d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: EBernhardson (WMF) ebernhard...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Don't prefix an empty transclusion parameter value with a space - change (mediawiki...Parsoid)

2013-06-27 Thread jenkins-bot (Code Review)

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

Change subject: Don't prefix an empty transclusion parameter value with a space
..


Don't prefix an empty transclusion parameter value with a space

Change-Id: I225dcf06eadd57512ed2a96856604b9db7b73bae
---
M js/lib/mediawiki.WikitextSerializer.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/js/lib/mediawiki.WikitextSerializer.js 
b/js/lib/mediawiki.WikitextSerializer.js
index afdeb7f..03f0e60 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -2698,10 +2698,10 @@
if 
(!/\s$/.test(k)) {

kStr = kStr + ' ';
}
-   if 
(!/^\s/.test(v)) {
+   if 
(vStr  !/^\s/.test(v)) {

vStr = ' ' + vStr;
}
-   } else if 
(k.match(/\s$/)  !v.match(/^\s/)) {
+   } else if 
(k.match(/\s$/)  vStr  !v.match(/^\s/)) {
// Only 
prefix value with space if key
// ends 
with space too
vStr = 
' ' + vStr;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I225dcf06eadd57512ed2a96856604b9db7b73bae
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@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] test2wiki to 1.22wmf9 - change (operations/mediawiki-config)

2013-06-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: test2wiki to 1.22wmf9
..

test2wiki to 1.22wmf9

Add symlinks

Change-Id: I6b3b6052f7d2803b550bfcbb2ef0b6df02be4560
---
A docroot/bits/static-1.22wmf9/extensions
A docroot/bits/static-1.22wmf9/resources
A docroot/bits/static-1.22wmf9/skins
A w/static-1.22wmf9/extensions
A w/static-1.22wmf9/resources
A w/static-1.22wmf9/skins
M wikiversions.dat
7 files changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/docroot/bits/static-1.22wmf9/extensions 
b/docroot/bits/static-1.22wmf9/extensions
new file mode 12
index 000..5a2cb9f
--- /dev/null
+++ b/docroot/bits/static-1.22wmf9/extensions
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/extensions
\ No newline at end of file
diff --git a/docroot/bits/static-1.22wmf9/resources 
b/docroot/bits/static-1.22wmf9/resources
new file mode 12
index 000..ce9ea16
--- /dev/null
+++ b/docroot/bits/static-1.22wmf9/resources
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/resources
\ No newline at end of file
diff --git a/docroot/bits/static-1.22wmf9/skins 
b/docroot/bits/static-1.22wmf9/skins
new file mode 12
index 000..3c4a2bf
--- /dev/null
+++ b/docroot/bits/static-1.22wmf9/skins
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/skins/
\ No newline at end of file
diff --git a/w/static-1.22wmf9/extensions b/w/static-1.22wmf9/extensions
new file mode 12
index 000..5a2cb9f
--- /dev/null
+++ b/w/static-1.22wmf9/extensions
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/extensions
\ No newline at end of file
diff --git a/w/static-1.22wmf9/resources b/w/static-1.22wmf9/resources
new file mode 12
index 000..ce9ea16
--- /dev/null
+++ b/w/static-1.22wmf9/resources
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/resources
\ No newline at end of file
diff --git a/w/static-1.22wmf9/skins b/w/static-1.22wmf9/skins
new file mode 12
index 000..d6279b2
--- /dev/null
+++ b/w/static-1.22wmf9/skins
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/skins
\ No newline at end of file
diff --git a/wikiversions.dat b/wikiversions.dat
index 787f878..ba92cf8 100644
--- a/wikiversions.dat
+++ b/wikiversions.dat
@@ -731,7 +731,7 @@
 tawikisource php-1.22wmf8 *
 tawiktionary php-1.22wmf8 *
 tenwiki php-1.22wmf8 *
-test2wiki php-1.22wmf8 *
+test2wiki php-1.22wmf9 *
 testwiki php-1.22wmf8 *
 testwikidatawiki php-1.22wmf8 *
 tetwiki php-1.22wmf7 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b3b6052f7d2803b550bfcbb2ef0b6df02be4560
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] testwiki, mediawikiwiki and testwikidatawiki to 1.22wmf9 - change (operations/mediawiki-config)

2013-06-27 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: testwiki, mediawikiwiki and testwikidatawiki to 1.22wmf9
..

testwiki, mediawikiwiki and testwikidatawiki to 1.22wmf9

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


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

diff --git a/wikiversions.dat b/wikiversions.dat
index ba92cf8..3b9258d 100644
--- a/wikiversions.dat
+++ b/wikiversions.dat
@@ -1,200 +1,200 @@
 aawikibooks php-1.22wmf8 *
 aawiki php-1.22wmf8 *
 aawiktionary php-1.22wmf8 *
-abwiki php-1.22wmf7 *
+abwiki php-1.22wmf8 *
 abwiktionary php-1.22wmf8 *
-acewiki php-1.22wmf7 *
+acewiki php-1.22wmf8 *
 advisorywiki php-1.22wmf8 *
 afwikibooks php-1.22wmf8 *
-afwiki php-1.22wmf7 *
+afwiki php-1.22wmf8 *
 afwikiquote php-1.22wmf8 *
 afwiktionary php-1.22wmf8 *
 akwikibooks php-1.22wmf8 *
-akwiki php-1.22wmf7 *
+akwiki php-1.22wmf8 *
 akwiktionary php-1.22wmf8 *
 alswikibooks php-1.22wmf8 *
-alswiki php-1.22wmf7 *
+alswiki php-1.22wmf8 *
 alswikiquote php-1.22wmf8 *
 alswiktionary php-1.22wmf8 *
-amwiki php-1.22wmf7 *
+amwiki php-1.22wmf8 *
 amwikiquote php-1.22wmf8 *
 amwiktionary php-1.22wmf8 *
 angwikibooks php-1.22wmf8 *
-angwiki php-1.22wmf7 *
+angwiki php-1.22wmf8 *
 angwikiquote php-1.22wmf8 *
 angwikisource php-1.22wmf8 *
 angwiktionary php-1.22wmf8 *
-anwiki php-1.22wmf7 *
+anwiki php-1.22wmf8 *
 anwiktionary php-1.22wmf8 *
 arbcom_dewiki php-1.22wmf8 *
 arbcom_enwiki php-1.22wmf8 *
 arbcom_fiwiki php-1.22wmf8 *
 arbcom_nlwiki php-1.22wmf8 *
-arcwiki php-1.22wmf7 *
+arcwiki php-1.22wmf8 *
 arwikibooks php-1.22wmf8 *
 arwikimedia php-1.22wmf8 *
 arwikinews php-1.22wmf8 *
-arwiki php-1.22wmf7 *
+arwiki php-1.22wmf8 *
 arwikiquote php-1.22wmf8 *
 arwikisource php-1.22wmf8 *
 arwikiversity php-1.22wmf8 *
 arwiktionary php-1.22wmf8 *
-arzwiki php-1.22wmf7 *
+arzwiki php-1.22wmf8 *
 astwikibooks php-1.22wmf8 *
-astwiki php-1.22wmf7 *
+astwiki php-1.22wmf8 *
 astwikiquote php-1.22wmf8 *
 astwiktionary php-1.22wmf8 *
 aswikibooks php-1.22wmf8 *
-aswiki php-1.22wmf7 *
+aswiki php-1.22wmf8 *
 aswikisource php-1.22wmf8 *
 aswiktionary php-1.22wmf8 *
 auditcomwiki php-1.22wmf8 *
-avwiki php-1.22wmf7 *
+avwiki php-1.22wmf8 *
 avwiktionary php-1.22wmf8 *
 aywikibooks php-1.22wmf8 *
-aywiki php-1.22wmf7 *
+aywiki php-1.22wmf8 *
 aywiktionary php-1.22wmf8 *
 azwikibooks php-1.22wmf8 *
-azwiki php-1.22wmf7 *
+azwiki php-1.22wmf8 *
 azwikiquote php-1.22wmf8 *
 azwikisource php-1.22wmf8 *
 azwiktionary php-1.22wmf8 *
-barwiki php-1.22wmf7 *
-bat_smgwiki php-1.22wmf7 *
+barwiki php-1.22wmf8 *
+bat_smgwiki php-1.22wmf8 *
 bawikibooks php-1.22wmf8 *
-bawiki php-1.22wmf7 *
-bclwiki php-1.22wmf7 *
+bawiki php-1.22wmf8 *
+bclwiki php-1.22wmf8 *
 bdwikimedia php-1.22wmf8 *
 betawikiversity php-1.22wmf8 *
 bewikibooks php-1.22wmf8 *
 bewikimedia php-1.22wmf8 *
-bewiki php-1.22wmf7 *
+bewiki php-1.22wmf8 *
 bewikiquote php-1.22wmf8 *
 bewikisource php-1.22wmf8 *
 bewiktionary php-1.22wmf8 *
-be_x_oldwiki php-1.22wmf7 *
+be_x_oldwiki php-1.22wmf8 *
 bgwikibooks php-1.22wmf8 *
 bgwikinews php-1.22wmf8 *
-bgwiki php-1.22wmf7 *
+bgwiki php-1.22wmf8 *
 bgwikiquote php-1.22wmf8 *
 bgwikisource php-1.22wmf8 *
 bgwiktionary php-1.22wmf8 *
-bhwiki php-1.22wmf7 *
+bhwiki php-1.22wmf8 *
 bhwiktionary php-1.22wmf8 *
 biwikibooks php-1.22wmf8 *
-biwiki php-1.22wmf7 *
+biwiki php-1.22wmf8 *
 biwiktionary php-1.22wmf8 *
-bjnwiki php-1.22wmf7 *
+bjnwiki php-1.22wmf8 *
 bmwikibooks php-1.22wmf8 *
-bmwiki php-1.22wmf7 *
+bmwiki php-1.22wmf8 *
 bmwikiquote php-1.22wmf8 *
 bmwiktionary php-1.22wmf8 *
 bnwikibooks php-1.22wmf8 *
-bnwiki php-1.22wmf7 *
+bnwiki php-1.22wmf8 *
 bnwikisource php-1.22wmf8 *
 bnwiktionary php-1.22wmf8 *
 boardgovcomwiki php-1.22wmf8 *
 boardwiki php-1.22wmf8 *
 bowikibooks php-1.22wmf8 *
-bowiki php-1.22wmf7 *
+bowiki php-1.22wmf8 *
 bowiktionary php-1.22wmf8 *
-bpywiki php-1.22wmf7 *
+bpywiki php-1.22wmf8 *
 brwikimedia php-1.22wmf8 *
-brwiki php-1.22wmf7 *
+brwiki php-1.22wmf8 *
 brwikiquote php-1.22wmf8 *
 brwikisource php-1.22wmf8 *
 brwiktionary php-1.22wmf8 *
 bswikibooks php-1.22wmf8 *
 bswikinews php-1.22wmf8 *
-bswiki php-1.22wmf7 *
+bswiki php-1.22wmf8 *
 bswikiquote php-1.22wmf8 *
 bswikisource php-1.22wmf8 *
 bswiktionary php-1.22wmf8 *
-bugwiki php-1.22wmf7 *
-bxrwiki php-1.22wmf7 *
+bugwiki php-1.22wmf8 *
+bxrwiki php-1.22wmf8 *
 cawikibooks php-1.22wmf8 *
 cawikinews php-1.22wmf8 *
-cawiki php-1.22wmf7 *
+cawiki php-1.22wmf8 *
 cawikiquote php-1.22wmf8 *
 cawikisource php-1.22wmf8 *
 cawiktionary php-1.22wmf8 *
-cbk_zamwiki php-1.22wmf7 *
-cdowiki php-1.22wmf7 *
-cebwiki php-1.22wmf7 *
-cewiki php-1.22wmf7 *
+cbk_zamwiki php-1.22wmf8 *
+cdowiki php-1.22wmf8 *
+cebwiki php-1.22wmf8 *
+cewiki php-1.22wmf8 *
 chairwiki php-1.22wmf8 *
 chapcomwiki

[MediaWiki-commits] [Gerrit] test2wiki to 1.22wmf9 - change (operations/mediawiki-config)

2013-06-27 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: test2wiki to 1.22wmf9
..


test2wiki to 1.22wmf9

Add symlinks

Change-Id: I6b3b6052f7d2803b550bfcbb2ef0b6df02be4560
---
A docroot/bits/static-1.22wmf9/extensions
A docroot/bits/static-1.22wmf9/resources
A docroot/bits/static-1.22wmf9/skins
A w/static-1.22wmf9/extensions
A w/static-1.22wmf9/resources
A w/static-1.22wmf9/skins
M wikiversions.dat
7 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/docroot/bits/static-1.22wmf9/extensions 
b/docroot/bits/static-1.22wmf9/extensions
new file mode 12
index 000..5a2cb9f
--- /dev/null
+++ b/docroot/bits/static-1.22wmf9/extensions
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/extensions
\ No newline at end of file
diff --git a/docroot/bits/static-1.22wmf9/resources 
b/docroot/bits/static-1.22wmf9/resources
new file mode 12
index 000..ce9ea16
--- /dev/null
+++ b/docroot/bits/static-1.22wmf9/resources
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/resources
\ No newline at end of file
diff --git a/docroot/bits/static-1.22wmf9/skins 
b/docroot/bits/static-1.22wmf9/skins
new file mode 12
index 000..3c4a2bf
--- /dev/null
+++ b/docroot/bits/static-1.22wmf9/skins
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/skins/
\ No newline at end of file
diff --git a/w/static-1.22wmf9/extensions b/w/static-1.22wmf9/extensions
new file mode 12
index 000..5a2cb9f
--- /dev/null
+++ b/w/static-1.22wmf9/extensions
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/extensions
\ No newline at end of file
diff --git a/w/static-1.22wmf9/resources b/w/static-1.22wmf9/resources
new file mode 12
index 000..ce9ea16
--- /dev/null
+++ b/w/static-1.22wmf9/resources
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/resources
\ No newline at end of file
diff --git a/w/static-1.22wmf9/skins b/w/static-1.22wmf9/skins
new file mode 12
index 000..d6279b2
--- /dev/null
+++ b/w/static-1.22wmf9/skins
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.22wmf9/skins
\ No newline at end of file
diff --git a/wikiversions.dat b/wikiversions.dat
index 787f878..ba92cf8 100644
--- a/wikiversions.dat
+++ b/wikiversions.dat
@@ -731,7 +731,7 @@
 tawikisource php-1.22wmf8 *
 tawiktionary php-1.22wmf8 *
 tenwiki php-1.22wmf8 *
-test2wiki php-1.22wmf8 *
+test2wiki php-1.22wmf9 *
 testwiki php-1.22wmf8 *
 testwikidatawiki php-1.22wmf8 *
 tetwiki php-1.22wmf7 *

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

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

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

[MediaWiki-commits] [Gerrit] Wikipedias to 1.22wmf8 - change (operations/mediawiki-config)

2013-06-27 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Wikipedias to 1.22wmf8
..


Wikipedias to 1.22wmf8

testwiki, mediawikiwiki and testwikidatawiki to 1.22wmf9

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

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



diff --git a/wikiversions.dat b/wikiversions.dat
index ba92cf8..3b9258d 100644
--- a/wikiversions.dat
+++ b/wikiversions.dat
@@ -1,200 +1,200 @@
 aawikibooks php-1.22wmf8 *
 aawiki php-1.22wmf8 *
 aawiktionary php-1.22wmf8 *
-abwiki php-1.22wmf7 *
+abwiki php-1.22wmf8 *
 abwiktionary php-1.22wmf8 *
-acewiki php-1.22wmf7 *
+acewiki php-1.22wmf8 *
 advisorywiki php-1.22wmf8 *
 afwikibooks php-1.22wmf8 *
-afwiki php-1.22wmf7 *
+afwiki php-1.22wmf8 *
 afwikiquote php-1.22wmf8 *
 afwiktionary php-1.22wmf8 *
 akwikibooks php-1.22wmf8 *
-akwiki php-1.22wmf7 *
+akwiki php-1.22wmf8 *
 akwiktionary php-1.22wmf8 *
 alswikibooks php-1.22wmf8 *
-alswiki php-1.22wmf7 *
+alswiki php-1.22wmf8 *
 alswikiquote php-1.22wmf8 *
 alswiktionary php-1.22wmf8 *
-amwiki php-1.22wmf7 *
+amwiki php-1.22wmf8 *
 amwikiquote php-1.22wmf8 *
 amwiktionary php-1.22wmf8 *
 angwikibooks php-1.22wmf8 *
-angwiki php-1.22wmf7 *
+angwiki php-1.22wmf8 *
 angwikiquote php-1.22wmf8 *
 angwikisource php-1.22wmf8 *
 angwiktionary php-1.22wmf8 *
-anwiki php-1.22wmf7 *
+anwiki php-1.22wmf8 *
 anwiktionary php-1.22wmf8 *
 arbcom_dewiki php-1.22wmf8 *
 arbcom_enwiki php-1.22wmf8 *
 arbcom_fiwiki php-1.22wmf8 *
 arbcom_nlwiki php-1.22wmf8 *
-arcwiki php-1.22wmf7 *
+arcwiki php-1.22wmf8 *
 arwikibooks php-1.22wmf8 *
 arwikimedia php-1.22wmf8 *
 arwikinews php-1.22wmf8 *
-arwiki php-1.22wmf7 *
+arwiki php-1.22wmf8 *
 arwikiquote php-1.22wmf8 *
 arwikisource php-1.22wmf8 *
 arwikiversity php-1.22wmf8 *
 arwiktionary php-1.22wmf8 *
-arzwiki php-1.22wmf7 *
+arzwiki php-1.22wmf8 *
 astwikibooks php-1.22wmf8 *
-astwiki php-1.22wmf7 *
+astwiki php-1.22wmf8 *
 astwikiquote php-1.22wmf8 *
 astwiktionary php-1.22wmf8 *
 aswikibooks php-1.22wmf8 *
-aswiki php-1.22wmf7 *
+aswiki php-1.22wmf8 *
 aswikisource php-1.22wmf8 *
 aswiktionary php-1.22wmf8 *
 auditcomwiki php-1.22wmf8 *
-avwiki php-1.22wmf7 *
+avwiki php-1.22wmf8 *
 avwiktionary php-1.22wmf8 *
 aywikibooks php-1.22wmf8 *
-aywiki php-1.22wmf7 *
+aywiki php-1.22wmf8 *
 aywiktionary php-1.22wmf8 *
 azwikibooks php-1.22wmf8 *
-azwiki php-1.22wmf7 *
+azwiki php-1.22wmf8 *
 azwikiquote php-1.22wmf8 *
 azwikisource php-1.22wmf8 *
 azwiktionary php-1.22wmf8 *
-barwiki php-1.22wmf7 *
-bat_smgwiki php-1.22wmf7 *
+barwiki php-1.22wmf8 *
+bat_smgwiki php-1.22wmf8 *
 bawikibooks php-1.22wmf8 *
-bawiki php-1.22wmf7 *
-bclwiki php-1.22wmf7 *
+bawiki php-1.22wmf8 *
+bclwiki php-1.22wmf8 *
 bdwikimedia php-1.22wmf8 *
 betawikiversity php-1.22wmf8 *
 bewikibooks php-1.22wmf8 *
 bewikimedia php-1.22wmf8 *
-bewiki php-1.22wmf7 *
+bewiki php-1.22wmf8 *
 bewikiquote php-1.22wmf8 *
 bewikisource php-1.22wmf8 *
 bewiktionary php-1.22wmf8 *
-be_x_oldwiki php-1.22wmf7 *
+be_x_oldwiki php-1.22wmf8 *
 bgwikibooks php-1.22wmf8 *
 bgwikinews php-1.22wmf8 *
-bgwiki php-1.22wmf7 *
+bgwiki php-1.22wmf8 *
 bgwikiquote php-1.22wmf8 *
 bgwikisource php-1.22wmf8 *
 bgwiktionary php-1.22wmf8 *
-bhwiki php-1.22wmf7 *
+bhwiki php-1.22wmf8 *
 bhwiktionary php-1.22wmf8 *
 biwikibooks php-1.22wmf8 *
-biwiki php-1.22wmf7 *
+biwiki php-1.22wmf8 *
 biwiktionary php-1.22wmf8 *
-bjnwiki php-1.22wmf7 *
+bjnwiki php-1.22wmf8 *
 bmwikibooks php-1.22wmf8 *
-bmwiki php-1.22wmf7 *
+bmwiki php-1.22wmf8 *
 bmwikiquote php-1.22wmf8 *
 bmwiktionary php-1.22wmf8 *
 bnwikibooks php-1.22wmf8 *
-bnwiki php-1.22wmf7 *
+bnwiki php-1.22wmf8 *
 bnwikisource php-1.22wmf8 *
 bnwiktionary php-1.22wmf8 *
 boardgovcomwiki php-1.22wmf8 *
 boardwiki php-1.22wmf8 *
 bowikibooks php-1.22wmf8 *
-bowiki php-1.22wmf7 *
+bowiki php-1.22wmf8 *
 bowiktionary php-1.22wmf8 *
-bpywiki php-1.22wmf7 *
+bpywiki php-1.22wmf8 *
 brwikimedia php-1.22wmf8 *
-brwiki php-1.22wmf7 *
+brwiki php-1.22wmf8 *
 brwikiquote php-1.22wmf8 *
 brwikisource php-1.22wmf8 *
 brwiktionary php-1.22wmf8 *
 bswikibooks php-1.22wmf8 *
 bswikinews php-1.22wmf8 *
-bswiki php-1.22wmf7 *
+bswiki php-1.22wmf8 *
 bswikiquote php-1.22wmf8 *
 bswikisource php-1.22wmf8 *
 bswiktionary php-1.22wmf8 *
-bugwiki php-1.22wmf7 *
-bxrwiki php-1.22wmf7 *
+bugwiki php-1.22wmf8 *
+bxrwiki php-1.22wmf8 *
 cawikibooks php-1.22wmf8 *
 cawikinews php-1.22wmf8 *
-cawiki php-1.22wmf7 *
+cawiki php-1.22wmf8 *
 cawikiquote php-1.22wmf8 *
 cawikisource php-1.22wmf8 *
 cawiktionary php-1.22wmf8 *
-cbk_zamwiki php-1.22wmf7 *
-cdowiki php-1.22wmf7 *
-cebwiki php-1.22wmf7 *
-cewiki php-1.22wmf7 *
+cbk_zamwiki php-1.22wmf8 *
+cdowiki php-1.22wmf8 *
+cebwiki php-1.22wmf8 *
+cewiki php-1.22wmf8 *
 chairwiki php-1.22wmf8 *
 chapcomwiki php-1.22wmf8 *
 checkuserwiki php-1.22wmf8 *
 chowiki php-1.22wmf8 *
-chrwiki php-1.22wmf7 *

[MediaWiki-commits] [Gerrit] Add mw.logObject - change (mediawiki...Scribunto)

2013-06-27 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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


Change subject: Add mw.logObject
..

Add mw.logObject

People have requested a method to log a table as something more detailed
than just table, to be able to inspect values while debugging.

Bug: 48173
Change-Id: Ia58cab834e87842927a2a13d153ee32473f74086
---
M engines/LuaCommon/lualib/mw.lua
1 file changed, 88 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/57/70857/1

diff --git a/engines/LuaCommon/lualib/mw.lua b/engines/LuaCommon/lualib/mw.lua
index 565d2ac..91abf93 100644
--- a/engines/LuaCommon/lualib/mw.lua
+++ b/engines/LuaCommon/lualib/mw.lua
@@ -572,6 +572,94 @@
logBuffer = logBuffer .. mw.allToString( ... ) .. '\n'
 end
 
+function mw.logObject( object, prefix )
+   local doneTable = {}
+   local doneObj = {}
+   local ct = {}
+   local function sorter( a, b )
+   local ta, tb = type( a ), type( b )
+   if ta ~= tb then
+   return ta  tb
+   end
+   if ta == 'string' or ta == 'number' then
+   return a  b
+   end
+   if ta == 'boolean' then
+   return tostring( a )  tostring( b )
+   end
+   return false -- Incomparable
+   end
+   local function _logObject( object, indent, expandTable )
+   local tp = type( object )
+   if tp == 'number' or tp == 'nil' or tp == 'boolean' then
+   return tostring( object )
+   elseif tp == 'string' then
+   return string.format( %q, object )
+   elseif tp == 'table' then
+   if not doneObj[object] then
+   local s = tostring( object )
+   if s == 'table' then
+   ct[tp] = ( ct[tp] or 0 ) + 1
+   doneObj[object] = 'table#' .. ct[tp]
+   else
+   doneObj[object] = s
+   doneTable[object] = true
+   end
+   end
+   if doneTable[object] or not expandTable then
+   return doneObj[object]
+   end
+   doneTable[object] = true
+
+   local ret = { doneObj[object], ' {\n' }
+   local mt = getmetatable( object )
+   if mt then
+   ret[#ret + 1] = string.rep(  , indent + 2 )
+   ret[#ret + 1] = 'metatable = '
+   ret[#ret + 1] = _logObject( mt, indent + 2, 
false )
+   ret[#ret + 1] = \n
+   end
+
+   local doneKeys = {}
+   for key, value in ipairs( object ) do
+   doneKeys[key] = true
+   ret[#ret + 1] = string.rep(  , indent + 2 )
+   ret[#ret + 1] = _logObject( value, indent + 2, 
true )
+   ret[#ret + 1] = ',\n'
+   end
+   local keys = {}
+   for key in pairs( object ) do
+   if not doneKeys[key] then
+   keys[#keys + 1] = key
+   end
+   end
+   table.sort( keys, sorter )
+   for i = 1, #keys do
+   local key = keys[i]
+   ret[#ret + 1] = string.rep(  , indent + 2 )
+   ret[#ret + 1] = '['
+   ret[#ret + 1] = _logObject( key, indent + 3, 
false )
+   ret[#ret + 1] = '] = '
+   ret[#ret + 1] = _logObject( object[key], indent 
+ 2, true )
+   ret[#ret + 1] = ,\n
+   end
+   ret[#ret + 1] = string.rep(  , indent )
+   ret[#ret + 1] = '}'
+   return table.concat( ret )
+   else
+   if not doneObj[object] then
+   ct[tp] = ( ct[tp] or 0 ) + 1
+   doneObj[object] = tostring( object ) .. '#' .. 
ct[tp]
+   end
+   return doneObj[object]
+   end
+   end
+   if prefix and prefix ~= '' then
+   logBuffer = logBuffer .. prefix .. ' = '
+   end
+   logBuffer = logBuffer .. _logObject( object, 0, true ) .. '\n'
+end
+
 function

[MediaWiki-commits] [Gerrit] Add support for specifying a global log rsyncd log file - change (operations/puppet)

2013-06-27 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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


Change subject: Add support for specifying a global log rsyncd log file
..

Add support for specifying a global log rsyncd log file

Change-Id: Id3c5cf2ee1331fced32e21dc9213d1ed8be2194f
---
M modules/rsync/manifests/server.pp
M modules/rsync/templates/header.erb
2 files changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/rsync/manifests/server.pp 
b/modules/rsync/manifests/server.pp
index 3d56bf1..21f9d60 100644
--- a/modules/rsync/manifests/server.pp
+++ b/modules/rsync/manifests/server.pp
@@ -14,6 +14,7 @@
   $use_xinetd = false,  # this parameter should not be used.  xinetd is not 
available.
   $address= '0.0.0.0',
   $motd_file  = 'UNSET',
+  $log_file  = 'UNSET',
   $use_chroot = 'yes'
 ) inherits rsync {
 
diff --git a/modules/rsync/templates/header.erb 
b/modules/rsync/templates/header.erb
index 4846d5d..8a086a5 100644
--- a/modules/rsync/templates/header.erb
+++ b/modules/rsync/templates/header.erb
@@ -5,6 +5,7 @@
 uid = nobody
 gid = nobody
 use chroot = %= use_chroot %
+% if log_file != 'UNSET' %log file = %= log_file %% end %
 log format = %t %a %m %f %b
 syslog facility = local3
 timeout = 300

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3c5cf2ee1331fced32e21dc9213d1ed8be2194f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] add WikibaseDataModel extension to extension-list - change (operations/mediawiki-config)

2013-06-27 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: add WikibaseDataModel extension to extension-list
..


add WikibaseDataModel extension to extension-list

this was split out from the Wikibase extension and is not new code

Change-Id: Ia8a612acd98e4e3ffdf4eab2c56a0d7e1df30b9b
---
M wmf-config/extension-list
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index aae9d32..ca36e63 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -142,6 +142,7 @@
 $IP/extensions/Wikibase/client/WikibaseClient.php
 $IP/extensions/Wikibase/lib/WikibaseLib.php
 $IP/extensions/Wikibase/repo/Wikibase.php
+$IP/extensions/WikibaseDataModel/WikibaseDataModel.php
 $IP/extensions/WikiEditor/WikiEditor.php
 $IP/extensions/wikihiero/wikihiero.php
 $IP/extensions/WikiLove/WikiLove.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8a612acd98e4e3ffdf4eab2c56a0d7e1df30b9b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

1 2 3 >

1 - 100 of 264 matches

Mail list logo