date:20160120

[MediaWiki-commits] [Gerrit] Use load_composer_autoloader - change (mediawiki...ContentTranslation)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Use load_composer_autoloader
..


Use load_composer_autoloader

See Ib031bef17c8a7d708a5c7878e74967d19217bbc8

Change-Id: I7c2a30058244dc89c71fee9356278b72740b67e6
---
M ContentTranslation.hooks.php
M extension.json
2 files changed, 1 insertion(+), 13 deletions(-)

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



diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 9711584..231c71e 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -10,16 +10,6 @@
 
 class ContentTranslationHooks {
/**
-* Extra setup in addition to extension.json.
-*/
-   public static function onSetup() {
-   // Composer support
-   if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-   require_once __DIR__ . '/vendor/autoload.php';
-   }
-   }
-
-   /**
 * Utility function that checks whether CX is enabled for a given user.
 * Currently it checks that if CX is a beta feature, whether the user 
has
 * enabled it. Otherwise it is always enabled.
diff --git a/extension.json b/extension.json
index 7825485..0d4bebd 100644
--- a/extension.json
+++ b/extension.json
@@ -16,9 +16,6 @@
"descriptionmsg": "cx-desc",
"license-name": "GPL-2.0+",
"type": "specialpage",
-   "ExtensionFunctions": [
-   "ContentTranslationHooks::onSetup"
-   ],
"ExtensionMessagesFiles": {
"ContentTranslationAliases": "ContentTranslation.alias.php"
},
@@ -1081,5 +1078,6 @@
"localBasePath": "modules",
"remoteExtPath": "ContentTranslation/modules"
},
+   "load_composer_autoloader": true,
"manifest_version": 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c2a30058244dc89c71fee9356278b72740b67e6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] color logging fixes - change (pywikibot/core)

2016-01-20 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: color logging fixes
..

color logging fixes

afe2555d7 implemented color_format, which uses str.format {} syntax,
but two messages in reflinks were not converted from %s syntax to {}.

Bug: T123887
Change-Id: I8e6916153428689dc4c6410bebfc9c771d8813d8
---
M scripts/reflinks.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/62/265462/1

diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 0474deb..814e1ce 100755
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -38,7 +38,7 @@
   one from i18n/reflinks.py
 """
 # (C) Nicolas Dumazet (NicDumZ), 2008
-# (C) Pywikibot team, 2008-2015
+# (C) Pywikibot team, 2008-2016
 #
 # Distributed under the terms of the MIT license.
 #
@@ -587,7 +587,7 @@
 # example : 
http://www.adminet.com/jo/20010615¦/ECOC0100037D.html
 # in [[fr:Cyanure]]
 pywikibot.output(color_format(
-'{lightred}Bad link{default} : %s in %s',
+'{lightred}Bad link{default} : {0} in {1}',
 ref.url, page.title(asLink=True)))
 continue
 except (URLError,
@@ -638,7 +638,7 @@
 continue
 elif not self.MIME.search(contentType):
 pywikibot.output(color_format(
-'{lightyellow}WARNING{default} : media : %s ',
+'{lightyellow}WARNING{default} : media : {0} ',
 ref.link))
 repl = ref.refLink()
 new_text = new_text.replace(match.group(), repl)

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

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

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

[MediaWiki-commits] [Gerrit] Raise Virtualbox clock sync frequency - change (mediawiki/vagrant)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Raise Virtualbox clock sync frequency
..


Raise Virtualbox clock sync frequency

This should cause Virtualbox to sync host and guest clock every
ten seconds. An accurate guest clock is required for time-based
or time-limited authentication methods such as OATH or OAuth.

Bug: T116507
Change-Id: Ie8706494abea6c56fd3fad160389628aa4b2a83b
---
M Vagrantfile
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index e666014..f63770d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -173,6 +173,9 @@
 vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
 vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']
 
+# Prevent clock drift, see http://stackoverflow.com/a/19492466/323407
+vb.customize ['guestproperty', 'set', :id, 
'/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold', 1]
+
 # To boot the VM in graphical mode, uncomment the following line:
 # vb.gui = true
   end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8706494abea6c56fd3fad160389628aa4b2a83b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Improve wfTempDir() fallback sequence - change (mediawiki/core)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Improve wfTempDir() fallback sequence
..


Improve wfTempDir() fallback sequence

Validate the return value of sys_get_temp_dir(), and use upload_tmp_dir
if that is not writable. If nothing is writable, throw an exception.

Bug: T119934
Change-Id: I27d784f55c47277bbab1192853e2e04a9d8bd39a
---
M includes/GlobalFunctions.php
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index f797e5b..928066b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2162,8 +2162,8 @@
 /**
  * Tries to get the system directory for temporary files. First
  * $wgTmpDirectory is checked, and then the TMPDIR, TMP, and TEMP
- * environment variables are then checked in sequence, and if none are
- * set try sys_get_temp_dir().
+ * environment variables are then checked in sequence, then
+ * sys_get_temp_dir(), then upload_tmp_dir from php.ini.
  *
  * NOTE: When possible, use instead the tmpfile() function to create
  * temporary files to avoid race conditions on file creation, etc.
@@ -2178,13 +2178,16 @@
}
 
$tmpDir = array_map( "getenv", array( 'TMPDIR', 'TMP', 'TEMP' ) );
+   $tmpDir[] = sys_get_temp_dir();
+   $tmpDir[] = ini_get( 'upload_tmp_dir' );
 
foreach ( $tmpDir as $tmp ) {
if ( $tmp && file_exists( $tmp ) && is_dir( $tmp ) && 
is_writable( $tmp ) ) {
return $tmp;
}
}
-   return sys_get_temp_dir();
+   throw new MWException( 'No writable temporary directory could be found. 
' .
+   'Please set $wgTmpDirectory to a writable directory.' );
 }
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27d784f55c47277bbab1192853e2e04a9d8bd39a
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ananay 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Ananay 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: L10n-bot 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move remaining usage of EchoGetDefaultNotifiedUsers into Use... - change (mediawiki...Flow)

2016-01-20 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Move remaining usage of EchoGetDefaultNotifiedUsers into 
UserLocator
..

Move remaining usage of EchoGetDefaultNotifiedUsers into UserLocator

Change-Id: Ib321dfbd993d7e5fd22a189d7f46bf3d9fa6b409
---
M Flow.php
M includes/Import/Postprocessor/LqtNotifications.php
M includes/Notifications/Controller.php
M includes/Notifications/Notifications.php
M includes/Notifications/UserLocator.php
5 files changed, 114 insertions(+), 111 deletions(-)


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

diff --git a/Flow.php b/Flow.php
index 8c0308c..63d77ab 100644
--- a/Flow.php
+++ b/Flow.php
@@ -166,7 +166,6 @@
 
 // Echo integration
 $wgHooks['BeforeCreateEchoEvent'][] = 
'Flow\NotificationController::onBeforeCreateEchoEvent';
-$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'Flow\NotificationController::getDefaultNotifiedUsers';
 $wgHooks['EchoGetBundleRules'][] = 
'Flow\NotificationController::onEchoGetBundleRules';
 
 // Beta feature Flow on user talk page
diff --git a/includes/Import/Postprocessor/LqtNotifications.php 
b/includes/Import/Postprocessor/LqtNotifications.php
index 896d2ae..fabb203 100644
--- a/includes/Import/Postprocessor/LqtNotifications.php
+++ b/includes/Import/Postprocessor/LqtNotifications.php
@@ -49,17 +49,7 @@
 * of determining users to notify so they can be replaced with this 
class during imports.
 */
protected function overrideUsersToNotify() {
-   global $wgHooks, $wgEchoNotifications;
-
-   // Remove the hook subscriber that chooses users for some 
notifications
-   $idx = array_search(
-   'Flow\NotificationController::getDefaultNotifiedUsers',
-   $wgHooks['EchoGetDefaultNotifiedUsers']
-   );
-   if ( $idx !== false ) {
-   unset( $wgHooks['EchoGetDefaultNotifiedUsers'][$idx] );
-   }
-
+   global $wgEchoNotifications;
 
// Remove the user-locators that choose on a per-notification 
basis who
// should be notified.
diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index 365f010..8a55dde 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -165,7 +165,7 @@
 * @throws FlowException When $params contains unexpected types/values
 */
public function notifyNewTopic( $params ) {
-   if ( ! class_exists( 'EchoEvent' ) ) {
+   if ( !class_exists( 'EchoEvent' ) ) {
// Nothing to do here.
return array();
}
@@ -411,104 +411,6 @@
break;
}
return true;
-   }
-
-   /**
-* Handler for EchoGetDefaultNotifiedUsers hook
-*  Returns a list of User objects in the second param
-*
-* @param $event EchoEvent being triggered
-* @param &$users Array of User objects.
-* @return bool
-*/
-   public static function getDefaultNotifiedUsers( EchoEvent $event, 
&$users ) {
-   $extra = $event->getExtra();
-   switch ( $event->getType() ) {
-   case 'flow-mention':
-   $mentionedUsers = $extra['mentioned-users'];
-
-   // Ignore mention if the user gets another notification
-   // already from the same flow event
-   $ids = array();
-   $topic = $extra['topic-workflow'];
-   if ( $topic instanceof UUID ) {
-   $ids[$topic->getAlphadecimal()] = $topic;
-   }
-   if ( isset( $extra['reply-to'] ) ) {
-   if ( $extra['reply-to'] instanceof UUID ) {
-   
$ids[$extra['reply-to']->getAlphadecimal()] = $extra['reply-to'];
-   } else {
-   wfDebugLog( 'Flow', __METHOD__ . ': 
Expected UUID but received ' . get_class( $extra['reply-to'] ) );
-   }
-   }
-   $notifiedUsers = self::getCreatorsFromPostIDs( $ids );
-
-   foreach( $mentionedUsers as $uid ) {
-   if ( !isset( $notifiedUsers[$uid] ) ) {
-   $users[$uid] = User::newFromId( $uid );
-   }
-   }
-   break;
-   case 'flow-topic-renamed':
-   $users += self::getCreatorsFromPostIDs( array( 
$extra['topic-workflow'] ) );
-   break

[MediaWiki-commits] [Gerrit] [WIP] Engage full surveillance mode for Flow talk pages - change (mediawiki...Flow)

2016-01-20 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: [WIP] Engage full surveillance mode for Flow talk pages
..

[WIP] Engage full surveillance mode for Flow talk pages

WIP because icons are still missing. Rest is done.

Bug: T121663
Change-Id: I63b7489c3a391af16461fe47ca9523256f990f69
---
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/FlowPresentationModel.php
M includes/Notifications/NewTopicPresentationModel.php
M includes/Notifications/Notifications.php
M includes/Notifications/PostEditedPresentationModel.php
M includes/Notifications/PostReplyPresentationModel.php
M includes/Notifications/TopicRenamedPresentationModel.php
8 files changed, 92 insertions(+), 11 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index f48de9b..f3ed2b2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -272,14 +272,24 @@
"flow-notification-edit-bundle": "$1 and $5 {{PLURAL:$6|other|others}} 
{{GENDER:$1|edited}} a [$4 post] in \"$2\" on 
\"$3\".",
"notification-header-flow-new-topic-v2": "New topic created on $3: 
\"$4\".",
"notification-bundle-header-flow-new-topic": "$1 new 
{{PLURAL:$2|topic|topics}} on $3.",
+   "notification-body-flow-new-topic-v2": "$1",
+   "notification-header-flow-new-topic-user-talk": "A new topic was 
created on your talk page: \"$4\"",
+   "notification-bundle-header-flow-new-topic-user-talk": "$1 new 
{{PLURAL:$2|topic|topics}} on your talk page.",
+   "notification-body-flow-new-topic-user-talk": "$1",
"notification-header-flow-post-reply": "$1 {{GENDER:$2|replied}} in 
\"$4\".",
"notification-bundle-header-flow-post-reply": "$1 new replies in 
\"$2\".",
-   "notification-body-flow-new-topic-v2": "$1",
"notification-body-flow-post-reply-v2": "$1",
+   "notification-header-flow-post-reply-user-talk": "$1 
{{GENDER:$2|posted}} a reply on your talk page in \"$4\".",
+   "notification-bundle-header-flow-post-reply-user-talk": "$1 new replies 
on your talk page in \"$2\".",
+   "notification-body-flow-post-reply-user-talk": "$1",
"notification-header-flow-post-edited-v2": "Your post on \"$1\" was 
edited.",
"notification-bundle-header-flow-post-edited-v2": "Your post on \"$1\" 
was edited multiple times.",
"notification-body-flow-post-edited-v2": "$1",
+   "notification-header-flow-post-edited-user-talk": "A post on \"$1\" was 
edited on your talk page.",
+   "notification-bundle-header-flow-post-edited-user-talk": "A post on 
\"$1\" was edited multiple times on your talk page.",
+   "notification-body-flow-post-edited-user-talk": "$1",
"notification-header-flow-topic-renamed-v2": "The topic \"$1\" was 
renamed to \"$2\".",
+   "notification-header-flow-topic-renamed-user-talk": "The topic \"$1\" 
was renamed to \"$2\" on your talk page.",
"notification-header-flow-mention": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}} in \"$3\".",
"notification-body-flow-mention": "$1",
"notification-header-flow-enabled-on-talkpage": "New discussion system 
enabled for {{GENDER:$2|your}} user talk page.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b098e88..2af9e15 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -282,13 +282,23 @@
"notification-header-flow-new-topic-v2": "Notification header text for 
when a new topic is created. Parameters:\n$1 - the formatted username of the 
user who created the topic\n* $2 - the username for gender purposes\n* $3 - 
title of the Flow board\n* $4 - title of the 
topic.\n{{Related|Flow-notification}}",
"notification-body-flow-new-topic-v2": "Notification body text for when 
a new topic is created. Parameters:\n$1 - a snippet of the content of the new 
topic.\n{{Related|Flow-notification}} {{notranslate}}",
"notification-bundle-header-flow-new-topic": "Notification text for 
when multiple new topics are created on the same page. Parameters:\n* $1 - The 
number of topics that were created for display purposes. This can be a number 
or '99+' if it is 99 or more\n* $2 - The number of new topics created for 
PLURAL purposes\n* $3 - The title of the page the topics were created 
on\n{{Related|Notification-bundle}}",
+   "notification-header-flow-new-topic-user-talk": "Notification header 
text for when a new topic is created on a user's talk page. Parameters:\n$1 - 
the formatted username of the user who created the topic\n* $2 - the username 
for gender purposes\n* $3 - title of the Flow board\n* $4 - title of the 
topic.\n{{Related|Flow-notification}}",
+   "notification-body-flow-new-topic-user-talk": "Notification body text 
for when a new topic is created on a user's talk page. Parameters:\n$1 - a 
snippet of the content of the new topic.\n{{Related|Flow-not

[MediaWiki-commits] [Gerrit] updateCollation.php: Switch back to using cl_from index for now - change (mediawiki/core)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: updateCollation.php: Switch back to using cl_from index for now
..


updateCollation.php: Switch back to using cl_from index for now

Using the cl_sortkey index instead (to reduce disruption to a live
site), as currently implemented, seems to have two serious problems:

* MySQL / MariaDB filesorts all rows that "sort above the given row
  [the last row of the previous batch]", not just a single category
  at a time until the row limit is reached.
* The current approach to pagination is broken in that it does not
  work with ENUM columns such as cl_type, causing 'file' rows to be
  skipped, or rows of any type to be repeated. See T119173.

This reverts part of commit a43f751cf6b6849e.

Bug: T58041
Change-Id: I619564e85b2122f249bdacc45d547b9ce1b3beb5
---
M maintenance/updateCollation.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index bb75314..bd75b3b 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -86,7 +86,7 @@
 
$options = array(
'LIMIT' => self::BATCH_SIZE,
-   'ORDER BY' => 'cl_to, cl_type, cl_from',
+   'ORDER BY' => 'cl_from, cl_to',
'STRAIGHT_JOIN',
);
 
@@ -132,7 +132,7 @@
$res = $dbw->select(
array( 'categorylinks', 'page' ),
array( 'cl_from', 'cl_to', 'cl_sortkey_prefix', 
'cl_collation',
-   'cl_sortkey', 'cl_type', 
'page_namespace', 'page_title'
+   'cl_sortkey', 'page_namespace', 
'page_title'
),
array_merge( $collationConds, $batchConds, 
array( 'cl_from = page_id' ) ),
__METHOD__,
@@ -216,13 +216,13 @@
 
/**
 * Return an SQL expression selecting rows which sort above the given 
row,
-* assuming an ordering of cl_to, cl_type, cl_from
+* assuming an ordering of cl_from, cl_to
 * @param stdClass $row
 * @param DatabaseBase $dbw
 * @return string
 */
function getBatchCondition( $row, $dbw ) {
-   $fields = array( 'cl_to', 'cl_type', 'cl_from' );
+   $fields = array( 'cl_from', 'cl_to' );
$first = true;
$cond = false;
$prefix = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I619564e85b2122f249bdacc45d547b9ce1b3beb5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: PleaseStand 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable ContentTranslationCorpora - change (operations/mediawiki-config)

2016-01-20 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: Enable ContentTranslationCorpora
..

Enable ContentTranslationCorpora

Bug: T119617
Change-Id: Iecf4a4a565da368e69217a89c86608ffc66fcf97
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index eea2061..eb007cb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15203,6 +15203,11 @@
'wikipedia' => true,
 ),
 
+//Parallel Corpora
+'wmgContentTranslationCorpora' => array(
+   'default' => false,
+),
+
 'wmgUseMapSources' => array(
'default' => false,
'wikivoyage' => true,

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

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

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

[MediaWiki-commits] [Gerrit] Beta: Set ContentTranslationCorpora to true - change (operations/mediawiki-config)

2016-01-20 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: Beta: Set ContentTranslationCorpora to true
..

Beta: Set ContentTranslationCorpora to true

Bug: T119617
Change-Id: I7d4bc8db37d39baa5e8c2ef13a1d44eb45cbec8d
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index d4835e1..38165a4 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -417,6 +417,10 @@
'default' => true,
),
 
+   'wmgContentTranslationCorpora' => array(
+   'default' => true,
+   ),
+
'wmgUseNavigationTiming' => array(
'default' => true,
),

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

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

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

[MediaWiki-commits] [Gerrit] Use load_composer_autoloader - change (mediawiki...ContentTranslation)

2016-01-20 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Use load_composer_autoloader
..

Use load_composer_autoloader

See Ib031bef17c8a7d708a5c7878e74967d19217bbc8

Change-Id: I7c2a30058244dc89c71fee9356278b72740b67e6
---
M ContentTranslation.hooks.php
M extension.json
2 files changed, 1 insertion(+), 10 deletions(-)


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

diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 9711584..231c71e 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -10,16 +10,6 @@
 
 class ContentTranslationHooks {
/**
-* Extra setup in addition to extension.json.
-*/
-   public static function onSetup() {
-   // Composer support
-   if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-   require_once __DIR__ . '/vendor/autoload.php';
-   }
-   }
-
-   /**
 * Utility function that checks whether CX is enabled for a given user.
 * Currently it checks that if CX is a beta feature, whether the user 
has
 * enabled it. Otherwise it is always enabled.
diff --git a/extension.json b/extension.json
index 7825485..b59edcd 100644
--- a/extension.json
+++ b/extension.json
@@ -1081,5 +1081,6 @@
"localBasePath": "modules",
"remoteExtPath": "ContentTranslation/modules"
},
+   "load_composer_autoloader": true,
"manifest_version": 1
 }

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

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

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

[MediaWiki-commits] [Gerrit] Use CentralIdLookup instead of hardcoding CentralAuth - change (mediawiki...ContentTranslation)

2016-01-20 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Use CentralIdLookup instead of hardcoding CentralAuth
..

Use CentralIdLookup instead of hardcoding CentralAuth

Bug: T123919
Change-Id: If06b94f230a5af68e1b05ccbc975c27f181cbdc3
---
M api/ApiQueryContentTranslation.php
M extension.json
D includes/GlobalUser.php
M includes/Translator.php
M scripts/fix-stats.php
5 files changed, 20 insertions(+), 61 deletions(-)


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

diff --git a/api/ApiQueryContentTranslation.php 
b/api/ApiQueryContentTranslation.php
index 9ab7f22..7c81557 100644
--- a/api/ApiQueryContentTranslation.php
+++ b/api/ApiQueryContentTranslation.php
@@ -107,8 +107,9 @@
);
if ( $translation !== null ) {
$translator = 
$translation->translation['lastUpdatedTranslator'];
+   $centralIdLookup = CentralIdLookup::factory();
$translation->translation['translatorName'] =
-   ContentTranslation\GlobalUser::newFromId( 
$translator )->getName();
+   $centralIdLookup->nameFromCentralId( 
$translator );
$result->addValue(
array( 'query', 'contenttranslation' ),
'translation', $translation->translation
diff --git a/extension.json b/extension.json
index 7825485..5dc965b 100644
--- a/extension.json
+++ b/extension.json
@@ -78,7 +78,6 @@
"ContentTranslation\\Database": "includes/Database.php",
"ContentTranslation\\Draft": "includes/Draft.php",
"ContentTranslation\\EchoNotificationPresentationModel": 
"includes/EchoNotificationPresentationModel.php",
-   "ContentTranslation\\GlobalUser": "includes/GlobalUser.php",
"ContentTranslation\\Notification": "includes/Notification.php",
"ContentTranslation\\SiteMapper": "includes/SiteMapper.php",
"ContentTranslation\\Stats": "includes/Stats.php",
diff --git a/includes/GlobalUser.php b/includes/GlobalUser.php
deleted file mode 100644
index 1192b7b..000
--- a/includes/GlobalUser.php
+++ /dev/null
@@ -1,53 +0,0 @@
-user = $user;
-   }
-
-   public static function newFromUser( \User $user ) {
-   // Use CentralAuth if available. Use local user to ease testing.
-   if ( class_exists( '\CentralAuthUser' ) ) {
-   $user = \CentralAuthUser::getInstance( $user );
-   }
-
-   if ( $user === null ) {
-   throw new \MWException( "Unable to find global user 
for" );
-   }
-
-   return new GlobalUser( $user );
-   }
-
-   /**
-* Get a GlobalUser object from a user's global id
-*
-* @param int $id
-* @return GlobalUser
-*/
-   public static function newFromId( $id ) {
-   // Use CentralAuth if available. Use local user to ease testing.
-   if ( class_exists( '\CentralAuthUser' ) ) {
-   $user = \CentralAuthUser::newFromId( $id );
-   } else {
-   $user = \User::newFromId( $id );
-   }
-
-   if ( $user === null ) {
-   throw new \MWException( "Unable to find global user 
for" );
-   }
-
-   return new GlobalUser( $user );
-   }
-
-
-   public function getId() {
-   return $this->user->getId();
-   }
-
-   public function getName() {
-   return $this->user->getName();
-   }
-}
diff --git a/includes/Translator.php b/includes/Translator.php
index 52a9d35..c1b85ef 100644
--- a/includes/Translator.php
+++ b/includes/Translator.php
@@ -5,13 +5,22 @@
 namespace ContentTranslation;
 
 class Translator {
-   function __construct( \User $user ) {
-   // GlobalUser::newFromUser must be used so CentralAuth checks 
are done
-   $this->globalUser = GlobalUser::newFromUser( $user );
+
+   /**
+* @var \User
+*/
+   private $user;
+
+   public function __construct( \User $user ) {
+   $this->user = $user;
}
 
public function getGlobalUserId() {
-   return $this->globalUser->getId();
+   $centralIdLookup = \CentralIdLookup::factory();
+   return $centralIdLookup->centralIdFromName(
+   $this->user->getName(),
+   \CentralIdLookup::AUDIENCE_RAW
+   );
}
 
public function addTranslation( $translationId ) {
diff --git a/scripts/fix-stats.php b/scripts/fix-stats.php
index db96981..8adac5e 100644
--- a/scripts/fix-stats.php
+++ b/scripts/fix-stats.

[MediaWiki-commits] [Gerrit] Test body_only since that's preferred - change (mediawiki...parsoid)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Test body_only since that's preferred
..


Test body_only since that's preferred

Change-Id: Ib01f955a949eca7f633c5ab926a9042ae77f2e7c
---
M tests/mocha/api.js
1 file changed, 27 insertions(+), 1 deletion(-)

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



diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 89a1e5b..4435ce9 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -462,7 +462,33 @@
.end(done);
});
 
-   it("should respect body parameter", function(done) {
+   it("should respect body parameter (body_only)", 
function(done) {
+   request(api)
+   .post(version === 3 ?
+   mockDomain + 
'/v3/transform/wikitext/to/html/' :
+   'v2/' + mockDomain + '/html/')
+   .send(version === 3 ? {
+   wikitext: "''foo''",
+   body_only: 1,
+   } : {
+   wikitext: "''foo''",
+   body: 1,
+   })
+   .expect(validHtmlResponse())
+   .expect(function(res) {
+   if (version === 3) {
+   // v3 only returns children of 

+   
res.text.should.not.match(/https://gerrit.wikimedia.org/r/265414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib01f955a949eca7f633c5ab926a9042ae77f2e7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] In refreshLinks.php don't clear tag hooks - change (mediawiki/core)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: In refreshLinks.php don't clear tag hooks
..


In refreshLinks.php don't clear tag hooks

It made perfect sense when I introduced this line in June 2005, but now
that we have  etc., we need to use the normal parser configuration.

Change-Id: I5a32e4e38badff85fe6d7d63c3fa158dc6fd5336
---
M maintenance/refreshLinks.php
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index a0cd6a9..1159e53 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -73,8 +73,6 @@
private function doRefreshLinks( $start, $newOnly = false,
$end = null, $redirectsOnly = false, $oldRedirectsOnly = false
) {
-   global $wgParser;
-
$reportingInterval = 100;
$dbr = $this->getDB( DB_SLAVE );
 
@@ -84,9 +82,6 @@
 
// Give extensions a chance to optimize settings
Hooks::run( 'MaintenanceRefreshLinksInit', array( $this ) );
-
-   # Don't generate extension images (e.g. Timeline)
-   $wgParser->clearTagHooks();
 
$what = $redirectsOnly ? "redirects" : "links";
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a32e4e38badff85fe6d7d63c3fa158dc6fd5336
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Preprocessor: Don't allow unclosed extension tags (matching ... - change (mediawiki/core)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Preprocessor: Don't allow unclosed extension tags (matching 
until end of input)
..


Preprocessor: Don't allow unclosed extension tags (matching until end of input)

I think it's saner to treat this as invalid syntax, and output the
mismatched tag code verbatim. The current behavior is particularly
annoying for  tags, which often swallow everything afterwards.

This does not affect HTML tags, though. Assuming Tidy is enabled, they
are still auto-closed at the end of the page content.

Related to T17712 and T58306. I think this brings the PHP parser closer
to Parsoid's interpretation.

It reduces performance somewhat in the worst case, though. Testing with
https://phabricator.wikimedia.org/F3245989 (a 1 MB page starting with
3000 opening tags of 15 different types), parsing time rises from
~0.2 seconds to ~1.1 seconds on my setup. We go from O(N) to O(kN),
where N is bytes of input and k is the number of types of tags present
on the page. Maximum k shouldn't exceed 30 or so in reasonable setups
(depends on installed extensions, it's 20 on English Wikipedia).

To consider:
* Should we keep previous behavior for unclosed  /
  ? This would be particularly disruptive for these if
  someone relied on the old behavior, and they're already
  special-cased in places.
* Unclosed  tags are now treated as HTML tags, and are still
  displayed as preformatted text, but without suppressing wikitext
  formatting.

Change-Id: Ia2f24dbfb3567c4b0778761585e6c0303d11ddd0
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/PreprocessorTest.php
4 files changed, 31 insertions(+), 13 deletions(-)

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



diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 4ca3a87..817f153 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -237,6 +237,8 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
+   // Map of tag name => true if there are no more closing tags of 
given type right of $i
+   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -457,17 +459,21 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
+   if (
+   !isset( 
$noMoreClosingTag[$name] ) &&
+   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_OFFSET_CAPTURE, $tagEndPos + 1 )
) {
$inner = substr( $text, 
$tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
$i = $matches[0][1] + strlen( 
$matches[0][0] );
$close = '' . 
htmlspecialchars( $matches[0][0] ) . '';
} else {
-   // No end tag -- let it run out 
to the end of the text.
-   $inner = substr( $text, 
$tagEndPos + 1 );
-   $i = $lengthText;
-   $close = '';
+   // No end tag -- don't match 
the tag, treat opening tag as literal and resume parsing.
+   $i = $tagEndPos + 1;
+   $accum .= htmlspecialchars( 
substr( $text, $tagStartPos, $tagEndPos + 1 - $tagStartPos ) );
+   // Cache results, otherwise we 
have O(N^2) performance for input like ...
+   $noMoreClosingTag[$name] = true;
+   continue;
}
}
//  and  just become 
 tags
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 50eaefb..28c49fd 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -160,6 +160,8 @@

[MediaWiki-commits] [Gerrit] In refreshLinks.php don't clear tag hooks - change (mediawiki/core)

2016-01-20 Thread Tim Starling (Code Review)

Tim Starling has uploaded a new change for review.

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

Change subject: In refreshLinks.php don't clear tag hooks
..

In refreshLinks.php don't clear tag hooks

It made perfect sense when I introduced this line in June 2005, but now
that we have  etc., we need to use the normal parser configuration.

Change-Id: I5a32e4e38badff85fe6d7d63c3fa158dc6fd5336
---
M maintenance/refreshLinks.php
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/265455/1

diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index a0cd6a9..1159e53 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -73,8 +73,6 @@
private function doRefreshLinks( $start, $newOnly = false,
$end = null, $redirectsOnly = false, $oldRedirectsOnly = false
) {
-   global $wgParser;
-
$reportingInterval = 100;
$dbr = $this->getDB( DB_SLAVE );
 
@@ -84,9 +82,6 @@
 
// Give extensions a chance to optimize settings
Hooks::run( 'MaintenanceRefreshLinksInit', array( $this ) );
-
-   # Don't generate extension images (e.g. Timeline)
-   $wgParser->clearTagHooks();
 
$what = $redirectsOnly ? "redirects" : "links";
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a32e4e38badff85fe6d7d63c3fa158dc6fd5336
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] Use TitleSquidURLs hook to purge mobile URLs directly - change (mediawiki...MobileFrontend)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Use TitleSquidURLs hook to purge mobile URLs directly
..


Use TitleSquidURLs hook to purge mobile URLs directly

Bug: T124165
Change-Id: I08cdf37a139249a57447c1c4b9d3573dad8fe485
---
M MobileFrontend.php
M includes/MobileFrontend.hooks.php
M tests/phpunit/MobileFrontend.hooksTest.php
3 files changed, 44 insertions(+), 0 deletions(-)

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



diff --git a/MobileFrontend.php b/MobileFrontend.php
index 1a366ff..8d0dafb 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -153,6 +153,7 @@
 $wgHooks['PageRenderingHash'][] = 'MobileFrontendHooks::onPageRenderingHash';
 $wgHooks['AfterBuildFeedLinks'][] = 
'MobileFrontendHooks::onAfterBuildFeedLinks';
 $wgHooks['MakeGlobalVariablesScript'][] = 
'MobileFrontendHooks::onMakeGlobalVariablesScript';
+$wgHooks['TitleSquidURLs'][] = 'MobileFrontendHooks::onTitleSquidURLs';
 
 $wgSpecialPages += array(
'History' => 'SpecialMobileHistory',
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index a949fb5..c2aac13 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1206,4 +1206,23 @@
}
return true;
}
+
+   /**
+* Handler for TitleSquidURLs hook to add copies of the cache purge
+* URLs which are transformed according to the wgMobileUrlTemplate, so
+* that both mobile and non-mobile URL variants get purged.
+*
+* @see * http://www.mediawiki.org/wiki/Manual:Hooks/TitleSquidURLs
+* @param Title $title the article title
+* @param array &$urls the set of URLs to purge
+*/
+   public static function onTitleSquidURLs( Title $title, array &$urls ) {
+   $context = MobileContext::singleton();
+   foreach ( $urls as $url ) {
+   $newUrl = $context->getMobileUrl( $url );
+   if ( $newUrl !== false && $newUrl !== $url ) {
+   $urls[] = $newUrl;
+   }
+   }
+   }
 }
diff --git a/tests/phpunit/MobileFrontend.hooksTest.php 
b/tests/phpunit/MobileFrontend.hooksTest.php
index 19a7088..064f69c 100644
--- a/tests/phpunit/MobileFrontend.hooksTest.php
+++ b/tests/phpunit/MobileFrontend.hooksTest.php
@@ -132,4 +132,28 @@
array( false, false, false, array(), 0, false ),
);
}
+
+   public function testOnTitleSquidURLs() {
+   $this->setMwGlobals( array(
+   'wgMobileUrlTemplate' => '%h0.m.%h1.%h2',
+   'wgServer' => 'http://en.wikipedia.org',
+   'wgArticlePath' => '/wiki/$1',
+   'wgScriptPath' => '/w',
+   'wgScript' => '/w/index.php',
+   ) );
+   MobileContext::setInstance( null );
+
+   $title = Title::newFromText( 'PurgeTest' );
+
+   $urls = $title->getCdnUrls();
+
+   $expected = array(
+   'http://en.wikipedia.org/wiki/PurgeTest',
+   
'http://en.wikipedia.org/w/index.php?title=PurgeTest&action=history',
+   
'http://en.m.wikipedia.org/w/index.php?title=PurgeTest&action=history',
+   'http://en.m.wikipedia.org/wiki/PurgeTest',
+   );
+
+   $this->assertArrayEquals( $expected, $urls );
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I08cdf37a139249a57447c1c4b9d3573dad8fe485
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Minor documentation changes - change (wikimedia...dashboard)

2016-01-20 Thread Bearloga (Code Review)

Bearloga has submitted this change and it was merged.

Change subject: Minor documentation changes
..


Minor documentation changes

Change-Id: I3e6765d7ba80829595d7456abadbe1f520228cfa
---
M shiny-server/metrics
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/shiny-server/metrics b/shiny-server/metrics
index d4fdf41..193ac4d 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit d4fdf41233ded844eb4cf7ebc2d0fe137beb6ac9
+Subproject commit 193ac4d38411f16820a336397a7220e5c8c3536d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e6765d7ba80829595d7456abadbe1f520228cfa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Minor documentation changes - change (wikimedia...dashboard)

2016-01-20 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Minor documentation changes
..

Minor documentation changes

Change-Id: I3e6765d7ba80829595d7456abadbe1f520228cfa
---
M shiny-server/metrics
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard 
refs/changes/54/265454/1

diff --git a/shiny-server/metrics b/shiny-server/metrics
index d4fdf41..193ac4d 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit d4fdf41233ded844eb4cf7ebc2d0fe137beb6ac9
+Subproject commit 193ac4d38411f16820a336397a7220e5c8c3536d

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e6765d7ba80829595d7456abadbe1f520228cfa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Add links to the report on estimating zero results rate - change (wikimedia...rainbow)

2016-01-20 Thread Bearloga (Code Review)

Bearloga has submitted this change and it was merged.

Change subject: Add links to the report on estimating zero results rate
..


Add links to the report on estimating zero results rate

Bug: T124072
Change-Id: I32b5007beb984d83f94a46d8b98f328bcb351d99
---
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_rate.md
M tab_documentation/kpi_zero_results.md
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/tab_documentation/failure_breakdown.md 
b/tab_documentation/failure_breakdown.md
index 308a8a3..a357106 100644
--- a/tab_documentation/failure_breakdown.md
+++ b/tab_documentation/failure_breakdown.md
@@ -12,7 +12,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests.
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/failure_rate.md 
b/tab_documentation/failure_rate.md
index a407a3c..0b37d29 100644
--- a/tab_documentation/failure_rate.md
+++ b/tab_documentation/failure_rate.md
@@ -13,7 +13,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/kpi_zero_results.md 
b/tab_documentation/kpi_zero_results.md
index fa0494b..1b566e9 100644
--- a/tab_documentation/kpi_zero_results.md
+++ b/tab_documentation/kpi_zero_results.md
@@ -5,7 +5,7 @@
 
 Outages and inaccuracies
 --
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32b5007beb984d83f94a46d8b98f328bcb351d99
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

___

[MediaWiki-commits] [Gerrit] Add links to the report on estimating zero results rate - change (wikimedia...rainbow)

2016-01-20 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Add links to the report on estimating zero results rate
..

Add links to the report on estimating zero results rate

Bug: T124072
Change-Id: I32b5007beb984d83f94a46d8b98f328bcb351d99
---
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_rate.md
M tab_documentation/kpi_zero_results.md
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow 
refs/changes/53/265453/1

diff --git a/tab_documentation/failure_breakdown.md 
b/tab_documentation/failure_breakdown.md
index 308a8a3..a357106 100644
--- a/tab_documentation/failure_breakdown.md
+++ b/tab_documentation/failure_breakdown.md
@@ -12,7 +12,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests.
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/failure_rate.md 
b/tab_documentation/failure_rate.md
index a407a3c..0b37d29 100644
--- a/tab_documentation/failure_rate.md
+++ b/tab_documentation/failure_rate.md
@@ -13,7 +13,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/kpi_zero_results.md 
b/tab_documentation/kpi_zero_results.md
index fa0494b..1b566e9 100644
--- a/tab_documentation/kpi_zero_results.md
+++ b/tab_documentation/kpi_zero_results.md
@@ -5,7 +5,7 @@
 
 Outages and inaccuracies
 --
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32b5007beb984d83f94a46d8b98f328bcb351d99
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner:

[MediaWiki-commits] [Gerrit] History merge API support - change (pywikibot/core)

2016-01-20 Thread Sn1per (Code Review)

Sn1per has uploaded a new change for review.

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

Change subject: History merge API support
..

History merge API support

Page history merging API support.
- Site.merge_history and Page.merge_history added
- Unit tests for above

Depends-on: Ic5078307dae78a2b3687e34a5d0a584988d483a1

Bug: T123198
Change-Id: I1a10700081a17583e10bc48bcab4e31d09be99bc
---
M pywikibot/page.py
M pywikibot/site.py
M tests/site_tests.py
3 files changed, 202 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/52/265452/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 82a9028..db0a199 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1703,6 +1703,23 @@
 return [{'user': rev.user, 'timestamp': 
unicode(rev.timestamp.isoformat())}
 for rev in self.revisions(total=total)]
 
+def merge_history(self, dest, timestamp=False, reason=False):
+"""
+Merge revisions from this page into another page.
+
+See L{APISite.merge_history} for details.
+
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.Page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type timestamp: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+return self.site.merge_history(self, dest, timestamp, reason)
+
 @deprecate_arg("throttle", None)
 def move(self, newtitle, reason=None, movetalkpage=True, sysop=False,
  deleteAndMove=False, safe=True):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 369972c..b33288a 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4874,6 +4874,100 @@
 return False
 
 OnErrorExc = namedtuple('OnErrorExc', 'exception on_new_page')
+
+# catalog of merge history errors for use in error messages
+_mh_errors = {
+"noapiwrite": "API editing not enabled on %(site)s wiki",
+"writeapidenied":
+"User %(user)s is not authorized to edit on %(site)s wiki",
+"mergehistory-fail-invalid-source": "Source %(source)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-invalid-dest": "Destination %(dest)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-no-change":
+"History merge did not merge any revisions. "
+"Please recheck the page and timestamp parameters.",
+"mergehistory-fail-permission":
+"User %(user)s has insufficient permissions to merge history.",
+"mergehistory-fail-timestamps-overlap":
+"Source revisions overlap or come after destination revisions."
+}
+
+@must_be(right='mergehistory')
+def merge_history(self, source, dest, timestamp=False, reason=False):
+"""Merge revisions from one page into another.
+
+Revisions dating up to the given timestamp in the source will be
+moved into the destination page history. History merge fails if
+the timestamps of source and dest revisions overlap (all source
+revisions must be dated before the earliest dest revision).
+
+@param source: Source page from which revisions will be merged
+@type source: pywikibot.Page
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type dest: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+# Check if pages exist before continuing
+if not source.exists():
+raise NoPage(source,
+ "Cannot merge revisions from source $(page)s because"
+ "it does not exist on $(site)s")
+if not dest.exists():
+raise NoPage(dest,
+ "Cannot merge revisions to destination $(page)s"
+ "because it does not exist on $(site)s")
+
+source_title = source.title(withSection=False)
+dest_title = source.title(withSection=False)
+if source_title == dest_title:  # Equal titles
+raise Error("Cannot merge revisions of %s to itself."
+% source_title)
+
+# Send the merge API request
+token = self.tokens['csrf']
+self.lock_page(source)
+self.lock_page(dest)
+req = self._simpl

[MediaWiki-commits] [Gerrit] Actively remove use of webproxy.eqiad.wmnet on labs - change (operations/puppet)

2016-01-20 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Actively remove use of webproxy.eqiad.wmnet on labs
..

Actively remove use of webproxy.eqiad.wmnet on labs

These files are still lingering on a lot of old instances.

Change-Id: Ibaba3be71e1acf8a098c478993f8bfe720209872
---
M modules/apt/manifests/init.pp
1 file changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/265451/1

diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index e7161db..b195d08 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -84,6 +84,26 @@
 } else {
 fail("Unknown operating system '${::operatingsystem}'.")
 }
+} else {
+if $::operatingsystem == 'Debian' {
+apt::conf { 'security-debian-proxy':
+ensure   => absent,
+}
+} elsif $::operatingsystem == 'Ubuntu' {
+apt::conf { 'security-ubuntu-proxy':
+ensure   => absent,
+}
+
+apt::conf { 'ubuntu-cloud-archive-proxy':
+ensure   => absent,
+}
+
+apt::conf { 'old-releases-proxy':
+ensure   => absent,
+}
+} else {
+fail("Unknown operating system '${::operatingsystem}'.")
+}
 }
 
 if $::operatingsystem == 'ubuntu' {

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

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

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

[MediaWiki-commits] [Gerrit] History merge API support - change (pywikibot/core)

2016-01-20 Thread Sn1per (Code Review)

Sn1per has uploaded a new change for review.

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

Change subject: History merge API support
..

History merge API support

Page history merging API support.
- Site.merge_history and Page.merge_history added
- Unit tests for above

Bug: T123198
Change-Id: Idcb421fc4df80545a95f6751082cd1be9602541e
---
M pywikibot/page.py
M pywikibot/site.py
M tests/site_tests.py
3 files changed, 202 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/50/265450/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 82a9028..db0a199 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1703,6 +1703,23 @@
 return [{'user': rev.user, 'timestamp': 
unicode(rev.timestamp.isoformat())}
 for rev in self.revisions(total=total)]
 
+def merge_history(self, dest, timestamp=False, reason=False):
+"""
+Merge revisions from this page into another page.
+
+See L{APISite.merge_history} for details.
+
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.Page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type timestamp: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+return self.site.merge_history(self, dest, timestamp, reason)
+
 @deprecate_arg("throttle", None)
 def move(self, newtitle, reason=None, movetalkpage=True, sysop=False,
  deleteAndMove=False, safe=True):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 369972c..b33288a 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4874,6 +4874,100 @@
 return False
 
 OnErrorExc = namedtuple('OnErrorExc', 'exception on_new_page')
+
+# catalog of merge history errors for use in error messages
+_mh_errors = {
+"noapiwrite": "API editing not enabled on %(site)s wiki",
+"writeapidenied":
+"User %(user)s is not authorized to edit on %(site)s wiki",
+"mergehistory-fail-invalid-source": "Source %(source)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-invalid-dest": "Destination %(dest)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-no-change":
+"History merge did not merge any revisions. "
+"Please recheck the page and timestamp parameters.",
+"mergehistory-fail-permission":
+"User %(user)s has insufficient permissions to merge history.",
+"mergehistory-fail-timestamps-overlap":
+"Source revisions overlap or come after destination revisions."
+}
+
+@must_be(right='mergehistory')
+def merge_history(self, source, dest, timestamp=False, reason=False):
+"""Merge revisions from one page into another.
+
+Revisions dating up to the given timestamp in the source will be
+moved into the destination page history. History merge fails if
+the timestamps of source and dest revisions overlap (all source
+revisions must be dated before the earliest dest revision).
+
+@param source: Source page from which revisions will be merged
+@type source: pywikibot.Page
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type dest: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+# Check if pages exist before continuing
+if not source.exists():
+raise NoPage(source,
+ "Cannot merge revisions from source $(page)s because"
+ "it does not exist on $(site)s")
+if not dest.exists():
+raise NoPage(dest,
+ "Cannot merge revisions to destination $(page)s"
+ "because it does not exist on $(site)s")
+
+source_title = source.title(withSection=False)
+dest_title = source.title(withSection=False)
+if source_title == dest_title:  # Equal titles
+raise Error("Cannot merge revisions of %s to itself."
+% source_title)
+
+# Send the merge API request
+token = self.tokens['csrf']
+self.lock_page(source)
+self.lock_page(dest)
+req = self._simple_request(action='mergehistory',
+

[MediaWiki-commits] [Gerrit] Add wikibase rights to $wgGrantPermissions - change (mediawiki...Wikibase)

2016-01-20 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Add wikibase rights to $wgGrantPermissions
..

Add wikibase rights to $wgGrantPermissions

grant restrictions are being moved from OAuth to core,
and these now need to be set for authentication changes
coming.

see Ida2b686 and
https://lists.wikimedia.org/pipermail/wikitech-l/2016-January/084501.html

Bug: T124269
Change-Id: I549c07f99168c9bd47fc968e10b8545a578e656b
---
M repo/Wikibase.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 8c9d642..182f5a2 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -124,6 +124,12 @@
$wgAvailableRights[] = 'item-redirect';
$wgAvailableRights[] = 'property-create';
 
+   $wgGrantPermissions['edit-page']['item-term'];
+   $wgGrantPermissions['edit-page']['item-redirect'];
+   $wgGrantPermissions['edit-page']['item-merge'];
+   $wgGrantPermissions['edit-page']['property-term'];
+   $wgGrantPermissions['createeditmovepage']['property-create'];
+
// i18n
$wgMessagesDirs['Wikibase'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['WikibaseAlias'] = __DIR__ . 
'/Wikibase.i18n.alias.php';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I549c07f99168c9bd47fc968e10b8545a578e656b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] History merge API support - change (pywikibot/core)

2016-01-20 Thread Sn1per (Code Review)

Sn1per has uploaded a new change for review.

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

Change subject: History merge API support
..

History merge API support

Page history merging API support.
- Site.merge_history and Page.merge_history added
- Unit tests for above

Bug: T123198
Change-Id: I52694309483451aed3b8c57ac025f0d3e965c23e
---
M pywikibot/page.py
M pywikibot/site.py
M tests/site_tests.py
3 files changed, 202 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/48/265448/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 82a9028..97c2210 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1703,6 +1703,23 @@
 return [{'user': rev.user, 'timestamp': 
unicode(rev.timestamp.isoformat())}
 for rev in self.revisions(total=total)]
 
+def merge_history(self, dest, timestamp=False, reason=False):
+"""
+Merge revisions from this page into another page.
+See L{APISite.merge_history} for details.
+
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.Page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type timestamp: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+return self.site.merge_history(self, dest, timestamp, reason)
+
+
 @deprecate_arg("throttle", None)
 def move(self, newtitle, reason=None, movetalkpage=True, sysop=False,
  deleteAndMove=False, safe=True):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 369972c..ba3ac46 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4874,6 +4874,99 @@
 return False
 
 OnErrorExc = namedtuple('OnErrorExc', 'exception on_new_page')
+
+# catalog of merge history errors for use in error messages
+_mh_errors = {
+"noapiwrite": "API editing not enabled on %(site)s wiki",
+"writeapidenied":
+"User %(user)s is not authorized to edit on %(site)s wiki",
+"mergehistory-fail-invalid-source": "Source %(source)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-invalid-dest": "Destination %(dest)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-no-change":
+"History merge did not merge any revisions. "
+"Please recheck the page and timestamp parameters.",
+"mergehistory-fail-permission":
+"User %(user)s has insufficient permissions to merge history.",
+"mergehistory-fail-timestamps-overlap":
+"Source revisions overlap or come after destination revisions."
+}
+@must_be(right='mergehistory')
+def merge_history(self, source, dest, timestamp=False, reason=False):
+"""Merge revisions from one page into another.
+
+Revisions dating up to the given timestamp in the source will be
+moved into the destination page history. History merge fails if
+the timestamps of source and dest revisions overlap (all source
+revisions must be dated before the earliest dest revision).
+
+@param source: Source page from which revisions will be merged
+@type source: pywikibot.Page
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type dest: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+# Check if pages exist before continuing
+if not source.exists():
+raise NoPage(source,
+ "Cannot merge revisions from source $(page)s because"
+ "it does not exist on $(site)s")
+if not dest.exists():
+raise NoPage(dest,
+ "Cannot merge revisions to destination $(page)s"
+ "because it does not exist on $(site)s")
+
+source_title = source.title(withSection=False)
+dest_title = source.title(withSection=False)
+if source_title == dest_title: # Equal titles
+raise Error("Cannot merge revisions of %s to itself."
+% source_title)
+
+# Send the merge API request
+token = self.tokens['csrf']
+self.lock_page(source)
+self.lock_page(dest)
+req = self._simple_request(action='mergehistory',
+

[MediaWiki-commits] [Gerrit] Remove unused/no longer existing item-create oauth grant - change (operations/mediawiki-config)

2016-01-20 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Remove unused/no longer existing item-create oauth grant
..

Remove unused/no longer existing item-create oauth grant

this was removed from wikibase back in 2014. (Ibec11b1)

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 31e4ae3..802e227 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -557,7 +557,6 @@
 $wgGrantPermissionGroups['checkuser'] = 'administration';
 
 // Rights needed to interact with wikibase
-$wgGrantPermissions['createeditmovepage']['item-create'] = true;
 $wgGrantPermissions['createeditmovepage']['property-create'] = true;
 $wgGrantPermissions['editpage']['item-term'] = true;
 $wgGrantPermissions['editpage']['item-merge'] = true;

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

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

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

[MediaWiki-commits] [Gerrit] Deploy missing data notes in Metrics dash - change (wikimedia...dashboard)

2016-01-20 Thread Bearloga (Code Review)

Bearloga has submitted this change and it was merged.

Change subject: Deploy missing data notes in Metrics dash
..


Deploy missing data notes in Metrics dash

Bug: T124072
Change-Id: I14551b095c7ef7544e1924d11d67ccd407148387
---
M shiny-server/metrics
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/shiny-server/metrics b/shiny-server/metrics
index c75f31b..d4fdf41 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit c75f31b30857867ccda27bdb49e43151d4810eb3
+Subproject commit d4fdf41233ded844eb4cf7ebc2d0fe137beb6ac9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14551b095c7ef7544e1924d11d67ccd407148387
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Deploy missing data notes in Metrics dash - change (wikimedia...dashboard)

2016-01-20 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Deploy missing data notes in Metrics dash
..

Deploy missing data notes in Metrics dash

Bug: T124072
Change-Id: I14551b095c7ef7544e1924d11d67ccd407148387
---
M shiny-server/metrics
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard 
refs/changes/46/265446/1

diff --git a/shiny-server/metrics b/shiny-server/metrics
index c75f31b..d4fdf41 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit c75f31b30857867ccda27bdb49e43151d4810eb3
+Subproject commit d4fdf41233ded844eb4cf7ebc2d0fe137beb6ac9

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14551b095c7ef7544e1924d11d67ccd407148387
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Add notes on dashboard why data is missing - change (wikimedia...rainbow)

2016-01-20 Thread Bearloga (Code Review)

Bearloga has submitted this change and it was merged.

Change subject: Add notes on dashboard why data is missing
..


Add notes on dashboard why data is missing

Bug: T124072
Change-Id: I6f22b32b982f365ab9bd4fa82114ffba7ccce8e1
---
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_rate.md
M tab_documentation/kpi_zero_results.md
3 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/tab_documentation/failure_breakdown.md 
b/tab_documentation/failure_breakdown.md
index fd18ad9..308a8a3 100644
--- a/tab_documentation/failure_breakdown.md
+++ b/tab_documentation/failure_breakdown.md
@@ -11,7 +11,8 @@
 
 Outages and inaccuracies
 --
-* On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
+* On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/failure_rate.md 
b/tab_documentation/failure_rate.md
index df37405..a407a3c 100644
--- a/tab_documentation/failure_rate.md
+++ b/tab_documentation/failure_rate.md
@@ -13,6 +13,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/kpi_zero_results.md 
b/tab_documentation/kpi_zero_results.md
index 32de6d0..fa0494b 100644
--- a/tab_documentation/kpi_zero_results.md
+++ b/tab_documentation/kpi_zero_results.md
@@ -5,8 +5,7 @@
 
 Outages and inaccuracies
 --
-
-* None so far!
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f22b32b982f365ab9bd4fa82114ffba7ccce8e1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Mark ApiULSLocalization internal - change (mediawiki...UniversalLanguageSelector)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Mark ApiULSLocalization internal
..


Mark ApiULSLocalization internal

Per suggestion in T91457#1944256

Change-Id: I27956c3f14188b3ae9f1c21e3f5c0e02ecb9e8f7
---
M api/ApiULSLocalization.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/api/ApiULSLocalization.php b/api/ApiULSLocalization.php
index 2699a4d..8bcbe3e 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -91,4 +91,9 @@
=> 'apihelp-ulslocalization-example-2',
);
}
+
+   // Try to scare people away from using this externally
+   public function isInternal() {
+   return true;
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27956c3f14188b3ae9f1c21e3f5c0e02ecb9e8f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Santhosh 
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 notes on dashboard why data is missing - change (wikimedia...rainbow)

2016-01-20 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Add notes on dashboard why data is missing
..

Add notes on dashboard why data is missing

Bug: T124072
Change-Id: I6f22b32b982f365ab9bd4fa82114ffba7ccce8e1
---
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_rate.md
M tab_documentation/kpi_zero_results.md
3 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow 
refs/changes/45/265445/1

diff --git a/tab_documentation/failure_breakdown.md 
b/tab_documentation/failure_breakdown.md
index fd18ad9..308a8a3 100644
--- a/tab_documentation/failure_breakdown.md
+++ b/tab_documentation/failure_breakdown.md
@@ -11,7 +11,8 @@
 
 Outages and inaccuracies
 --
-* On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
+* On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/failure_rate.md 
b/tab_documentation/failure_rate.md
index df37405..a407a3c 100644
--- a/tab_documentation/failure_rate.md
+++ b/tab_documentation/failure_rate.md
@@ -13,6 +13,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/kpi_zero_results.md 
b/tab_documentation/kpi_zero_results.md
index 32de6d0..fa0494b 100644
--- a/tab_documentation/kpi_zero_results.md
+++ b/tab_documentation/kpi_zero_results.md
@@ -5,8 +5,7 @@
 
 Outages and inaccuracies
 --
-
-* None so far!
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f22b32b982f365ab9bd4fa82114ffba7ccce8e1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Update citoid to cf4df7e - change (mediawiki...deploy)

2016-01-20 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review.

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

Change subject: Update citoid to cf4df7e
..

Update citoid to cf4df7e

List of changes:
cf4df7e Switch to Jessie and Node 4.2
xxx Update node module dependencies

Change-Id: Id279f70cf1f6a3b4041e6f55a47b206e97dab5d3
---
A node_modules/ansi-regex/license
M node_modules/ansi-regex/package.json
M node_modules/bluebird/package.json
M node_modules/body-parser/node_modules/bytes/package.json
M node_modules/body-parser/node_modules/depd/package.json
R node_modules/body-parser/node_modules/http-errors/LICENSE
R node_modules/body-parser/node_modules/http-errors/index.js
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/LICENSE
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits.js
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits_browser.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/test.js
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/LICENSE
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/codes.json
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/index.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json
A node_modules/body-parser/node_modules/http-errors/package.json
M node_modules/body-parser/node_modules/qs/package.json
M node_modules/body-parser/node_modules/raw-body/package.json
M node_modules/body-parser/package.json
M node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json
M node_modules/bunyan/node_modules/dtrace-provider/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
M node_modules/bunyan/node_modules/mv/node_modules/ncp/package.json
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/LICENSE
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/LICENSE
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/inherits.js
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/inherits_browser.js
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/package.json
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/test.js
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/LICENSE
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/LICENSE
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/package.json
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/license
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/wrappy/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/package.json
M node_modules/bunyan/node_modules/mv/node_modules/rimraf/package.json
M node_modules/bunyan/node_modules/mv/package.json
M node_modules/bunyan/node_modules/safe-json-stringify/package.json
M node_modules/bunyan/package.json
M node_modules/cassandra-uuid/node_modules/long/package.json
M node_modules/cassandra-uuid/package.json
C node_modules/cheerio/node_modules/css-select/LICENSE
M 
node_modules/cheerio/node_modules/css-select/node_modules/boolbase/package.json
C node_modules/cheerio/node_modules/css-select/node_modules/css-what/LICENSE
M 
node_modules/cheerio/node_modules/css-select/node_modules/css-what/package.json
C 
node_modules/cheerio/node_modules/css-select/node_modules/domutils/node_modules/domelementtype/LICENSE
A 
node_modules/cheerio/node_modules/css-select/node_modules/

[MediaWiki-commits] [Gerrit] Remove old unneeded URL exclusion rules - change (pywikibot/core)

2016-01-20 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Remove old unneeded URL exclusion rules
..

Remove old unneeded URL exclusion rules

No problems are experienced now accessing these URLs.

Bug: T124015
Change-Id: I1f33969058fc67f8437f2f92325faba636a9c81c
---
M scripts/weblinkchecker.py
1 file changed, 3 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/42/265442/1

diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py
index d1f0834..7aa40b0 100755
--- a/scripts/weblinkchecker.py
+++ b/scripts/weblinkchecker.py
@@ -162,19 +162,13 @@
 
 # Other special cases
 # bot somehow can't handle their redirects:
+# TODO: T124140
 re.compile(r'.*[\./@]gso\.gbv\.de(/.*)?'),
+
 re.compile(r'.*[\./@]berlinonline\.de(/.*)?'),
 # above entry to be manually fixed per request at 
[[de:Benutzer:BLueFiSH.as/BZ]]
 # bot can't handle their redirects:
-re.compile(r'.*[\./@]bodo\.kommune\.no(/.*)?'),
-re.compile(r'.*[\./@]jpl\.nasa\.gov(/.*)?'),  # bot rejected on the site
-re.compile(r'.*[\./@]itis\.gov(/.*)?'),  # bot rejected on the site
-re.compile(r'.*[\./@]cev\.lu(/.*)?'),  # bot rejected on the site
-# very slow response resulting in bot error:
-re.compile(r'.*[\./@]science\.ksc\.nasa\.gov(/.*)?'),
-re.compile(r'.*[\./@]britannica\.com(/.*)?'),  # HTTP redirect loop
-# bot rejected on the site:
-re.compile(r'.*[\./@]quickfacts\.census\.gov(/.*)?'),
+
 # bot rejected on the site, already archived
 re.compile(r'.*[\./@]web\.archive\.org(/.*)?'),
 ]

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

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

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

[MediaWiki-commits] [Gerrit] Switch to Jessie and Node 4.2 - change (mediawiki...citoid)

2016-01-20 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged.

Change subject: Switch to Jessie and Node 4.2
..


Switch to Jessie and Node 4.2

Bug: T107304
Change-Id: I8fb207f93746159dce0395fae2abd2c4c00765bd
---
M package.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/package.json b/package.json
index bd81e86..22d896f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
 "swagger-router": "^0.3.4"
   },
   "deploy": {
-"target": "ubuntu",
+"node": "4.2",
+"target": "debian",
 "dependencies": {
   "_all": []
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fb207f93746159dce0395fae2abd2c4c00765bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Mvolz 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Switch to Jessie and Node 4.2 - change (mediawiki...citoid)

2016-01-20 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review.

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

Change subject: Switch to Jessie and Node 4.2
..

Switch to Jessie and Node 4.2

Bug: T107304
Change-Id: I8fb207f93746159dce0395fae2abd2c4c00765bd
---
M package.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid 
refs/changes/41/265441/1

diff --git a/package.json b/package.json
index bd81e86..22d896f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
 "swagger-router": "^0.3.4"
   },
   "deploy": {
-"target": "ubuntu",
+"node": "4.2",
+"target": "debian",
 "dependencies": {
   "_all": []
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fb207f93746159dce0395fae2abd2c4c00765bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] Job runners: Add a dedicated htmlCacheUpdate runner - change (operations/puppet)

2016-01-20 Thread Ori.livneh (Code Review)

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

Change subject: Job runners: Add a dedicated htmlCacheUpdate runner
..


Job runners: Add a dedicated htmlCacheUpdate runner

The bulk of the jobs in the queue are Wikidata / enwiki / Commons
htmlCacheUpdate jobs, which use $wgJobBackoffThrottling. Adding a dedicated
runner would help ensure that these jobs get processed as soon as the backoff
expires, and would support Aaron's theory that the de facto throttle rate is
far lower than what we set it to.

Bug: T123815
Bug: T124194
Change-Id: I180856917b5c74437e10e4c9b45e4e0a2ea1e381
---
M hieradata/role/common/mediawiki/jobrunner.yaml
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
3 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml 
b/hieradata/role/common/mediawiki/jobrunner.yaml
index f5c4dea..93bd460 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -7,6 +7,7 @@
 mediawiki::jobrunner::runners_restbase: 3
 mediawiki::jobrunner::runners_translate: 1
 mediawiki::jobrunner::runners_upload: 7
+mediawiki::jobrunner::runners_html: 1
 nutcracker::verbosity: "4"
 hhvm::extra::fcgi:
   max_execution_time: 1200
diff --git a/modules/mediawiki/manifests/jobrunner.pp 
b/modules/mediawiki/manifests/jobrunner.pp
index 13f9329..cd65bda 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -7,6 +7,7 @@
 $queue_servers,
 $aggr_servers  = $queue_servers,
 $runners_basic = 0,
+$runners_html  = 0,
 $runners_upload= 0,
 $runners_gwt   = 0,
 $runners_restbase  = 0,
diff --git a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb 
b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
index 365fd6b..58a0665 100644
--- a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
@@ -25,6 +25,12 @@
 "refreshLinks"
 ]
 },
+"html": {
+"runners": <%=  @runners_html  %>,
+"include": [
+"htmlCacheUpdate"
+]
+},
 "gwt": {
 "runners": <%=  @runners_gwt  %>,
 "include": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I180856917b5c74437e10e4c9b45e4e0a2ea1e381
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] graphite doesn't allow spaces in stat names - change (mediawiki...GeoData)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: graphite doesn't allow spaces in stat names
..


graphite doesn't allow spaces in stat names

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

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



diff --git a/includes/api/ApiQueryGeoSearchElastic.php 
b/includes/api/ApiQueryGeoSearchElastic.php
index 4436ac9..aa8dabf 100644
--- a/includes/api/ApiQueryGeoSearchElastic.php
+++ b/includes/api/ApiQueryGeoSearchElastic.php
@@ -90,7 +90,7 @@
 
$searcher = new Searcher( $this->getUser() );
 
-   $resultSet = $searcher->performSearch( $query, 'GeoData spatial 
search' );
+   $resultSet = $searcher->performSearch( $query, 
'GeoData_spatial_search' );
 
if ( isset( $params['debug'] ) && $params['debug'] ) {
$this->addDebugInfo( $resultSet );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d023bc203b36d3cb1373f92463962b202615d69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] graphite doesn't allow spaces in stat names - change (mediawiki...GeoData)

2016-01-20 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: graphite doesn't allow spaces in stat names
..

graphite doesn't allow spaces in stat names

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


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

diff --git a/includes/api/ApiQueryGeoSearchElastic.php 
b/includes/api/ApiQueryGeoSearchElastic.php
index 4436ac9..aa8dabf 100644
--- a/includes/api/ApiQueryGeoSearchElastic.php
+++ b/includes/api/ApiQueryGeoSearchElastic.php
@@ -90,7 +90,7 @@
 
$searcher = new Searcher( $this->getUser() );
 
-   $resultSet = $searcher->performSearch( $query, 'GeoData spatial 
search' );
+   $resultSet = $searcher->performSearch( $query, 
'GeoData_spatial_search' );
 
if ( isset( $params['debug'] ) && $params['debug'] ) {
$this->addDebugInfo( $resultSet );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d023bc203b36d3cb1373f92463962b202615d69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] Job runners: Add a dedicated htmlCacheUpdate runner - change (operations/puppet)

2016-01-20 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Job runners: Add a dedicated htmlCacheUpdate runner
..

Job runners: Add a dedicated htmlCacheUpdate runner

The bulk of the jobs in the queue are Wikidata / enwiki / Commons
htmlCacheUpdate jobs, which use $wgJobBackoffThrottling. Adding a dedicated
runner would help ensure that these jobs get processed as soon as the backoff
expires, and would support Aaron's theory that the de facto throttle rate is
far lower than what we set it to.

Bug: T123815
Bug: T124194
Change-Id: I180856917b5c74437e10e4c9b45e4e0a2ea1e381
---
M hieradata/role/common/mediawiki/jobrunner.yaml
M modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
2 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml 
b/hieradata/role/common/mediawiki/jobrunner.yaml
index f5c4dea..93bd460 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -7,6 +7,7 @@
 mediawiki::jobrunner::runners_restbase: 3
 mediawiki::jobrunner::runners_translate: 1
 mediawiki::jobrunner::runners_upload: 7
+mediawiki::jobrunner::runners_html: 1
 nutcracker::verbosity: "4"
 hhvm::extra::fcgi:
   max_execution_time: 1200
diff --git a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb 
b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
index 365fd6b..58a0665 100644
--- a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
@@ -25,6 +25,12 @@
 "refreshLinks"
 ]
 },
+"html": {
+"runners": <%=  @runners_html  %>,
+"include": [
+"htmlCacheUpdate"
+]
+},
 "gwt": {
 "runners": <%=  @runners_gwt  %>,
 "include": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I180856917b5c74437e10e4c9b45e4e0a2ea1e381
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Remove partial submodule. - change (mediawiki...SpellingDictionary)

2016-01-20 Thread JanZerebecki (Code Review)

JanZerebecki has uploaded a new change for review.

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

Change subject: Remove partial submodule.
..

Remove partial submodule.

It seems this was not properly removed. It causes problem when checking out
submodules recursively.

Change-Id: I89e50002f659a2fabbde82dc07d86ef9c34fdc84
---
D modules/jquery.uls
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/modules/jquery.uls b/modules/jquery.uls
deleted file mode 16
index 10777bb..000
--- a/modules/jquery.uls
+++ /dev/null
-Subproject commit 10777bb25ea23dc5609a1109a27e901711cc264b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89e50002f659a2fabbde82dc07d86ef9c34fdc84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpellingDictionary
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 

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

[MediaWiki-commits] [Gerrit] elasticsearch: Add ferm rule for labtestweb2001 - change (operations/puppet)

2016-01-20 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: elasticsearch: Add ferm rule for labtestweb2001
..


elasticsearch: Add ferm rule for labtestweb2001

Testlabs box for running wikitech clone

Change-Id: I28b5515de2ee2ec3708115ad52e87f660ffac2ca
---
M modules/role/manifests/elasticsearch/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/elasticsearch/server.pp 
b/modules/role/manifests/elasticsearch/server.pp
index ca91d93..0ef61e9 100644
--- a/modules/role/manifests/elasticsearch/server.pp
+++ b/modules/role/manifests/elasticsearch/server.pp
@@ -22,7 +22,7 @@
 proto   => 'tcp',
 port=> '9200',
 notrack => true,
-srange  => '(($INTERNAL @resolve(silver.wikimedia.org)))',
+srange  => '(($INTERNAL @resolve(silver.wikimedia.org) 
@resolve(labtestweb2001.wikimedia.org)))',
 }
 
 $elastic_nodes = hiera('elasticsearch::cluster_hosts')

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

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

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

[MediaWiki-commits] [Gerrit] Deploy new dashboards - Metrics dash more robust to bad data... - change (wikimedia...dashboard)

2016-01-20 Thread OliverKeyes (Code Review)

OliverKeyes has submitted this change and it was merged.

Change subject: Deploy new dashboards - Metrics dash more robust to bad data - 
Maps dash has new annotations
..


Deploy new dashboards
- Metrics dash more robust to bad data
- Maps dash has new annotations

Bug: T124099
Change-Id: Ifef00c37c6ab78ebeaeb6b34b3123003bde305a0
---
M CHANGELOG.md
M shiny-server/external
M shiny-server/maps
M shiny-server/metrics
4 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3adea1..0dc80e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log (Patch Notes)
 All notable changes to the *Discovery Dashboards* project will be documented 
in this file.
 
+## 2016/01/20
+- Deployed new, more robust Metrics dashboard version
+- Deployed Maps dashboard with new annotations
+
+## 2016/01/19
+- Deployed Portal dashboard that includes geo graphs
+
 ## 2015/12/14
 - Deploying WDQS dashboard that includes bot filtering for usage data
 - Deploying URL updaters across all dashboards
diff --git a/shiny-server/external b/shiny-server/external
index 2ea5ca8..887d5e5 16
--- a/shiny-server/external
+++ b/shiny-server/external
-Subproject commit 2ea5ca8e9dfe5b53fd6e8c70af8e5c283be18c4a
+Subproject commit 887d5e532ef32ad260d2a99b30ab7017e2020412
diff --git a/shiny-server/maps b/shiny-server/maps
index 9530f23..989bd9b 16
--- a/shiny-server/maps
+++ b/shiny-server/maps
-Subproject commit 9530f2328bf52495e1548cc85a28ab842e1a923c
+Subproject commit 989bd9b6892664afd7388edd0cff572a24a4c891
diff --git a/shiny-server/metrics b/shiny-server/metrics
index 6031782..c75f31b 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit 6031782c388fa26c7dbb511f775ff9c94d6410a7
+Subproject commit c75f31b30857867ccda27bdb49e43151d4810eb3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef00c37c6ab78ebeaeb6b34b3123003bde305a0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: OliverKeyes 

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

[MediaWiki-commits] [Gerrit] elasticsearch: Add ferm rule for labtestweb2001 - change (operations/puppet)

2016-01-20 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: elasticsearch: Add ferm rule for labtestweb2001
..

elasticsearch: Add ferm rule for labtestweb2001

Testlabs box for running wikitech clone

Change-Id: I28b5515de2ee2ec3708115ad52e87f660ffac2ca
---
M modules/role/manifests/elasticsearch/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/role/manifests/elasticsearch/server.pp 
b/modules/role/manifests/elasticsearch/server.pp
index ca91d93..0ef61e9 100644
--- a/modules/role/manifests/elasticsearch/server.pp
+++ b/modules/role/manifests/elasticsearch/server.pp
@@ -22,7 +22,7 @@
 proto   => 'tcp',
 port=> '9200',
 notrack => true,
-srange  => '(($INTERNAL @resolve(silver.wikimedia.org)))',
+srange  => '(($INTERNAL @resolve(silver.wikimedia.org) 
@resolve(labtestweb2001.wikimedia.org)))',
 }
 
 $elastic_nodes = hiera('elasticsearch::cluster_hosts')

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

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

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

[MediaWiki-commits] [Gerrit] Plugin: hook destroy regardless of provider - change (mediawiki/vagrant)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Plugin: hook destroy regardless of provider
..


Plugin: hook destroy regardless of provider

Change the `:machine_action_destroy` hook in mediawiki-vagrant plugin so
that it fires for all providers. The previous implementation only fired
when the VM provider was VirtualBox. This meant that the cleanup of
puppet provisioned files on the host computer did not occur of LXC and
other providers.

Change-Id: Ie9044dadac3e619754a11d582afe8e38bbda9923
---
M lib/mediawiki-vagrant.rb
M lib/mediawiki-vagrant/version.rb
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/mediawiki-vagrant.rb b/lib/mediawiki-vagrant.rb
index 2dca567..fc1e2db 100644
--- a/lib/mediawiki-vagrant.rb
+++ b/lib/mediawiki-vagrant.rb
@@ -86,7 +86,7 @@
 
 action_hook(:mediawiki, :machine_action_destroy) do |hook|
   require 'mediawiki-vagrant/destroy'
-  hook.before(VagrantPlugins::ProviderVirtualBox::Action::Destroy, Destroy)
+  hook.prepend(Destroy)
 end
 
 provisioner 'mediawiki_reload' do
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index e699811..93797c0 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
 module MediaWikiVagrant
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9044dadac3e619754a11d582afe8e38bbda9923
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove deprecated calling style of UserMailer::send() - change (mediawiki/core)

2016-01-20 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Remove deprecated calling style of UserMailer::send()
..

Remove deprecated calling style of UserMailer::send()

Change-Id: I475932f37a579dd86bfd98e6b14509d6ba86f128
---
M includes/mail/UserMailer.php
1 file changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index ded5dec..17a3f82 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -107,9 +107,6 @@
 *  'contentType' string default 'text/plain; charset=UTF-8'
 *  'headers' array Extra headers to set
 *
-* Previous versions of this function had $replyto as the 5th argument 
and $contentType
-* as the 6th. These are still supported for backwards compatability, 
but deprecated.
-*
 * @throws MWException
 * @throws Exception
 * @return Status
@@ -117,14 +114,6 @@
public static function send( $to, $from, $subject, $body, $options = 
array() ) {
global $wgAllowHTMLEmail;
 
-   if ( !is_array( $options ) ) {
-   // Old calling style
-   wfDeprecated( __METHOD__ . ' with $replyto as 5th 
parameter', '1.26' );
-   $options = array( 'replyTo' => $options );
-   if ( func_num_args() === 6 ) {
-   $options['contentType'] = func_get_arg( 5 );
-   }
-   }
if ( !isset( $options['contentType'] ) ) {
$options['contentType'] = 'text/plain; charset=UTF-8';
}

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

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

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

[MediaWiki-commits] [Gerrit] Fixup contenttype stuff in UserMailer - change (mediawiki/core)

2016-01-20 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Fixup contenttype stuff in UserMailer
..

Fixup contenttype stuff in UserMailer

Change-Id: I9e251962fe731fa78f6867a14e2e91783288dd61
---
M includes/mail/UserMailer.php
1 file changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 85595f1..ded5dec 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -116,7 +116,7 @@
 */
public static function send( $to, $from, $subject, $body, $options = 
array() ) {
global $wgAllowHTMLEmail;
-   $contentType = 'text/plain; charset=UTF-8';
+
if ( !is_array( $options ) ) {
// Old calling style
wfDeprecated( __METHOD__ . ' with $replyto as 5th 
parameter', '1.26' );
@@ -124,6 +124,9 @@
if ( func_num_args() === 6 ) {
$options['contentType'] = func_get_arg( 5 );
}
+   }
+   if ( !isset( $options['contentType'] ) ) {
+   $options['contentType'] = 'text/plain; charset=UTF-8';
}
 
if ( !is_array( $to ) ) {
@@ -327,8 +330,7 @@
$body = str_replace( "\n", "\r\n", $body );
}
$headers['MIME-Version'] = '1.0';
-   $headers['Content-type'] = ( is_null( $contentType ) ?
-   'text/plain; charset=UTF-8' : $contentType );
+   $headers['Content-type'] = $contentType;
$headers['Content-transfer-encoding'] = '8bit';
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...EmailCapture)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Call UserMailer::send() with reply to address correctly
..


Call UserMailer::send() with reply to address correctly

Change-Id: I10fc6674514d9ccfb0df75d5e7d4f0fe046c0ea0
---
M api/ApiEmailCapture.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/api/ApiEmailCapture.php b/api/ApiEmailCapture.php
index b501b05..e0d5406 100644
--- a/api/ApiEmailCapture.php
+++ b/api/ApiEmailCapture.php
@@ -44,8 +44,10 @@
),
$this->msg( 
$wgEmailCaptureAutoResponse['subject-msg'] )->text(),
$this->msg( 
$wgEmailCaptureAutoResponse['body-msg'], $fullLink, $link, $code )->text(),
-   $wgEmailCaptureAutoResponse['reply-to'],
-   
$wgEmailCaptureAutoResponse['content-type']
+   array(
+   'replyTo' => 
$wgEmailCaptureAutoResponse['reply-to'],
+   'contentType' => 
$wgEmailCaptureAutoResponse['content-type']
+   )
);
}
$r = array( 'result' => 'Success' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10fc6674514d9ccfb0df75d5e7d4f0fe046c0ea0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EmailCapture
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...Echo)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Call UserMailer::send() with reply to address correctly
..


Call UserMailer::send() with reply to address correctly

Change-Id: I240c61a154af591e852cd9ddc537365bc22d2855
---
M includes/EmailBundler.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php
index 514f9a7..438580a 100644
--- a/includes/EmailBundler.php
+++ b/includes/EmailBundler.php
@@ -252,7 +252,13 @@
$replyAddress = new MailAddress( $wgNotificationSender, 
$wgNotificationReplyName );
 
// Schedule a email job or just send the email directly?
-   UserMailer::send( $toAddress, $fromAddress, 
$content['subject'], $content['body'], $replyAddress );
+   UserMailer::send(
+   $toAddress,
+   $fromAddress,
+   $content['subject'],
+   $content['body'],
+   array( 'replyTo' => $replyAddress )
+   );
MWEchoEventLogging::logSchemaEchoMail( $this->mUser, 'bundle' );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I240c61a154af591e852cd9ddc537365bc22d2855
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...SemanticWatchlist)

2016-01-20 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Call UserMailer::send() with reply to address correctly
..

Call UserMailer::send() with reply to address correctly

Change-Id: I3fce6c666e2c878a221e2e4c6acacfd0254d173a
---
M includes/SWL_Emailer.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/includes/SWL_Emailer.php b/includes/SWL_Emailer.php
index 34b0e18..e8328c3 100644
--- a/includes/SWL_Emailer.php
+++ b/includes/SWL_Emailer.php
@@ -56,8 +56,7 @@
new MailAddress( $wgPasswordSender, 
$wgPasswordSenderName ),
$title,
$emailText,
-   null,
-   'text/html; charset=ISO-8859-1'
+   array( 'contentType' => 'text/html; charset=ISO-8859-1' 
)
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fce6c666e2c878a221e2e4c6acacfd0254d173a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticWatchlist
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...EmailCapture)

2016-01-20 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Call UserMailer::send() with reply to address correctly
..

Call UserMailer::send() with reply to address correctly

Change-Id: I10fc6674514d9ccfb0df75d5e7d4f0fe046c0ea0
---
M api/ApiEmailCapture.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/api/ApiEmailCapture.php b/api/ApiEmailCapture.php
index b501b05..e0d5406 100644
--- a/api/ApiEmailCapture.php
+++ b/api/ApiEmailCapture.php
@@ -44,8 +44,10 @@
),
$this->msg( 
$wgEmailCaptureAutoResponse['subject-msg'] )->text(),
$this->msg( 
$wgEmailCaptureAutoResponse['body-msg'], $fullLink, $link, $code )->text(),
-   $wgEmailCaptureAutoResponse['reply-to'],
-   
$wgEmailCaptureAutoResponse['content-type']
+   array(
+   'replyTo' => 
$wgEmailCaptureAutoResponse['reply-to'],
+   'contentType' => 
$wgEmailCaptureAutoResponse['content-type']
+   )
);
}
$r = array( 'result' => 'Success' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10fc6674514d9ccfb0df75d5e7d4f0fe046c0ea0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EmailCapture
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Enable Echo cross-wiki tracking table on all wikis with Cent... - change (operations/mediawiki-config)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Enable Echo cross-wiki tracking table on all wikis with 
CentralAuth
..


Enable Echo cross-wiki tracking table on all wikis with CentralAuth

Remove wmgEchoUseCrossWikiTrackingTable and replace with
a check for CentralAuth.

Bug: T124232
Change-Id: I20537a01365333a9694e18f0bf9b20a3377adc83
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 5 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 8e21034..90e0ce3 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -346,8 +346,10 @@
$wgEventServiceUrl = 
'http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events';
 }
 
-if ( $wmgUseEcho ) {
+if ( $wmgUseEcho && $wmgUseCentralAuth ) {
$wgEchoSharedTrackingDB = 'wikishared';
+   // Set cluster back to false, to override CommonSettings.php setting it 
to 'extension1'
+   $wgEchoSharedTrackingCluster = false;
 }
 
 // Experimental
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d5a9cea..31e4ae3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2492,7 +2492,8 @@
// Whether to make the cross-wiki notifications beta feature available
$wgEchoUseCrossWikiBetaFeature = $wmgEchoUseCrossWikiBetaFeature;
 
-   if ( $wmgEchoUseCrossWikiTrackingTable ) {
+   // Enable tracking table only on SULed wikis
+   if ( $wmgUseCentralAuth ) {
$wgEchoSharedTrackingDB = 'wikishared';
// Explicitly set this to 'extension1', because some wikis have 
$wgEchoCluster set to false
$wgEchoSharedTrackingCluster = 'extension1';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d12bebc..c5e06d8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14982,12 +14982,6 @@
'mediawikiwiki' => true,
 ),
 
-'wmgEchoUseCrossWikiTrackingTable' => array(
-   'default' => false,
-   'testwiki' => true,
-   'test2wiki' => true,
-),
-
 // Thanks should be enabled for wikis with Echo
 'wmgUseThanks' => array(
'default' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I20537a01365333a9694e18f0bf9b20a3377adc83
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...Echo)

2016-01-20 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Call UserMailer::send() with reply to address correctly
..

Call UserMailer::send() with reply to address correctly

Change-Id: I240c61a154af591e852cd9ddc537365bc22d2855
---
M includes/EmailBundler.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php
index 514f9a7..438580a 100644
--- a/includes/EmailBundler.php
+++ b/includes/EmailBundler.php
@@ -252,7 +252,13 @@
$replyAddress = new MailAddress( $wgNotificationSender, 
$wgNotificationReplyName );
 
// Schedule a email job or just send the email directly?
-   UserMailer::send( $toAddress, $fromAddress, 
$content['subject'], $content['body'], $replyAddress );
+   UserMailer::send(
+   $toAddress,
+   $fromAddress,
+   $content['subject'],
+   $content['body'],
+   array( 'replyTo' => $replyAddress )
+   );
MWEchoEventLogging::logSchemaEchoMail( $this->mUser, 'bundle' );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I240c61a154af591e852cd9ddc537365bc22d2855
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Allow UserInputWidget on mobile - change (mediawiki/core)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Allow UserInputWidget on mobile
..


Allow UserInputWidget on mobile

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

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/Resources.php b/resources/Resources.php
index cd9810c..60c3175 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2160,6 +2160,7 @@
'dependencies' => array(
'oojs-ui',
),
+   'targets' => array( 'desktop', 'mobile' ),
),
 
/* es5-shim */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87699a93ca1b34c6d248456fcc060f584623d158
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use intermediary for searching - change (mediawiki...GeoData)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Use intermediary for searching
..


Use intermediary for searching

Bug: T124102
Change-Id: I21ac36cf9a691168119be563d33ac9c671368c53
(cherry picked from commit 2237357be9f6a716ed2e17ec4607d590bcc4263d)
---
M GeoData.php
A includes/Searcher.php
M includes/api/ApiQueryGeoSearchElastic.php
3 files changed, 185 insertions(+), 161 deletions(-)

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



diff --git a/GeoData.php b/GeoData.php
index be5d7e9..c0e21a9 100644
--- a/GeoData.php
+++ b/GeoData.php
@@ -28,6 +28,7 @@
 $wgAutoloadClasses['GeoData\GeoData'] = "$dir/includes/GeoData.body.php";
 $wgAutoloadClasses['GeoData\Hooks'] = "$dir/includes/Hooks.php";
 $wgAutoloadClasses['GeoData\Math'] = "$dir/includes/Math.php";
+$wgAutoloadClasses['GeoData\Searcher'] = "$dir/includes/Searcher.php";
 
 $wgMessagesDirs['GeoData'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['GeoData'] = "$dir/GeoData.i18n.php";
diff --git a/includes/Searcher.php b/includes/Searcher.php
new file mode 100644
index 000..cee6e8a
--- /dev/null
+++ b/includes/Searcher.php
@@ -0,0 +1,47 @@
+makeConfig( 
'CirrusSearch' );
+   $connection = new \CirrusSearch\Connection( $config );
+
+   parent::__construct( $connection, $user, 0 );
+   }
+
+   /**
+* Perform search
+*
+* @param \Elastica\Query $query
+* @param string $queryType Query description for logging
+* @return \Elastica\ResultSet
+* @throws ExceptionInterface
+*/
+   public function performSearch( \Elastica\Query $query, $queryType ) {
+   $pageType = $this->connection->getPageType( wfWikiID() );
+   $search = $pageType->createSearch( $query );
+
+   try {
+   $this->start( "performing $queryType", array( 
'queryType' => $queryType ) );
+   $result = $search->search();
+   $this->success();
+   } catch ( ExceptionInterface $ex ) {
+   $this->failure( $ex );
+   throw $ex;
+   }
+
+   return $result;
+   }
+}
\ No newline at end of file
diff --git a/includes/api/ApiQueryGeoSearchElastic.php 
b/includes/api/ApiQueryGeoSearchElastic.php
index d06196c..4436ac9 100644
--- a/includes/api/ApiQueryGeoSearchElastic.php
+++ b/includes/api/ApiQueryGeoSearchElastic.php
@@ -3,8 +3,6 @@
 namespace GeoData;
 
 use ApiPageSet;
-use ConfigFactory;
-use MWException;
 use MWNamespace;
 use Title;
 
@@ -24,185 +22,163 @@
parent::run( $resultPageSet );
$this->resetQueryParams(); //@fixme: refactor to make this 
unnecessary
 
-   try {
-   $params = $this->params = $this->extractRequestParams();
+   $params = $this->params = $this->extractRequestParams();
 
-   $bools = new \Elastica\Filter\BoolFilter();
-   if ( $this->idToExclude ) {
-   $bools->addMustNot(
-   new \Elastica\Filter\Term( array( '_id' 
=> $this->idToExclude ) )
-   );
-   }
-   // Only Earth is supported
-   $bools->addMust( new \Elastica\Filter\Term( array( 
'coordinates.globe' => 'earth' ) ) );
-   if ( isset( $params['maxdim'] ) ) {
-   $bools->addMust( new \Elastica\Filter\Range(
-   'coordinates.dim',
-   array( 'to' => $params['maxdim'] ) )
-   );
-   }
+   $bools = new \Elastica\Filter\BoolFilter();
+   if ( $this->idToExclude ) {
+   $bools->addMustNot( new \Elastica\Filter\Term( array( 
'_id' => $this->idToExclude ) ) );
+   }
+   // Only Earth is supported
+   $bools->addMust( new \Elastica\Filter\Term( array( 
'coordinates.globe' => 'earth' ) ) );
+   if ( isset( $params['maxdim'] ) ) {
+   $bools->addMust( new \Elastica\Filter\Range( 
'coordinates.dim',
+   array( 'to' => $params['maxdim'] ) ) );
+   }
 
-   $primary = $params['primary'];
-   if ( $primary !== 'all' ) {
-   $bools->addMust( new \Elastica\Filter\Term(
-   array( 'coordinates.primary' => intval( 
$primary === 'primary' ) )
+   $primary = $params['primary'];
+   if ( $primary !== 'all' ) {
+   $bools->addMust( new \Elastica\Filter\Term( array(
+   'coordinates.primary' =>

[MediaWiki-commits] [Gerrit] Update Vagrant links in README-lxc - change (mediawiki/vagrant)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Update Vagrant links in README-lxc
..


Update Vagrant links in README-lxc

Link to the currently released version.

Change-Id: I31157bcb6b190296fd0af450e3aaca4285b3f4a1
---
M support/README-lxc.md
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/support/README-lxc.md b/support/README-lxc.md
index cda200d..bf6 100644
--- a/support/README-lxc.md
+++ b/support/README-lxc.md
@@ -32,8 +32,8 @@
 official PPA.
 Check https://www.vagrantup.com/downloads.html for current version URL.
 
-wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb
-sudo dpkg -i vagrant_1.7.2_x86_64.deb
+wget https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.deb
+sudo dpkg -i vagrant_1.8.1_x86_64.deb
 
 Install the Vagrant LXC provider plugin:
 
@@ -74,8 +74,8 @@
 at vagrantup.com. Check https://www.vagrantup.com/downloads.html for the
 most up to date download URL.
 
-wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4_x86_64.deb
-sudo dpkg -i vagrant_1.7.4_x86_64.deb
+wget https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.deb
+sudo dpkg -i vagrant_1.8.1_x86_64.deb
 
 Install the Vagrant LXC provider plugin:
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31157bcb6b190296fd0af450e3aaca4285b3f4a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable EventBus extension on test wikis - change (operations/mediawiki-config)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Enable EventBus extension on test wikis
..


Enable EventBus extension on test wikis

Bug: T116786
Change-Id: I87480c7cc43d20fdca190dd7646281b534c3269d
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 082e5bc..87b39a7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16232,6 +16232,8 @@
 
 'wmgUseEventBus' => array(
'default' => false,
+   'testwiki' => true,
+   'test2wiki' => true,
 ),
 
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87480c7cc43d20fdca190dd7646281b534c3269d
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Eevans 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Thcipriani 
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 UserInputWidget on mobile - change (mediawiki/core)

2016-01-20 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Allow UserInputWidget on mobile
..

Allow UserInputWidget on mobile

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


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

diff --git a/resources/Resources.php b/resources/Resources.php
index cd9810c..60c3175 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2160,6 +2160,7 @@
'dependencies' => array(
'oojs-ui',
),
+   'targets' => array( 'desktop', 'mobile' ),
),
 
/* es5-shim */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87699a93ca1b34c6d248456fcc060f584623d158
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Use 'u' as preg regex modifier in UrlSchemeValidators - change (mediawiki...Wikibase)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Use 'u' as preg regex modifier in UrlSchemeValidators
..


Use 'u' as preg regex modifier in UrlSchemeValidators

Like Parser uses its Parser::EXT_LINK_URL_CLASS.

Bug: T56004
Change-Id: I0a0671131d5cea5dc82b68635cae2ca43b71dfc6
---
M repo/includes/Validators/UrlSchemeValidators.php
M repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php
2 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/repo/includes/Validators/UrlSchemeValidators.php 
b/repo/includes/Validators/UrlSchemeValidators.php
index d04151c..04df04c 100644
--- a/repo/includes/Validators/UrlSchemeValidators.php
+++ b/repo/includes/Validators/UrlSchemeValidators.php
@@ -44,16 +44,16 @@
case 'svn':
case 'telnet':
case 'worldwind':
-   $regex = '!^' . preg_quote( $scheme, '!' ) . 
'://(' . Parser::EXT_LINK_URL_CLASS . ')+$!i';
+   $regex = '!^' . preg_quote( $scheme, '!' ) . 
'://(' . Parser::EXT_LINK_URL_CLASS . ')+$!ui';
break;
 
case 'mailto':
-   $regex = '!^mailto:(' . 
Parser::EXT_LINK_URL_CLASS . ')+@(' . Parser::EXT_LINK_URL_CLASS . ')+$!i';
+   $regex = '!^mailto:(' . 
Parser::EXT_LINK_URL_CLASS . ')+@(' . Parser::EXT_LINK_URL_CLASS . ')+$!ui';
break;
 
case '*':
case 'any':
-   $regex = '!^([a-z][a-z\d+.-]*):(' . 
Parser::EXT_LINK_URL_CLASS . ')+$!i';
+   $regex = '!^([a-z][a-z\d+.-]*):(' . 
Parser::EXT_LINK_URL_CLASS . ')+$!ui';
break;
 
default:
diff --git a/repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php 
b/repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php
index 9ae28c8..377ebc8 100644
--- a/repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php
+++ b/repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php
@@ -50,10 +50,12 @@
array( 'http', 
'http://foo:b...@acme.com/stuff/thingy.php?foo=bar#part' ),
array( 'https', 'https://acme.com' ),
array( 'https', 
'https://foo:b...@acme.com/stuff/thingy.php?foo=bar#part' ),
+   array( 'https', 'https://ko.wikipedia.org/wiki/전_(요리)' 
),
array( 'ftp', 'ftp://acme.com' ),
array( 'ftp', 
'ftp://foo:b...@acme.com/stuff/thingy.php?foo=bar#part' ),
array( 'irc', 'irc://chat.freenode.net/gimp' ),
array( 'mailto', 'mailto:foo@bar' ),
+   array( 'mailto', 'mailto:random.korean.character.전@bar' 
),
array( 'mailto', 
'mailto:eve.elder+s...@some.place.else?Subject=test' ),
array( 'telnet', 'telnet://user:password@host:/' ),
array( 'any', 'http://acme.com' ),
@@ -61,6 +63,7 @@
array( 'any', 'dummy+me:other-stuff' ),
array( 'any', 'dummy-you:some?things' ),
array( 'any', 'dummy.do:other#things' ),
+   array( 'any', 'random.korean.character:전' ),
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a0671131d5cea5dc82b68635cae2ca43b71dfc6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] HTMLForm: Don't limit width to 50em in OOUI mode - change (mediawiki/core)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: HTMLForm: Don't limit width to 50em in OOUI mode
..


HTMLForm: Don't limit width to 50em in OOUI mode

Change-Id: I5f6e825ec76ea8cc86b010ce10839aebc493d7ef
---
M resources/src/mediawiki/mediawiki.htmlform.ooui.css
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  MarkTraceur: Looks good to me, but someone else must approve
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  VolkerE: Looks good to me, but someone else must approve
  Florianschmidtwelzow: Looks good to me, but someone else must approve
  Esanders: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki/mediawiki.htmlform.ooui.css 
b/resources/src/mediawiki/mediawiki.htmlform.ooui.css
index 309eb34..95acc86 100644
--- a/resources/src/mediawiki/mediawiki.htmlform.ooui.css
+++ b/resources/src/mediawiki/mediawiki.htmlform.ooui.css
@@ -1,7 +1,6 @@
 /* OOUIHTMLForm styles */
 
 .mw-htmlform-ooui-wrapper {
-   width: 50em;
margin: 1em 0;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f6e825ec76ea8cc86b010ce10839aebc493d7ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: VolkerE 
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 "Rollback labswiki and labtestwiki to 1.27.0-wmf.9" - change (operations/mediawiki-config)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Rollback labswiki and labtestwiki to 1.27.0-wmf.9"
..


Revert "Rollback labswiki and labtestwiki to 1.27.0-wmf.9"

This reverts commit f4e246daf54a8c55ac994999e2d78c4c30b6.

Rollback is now unnecessary due to backported SemanticForms fix in
1.27.0-wmf.10 branch (see I9e538c325b58d2db61a8f05dac88bb3d39d2b7d4).

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

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



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

[MediaWiki-commits] [Gerrit] Remove wfGetDB() ampersand - change (mediawiki...SpecialNamespaces)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Remove wfGetDB() ampersand
..


Remove wfGetDB() ampersand

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

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



diff --git a/SpecialNamespaces.php b/SpecialNamespaces.php
index 318a3a0..45df1ac 100644
--- a/SpecialNamespaces.php
+++ b/SpecialNamespaces.php
@@ -116,7 +116,7 @@
if ( ( $cached == NULL ) || ( !is_array( $cached ) ) ) {
 
// if namespaces are not in memcache, retrieve them from main 
database
-   $dbr =& wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'namespace_names', '*' );
$numrows = $dbr->numRows( $res );
if ( $numrows > 0 )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a9e2940bc54834bcfa97244abd11f59e830a1e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpecialNamespaces
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Rollback labswiki and labtestwiki to 1.27.0-wmf.9" - change (operations/mediawiki-config)

2016-01-20 Thread Dduvall (Code Review)

Dduvall has uploaded a new change for review.

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

Change subject: Revert "Rollback labswiki and labtestwiki to 1.27.0-wmf.9"
..

Revert "Rollback labswiki and labtestwiki to 1.27.0-wmf.9"

This reverts commit f4e246daf54a8c55ac994999e2d78c4c30b6.

Rollback is now unnecessary due to backported SemanticForms fix in
1.27.0-wmf.10 branch (see I9e538c325b58d2db61a8f05dac88bb3d39d2b7d4).

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


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

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

[MediaWiki-commits] [Gerrit] Rollback labswiki and labtestwiki to 1.27.0-wmf.9 - change (operations/mediawiki-config)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Rollback labswiki and labtestwiki to 1.27.0-wmf.9
..


Rollback labswiki and labtestwiki to 1.27.0-wmf.9

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

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



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

[MediaWiki-commits] [Gerrit] Set global sfgFormPrinter - change (mediawiki...SemanticForms)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Set global sfgFormPrinter
..


Set global sfgFormPrinter

...instead of a variable local to the inline function

Bug: T124149
Change-Id: I9e538c325b58d2db61a8f05dac88bb3d39d2b7d4
(cherry picked from commit ac2a48a938e59aff27a2cb6688ac7a8209d5b277)
---
M extension.json
M includes/SF_Utils.php
2 files changed, 9 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index a9a88ac..c4afd79 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"@Note": "When updating this file please also update SemanticForms.php 
with the same changes.",
"name": "Semantic Forms",
-   "version": "3.4.1",
+   "version": "3.4.2-alpha",
"author": [
"Yaron Koren",
"Stephan Gambke",
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 31340e1..b33c146 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -14,6 +14,13 @@
$smwgEnabledSpecialPage, $wgExtensionFunctions, $wgSpecialPages,
$wgAutoloadClasses, $sfgContLang, $sfgFormPrinter, 
$wgLanguageCode;
 
+   if ( defined( 'SF_VERSION' ) ) {
+   // Do not load Semantic Forms more than once.
+   return 1;
+   }
+
+   define( 'SF_VERSION', '3.4.2-alpha' );
+
if ( !defined( 'SMW_VERSION' ) ) {
// SMW defines these namespaces itself.
define( 'SF_NS_FORM', 106 );
@@ -42,7 +49,7 @@
// input types.
if ( defined( 'SMW_VERSION' ) ) {
$GLOBALS['wgExtensionFunctions'][] = function() {
-   $sfgFormPrinter = new StubObject( 
'sfgFormPrinter', 'SFFormPrinter' );
+   $GLOBALS['sfgFormPrinter'] = new StubObject( 
'sfgFormPrinter', 'SFFormPrinter' );
};
}  else {
$sfgFormPrinter = new StubObject( 'sfgFormPrinter', 
'SFFormPrinter' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e538c325b58d2db61a8f05dac88bb3d39d2b7d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: wmf/1.27.0-wmf.10
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Foxtrott 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Prevent RDF builder from generating broken decimals if geo-p... - change (mediawiki...Wikibase)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Prevent RDF builder from generating broken decimals if 
geo-precision is not specified
..


Prevent RDF builder from generating broken decimals if geo-precision is not 
specified

Bug: T123392
Change-Id: Ia1a1ea2066713fb3aaecfb4b31995925944549b2
---
M docs/ontology.owl
M repo/includes/rdf/Values/GlobeCoordinateRdfBuilder.php
M repo/tests/phpunit/includes/rdf/Values/GlobeCoordinateRdfBuilderTest.php
3 files changed, 54 insertions(+), 2 deletions(-)

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



diff --git a/docs/ontology.owl b/docs/ontology.owl
index 842e28e..283fd42 100644
--- a/docs/ontology.owl
+++ b/docs/ontology.owl
@@ -98,6 +98,10 @@
 
   
 
+  
+ GeoAutoPrecision
+ This coordinate value uses automatic precision since the 
user did not specify one.
+

[MediaWiki-commits] [Gerrit] Rollback labswiki and labtestwiki to 1.27.0-wmf.9 - change (operations/mediawiki-config)

2016-01-20 Thread Dduvall (Code Review)

Dduvall has uploaded a new change for review.

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

Change subject: Rollback labswiki and labtestwiki to 1.27.0-wmf.9
..

Rollback labswiki and labtestwiki to 1.27.0-wmf.9

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


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

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

[MediaWiki-commits] [Gerrit] [cirrus maint] redirect stderr to log and use full mwscript ... - change (operations/puppet)

2016-01-20 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: [cirrus maint] redirect stderr to log and use full mwscript path
..

[cirrus maint] redirect stderr to log and use full mwscript path

The log files from this command are generated, but not populated with
anything. Likely they are empty because stderr was not also redirected
to the log files. Best guess for why nothing is running is that the full
path to mwscript should be use. If not the case it still doesn't hurt
to be explicit

Bug: T120843
Change-Id: I2247ae6b12b7dcf4b38d7104cbafa31960a0a6b3
---
M modules/mediawiki/manifests/maintenance/cirrussearch.pp
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/mediawiki/manifests/maintenance/cirrussearch.pp 
b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
index 41ff559..bb55fce 100644
--- a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
+++ b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
@@ -12,7 +12,7 @@
 minute   => 20,
 hour => 0,
 weekday  => 2,
-command  => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c 
\'mwscript extensions/CirrusSearch/maintenance/updateSuggesterIndex.php 
--wiki={} --masterTimeout=10m --cluster=eqiad --optimize > 
/var/log/mediawiki/cirrus-suggest/{}.eqiad.log || true\''
+command  => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c 
\'/usr/local/bin/mwscript 
extensions/CirrusSearch/maintenance/updateSuggesterIndex.php --wiki={} 
--masterTimeout=10m --cluster=eqiad --optimize > 
/var/log/mediawiki/cirrus-suggest/{}.eqiad.log 2>&1 || true\''
 }
 
 cron { 'cirrus_build_completion_indices_codfw':
@@ -21,7 +21,7 @@
 minute   => 20,
 hour => 0,
 weekday  => 2,
-command  => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c 
\'mwscript extensions/CirrusSearch/maintenance/updateSuggesterIndex.php 
--wiki={} --masterTimeout=10m --cluster=codfw --optimize > 
/var/log/mediawiki/cirrus-suggest/{}.codfw.log || true\''
+command  => '/usr/local/bin/expanddblist all | xargs -I{} -P 4 sh -c 
\'/usr/local/bin/mwscript 
extensions/CirrusSearch/maintenance/updateSuggesterIndex.php --wiki={} 
--masterTimeout=10m --cluster=codfw --optimize > 
/var/log/mediawiki/cirrus-suggest/{}.codfw.log 2>&1 || true\''
 }
 
 file { '/var/log/mediawiki/cirrus-suggest':

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

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

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

[MediaWiki-commits] [Gerrit] Set global sfgFormPrinter - change (mediawiki...SemanticForms)

2016-01-20 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Set global sfgFormPrinter
..

Set global sfgFormPrinter

...instead of a variable local to the inline function

Bug: T124149
Change-Id: I9e538c325b58d2db61a8f05dac88bb3d39d2b7d4
(cherry picked from commit ac2a48a938e59aff27a2cb6688ac7a8209d5b277)
---
M extension.json
M includes/SF_Utils.php
2 files changed, 9 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index a9a88ac..c4afd79 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"@Note": "When updating this file please also update SemanticForms.php 
with the same changes.",
"name": "Semantic Forms",
-   "version": "3.4.1",
+   "version": "3.4.2-alpha",
"author": [
"Yaron Koren",
"Stephan Gambke",
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 31340e1..b33c146 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -14,6 +14,13 @@
$smwgEnabledSpecialPage, $wgExtensionFunctions, $wgSpecialPages,
$wgAutoloadClasses, $sfgContLang, $sfgFormPrinter, 
$wgLanguageCode;
 
+   if ( defined( 'SF_VERSION' ) ) {
+   // Do not load Semantic Forms more than once.
+   return 1;
+   }
+
+   define( 'SF_VERSION', '3.4.2-alpha' );
+
if ( !defined( 'SMW_VERSION' ) ) {
// SMW defines these namespaces itself.
define( 'SF_NS_FORM', 106 );
@@ -42,7 +49,7 @@
// input types.
if ( defined( 'SMW_VERSION' ) ) {
$GLOBALS['wgExtensionFunctions'][] = function() {
-   $sfgFormPrinter = new StubObject( 
'sfgFormPrinter', 'SFFormPrinter' );
+   $GLOBALS['sfgFormPrinter'] = new StubObject( 
'sfgFormPrinter', 'SFFormPrinter' );
};
}  else {
$sfgFormPrinter = new StubObject( 'sfgFormPrinter', 
'SFFormPrinter' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e538c325b58d2db61a8f05dac88bb3d39d2b7d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: wmf/1.27.0-wmf.10
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Foxtrott 

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

[MediaWiki-commits] [Gerrit] Remove wfGetDB() ampersand - change (mediawiki...SpecialNamespaces)

2016-01-20 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove wfGetDB() ampersand
..

Remove wfGetDB() ampersand

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


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

diff --git a/SpecialNamespaces.php b/SpecialNamespaces.php
index 318a3a0..45df1ac 100644
--- a/SpecialNamespaces.php
+++ b/SpecialNamespaces.php
@@ -116,7 +116,7 @@
if ( ( $cached == NULL ) || ( !is_array( $cached ) ) ) {
 
// if namespaces are not in memcache, retrieve them from main 
database
-   $dbr =& wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'namespace_names', '*' );
$numrows = $dbr->numRows( $res );
if ( $numrows > 0 )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a9e2940bc54834bcfa97244abd11f59e830a1e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpecialNamespaces
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] comment IPv6 records for git-ssh - change (operations/dns)

2016-01-20 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: comment IPv6 records for git-ssh
..


comment IPv6 records for git-ssh

Currently these IPs are in DNS but users can't connect to them
due to T100519 still needing work.

Users who have IPv6, like Reedy who reported this, can't connect
to git-ssh.wm.org due to this.

Commenting them for now until the remaining issue is fixed so that
they fall back to IPv4 instead.

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

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index dffd737..10445d7 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -237,9 +237,9 @@
 restbase1H  IN CNAME restbase.eqiad
 rest1H  IN CNAME restbase.eqiad
 git-ssh.eqiad   1H  IN A208.80.154.250
-1H  IN  2620:0:861:ed1a::3:16
+; FIXME T100519 1H  IN  2620:0:861:ed1a::3:16
 git-ssh 1H  IN A208.80.154.250
-1H  IN  2620:0:861:ed1a::3:16
+; FIXME T100519 1H  IN  2620:0:861:ed1a::3:16
 
 ;;; ulsfo
 text-lb.ulsfo   600 IN DYNA geoip!text-addrs/ulsfo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f39a36a4bf7af0bfa29b836a42a39093ea83676
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] comment IPv6 records for git-ssh - change (operations/dns)

2016-01-20 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: comment IPv6 records for git-ssh
..

comment IPv6 records for git-ssh

Currently these IPs are in DNS but users can't connect to them
due to T100519 still needing work.

Users who have IPv6, like Reedy who reported this, can't connect
to git-ssh.wm.org due to this.

Commenting them for now until the remaining issue is fixed so that
they fall back to IPv4 instead.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/24/265424/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index dffd737..136ca0d 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -237,9 +237,9 @@
 restbase1H  IN CNAME restbase.eqiad
 rest1H  IN CNAME restbase.eqiad
 git-ssh.eqiad   1H  IN A208.80.154.250
-1H  IN  2620:0:861:ed1a::3:16
+;   1H  IN  2620:0:861:ed1a::3:16
 git-ssh 1H  IN A208.80.154.250
-1H  IN  2620:0:861:ed1a::3:16
+;   1H  IN  2620:0:861:ed1a::3:16
 
 ;;; ulsfo
 text-lb.ulsfo   600 IN DYNA geoip!text-addrs/ulsfo

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

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

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

[MediaWiki-commits] [Gerrit] Use rc_source column for filtering changes in client - change (mediawiki...Wikibase)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Use rc_source column for filtering changes in client
..


Use rc_source column for filtering changes in client

Bug: T44289
Change-Id: I563ccabb52153ca88acc8b2299fabfb9ac0c2fa7
---
M client/includes/Hooks/ChangesListSpecialPageHooksHandler.php
M client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php
2 files changed, 45 insertions(+), 3 deletions(-)

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



diff --git a/client/includes/Hooks/ChangesListSpecialPageHooksHandler.php 
b/client/includes/Hooks/ChangesListSpecialPageHooksHandler.php
index 73b83f0..8175166 100644
--- a/client/includes/Hooks/ChangesListSpecialPageHooksHandler.php
+++ b/client/includes/Hooks/ChangesListSpecialPageHooksHandler.php
@@ -5,9 +5,12 @@
 use ChangesListSpecialPage;
 use FormOptions;
 use IContextSource;
+use LoadBalancer;
+use LBFactory;
 use RequestContext;
 use User;
 use WebRequest;
+use Wikibase\Client\RecentChanges\RecentChangeFactory;
 use Wikibase\Client\WikibaseClient;
 use Wikimedia\Assert\Assert;
 
@@ -30,6 +33,11 @@
private $user;
 
/**
+* @var LoadBalancer
+*/
+   private $loadBalancer;
+
+   /**
 * @var string
 */
private $pageName;
@@ -47,17 +55,20 @@
/**
 * @param WebRequest $request
 * @param User $user
+* @param LoadBalancer $loadBalancer
 * @param string $pageName
 * @param bool $showExternalChanges
 */
public function __construct(
WebRequest $request,
User $user,
+   LoadBalancer $loadBalancer,
$pageName,
$showExternalChanges
) {
$this->request = $request;
$this->user = $user;
+   $this->loadBalancer = $loadBalancer;
$this->pageName = $pageName;
$this->showExternalChanges = $showExternalChanges;
}
@@ -79,6 +90,7 @@
return new self(
$context->getRequest(),
$context->getUser(),
+   LBFactory::singleton()->getMainLB(),
$specialPageName,
$settings->getSetting( 'showExternalRecentChanges' )
);
@@ -184,7 +196,9 @@
// do not include wikibase changes for activated enhanced 
watchlist
// since we do not support that format yet
if ( $this->shouldHideWikibaseChanges( $opts ) ) {
-   $conds[] = 'rc_type != ' . RC_EXTERNAL;
+   $dbr = $this->loadBalancer->getConnection( DB_SLAVE );
+   $conds[] = 'rc_source != ' . $dbr->addQuotes( 
RecentChangeFactory::SRC_WIKIBASE );
+   $this->loadBalancer->reuseConnection( $dbr );
}
 
return $conds;
diff --git 
a/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php
 
b/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php
index aebaa8c..a32497d 100644
--- 
a/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php
+++ 
b/client/tests/phpunit/includes/Hooks/ChangesListSpecialPageHooksHandlerTest.php
@@ -77,6 +77,7 @@
$hookHandler = new ChangesListSpecialPageHooksHandler(
$this->getRequest( array() ),
$this->getUser( $userOptions ),
+   $this->getLoadBalancer(),
'Watchlist',
true
);
@@ -98,7 +99,7 @@
false
),
array(
-   array( 'rc_type != 5' ),
+   array( "rc_source != 'wb'" ),
array( 'usenewrc' => 0 ),
true
)
@@ -109,6 +110,7 @@
$hookHandler = new ChangesListSpecialPageHooksHandler(
$this->getRequest( array() ),
$this->getUser( array( 'usenewrc' => 1 ) ),
+   $this->getLoadBalancer(),
'Watchlist',
true
);
@@ -118,7 +120,7 @@
$conds = array();
$hookHandler->addWikibaseConditions( $conds, $opts );
 
-   $this->assertEquals( array( 'rc_type != 5' ), $conds );
+   $this->assertEquals( array( "rc_source != 'wb'" ), $conds );
}
 
/**
@@ -133,6 +135,7 @@
$hookHandler = new ChangesListSpecialPageHooksHandler(
$this->getRequest( $requestParams ),

[MediaWiki-commits] [Gerrit] Show deactivated selection when cursor is collapsed - change (VisualEditor/VisualEditor)

2016-01-20 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Show deactivated selection when cursor is collapsed
..

Show deactivated selection when cursor is collapsed

For example, when inserting a link.

Change-Id: I04ca47446f5bff85ef845b47cec6626d6650c8fb
---
M src/ce/styles/ve.ce.Surface.css
M src/ce/ve.ce.Surface.js
2 files changed, 13 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/23/265423/1

diff --git a/src/ce/styles/ve.ce.Surface.css b/src/ce/styles/ve.ce.Surface.css
index 5698c79..0ff045b 100644
--- a/src/ce/styles/ve.ce.Surface.css
+++ b/src/ce/styles/ve.ce.Surface.css
@@ -29,6 +29,9 @@
margin-top: -0.15em;
padding: 0.15em 0;
 }
+.ve-ce-surface-deactivatedSelection-collapsed > div {
+   background: #000;
+}
 
 /* Set opacity directly on the highlights, rather than their containers,
otherwise the opacity isn't applied at all */
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index f16ef33..9884048 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -571,16 +571,19 @@
this.$deactivatedSelection.empty();
 
// Check we have a deactivated surface and a non-collapsed native 
selection
-   if ( this.deactivated && selection.isNativeCursor() && 
!selection.getModel().isCollapsed() ) {
+   if ( this.deactivated && selection.isNativeCursor() ) {
rects = selection.getSelectionRects();
if ( rects ) {
for ( i = 0, l = rects.length; i < l; i++ ) {
-   this.$deactivatedSelection.append( $( '' 
).css( {
-   top: rects[ i ].top,
-   left: rects[ i ].left,
-   width: rects[ i ].width,
-   height: rects[ i ].height
-   } ) );
+   this.$deactivatedSelection.append(
+   $( '' ).css( {
+   top: rects[ i ].top,
+   left: rects[ i ].left,
+   // Collapsed selections can 
have a width of 0, so expand
+   width: Math.max( rects[ i 
].width, 1 ),
+   height: rects[ i ].height
+   }
+   ) ).toggleClass( 
've-ce-surface-deactivatedSelection-collapsed', 
selection.getModel().isCollapsed() );
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04ca47446f5bff85ef845b47cec6626d6650c8fb
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] Add PLURAL in math-status-introduction - change (mediawiki...Math)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Add PLURAL in math-status-introduction
..


Add PLURAL in math-status-introduction

Thread:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Math-status-introduction/en

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

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



diff --git a/i18n/en.json b/i18n/en.json
index 019c14f..7066b3c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -64,7 +64,7 @@
"math_notexvc": "Missing texvc executable. Please see 
math/README to configure.",
"math_output_error": "Cannot store math image on filesystem.",
"math_sample": "Insert formula here",
-   "math-status-introduction" : "This page displays information about the 
enabled math rendering modes.\n\nThe following rendering {{PLURAL:$1|mode 
is|modes are}} enabled:",
+   "math-status-introduction" : "This page displays information about the 
enabled math rendering {{PLURAL:$1|mode|modes}}.\n\nThe following rendering 
{{PLURAL:$1|mode is|modes are}} enabled:",
"math_syntax_error": "syntax error",
"math_timeout": "$1 timeout from \"$2\".",
"math-test-end": "Backend tests for rendering mode ''$1'' completed.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a41a446001cf35c3dc0cac4025ae8fc64a3c9e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: IoannisKydonis 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add support for logging to Schema:QuickSurveyInitiation - change (mediawiki...QuickSurveys)

2016-01-20 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

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

Change subject: Add support for logging to Schema:QuickSurveyInitiation
..

Add support for logging to Schema:QuickSurveyInitiation

Bug: T123696
Change-Id: I46d19c9f2d9b056f114c290b32a14307641e4ded
---
M includes/QuickSurveys.hooks.php
M resources/ext.quicksurveys.lib/lib.js
M resources/ext.quicksurveys.views/QuickSurvey.js
3 files changed, 64 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys 
refs/changes/22/265422/1

diff --git a/includes/QuickSurveys.hooks.php b/includes/QuickSurveys.hooks.php
index 3565281..bb7adb9 100644
--- a/includes/QuickSurveys.hooks.php
+++ b/includes/QuickSurveys.hooks.php
@@ -157,6 +157,7 @@
public static function onEventLoggingRegisterSchemas( &$schemas ) {
// @see 
https://meta.wikimedia.org/wiki/Schema:QuickSurveysResponses
$schemas['QuickSurveysResponses'] = 15262168;
+   $schemas['QuickSurveyInitiation'] = 15262203;
 
return true;
}
diff --git a/resources/ext.quicksurveys.lib/lib.js 
b/resources/ext.quicksurveys.lib/lib.js
index c794d45..4c23785 100644
--- a/resources/ext.quicksurveys.lib/lib.js
+++ b/resources/ext.quicksurveys.lib/lib.js
@@ -1,7 +1,53 @@
 // jscs:disable disallowDanglingUnderscores
 ( function ( $ ) {
var survey,
-   availableSurveys = [];
+   availableSurveys = [],
+   $window = $( window );
+
+   /**
+* // FIXME: upstream the similar code from the 'mobile.startup/util' 
module and use it
+* Check if at least half of the element's height and half of its width 
are in viewport
+*
+* @ignore
+* @param {jQuery.Object} $el - element that's being tested
+* @return {Boolean}
+*/
+   function isElementInViewport( $el ) {
+   var windowHeight = $window.height(),
+   windowWidth = $window.width(),
+   windowScrollLeft = $window.scrollLeft(),
+   windowScrollTop = $window.scrollTop(),
+   elHeight = $el.height(),
+   elWidth = $el.width(),
+   elOffset = $el.offset();
+
+   return (
+   ( windowScrollTop + windowHeight >= elOffset.top + 
elHeight / 2 ) &&
+   ( windowScrollLeft + windowWidth >= elOffset.left + 
elWidth / 2 ) &&
+   ( windowScrollTop <= elOffset.top + elHeight / 2 )
+   );
+   }
+
+   /**
+* Log impression when a survey is seen by the user
+* @param {jQuery.Object} $el
+* @param {Object} config - survey config data
+* @ignore
+*/
+   function logSurveyImpression( $el, config ) {
+   if ( isElementInViewport( $el ) ) {
+   $window.off( 'scroll.quickSurveys', logSurveyImpression 
);
+
+   if ( mw.eventLog ) {
+   mw.eventLog.logEvent( 'QuickSurveyInitiation', {
+   surveySessionToken: 
config.surveySessionToken,
+   surveyInstanceToken: 
config.surveyInstanceToken,
+   surveyCodeName: config.survey.name,
+   eventName: 'impression'
+   } );
+   }
+   }
+   }
 
/**
 * Insert the quick survey panel into the article either (in priority 
order)
@@ -127,6 +173,12 @@
mw.storage.set( getSurveyStorageKey( 
survey ), '~' );
} );
$panel.replaceWith( panel.$element );
+
+   $window.on( 'scroll.quickSurveys', $.debounce( 
250, function () {
+   logSurveyImpression( panel.$element, 
options );
+   } ) );
+   // maybe the survey is already visible?
+   logSurveyImpression( panel.$element, options );
} );
}
}
diff --git a/resources/ext.quicksurveys.views/QuickSurvey.js 
b/resources/ext.quicksurveys.views/QuickSurvey.js
index 64ae06f..88d5dc4 100644
--- a/resources/ext.quicksurveys.views/QuickSurvey.js
+++ b/resources/ext.quicksurveys.views/QuickSurvey.js
@@ -59,6 +59,16 @@
QuickSurvey.super.call( this, $.extend( {}, config, {
items: [ this.initialPanel, this.finalPanel ]
} ) );
+
+   if ( mw.eventLog ) {
+   mw.eventLog.logEvent( 'QuickSurveyInitiation', {
+

[MediaWiki-commits] [Gerrit] Add data-values/* to wikidata-feed irc channel - change (labs...grrrit)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Add data-values/* to wikidata-feed irc channel
..


Add data-values/* to wikidata-feed irc channel

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

Approvals:
  Hoo man: Looks good to me, but someone else must approve
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/config.yaml b/config.yaml
index 29ea577..ccadc31 100644
--- a/config.yaml
+++ b/config.yaml
@@ -143,6 +143,7 @@
 .*:
 branch: "betacluster"
 "#wikidata-feed":
+data-values/.*:
 mediawiki/extensions/Wikibase.*:
 mediawiki/extensions/Wikidata.*:
 mediawiki/extensions/DataTypes:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbbe932955fb249787859cfa3b55cad9faf16460
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...ImportFreeImages)

2016-01-20 Thread Aaron Schulz (Code Review)

Aaron Schulz has submitted this change and it was merged.

Change subject: Define doesWrites() for SpecialPage classes
..


Define doesWrites() for SpecialPage classes

Bug: T123589
Change-Id: I959dff9fce9bb0ff985553df721ccfd9745f083d
---
M SpecialImportFreeImages.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/SpecialImportFreeImages.php b/SpecialImportFreeImages.php
index 04d542a..37487b6 100644
--- a/SpecialImportFreeImages.php
+++ b/SpecialImportFreeImages.php
@@ -9,6 +9,10 @@
parent::__construct( 'ImportFreeImages'/*class*/, 
'upload'/*restriction*/ );
}
 
+   public function doesWrites() {
+   return true;
+   }
+
/**
 * Group this special page under the correct header on 
Special:SpecialPages.
 *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I959dff9fce9bb0ff985553df721ccfd9745f083d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImportFreeImages
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Disable A/B/C test (PAB2) - change (wikimedia/portals)

2016-01-20 Thread JGirault (Code Review)

JGirault has uploaded a new change for review.

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

Change subject: Disable A/B/C test (PAB2)
..

Disable A/B/C test (PAB2)

Bug: T124245
Change-Id: Ic87af9a5ab0321bc4cf7331a9774c7b07e83011b
---
M dev/wikipedia.org/assets/css/wm-portal.css
M dev/wikipedia.org/assets/js/wm-portal.js
M dev/wikipedia.org/assets/js/wm-test.js
M dev/wikipedia.org/index.handlebars
D dev/wikipedia.org/templates/search-pab1.handlebars
D dev/wikipedia.org/templates/search-pab1.option.handlebars
M prod/wikipedia.org/index.html
7 files changed, 10 insertions(+), 557 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals 
refs/changes/21/265421/1

diff --git a/dev/wikipedia.org/assets/css/wm-portal.css 
b/dev/wikipedia.org/assets/css/wm-portal.css
index 60e8239..f3a5194 100644
--- a/dev/wikipedia.org/assets/css/wm-portal.css
+++ b/dev/wikipedia.org/assets/css/wm-portal.css
@@ -544,12 +544,6 @@
 }
 }
 
-/* Hides the search before we know if the user is part of the test */
-
-#search-container.search-container {
-display: none;
-}
-
 /* Gives the button its previous native look */
 .formBtn {
 background-color: white;
@@ -580,4 +574,4 @@
 padding: 1px 2px;
 font-size: 11px;
 vertical-align: top;
-}
\ No newline at end of file
+}
diff --git a/dev/wikipedia.org/assets/js/wm-portal.js 
b/dev/wikipedia.org/assets/js/wm-portal.js
index d575bd6..040dee3 100644
--- a/dev/wikipedia.org/assets/js/wm-portal.js
+++ b/dev/wikipedia.org/assets/js/wm-portal.js
@@ -16,13 +16,9 @@
  * Validate with JSLint or JSHint.
  *
  */
-/* global _, wmTest, addEvent, removeEvent, doWhenReady */
+/* global _, addEvent, doWhenReady */
 
-var lp = {
-   searchInput: document.getElementById( 'searchInput' )
-};
-
-( function ( wmTest, lp ) {
+( function ( ) {
'use strict';
 
/**
@@ -165,7 +161,7 @@
select = $( 'searchLanguage' );
// Verify that an  exists for the langCode that was
// in the cookie. If so, set the value to it.
-   if ( select && select.tagName === 'SELECT' ) {
+   if ( select ) {
options = select.getElementsByTagName( 'option' );
for ( i = 0, len = options.length; !matchingLang && i < 
len; i += 1 ) {
if ( options[ i ].value === iso639 ) {
@@ -186,41 +182,6 @@
}
if ( matchingLang ) {
select.value = matchingLang;
-   updateBranding( matchingLang );
-   }
-   } else if ( wmTest.abtest1 && select && select.tagName === 'UL' 
) {
-   var lis = select.getElementsByTagName( 'li' );
-   for ( i = 0, len = lis.length; !matchingLang && i < 
len; i += 1 ) {
-   if ( lis[ i ].firstChild.getAttribute( 
'data-lang-value' ) === iso639 ) {
-   matchingLang = iso639;
-   }
-   }
-   if ( !matchingLang && document.querySelector ) {
-   matchingLink = document.querySelector( 
'.langlist a[lang|="' + iso639 + '"]' );
-   if ( matchingLink ) {
-   matchingLang = iso639;
-   var customLi = document.createElement( 
'li' ),
-   customA = 
document.createElement( 'a' );
-   customA.setAttribute( 'lang', iso639 );
-   customA.setAttribute( 
'data-lang-value', iso639 );
-   textContent( customA, 
matchingLink.textContent || matchingLink.innerText || iso639 );
-   customLi.appendChild( customA );
-   select.appendChild( customLi );
-   }
-   }
-   if ( matchingLang ) {
-   select.setAttribute( 'data-lang-value', 
matchingLang );
-   textContent( document.getElementById( 
'selectedLanguageCode' ), iso639.toUpperCase() );
-   document.getElementById( 'hiddenLanguageInput' 
).value = matchingLang;
-
-   var activeLi = document.querySelector( 
'#searchLanguage .selected' ),
-   newActiveLi = document.querySelector( 
'#searchLanguage [lang="' + matchingLang + '"]' );
-   if ( activeLi ) {
-   activeLi.className = '';
-   }
-   if ( newActiveLi ) {
-

[MediaWiki-commits] [Gerrit] Reduce complexity of default configuration code - change (mediawiki...Wikibase)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Reduce complexity of default configuration code
..


Reduce complexity of default configuration code

Change-Id: I5ad0e08bcbe91d434e71d0b7bb5460dda1ac3492
---
M repo/config/Wikibase.default.php
1 file changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index e8432e1..3e6b3f4 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -77,11 +77,8 @@
'transformLegacyFormatOnExport' => true,
 
'conceptBaseUri' => function() {
-   $uri = $GLOBALS['wgServer'];
-   $uri = preg_replace( '!^//!', 'http://', $uri );
-   $uri = $uri . '/entity/';
-
-   return $uri;
+   $uri = preg_replace( '!^//!', 'http://', $GLOBALS['wgServer'] );
+   return $uri . '/entity/';
},
 
// Property used as formatter to link identifiers

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ad0e08bcbe91d434e71d0b7bb5460dda1ac3492
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [MobileFrontend] Add some more experimental tests - change (integration/config)

2016-01-20 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: [MobileFrontend] Add some more experimental tests
..

[MobileFrontend] Add some more experimental tests

New experimental tests added:

- mwext-MobileFrontend-testextension-hhvm
- mediawiki-extensions-hhvm
- mediawiki-extensions-qunit
- mwext-testextension-hhvm
- mwext-testextension-hhvm-composer

This is so we can test so we can migrate tests.

Would like to convert the qunit tests to the new one.

Change-Id: I36f1eac0325b30f3170c74eff964b195908112ff
---
M zuul/layout.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/20/265420/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 470f01c..75126fe 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3641,6 +3641,12 @@
   - mwext-MobileFrontend-doxygen-publish
 experimental:
   - mwext-MobileFrontend-testextension-hhvm
+  - mediawiki-extensions-hhvm
+  - mediawiki-extensions-qunit
+  - mwext-testextension-hhvm
+  - mwext-testextension-hhvm-composer
+  - npm
+  - php-composer-test
 
   - name: mediawiki/extensions/MobileApp
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Fix @return doc for MobileContext::getMobileUrl() - change (mediawiki...MobileFrontend)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix @return doc for MobileContext::getMobileUrl()
..


Fix @return doc for MobileContext::getMobileUrl()

Change-Id: I2d5df8d3523fc8c2bec69128c492e3ff581488f7
---
M includes/MobileContext.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 1acf8b3..66c19a0 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -785,7 +785,7 @@
 * Take a URL and return a copy that conforms to the mobile URL template
 * @param string $url
 * @param bool $forceHttps
-* @return string
+* @return string|bool
 */
public function getMobileUrl( $url, $forceHttps = false ) {
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d5df8d3523fc8c2bec69128c492e3ff581488f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Apex theme: NumberInputWidget: Fix width of +/- buttons - change (oojs/ui)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Apex theme: NumberInputWidget: Fix width of +/- buttons
..


Apex theme: NumberInputWidget: Fix width of +/- buttons

Change-Id: Id4fb93713e0646f11628586440a1ad2daaa469e4
---
M src/themes/apex/widgets.less
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 06058a8..e257476 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -983,7 +983,7 @@
max-width: 50em;
 
&-field > .oo-ui-buttonWidget {
-   width: 2.5em;
+   width: 2.25em;
}
 
&-minusButton.oo-ui-buttonElement-framed.oo-ui-widget-enabled > 
.oo-ui-buttonElement-button {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4fb93713e0646f11628586440a1ad2daaa469e4
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix ordering issue when provisioning Thumbor - change (mediawiki/vagrant)

2016-01-20 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: Fix ordering issue when provisioning Thumbor
..

Fix ordering issue when provisioning Thumbor

For thumbor, which depends on the sentry role, provisioning breaks
due to a68391ab0dc0638c2c1b568574294de0e92c6312

This fixes the issue by moving this action to the install step

Change-Id: I59aff509d5439706afe65b76ef71b250522d6aa9
---
M puppet/modules/role/manifests/sentry.pp
M puppet/modules/sentry/manifests/init.pp
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/19/265419/1

diff --git a/puppet/modules/role/manifests/sentry.pp 
b/puppet/modules/role/manifests/sentry.pp
index 074db28..f2b03d2 100644
--- a/puppet/modules/role/manifests/sentry.pp
+++ b/puppet/modules/role/manifests/sentry.pp
@@ -19,9 +19,5 @@
 ],
 composer => true,
 }
-
-mediawiki::import::text { 'VagrantRoleSentry':
-content => template('role/sentry/VagrantRoleSentry.wiki.erb'),
-}
 }
 
diff --git a/puppet/modules/sentry/manifests/init.pp 
b/puppet/modules/sentry/manifests/init.pp
index 245df38..274d54e 100644
--- a/puppet/modules/sentry/manifests/init.pp
+++ b/puppet/modules/sentry/manifests/init.pp
@@ -102,6 +102,10 @@
 require  => Mysql::Db[$db_name],
 }
 
+mediawiki::import::text { 'VagrantRoleSentry':
+content => template('role/sentry/VagrantRoleSentry.wiki.erb'),
+}
+
 apache::site { 'sentry':
 ensure  => present,
 content => template('sentry/apache-site.erb'),

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

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

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

[MediaWiki-commits] [Gerrit] Fix @return doc for MobileContext::getMobileUrl() - change (mediawiki...MobileFrontend)

2016-01-20 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Fix @return doc for MobileContext::getMobileUrl()
..

Fix @return doc for MobileContext::getMobileUrl()

Change-Id: I2d5df8d3523fc8c2bec69128c492e3ff581488f7
---
M includes/MobileContext.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 1acf8b3..66c19a0 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -785,7 +785,7 @@
 * Take a URL and return a copy that conforms to the mobile URL template
 * @param string $url
 * @param bool $forceHttps
-* @return string
+* @return string|bool
 */
public function getMobileUrl( $url, $forceHttps = false ) {
 

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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf-deploy - change (mediawiki...ocg-collection)

2016-01-20 Thread Cscott (Code Review)

Cscott has submitted this change and it was merged.

Change subject: Merge branch 'master' into wmf-deploy
..


Merge branch 'master' into wmf-deploy

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia70231ce19fd2a68cf2fcec3c090ffc744d1313e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 

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

[MediaWiki-commits] [Gerrit] Updating to latest masters - change (mediawiki...ocg-collection)

2016-01-20 Thread Cscott (Code Review)

Cscott has submitted this change and it was merged.

Change subject: Updating to latest masters
..


Updating to latest masters

Deployed new bundler (6491a016302de2db86a8ee14238ce5f25707df74):
* Use `body_only` instead of `bodyOnly` in REST v1/Parsoid v3 API.
* New `--fetch-modules` option (turned off by default). [[phab:T114788]]
* Add username to the User-Agent header.
* Remove most references to parsoid-lb.eqiad.wikimedia.org. [[phab:T110474]]
* Handle protocol-relative API URLs.
* Update dependencies; delint code.

Deployed new latexer (c87d63a404fbd60423f3d5a6058085c3c3f70668):
* Update dependencies; delint code.

Deployed new texter (89c4826d9db7a3719ba056317bdb6cc8cdaf2161):
* Update dependencies; delint code.

Change-Id: Ia857f925a653d36467c2edd5de5b890d75be79a2
---
M mw-ocg-bundler
M mw-ocg-latexer
M mw-ocg-texter
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/mw-ocg-bundler b/mw-ocg-bundler
index f673740..6491a01 16
--- a/mw-ocg-bundler
+++ b/mw-ocg-bundler
-Subproject commit f673740b2a61b0bda64b0e58f7b7e596e3e7de4d
+Subproject commit 6491a016302de2db86a8ee14238ce5f25707df74
diff --git a/mw-ocg-latexer b/mw-ocg-latexer
index 2c27274..c87d63a 16
--- a/mw-ocg-latexer
+++ b/mw-ocg-latexer
-Subproject commit 2c2727487be7af4d55c78982a8891b6dd1ee01d2
+Subproject commit c87d63a404fbd60423f3d5a6058085c3c3f70668
diff --git a/mw-ocg-texter b/mw-ocg-texter
index 3d4ab2d..89c4826 16
--- a/mw-ocg-texter
+++ b/mw-ocg-texter
-Subproject commit 3d4ab2dcdb3ab39cc781b757792a1ee8419fae6d
+Subproject commit 89c4826d9db7a3719ba056317bdb6cc8cdaf2161

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia857f925a653d36467c2edd5de5b890d75be79a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf-deploy - change (mediawiki...ocg-collection)

2016-01-20 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Merge branch 'master' into wmf-deploy
..

Merge branch 'master' into wmf-deploy

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/17/265417/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia70231ce19fd2a68cf2fcec3c090ffc744d1313e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Updating to latest masters - change (mediawiki...ocg-collection)

2016-01-20 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Updating to latest masters
..

Updating to latest masters

Deployed new bundler (6491a016302de2db86a8ee14238ce5f25707df74):
* Use `body_only` instead of `bodyOnly` in REST v1/Parsoid v3 API.
* New `--fetch-modules` option (turned off by default). [[phab:T114788]]
* Add username to the User-Agent header.
* Remove most references to parsoid-lb.eqiad.wikimedia.org. [[phab:T110474]]
* Handle protocol-relative API URLs.
* Update dependencies; delint code.

Deployed new latexer (c87d63a404fbd60423f3d5a6058085c3c3f70668):
* Update dependencies; delint code.

Deployed new texter (89c4826d9db7a3719ba056317bdb6cc8cdaf2161):
* Update dependencies; delint code.

Change-Id: Ia857f925a653d36467c2edd5de5b890d75be79a2
---
M mw-ocg-bundler
M mw-ocg-latexer
M mw-ocg-texter
3 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/16/265416/1

diff --git a/mw-ocg-bundler b/mw-ocg-bundler
index f673740..6491a01 16
--- a/mw-ocg-bundler
+++ b/mw-ocg-bundler
-Subproject commit f673740b2a61b0bda64b0e58f7b7e596e3e7de4d
+Subproject commit 6491a016302de2db86a8ee14238ce5f25707df74
diff --git a/mw-ocg-latexer b/mw-ocg-latexer
index 2c27274..c87d63a 16
--- a/mw-ocg-latexer
+++ b/mw-ocg-latexer
-Subproject commit 2c2727487be7af4d55c78982a8891b6dd1ee01d2
+Subproject commit c87d63a404fbd60423f3d5a6058085c3c3f70668
diff --git a/mw-ocg-texter b/mw-ocg-texter
index 3d4ab2d..89c4826 16
--- a/mw-ocg-texter
+++ b/mw-ocg-texter
-Subproject commit 3d4ab2dcdb3ab39cc781b757792a1ee8419fae6d
+Subproject commit 89c4826d9db7a3719ba056317bdb6cc8cdaf2161

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia857f925a653d36467c2edd5de5b890d75be79a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Support a blacklist category - change (mediawiki...PageImages)

2016-01-20 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Support a blacklist category
..

Support a blacklist category

It should be possible for a project to exclude images in a certain
category from being used as PageImages.

In Enwiki https://en.wikipedia.org/wiki/Category:All_non-free_media
can be used and Italian has https://it.wikipedia.org/wiki/Template:EDP

By using a message this puts control into the hands of the users simply
by editing the message for "pageimages-blacklist-category" and setting
the text to "Category:All_non-free_media" for example

Bug: T124225
Change-Id: I84838727a01a5fa444e9cc64da7e6df2f9f9883a
---
M PageImages.body.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 10 insertions(+), 1 deletion(-)


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

diff --git a/PageImages.body.php b/PageImages.body.php
index bdef1cf..7d86009 100644
--- a/PageImages.body.php
+++ b/PageImages.body.php
@@ -148,7 +148,14 @@
if ( !isset( $scores[$fileName] ) ) {
$scores[$fileName] = -1;
}
-   $scores[$fileName] = max( $scores[$fileName], 
self::getScore( $image, $counter++ ) );
+   // If a blacklist category has been setup, check if the 
file is in it and exclude it from results (with score 0) if true
+   if ( array_search( wfMessage( 
'pageimages-blacklist-category' )->plain(),
+   array_keys( 
$image->getTitle()->getParentCategoryTree() )  ) !== false ) {
+   $score = 0;
+   } else {
+   $score = max( $scores[$fileName], 
self::getScore( $image, $counter++ ) );
+   }
+   $scores[$fileName] = $score;
}
$image = false;
foreach ( $scores as $name => $score ) {
diff --git a/i18n/en.json b/i18n/en.json
index e383969..df5a86d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,6 +5,7 @@
"pageimages-desc": "Collects information about images used on page",
"pageimages-blacklist": "",
"pageimages-info-label": "Page image",
+   "pageimages-blacklist-category": "",
"apihelp-query+pageimages-description": "Returns information about 
images on the page, such as thumbnail and presence of photos.",
"apihelp-query+pageimages-param-prop": "Which information to 
return:\n;thumbnail:URL and dimensions of image associated with page, if 
any.\n;name:Image title.",
"apihelp-query+pageimages-param-thumbsize": "Maximum thumbnail 
dimension.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e4258b6..ef17f3c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,6 +8,7 @@
"pageimages-desc": "{{desc|name=Page 
Images|url=https://www.mediawiki.org/wiki/Extension:PageImages}}";,
"pageimages-blacklist": "List of images. They will never be selected as 
page images",
"pageimages-info-label": "Label for the page image field on the 
action=info page.\n\nSee [{{canonicalurl:w:Main Page|action=info}} example].",
+   "pageimages-blacklist-category": "Any images that are associated with 
this category will be blacklisted from being used as page images.",
"apihelp-query+pageimages-description": 
"{{doc-apihelp-description|query+pageimages}}",
"apihelp-query+pageimages-param-prop": 
"{{doc-apihelp-param|query+pageimages|prop}}",
"apihelp-query+pageimages-param-thumbsize": 
"{{doc-apihelp-param|query+pageimages|thumbsize}}",

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

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

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

[MediaWiki-commits] [Gerrit] Test body_only since that's preferred - change (mediawiki...parsoid)

2016-01-20 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Test body_only since that's preferred
..

Test body_only since that's preferred

Change-Id: Ib01f955a949eca7f633c5ab926a9042ae77f2e7c
---
M tests/mocha/api.js
1 file changed, 27 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/14/265414/1

diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 89a1e5b..4435ce9 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -462,7 +462,33 @@
.end(done);
});
 
-   it("should respect body parameter", function(done) {
+   it("should respect body parameter (body_only)", 
function(done) {
+   request(api)
+   .post(version === 3 ?
+   mockDomain + 
'/v3/transform/wikitext/to/html/' :
+   'v2/' + mockDomain + '/html/')
+   .send(version === 3 ? {
+   wikitext: "''foo''",
+   body_only: 1,
+   } : {
+   wikitext: "''foo''",
+   body: 1,
+   })
+   .expect(validHtmlResponse())
+   .expect(function(res) {
+   if (version === 3) {
+   // v3 only returns children of 

+   
res.text.should.not.match(/https://gerrit.wikimedia.org/r/265414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib01f955a949eca7f633c5ab926a9042ae77f2e7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] Enable cross-wiki notifications beta feature on first wave o... - change (operations/mediawiki-config)

2016-01-20 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Enable cross-wiki notifications beta feature on first wave of 
wikis
..

Enable cross-wiki notifications beta feature on first wave of wikis

Wikidata, mw.org, Commons, all Hebrew wikis and all French wikis.

Bug: T124234
Change-Id: Idf26aad4a382264336b70a5d2feed2cd561a839a
---
M wmf-config/InitialiseSettings.php
1 file changed, 19 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d12bebc..2a5e892 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14948,6 +14948,25 @@
'default' => false,
'testwiki' => true,
'test2wiki' => true,
+   'testwikidatawiki' => true,
+   'wikidatawiki' => true,
+   'mediawikiwiki' => true,
+   'commonswiki' => true,
+   'hewiki' => true,
+   'hewikibooks' => true,
+   'hewikinews' => true,
+   'hewikiquote' => true,
+   'hewikisource' => true,
+   'hewikivoyage' => true,
+   'hewiktionary' => true,
+   'frwiki' => true,
+   'frwikibooks' => true,
+   'frwikinews' => true,
+   'frwikiquote' => true,
+   'frwikisource' => true,
+   'frwikiversity' => true,
+   'frwikivoyage' => true,
+   'frwiktionary' => true,
 ),
 # from and reply to address when Echo sends email notifications
 'wmgNotificationSender' => array(

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

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

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

[MediaWiki-commits] [Gerrit] Clarify Gather system messages - change (mediawiki...Gather)

2016-01-20 Thread IoannisKydonis (Code Review)

IoannisKydonis has uploaded a new change for review.

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

Change subject: Clarify Gather system messages
..

Clarify Gather system messages

Thread:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-editlist-paramvalue-perm-private/ksh

Change-Id: Ieb32e7eda39141d71af66bad8ddc042037d70a09
---
M i18n/qqq.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 75fb583..4de44f9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -149,8 +149,8 @@
"apihelp-editlist-param-description": 
"{{doc-apihelp-param|editlist|description}}",
"apihelp-editlist-param-image": "{{doc-apihelp-param|editlist|image}}",
"apihelp-editlist-param-mode": 
"{{doc-apihelp-param|editlist|mode|paramvalues=1}}",
-   "apihelp-editlist-paramvalue-perm-public": 
"{{doc-apihelp-paramvalue|editlist|perm|public}}",
-   "apihelp-editlist-paramvalue-perm-private": 
"{{doc-apihelp-paramvalue|editlist|perm|private}}",
+   "apihelp-editlist-paramvalue-perm-public": 
"{{doc-apihelp-paramvalue|editlist|perm|public}}\n Make the operation visible 
to everyone.",
+   "apihelp-editlist-paramvalue-perm-private": 
"{{doc-apihelp-paramvalue|editlist|perm|private}}\n Make the operation visible 
to owner only.",
"apihelp-editlist-paramvalue-mode-update": 
"{{doc-apihelp-paramvalue|editlist|mode|update}}",
"apihelp-editlist-paramvalue-mode-remove": 
"{{doc-apihelp-paramvalue|editlist|mode|remove}}",
"apihelp-editlist-paramvalue-mode-deletelist": 
"{{doc-apihelp-paramvalue|editlist|mode|deletelist}}",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb32e7eda39141d71af66bad8ddc042037d70a09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: dev
Gerrit-Owner: IoannisKydonis 

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

[MediaWiki-commits] [Gerrit] Fix mw.TemplateData.SourceHandler.prototype.extractParameter... - change (mediawiki...TemplateData)

2016-01-20 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Fix 
mw.TemplateData.SourceHandler.prototype.extractParametersFromTemplateCode 
return doc
..

Fix mw.TemplateData.SourceHandler.prototype.extractParametersFromTemplateCode 
return doc

Does not return a promise

Change-Id: I790fb92542abca9768d0e55cfe79906e22886c1d
---
M modules/ext.templateDataGenerator.sourceHandler.js
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/modules/ext.templateDataGenerator.sourceHandler.js 
b/modules/ext.templateDataGenerator.sourceHandler.js
index 13db457..0f10149 100644
--- a/modules/ext.templateDataGenerator.sourceHandler.js
+++ b/modules/ext.templateDataGenerator.sourceHandler.js
@@ -160,8 +160,7 @@
  * Adapted from 
https://he.wikipedia.org/wiki/MediaWiki:Gadget-TemplateParamWizard.js
  *
  * @param {string} templateCode Source of the template.
- * @return {jQuery.Promise} A promise that resolves into an
- *  array of parameters that appear in the template code
+ * @return {string[]} An array of parameters that appear in the template code
  */
 mw.TemplateData.SourceHandler.prototype.extractParametersFromTemplateCode = 
function ( templateCode ) {
var matches,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I790fb92542abca9768d0e55cfe79906e22886c1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Don't show warning about already-known parameters that weren... - change (mediawiki...TemplateData)

2016-01-20 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Don't show warning about already-known parameters that weren't 
imported
..

Don't show warning about already-known parameters that weren't imported

Bug: T124223
Change-Id: Id102799b925ebaec6a1d819f1d2294982c24e407
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.templateDataGenerator.ui.tdDialog.js
4 files changed, 0 insertions(+), 7 deletions(-)


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

diff --git a/extension.json b/extension.json
index 93d4251..99af116 100644
--- a/extension.json
+++ b/extension.json
@@ -112,7 +112,6 @@
"templatedata-modal-current-language",
"templatedata-modal-errormsg",
"templatedata-modal-errormsg-import-noparams",
-   
"templatedata-modal-errormsg-import-paramsalreadyexist",
"templatedata-modal-format-inline",
"templatedata-modal-format-block",
"templatedata-modal-json-error-replace",
diff --git a/i18n/en.json b/i18n/en.json
index bff7f71..bb23ddd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -62,7 +62,6 @@
"templatedata-modal-current-language": "Current language: $1",
"templatedata-modal-errormsg": "Errors found. Please make sure there 
are no empty or duplicate parameter names, and that the parameter name does not 
include \"$1\", \"$2\" or \"$3\".",
"templatedata-modal-errormsg-import-noparams": "No new parameters found 
during import.",
-   "templatedata-modal-errormsg-import-paramsalreadyexist": 
"{{PLURAL:$1|One parameter was not imported, because it already exists|Some 
parameters were not imported, because they already exist}} in the editor: $1",
"templatedata-modal-format-inline": "Inline",
"templatedata-modal-format-block": "Block",
"templatedata-modal-json-error-replace": "Replace",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 15278c8..c9a69b4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -72,7 +72,6 @@
"templatedata-modal-current-language": "Label displaying the current 
language in the edit dialog. Parameters:\n* $1 - currently showing 
language\n{{Identical|Current language}}",
"templatedata-modal-errormsg": "Error message that appears in the 
TemplateData generator GUI in case there are empty, duplicate or invalid 
parameter names.\n\nInvalid characters are supplied as parameters to avoid 
parsing errors in translation strings.\n\nParameters:\n* $1 - pipe 
(|)\n* $2 - equal sign (=)\n* $3 - double curly 
brackets (}})",
"templatedata-modal-errormsg-import-noparams": "Error message that 
appears in the TemplateData generator GUI in case no template parameters were 
found during the import attempt.",
-   "templatedata-modal-errormsg-import-paramsalreadyexist": "Error message 
that appears when some parameters were not imported from the template code 
because they already exist in the editor.\n\nParameters:\n* $1 - list of 
parameters that were not imported",
"templatedata-modal-format-inline": "Label for inline 
format\n{{Identical|Inline}}",
"templatedata-modal-format-block": "Label for block 
format\n{{Identical|Block}}",
"templatedata-modal-json-error-replace": "Label for the button in the 
error message, agreeing to replace the existing faulty TemplateData string with 
a new one.\n{{Identical|Replace}}",
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index 825a149..e1fc0df 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -788,10 +788,6 @@
// Repopulate the list
this.repopulateParamSelectWidget();
 
-   if ( response.existing.length > 0 ) {
-   combinedMessage.push( mw.msg( 
'templatedata-modal-errormsg-import-paramsalreadyexist', 
response.existing.join( mw.msg( 'comma-separator' ) ), response.existing.length 
) );
-   }
-
if ( response.imported.length === 0 ) {
combinedMessage.push( mw.msg( 
'templatedata-modal-errormsg-import-noparams' ) );
state = 'error';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id102799b925ebaec6a1d819f1d2294982c24e407
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Use intermediary for searching - change (mediawiki...GeoData)

2016-01-20 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Use intermediary for searching
..

Use intermediary for searching

Bug: T124102
Change-Id: I21ac36cf9a691168119be563d33ac9c671368c53
(cherry picked from commit 2237357be9f6a716ed2e17ec4607d590bcc4263d)
---
M GeoData.php
A includes/Searcher.php
M includes/api/ApiQueryGeoSearchElastic.php
3 files changed, 185 insertions(+), 161 deletions(-)


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

diff --git a/GeoData.php b/GeoData.php
index be5d7e9..c0e21a9 100644
--- a/GeoData.php
+++ b/GeoData.php
@@ -28,6 +28,7 @@
 $wgAutoloadClasses['GeoData\GeoData'] = "$dir/includes/GeoData.body.php";
 $wgAutoloadClasses['GeoData\Hooks'] = "$dir/includes/Hooks.php";
 $wgAutoloadClasses['GeoData\Math'] = "$dir/includes/Math.php";
+$wgAutoloadClasses['GeoData\Searcher'] = "$dir/includes/Searcher.php";
 
 $wgMessagesDirs['GeoData'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['GeoData'] = "$dir/GeoData.i18n.php";
diff --git a/includes/Searcher.php b/includes/Searcher.php
new file mode 100644
index 000..cee6e8a
--- /dev/null
+++ b/includes/Searcher.php
@@ -0,0 +1,47 @@
+makeConfig( 
'CirrusSearch' );
+   $connection = new \CirrusSearch\Connection( $config );
+
+   parent::__construct( $connection, $user, 0 );
+   }
+
+   /**
+* Perform search
+*
+* @param \Elastica\Query $query
+* @param string $queryType Query description for logging
+* @return \Elastica\ResultSet
+* @throws ExceptionInterface
+*/
+   public function performSearch( \Elastica\Query $query, $queryType ) {
+   $pageType = $this->connection->getPageType( wfWikiID() );
+   $search = $pageType->createSearch( $query );
+
+   try {
+   $this->start( "performing $queryType", array( 
'queryType' => $queryType ) );
+   $result = $search->search();
+   $this->success();
+   } catch ( ExceptionInterface $ex ) {
+   $this->failure( $ex );
+   throw $ex;
+   }
+
+   return $result;
+   }
+}
\ No newline at end of file
diff --git a/includes/api/ApiQueryGeoSearchElastic.php 
b/includes/api/ApiQueryGeoSearchElastic.php
index d06196c..4436ac9 100644
--- a/includes/api/ApiQueryGeoSearchElastic.php
+++ b/includes/api/ApiQueryGeoSearchElastic.php
@@ -3,8 +3,6 @@
 namespace GeoData;
 
 use ApiPageSet;
-use ConfigFactory;
-use MWException;
 use MWNamespace;
 use Title;
 
@@ -24,185 +22,163 @@
parent::run( $resultPageSet );
$this->resetQueryParams(); //@fixme: refactor to make this 
unnecessary
 
-   try {
-   $params = $this->params = $this->extractRequestParams();
+   $params = $this->params = $this->extractRequestParams();
 
-   $bools = new \Elastica\Filter\BoolFilter();
-   if ( $this->idToExclude ) {
-   $bools->addMustNot(
-   new \Elastica\Filter\Term( array( '_id' 
=> $this->idToExclude ) )
-   );
-   }
-   // Only Earth is supported
-   $bools->addMust( new \Elastica\Filter\Term( array( 
'coordinates.globe' => 'earth' ) ) );
-   if ( isset( $params['maxdim'] ) ) {
-   $bools->addMust( new \Elastica\Filter\Range(
-   'coordinates.dim',
-   array( 'to' => $params['maxdim'] ) )
-   );
-   }
+   $bools = new \Elastica\Filter\BoolFilter();
+   if ( $this->idToExclude ) {
+   $bools->addMustNot( new \Elastica\Filter\Term( array( 
'_id' => $this->idToExclude ) ) );
+   }
+   // Only Earth is supported
+   $bools->addMust( new \Elastica\Filter\Term( array( 
'coordinates.globe' => 'earth' ) ) );
+   if ( isset( $params['maxdim'] ) ) {
+   $bools->addMust( new \Elastica\Filter\Range( 
'coordinates.dim',
+   array( 'to' => $params['maxdim'] ) ) );
+   }
 
-   $primary = $params['primary'];
-   if ( $primary !== 'all' ) {
-   $bools->addMust( new \Elastica\Filter\Term(
-   array( 'coordinates.primary' => intval( 
$primary === 'primary' ) )
+   $primary = $params['primary'];
+   if ( $primary !== 'all' ) {
+   $bools->addMust( new \Elastica\Filter\Term( array(
+

[MediaWiki-commits] [Gerrit] Use 'u' as preg regex modifier in UrlSchemeValidators - change (mediawiki...Wikibase)

2016-01-20 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Use 'u' as preg regex modifier in UrlSchemeValidators
..

Use 'u' as preg regex modifier in UrlSchemeValidators

Like Parser uses its Parser::EXT_LINK_URL_CLASS.

Bug: T56004
Change-Id: I0a0671131d5cea5dc82b68635cae2ca43b71dfc6
---
M repo/includes/Validators/UrlSchemeValidators.php
M repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php
2 files changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/repo/includes/Validators/UrlSchemeValidators.php 
b/repo/includes/Validators/UrlSchemeValidators.php
index d04151c..28796ed 100644
--- a/repo/includes/Validators/UrlSchemeValidators.php
+++ b/repo/includes/Validators/UrlSchemeValidators.php
@@ -44,7 +44,7 @@
case 'svn':
case 'telnet':
case 'worldwind':
-   $regex = '!^' . preg_quote( $scheme, '!' ) . 
'://(' . Parser::EXT_LINK_URL_CLASS . ')+$!i';
+   $regex = '!^' . preg_quote( $scheme, '!' ) . 
'://(' . Parser::EXT_LINK_URL_CLASS . ')+$!ui';
break;
 
case 'mailto':
diff --git a/repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php 
b/repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php
index 9ae28c8..a940489 100644
--- a/repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php
+++ b/repo/tests/phpunit/includes/Validators/UrlSchemeValidatorsTest.php
@@ -50,6 +50,7 @@
array( 'http', 
'http://foo:b...@acme.com/stuff/thingy.php?foo=bar#part' ),
array( 'https', 'https://acme.com' ),
array( 'https', 
'https://foo:b...@acme.com/stuff/thingy.php?foo=bar#part' ),
+   array( 'https', 'https://ko.wikipedia.org/wiki/전_(요리)' 
),
array( 'ftp', 'ftp://acme.com' ),
array( 'ftp', 
'ftp://foo:b...@acme.com/stuff/thingy.php?foo=bar#part' ),
array( 'irc', 'irc://chat.freenode.net/gimp' ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a0671131d5cea5dc82b68635cae2ca43b71dfc6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Use intermediary for searching - change (mediawiki...GeoData)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: Use intermediary for searching
..


Use intermediary for searching

Bug: T124102
Change-Id: I21ac36cf9a691168119be563d33ac9c671368c53
---
M GeoData.php
A includes/Searcher.php
M includes/api/ApiQueryGeoSearchElastic.php
3 files changed, 185 insertions(+), 161 deletions(-)

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



diff --git a/GeoData.php b/GeoData.php
index be5d7e9..c0e21a9 100644
--- a/GeoData.php
+++ b/GeoData.php
@@ -28,6 +28,7 @@
 $wgAutoloadClasses['GeoData\GeoData'] = "$dir/includes/GeoData.body.php";
 $wgAutoloadClasses['GeoData\Hooks'] = "$dir/includes/Hooks.php";
 $wgAutoloadClasses['GeoData\Math'] = "$dir/includes/Math.php";
+$wgAutoloadClasses['GeoData\Searcher'] = "$dir/includes/Searcher.php";
 
 $wgMessagesDirs['GeoData'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['GeoData'] = "$dir/GeoData.i18n.php";
diff --git a/includes/Searcher.php b/includes/Searcher.php
new file mode 100644
index 000..cee6e8a
--- /dev/null
+++ b/includes/Searcher.php
@@ -0,0 +1,47 @@
+makeConfig( 
'CirrusSearch' );
+   $connection = new \CirrusSearch\Connection( $config );
+
+   parent::__construct( $connection, $user, 0 );
+   }
+
+   /**
+* Perform search
+*
+* @param \Elastica\Query $query
+* @param string $queryType Query description for logging
+* @return \Elastica\ResultSet
+* @throws ExceptionInterface
+*/
+   public function performSearch( \Elastica\Query $query, $queryType ) {
+   $pageType = $this->connection->getPageType( wfWikiID() );
+   $search = $pageType->createSearch( $query );
+
+   try {
+   $this->start( "performing $queryType", array( 
'queryType' => $queryType ) );
+   $result = $search->search();
+   $this->success();
+   } catch ( ExceptionInterface $ex ) {
+   $this->failure( $ex );
+   throw $ex;
+   }
+
+   return $result;
+   }
+}
\ No newline at end of file
diff --git a/includes/api/ApiQueryGeoSearchElastic.php 
b/includes/api/ApiQueryGeoSearchElastic.php
index d06196c..4436ac9 100644
--- a/includes/api/ApiQueryGeoSearchElastic.php
+++ b/includes/api/ApiQueryGeoSearchElastic.php
@@ -3,8 +3,6 @@
 namespace GeoData;
 
 use ApiPageSet;
-use ConfigFactory;
-use MWException;
 use MWNamespace;
 use Title;
 
@@ -24,185 +22,163 @@
parent::run( $resultPageSet );
$this->resetQueryParams(); //@fixme: refactor to make this 
unnecessary
 
-   try {
-   $params = $this->params = $this->extractRequestParams();
+   $params = $this->params = $this->extractRequestParams();
 
-   $bools = new \Elastica\Filter\BoolFilter();
-   if ( $this->idToExclude ) {
-   $bools->addMustNot(
-   new \Elastica\Filter\Term( array( '_id' 
=> $this->idToExclude ) )
-   );
-   }
-   // Only Earth is supported
-   $bools->addMust( new \Elastica\Filter\Term( array( 
'coordinates.globe' => 'earth' ) ) );
-   if ( isset( $params['maxdim'] ) ) {
-   $bools->addMust( new \Elastica\Filter\Range(
-   'coordinates.dim',
-   array( 'to' => $params['maxdim'] ) )
-   );
-   }
+   $bools = new \Elastica\Filter\BoolFilter();
+   if ( $this->idToExclude ) {
+   $bools->addMustNot( new \Elastica\Filter\Term( array( 
'_id' => $this->idToExclude ) ) );
+   }
+   // Only Earth is supported
+   $bools->addMust( new \Elastica\Filter\Term( array( 
'coordinates.globe' => 'earth' ) ) );
+   if ( isset( $params['maxdim'] ) ) {
+   $bools->addMust( new \Elastica\Filter\Range( 
'coordinates.dim',
+   array( 'to' => $params['maxdim'] ) ) );
+   }
 
-   $primary = $params['primary'];
-   if ( $primary !== 'all' ) {
-   $bools->addMust( new \Elastica\Filter\Term(
-   array( 'coordinates.primary' => intval( 
$primary === 'primary' ) )
+   $primary = $params['primary'];
+   if ( $primary !== 'all' ) {
+   $bools->addMust( new \Elastica\Filter\Term( array(
+   'coordinates.primary' => intval( 
$primary === 'primary' )
+

[MediaWiki-commits] [Gerrit] Reword MoodBar system message - change (mediawiki...MoodBar)

2016-01-20 Thread IoannisKydonis (Code Review)

IoannisKydonis has uploaded a new change for review.

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

Change subject: Reword MoodBar system message
..

Reword MoodBar system message

Thread:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-feedbackdashboardresponse-param-anonymize/ksh

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


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

diff --git a/i18n/en.json b/i18n/en.json
index 01869a5..9a44321 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -175,7 +175,7 @@
"apihelp-feedbackdashboardresponse-description": "Allows users to 
submit response to a feedback about their experiences on the site.",
"apihelp-feedbackdashboardresponse-param-feedback": "The moodbar 
feedback unique identifier.",
"apihelp-feedbackdashboardresponse-param-response": "The feedback 
text.",
-   "apihelp-feedbackdashboardresponse-param-anonymize": "Whether to hide 
user information.",
+   "apihelp-feedbackdashboardresponse-param-anonymize": "Whether to hide 
the user's information.",
"apihelp-feedbackdashboardresponse-param-editmode": "Whether or not the 
feedback context is in edit mode.",
"apihelp-feedbackdashboardresponse-param-useragent": "The User-Agent 
header of the browser.",
"apihelp-feedbackdashboardresponse-param-system": "The operating system 
being used.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0419a5a371919071d0746da8803feecd6ed42117
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MoodBar
Gerrit-Branch: master
Gerrit-Owner: IoannisKydonis 

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

[MediaWiki-commits] [Gerrit] SessionManager: Change behavior of getSessionById() - change (mediawiki/core)

2016-01-20 Thread jenkins-bot (Code Review)

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

Change subject: SessionManager: Change behavior of getSessionById()
..


SessionManager: Change behavior of getSessionById()

It's easily possible for SessionManager::getSessionById() to not be
able to load the specified session and to not be able to create an empty
one by that ID, for example if the user's token changed. So change this
from an exceptional condition to an expected one, and adjust callers to
deal with it appropriately.

Let's also make the checks for invalid data structure when loading the
session from the store delete the bogus data entirely.

At the same time, let's change the silly "$noEmpty" parameter to
"$create" and make the default behavior be not to create an empty
session.

Bug: T124126
Change-Id: I085d2026d1b366b1af9fd0e8ca3d815fd8288030
(cherry picked from commit 4f5057b84b36eccd16627a6b29831dfdb4483b02)
---
M includes/WebRequest.php
M includes/context/RequestContext.php
M includes/jobqueue/jobs/UploadFromUrlJob.php
M includes/session/PHPSessionHandler.php
M includes/session/SessionManager.php
M includes/session/SessionManagerInterface.php
M tests/phpunit/includes/session/PHPSessionHandlerTest.php
M tests/phpunit/includes/session/SessionManagerTest.php
8 files changed, 67 insertions(+), 44 deletions(-)

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



diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 7306105..2c14618 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -655,7 +655,10 @@
 */
public function getSession() {
if ( $this->sessionId !== null ) {
-   return SessionManager::singleton()->getSessionById( 
(string)$this->sessionId, false, $this );
+   $session = SessionManager::singleton()->getSessionById( 
(string)$this->sessionId, true, $this );
+   if ( $session ) {
+   return $session;
+   }
}
 
$session = SessionManager::singleton()->getSessionForRequest( 
$this );
diff --git a/includes/context/RequestContext.php 
b/includes/context/RequestContext.php
index 16f11ee..afb5704 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -576,8 +576,9 @@
// Get new session, if applicable
$session = null;
if ( strlen( $params['sessionId'] ) ) { // don't make a 
new random ID
-   $session = 
MediaWiki\Session\SessionManager::singleton()
-   ->getSessionById( $params['sessionId'] 
);
+   $manager = 
MediaWiki\Session\SessionManager::singleton();
+   $session = $manager->getSessionById( 
$params['sessionId'], true )
+   ?: $manager->getEmptySession();
}
 
// Remove any user IP or agent information, and attach 
the request
diff --git a/includes/jobqueue/jobs/UploadFromUrlJob.php 
b/includes/jobqueue/jobs/UploadFromUrlJob.php
index 28e3c40..0491e64 100644
--- a/includes/jobqueue/jobs/UploadFromUrlJob.php
+++ b/includes/jobqueue/jobs/UploadFromUrlJob.php
@@ -155,18 +155,22 @@
 * Store a result in the session data. Note that the caller is 
responsible
 * for appropriate session_start and session_write_close calls.
 *
-* @param MediaWiki\\Session\\Session $session Session to store result 
into
+* @param MediaWiki\\Session\\Session|null $session Session to store 
result into
 * @param string $result The result (Success|Warning|Failure)
 * @param string $dataKey The key of the extra data
 * @param mixed $dataValue The extra data itself
 */
protected function storeResultInSession(
-   MediaWiki\Session\Session $session, $result, $dataKey, 
$dataValue
+   MediaWiki\Session\Session $session = null, $result, $dataKey, 
$dataValue
) {
-   $data = self::getSessionData( $session, 
$this->params['sessionKey'] );
-   $data['result'] = $result;
-   $data[$dataKey] = $dataValue;
-   self::setSessionData( $session, $this->params['sessionKey'], 
$data );
+   if ( $session ) {
+   $data = self::getSessionData( $session, 
$this->params['sessionKey'] );
+   $data['result'] = $result;
+   $data[$dataKey] = $dataValue;
+   self::setSessionData( $session, 
$this->params['sessionKey'], $data );
+   } else {
+   wfDebug( __METHOD__ . ': Cannot store result in 
session, session does not exist' );
+   }
}
 
/**
diff --git a/includes/session

[MediaWiki-commits] [Gerrit] Update Schema:QuickSurveysResponses fields - change (mediawiki...QuickSurveys)

2016-01-20 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

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

Change subject: Update Schema:QuickSurveysResponses fields
..

Update Schema:QuickSurveysResponses fields

Add more fields and use the revision 15262168.

Bug: T123696
Change-Id: Ief45a48e1c45a41d30146335b6d50d286afa119c
---
M includes/QuickSurveys.hooks.php
M resources/ext.quicksurveys.lib/lib.js
M resources/ext.quicksurveys.views/QuickSurvey.js
3 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys 
refs/changes/06/265406/1

diff --git a/includes/QuickSurveys.hooks.php b/includes/QuickSurveys.hooks.php
index 7cc2f81..3565281 100644
--- a/includes/QuickSurveys.hooks.php
+++ b/includes/QuickSurveys.hooks.php
@@ -156,7 +156,7 @@
 */
public static function onEventLoggingRegisterSchemas( &$schemas ) {
// @see 
https://meta.wikimedia.org/wiki/Schema:QuickSurveysResponses
-   $schemas['QuickSurveysResponses'] = 14136037;
+   $schemas['QuickSurveysResponses'] = 15262168;
 
return true;
}
diff --git a/resources/ext.quicksurveys.lib/lib.js 
b/resources/ext.quicksurveys.lib/lib.js
index 971b09a..398f623 100644
--- a/resources/ext.quicksurveys.lib/lib.js
+++ b/resources/ext.quicksurveys.lib/lib.js
@@ -113,7 +113,8 @@
templateData: {
question: mw.msg( 
survey.question ),
description: mw.msg( 
survey.description )
-   }
+   },
+   surveyInstanceToken: 
mw.user.generateRandomSessionId()
};
 
if ( survey.type === 'internal' ) {
diff --git a/resources/ext.quicksurveys.views/QuickSurvey.js 
b/resources/ext.quicksurveys.views/QuickSurvey.js
index b133512..19373fa 100644
--- a/resources/ext.quicksurveys.views/QuickSurvey.js
+++ b/resources/ext.quicksurveys.views/QuickSurvey.js
@@ -115,6 +115,9 @@
 
if ( mw.eventLog ) {
return mw.eventLog.logEvent( 
'QuickSurveysResponses', {
+   namespaceId: mw.config.get( 
'wgNamespaceNumber' ),
+   surveySessionToken: mw.user.sessionId() 
+ '-quicksurveys',
+   surveyInstanceToken: 
this.config.surveyInstanceToken,
pageId: mw.config.get( 'wgArticleId' ),
pageTitle: mw.config.get( 'wgPageName' 
),
surveyCodeName: survey.name,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief45a48e1c45a41d30146335b6d50d286afa119c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: dev
Gerrit-Owner: Bmansurov 

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

1 2 3 4 >

1 - 100 of 344 matches

Mail list logo