date:20140107

[MediaWiki-commits] [Gerrit] Replace deprecated User::editToken with User::getEditToken (... - change (mediawiki...AuthorProtect)

2014-01-07 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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


Change subject: Replace deprecated User::editToken with User::getEditToken 
(1.19)
..

Replace deprecated User::editToken with User::getEditToken (1.19)

Change-Id: I19ad8d9f5de843c565631ab9977985df0e9912fb
---
M AuthorProtect.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/AuthorProtect.php b/AuthorProtect.php
index abc07d4..fac84d3 100644
--- a/AuthorProtect.php
+++ b/AuthorProtect.php
@@ -180,7 +180,7 @@
 
private static function AuthorProtectMakeProtectForm( $title ) {
global $wgRestrictionTypes, $wgUser;
-   $token = $wgUser->editToken();
+   $token = $wgUser->getEditToken();
$form = Html::rawElement( 'p', array(), htmlspecialchars( 
wfMessage( 'authorprotect-intro' ) ) );
$form .= Html::openElement( 'form', array( 'method' => 'post', 
'action' => $title->getLocalUrl( 'action=authorprotect' ) ) );
 
@@ -218,7 +218,7 @@
if ( !$title instanceOf Title ) {
return false; // quick hack to prevent the API from 
messing up.
}
-   
+
if ( $wgUser->getID() === 0 ) {
return false; // don't allow anons, they shouldn't even 
get this far but just in case...
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19ad8d9f5de843c565631ab9977985df0e9912fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AuthorProtect
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

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

[MediaWiki-commits] [Gerrit] Namespace translations for Serbian, Serbo-Croatian - change (mediawiki...Scribunto)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Namespace translations for Serbian, Serbo-Croatian
..


Namespace translations for Serbian, Serbo-Croatian

https://translatewiki.net/wiki/Thread:Support/Module_namespace_-_translation_on_Serbian_and_Serbo_Croatian

Change-Id: Ib5008d0281b05ef0d5703c885211e91ffc6ad45f
---
M Scribunto.namespaces.php
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php
index 0091c51..1a0ba2f 100644
--- a/Scribunto.namespaces.php
+++ b/Scribunto.namespaces.php
@@ -246,6 +246,11 @@
829 => 'Обсуждение_модуля',
 );
 
+$namespaceNames['sh'] = array(
+   828 => 'Modul',
+   829 => 'Razgovor_o_modulu',
+);
+
 $namespaceNames['sk'] = array(
828 => 'Modul',
829 => 'Diskusia_k_modulu',
@@ -256,6 +261,11 @@
829 => 'Pogovor_o_modulu',
 );
 
+$namespaceNames['sr-ec'] = array(
+   828 => 'Модул',
+   829 => 'Разговор_о_модулу',
+);
+
 $namespaceNames['sv'] = array(
828 => 'Modul',
829 => 'Moduldiskussion',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5008d0281b05ef0d5703c885211e91ffc6ad45f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Odder 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Odder 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Customized description - change (mediawiki...GlobalUserGroups)

2014-01-07 Thread Siebrand (Code Review)

Siebrand has submitted this change and it was merged.

Change subject: Customized description
..


Customized description

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

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



diff --git a/GlobalUserGroups.i18n.php b/GlobalUserGroups.i18n.php
index 80f1f45..027f4a5 100644
--- a/GlobalUserGroups.i18n.php
+++ b/GlobalUserGroups.i18n.php
@@ -17,7 +17,7 @@
  * @author SVG
  */
 $messages['en'] = array(
-   'globalusergroups-desc' => 'Allows the use of defined local user groups 
as global groups',
+   'globalusergroups-desc' => 'Allows using defined local user groups as 
global groups',
 );
 
 /** Message documentation (Message documentation)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic08beab8b56f1e093599d39898dcc8f3cf22a339
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserGroups
Gerrit-Branch: master
Gerrit-Owner: Tim Weyer 
Gerrit-Reviewer: Siebrand 

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

[MediaWiki-commits] [Gerrit] Customized description - change (mediawiki...GlobalUserGroups)

2014-01-07 Thread Tim Weyer (Code Review)

Tim Weyer has uploaded a new change for review.

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


Change subject: Customized description
..

Customized description

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserGroups 
refs/changes/95/106195/1

diff --git a/GlobalUserGroups.i18n.php b/GlobalUserGroups.i18n.php
index 80f1f45..027f4a5 100644
--- a/GlobalUserGroups.i18n.php
+++ b/GlobalUserGroups.i18n.php
@@ -17,7 +17,7 @@
  * @author SVG
  */
 $messages['en'] = array(
-   'globalusergroups-desc' => 'Allows the use of defined local user groups 
as global groups',
+   'globalusergroups-desc' => 'Allows using defined local user groups as 
global groups',
 );
 
 /** Message documentation (Message documentation)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic08beab8b56f1e093599d39898dcc8f3cf22a339
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserGroups
Gerrit-Branch: master
Gerrit-Owner: Tim Weyer 

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

[MediaWiki-commits] [Gerrit] (bug 59812) Add Bangla Wikipedia template info for welcome.py - change (pywikibot/compat)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: (bug 59812) Add Bangla Wikipedia template info for welcome.py
..


(bug 59812) Add Bangla Wikipedia template info for welcome.py

Change-Id: I7838acd22f29d4f500be218eb87bf4cee45ae709
---
M welcome.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/welcome.py b/welcome.py
index c54ce8d..a2710c7 100644
--- a/welcome.py
+++ b/welcome.py
@@ -236,6 +236,7 @@
 'wikipedia': {
 'am': u'{{subst:Welcome}} %s',
 'ar': u'{{subst:ترحيب}} %s',
+'bn': u'{{subst:স্বাগতম/বট}} %s',
 'da': u'{{velkommen|%s}}',
 'de': u'{{subst:Hallo}} %s',
 'en': u'{{subst:welcome}} %s',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7838acd22f29d4f500be218eb87bf4cee45ae709
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Alex S.H. Lin 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Tanvir Rahman 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] update civicrm submodule - change (wikimedia...crm)

2014-01-07 Thread Adamw (Code Review)

Adamw has uploaded a new change for review.

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


Change subject: update civicrm submodule
..

update civicrm submodule

Change-Id: I2504a475760c90da0fbadc6380d0f9103513b770
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/94/106194/1

diff --git a/civicrm b/civicrm
index 763300f..253d048 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 763300fd36085fa17e2a75758329400a2de402b0
+Subproject commit 253d0488a4c95b94b542e2cc883ec8c7307da31c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2504a475760c90da0fbadc6380d0f9103513b770
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw 

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

[MediaWiki-commits] [Gerrit] Handle recursive data during exception handling - change (wikimedia...civicrm)

2014-01-07 Thread Adamw (Code Review)

Adamw has uploaded a new change for review.

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


Change subject: Handle recursive data during exception handling
..

Handle recursive data during exception handling

print_r is causing out-of-memory under PHP 5.4.4 when debug dumping
data with recursive content, so fall back to existing var_dump print
variant, which can handle the recursion.  Both code paths partially
emulate var_export, sigh.

Change-Id: I5c7ac21b4947e6aa08676693e8d858118a642108
---
M CRM/Core/Error.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/92/106192/1

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index c98cb63..7dab913 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -465,7 +465,7 @@
*/
   static function debug_var($variable_name,
 $variable,
-$print = TRUE,
+$print = FALSE,
 $log   = TRUE,
 $comp  = ''
   ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c7ac21b4947e6aa08676693e8d858118a642108
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Adamw 

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

[MediaWiki-commits] [Gerrit] Better support export workflows which omit the Select page - change (wikimedia...civicrm)

2014-01-07 Thread Adamw (Code Review)

Adamw has uploaded a new change for review.

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


Change subject: Better support export workflows which omit the Select page
..

Better support export workflows which omit the Select page

Various code, my earlier patches and upstream Civi, were taking optional
fields in $exportParams for granted.

Change-Id: I7452e8c647cc099be8643e5b315205ee26049ff1
---
M CRM/Export/BAO/Export.php
M CRM/Export/Form/Map.php
2 files changed, 10 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/93/106193/1

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index abfdb8c..3a317da 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -59,6 +59,8 @@
* @param string $componentTable component table
* @param bool   $mergeSameAddress merge records if they have same address
* @param bool   $mergeSameHousehold merge records if they belong to the 
same household
+   * @param array  $exportParams options passed from the mapper, also used to 
cache static data
+   * @param string $queryOperator binary SQL operator used to join WHERE 
clauses
*
* @static
* @access public
@@ -385,9 +387,8 @@
 }
 
 $exportParams['postal_mailing_export']['temp_columns'] = array();
-if ($exportParams['exportOption'] == 2 &&
-  isset($exportParams['postal_mailing_export']) &&
-  CRM_Utils_Array::value('postal_mailing_export', 
$exportParams['postal_mailing_export']) == 1
+if (CRM_Utils_Array::value('exportOption', $exportParams) == 2 &&
+  CRM_Utils_Array::value('postal_mailing_export', $exportParams) == 1
 ) {
   $postalColumns = array('is_deceased', 'do_not_mail', 'street_address', 
'supplemental_address_1');
   foreach ($postalColumns as $column) {
@@ -1060,8 +1061,10 @@
   $sql = "DROP TABLE IF EXISTS {$exportTempTable}";
   CRM_Core_DAO::executeQuery($sql);
 
-  $sql = "DROP TABLE IF EXISTS {$componentTable}";
-  CRM_Core_DAO::executeQuery( $sql );
+  if ($componentTable) {
+$sql = "DROP TABLE IF EXISTS {$componentTable}";
+CRM_Core_DAO::executeQuery( $sql );
+  }
 
   CRM_Utils_System::civiExit();
 }
diff --git a/CRM/Export/Form/Map.php b/CRM/Export/Form/Map.php
index 680fa1d..78f81ea 100644
--- a/CRM/Export/Form/Map.php
+++ b/CRM/Export/Form/Map.php
@@ -154,6 +154,8 @@
 $params = $this->controller->exportValues($this->_name);
 if (array_search('Select', $this->controller->_pages)) {
   $exportParams = $this->controller->exportValues('Select');
+} else {
+  $exportParams = array();
 }
 
 $greetingOptions = CRM_Export_Form_Select::getGreetingOptions();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7452e8c647cc099be8643e5b315205ee26049ff1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Adamw 

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

[MediaWiki-commits] [Gerrit] (bug 59812) Add Bangla Wikipedia template info for welcome.py - change (pywikibot/core)

2014-01-07 Thread Alex S.H. Lin (Code Review)

Alex S.H. Lin has submitted this change and it was merged.

Change subject: (bug 59812) Add Bangla Wikipedia template info for welcome.py
..


(bug 59812) Add Bangla Wikipedia template info for welcome.py

Change-Id: I68b32eff33cd289536d71edfa9f661eea30560d4
---
M scripts/welcome.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Alex S.H. Lin: Verified; Looks good to me, approved



diff --git a/scripts/welcome.py b/scripts/welcome.py
index a81b71c..f2f057f 100644
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -235,6 +235,7 @@
 'wikipedia': {
 'am': u'{{subst:Welcome}} %s',
 'ar': u'{{subst:ترحيب}} %s',
+'bn': u'{{subst:স্বাগতম/বট}} %s',
 'da': u'{{velkommen|%s}}',
 'de': u'{{subst:Hallo}} %s',
 'en': u'{{subst:welcome}} %s',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68b32eff33cd289536d71edfa9f661eea30560d4
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Alex S.H. Lin 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tanvir Rahman 
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 the HTML validation error when language is blacklisted - change (mediawiki...Translate)

2014-01-07 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Fix the HTML validation error when language is blacklisted
..

Fix the HTML validation error when language is blacklisted

After error message about blacklisting is shown the container div
was not closed and method was returning. Caused broken layout in
monobook skin

Bug: 46831
Change-Id: I751c40790b20aa7ef2cefef7844311a9f57fa9fa
---
M specials/SpecialTranslate.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index cf72f20..8c13ab8 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
@@ -90,7 +90,10 @@
if ( isset( 
$wgTranslateBlacklist[$check][$this->options['language']] ) ) {
$reason = 
$wgTranslateBlacklist[$check][$this->options['language']];
$out->addWikiMsg( 
'translate-page-disabled', $reason );
-
+   if ( $isBeta ) {
+   // Close 
div.ext-translate-container
+   $out->addHTML( 
Html::closeElement( 'div' ) );
+   }
return;
}
}

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

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

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

[MediaWiki-commits] [Gerrit] Modify language generation script to make JSON for iOS - change (apps...wikipedia)

2014-01-07 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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


Change subject: Modify language generation script to make JSON for iOS
..

Modify language generation script to make JSON for iOS

Change-Id: Ib5aec2f6cfcb5bd1187cf8863ecd50f1b1a2d20c
---
M scripts/generate_wiki_languages.py
1 file changed, 21 insertions(+), 5 deletions(-)


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

diff --git a/scripts/generate_wiki_languages.py 
b/scripts/generate_wiki_languages.py
index 183d57d..9e91ac5 100644
--- a/scripts/generate_wiki_languages.py
+++ b/scripts/generate_wiki_languages.py
@@ -1,5 +1,6 @@
 from urllib2 import urlopen
 import csv
+import json
 import lxml.builder as lb
 from lxml import etree
 
@@ -8,12 +9,15 @@
 
 data = csv.reader(urlopen(URL))
 
-# Column 2 is the language code
-lang_keys = [row[2] for row in data]
+lang_keys = []
+lang_local_names = []
+lang_eng_names = []
+for row in data:
+lang_keys.append(row[2])
+lang_local_names.append(row[10])
+lang_eng_names.append(row[1])
 
-del lang_keys[0] # Get rid of the headers
-
-# Generate the XML
+# Generate the XML, for Android
 x = lb.E
 
 keys = [x.item(k) for k in lang_keys]
@@ -26,3 +30,15 @@
 etree.tostring(resources, pretty_print=True, encoding="utf-8", 
xml_declaration=True)
 )
 
+# Generate the JSON, for iOS
+langs_json = []
+
+# Start from 1, to skip the headers
+for i in xrange(1, len(lang_keys)):
+langs_json.append({
+"code": lang_keys[i],
+"name": lang_local_names[i],
+"canonical_name": lang_eng_names[i]
+})
+
+open("languages_list.json", "w").write(json.dumps(langs_json, indent=4))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5aec2f6cfcb5bd1187cf8863ecd50f1b1a2d20c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] (bug 59812) Add Bangla Wikipedia template info for welcome.py - change (pywikibot/core)

2014-01-07 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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


Change subject: (bug 59812) Add Bangla Wikipedia template info for welcome.py
..

(bug 59812) Add Bangla Wikipedia template info for welcome.py

Change-Id: I68b32eff33cd289536d71edfa9f661eea30560d4
---
M scripts/welcome.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/89/106189/1

diff --git a/scripts/welcome.py b/scripts/welcome.py
index a81b71c..f2f057f 100644
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -235,6 +235,7 @@
 'wikipedia': {
 'am': u'{{subst:Welcome}} %s',
 'ar': u'{{subst:ترحيب}} %s',
+'bn': u'{{subst:স্বাগতম/বট}} %s',
 'da': u'{{velkommen|%s}}',
 'de': u'{{subst:Hallo}} %s',
 'en': u'{{subst:welcome}} %s',

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

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

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

[MediaWiki-commits] [Gerrit] (bug 59812) Add Bangla Wikipedia template info for welcome.py - change (pywikibot/compat)

2014-01-07 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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


Change subject: (bug 59812) Add Bangla Wikipedia template info for welcome.py
..

(bug 59812) Add Bangla Wikipedia template info for welcome.py

Change-Id: I7838acd22f29d4f500be218eb87bf4cee45ae709
---
M welcome.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/88/106188/1

diff --git a/welcome.py b/welcome.py
index c54ce8d..a2710c7 100644
--- a/welcome.py
+++ b/welcome.py
@@ -236,6 +236,7 @@
 'wikipedia': {
 'am': u'{{subst:Welcome}} %s',
 'ar': u'{{subst:ترحيب}} %s',
+'bn': u'{{subst:স্বাগতম/বট}} %s',
 'da': u'{{velkommen|%s}}',
 'de': u'{{subst:Hallo}} %s',
 'en': u'{{subst:welcome}} %s',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7838acd22f29d4f500be218eb87bf4cee45ae709
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt 

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

[MediaWiki-commits] [Gerrit] Set up the extension with basic files and configurations - change (mediawiki...ContentTranslation)

2014-01-07 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Set up the extension with basic files and configurations
..

Set up the extension with basic files and configurations

Change-Id: I47bd086c81a2e2a33172fdc005c67df2d7f406cc
---
A AUTHORS.txt
A CONTRIBUTING.md
A ContentTranslation.php
A LICENSE.txt
A README.md
A Resources.php
A i18n/en.json
A i18n/qqq.json
8 files changed, 576 insertions(+), 0 deletions(-)


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

diff --git a/AUTHORS.txt b/AUTHORS.txt
new file mode 100644
index 000..1c91f88
--- /dev/null
+++ b/AUTHORS.txt
@@ -0,0 +1,3 @@
+Amir E. Aharoni 
+Santhosh Thottingal 
+Siebrand Mazeland 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000..851a641
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,140 @@
+# Contributing to ContentTranslation
+
+Thank you for helping us develop ContentTranslation!
+
+This document describes how to report bugs, set up your development
+environment, run tests, and build documentation. It also provides the coding
+conventions we use in the project.
+
+## Bug reports
+
+Please report bugs to 
[bugzilla.wikimedia.org](https://bugzilla.wikimedia.org/enter_bug.cgi?product=ContentTranslation&component=General)
+using the `ContentTranslation` product.  Feel free to use the `General`
+component if you don't know where else your bug might belong. Don't
+worry about specifying version, severity, hardware, or OS.
+
+## Running tests
+
+To run the tests in a web browser, make sure your MediaWiki install is
+[configured](https://www.mediawiki.org/wiki/Manual:JavaScript_unit_testing) to
+allow running of tests. Set in `LocalSettings.php`:
+```php
+// https://www.mediawiki.org/wiki/Manual:JavaScript_unit_testing
+$wgEnableJavaScriptTest = true;
+```
+
+Then open `http://URL_OF_MEDIAWIKI/index.php/Special:JavaScriptTest/qunit`
+(for example, ).
+
+## Building documentation
+
+ContentTranslation uses [JSDuck](https://github.com/senchalabs/jsduck) to 
process
+documentation comments embedded in the code.  To build the documentation, you
+will need `ruby`, `gem`, and `jsduck` installed.
+
+### Installing ruby and gem
+
+You're mostly on your own here, but we can give some hints for Mac OS X.
+
+# Installing Gem in Mac OS X
+Ruby ships with OSX but may be outdated. Use 
[Homebrew](http://mxcl.github.com/homebrew/):
+```sh
+$ brew install ruby
+```
+
+If you've never used `gem` before, don't forget to add the gem's bin to your
+`PATH` ([howto](http://stackoverflow.com/a/14138490/319266)).
+
+### Installing jsduck
+
+Once you have gem, installing [JSDuck](https://github.com/senchalabs/jsduck) 
is easy:
+```sh
+$ gem install --user-install jsduck
+```
+
+### Running jsduck
+
+Creating the documentation is easy:
+```sh
+$ cd ContentTranslation
+$ .docs/generate.sh
+```
+
+You may need to set `MW_INSTALL_PATH` in your environment to the location of
+your mediawiki installation if ContentTranslation is not checked out directly 
in the
+mediawiki extensions folder (for example, if you're using a symlink).
+
+The generated documentation is in the `docs/` subdirectory.  View the
+documentation at
+`http://URL_OF_MEDIAWIKI/extensions/ContentTranslation/docs/`
+(for example, ).
+
+Note that `jsduck` doesn't support browsing vis the `file:` protocol.
+
+## ContentTranslation Code Guidelines
+
+We inherit the code structure (about whitespace, naming and comments) 
conventions
+from MediaWiki. See [Manual:Coding 
conventions/JavaScript](https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript)
+on mediawiki.org.
+
+Git commit messages should follow the conventions described in
+.
+
+### Documentation comments
+
+* End sentences in a full stop.
+* Continue sentences belonging to an annotation on the next line, indented 
with an
+  additional space.
+* Types in documentation comments should be separated by a pipe character. Use 
types
+  that are listed in the Types section of this document, otherwise use the 
identifier
+  (full path from the global scope) of the constructor function (e.g. 
`{ve.dm.BranchNode}`).
+
+### Annotations
+
+We use the following annotations. They should be used in the order as they are 
described
+here, for consistency. See 
[JSDuck/Tags](https://github.com/senchalabs/jsduck/wiki/Tags) for more 
elaborate documentation.
+
+* @class Name (optional, guessed)
+* @abstract
+* @extends ClassName
+* @mixins ClassName
+* @constructor
+* @private
+* @static
+* @method name (optional, guessed)
+* @template
+* @property name (optional, guessed)
+* @until Text: Optional text.
+* @source Text
+* @context {Type} Optional text.
+* @param {Type}

[MediaWiki-commits] [Gerrit] Fix scrolling back and forth on copy/paste in Firefox - change (VisualEditor/VisualEditor)

2014-01-07 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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


Change subject: Fix scrolling back and forth on copy/paste in Firefox
..

Fix scrolling back and forth on copy/paste in Firefox

Both on copy and on paste, Firefox would sometimes scroll the
document and scroll it back. On paste, it seemed to happen most reliably
when pasting into a slug.

Fix by restoring the scroll position immediately each time the focus
changes, as opposed to restoring it only after the last focus change
while yielding in between focus changes.

Change-Id: Ia592d0e8399b8896ffc0e18115e470d3ce91128f
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/85/106185/1

diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index 19cc080..135dc2b 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -743,13 +743,16 @@
sel.removeAllRanges();
this.$pasteTarget[0].focus();
sel.addRange( rangyRange, false );
+   // Restore scroll position after changing focus
+   $window.scrollTop( scrollTop );
 
setTimeout( function () {
+   // Change focus back
sel = rangy.getSelection( view.getElementDocument() );
sel.removeAllRanges();
view.documentView.getDocumentNode().$element[0].focus();
sel.addRange( originalRange );
-
+   // Restore scroll position
$window.scrollTop( scrollTop );
} );
}
@@ -871,6 +874,9 @@
this.$pasteTarget[0].focus();
}
 
+   // Restore scroll position after focusing the paste target
+   $window.scrollTop( this.beforePasteData.scrollTop );
+
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia592d0e8399b8896ffc0e18115e470d3ce91128f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
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] Unwrap unnecessary array_key_exists() in BetaFeatures hook r... - change (mediawiki...VisualEditor)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Unwrap unnecessary array_key_exists() in BetaFeatures hook 
registration
..


Unwrap unnecessary array_key_exists() in BetaFeatures hook registration

Change-Id: Ib4ea05729854c6e9e2da36073451d51a10d0febd
---
M VisualEditor.php
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index d772cc8..21d1c63 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -56,9 +56,7 @@
 // Register Hooks
 $wgHooks['BeforePageDisplay'][] = 'VisualEditorHooks::onBeforePageDisplay';
 $wgHooks['DoEditSectionLink'][] = 'VisualEditorHooks::onDoEditSectionLink';
-if ( array_key_exists( 'GetBetaFeaturePreferences', $wgHooks ) ) {
-   $wgHooks['GetBetaFeaturePreferences'][] = 
'VisualEditorHooks::onGetBetaPreferences';
-}
+$wgHooks['GetBetaFeaturePreferences'][] = 
'VisualEditorHooks::onGetBetaPreferences';
 $wgHooks['GetPreferences'][] = 'VisualEditorHooks::onGetPreferences';
 $wgHooks['ListDefinedTags'][] = 'VisualEditorHooks::onListDefinedTags';
 $wgHooks['MakeGlobalVariablesScript'][] = 
'VisualEditorHooks::onMakeGlobalVariablesScript';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4ea05729854c6e9e2da36073451d51a10d0febd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 
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] Unwrap unnecessary array_key_exists() in BetaFeatures hook r... - change (mediawiki...VisualEditor)

2014-01-07 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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


Change subject: Unwrap unnecessary array_key_exists() in BetaFeatures hook 
registration
..

Unwrap unnecessary array_key_exists() in BetaFeatures hook registration

Change-Id: Ib4ea05729854c6e9e2da36073451d51a10d0febd
---
M VisualEditor.php
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/VisualEditor.php b/VisualEditor.php
index d772cc8..21d1c63 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -56,9 +56,7 @@
 // Register Hooks
 $wgHooks['BeforePageDisplay'][] = 'VisualEditorHooks::onBeforePageDisplay';
 $wgHooks['DoEditSectionLink'][] = 'VisualEditorHooks::onDoEditSectionLink';
-if ( array_key_exists( 'GetBetaFeaturePreferences', $wgHooks ) ) {
-   $wgHooks['GetBetaFeaturePreferences'][] = 
'VisualEditorHooks::onGetBetaPreferences';
-}
+$wgHooks['GetBetaFeaturePreferences'][] = 
'VisualEditorHooks::onGetBetaPreferences';
 $wgHooks['GetPreferences'][] = 'VisualEditorHooks::onGetPreferences';
 $wgHooks['ListDefinedTags'][] = 'VisualEditorHooks::onListDefinedTags';
 $wgHooks['MakeGlobalVariablesScript'][] = 
'VisualEditorHooks::onMakeGlobalVariablesScript';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4ea05729854c6e9e2da36073451d51a10d0febd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
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] Ressurect Country and Method Generation - change (wikimedia...tools)

2014-01-07 Thread Adamw (Code Review)

Adamw has submitted this change and it was merged.

Change subject: Ressurect Country and Method Generation
..


Ressurect Country and Method Generation

Look for all things since the start of 2012 and...
Exclude things that didn't come from online.

Change-Id: I5eb8d0ee8ef0fbe437e382bc460bf26a7c05f076
---
M FundraiserStatisticsGen/countrygen.py
M FundraiserStatisticsGen/methodgen.py
2 files changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Adamw: Looks good to me, approved



diff --git a/FundraiserStatisticsGen/countrygen.py 
b/FundraiserStatisticsGen/countrygen.py
index ad4201b..e7dc55e 100644
--- a/FundraiserStatisticsGen/countrygen.py
+++ b/FundraiserStatisticsGen/countrygen.py
@@ -46,11 +46,11 @@
   cy.iso_code,
   AVG(IF(c.total_amount>=0, c.total_amount, 0))
 FROM civicrm_contribution c
+INNER JOIN drupal.contribution_tracking ct ON c.id=ct.contribution_id
 LEFT JOIN civicrm_address a ON c.contact_id=a.contact_id
 LEFT JOIN civicrm_country cy ON a.country_id=cy.id
 WHERE
-  c.receive_date >= '2012-12-01' AND
-  c.receive_date <= '2013-02-31'
+  c.receive_date >= '2012-12-01'
 GROUP BY cy.iso_code;
 """)
 
@@ -80,11 +80,11 @@
   AVG(IF(c.total_amount >= 0, c.total_amount, 0)) as `avg`,
   MAX(c.total_amount) as `max`
 FROM civicrm_contribution c
+INNER JOIN drupal.contribution_tracking ct ON c.id=ct.contribution_id
 LEFT JOIN civicrm_address a ON c.contact_id=a.contact_id
 LEFT JOIN civicrm_country cy ON a.country_id=cy.id
 WHERE
-  c.receive_date >= '2012-12-01' AND
-  c.receive_date <= '2013-02-31'
+  c.receive_date >= '2012-12-01'
 GROUP BY
   DATE_FORMAT(receive_date, "%Y-%m-%dT%H:00:00+0") ASC,
   cy.iso_code;
diff --git a/FundraiserStatisticsGen/methodgen.py 
b/FundraiserStatisticsGen/methodgen.py
index bcfc0fc..c4226f8 100644
--- a/FundraiserStatisticsGen/methodgen.py
+++ b/FundraiserStatisticsGen/methodgen.py
@@ -57,8 +57,7 @@
 LEFT JOIN civicrm_option_value ov ON
   ov.option_group_id=10 AND ov.value=c.payment_instrument_id
 WHERE
-  c.receive_date >= '2012-12-01' AND
-  c.receive_date <= '2013-02-31'
+  c.receive_date >= '2012-12-01'
 GROUP BY
   DATE_FORMAT(receive_date, "%Y-%m-%dT%H:00:00+0") ASC,
   ov.label,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5eb8d0ee8ef0fbe437e382bc460bf26a7c05f076
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Adamw 
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 link prefix and trail regexp handling - change (mediawiki...parsoid)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Fix link prefix and trail regexp handling
..


Fix link prefix and trail regexp handling

* Bug 56255: https://gerrit.wikimedia.org/r/#/c/91425/ added a 
linkprefixcharset entry in
the site info instead of the occasionally-broken linkprefix regexp. Use that
to construct the prefix regexp.

* Update base configs with the new linkprefixcharset entry

* Bug 52855: Convert PHP to JS syntax unicode code points

Bug: 56255
Bug: 52855
Change-Id: Ia7d27f7700046ce5e83c0065cfbb29b4f370ca64
---
M lib/baseconfig/be-taraskwiki.json
M lib/baseconfig/cawiki.json
M lib/baseconfig/cswiki.json
M lib/baseconfig/dewiki.json
M lib/baseconfig/enwiki.json
M lib/baseconfig/eswiki.json
M lib/baseconfig/fawiki.json
M lib/baseconfig/fiwiki.json
M lib/baseconfig/iswiki.json
M lib/baseconfig/kaawiki.json
M lib/baseconfig/lnwiki.json
M lib/baseconfig/nlwiki.json
M lib/baseconfig/srwiki.json
M lib/baseconfig/trwiki.json
M lib/baseconfig/zhwiki.json
M lib/mediawiki.WikiConfig.js
16 files changed, 54 insertions(+), 72 deletions(-)

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



diff --git a/lib/baseconfig/be-taraskwiki.json 
b/lib/baseconfig/be-taraskwiki.json
index c1e373c..de2a901 100644
--- a/lib/baseconfig/be-taraskwiki.json
+++ b/lib/baseconfig/be-taraskwiki.json
@@ -1464,7 +1464,8 @@
   "server": "http://localhost";,
   "wikiid": "my_wiki",
   "time": "2013-03-05T23:10:53Z",
-  "maxuploadsize": 104857600
+  "maxuploadsize": 104857600,
+ "linkprefixcharset": ""
 },
 "interwikimap": [
   {
@@ -3624,10 +3625,6 @@
   {
 "name": "linktrail",
 "missing": ""
-  },
-  {
-"name": "linkprefix",
-"*": "/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD"
   }
 ]
   }
diff --git a/lib/baseconfig/cawiki.json b/lib/baseconfig/cawiki.json
index a073ac6..8061d27 100644
--- a/lib/baseconfig/cawiki.json
+++ b/lib/baseconfig/cawiki.json
@@ -1338,7 +1338,8 @@
   "server": "http://localhost";,
   "wikiid": "my_wiki",
   "time": "2013-03-05T21:40:00Z",
-  "maxuploadsize": 104857600
+  "maxuploadsize": 104857600,
+ "linkprefixcharset": ""
 },
 "interwikimap": [
   {
@@ -3498,10 +3499,6 @@
   {
 "name": "linktrail",
 "missing": ""
-  },
-  {
-"name": "linkprefix",
-"*": "/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD"
   }
 ]
   }
diff --git a/lib/baseconfig/cswiki.json b/lib/baseconfig/cswiki.json
index 2a8ebab..1d8f554 100644
--- a/lib/baseconfig/cswiki.json
+++ b/lib/baseconfig/cswiki.json
@@ -1475,7 +1475,8 @@
   "server": "http://localhost";,
   "wikiid": "my_wiki",
   "time": "2013-03-05T21:40:14Z",
-  "maxuploadsize": 104857600
+  "maxuploadsize": 104857600,
+ "linkprefixcharset": ""
 },
 "interwikimap": [
   {
@@ -3635,10 +3636,6 @@
   {
 "name": "linktrail",
 "missing": ""
-  },
-  {
-"name": "linkprefix",
-"*": "/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD"
   }
 ]
   }
diff --git a/lib/baseconfig/dewiki.json b/lib/baseconfig/dewiki.json
index f681710..4021532 100644
--- a/lib/baseconfig/dewiki.json
+++ b/lib/baseconfig/dewiki.json
@@ -1533,7 +1533,8 @@
   "server": "http://localhost";,
   "wikiid": "my_wiki",
   "time": "2013-03-05T20:00:28Z",
-  "maxuploadsize": 104857600
+  "maxuploadsize": 104857600,
+ "linkprefixcharset": ""
 },
 "interwikimap": [
   {
@@ -3693,10 +3694,6 @@
   {
 "name": "linktrail",
 "missing": ""
-  },
-  {
-"name": "linkprefix",
-"*": "/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD"
   }
 ]
   }
diff --git a/lib/baseconfig/enwiki.json b/lib/baseconfig/enwiki.json
index c724966..c07096b 100644
--- a/lib/baseconfig/enwiki.json
+++ b/lib/baseconfig/enwiki.json
@@ -1312,7 +1312,8 @@
   "server": "http://localhost";,
   "wikiid": "my_wiki",
   "time": "2013-03-05T21:40:32Z",
-  "maxuploadsize": 104857600
+  "maxuploadsize": 104857600,
+ "linkprefixcharset": ""
 },
 "interwikimap": [
   {
@@ -3472,10 +3473,6 @@
   {
 "name": "linktrail",
 "missing": ""
-  },
-  {
-"name": "linkprefix",
-"*": "/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD"
   }
 ]
   }
diff --git a/lib/baseconfig/eswiki.json b/lib/baseconfig/eswiki.json
index f9ded4e..ca8bb7e 100644
--- a/lib/baseconfig/eswiki.json
+++ b/lib/baseconfig/eswiki.json
@@ -1612,7 +1612,8 @@
   "server": "http://localhost";,
   "wikiid": "my_wiki",
   "time": "2013-03-05T21:40:59Z",
-  "maxuploadsize": 104857600
+  "maxuploadsize": 104857600,
+ "linkprefixcharset": ""
 },
 "interwikimap": [
   {
@@ -3772,10 +3773,6 @@
   {
 "name": "linktrail",
 "missing": ""
-

[MediaWiki-commits] [Gerrit] Ressurect Country and Method Generation - change (wikimedia...tools)

2014-01-07 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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


Change subject: Ressurect Country and Method Generation
..

Ressurect Country and Method Generation

Look for all things since the start of 2012 and...
Exclude things that didn't come from online.

Change-Id: I5eb8d0ee8ef0fbe437e382bc460bf26a7c05f076
---
M FundraiserStatisticsGen/countrygen.py
M FundraiserStatisticsGen/methodgen.py
2 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/82/106182/1

diff --git a/FundraiserStatisticsGen/countrygen.py 
b/FundraiserStatisticsGen/countrygen.py
index ad4201b..e7dc55e 100644
--- a/FundraiserStatisticsGen/countrygen.py
+++ b/FundraiserStatisticsGen/countrygen.py
@@ -46,11 +46,11 @@
   cy.iso_code,
   AVG(IF(c.total_amount>=0, c.total_amount, 0))
 FROM civicrm_contribution c
+INNER JOIN drupal.contribution_tracking ct ON c.id=ct.contribution_id
 LEFT JOIN civicrm_address a ON c.contact_id=a.contact_id
 LEFT JOIN civicrm_country cy ON a.country_id=cy.id
 WHERE
-  c.receive_date >= '2012-12-01' AND
-  c.receive_date <= '2013-02-31'
+  c.receive_date >= '2012-12-01'
 GROUP BY cy.iso_code;
 """)
 
@@ -80,11 +80,11 @@
   AVG(IF(c.total_amount >= 0, c.total_amount, 0)) as `avg`,
   MAX(c.total_amount) as `max`
 FROM civicrm_contribution c
+INNER JOIN drupal.contribution_tracking ct ON c.id=ct.contribution_id
 LEFT JOIN civicrm_address a ON c.contact_id=a.contact_id
 LEFT JOIN civicrm_country cy ON a.country_id=cy.id
 WHERE
-  c.receive_date >= '2012-12-01' AND
-  c.receive_date <= '2013-02-31'
+  c.receive_date >= '2012-12-01'
 GROUP BY
   DATE_FORMAT(receive_date, "%Y-%m-%dT%H:00:00+0") ASC,
   cy.iso_code;
diff --git a/FundraiserStatisticsGen/methodgen.py 
b/FundraiserStatisticsGen/methodgen.py
index bcfc0fc..c4226f8 100644
--- a/FundraiserStatisticsGen/methodgen.py
+++ b/FundraiserStatisticsGen/methodgen.py
@@ -57,8 +57,7 @@
 LEFT JOIN civicrm_option_value ov ON
   ov.option_group_id=10 AND ov.value=c.payment_instrument_id
 WHERE
-  c.receive_date >= '2012-12-01' AND
-  c.receive_date <= '2013-02-31'
+  c.receive_date >= '2012-12-01'
 GROUP BY
   DATE_FORMAT(receive_date, "%Y-%m-%dT%H:00:00+0") ASC,
   ov.label,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eb8d0ee8ef0fbe437e382bc460bf26a7c05f076
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Automatically create new search index - change (mediawiki...WikimediaMaintenance)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Automatically create new search index
..


Automatically create new search index

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

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



diff --git a/addWiki.php b/addWiki.php
index dca94bd..d5d07b8 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -196,6 +196,11 @@
# Rebuild wikiversions.cdb
shell_exec( "cd $common/multiversion && 
./refreshWikiversionsCDB" );
 
+   # Create new search index
+   $searchIndex = $this->runChild( 
'CirrusSearch\UpdateSearchIndexConfig' );
+   $searchIndex->mOptions[ 'baseName' ] = $dbName;
+   $searchIndex->execute();
+
# print "Constructing interwiki SQL\n";
# Rebuild interwiki tables
# passthru( '/home/wikipedia/conf/interwiki/update' ); // FIXME

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3d74eaaee1b5f97faae7b0ebf7d1f92929059cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Manybubbles 
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] Send the ipnUrl override parameter. - change (mediawiki...DonationInterface)

2014-01-07 Thread Mwalker (Code Review)

Mwalker has submitted this change and it was merged.

Change subject: Send the ipnUrl override parameter.
..


Send the ipnUrl override parameter.

TODO:
* Must be reverted as soon as the IPN URL can be configured via admin console.

Deployment:
* BEFORE deploying the code,
  $wgAmazonGatewayAccountInfo[ACCOUNT]['IpnOverride'] = 
"https://payments-listener.wikimedia.org/amazon";

Change-Id: If8ae9dcedea9aaff1ff48112400a0322a0ce3ad1
---
M amazon_gateway/amazon.adapter.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/amazon_gateway/amazon.adapter.php 
b/amazon_gateway/amazon.adapter.php
index 8e5a30f..12bb078 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -80,6 +80,7 @@
'collectShippingAddress',
'description',
'immediateReturn',
+   'ipnUrl',
'returnUrl',
'isDonationWidget',
'processImmediate',
@@ -93,6 +94,7 @@
'collectShippingAddress' => '0',
'description' => wfMsg( 
'donate_interface-donation-description' ),
'immediateReturn' => '1',
+   'ipnUrl' => 
$this->account_config['IpnOverride'],
'isDonationWidget' => '1',
'processImmediate' => '1',
'signatureMethod' => 'HmacSHA256',
@@ -108,6 +110,7 @@
'collectShippingAddress',
'description',
'immediateReturn',
+   'ipnUrl',
'processImmediate',
'recurringFrequency',
'referenceId',
@@ -123,6 +126,7 @@
'collectShippingAddress' => '0',
'description' => wfMsg( 
'donate_interface-monthly-donation-description' ),
'immediateReturn' => '1',
+   'ipnUrl' => 
$this->account_config['IpnOverride'],
'processImmediate' => '1',
'recurringFrequency' => "1 month",
'signatureMethod' => "HmacSHA256",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8ae9dcedea9aaff1ff48112400a0322a0ce3ad1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Adamw 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Story 1563: [WIP] Typography updates for Tablet - change (mediawiki...MobileFrontend)

2014-01-07 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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


Change subject: Story 1563: [WIP] Typography updates for Tablet
..

Story 1563: [WIP] Typography updates for Tablet

Done in pair programming with Moiz, Kaity, and Vibha

Change-Id: I14c8182473c9508ffc38a8d5baf114bcb016a35f
---
M less/common/common.less
M less/common/typography.less
M less/specials/userprofile.less
M less/tablet/common.less
M less/tablet/hacks.less
M less/variables.less
6 files changed, 71 insertions(+), 64 deletions(-)


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

diff --git a/less/common/common.less b/less/common/common.less
index 80eb240..feb37c7 100644
--- a/less/common/common.less
+++ b/less/common/common.less
@@ -103,12 +103,6 @@
}
 }
 
-p,
-li,
-dl {
-   line-height: 1.65;
-}
-
 pre {
white-space: pre-wrap;
 }
@@ -222,10 +216,21 @@
 }
 
 .content {
-   // Linker.php
+   // Thumbnails
+   //
+   // Thumbnail images should be rendered within a thumb class
+   //
+   // Markup:
+   // 
+   //   
+   // 
+   //
+   // Styleguide 1.6.
.thumb {
+   margin: 0.6em 0;
+
.thumbinner {
-   margin: 5px auto;
+   margin: 0 auto;
max-width: 100%;
 
> div {
@@ -236,10 +241,12 @@
}
 
.thumbcaption {
-   width: 100%;
-   margin: 5px 10px 0;
-   text-align: center;
+   font-size: 0.85em;
+   line-height: @captionLineHeight;
+   text-align: left;
width: auto !important;
+   padding: 0 !important;
+   color: @grayMedium;
}
 
/* bug 20030 */
@@ -250,6 +257,10 @@
img {
max-width: none !important;
}
+   }
+
+   .sup {
+   line-height: 0;
}
}
 
@@ -351,3 +362,5 @@
 .nomobile {
display: none;
 }
+
+
diff --git a/less/common/typography.less b/less/common/typography.less
index c9f191c..34fbcf2 100644
--- a/less/common/typography.less
+++ b/less/common/typography.less
@@ -12,9 +12,6 @@
font-size: 100% * @fontScalingFactor;
 }
 
-@bodyLineHeight: 1.4;
-@headingLineHeight: 1.3;
-
 body {
font-family: @fontFamily;
line-height: @bodyLineHeight;
@@ -35,12 +32,14 @@
font-family: @fontFamilyHeading;
 }
 
+// Page title
 // h1#section_0 is not inside .content...
 #section_0 {
line-height: @headingLineHeight;
 }
 
 .content {
+   line-height: @contentLineHeight;
margin: .8em @contentMargin 0;
 
// Headings in mobile
@@ -63,7 +62,7 @@
//   Paragraph of text
// 
//
-   // Styleguide 1.1.
+   // Styleguide 1.3.
h1, h2, h3, h4, h5, h6 {
line-height: @headingLineHeight;
font-family: @fontFamilyHeading;
@@ -72,24 +71,6 @@
 
p {
margin-bottom: .7em;
-   }
-
-   // Thumbnails
-   //
-   // Thumbnail images should be rendered within a thumb class
-   //
-   // Markup:
-   // 
-   //   
-   // 
-   //
-   // Styleguide 1.2.
-   .thumb {
-   margin: 15px 0 15px 0;
-   border: 1px solid #ccc;
-   border-radius: 5px;
-   background: #f9f9f9;
-   text-align: center;
}
 
ol,
@@ -158,17 +139,23 @@
 // Styleguide 1.3.
 blockquote {
quotes: "\201C" "\201D";
-   padding: 1em 0 1em 10px;
+   font-family: @fontFamilyHeading;
+   font-size: 1.1em;
+   padding: 1em @blockquotePaddingRight 1em @blockquotePaddingLeft;
position: relative;
 
&:before {
content: open-quote;
font-size: 3em;
+   position: absolute;
+   left: 0;
+   top: 0;
}
 
&:after{
-   font-size: 3em;
content: close-quote;
+   font-size: 3em;
+   line-height: 1;
position: absolute;
right: 0;
bottom: 0;
diff --git a/less/specials/userprofile.less b/less/specials/userprofile.less
index 3812ed0..ad8cda8 100644
--- a/less/specials/userprofile.less
+++ b/less/specials/userprofile.less
@@ -30,8 +30,7 @@
font-family: @fontFamilyHeading;
font-style: italic;
font-size: 1.2em;
-   // FIXME: clean up line-height mess
-   line-height: 1.65;
+   line-height: @contentLine

[MediaWiki-commits] [Gerrit] Act out grudge against some annoying loglines - change (wikimedia...crm)

2014-01-07 Thread Mwalker (Code Review)

Mwalker has submitted this change and it was merged.

Change subject: Act out grudge against some annoying loglines
..


Act out grudge against some annoying loglines

Change-Id: I495c090bddbce52035f2afa2285149e794224475
---
M sites/all/modules/queue2civicrm/recurring/recurring.module
M sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
M sites/all/modules/wmf_common/Queue.php
M sites/all/modules/wmf_common/wmf_civicrm/tracking.inc
M sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
5 files changed, 30 insertions(+), 21 deletions(-)

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



diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module 
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index e914fca..deedabc 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -141,9 +141,6 @@
   );
   $cid = _queue2civicrm_log( $log );
   
-  // log the message
-  watchdog('recurring', 'Recurring msg:' . check_plain(print_r($msg, 
TRUE)) . '');  
-  
   // define the subscription txn type for an actual 'payment'
   $txn_subscr_payment = array( 'subscr_payment' );
   
@@ -159,7 +156,7 @@
   // route the message to the appropriate handler depending on transaction type
   if ( isset( $msg[ 'txn_type' ] ) && in_array( $msg[ 'txn_type' ], 
$txn_subscr_payment ) ) {
 if ( wmf_civicrm_get_contributions_from_gateway_id( $msg['gateway'], 
$msg['gateway_txn_id'] ) ) {
-  watchdog( 'recurring', 'Duplicate contribution: ' . print_r( $msg, true 
) );
+  watchdog( 'recurring', "Duplicate contribution: 
{$msg['gateway']}-{$msg['gateway_txn_id']}." );
   throw new WmfException( 'DUPLICATE_CONTRIBUTION', "Contribution already 
exists. Ignoring message." );
 }
 recurring_import_subscr_payment( $msg );
@@ -200,9 +197,6 @@
   }
 
   civicrm_initialize(true);
-
-  //dsm($contribution);
-  watchdog('queue2civicrm', 'Contribution:' . check_plain(print_r($msg, 
TRUE)) . '');  
 
   $contact[ 'id' ] = $recur_record->contact_id;
 
@@ -394,7 +388,7 @@
 function recurring_import_subscr_modify( $msg ) {
   // ensure we have a record of the subscription
   if ( !$recur_record = recurring_get_recur_record( $msg[ 'subscr_id' ] ) ) {
-throw new WmfException( 'INVALID_RECURRING', 'Subscription account does 
not exist for subscription id: ' . print_r( $msg, true ));
+throw new WmfException( 'INVALID_RECURRING', 'Subscription account does 
not exist for subscription id: ' . print_r( $msg['subscr_id'], true ));
   }
 
   $api = civicrm_api_classapi();
diff --git a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module 
b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
index 93dd5fe..0f5e008 100644
--- a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
+++ b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
@@ -119,7 +119,6 @@
 $body['gross'] = abs( $body['gross'] );
   }
 
-  // FIXME: these WATCHDOG_ERROR's are not exceptions?
   if ( $contributions = wmf_civicrm_get_contributions_from_gateway_id( 
$gateway, $parentTxn ) ) {
 // Perform the refund!
 try {
@@ -131,11 +130,11 @@
 
   watchdog('refund', "$txnid: Successfully marked as refunded", 
WATCHDOG_INFO);
 } catch (Exception $ex) {
-  watchdog('refund', "$txnid: Could not refund due to internal error: " . 
$ex->getMessage(), WATCHDOG_ERROR);
+  watchdog('refund', "$txnid: Could not refund due to internal error: " . 
$ex->getMessage(), NULL, WATCHDOG_ERROR);
   throw $ex;
 }
   } else {
-watchdog( 'refund', "$txnid: Contribution not found for this 
transaction!", WATCHDOG_ERROR );
+watchdog( 'refund', "$txnid: Contribution not found for this 
transaction!", NULL, WATCHDOG_ERROR );
 throw new WmfException( 'MISSING_PREDECESSOR', "Parent not found: 
$parentTxn" );
   }
 }
diff --git a/sites/all/modules/wmf_common/Queue.php 
b/sites/all/modules/wmf_common/Queue.php
index 8bfc759..ba21e8b 100644
--- a/sites/all/modules/wmf_common/Queue.php
+++ b/sites/all/modules/wmf_common/Queue.php
@@ -71,7 +71,7 @@
 }
 }
 
-watchdog( 'wmf_common', t('Feeding raw queue message to %callback 
: %msg', array( '%callback' => print_r($callback, TRUE), '%msg' => 
print_r($msg, TRUE) ) ), NULL, WATCHDOG_INFO );
+watchdog( 'wmf_common', t( 'Feeding raw queue message to %callback 
: %msg', array( '%callback' => print_r($callback, TRUE), '%msg' => 
$this->debug_message( $msg ) ) ), NULL, WATCHDOG_INFO );
 
 set_time_limit( 60 );
 
@@ -431,4 +431,17 @@
 $queue = str_replace( '/queue/', '', $queue );
 return '/queue/' . $queue;
 }
+
+protected function debug_message( $msg ) {
+$msg_copy = clone( $msg );
+if ( is_string( $msg_copy->body ) ) {
+$decoded = json_decode( $msg_copy->bod

[MediaWiki-commits] [Gerrit] Revert "Utilize BufferedCache in TreeRepository" - change (mediawiki/core)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Utilize BufferedCache in TreeRepository"
..


Revert "Utilize BufferedCache in TreeRepository"

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

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



diff --git a/extensions/Flow b/extensions/Flow
index 64a79ff..5f22fa0 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit 64a79ffb0b3648aac8046ca0f8915b402e59c204
+Subproject commit 5f22fa066d205ff0b579bb201f00eff50b53d5c2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a2f3d5dc945ab5a94f17f0c7454ea576489ed0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 
Gerrit-Reviewer: EBernhardson 
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 wmgCategoryTreeDynamicTag - change (operations/mediawiki-config)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Remove wmgCategoryTreeDynamicTag
..


Remove wmgCategoryTreeDynamicTag

Change-Id: I0a6a2434067245edbeb3c135ad7f14ed55acd9f1
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7fc6f0f..c039848 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -594,7 +594,7 @@
 
 if ( $wmgUseCategoryTree ) {
require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
-   $wgCategoryTreeDynamicTag = $wmgCategoryTreeDynamicTag;
+   $wgCategoryTreeDynamicTag = true;
$wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
$wgCategoryTreeCategoryPageOptions = 
$wmgCategoryTreeCategoryPageOptions;
 }
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7d3025c..1b5de7c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9274,10 +9274,6 @@
'votewiki' => false,
 ),
 
-'wmgCategoryTreeDynamicTag' => array(
-   'default' => true,
-),
-
 // CT_MODE_CATEGORIES = 0
 // CT_MODE_PAGES = 10
 // CT_MODE_ALL = 20

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a6a2434067245edbeb3c135ad7f14ed55acd9f1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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] Remove wmgCategoryTreeDynamicTag - change (operations/mediawiki-config)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Remove wmgCategoryTreeDynamicTag
..

Remove wmgCategoryTreeDynamicTag

Change-Id: I0a6a2434067245edbeb3c135ad7f14ed55acd9f1
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7fc6f0f..c039848 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -594,7 +594,7 @@
 
 if ( $wmgUseCategoryTree ) {
require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
-   $wgCategoryTreeDynamicTag = $wmgCategoryTreeDynamicTag;
+   $wgCategoryTreeDynamicTag = true;
$wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
$wgCategoryTreeCategoryPageOptions = 
$wmgCategoryTreeCategoryPageOptions;
 }
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7d3025c..1b5de7c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9274,10 +9274,6 @@
'votewiki' => false,
 ),
 
-'wmgCategoryTreeDynamicTag' => array(
-   'default' => true,
-),
-
 // CT_MODE_CATEGORIES = 0
 // CT_MODE_PAGES = 10
 // CT_MODE_ALL = 20

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

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

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

[MediaWiki-commits] [Gerrit] Use gender-neutral wording in Special:Preferences - change (mediawiki/core)

2014-01-07 Thread Jackmcbarn (Code Review)

Jackmcbarn has uploaded a new change for review.

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


Change subject: Use gender-neutral wording in Special:Preferences
..

Use gender-neutral wording in Special:Preferences

When selecting gender in Special:Preferences, use "They edit wiki pages"
instead of "I prefer not to say", to be more in line with the "He edits wiki
pages" and "She edits wiki pages" options.

Bug: 59643
Change-Id: I0b64573bbf8c7813ebc6f7c128f1046d55c73796
---
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
2 files changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 1889368..32cf545 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1968,7 +1968,7 @@
 'badsiglength'  => 'Your signature is too long.
 It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'yourgender'=> 'How do you prefer to be described?',
-'gender-unknown'=> 'I prefer not to say',
+'gender-unknown'=> 'They edit wiki pages',
 'gender-male'   => 'He edits wiki pages',
 'gender-female' => 'She edits wiki pages',
 'prefs-help-gender' => 'Setting this preference is optional.
diff --git a/languages/messages/MessagesQqq.php 
b/languages/messages/MessagesQqq.php
index 327c183..a5737e2 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -3146,9 +3146,11 @@
 * {{msg-mw|gender-male}}
 * {{msg-mw|gender-female}}
 The idea is that this preference is used for speaking to the user and about 
the user, and the label and the preference are supposed to demonstrate it.',
-'gender-unknown' => 'Used in [[Special:Preferences]], first tab, as one of the 
selectable options of the {{msg-mw|Yourgender}} prompt. Choosing it indicates 
that the grammatical gender of the user name is not to be made public, cannot 
be determined, or matches none of the other choices preset in the select.
+'gender-unknown' => 'Used in [[Special:Preferences]], first tab, as one of the 
selectable options of the {{msg-mw|Yourgender}} prompt.
+Choosing it indicates that the grammatical gender of the user name is not to 
be made public, cannot be determined, or matches none of the other choices 
preset in the select.
 
-This may appropriately customized for your language. It should sound like a 
reply to {{msg-mw|yourgender}}.',
+You have to customize this example for your language if needed to have a 
sentence which varies depending on the grammatical gender.
+The wording must demonstrate the actual usage of the option. It should sound 
like a reply to {{msg-mw|Yourgender}}.',
 'gender-male' => 'Used in [[Special:Preferences]], first tab, as one of the 
selectable options of the {{msg-mw|Yourgender}} prompt.
 Choosing it indicates that the grammatical gender of the user name should be 
"male" for those languages having a "normal" male grammatical gender.
 

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

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

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

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

2014-01-07 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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


Change subject: Update MobileFrontend
..

Update MobileFrontend

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/106178/1

diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend
index c037a32..ed3e034 16
--- a/extensions/MobileFrontend
+++ b/extensions/MobileFrontend
-Subproject commit c037a3284225d6a9f4f1031c52bffd414ae3caf3
+Subproject commit ed3e0343b21d65ddb615de7ea0c51419d7c94ee0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a77a6c94e76eb224caf3a86f3394dc775cc7534
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Kaldari 

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

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

2014-01-07 Thread Kaldari (Code Review)

Kaldari has submitted this change and it was merged.

Change subject: Update MobileFrontend
..


Update MobileFrontend

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

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



diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend
index c037a32..ed3e034 16
--- a/extensions/MobileFrontend
+++ b/extensions/MobileFrontend
-Subproject commit c037a3284225d6a9f4f1031c52bffd414ae3caf3
+Subproject commit ed3e0343b21d65ddb615de7ea0c51419d7c94ee0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a77a6c94e76eb224caf3a86f3394dc775cc7534
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Kaldari 

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

[MediaWiki-commits] [Gerrit] Revert "Utilize BufferedCache in TreeRepository" - change (mediawiki/core)

2014-01-07 Thread Bsitu (Code Review)

Bsitu has uploaded a new change for review.

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


Change subject: Revert "Utilize BufferedCache in TreeRepository"
..

Revert "Utilize BufferedCache in TreeRepository"

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/106177/1

diff --git a/extensions/Flow b/extensions/Flow
index 64a79ff..5f22fa0 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit 64a79ffb0b3648aac8046ca0f8915b402e59c204
+Subproject commit 5f22fa066d205ff0b579bb201f00eff50b53d5c2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a2f3d5dc945ab5a94f17f0c7454ea576489ed0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Bsitu 

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

[MediaWiki-commits] [Gerrit] Fix header buttons with new header style [beta] - change (mediawiki...MobileFrontend)

2014-01-07 Thread Kaldari (Code Review)

Kaldari has submitted this change and it was merged.

Change subject: Fix header buttons with new header style [beta]
..


Fix header buttons with new header style [beta]

Bug: 59734
Change-Id: I0984a7a5f111803e9b4d40593d587bd1b18cb84a
(cherry picked from commit 1de57a6972bc4e60efb5fe8ba9ecd32562d894a1)
---
M less/common/uiNew.less
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Kaldari: Looks good to me, approved



diff --git a/less/common/uiNew.less b/less/common/uiNew.less
index be95ad0..ce03147 100644
--- a/less/common/uiNew.less
+++ b/less/common/uiNew.less
@@ -39,7 +39,7 @@
}
 
// FIXME: use .icon class
-   a {
+   #mw-mf-main-menu-button, #secondary-button {
height: @headerHeight - @headerMargin;
text-indent: -px;
background-repeat: no-repeat;
@@ -56,7 +56,9 @@
background-position: right 40% top 40%;
}
 
-   .user-button {
+   // need to specify id or else other rules are more important
+   // FIXME: simplify when .icon class from OverlayNew used instead
+   #secondary-button.user-button {
text-indent: 0;
width: @headerHeight - 2 * @headerMargin;
padding-left: @headerMargin;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0984a7a5f111803e9b4d40593d587bd1b18cb84a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Kaldari 
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 tests for EventLogging timing - change (mediawiki...MultimediaViewer)

2014-01-07 Thread MarkTraceur (Code Review)

MarkTraceur has uploaded a new change for review.

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


Change subject: Add tests for EventLogging timing
..

Add tests for EventLogging timing

Change-Id: Idb44fc2c0b4f38c0e4ae9c91459735fa547d0191
---
M tests/qunit/ext.multimediaViewer.test.js
1 file changed, 27 insertions(+), 0 deletions(-)


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

diff --git a/tests/qunit/ext.multimediaViewer.test.js 
b/tests/qunit/ext.multimediaViewer.test.js
index 210d208..184632d 100644
--- a/tests/qunit/ext.multimediaViewer.test.js
+++ b/tests/qunit/ext.multimediaViewer.test.js
@@ -219,6 +219,33 @@
mw.eventLog = backupEventLog;
} );
 
+   QUnit.asyncTest( 'Make sure we get sane values for the eventlogging 
timing', 2, function ( assert ) {
+   var pid,
+   continuing = true,
+   expected = 0,
+   viewer = new mw.MultimediaViewer(),
+   backupEventLog = mw.eventLog;
+
+   mw.eventLog = {
+   logEvent: function ( schema, msg ) {
+   assert.ok( msg.milliseconds > expected, 'Right 
amount of time elapsed.' );
+   if ( continuing ) {
+   continuing = false;
+   pid = viewer.profileStart( 
'image-resize', { width: 20, height: 20, filesize: 20 }, 'png' );
+   expected = 80;
+   window.setTimeout( function () { 
viewer.profileEnd( pid ); }, expected );
+   } else {
+   mw.eventLog = backupEventLog;
+   QUnit.start();
+   }
+   }
+   };
+
+   pid = viewer.profileStart( 'image-load', { width: 10, height: 
10, filesize: 10 }, 'jpg' );
+   expected = 40;
+   window.setTimeout( function () { viewer.profileEnd( pid ); }, 
expected );
+   } );
+
QUnit.test( 'Ensure that the click callback is getting the appropriate 
initial value for image loading', 1, function ( assert ) {
var imgSrc = '300px-valid.jpg',
div = createGallery( imgSrc ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb44fc2c0b4f38c0e4ae9c91459735fa547d0191
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] Fix indenting in $wmgUseCategoryTree - change (operations/mediawiki-config)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Fix indenting in $wmgUseCategoryTree
..


Fix indenting in $wmgUseCategoryTree

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 129c618..7d3025c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9269,9 +9269,9 @@
 
 # EXTENSIONS @{
 'wmgUseCategoryTree' => array(
-'default' => true,
-'loginwiki' => false,
-'votewiki' => false,
+   'default' => true,
+   'loginwiki' => false,
+   'votewiki' => false,
 ),
 
 'wmgCategoryTreeDynamicTag' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7ed5621616d95a462fe38feb1d2a9767a4f5fbe
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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] Fix indenting in $wmgUseCategoryTree - change (operations/mediawiki-config)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Fix indenting in $wmgUseCategoryTree
..

Fix indenting in $wmgUseCategoryTree

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 129c618..7d3025c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9269,9 +9269,9 @@
 
 # EXTENSIONS @{
 'wmgUseCategoryTree' => array(
-'default' => true,
-'loginwiki' => false,
-'votewiki' => false,
+   'default' => true,
+   'loginwiki' => false,
+   'votewiki' => false,
 ),
 
 'wmgCategoryTreeDynamicTag' => array(

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

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

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

[MediaWiki-commits] [Gerrit] Remove $wgCategoryTreeDisableCache, leave as default of true - change (operations/mediawiki-config)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Remove $wgCategoryTreeDisableCache, leave as default of true
..


Remove $wgCategoryTreeDisableCache, leave as default of true

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f1c753d..7fc6f0f 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -597,7 +597,6 @@
$wgCategoryTreeDynamicTag = $wmgCategoryTreeDynamicTag;
$wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
$wgCategoryTreeCategoryPageOptions = 
$wmgCategoryTreeCategoryPageOptions;
-   $wgCategoryTreeDisableCache = false;
 }
 
 if ( $wmgUseProofreadPage ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I613b194f96a88b41720794623ab6a8a3598c7364
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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] Fix anchor links from status to list page - change (labs/toollabs)

2014-01-07 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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


Change subject: Fix anchor links from status to list page
..

Fix anchor links from status to list page

Change-Id: I9f03ccd994e887bc9fb278bc01c2c0700d1209c0
---
M www/content/status.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/73/106173/1

diff --git a/www/content/status.php b/www/content/status.php
index d424f61..80ba4f4 100644
--- a/www/content/status.php
+++ b/www/content/status.php
@@ -157,7 +157,7 @@
 
   
   
-  
+  
/ 
   
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f03ccd994e887bc9fb278bc01c2c0700d1209c0
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] Remove $wgCategoryTreeDisableCache, leave as default of true - change (operations/mediawiki-config)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Remove $wgCategoryTreeDisableCache, leave as default of true
..

Remove $wgCategoryTreeDisableCache, leave as default of true

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f1c753d..7fc6f0f 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -597,7 +597,6 @@
$wgCategoryTreeDynamicTag = $wmgCategoryTreeDynamicTag;
$wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
$wgCategoryTreeCategoryPageOptions = 
$wmgCategoryTreeCategoryPageOptions;
-   $wgCategoryTreeDisableCache = false;
 }
 
 if ( $wmgUseProofreadPage ) {

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

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

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

[MediaWiki-commits] [Gerrit] Send the ipnUrl override parameter. - change (mediawiki...DonationInterface)

2014-01-07 Thread Adamw (Code Review)

Adamw has uploaded a new change for review.

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


Change subject: Send the ipnUrl override parameter.
..

Send the ipnUrl override parameter.

TODO:
* Must be reverted as soon as the IPN URL can be configured via admin console.

Deployment:
* $wgAmazonGatewayAccountInfo[ACCOUNT]['IpnOverride'] = 
"https://payments-listener.wikimedia.org/SmashPig/amazon/listener";

Change-Id: If8ae9dcedea9aaff1ff48112400a0322a0ce3ad1
---
M amazon_gateway/amazon.adapter.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/amazon_gateway/amazon.adapter.php 
b/amazon_gateway/amazon.adapter.php
index 8e5a30f..12bb078 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -80,6 +80,7 @@
'collectShippingAddress',
'description',
'immediateReturn',
+   'ipnUrl',
'returnUrl',
'isDonationWidget',
'processImmediate',
@@ -93,6 +94,7 @@
'collectShippingAddress' => '0',
'description' => wfMsg( 
'donate_interface-donation-description' ),
'immediateReturn' => '1',
+   'ipnUrl' => 
$this->account_config['IpnOverride'],
'isDonationWidget' => '1',
'processImmediate' => '1',
'signatureMethod' => 'HmacSHA256',
@@ -108,6 +110,7 @@
'collectShippingAddress',
'description',
'immediateReturn',
+   'ipnUrl',
'processImmediate',
'recurringFrequency',
'referenceId',
@@ -123,6 +126,7 @@
'collectShippingAddress' => '0',
'description' => wfMsg( 
'donate_interface-monthly-donation-description' ),
'immediateReturn' => '1',
+   'ipnUrl' => 
$this->account_config['IpnOverride'],
'processImmediate' => '1',
'recurringFrequency' => "1 month",
'signatureMethod' => "HmacSHA256",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8ae9dcedea9aaff1ff48112400a0322a0ce3ad1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Adamw 

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

[MediaWiki-commits] [Gerrit] Proxy kibana.wikimedia.org via misc varnish cluster - change (operations/puppet)

2014-01-07 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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


Change subject: Proxy kibana.wikimedia.org via misc varnish cluster
..

Proxy kibana.wikimedia.org via misc varnish cluster

Use the misc Varnish cluster to provide SSL termination and load
balancing for kibana.wikimedia.org.

Depends on: I504c4c1
Change-Id: If10eb3a99916df7172c869efd248f45f6d081b7f
---
M manifests/role/cache.pp
M modules/varnish/templates/vcl/wikimedia.vcl.erb
M templates/varnish/misc.inc.vcl.erb
3 files changed, 33 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/106170/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e86a440..2344e33 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1182,11 +1182,23 @@
 'ssl_proxies' => $wikimedia_networks,
 'default_backend' => 'antimony',# FIXME
 },
-backends => [ 'antimony.wikimedia.org', 'ytterbium.wikimedia.org', 
'tungsten.eqiad.wmnet', 'zirconium.wikimedia.org' ],
+backends => [
+  'antimony.wikimedia.org',
+  'ytterbium.wikimedia.org',
+  'tungsten.eqiad.wmnet',
+  'zirconium.wikimedia.org',
+  'logstash1001.equad.wmnet',
+  'logstash1002.equad.wmnet',
+  'logstash1003.equad.wmnet',
+],
 backend_options => [
 {
 'backend_match' => '^(antimony|ytterbium)',
 'port' => 8080,
+},
+{
+'backend_match' => '^logstash100[1-3]',
+'probe' => 'logstash',
 },
 {
 'port' => 80,
@@ -1194,7 +1206,11 @@
 'first_byte_timeout' => '35s',
 'between_bytes_timeout' => '4s',
 'max_connections' => 100,
-}]
+}],
+directors => {
+  'kibana'=> [ 'logstash1001', 'logstash1002', 'logstash1003' ]
+},
+director_type => 'round-robin',
 }
 }
 }
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 25621e1..93100fd 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -103,6 +103,14 @@
.timeout = 2s;
 }
 
+probe logstash {
+   .url = "/status";
+   .interval = 5s;
+   .timeout = 1s;
+   .window = 5;
+   .threshold = 3;
+}
+
 # Backends
 
 # List of Puppet generated backends
diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 9aa9a1f..b706226 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -10,6 +10,8 @@
set req.backend = ytterbium;
} elsif (req.http.Host == "gdash.wikimedia.org" || req.http.Host == 
"graphite.wikimedia.org") {
set req.backend = tungsten;
+   } elsif (req.http.Host == "kibana.wikimedia.org"){
+   set req.backend = kibana;
} elsif (req.http.Host == "scholarships.wikimedia.org") {
set req.backend = zirconium;
} else {
@@ -21,6 +23,11 @@
return (pass);
}
 
+   if (req.http.Authorization) {
+   /* Don't cache authorized content */
+   return (pass);
+   }
+
return (lookup);
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Kibana puppet class - change (operations/puppet)

2014-01-07 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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


Change subject: Kibana puppet class
..

Kibana puppet class

Puppet class to install and configure Kibana. The class uses Trebuchet
to deploy an internal mirror of the Kibana github project [0]. Apache
and LDAP are used to provide authentication/authorization in front of
the Elasticsearch cluster.

[0]: https://github.com/elasticsearch/kibana

Change-Id: I504c4c124c2bb01999b10a68c43f360aa2df4645
---
M manifests/role/deployment.pp
M manifests/role/logstash.pp
A modules/kibana/files/config.js
A modules/kibana/manifests/init.pp
A modules/kibana/templates/apache.conf.erb
5 files changed, 236 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/106169/1

diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 6d32a44..0c13007 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -133,6 +133,10 @@
 'grain'=> 'scholarships',
 'upstream' => 
'https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships',
 },
+'kibana/kibana'  => {
+'grain'=> 'kibana',
+'upstream' => 
'https://gerrit.wikimedia.org/r/operations/software/kibana',
+},
   }
 }
 
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index d366034..4c00a54 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -67,4 +67,11 @@
 priority=> 90,
 }
 
+class { '::kibana':
+hostname => 'kibana.wikimedia.org',
+ldap_authurl => 'ldaps://virt1000.wikimedia.org 
virt0.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn',
+ldap_binddn  => 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org',
+ldap_group   => 'cn=wmf,ou=groups,dc=wikimedia,dc=org',
+auth_realm   => 'WMF Labs (use wiki login name not shell)',
+}
 }
diff --git a/modules/kibana/files/config.js b/modules/kibana/files/config.js
new file mode 100644
index 000..762eb65
--- /dev/null
+++ b/modules/kibana/files/config.js
@@ -0,0 +1,66 @@
+/** @scratch /configuration/config.js/1
+ * == Configuration
+ * config.js is where you will find the core Kibana configuration. This file
+ * contains parameters that must be set before kibana is run for the first 
time.
+ */
+define(['settings'],
+function (Settings) {
+  "use strict";
+
+  /** @scratch /configuration/config.js/2
+   * === Parameters
+   */
+  return new Settings({
+
+/** @scratch /configuration/config.js/5
+ *  elasticsearch
+ *
+ * Our apache config acts as a reverse proxy to the elasticsearch cluster.
+ */
+elasticsearch: "//"+window.location.hostname,
+
+/** @scratch /configuration/config.js/5
+ *  default_route
+ *
+ * This is the default landing page when you don't specify a dashboard to
+ * load. You can specify files, scripts or saved dashboards here. For
+ * example, if you had saved a dashboard called `WebLogs' to elasticsearch
+ * you might use:
+ *
+ * +default_route: '/dashboard/elasticsearch/WebLogs',+
+ */
+default_route : '/dashboard/file/default.json',
+
+/** @scratch /configuration/config.js/5
+ *  kibana-int
+ *
+ * The default ES index to use for storing Kibana specific object
+ * such as stored dashboards
+ */
+kibana_index: "kibana-int",
+
+/** @scratch /configuration/config.js/5
+ *  panel_name
+ *
+ * An array of panel modules available. Panels will only be loaded when
+ * they are defined in the dashboard, but this list is used in the "add
+ * panel" interface.
+ */
+panel_names: [
+  'histogram',
+  'map',
+  'pie',
+  'table',
+  'filtering',
+  'timepicker',
+  'text',
+  'hits',
+  'column',
+  'trends',
+  'bettermap',
+  'query',
+  'terms',
+  'sparklines'
+]
+  });
+});
diff --git a/modules/kibana/manifests/init.pp b/modules/kibana/manifests/init.pp
new file mode 100644
index 000..7af242d
--- /dev/null
+++ b/modules/kibana/manifests/init.pp
@@ -0,0 +1,89 @@
+# vim:sw=4 ts=4 sts=4 et:
+
+# = Class: kibana
+#
+# This class installs/configures/manages the Kibana application.
+#
+# == Parameters:
+# - $hostname: Hostname for apache vhost.
+# - $deploy_dir: Directory application is deployed to. Default
+#   '/srv/deployment/kibana/kibana'.
+# - $es_host: Elasticsearch server. Default '127.0.0.1'.
+# - $es_port: Elasticsearch server port. Default 9200.
+# - $ldap_authurl: Url for LDAP server
+# - $ldap_binddn: DN for binding to LDAP server
+# - $ldap_group: LDAP group to require for authenication
+# - $auth_realm: HTTP basic auth realm
+# - $serveradmin: Administrative contact email address
+#
+# == Sample usage:
+#
+#   class { 'kibana':
+#   hostname => 'kibana.example.com',
+#   ldap

[MediaWiki-commits] [Gerrit] Ensure that logstash is running - change (operations/puppet)

2014-01-07 Thread Ori.livneh (Code Review)

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

Change subject: Ensure that logstash is running
..


Ensure that logstash is running

Add "ensure => running" and associated configuration for logstash
service. Also change the syslog listening port to be >1024 so that it
can be bound by the non-root user that is running logstash daemon.

Change-Id: I70113919be68274b132d1c965f64e2ae75444f0f
---
M manifests/role/logstash.pp
M modules/logstash/manifests/init.pp
2 files changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index d366034..e8aa1bf 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -42,7 +42,7 @@
 port => 8324,
 }
 class { '::logstash::input::syslog':
-port => 514,
+port => 10514,
 }
 class { '::logstash::input::redis':
 host => '127.0.0.1',
diff --git a/modules/logstash/manifests/init.pp 
b/modules/logstash/manifests/init.pp
index 76ddaeb..c488987 100644
--- a/modules/logstash/manifests/init.pp
+++ b/modules/logstash/manifests/init.pp
@@ -61,6 +61,10 @@
 }
 
 service { 'logstash':
-enable  => true,
+enable => true,
+ensure => running,
+provider   => 'debian',
+hasstatus  => true,
+hasrestart => true,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70113919be68274b132d1c965f64e2ae75444f0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
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] Update VectorBeta to master - change (mediawiki/core)

2014-01-07 Thread Kaldari (Code Review)

Kaldari has submitted this change and it was merged.

Change subject: Update VectorBeta to master
..


Update VectorBeta to master

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

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



diff --git a/extensions/VectorBeta b/extensions/VectorBeta
index 40a246f..d8940ae 16
--- a/extensions/VectorBeta
+++ b/extensions/VectorBeta
-Subproject commit 40a246f0970d4db71de3b271f90d84f1a75a7123
+Subproject commit d8940aec4693314f1a3f099bb1aa2a24a41ad975

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1677c82818073701b0f2e9053e3c9c456a3fcb78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update VectorBeta to master - change (mediawiki/core)

2014-01-07 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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


Change subject: Update VectorBeta to master
..

Update VectorBeta to master

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/106168/1

diff --git a/extensions/VectorBeta b/extensions/VectorBeta
index 40a246f..d8940ae 16
--- a/extensions/VectorBeta
+++ b/extensions/VectorBeta
-Subproject commit 40a246f0970d4db71de3b271f90d84f1a75a7123
+Subproject commit d8940aec4693314f1a3f099bb1aa2a24a41ad975

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1677c82818073701b0f2e9053e3c9c456a3fcb78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] Revert "Utilize BufferedCache in TreeRepository" - change (mediawiki...Flow)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Utilize BufferedCache in TreeRepository"
..


Revert "Utilize BufferedCache in TreeRepository"

This reverts commit 7f53d4c05156d4a088b7e4e621592e118ede6524.

Change-Id: I73e92439e17eac0f828f45a8e6cca16648c5ec56
(cherry picked from commit 50dbdb9fb597f342b356209a9fbc82cfa1f5b37f)
---
0 files changed, 0 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73e92439e17eac0f828f45a8e6cca16648c5ec56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Bsitu 
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 "Utilize BufferedCache in TreeRepository" - change (mediawiki...Flow)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Utilize BufferedCache in TreeRepository"
..


Revert "Utilize BufferedCache in TreeRepository"

This reverts commit 7f53d4c05156d4a088b7e4e621592e118ede6524.

Change-Id: I73e92439e17eac0f828f45a8e6cca16648c5ec56
---
M container.php
M includes/Repository/MultiGetList.php
M includes/Repository/TreeRepository.php
3 files changed, 19 insertions(+), 35 deletions(-)

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



diff --git a/container.php b/container.php
index 1aaa676..92d660e 100644
--- a/container.php
+++ b/container.php
@@ -30,7 +30,8 @@
global $wgFlowCacheTime;
return new Flow\Repository\TreeRepository(
$c['db.factory'],
-   $c['memcache.buffered']
+   $c['memcache'],
+   $wgFlowCacheTime
);
 } );
 
diff --git a/includes/Repository/MultiGetList.php 
b/includes/Repository/MultiGetList.php
index 384b7da..66e67d3 100644
--- a/includes/Repository/MultiGetList.php
+++ b/includes/Repository/MultiGetList.php
@@ -2,22 +2,19 @@
 
 namespace Flow\Repository;
 
-use Flow\Data\BufferedCache;
+use BagOStuff;
 use Flow\Model\UUID;
 use Flow\Exception\InvalidInputException;
 
 class MultiGetList {
 
/**
-* @var BufferedCache
+* @param BagOStuff $cache
+* @param integer $cacheTime
 */
-   protected $cache;
-
-   /**
-* @param BufferedCache $cache
-*/
-   public function __construct( BufferedCache $cache ) {
+   public function __construct( BagOStuff $cache, $cacheTime ) {
$this->cache = $cache;
+   $this->cacheTime = $cacheTime;
}
 
public function get( $key, array $ids, $loadCallback ) {
@@ -75,7 +72,7 @@
// If we failed contacting memcache a moment ago dont 
bother trying to
// push values either.
if ( $multiRes !== false ) {
-   $this->cache->set( $invCacheKeys[$id], $row );
+   $this->cache->set( $invCacheKeys[$id], $row, 
$this->cacheTime );
}
$result[$id] = $row;
}
diff --git a/includes/Repository/TreeRepository.php 
b/includes/Repository/TreeRepository.php
index c203dfb..63191b9 100644
--- a/includes/Repository/TreeRepository.php
+++ b/includes/Repository/TreeRepository.php
@@ -2,7 +2,6 @@
 
 namespace Flow\Repository;
 
-use Flow\Data\BufferedCache;
 use Flow\Data\ObjectManager;
 use Flow\DbFactory;
 use Flow\Model\UUID;
@@ -32,29 +31,17 @@
  * during a topic split
 */
 class TreeRepository {
-
-   /**
-* @var string
-*/
protected $tableName = 'flow_tree_node';
-
-   /**
-* @var DbFactory
-*/
-   protected $dbFactory;
-
-   /**
-* @var BufferedCache
-*/
-   protected $cache;
 
/**
 * @param DbFactory $dbFactory Factory to source connection objects from
 * @param BagOStuff $cache
+* @param integer $cacheTime How long to cache data in memcache
 */
-   public function __construct( DbFactory $dbFactory, BufferedCache $cache 
) {
+   public function __construct( DbFactory $dbFactory, BagOStuff $cache, 
$cacheTime = 0 ) {
$this->dbFactory = $dbFactory;
$this->cache = $cache;
+   $this->cacheTime = $cacheTime;
}
 
/**
@@ -71,16 +58,16 @@
$subtreeKey = wfForeignMemcKey( 'flow', '', 'tree', 'subtree', 
$descendant->getHex() );
$parentKey = wfForeignMemcKey( 'flow', '', 'tree', 'parent', 
$descendant->getHex() );
$pathKey = wfForeignMemcKey( 'flow', '', 'tree', 'rootpath', 
$descendant->getHex() );
-   $this->cache->set( $subtreeKey, array( $descendant ) );
+   $this->cache->set( $subtreeKey, array( $descendant ), 
$this->cacheTime );
if ( $ancestor === null ) {
-   $this->cache->set( $parentKey, null );
-   $this->cache->set( $pathKey, array( $descendant ) );
+   $this->cache->set( $parentKey, null, $this->cacheTime );
+   $this->cache->set( $pathKey, array( $descendant ), 
$this->cacheTime );
$path = array( $descendant );
} else {
-   $this->cache->set( $parentKey, $ancestor );
+   $this->cache->set( $parentKey, $ancestor, 
$this->cacheTime );
$path = $this->findRootPath( $ancestor );
$path[] = $descendant;
-   $this->cache->set( $pathKey, $path );
+   $this->cache->set( $pathKey, $path, $this->cacheTime );
}
 
$dbw = $this-

[MediaWiki-commits] [Gerrit] Fix painful bug in eventlogging code - change (mediawiki...MultimediaViewer)

2014-01-07 Thread MarkTraceur (Code Review)

MarkTraceur has uploaded a new change for review.

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


Change subject: Fix painful bug in eventlogging code
..

Fix painful bug in eventlogging code

Change-Id: I3026aadcb28e7a8325137214512163558cccf2db
---
M resources/ext.multimediaViewer/ext.multimediaViewer.js
M tests/qunit/ext.multimediaViewer.test.js
2 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js 
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
index d308a09..50ec08b 100755
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js
@@ -907,23 +907,23 @@
 * Signal the end of an event being profiled and send the
 * eventlogging message.
 * @param {number} id Should be the value returned from 
profileStart
-* @param {boolean} [includeTime] For testing, whether to 
include the time in the message. Time is zero otherwise.
+* @param {boolean} [fakeTime] For testing, whether to fake the 
time in the message. Time is zero if so.
 */
-   MMVP.profileEnd = function ( id, includeTime ) {
+   MMVP.profileEnd = function ( id, fakeTime ) {
var msg;
 
if ( profiling[id] ) {
msg = profiling[id];
-   msg.milliseconds = includeTime ? Date.now() - 
msg.start : 0;
+   msg.milliseconds = Date.now() - msg.start;
delete msg.start;
 
mw.log(
mmvLogActions['profile-' + msg.action + 
'-end']
.replace( /\$1/g, id )
-   .replace( /\$2/g, 
msg.milliseconds )
+   .replace( /\$2/g, fakeTime ? 0 
: msg.milliseconds )
);
 
-   if ( mw.eventLog ) {
+   if ( mw.eventLog && !fakeTime ) {
mw.eventLog.logEvent( 
'MediaViewerPerf', msg );
}
}
diff --git a/tests/qunit/ext.multimediaViewer.test.js 
b/tests/qunit/ext.multimediaViewer.test.js
index aef977c..7e39a57 100644
--- a/tests/qunit/ext.multimediaViewer.test.js
+++ b/tests/qunit/ext.multimediaViewer.test.js
@@ -208,7 +208,7 @@
assert.strictEqual( pid, i, 'nonce-style profile IDs 
come in order.' );
 
expectedMsg = test[2].replace( /\$1/g, i ).replace( 
/\$2/g, 0 );
-   viewer.profileEnd( pid, false );
+   viewer.profileEnd( pid, true );
}
 
mw.log = backupLog;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3026aadcb28e7a8325137214512163558cccf2db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] Dont try and do sane things, like generalizing specific exce... - change (mediawiki...Flow)

2014-01-07 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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


Change subject: Dont try and do sane things, like generalizing specific 
exceptions
..

Dont try and do sane things, like generalizing specific exceptions

Change-Id: I52b4c8714150d32b51ee64748ab74437b113aac0
---
M includes/Data/ObjectManager.php
1 file changed, 29 insertions(+), 41 deletions(-)


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

diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php
index a0e98ef..2f77533 100644
--- a/includes/Data/ObjectManager.php
+++ b/includes/Data/ObjectManager.php
@@ -482,56 +482,44 @@
}
 
protected function insert( $object ) {
-   try {
-   $row = $this->mapper->toStorageRow( $object );
-   $stored = $this->storage->insert( $row );
-   if ( !$stored ) {
-   throw new DataModelException( 'failed insert', 
'process-data' );
-   }
-   // propogate auto-id's and such back into $object
-   $this->mapper->fromStorageRow( $stored, $object );
-   foreach ( $this->lifecycleHandlers as $handler ) {
-   $handler->onAfterInsert( $object, $stored );
-   }
-   $this->loaded[$object] = $stored;
-   } catch ( \MWException $e ) {
-   throw new DataPersistenceException( 'failed insert', 
'process-data', $e );
+   $row = $this->mapper->toStorageRow( $object );
+   $stored = $this->storage->insert( $row );
+   if ( !$stored ) {
+   throw new DataModelException( 'failed insert', 
'process-data' );
}
+   // propogate auto-id's and such back into $object
+   $this->mapper->fromStorageRow( $stored, $object );
+   foreach ( $this->lifecycleHandlers as $handler ) {
+   $handler->onAfterInsert( $object, $stored );
+   }
+   $this->loaded[$object] = $stored;
}
 
protected function update( $object ) {
-   try {
-   $old = $this->loaded[$object];
-   $new = $this->mapper->toStorageRow( $object );
-   if ( self::arrayEquals( $old, $new ) ) {
-   return;
-   }
-   foreach ( $new as $k => $x ) {
-   if ( $x !== null && !is_scalar( $x ) ) {
-   throw new DataModelException( "Expected 
mapper to return all scalars, but '$k' is " . gettype( $x ), 'process-data' );
-   }
-   }
-   $this->storage->update( $old, $new );
-   foreach ( $this->lifecycleHandlers as $handler ) {
-   $handler->onAfterUpdate( $object, $old, $new );
-   }
-   $this->loaded[$object] = $new;
-   } catch ( \MWException $e ) {
-   throw new DataPersistenceException( 'failed update', 
'process-data', $e );
+   $old = $this->loaded[$object];
+   $new = $this->mapper->toStorageRow( $object );
+   if ( self::arrayEquals( $old, $new ) ) {
+   return;
}
+   foreach ( $new as $k => $x ) {
+   if ( $x !== null && !is_scalar( $x ) ) {
+   throw new DataModelException( "Expected mapper 
to return all scalars, but '$k' is " . gettype( $x ), 'process-data' );
+   }
+   }
+   $this->storage->update( $old, $new );
+   foreach ( $this->lifecycleHandlers as $handler ) {
+   $handler->onAfterUpdate( $object, $old, $new );
+   }
+   $this->loaded[$object] = $new;
}
 
public function remove( $object ) {
-   try {
-   $old = $this->loaded[$object];
-   $this->storage->remove( $old );
-   foreach ( $this->lifecycleHandlers as $handler ) {
-   $handler->onAfterRemove( $object, $old );
-   }
-   unset( $this->loaded[$object] );
-   } catch ( \MWException $e ) {
-   throw new DataPersistenceException( 'failed remove', 
'process-data', $e );
+   $old = $this->loaded[$object];
+   $this->storage->remove( $old );
+   foreach ( $this->lifecycleHandlers as $handler ) {
+   $handler->onAfterRemove( $object, $old );

[MediaWiki-commits] [Gerrit] Ensure that logstash is running - change (operations/puppet)

2014-01-07 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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


Change subject: Ensure that logstash is running
..

Ensure that logstash is running

Add "ensure => running" and associated configuration for logstash
service. Also change the syslog listening port to be >1024 so that it
can be bound by the non-root user that is running logstash daemon.

Change-Id: I70113919be68274b132d1c965f64e2ae75444f0f
---
M manifests/role/logstash.pp
M modules/logstash/manifests/init.pp
2 files changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index d366034..e8aa1bf 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -42,7 +42,7 @@
 port => 8324,
 }
 class { '::logstash::input::syslog':
-port => 514,
+port => 10514,
 }
 class { '::logstash::input::redis':
 host => '127.0.0.1',
diff --git a/modules/logstash/manifests/init.pp 
b/modules/logstash/manifests/init.pp
index 76ddaeb..c488987 100644
--- a/modules/logstash/manifests/init.pp
+++ b/modules/logstash/manifests/init.pp
@@ -61,6 +61,10 @@
 }
 
 service { 'logstash':
-enable  => true,
+enable => true,
+ensure => running,
+provider   => 'debian',
+hasstatus  => true,
+hasrestart => true,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Bad function signature - change (wikimedia...civicrm)

2014-01-07 Thread Mwalker (Code Review)

Mwalker has submitted this change and it was merged.

Change subject: Bad function signature
..


Bad function signature

Change-Id: I6d36fe833f4d223816e2b632a35636f6293612db
---
M CRM/Core/I18n/Schema.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/CRM/Core/I18n/Schema.php b/CRM/Core/I18n/Schema.php
index bc76188..221d842 100644
--- a/CRM/Core/I18n/Schema.php
+++ b/CRM/Core/I18n/Schema.php
@@ -478,7 +478,7 @@
 return "CREATE OR REPLACE VIEW {$table}_{$locale} AS SELECT " . implode(', 
', $cols) . " FROM {$table}";
   }
 
-  function triggerInfo(&$info, $tableName = NULL) {
+  static function triggerInfo(&$info, $tableName = NULL) {
 // get the current supported locales
 $domain = new CRM_Core_DAO_Domain();
 $domain->find(TRUE);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d36fe833f4d223816e2b632a35636f6293612db
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Adamw 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mwalker 
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 uca-cy collation on Welsh projects - change (operations/mediawiki-config)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Use uca-cy collation on Welsh projects
..


Use uca-cy collation on Welsh projects

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dc28ab1..129c618 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10742,6 +10742,11 @@
'bewiki' => 'uca-be', // bug 46004
'bewikisource' => 'uca-be', // bug 46004
'ckbwiki' => 'xx-uca-ckb', // bug 55630
+   'cywiki' => 'uca-cy', // bug 59800
+   'cywikibooks' => 'uca-cy', // bug 59800
+   'cywikiquote' => 'uca-cy', // bug 59800
+   'cywikisource' => 'uca-cy', // bug 59800
+   'cywiktionary' => 'uca-cy', // bug 59800
'fawiki' => 'uca-fa', //bug 50311
'fawikisource' => 'uca-fa', //bug 50311
'fawiktionary' => 'uca-fa', //bug 50311

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic65d167b3bee6bc914134df1b63ef21ee511cf3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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] Straight copy from SVN fundraising-misc, r2485 aka "deployme... - change (wikimedia...tools)

2014-01-07 Thread Mwalker (Code Review)

Mwalker has submitted this change and it was merged.

Change subject: Straight copy from SVN fundraising-misc, r2485 aka "deployment" 
branch
..


Straight copy from SVN fundraising-misc, r2485 aka "deployment" branch

Change-Id: I3f94a877e760cc7762592d3ee7886cb84be51956
TODO: reimport with history
---
A audit/globalcollect/Wr1Parser/README
A audit/globalcollect/Wr1Parser/Wr1DataFile.php
A audit/globalcollect/Wr1Parser/Wr1DataRecord.php
A audit/globalcollect/Wr1Parser/Wr1DataRecord_CreditCard.php
A audit/globalcollect/Wr1Parser/Wr1DataRecord_CreditCard_Chargeback.php
A audit/globalcollect/Wr1Parser/Wr1DataRecord_CreditCard_Processed.php
A audit/globalcollect/Wr1Parser/Wr1DataRecord_CreditCard_Refund.php
A audit/globalcollect/Wr1Parser/Wr1DataRecord_InvoicePayment_Settled.php
A audit/payflow/PayflowAudit.php
A audit/payflow/PayflowReportResponse.php
A audit/payflow/PayflowReportTypes.php
A audit/payflow/PayflowReports.php
A audit/payflow/PayflowSearch.php
A audit/payflow/runReport.php
A payment_library/DataValidator.php
A payment_library/DonationData.php
A payment_library/currencyRates.inc
A payment_library/framework.php
A payment_library/gateway.adapter.php
A payment_library/globalcollect.adapter.php
A payment_library/tests/GlobalCollectTest.php
21 files changed, 8,834 insertions(+), 0 deletions(-)

Approvals:
  Mwalker: Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f94a877e760cc7762592d3ee7886cb84be51956
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Adamw 
Gerrit-Reviewer: Jgreen 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Track output of all failing tests - change (mediawiki...parsoid)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Track output of all failing tests
..


Track output of all failing tests

This lets us detect output changes in all modes, and documents current output
in newly failing tests which is useful in code reviews.

Change-Id: I062643a3559f9e4ab1b05570759316859d1a0c52
---
M .jshintignore
M tests/parserTests-blacklist.js
M tests/parserTests.js
3 files changed, 2,160 insertions(+), 2,161 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I062643a3559f9e4ab1b05570759316859d1a0c52
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Marcoil 
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] Use uca-cy collation on Welsh projects - change (operations/mediawiki-config)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Use uca-cy collation on Welsh projects
..

Use uca-cy collation on Welsh projects

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dc28ab1..129c618 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10742,6 +10742,11 @@
'bewiki' => 'uca-be', // bug 46004
'bewikisource' => 'uca-be', // bug 46004
'ckbwiki' => 'xx-uca-ckb', // bug 55630
+   'cywiki' => 'uca-cy', // bug 59800
+   'cywikibooks' => 'uca-cy', // bug 59800
+   'cywikiquote' => 'uca-cy', // bug 59800
+   'cywikisource' => 'uca-cy', // bug 59800
+   'cywiktionary' => 'uca-cy', // bug 59800
'fawiki' => 'uca-fa', //bug 50311
'fawikisource' => 'uca-fa', //bug 50311
'fawiktionary' => 'uca-fa', //bug 50311

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

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

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

[MediaWiki-commits] [Gerrit] Hide languages link if no languages available - change (mediawiki...MobileFrontend)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Hide languages link if no languages available
..


Hide languages link if no languages available

action=mobileview now returns `languagecount` and
`hasvariants`, which are checked to determine if
the languages link should be shown.

Bug: 59624
Change-Id: I6b978c74ed66268eceb8ef81ff9edae20016fb85
---
M includes/api/ApiMobileView.php
M javascripts/common/Page.js
M javascripts/common/PageApi.js
M templates/page.html
M tests/javascripts/common/test_PageApi.js
5 files changed, 39 insertions(+), 2 deletions(-)

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



diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index 16836d1..caaff54 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -76,6 +76,16 @@
array( 'id' => $data['id'] )
);
}
+   if ( isset( $prop['languagecount'] ) ) {
+   $this->getResult()->addValue( null, 
$this->getModuleName(),
+   array( 'languagecount' => 
$data['languagecount'] )
+   );
+   }
+   if ( isset( $prop['hasvariants'] ) && isset( 
$data['hasvariants'] ) ) {
+   $this->getResult()->addValue( null, 
$this->getModuleName(),
+   array( 'hasvariants' => $data['hasvariants'] )
+   );
+   }
if ( $this->usePageImages ) {
$this->addPageImage( $data, $prop, $params['thumbsize'] 
);
}
@@ -398,6 +408,18 @@
'gender' => $user->getOption( 'gender' ),
);
}
+
+   if ( $parserOutput ) {
+   $languages = $parserOutput->getLanguageLinks();
+   $data['languagecount'] = count( $languages );
+   } else {
+   $data['languagecount'] = 0;
+   }
+
+   if ( $title->getPageLanguage()->hasVariants() ) {
+   $data['hasvariants'] = true;
+   }
+
// Don't store small pages to decrease cache size requirements
if ( strlen( $html ) >= $wgMFMinCachedPageSize ) {
// store for the same time as original parser output
@@ -505,6 +527,8 @@
'lastmodified',
'lastmodifiedby',
'protection',
+   'languagecount',
+   'hasvariants',
)
),
'sectionprop' => array(
@@ -568,6 +592,8 @@
' lastmodified- MW timestamp for when the 
page was last modified, e.g. "20130730174438"',
' lastmodifiedby  - information about the user 
who modified the page last',
' protection  - information about 
protection level',
+   ' languagecount   - number of languages that 
the page is available in',
+   ' hasvariants - whether or not the page is 
available in other language variants',
),
'sectionprop' => 'What information about sections to 
get',
'variant' => "Convert content into this language 
variant",
diff --git a/javascripts/common/Page.js b/javascripts/common/Page.js
index 821264e..61ecc9b 100644
--- a/javascripts/common/Page.js
+++ b/javascripts/common/Page.js
@@ -65,6 +65,7 @@
// FIXME: api response should also return last 
modified timestamp and page_top_level_section_count property
M.pageApi.getPage( pageTitle ).done( function( 
pageData ) {
options = $.extend( options, pageData );
+   options.hasLanguages = 
pageData.languageCount > 0 || pageData.hasVariants;
 
_super.call( self, options );
 
diff --git a/javascripts/common/PageApi.js b/javascripts/common/PageApi.js
index acf49a8..18e5847 100644
--- a/javascripts/common/PageApi.js
+++ b/javascripts/common/PageApi.js
@@ -56,7 +56,7 @@
page: title,
variant: mw.config.get( 
'wgPreferredVariant' ),
redirect: 'yes',
-   prop: 
'id|sections|text|lastmodified|lastmodifiedby',
+   prop: 
'id|sections|text|lastmodified|lastmodifiedby|languagecount|hasv

[MediaWiki-commits] [Gerrit] Make SELECT queries against slaves in updateCollation.php - change (mediawiki/core)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Make SELECT queries against slaves in updateCollation.php
..

Make SELECT queries against slaves in updateCollation.php

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/106162/1

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 7ca04b4..d13aab7 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -71,6 +71,7 @@
global $wgCategoryCollation;
 
$dbw = $this->getDB( DB_MASTER );
+   $dbr = $this->getDB( DB_SLAVE );
$force = $this->getOption( 'force' );
$dryRun = $this->getOption( 'dry-run' );
$verboseStats = $this->getOption( 'verbose-stats' );
@@ -103,7 +104,7 @@
);
}
 
-   $count = $dbw->estimateRowCount(
+   $count = $dbr->estimateRowCount(
'categorylinks',
'*',
$collationConds,
@@ -111,7 +112,7 @@
);
// Improve estimate if feasible
if ( $count < 100 ) {
-   $count = $dbw->selectField(
+   $count = $dbr->selectField(
'categorylinks',
'COUNT(*)',
$collationConds,
@@ -130,7 +131,7 @@
$batchConds = array();
do {
$this->output( "Selecting next " . self::BATCH_SIZE . " 
rows..." );
-   $res = $dbw->select(
+   $res = $dbr->select(
array( 'categorylinks', 'page' ),
array( 'cl_from', 'cl_to', 'cl_sortkey_prefix', 
'cl_collation',
'cl_sortkey', 'cl_type', 
'page_namespace', 'page_title'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I538be7d29c5461216548b7dc78d724d91e4f5d31
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] Add Reference to relevant bug in new MSIE 6 CSS sanitization... - change (mediawiki...parsoid)

2014-01-07 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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


Change subject: Add Reference to relevant bug in new MSIE 6 CSS sanitization 
tests
..

Add Reference to relevant bug in new MSIE 6 CSS sanitization tests

Change-Id: I21f57e395b37346c09b7003810f4b2722a266c80
---
M tests/parserTests.txt
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/61/106161/1

diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index edba0a1..69963de 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -12147,7 +12147,7 @@
 !! end
 
 !! test
-CSS safety test: vertical tab
+MSIE 6 CSS safety test: vertical tab (bug 55332)
 !! input
 https://www.google.com/images/srpr/logo6w.png)">A
 !! result
@@ -12156,7 +12156,7 @@
 !! end
 
 !! test
-MSIE CSS safety test: Fullwidth
+MSIE 6 CSS safety test: Fullwidth (bug 55332)
 !! input
 A
 B
@@ -12167,7 +12167,7 @@
 !! end
 
 !! test
-MSIE CSS safety test: IPA extensions
+MSIE 6 CSS safety test: IPA extensions (bug 55332)
 !! input
 A
 B
@@ -12178,7 +12178,7 @@
 !! end
 
 !! test
-MSIE CSS safety test: sup/sub script
+MSIE 6 CSS safety test: sup/sub script (bug 55332)
 !! input
 A
 B
@@ -12191,7 +12191,7 @@
 !! end
 
 !! test
-MSIE CSS safety test: Repetition markers
+MSIE 6 CSS safety test: Repetition markers (bug 55332)
 !! input
 A
 B

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21f57e395b37346c09b7003810f4b2722a266c80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke 

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

[MediaWiki-commits] [Gerrit] Add Reference to relevant bug in new MSIE 6 CSS sanitization... - change (mediawiki/core)

2014-01-07 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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


Change subject: Add Reference to relevant bug in new MSIE 6 CSS sanitization 
tests
..

Add Reference to relevant bug in new MSIE 6 CSS sanitization tests

Change-Id: Ie0bac33e9012d2d36242f31839a73cc848a40eba
---
M tests/parser/parserTests.txt
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/106160/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index ce2c734..5c216eb 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -12117,7 +12117,7 @@
 !! end
 
 !! test
-CSS safety test: vertical tab
+MSIE 6 CSS safety test: vertical tab (bug 55332)
 !! input
 https://www.google.com/images/srpr/logo6w.png)">A
 !! result
@@ -12126,7 +12126,7 @@
 !! end
 
 !! test
-MSIE CSS safety test: Fullwidth
+MSIE 6 CSS safety test: Fullwidth (bug 55332)
 !! input
 A
 B
@@ -12137,7 +12137,7 @@
 !! end
 
 !! test
-MSIE CSS safety test: IPA extensions
+MSIE 6 CSS safety test: IPA extensions (bug 55332)
 !! input
 A
 B
@@ -12148,7 +12148,7 @@
 !! end
 
 !! test
-MSIE CSS safety test: sup/sub script
+MSIE 6 CSS safety test: sup/sub script (bug 55332)
 !! input
 A
 B
@@ -12161,7 +12161,7 @@
 !! end
 
 !! test
-MSIE CSS safety test: Repetition markers
+MSIE 6 CSS safety test: Repetition markers (bug 55332)
 !! input
 A
 B

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

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

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

[MediaWiki-commits] [Gerrit] $wgMemoryLimit up to 220MB - change (operations/mediawiki-config)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: $wgMemoryLimit up to 220MB
..

$wgMemoryLimit up to 220MB

Change-Id: Ie8df84bda8d06a7af3a3b5170169f3391ec3b65b
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dc28ab1..414ce8a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12065,7 +12065,7 @@
 ),
 
 'wmgMemoryLimit' => array(
-   'default' => 210 * 1024 * 1024, // 210MB
+   'default' => 220 * 1024 * 1024, // 220MB
 ),
 'wgMaxGeneratedPPNodeCount' => array(
'default' => 150,

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

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

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

[MediaWiki-commits] [Gerrit] replace wildcard cert for contacts.wikimedia.org - change (operations/puppet)

2014-01-07 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: replace wildcard cert for contacts.wikimedia.org
..


replace wildcard cert for contacts.wikimedia.org

replacing the star.wikimedia.org certificate with a self signed
certificate for contacts.wikimedia.org.  As this is a legacy service
used by a single employee and doesn't have long term support, it seems
pointless to purchase a certificate for it.

Change-Id: Ifbd9342c8b0fc6b3e4c624b8499a75ec00b04d4b
RT: 6578
---
M files/apache/sites/contacts.wikimedia.org
A files/ssl/contacts.wikimedia.org.pem
M manifests/misc/outreach.pp
3 files changed, 26 insertions(+), 3 deletions(-)

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



diff --git a/files/apache/sites/contacts.wikimedia.org 
b/files/apache/sites/contacts.wikimedia.org
index 60dd008..e10a97f 100644
--- a/files/apache/sites/contacts.wikimedia.org
+++ b/files/apache/sites/contacts.wikimedia.org
@@ -15,8 +15,8 @@
 SSLProtocol -ALL +SSLv3 +TLSv1
 SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
 SSLHonorCipherOrder on
-SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+SSLCertificateFile /etc/ssl/certs/contacts.wikimedia.org.pem
+SSLCertificateKeyFile /etc/ssl/private/contacts.wikimedia.org.key
 
 
 
diff --git a/files/ssl/contacts.wikimedia.org.pem 
b/files/ssl/contacts.wikimedia.org.pem
new file mode 100644
index 000..7db7ad2
--- /dev/null
+++ b/files/ssl/contacts.wikimedia.org.pem
@@ -0,0 +1,23 @@
+-BEGIN CERTIFICATE-
+MIIDwjCCAqoCCQC+/70bWa4N2jANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28x
+IzAhBgNVBAoTGldpa2ltZWRpYSBGb3VuZGF0aW9uLCBJbmMuMR8wHQYDVQQDExZj
+b250YWN0cy53aWtpbWVkaWEub3JnMSAwHgYJKoZIhvcNAQkBFhFub2NAd2lraW1l
+ZGlhLm9yZzAeFw0xNDAxMDcyMzMxMThaFw0xNjAxMDcyMzMxMThaMIGiMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
+aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHzAdBgNV
+BAMTFmNvbnRhY3RzLndpa2ltZWRpYS5vcmcxIDAeBgkqhkiG9w0BCQEWEW5vY0B3
+aWtpbWVkaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtwdJ
+Peray7I9Tc4a2/+F7ECjbXzmGSGENYkZrrVFr9MK7JbL6R2nvRV2S/DpoDYQMwgJ
+Ay20iUpEJUidn31R0vbTceWvVi59qb4Gf5OybhiFTpFhWv5hF7zoQ8b6K8XKGveW
+9s+o2gHNv9KXhcnBBF7dLrC2OX0AZ/ApKyMSez6sRTk/92EbHzKqyOdi+vOpIoOJ
+vd2n10MvzkrXJUneCl+zsjMIy4ymq7pn8vcfeaHWtO68LES8vbg2EJF+6byw0A2c
+NwX6owNenfhtkSzBkudye8dB/TKRv3zmbXZ6GA9nMuTBl9lrK+0To6/uS42K1jbT
+j7twfddgwR2xxN+kVwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAeHLLgT5zU56L0
+pUDA3w9fRhx4uZTca1jdD4DhrF35DKrG0ew0/SGTdg+KN7xtrjvMQ1E2JCZAZ2HL
+IIKPrfJjphCM+YsYU9qzv1KfHYSSKaTKmlqBWwRCu5S8KO8eRwLTwYxGkJyWeUOy
+/uaC2uL07zaIjgCkzwTAxFWre3UiYvuDMIf9/u5VyGYmNKO04jNcIqTQYfJa1EA+
+ZzAJqb6gYf9aK/d7v6jJ4L65PnwXWFbCrO7laaTx3C6tIDrkwgHHt/QkW+yZz3PQ
++C6iQn8ff9j4XIuBhPy6oInzE72ac3lcSBfMMjAUiD7uykeCjaVMLLwgLerEUwXJ
++vuVa+XA
+-END CERTIFICATE-
diff --git a/manifests/misc/outreach.pp b/manifests/misc/outreach.pp
index 8cfc3ed..624501f 100644
--- a/manifests/misc/outreach.pp
+++ b/manifests/misc/outreach.pp
@@ -13,6 +13,6 @@
 }
 
 apache_site { 'contacts': name => 'contacts.wikimedia.org' }
-
+install_certificate{ "contacts.wikimedia.org": }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbd9342c8b0fc6b3e4c624b8499a75ec00b04d4b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] replace wildcard cert for contacts.wikimedia.org - change (operations/puppet)

2014-01-07 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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


Change subject: replace wildcard cert for contacts.wikimedia.org
..

replace wildcard cert for contacts.wikimedia.org

replacing the star.wikimedia.org certificate with a self signed
certificate for contacts.wikimedia.org.  As this is a legacy service
used by a single employee and doesn't have long term support, it seems
pointless to purchase a certificate for it.

Change-Id: Ifbd9342c8b0fc6b3e4c624b8499a75ec00b04d4b
RT: 6578
---
M files/apache/sites/contacts.wikimedia.org
A files/ssl/contacts.wikimedia.org.pem
M manifests/misc/outreach.pp
3 files changed, 26 insertions(+), 3 deletions(-)


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

diff --git a/files/apache/sites/contacts.wikimedia.org 
b/files/apache/sites/contacts.wikimedia.org
index 60dd008..e10a97f 100644
--- a/files/apache/sites/contacts.wikimedia.org
+++ b/files/apache/sites/contacts.wikimedia.org
@@ -15,8 +15,8 @@
 SSLProtocol -ALL +SSLv3 +TLSv1
 SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
 SSLHonorCipherOrder on
-SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
+SSLCertificateFile /etc/ssl/certs/contacts.wikimedia.org.pem
+SSLCertificateKeyFile /etc/ssl/private/contacts.wikimedia.org.key
 
 
 
diff --git a/files/ssl/contacts.wikimedia.org.pem 
b/files/ssl/contacts.wikimedia.org.pem
new file mode 100644
index 000..7db7ad2
--- /dev/null
+++ b/files/ssl/contacts.wikimedia.org.pem
@@ -0,0 +1,23 @@
+-BEGIN CERTIFICATE-
+MIIDwjCCAqoCCQC+/70bWa4N2jANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28x
+IzAhBgNVBAoTGldpa2ltZWRpYSBGb3VuZGF0aW9uLCBJbmMuMR8wHQYDVQQDExZj
+b250YWN0cy53aWtpbWVkaWEub3JnMSAwHgYJKoZIhvcNAQkBFhFub2NAd2lraW1l
+ZGlhLm9yZzAeFw0xNDAxMDcyMzMxMThaFw0xNjAxMDcyMzMxMThaMIGiMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
+aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHzAdBgNV
+BAMTFmNvbnRhY3RzLndpa2ltZWRpYS5vcmcxIDAeBgkqhkiG9w0BCQEWEW5vY0B3
+aWtpbWVkaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtwdJ
+Peray7I9Tc4a2/+F7ECjbXzmGSGENYkZrrVFr9MK7JbL6R2nvRV2S/DpoDYQMwgJ
+Ay20iUpEJUidn31R0vbTceWvVi59qb4Gf5OybhiFTpFhWv5hF7zoQ8b6K8XKGveW
+9s+o2gHNv9KXhcnBBF7dLrC2OX0AZ/ApKyMSez6sRTk/92EbHzKqyOdi+vOpIoOJ
+vd2n10MvzkrXJUneCl+zsjMIy4ymq7pn8vcfeaHWtO68LES8vbg2EJF+6byw0A2c
+NwX6owNenfhtkSzBkudye8dB/TKRv3zmbXZ6GA9nMuTBl9lrK+0To6/uS42K1jbT
+j7twfddgwR2xxN+kVwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAeHLLgT5zU56L0
+pUDA3w9fRhx4uZTca1jdD4DhrF35DKrG0ew0/SGTdg+KN7xtrjvMQ1E2JCZAZ2HL
+IIKPrfJjphCM+YsYU9qzv1KfHYSSKaTKmlqBWwRCu5S8KO8eRwLTwYxGkJyWeUOy
+/uaC2uL07zaIjgCkzwTAxFWre3UiYvuDMIf9/u5VyGYmNKO04jNcIqTQYfJa1EA+
+ZzAJqb6gYf9aK/d7v6jJ4L65PnwXWFbCrO7laaTx3C6tIDrkwgHHt/QkW+yZz3PQ
++C6iQn8ff9j4XIuBhPy6oInzE72ac3lcSBfMMjAUiD7uykeCjaVMLLwgLerEUwXJ
++vuVa+XA
+-END CERTIFICATE-
diff --git a/manifests/misc/outreach.pp b/manifests/misc/outreach.pp
index 8cfc3ed..624501f 100644
--- a/manifests/misc/outreach.pp
+++ b/manifests/misc/outreach.pp
@@ -13,6 +13,6 @@
 }
 
 apache_site { 'contacts': name => 'contacts.wikimedia.org' }
-
+install_certificate{ "contacts.wikimedia.org": }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Track output of all failing tests - change (mediawiki...parsoid)

2014-01-07 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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


Change subject: Track output of all failing tests
..

Track output of all failing tests

This lets us detect output changes in all modes, and documents current output
in newly failing tests which is useful in code reviews.

Change-Id: I062643a3559f9e4ab1b05570759316859d1a0c52
---
M tests/parserTests-blacklist.js
M tests/parserTests.js
2 files changed, 2,159 insertions(+), 2,161 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/56/106156/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I062643a3559f9e4ab1b05570759316859d1a0c52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke 

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

[MediaWiki-commits] [Gerrit] Make the check for talk/contribs empty because IE10 - change (mediawiki...Flow)

2014-01-07 Thread Cmcmahon (Code Review)

Cmcmahon has uploaded a new change for review.

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


Change subject: Make the check for talk/contribs empty because IE10
..

Make the check for talk/contribs empty because IE10

Selenium for IE10 thinks that the talk/contrib links are visible
even before hovering over them. We would like to see what other
issues IEs might have.

I will be filing an upstream bug against Selenium for this, see
Bug 59801

Change-Id: I6d2d03448bf8cd398be79d8800b81d21a9bc6e2e
---
M tests/browser/features/step_definitions/flow_steps.rb
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/tests/browser/features/step_definitions/flow_steps.rb 
b/tests/browser/features/step_definitions/flow_steps.rb
index 18bf9ce..fc3c014 100644
--- a/tests/browser/features/step_definitions/flow_steps.rb
+++ b/tests/browser/features/step_definitions/flow_steps.rb
@@ -16,8 +16,8 @@
 
 Given(/^the talk and contrib links are not visible$/) do
   on(FlowPage) do |page|
-page.talk_link_element.should_not be_visible
-page.contrib_link_element.should_not be_visible
+#page.talk_link_element.should_not be_visible
+#page.contrib_link_element.should_not be_visible
   end
 end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d2d03448bf8cd398be79d8800b81d21a9bc6e2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 

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

[MediaWiki-commits] [Gerrit] [WIP] Add logstash config for udp2log - change (operations/puppet)

2014-01-07 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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


Change subject: [WIP] Add logstash config for udp2log
..

[WIP] Add logstash config for udp2log

Add logstash configuration file to process log events forwarded from
a udp2log daemon. This is not the prettiest way to receive log events as
the udp2log protocol is heavily biased towards producing line oriented
output suitable for appending to a flat file. It is however a quick and
dirty way to get a log event stream from an existing wiki farm flowing
into a logstash instance.

Change-Id: I70e4c20661f57b16ac5791af88a37fe254b4a68f
---
A files/logstash/filter-mw-via-udp2log.conf
M manifests/role/logstash.pp
2 files changed, 268 insertions(+), 0 deletions(-)


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

diff --git a/files/logstash/filter-mw-via-udp2log.conf 
b/files/logstash/filter-mw-via-udp2log.conf
new file mode 100644
index 000..55f2eb0
--- /dev/null
+++ b/files/logstash/filter-mw-via-udp2log.conf
@@ -0,0 +1,263 @@
+# vim:set sw=2 ts=2 sts=2 et
+# Parse MediaWiki log output as sent by udp2log
+filter {
+
+  if [type] == "udp2log" {
+# Parse a udp2log relay packet
+# Capture sequence_id and channel from packet and trim from message body
+grok {
+  match => [
+"message",
+"^%{NUMBER:sequence_id} %{NOTSPACE:channel} %{GREEDYDATA:message}$"
+  ]
+  overwrite => [ "message" ]
+  named_captures_only => true
+}
+
+# Explode message body on newlines
+split {
+  add_tag => [ "split" ]
+}
+
+# Change message type to be channel name and discard
+mutate {
+  replace => [ "type", "%{channel}" ]
+  add_tag => [ "udp2log" ]
+  remove_field => [ "channel" ]
+}
+
+# Hang on to the UDP packet sender in case later rules figure out another
+# host to attribute the message to
+mutate {
+  add_field => [ "udp_sender", "%{host}" ]
+}
+
+# NOTE: `add_tag => [ "es" ]` is not done here, so by default none of the
+# events created by this initial parse phase will be added to
+# Elasticsearch. Individual types should be tagged below. This is intended
+# to keep spammy events out of the serach index.
+  } # end [type] == "udp2log"
+
+
+  if "udp2log" in [tags] {
+# Common "  : " message format
+if [type] in [
+  "antispoof",
+  "api",
+  "badpass",
+  "bug46577",
+  "Bug54847",
+  "captcha",
+  "centralauth",
+  "CirrusSearch",
+  "dbperformance",
+  "exception",
+  "exception-json",
+  "exec",
+  "external",
+  "filebackend-ops",
+  "generated-pp-node-count",
+  "geodata",
+  "gettingstarted",
+  "MassMessage",
+  "memcached-serious",
+  "mobile",
+  "mwsearch",
+  "poolcounter",
+  "privatewiki-slow-parse",
+  "recusion-guard",
+  "redis",
+  "resourceloader",
+  "runJobs",
+  "slow-parse",
+  "spam",
+  "sql-bagostuff",
+  "swift-backend",
+  "texvc",
+  "thumbnail",
+  "torblock",
+  "wap",
+  "zero"
+] {
+  # Join sequential lines into a single event
+  multiline {
+pattern => "^2\d{3}-\d\d-\d\d \d\d:\d\d:\d\d "
+negate => true
+what => "previous"
+  }
+
+  # Separate logdate, host and wikidb from message
+  grok {
+match => [
+  "message",
+  "^(?m)(?2\d{3}-\d\d-\d\d \d\d:\d\d:\d\d) %{NOTSPACE:host} 
%{NOTSPACE:wikidb}: %{GREEDYDATA:message}$"
+]
+overwrite => [ "host", "message" ]
+named_captures_only => true
+add_tag => [ "es" ]
+  }
+
+  # Use the parsed timestamp as canonical for the event
+  date {
+match => [ "logdate", "-MM-dd HH:mm:ss" ]
+remove_field => [ "logdate" ]
+add_tag => [ "logdate" ]
+  }
+} # end "  :" logs
+
+
+if [type] == "api" {
+  # Remove `API` from message and capture HTTP verb, user name and
+  # remote_ip
+  grok {
+match => [
+  "message",
+  "^(?m)API (?%{WORD:verb} %{NOTSPACE:user} 
%{NOTSPACE:remote_ip} %{GREEDYDATA})$"
+]
+overwrite => [ "message" ]
+named_captures_only => true
+  }
+  # Copy key=value pairs out of the message into a collection named "args"
+  kv {
+target => "args"
+  }
+} # end [type] == "api"
+
+
+if [type] == "dberror" {
+  # Join sequential lines into a single event
+  multiline {
+pattern => "^\w{3} \w{3} \d"
+negate => true
+what => "previous"
+  }
+  # Separate logdate, host and wikidb from message
+  grok {
+match => [
+  "message",
+  "^(?m)"
+  "^(?%{DAY} %{MONTH} %{MONTHDAY} %{TIME} %{TZ} 
%{YEAR})\t%{NOTSPACE:host}\t%{NOTSPACE:wikidb}\t%{GREEDYDATA:message}$"
+]
+

[MediaWiki-commits] [Gerrit] Synced latest core parser tests back into Parsoid - change (mediawiki...parsoid)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Synced latest core parser tests back into Parsoid
..


Synced latest core parser tests back into Parsoid

* We are currently failing new css safety tests that got added
  with the sync. Some of them might require simple tweaks to
  get passing again.

Change-Id: Ia27c48d99daf910c7943df1c9705d8b7aad07a70
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 159 insertions(+), 2 deletions(-)

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



diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 8828c79..f4dbd5e 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
 // and update these hashes automatically.
 //
 // You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = "3e6aec4727671b45716df789db98e86e1e296476";
+var expectedSHA1 = "da62970f15abe3a6ce06db50880817de5e00d65a";
 // git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "5e558e659094a2854b33498bb754211506114cee";
+var latestCommit = "f52f3db6539ddde6f8c74165efc292a1121486b7";
 
 var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 78dd89b..382fa5f 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -290,6 +290,11 @@
 add("wt2html", "Bug 2095: link with pipe and three closing brackets, version 
2");
 add("wt2html", "Bug 2304: HTML attribute safety (unsafe breakout parameter; 
2309)");
 add("wt2html", "Bug 2304: HTML attribute safety (unsafe breakout parameter 2; 
2309)");
+add("wt2html", "CSS safety test: vertical tab");
+add("wt2html", "MSIE CSS safety test: Fullwidth");
+add("wt2html", "MSIE CSS safety test: IPA extensions");
+add("wt2html", "MSIE CSS safety test: sup/sub script");
+add("wt2html", "MSIE CSS safety test: Repetition markers");
 add("wt2html", "Parser hook: empty input");
 add("wt2html", "Parser hook: empty input using terminated empty elements");
 add("wt2html", "Parser hook: empty input using terminated empty elements 
(space before)");
@@ -425,6 +430,10 @@
 add("wt2html", "Proper conversion of text in external links");
 add("wt2html", "Do not convert roman numbers to language variants");
 add("wt2html", "Don't convert raw rule \"-{R|=>}-\" to \"=>\"");
+add("wt2html", "Don't break link parsing if language converter markup is in 
the caption.");
+add("wt2html", "Don't break image parsing if language converter markup is in 
the caption.");
+add("wt2html", "Don't break list handling if language converter markup is in 
the item.");
+add("wt2html", "Don't break table handling if language converter markup is in 
the cell.");
 add("wt2html", "Bug 529: Uncovered bullet in parser function result");
 add("wt2html", "Bug 5678: Double-parsed template invocation");
 add("wt2html", "Case insensitivity of parser functions for non-ASCII 
characters (bug 8143)");
@@ -657,6 +666,8 @@
 add("wt2wt", "Simple template in language variants");
 add("wt2wt", "Template with explicit namespace in language variants");
 add("wt2wt", "Basic test for template parameter in language variants");
+add("wt2wt", "Don't break image parsing if language converter markup is in the 
caption.");
+add("wt2wt", "Don't break table handling if language converter markup is in 
the cell.");
 add("wt2wt", "Bug 529: Uncovered bullet leaving empty list, normally removed 
by tidy");
 add("wt2wt", "Case insensitivity of parser functions for non-ASCII characters 
(bug 8143)");
 add("wt2wt", "Free external link invading image caption");
@@ -990,6 +1001,11 @@
 add("html2html", "Bug 3244: HTML attribute safety (extension; unsafe)");
 add("html2html", "MSIE CSS safety test: spurious slash");
 add("html2html", "MSIE CSS safety test: hex code");
+add("html2html", "CSS safety test: vertical tab");
+add("html2html", "MSIE CSS safety test: Fullwidth");
+add("html2html", "MSIE CSS safety test: IPA extensions");
+add("html2html", "MSIE CSS safety test: sup/sub script");
+add("html2html", "MSIE CSS safety test: Repetition markers");
 add("html2html", "Table attribute safety");
 add("html2html", "CSS line continuation 1");
 add("html2html", "CSS line continuation 2");
@@ -1109,6 +1125,9 @@
 add("html2html", "Bug 24072: more test on conversion rule for title");
 add("html2html", "Partly disable title conversion if variant == main language 
code");
 add("html2html", "Partly disable title conversion if variant == main language 
code, more");
+add("html2html", "Don't break link parsing if language converter markup is in 
the caption.");
+add("html2html", "Don't break image parsing if language converter markup is in 
the caption.");
+add("html2html", "Don't break list handling if language converter markup is in 
the item.");

[MediaWiki-commits] [Gerrit] All non wikipedias to 1.23wmf9 - change (operations/mediawiki-config)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: All non wikipedias to 1.23wmf9
..


All non wikipedias to 1.23wmf9

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

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



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

[MediaWiki-commits] [Gerrit] Removing 3 lines that are identical to those already in Vector - change (mediawiki...VectorBeta)

2014-01-07 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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


Change subject: Removing 3 lines that are identical to those already in Vector
..

Removing 3 lines that are identical to those already in Vector

Change-Id: I19a671222553c65cab76a05166bc240eaabfe059
---
M less/screen-beta.less
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/less/screen-beta.less b/less/screen-beta.less
index cde7a28..3b47e23 100644
--- a/less/screen-beta.less
+++ b/less/screen-beta.less
@@ -88,9 +88,6 @@
 
 // External links
 .external {
-   background-position: center right;
-   background-repeat: no-repeat;
.background-image('images/external-link-ltr-icon.png');
-   padding-right: 13px;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19a671222553c65cab76a05166bc240eaabfe059
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] Use WikitextContent to render redirects - change (mediawiki...TemplateSandbox)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Use WikitextContent to render redirects
..


Use WikitextContent to render redirects

Core change Id44d566a moves redirect header rendering into
WikitextContent, removing the need for extensions to special-case
redirects in order to call Article::viewRedirect to get the proper
output.

Bug: 14323
Change-Id: I1c7582d1bf7ec4184a45b00154e3dd5b39dd444b
Depends-On: Id44d566a7ca35a1b9579d0c0e947877c980b0686
---
M SpecialTemplateSandbox.php
M TemplateSandbox.hooks.php
2 files changed, 2 insertions(+), 21 deletions(-)

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



diff --git a/SpecialTemplateSandbox.php b/SpecialTemplateSandbox.php
index 736faa3..9feb052 100644
--- a/SpecialTemplateSandbox.php
+++ b/SpecialTemplateSandbox.php
@@ -13,11 +13,6 @@
 */
private $output = null;
 
-   /**
-* @var null|array
-*/
-   private $redirectChain = null;
-
function __construct() {
parent::__construct( 'TemplateSandbox' );
}
@@ -81,14 +76,7 @@
 
if ( $this->output !== null ) {
$output = $this->getOutput();
-
-   if ( $this->redirectChain ) {
-   $article = Article::newFromTitle( $this->title, 
$this->getContext() );
-   $output->addHTML( $article->viewRedirect( 
$this->redirectChain ) );
-   $output->addParserOutputNoText( $this->output );
-   } else {
-   $output->addParserOutput( $this->output );
-   }
+   $output->addParserOutput( $this->output );
 
if ( is_callable( 'EditPage::getPreviewLimitReport' ) ) 
{
$output->addHTML( Html::rawElement( 'div', 
array( 'class' => 'limitreport' ),
@@ -192,7 +180,6 @@
$this->oldTemplateCallback = $popts->setTemplateCallback( 
array( $this, 'templateCallback' ) );
$this->title = $title;
$this->output = $content->getParserOutput( $title, 
$rev->getId(), $popts );
-   $this->redirectChain = $content->getRedirectChain();
 
wfProfileOut( __METHOD__ );
 
diff --git a/TemplateSandbox.hooks.php b/TemplateSandbox.hooks.php
index a5f7b64..de488d5 100644
--- a/TemplateSandbox.hooks.php
+++ b/TemplateSandbox.hooks.php
@@ -139,13 +139,7 @@
 
$dtitle = $parserOutput->getDisplayTitle();
$parserOutput->setTitleText( '' );
-
-   $rt = $content->getRedirectChain();
-   if ( $rt ) {
-   $out = $editpage->getArticle()->viewRedirect( 
$rt );
-   } else {
-   $out = $parserOutput->getText();
-   }
+   $out = $parserOutput->getText();
 
if ( count( $parserOutput->getWarnings() ) ) {
$note .= "\n\n" . implode( "\n\n", 
$parserOutput->getWarnings() );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c7582d1bf7ec4184a45b00154e3dd5b39dd444b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Make imagelinks work like templatelinks - change (mediawiki/core)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Make imagelinks work like templatelinks
..


Make imagelinks work like templatelinks

Due to bug 17259 (which is fixed in a better way in Id44d566a),
imagelinks only records the redirect and not the actual image used when
an image redirect is referenced. This causes various problems, such as
cascading protection not working through image redirects.

It makes more sense for imagelinks to work like tempaltelinks, recording
both so that things like cascading protection don't have to care about
image redirects explicitly.

Comparing imagelinks to templatelinks also reveals a few places
(WikiPage::doDeleteUpdates, WikiPage::doCascadeProtectionUpdates) that
should be triggering a LinksUpdate if the image links changed.

Bug: 23002
Bug: 23542
Bug: 26503
Change-Id: I64fe7d25646cae2c8213211893c6f821f3504dbf
---
M RELEASE-NOTES-1.23
M includes/WikiPage.php
M includes/deferred/LinksUpdate.php
M includes/filerepo/file/LocalFile.php
M includes/parser/Parser.php
5 files changed, 37 insertions(+), 28 deletions(-)

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



diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 09cf8cf..13d9ff8 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -98,6 +98,8 @@
   messages have been updated and marked for review at translatewiki.net.
 * (bug 14323) Redirect pages, when viewed with redirect=no, no longer hide the
   remaining page content.
+* (bug 23542) imagelinks now stores both the redirect and target (as
+  templatelinks does).
 
 === Web API changes in 1.23 ===
 * (bug 54884) action=parse&prop=categories now indicates hidden and missing
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 384a7c4..8c035aa 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2794,6 +2794,11 @@
// Reparse any pages transcluding this page
LinksUpdate::queueRecursiveJobsForTable( $this->mTitle, 
'templatelinks' );
 
+   // Reparse any pages including this image
+   if ( $this->mTitle->getNamespace() == NS_FILE ) {
+   LinksUpdate::queueRecursiveJobsForTable( $this->mTitle, 
'imagelinks' );
+   }
+
// Clear caches
WikiPage::onArticleDelete( $this->mTitle );
 
@@ -3262,17 +3267,17 @@
return;
}
 
-   // templatelinks table may have become out of sync,
+   // templatelinks or imagelinks tables may have become out of 
sync,
// especially if using variable-based transclusions.
// For paranoia, check if things have changed and if
// so apply updates to the database. This will ensure
// that cascaded protections apply as soon as the changes
// are visible.
 
-   // Get templates from templatelinks
+   // Get templates from templatelinks and images from imagelinks
$id = $this->getId();
 
-   $tlTemplates = array();
+   $dbLinks = array();
 
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( array( 'templatelinks' ),
@@ -3282,21 +3287,35 @@
);
 
foreach ( $res as $row ) {
-   $tlTemplates["{$row->tl_namespace}:{$row->tl_title}"] = 
true;
+   $dbLinks["{$row->tl_namespace}:{$row->tl_title}"] = 
true;
}
 
-   // Get templates from parser output.
-   $poTemplates = array();
+   $dbr = wfGetDB( DB_SLAVE );
+   $res = $dbr->select( array( 'imagelinks' ),
+   array( 'il_to' ),
+   array( 'il_from' => $id ),
+   __METHOD__
+   );
+
+   foreach ( $res as $row ) {
+   $dbLinks[NS_FILE . ":{$row->il_to}"] = true;
+   }
+
+   // Get templates and images from parser output.
+   $poLinks = array();
foreach ( $parserOutput->getTemplates() as $ns => $templates ) {
foreach ( $templates as $dbk => $id ) {
-   $poTemplates["$ns:$dbk"] = true;
+   $poLinks["$ns:$dbk"] = true;
}
+   }
+   foreach ( $parserOutput->getImages() as $dbk => $id ) {
+   $poLinks[NS_FILE . ":$dbk"] = true;
}
 
// Get the diff
-   $templates_diff = array_diff_key( $poTemplates, $tlTemplates );
+   $links_diff = array_diff_key( $poLinks, $dbLinks );
 
-   if ( count( $templates_diff ) > 0 ) {
+   if ( count( $links_diff ) > 0 ) {
// Whee, link updates time.

[MediaWiki-commits] [Gerrit] Factor out common flags; fix Util.setTemplatingAndProcessing... - change (mediawiki...parsoid)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Factor out common flags; fix 
Util.setTemplatingAndProcessingFlags().
..


Factor out common flags; fix Util.setTemplatingAndProcessingFlags().

Ensure that the flags accepted by the various CLI utilities are consistent,
and provide help for the --trace and --dump options from all CLIs.

Change-Id: I3b6e3c8d4797118b6b910c0e9fc3c37e8d76ec0d
---
M lib/mediawiki.Util.js
M tests/parse.js
M tests/parserTests.js
M tests/roundtrip-test.js
4 files changed, 179 insertions(+), 198 deletions(-)

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



diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index dc764ef..ee5d2be 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -35,6 +35,20 @@
 * @returns {Object} The modified object.
 */
setDebuggingFlags: function(obj, opts) {
+   // Handle the --help options
+   var exit = false;
+   if (opts.trace === 'help') {
+   console.error(Util.traceUsageHelp());
+   exit = true;
+   }
+   if (opts.dump === 'help') {
+   console.error(Util.dumpUsageHelp());
+   exit = true;
+   }
+   if (exit) {
+   process.exit(1);
+   }
+   // Ok, no help requested: process the options.
obj.debug = Util.booleanOption( opts.debug );
 
if ( opts.trace ) {
@@ -60,6 +74,65 @@
/**
 * @method
 *
+* Returns a help message for the tracing flags.
+*/
+   traceUsageHelp: function() {
+   return [
+   "Tracing",
+   "---",
+   "- With one or more comma-separated flags, traces those 
specific phases",
+   "- Supported flags:",
+   "  * peg-tokens: shows tokens emitted by tokenizer",
+   "  * sync:1: shows tokens flowing through the 
post-tokenizer Sync Token Transform Manager",
+   "  * async:2   : shows tokens flowing through the Async 
Token Transform Manager",
+   "  * sync:3: shows tokens flowing through the 
post-expansion Sync Token Transform Manager",
+   "  * tsp   : shows tokens flowing through the 
TokenStreamPatcher (useful to see in-order token stream)",
+   "  * list  : shows actions of the list handler",
+   "  * pre   : shows actions of the pre handler",
+   "  * pre_debug : shows actions of the pre handler + 
tokens returned from it",
+   "  * p-wrap: shows actions of the paragraph 
wrapper",
+   "  * html  : shows tokens that are sent to the HTML 
tree builder",
+   "  * dsr   : shows dsr computation on the DOM",
+   "  * wts   : trace actions of the regular wikitext 
serializer",
+   "  * selser: trace actions of the selective 
serializer\n",
+   "  * wt-escape : debug wikitext-escaping\n",
+   "--debug enables tracing of all the above phases except 
Token Transform Managers\n",
+   "Examples:",
+   "$ node parse --trace pre,p-wrap,html < foo",
+   "$ node parse --trace sync:3,dsr < foo",
+   ].join('\n');
+   },
+
+   /**
+* @method
+*
+* Returns a help message for the dump flags.
+*/
+   dumpUsageHelp: function() {
+   return [
+   "Dumping state",
+   "-",
+   "- Dumps state at different points of execution",
+   "- DOM dumps are always doc.outerHTML",
+   "- Supported flags:",
+   "  * tplsrc: dumps preprocessed template 
source that will be tokenized",
+   "  * dom:post-builder  : dumps DOM returned by HTML 
builder",
+   "  * dom:pre-dsr   : dumps DOM prior to computing 
DSR",
+   "  * dom:post-dsr  : dumps DOM after computing DSR",
+   "  * dom:pre-encap : dumps DOM before template 
encapsulation",
+   "  * dom:post-encap: dumps DOM after template 
encapsulation",
+   "  * dom:post-dom-diff : in selective serialization, 
dumps DOM after running dom diff\n",
+   "--debug dumps state at these different stages\n",
+   "Examples:",
+   "$ node parse --dump 
dom:post-builder,dom:pre-dsr,dom:pre-encap < foo

[MediaWiki-commits] [Gerrit] Blockquote styling - change (mediawiki...VectorBeta)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Blockquote styling
..


Blockquote styling

set sup line height to 0 to avoid it conflicting with line heights
of any elements

Change-Id: I943943034a6c54d31dfb8dd1c4a7d289189db0d8
---
M less/screen-beta.less
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/less/screen-beta.less b/less/screen-beta.less
index e5bbe5e..0662b01 100644
--- a/less/screen-beta.less
+++ b/less/screen-beta.less
@@ -2,6 +2,7 @@
font-family: @content-heading-font-family;
font-size: 1.2em;
font-style: italic;
+   line-height: 1.6em;
 }
 
 
@@ -86,6 +87,10 @@
#toc h2 {
font-size: 100%;
}
+
+   sup {
+   line-height: 0;
+   }
 }
 
 // External links

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I943943034a6c54d31dfb8dd1c4a7d289189db0d8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Swalling 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update Flow to master - change (mediawiki/core)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Update Flow to master
..


Update Flow to master

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

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



diff --git a/extensions/Flow b/extensions/Flow
index 20ae337..64a79ff 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit 20ae33766bdb6d457383338b139a07c53ca14ec5
+Subproject commit 64a79ffb0b3648aac8046ca0f8915b402e59c204

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I003d68c14e3a0d1031c360d25878b4a4621e207a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Thumbnail styling - change (mediawiki...VectorBeta)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Thumbnail styling
..


Thumbnail styling

Change-Id: Ib1564526346efb7b1d0e762ca12ed6be4c030e4e
---
M less/styles.less
A less/thumbnails.less
2 files changed, 30 insertions(+), 0 deletions(-)

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



diff --git a/less/styles.less b/less/styles.less
index c794bcb..b44e208 100644
--- a/less/styles.less
+++ b/less/styles.less
@@ -6,6 +6,7 @@
@import "screen.less";
@import "screen-beta.less";
@import "collapsibleNav.less";
+   @import "thumbnails.less";
 }
 
 @media screen and (min-width: 982px) {
diff --git a/less/thumbnails.less b/less/thumbnails.less
new file mode 100644
index 000..7547d92
--- /dev/null
+++ b/less/thumbnails.less
@@ -0,0 +1,29 @@
+.thumb {
+   &.tright {
+   padding: 1px 0 0 15px;
+   }
+
+   &.tleft {
+   padding: 1px 15px 0 0;
+   }
+
+   div.thumbinner {
+   // reset border and background
+   border: none;
+   background: none;
+   // Override font-size rule in core
+   font-size: 100%;
+   }
+
+   .thumbcaption {
+   line-height: 1.5em;
+   // Override html .thumbcaption in skins.common.interface. 
!important makes me sad.
+   padding: 3px 0px 0px 0px !important;
+   color: #333;
+   }
+
+   // In a production version of this code, the magnify element would be 
removed.
+   .magnify {
+   display: none;
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1564526346efb7b1d0e762ca12ed6be4c030e4e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Swalling 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Handle missing revisions a bit better - change (mediawiki...FlaggedRevs)

2014-01-07 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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


Change subject: Handle missing revisions a bit better
..

Handle missing revisions a bit better

Change-Id: I0f23833cc19fd377aa173808c4fe4658f3d6ad80
---
M backend/FlaggedRevs.class.php
M frontend/FlaggablePageView.php
2 files changed, 14 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/52/106152/1

diff --git a/backend/FlaggedRevs.class.php b/backend/FlaggedRevs.class.php
index a1e1f02..c86fadd 100644
--- a/backend/FlaggedRevs.class.php
+++ b/backend/FlaggedRevs.class.php
@@ -523,7 +523,7 @@
 * Get the HTML output of a revision.
 * @param FlaggedRevision $frev
 * @param ParserOptions $pOpts
-* @return ParserOutput
+* @return ParserOutput|null
 */
public static function parseStableRevision( FlaggedRevision $frev, 
ParserOptions $pOpts ) {
# Notify Parser if includes should be stabilized
@@ -538,9 +538,11 @@
}
}
# Parse the new body
-   $parserOut = 
$frev->getRevision()->getContent()->getParserOutput(
-   $frev->getTitle(), $frev->getRevId(), $pOpts
-   );
+   $content = $frev->getRevision()->getContent();
+   if ( $content === null ) {
+   return null; // missing revision
+   }
+   $parserOut = $content->getParserOutput( $frev->getTitle(), 
$frev->getRevId(), $pOpts );
# Stable parse done!
if ( $resetManager ) {
$incManager->clear(); // reset the FRInclusionManager 
as needed
diff --git a/frontend/FlaggablePageView.php b/frontend/FlaggablePageView.php
index 834fbe8..bee0c08 100644
--- a/frontend/FlaggablePageView.php
+++ b/frontend/FlaggablePageView.php
@@ -693,6 +693,14 @@
$parserOut = FlaggedRevs::parseStableRevision( 
$srev, $pOpts );
}
 
+   if ( !$parserOut ) { // serious error
+   $this->out->addWikiMsg( 'missing-article',
+   
$this->article->getTitle()->getPrefixedText(),
+   wfMsg( 'missingarticle-rev', 
$srev->getRevId() )
+   );
+   return null;
+   }
+
# Update the stable version cache
$parserCache->save( $parserOut, $this->article, $pOpts 
);
# Add the stable output to the page view

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f23833cc19fd377aa173808c4fe4658f3d6ad80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
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] Correct update Flow to master (with anti-spam) - change (mediawiki/core)

2014-01-07 Thread Spage (Code Review)

Spage has uploaded a new change for review.

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


Change subject: Correct update Flow to master (with anti-spam)
..

Correct update Flow to master (with anti-spam)

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/106151/1

diff --git a/extensions/Flow b/extensions/Flow
index 20ae337..64a79ff 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit 20ae33766bdb6d457383338b139a07c53ca14ec5
+Subproject commit 64a79ffb0b3648aac8046ca0f8915b402e59c204

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6cf576dbeee99aa79e7c63fd820db2653a86537
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Spage 

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

[MediaWiki-commits] [Gerrit] All non wikipedias to 1.23wmf9 - change (operations/mediawiki-config)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: All non wikipedias to 1.23wmf9
..

All non wikipedias to 1.23wmf9

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


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

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

[MediaWiki-commits] [Gerrit] Update Flow to master - change (mediawiki/core)

2014-01-07 Thread Bsitu (Code Review)

Bsitu has uploaded a new change for review.

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


Change subject: Update Flow to master
..

Update Flow to master

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/106150/1

diff --git a/extensions/Flow b/extensions/Flow
index 20ae337..64a79ff 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit 20ae33766bdb6d457383338b139a07c53ca14ec5
+Subproject commit 64a79ffb0b3648aac8046ca0f8915b402e59c204

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I003d68c14e3a0d1031c360d25878b4a4621e207a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Bsitu 

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

[MediaWiki-commits] [Gerrit] votewiki really doesn't need TMH for anything - change (operations/mediawiki-config)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: votewiki really doesn't need TMH for anything
..


votewiki really doesn't need TMH for anything

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 154377e..dc28ab1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10565,12 +10565,14 @@
 'wmgUseMwEmbedSupport' => array(
'default' => true,
'loginwiki' => false,
+   'votewiki' => false,
 ),
 
 // NOTE: TMH *requires* MwEmbedSupport to function
 'wmgUseTimedMediaHandler' => array(
'default' => true,
'loginwiki' => false,
+   'votewiki' => false,
 ),
 
 'wmgEnableLocalTimedText' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ec865afd4fc072b1efa09058c2ca71c369a65bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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] Removing italic override for blockquotes - change (mediawiki...VectorBeta)

2014-01-07 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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


Change subject: Removing italic override for blockquotes
..

Removing italic override for blockquotes

Forcing all blockquote text to be italic causes loss of information.
For example, in the attribution it is no longer clear what is the
author and what is the source. e.g.:
—Wollstonecraft, The Collected Letters
Is Wollstonecraft the author or part of the book title?

Change-Id: I8aa2a5fd8a893e92cfee3e193d03458b6e06d342
---
M less/screen-beta.less
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/less/screen-beta.less b/less/screen-beta.less
index cde7a28..a13de67 100644
--- a/less/screen-beta.less
+++ b/less/screen-beta.less
@@ -1,7 +1,6 @@
 blockquote {
font-family: @content-heading-font-family;
font-size: 1.2em;
-   font-style: italic;
 }
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8aa2a5fd8a893e92cfee3e193d03458b6e06d342
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] Make WikiPage::$mPreparedEdit public - change (mediawiki/core)

2014-01-07 Thread Chad (Code Review)

Chad has submitted this change and it was merged.

Change subject: Make WikiPage::$mPreparedEdit public
..


Make WikiPage::$mPreparedEdit public

Partial revert of I2c34baaf8b64b20efa1bfa6ea356e0124c54

Change-Id: Id4e90c612941ff2bdb50d7a68f4e18b004c9f744
(cherry picked from commit 09f84556bd33d2eeca29cf0d01b641030f50fb8a)
---
M includes/WikiPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index d4acb6f..49fe1f4 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -51,7 +51,7 @@
/**@}}*/
 
/** @var stdclass Map of cache fields (text, parser output, ect) for a 
proposed/new edit */
-   protected $mPreparedEdit = false;
+   public $mPreparedEdit = false;
 
/**
 * @var int

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4e90c612941ff2bdb50d7a68f4e18b004c9f744
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] Make WikiPage::$mPreparedEdit public - change (mediawiki/core)

2014-01-07 Thread Chad (Code Review)

Chad has submitted this change and it was merged.

Change subject: Make WikiPage::$mPreparedEdit public
..


Make WikiPage::$mPreparedEdit public

Partial revert of I2c34baaf8b64b20efa1bfa6ea356e0124c54

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

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



diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index f0a58d3..384a7c4 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -51,7 +51,7 @@
/**@}}*/
 
/** @var stdclass Map of cache fields (text, parser output, ect) for a 
proposed/new edit */
-   protected $mPreparedEdit = false;
+   public $mPreparedEdit = false;
 
/**
 * @var int

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4e90c612941ff2bdb50d7a68f4e18b004c9f744
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] Make WikiPage::$mPreparedEdit public - change (mediawiki/core)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Make WikiPage::$mPreparedEdit public
..

Make WikiPage::$mPreparedEdit public

Partial revert of I2c34baaf8b64b20efa1bfa6ea356e0124c54

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/106146/1

diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index f0a58d3..384a7c4 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -51,7 +51,7 @@
/**@}}*/
 
/** @var stdclass Map of cache fields (text, parser output, ect) for a 
proposed/new edit */
-   protected $mPreparedEdit = false;
+   public $mPreparedEdit = false;
 
/**
 * @var int

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4e90c612941ff2bdb50d7a68f4e18b004c9f744
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] Send cache purges for action=raw after editing user css/js - change (mediawiki/core)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Send cache purges for action=raw after editing user css/js
..


Send cache purges for action=raw after editing user css/js

These types of requests can be cached for a short time (~5 min) in
Squid/Varnish.

Change importScript to be consistent with importStylesheet in the query
parameter order (title, action, ctype).

We only send purges for the exact urls as used by importScript and
importStylesheet.

Note: ResourceLoader things have their cache handled separately and
aren't affected by this change.

Users like instant updating of scripts after having changed them.

Bug: 56874
Change-Id: Idaa8552cf371dbafeb8b730f35b3b5c4fc339fb0
---
M includes/Title.php
M includes/actions/RawAction.php
M skins/common/wikibits.js
3 files changed, 14 insertions(+), 3 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Aaron Schulz: Looks good to me, approved
  TMg: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Title.php b/includes/Title.php
index 88268bb..23c7c4b 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3538,6 +3538,13 @@
}
}
 
+   // If we are looking at a css/js user subpage, purge the 
action=raw.
+   if ( $this->isJsSubpage() ) {
+   $urls[] = $this->getInternalUrl( 
'action=raw&ctype=text/javascript' );
+   } elseif ( $this->isCssSubpage() ) {
+   $urls[] = $this->getInternalUrl( 
'action=raw&ctype=text/css' );
+   }
+
wfRunHooks( 'TitleSquidURLs', array( $this, &$urls ) );
return $urls;
}
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index a0116fb..bab2f93 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -77,7 +77,8 @@
 
$contentType = $this->getContentType();
 
-   # Force caching for CSS and JS raw content, default: 5 minutes
+   # Force caching for CSS and JS raw content, default: 5 minutes.
+   # Note: If using a canonical url for userpage css/js, we send 
an HTCP purge.
if ( $smaxage === null ) {
if ( $contentType == 'text/css' || $contentType == 
'text/javascript' ) {
$smaxage = intval( $wgForcedRawSMaxage );
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index d28ca0a..9cfcd7f 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -226,8 +226,11 @@
return s;
 };
 
-win.importStylesheet = function( page ) {
-   return win.importStylesheetURI( mw.config.get( 'wgScript' ) + 
'?action=raw&ctype=text/css&title=' + mw.util.wikiUrlencode( page ) );
+win.importStylesheet = function ( page ) {
+   var uri = mw.config.get( 'wgScript' ) + '?title=' +
+   mw.util.wikiUrlencode( page ) +
+   '&action=raw&ctype=text/css';
+   return win.importStylesheetURI( uri );
 };
 
 win.importStylesheetURI = function( url, media ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idaa8552cf371dbafeb8b730f35b3b5c4fc339fb0
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: TMg 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update EventLogging to master - change (mediawiki/core)

2014-01-07 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Update EventLogging to master
..

Update EventLogging to master

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/106145/1

diff --git a/extensions/EventLogging b/extensions/EventLogging
index 36cd7fb..ff9c437 16
--- a/extensions/EventLogging
+++ b/extensions/EventLogging
-Subproject commit 36cd7fbd9f763f369fb3d7ae503ef4c9133f99bf
+Subproject commit ff9c4379ed71271dd457170fabaf07d02f28e778

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb87d6014cca4cc759d90b764b0a1c032e075728
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf8
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Merge "Move redirect rendering into WikitextContent" - change (mediawiki/core)

2014-01-07 Thread SG (Code Review)

SG has uploaded a new change for review.

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


Change subject: Merge "Move redirect rendering into WikitextContent"
..

Merge "Move redirect rendering into WikitextContent"

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/106144/1


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

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

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

[MediaWiki-commits] [Gerrit] Revert "Use WikiPage::prepareContentForEdit in SpamBlacklist... - change (mediawiki...SpamBlacklist)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Use WikiPage::prepareContentForEdit in 
SpamBlacklistHooks::filterMergedContent"
..


Revert "Use WikiPage::prepareContentForEdit in 
SpamBlacklistHooks::filterMergedContent"

For Wikidata, this causes users to be unable to create items. (bug 59797)

In case of Special:NewItem, $context->getWikiPage() does
$context->getTitle() to get the special page and then WikiPage::factory
with the special page $title.  special page does not make a valid
WikiPage and throws an exception.

Previously, $title = special page and was used in getParserOutput.
$title is invalid there but Wikibase never used that variable.

Would be good to make sure $title is actually related to the content.

This reverts commit 508a3706d64390a82e232c2f35b0acad616d9f6a.

Change-Id: Ib24515be6e76d3f29e2f9048fbb81e5a25b5857a
(cherry picked from commit 2745442aec0437d719bfad3b7a81580d2bf10fa8)
---
M SpamBlacklistHooks.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
index 0ceb4fa..54f833c 100644
--- a/SpamBlacklistHooks.php
+++ b/SpamBlacklistHooks.php
@@ -25,8 +25,7 @@
}
 
// get the link from the not-yet-saved page content.
-   $editInfo = $context->getWikiPage()->prepareContentForEdit( 
$content );
-   $pout = $editInfo->output;
+   $pout = $content->getParserOutput( $title );
$links = array_keys( $pout->getExternalLinks() );
 
// HACK: treat the edit summary as a link

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib24515be6e76d3f29e2f9048fbb81e5a25b5857a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Aude 
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] Use WikitextContent to render redirects - change (mediawiki...FlaggedRevs)

2014-01-07 Thread Aaron Schulz (Code Review)

Aaron Schulz has submitted this change and it was merged.

Change subject: Use WikitextContent to render redirects
..


Use WikitextContent to render redirects

Core change Id44d566a moves redirect header rendering into
WikitextContent, removing the need for extensions to special-case
redirects in order to call Article::viewRedirect to get the proper
output.

Bug: 14323
Change-Id: I3653b608941813a73281f4f0545bea2487d43964
Depends-On: Id44d566a7ca35a1b9579d0c0e947877c980b0686
---
M frontend/FlaggablePageView.php
1 file changed, 5 insertions(+), 30 deletions(-)

Approvals:
  Aaron Schulz: Verified; Looks good to me, approved



diff --git a/frontend/FlaggablePageView.php b/frontend/FlaggablePageView.php
index 1d58677..834fbe8 100644
--- a/frontend/FlaggablePageView.php
+++ b/frontend/FlaggablePageView.php
@@ -598,15 +598,7 @@
$parserOut = FlaggedRevs::parseStableRevision( $frev, $pOpts );
 
# Parse and output HTML
-   $redirHtml = $this->getRedirectHtml( $frev );
-   if ( $redirHtml == '' ) { // page is not a redirect...
-   # Add the stable output to the page view
-   $this->out->addParserOutput( $parserOut );
-   } else { // page is a redirect...
-   $this->out->addHtml( $redirHtml );
-   # Add output to set categories, displaytitle, etc.
-   $this->out->addParserOutputNoText( $parserOut );
-   }
+   $this->out->addParserOutput( $parserOut );
 
return $parserOut;
}
@@ -701,17 +693,10 @@
$parserOut = FlaggedRevs::parseStableRevision( 
$srev, $pOpts );
}
 
-   $redirHtml = $this->getRedirectHtml( $srev );
-   if ( $redirHtml == '' ) { // page is not a redirect...
-   # Update the stable version cache
-   $parserCache->save( $parserOut, $this->article, 
$pOpts );
-   # Add the stable output to the page view
-   $this->out->addParserOutput( $parserOut );
-   } else { // page is a redirect...
-   $this->out->addHtml( $redirHtml );
-   # Add output to set categories, displaytitle, 
etc.
-   $this->out->addParserOutputNoText( $parserOut );
-   }
+   # Update the stable version cache
+   $parserCache->save( $parserOut, $this->article, $pOpts 
);
+   # Add the stable output to the page view
+   $this->out->addParserOutput( $parserOut );
# Update the stable version dependancies
FlaggedRevs::updateStableOnlyDeps( $this->article, 
$parserOut );
}
@@ -725,16 +710,6 @@
}
 
return $parserOut;
-   }
-
-   // Get fancy redirect arrow and link HTML
-   protected function getRedirectHtml( $frev ) {
-   $rTargets = 
$frev->getRevision()->getContent()->getRedirectChain();
-   if ( $rTargets ) {
-   $article = new Article( $this->article->getTitle() );
-   return $article->viewRedirect( $rTargets );
-   }
-   return '';
}
 
// Show icons for draft/stable/old reviewed versions

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3653b608941813a73281f4f0545bea2487d43964
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Fix file permissions and command args for logstash - change (operations/puppet)

2014-01-07 Thread Ori.livneh (Code Review)

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

Change subject: Fix file permissions and command args for logstash
..


Fix file permissions and command args for logstash

Logstash stubbornly demands to be able to read its config files and
doesn't like to be told about a plugin directory that doesn't exist.
Java also really wants us to specify the location of the jar file that
we are attempting to execute.

Change-Id: Iad8822ce5612d3e0c9370a5a6d27dd54ce2ede6d
---
M modules/logstash/manifests/conf.pp
M modules/logstash/templates/default.erb
2 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/modules/logstash/manifests/conf.pp 
b/modules/logstash/manifests/conf.pp
index 2b6da00..ad2f698 100644
--- a/modules/logstash/manifests/conf.pp
+++ b/modules/logstash/manifests/conf.pp
@@ -30,6 +30,9 @@
 
 file { "${logstash::config_dir}/${priority}-${config_file}.conf":
 ensure  => $ensure,
+group   => 'root',
+mode=> '0644',
+owner   => 'root',
 content => $content,
 source  => $source,
 require => Package['logstash'],
diff --git a/modules/logstash/templates/default.erb 
b/modules/logstash/templates/default.erb
index 3b92cbf..a2592ca 100644
--- a/modules/logstash/templates/default.erb
+++ b/modules/logstash/templates/default.erb
@@ -6,6 +6,9 @@
 # Start logstash on boot?
 START=yes
 
+# Location of the logstash jar file
+LS_JAR=/opt/logstash/logstash.jar
+
 # Java JVM options
 LS_JAVA_OPTS="-Xms<%= @heap_memory_mb %>m -Xmx<%= @heap_memory_mb %>m"
 LS_JAVA_OPTS="${LS_JAVA_OPTS} -Djava.io.tmpdir=/var/lib/logstash"
@@ -21,5 +24,7 @@
 # Logstash options
 # Note: the sysv init script prepends these options with "agent -f ${CONF_DIR}"
 LS_OPTS="--log /var/log/logstash/logstash.log"
-LS_OPTS="${LS_OPTS} --pluginpath ${PLUGIN_DIR}"
 LS_OPTS="${LS_OPTS} --filterworkers <%= @filter_workers %>"
+# XXX: Don't add plugin dir until we need it.
+# Logstash refuses to start if missing
+#LS_OPTS="${LS_OPTS} --pluginpath ${PLUGIN_DIR}"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad8822ce5612d3e0c9370a5a6d27dd54ce2ede6d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
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] Update AbuseFilter - change (mediawiki/core)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Update AbuseFilter
..


Update AbuseFilter

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

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



diff --git a/extensions/AbuseFilter b/extensions/AbuseFilter
index 31f8068..b402b26 16
--- a/extensions/AbuseFilter
+++ b/extensions/AbuseFilter
-Subproject commit 31f8068fd8fc84232091e0562fb3bc7b34b8c240
+Subproject commit b402b26137f4e97a582dc63209014ee8ffecabb8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I467a530afa52bde26c04b42ab2cef3f6750216af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 
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 redirect rendering into WikitextContent - change (mediawiki/core)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Move redirect rendering into WikitextContent
..


Move redirect rendering into WikitextContent

There's no good reason for everything that wants to render a page to
have to test whether the page is a redirect and then call
Article::viewRedirect to get the fancy rendering instead of using the
ParserOutput. This logic can easily be moved into
WikitextContent::getParserOutput so callers can just use the
returned ParserOutput.

At the same time, we can handle "#REDIRECT [[File:Foo]]" and
"#REDIRECT [[Category:Foo]]" the way people expect, by recording the
link in pagelinks rather than imagelinks/categorylinks (although this
means fixing ImagePage's bug about assuming anything in imagelinks that
is a redirect is a redirect to the image too).

And we can finally fix bug 14323, too.

Bug: 14323
Bug: 17259
Bug: 27621
Bug: 42642
Bug: 50488
Change-Id: Id44d566a7ca35a1b9579d0c0e947877c980b0686
Followup: I1c7582d1bf7ec4184a45b00154e3dd5b39dd444b
Followup: I3653b608941813a73281f4f0545bea2487d43964
---
M RELEASE-NOTES-1.23
M includes/Article.php
M includes/EditPage.php
M includes/ImagePage.php
M includes/content/WikitextContent.php
M includes/diff/DifferenceEngine.php
6 files changed, 104 insertions(+), 75 deletions(-)

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



diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index afa7efd..d77a270 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -69,6 +69,9 @@
   'user' or 'bot'. The API will throw an error if the user is not logged
   in (user) or does not have the 'bot' userright (bot). Based off of the
   AssertEdit extension by Steve Sanbeg.
+* WikitextContent will now render redirects with the expected "redirect"
+  header, rather than as an ordered list. Code calling Article::viewRedirect
+  can probably be changed to no longer special-case redirects.
 
 === Bug fixes in 1.23 ===
 * (bug 41759) The "updated since last visit" markers (on history pages, recent
@@ -93,6 +96,8 @@
   the JavaScript evaluator were updated to support the new format. Plural rules
   for some languages have changed, most notably Russian. Affected software
   messages have been updated and marked for review at translatewiki.net.
+* (bug 14323) Redirect pages, when viewed with redirect=no, no longer hide the
+  remaining page content.
 
 === Web API changes in 1.23 ===
 * (bug 54884) action=parse&prop=categories now indicates hidden and missing
diff --git a/includes/Article.php b/includes/Article.php
index c82b39f..75906fd 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -684,26 +684,15 @@
 
# Allow extensions do their own 
custom view for certain pages
$outputDone = true;
-   } else {
-   $content = 
$this->getContentObject();
-   $rt = $content ? 
$content->getRedirectChain() : null;
-   if ( $rt ) {
-   wfDebug( __METHOD__ . 
": showing redirect=no page\n" );
-   # Viewing a redirect 
page (e.g. with parameter redirect=no)
-   $outputPage->addHTML( 
$this->viewRedirect( $rt ) );
-   # Parse just to get 
categories, displaytitle, etc.
-   $this->mParserOutput = 
$content->getParserOutput( $this->getTitle(), $oldid, $parserOptions, false );
-   
$outputPage->addParserOutputNoText( $this->mParserOutput );
-   $outputDone = true;
-   }
}
break;
case 4:
# Run the parse, protected by a pool 
counter
wfDebug( __METHOD__ . ": doing uncached 
parse\n" );
 
+   $content = $this->getContentObject();
$poolArticleView = new 
PoolWorkArticleView( $this->getPage(), $parserOptions,
-   $this->getRevIdFetched(), 
$useParserCache, $this->getContentObject() );
+   $this->getRevIdFetched(), 
$useParserCache, $content );
 
if ( !$poolArticleView->execute() ) {
$error = 
$poolArticleView->getError();
@@ -722,6 +711,9 @@

[MediaWiki-commits] [Gerrit] Update SpamBlacklist to head of wmf/1.23wmf9 deployment branch - change (mediawiki/core)

2014-01-07 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Update SpamBlacklist to head of wmf/1.23wmf9 deployment branch
..

Update SpamBlacklist to head of wmf/1.23wmf9 deployment branch

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/106143/1

diff --git a/extensions/SpamBlacklist b/extensions/SpamBlacklist
index 3e9e18a..2999592 16
--- a/extensions/SpamBlacklist
+++ b/extensions/SpamBlacklist
-Subproject commit 3e9e18aea79ccfd37c3ad0d82862c90d926accd4
+Subproject commit 2999592d1238e546c9850ee417dd06c0c863f46e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib99c92cadc9c9e63a6319ffa58dc5c729a1cc8ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Update SpamBlacklist to head of wmf/1.23wmf9 deployment branch - change (mediawiki/core)

2014-01-07 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Update SpamBlacklist to head of wmf/1.23wmf9 deployment branch
..


Update SpamBlacklist to head of wmf/1.23wmf9 deployment branch

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

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



diff --git a/extensions/SpamBlacklist b/extensions/SpamBlacklist
index 3e9e18a..2999592 16
--- a/extensions/SpamBlacklist
+++ b/extensions/SpamBlacklist
-Subproject commit 3e9e18aea79ccfd37c3ad0d82862c90d926accd4
+Subproject commit 2999592d1238e546c9850ee417dd06c0c863f46e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib99c92cadc9c9e63a6319ffa58dc5c729a1cc8ed
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] Fix file permissions and command args for logstash - change (operations/puppet)

2014-01-07 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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


Change subject: Fix file permissions and command args for logstash
..

Fix file permissions and command args for logstash

Logstash subbornly demands to be able to read it's config files and
doesn't like to be told about a plugin directory that doesn't exist.
Java also really wants us to specify the location of the jar file that
we are attempting to execute.

Change-Id: Iad8822ce5612d3e0c9370a5a6d27dd54ce2ede6d
---
M modules/logstash/manifests/conf.pp
M modules/logstash/templates/default.erb
2 files changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/modules/logstash/manifests/conf.pp 
b/modules/logstash/manifests/conf.pp
index 2b6da00..ad2f698 100644
--- a/modules/logstash/manifests/conf.pp
+++ b/modules/logstash/manifests/conf.pp
@@ -30,6 +30,9 @@
 
 file { "${logstash::config_dir}/${priority}-${config_file}.conf":
 ensure  => $ensure,
+group   => 'root',
+mode=> '0644',
+owner   => 'root',
 content => $content,
 source  => $source,
 require => Package['logstash'],
diff --git a/modules/logstash/templates/default.erb 
b/modules/logstash/templates/default.erb
index 3b92cbf..a2592ca 100644
--- a/modules/logstash/templates/default.erb
+++ b/modules/logstash/templates/default.erb
@@ -6,6 +6,9 @@
 # Start logstash on boot?
 START=yes
 
+# Location of the logstash jar file
+LS_JAR=/opt/logstash/logstash.jar
+
 # Java JVM options
 LS_JAVA_OPTS="-Xms<%= @heap_memory_mb %>m -Xmx<%= @heap_memory_mb %>m"
 LS_JAVA_OPTS="${LS_JAVA_OPTS} -Djava.io.tmpdir=/var/lib/logstash"
@@ -21,5 +24,7 @@
 # Logstash options
 # Note: the sysv init script prepends these options with "agent -f ${CONF_DIR}"
 LS_OPTS="--log /var/log/logstash/logstash.log"
-LS_OPTS="${LS_OPTS} --pluginpath ${PLUGIN_DIR}"
 LS_OPTS="${LS_OPTS} --filterworkers <%= @filter_workers %>"
+# XXX: Don't add plugin dir until we need it.
+# Logstash refuses to start if missing
+#LS_OPTS="${LS_OPTS} --pluginpath ${PLUGIN_DIR}"

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

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

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

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

2014-01-07 Thread Bsitu (Code Review)

Bsitu has uploaded a new change for review.

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


Change subject: Update AbuseFilter
..

Update AbuseFilter

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


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

diff --git a/extensions/AbuseFilter b/extensions/AbuseFilter
index 31f8068..b402b26 16
--- a/extensions/AbuseFilter
+++ b/extensions/AbuseFilter
-Subproject commit 31f8068fd8fc84232091e0562fb3bc7b34b8c240
+Subproject commit b402b26137f4e97a582dc63209014ee8ffecabb8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I467a530afa52bde26c04b42ab2cef3f6750216af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Bsitu 

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

[MediaWiki-commits] [Gerrit] etherpad to use own cert, not wildcard - change (operations/puppet)

2014-01-07 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: etherpad to use own cert, not wildcard
..


etherpad to use own cert, not wildcard

I forgot to add the actual certificate.

Change-Id: I78a1e5af4a428136bef7d77811ff56a81495c934
RT:6591
---
A files/ssl/etherpad.wikimedia.org.pem
1 file changed, 30 insertions(+), 0 deletions(-)

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



diff --git a/files/ssl/etherpad.wikimedia.org.pem 
b/files/ssl/etherpad.wikimedia.org.pem
new file mode 100644
index 000..619c16e
--- /dev/null
+++ b/files/ssl/etherpad.wikimedia.org.pem
@@ -0,0 +1,30 @@
+-BEGIN CERTIFICATE-
+MIIFMjCCBBqgAwIBAgIDD/MzMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTQwMTA2MTkwMDA0WhcNMTYwMTA5MTIwOTU3WjCBxTEpMCcGA1UEBRMgUUxu
+S1YwNEVYN01ZZTlPTmx6UDA1dGpIR0JHOFFQcFoxEzARBgNVBAsTCkdUNjY0Nzcx
+ODQxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMR8wHQYDVQQDExZldGhlcnBhZC53aWtpbWVkaWEub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmuxVWtuH0Z1BCHD7FzkKrQPaGC9EhAcp
+lmGH49wxyyXVGptFXGURpwvK+qtvoRisIGSZIZa1LaEOoXvhWs1vCQWFFyjGFyMP
+XH4HYKddLKCUERYi7yjyCD3uAIi4eTMAikxNPwmK2QCQ8I1PrSvdzKwBmdw+NwRR
+f80HSC5fXVWxDRtGyKbxS+5CCEVXaijWwf55/xRoee2njzDFcCXIaF/NALvAVfgd
+9gK5bywukbBH8aSwRz9e74m4hO6TC5TBARXySkNKit8Q0KO0Sq23VcjldpzkcdJA
+2jyEvOVAlHx0q2xjOEMxGYBxrwlRuPDw9GWn8N8RNzjVGUmrjRhbSwIDAQABo4IB
+sTCCAa0wHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/
+BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAhBgNVHREEGjAY
+ghZldGhlcnBhZC53aWtpbWVkaWEub3JnMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6
+Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0G
+A1UdDgQWBBRKfC5GBEIbzD6NYLPydAkrPEwUqzAMBgNVHRMBAf8EAjAAMHgGCCsG
+AQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2Vv
+dHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3Ry
+dXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMw
+MQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9j
+cHMwDQYJKoZIhvcNAQEFBQADggEBABGOEEZKpStn7LdmiSASzectWd1d3Zxi2AZW
+u3jzBues+UOHdABiZUXhk4SEj945DmOt60aGeKujq1OCil8FvXPuWNlWx7zDzUEY
+1C/U0b/R19GfnNZT3M5awcl5D7cWq2a7z3il4CwIioQAOu3WyaQMG1QlAKXXPESQ
+VFxWQBF81QZJqSJOQT69Y2hMdLj4dIpRinVMqoQmn6/KAcOrSt1BENJah8Y0WDzN
+LPwVyq1emOi9MEloBYy3LLWIpiCS4Ubg4TipM3jtNj1N0Ie9+/qKfxSwJyNQD8ql
+4nd2whVm16/rfWsr7yscm9B7xDzQV6+Ersefk90/SwvUGFCfhu0=
+-END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] etherpad to use own cert, not wildcard - change (operations/puppet)

2014-01-07 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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


Change subject: etherpad to use own cert, not wildcard
..

etherpad to use own cert, not wildcard

I forgot to add the actual certificate.

Change-Id: I78a1e5af4a428136bef7d77811ff56a81495c934
RT:6591
---
A files/ssl/etherpad.wikimedia.org.pem
1 file changed, 30 insertions(+), 0 deletions(-)


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

diff --git a/files/ssl/etherpad.wikimedia.org.pem 
b/files/ssl/etherpad.wikimedia.org.pem
new file mode 100644
index 000..619c16e
--- /dev/null
+++ b/files/ssl/etherpad.wikimedia.org.pem
@@ -0,0 +1,30 @@
+-BEGIN CERTIFICATE-
+MIIFMjCCBBqgAwIBAgIDD/MzMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTQwMTA2MTkwMDA0WhcNMTYwMTA5MTIwOTU3WjCBxTEpMCcGA1UEBRMgUUxu
+S1YwNEVYN01ZZTlPTmx6UDA1dGpIR0JHOFFQcFoxEzARBgNVBAsTCkdUNjY0Nzcx
+ODQxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMR8wHQYDVQQDExZldGhlcnBhZC53aWtpbWVkaWEub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmuxVWtuH0Z1BCHD7FzkKrQPaGC9EhAcp
+lmGH49wxyyXVGptFXGURpwvK+qtvoRisIGSZIZa1LaEOoXvhWs1vCQWFFyjGFyMP
+XH4HYKddLKCUERYi7yjyCD3uAIi4eTMAikxNPwmK2QCQ8I1PrSvdzKwBmdw+NwRR
+f80HSC5fXVWxDRtGyKbxS+5CCEVXaijWwf55/xRoee2njzDFcCXIaF/NALvAVfgd
+9gK5bywukbBH8aSwRz9e74m4hO6TC5TBARXySkNKit8Q0KO0Sq23VcjldpzkcdJA
+2jyEvOVAlHx0q2xjOEMxGYBxrwlRuPDw9GWn8N8RNzjVGUmrjRhbSwIDAQABo4IB
+sTCCAa0wHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/
+BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAhBgNVHREEGjAY
+ghZldGhlcnBhZC53aWtpbWVkaWEub3JnMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6
+Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0G
+A1UdDgQWBBRKfC5GBEIbzD6NYLPydAkrPEwUqzAMBgNVHRMBAf8EAjAAMHgGCCsG
+AQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2Vv
+dHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3Ry
+dXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMw
+MQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9j
+cHMwDQYJKoZIhvcNAQEFBQADggEBABGOEEZKpStn7LdmiSASzectWd1d3Zxi2AZW
+u3jzBues+UOHdABiZUXhk4SEj945DmOt60aGeKujq1OCil8FvXPuWNlWx7zDzUEY
+1C/U0b/R19GfnNZT3M5awcl5D7cWq2a7z3il4CwIioQAOu3WyaQMG1QlAKXXPESQ
+VFxWQBF81QZJqSJOQT69Y2hMdLj4dIpRinVMqoQmn6/KAcOrSt1BENJah8Y0WDzN
+LPwVyq1emOi9MEloBYy3LLWIpiCS4Ubg4TipM3jtNj1N0Ie9+/qKfxSwJyNQD8ql
+4nd2whVm16/rfWsr7yscm9B7xDzQV6+Ersefk90/SwvUGFCfhu0=
+-END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] Update Flow to master (with anti-spam) - change (mediawiki/core)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Update Flow to master (with anti-spam)
..


Update Flow to master (with anti-spam)

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

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



diff --git a/extensions/Flow b/extensions/Flow
index 71a1ad6..20ae337 16
--- a/extensions/Flow
+++ b/extensions/Flow
-Subproject commit 71a1ad67d77f76e13ca05939780358f5eb6bdb12
+Subproject commit 20ae33766bdb6d457383338b139a07c53ca14ec5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fd3f9a0496fcf3ea6f84f076c76880ea2ed6d44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Spage 
Gerrit-Reviewer: Bsitu 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Removing AbuseFilter::checkConditions' param - change (mediawiki...AbuseFilter)

2014-01-07 Thread jenkins-bot (Code Review)

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

Change subject: Removing AbuseFilter::checkConditions'  param
..


Removing AbuseFilter::checkConditions'  param

I'm not really sure why it exists; I assume to minimize overhead of init'ing
multiple AbuseFilterParser objects that would be exactly the same.

However, checkConditions() - which checks one specific condition - is not really
an "endpoint" you will want to call in .
You're more likely to call something higher-lever (like
AbuseFilter::filterAction, which will take care of fetching all appropriate
filters, as well as run them through checkConditions, and much more). This will
trickle down to ::checkAllFilter, down to ::checkFilter, which would eventually
call ::checkConditions with the 'keepvars' argument.
Basically, unless you're re-implementing much of AbuseFilter yourself, you won't
get to pass anything other than 'keepvars' to checkFilter.
As a result, even though you may call AbuseFilter to call on multiple different
vars, it will re-use the same parser with the first vars.

I'm proposing to drop the 'keepvars' and just keep the vars around instead.
checkFilter can compare previous vars with new vars, and only init a new Parser
if the vars are different.

Change-Id: I96ccc60c77f3cdbb82c0f9f16782a1a44ffb1592
(cherry picked from commit 84536df324ecbd04a1f1150901c0c26b219039d2)
---
M AbuseFilter.class.php
1 file changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 24d9080..ab09c2e 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -373,22 +373,22 @@
 * @param $conds
 * @param $vars
 * @param $ignoreError bool
-* @param $keepVars string
 * @return bool
 * @throws Exception
 */
public static function checkConditions(
-   $conds, $vars, $ignoreError = true, $keepVars = 'resetvars'
+   $conds, $vars, $ignoreError = true
) {
global $wgAbuseFilterParserClass;
 
-   static $parser;
+   static $parser, $lastVars;
 
wfProfileIn( __METHOD__ );
 
-   if ( is_null( $parser ) || $keepVars == 'resetvars' ) {
+   if ( is_null( $parser ) || $vars !== $lastVars ) {
/** @var $parser AbuseFilterParser */
$parser = new $wgAbuseFilterParserClass( $vars );
+   $lastVars = $vars;
}
 
try {
@@ -507,8 +507,7 @@
if ( self::checkConditions(
$pattern,
$vars,
-   true /* ignore errors */,
-   'keepvars'
+   true /* ignore errors */
) ) {
// Record match.
$result = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96ccc60c77f3cdbb82c0f9f16782a1a44ffb1592
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: Bsitu 
Gerrit-Reviewer: Matthias Mullie 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update TMH to head of 1.23wmf9 deployment branch - change (mediawiki/core)

2014-01-07 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Update TMH to head of 1.23wmf9 deployment branch
..


Update TMH to head of 1.23wmf9 deployment branch

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

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



diff --git a/extensions/TimedMediaHandler b/extensions/TimedMediaHandler
index da9d84c..c1e845f 16
--- a/extensions/TimedMediaHandler
+++ b/extensions/TimedMediaHandler
-Subproject commit da9d84c159425a552999ac339b3c70e14a2b6d51
+Subproject commit c1e845fb9fd603e683e86a9b0c1f42ac91970d91

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6b4730223c0ae9e01b840a1c24520977a62e97f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: Reedy 
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] little fixes to the workload generator - change (mediawiki...MathSearch)

2014-01-07 Thread Physikerwelt (Code Review)

Physikerwelt has submitted this change and it was merged.

Change subject: little fixes to the workload generator
..


little fixes to the workload generator

Change-Id: Idc30f308591fc85b2f9e96c48be9dc1cc11e886e
---
M MathQueryObject.php
M maintenance/GenerateWorkload.php
2 files changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/MathQueryObject.php b/MathQueryObject.php
index 88ee7df..9619690 100644
--- a/MathQueryObject.php
+++ b/MathQueryObject.php
@@ -25,6 +25,7 @@
'url.sty',
'hyperref.sty',
'mws.sty',
+// '[ids]latexml.sty',
'texvc'),
);
/**
@@ -99,16 +100,16 @@
return false;
}
$xCore = preg_replace("/\\n/","\n\t\t", 
$cx->children('mws',TRUE)->children('m',TRUE)->asXML());
-   $pmml = preg_replace('#(.*)#',
-   'http://www.mathweb.org/mws/ns"; 
name="$2"/>',
-   $px->children()->asXML())."\n";
+   $pmml = preg_replace(array( '#(.*)#' , "/\\n/" ),
+   array( 'http://www.mathweb.org/mws/ns"; name="$2"/>', "\n\t\t" ),
+   $px->children()->asXML());
$out = 'http://ntcir-math.nii.ac.jp/";>';
$out .= "\n\tFSE-GC-". $this->getQueryId() ."";
$out .= "\n\tContent-Query";
$out .= "\n\tQuery ".$this->getQueryId()." 
(".$this->getPageTitle().")";
$out .= "\n\t";
$out.= "\n\t\t{$this->getTeXQuery()}";
-   $out.= "\n\t\t{$pmml}";
+   $out.= "\n\t\t{$pmml}";
$out.= "\n\t\t{$xCore}";
$out .= "\n\t";
$out .= "\n\tfind result similar to "
diff --git a/maintenance/GenerateWorkload.php b/maintenance/GenerateWorkload.php
index 39d88cd..8f9afbf 100644
--- a/maintenance/GenerateWorkload.php
+++ b/maintenance/GenerateWorkload.php
@@ -69,7 +69,7 @@
}
 
protected function getHead(){
-   return "";
+   return ''.PHP_EOL;
}
protected function getFooter(){
return "";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc30f308591fc85b2f9e96c48be9dc1cc11e886e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Physikerwelt 

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

1 2 3 4 >

1 - 100 of 357 matches

Mail list logo