date:20150219

[MediaWiki-commits] [Gerrit] dhcp: Adding entries for mc2002-2006 - change (operations/puppet)

2015-02-19 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: dhcp: Adding entries for mc2002-2006
..

dhcp: Adding entries for mc2002-2006

Change-Id: I4960a96e8303f219d30f6fe0bece564046575931
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 28 insertions(+), 0 deletions(-)


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

diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 85c0ffa..87f279b 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2060,6 +2060,34 @@
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host mc2003 {
+   hardware ethernet 90:e2:ba:19:54:11;
+   fixed-address mc2003.codfw.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host mc2004 {
+   hardware ethernet 90:e2:ba:19:56:51;
+   fixed-address mc2004.codfw.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host mc2005 {
+   hardware ethernet 90:e2:ba:19:56:f5;
+   fixed-address mc2005.codfw.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host mc2006 {
+   hardware ethernet 90:e2:ba:19:4e:31;
+   fixed-address mc2006.codfw.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host ms1001 {
hardware ethernet 78:2b:cb:0a:13:f3;
fixed-address ms1001.wikimedia.org;

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

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

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

[MediaWiki-commits] [Gerrit] Migrate Intuition to JSON - change (mediawiki...Translate)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Migrate Intuition to JSON
..


Migrate Intuition to JSON

Change-Id: I6e9db7e19881f7c7b83e1133d37db7dc0d460192
---
M ffs/IntuitionTextdomains.php
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/ffs/IntuitionTextdomains.php b/ffs/IntuitionTextdomains.php
index 12ab21b..9ea4c9a 100644
--- a/ffs/IntuitionTextdomains.php
+++ b/ffs/IntuitionTextdomains.php
@@ -40,9 +40,8 @@
} else {
// Intuition text-domains are case-insensitive 
and internally
// converts to lowercase names starting with a 
capital letter.
-   // eg. "MyTool" -> "Mytool.i18n.php"
-   // No subdirectories!
-   $file = ucfirst( $sanitizedName ) . '.i18n.php';
+   // eg. "MyTool" -> "Mytool/%CODE%.json"
+   $file = preg_replace( '/\s+/', '', 
"$sanitizedName/%CODE%.json" );
}
 
if ( isset( $g['descmsg'] ) ) {
@@ -82,7 +81,7 @@
$g['optional'] = array();
}
 
-   $g['format'] = 'php';
+   $g['format'] = 'json';
 
$copyvars = array(
'aliasfile',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e9db7e19881f7c7b83e1133d37db7dc0d460192
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
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] [FEAT] Pluralize some messages - change (pywikibot/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: [FEAT] Pluralize some messages
..


[FEAT] Pluralize some messages

- unlink becomes the counter for removing links and redirect
- the number of changed links is the lenght of new_targets
- simplify targets string by join statement, use localized
  comma separator. targets will be an empty string if the
  new_targets list is empty.

Bug: T89678
Change-Id: Iff8f577e430deffea19b6763de1f53cfa58fd39e
---
M scripts/solve_disambiguation.py
1 file changed, 23 insertions(+), 19 deletions(-)

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



diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index fad491e..c740a58 100644
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -559,7 +559,7 @@
 # TODO: break this function up into subroutines!
 
 include = False
-unlink = False
+unlink_counter = 0
 new_targets = []
 try:
 text = refPage.get()
@@ -769,7 +769,7 @@
 elif choice in ['u', 'U']:
 # unlink - we remove the section if there's any
 text = text[:m.start()] + link_text + text[m.end():]
-unlink = True
+unlink_counter += 1
 continue
 else:
 if len(choice) > 0 and choice[0] == 'r':
@@ -843,7 +843,8 @@
 pywikibot.showDiff(original_text, text)
 pywikibot.output(u'')
 # save the page
-self.setSummaryMessage(disambPage, new_targets, unlink, dn)
+self.setSummaryMessage(disambPage, new_targets, unlink_counter,
+   dn)
 try:
 refPage.put_async(text, comment=self.comment)
 except pywikibot.LockedPage:
@@ -927,17 +928,16 @@
 self.alternatives += links
 return True
 
-def setSummaryMessage(self, disambPage, new_targets=[], unlink=False,
+def setSummaryMessage(self, disambPage, new_targets=[], unlink_counter=0,
   dn=False):
 # make list of new targets
-targets = ''
-for page_title in new_targets:
-targets += u'[[%s]], ' % page_title
-# remove last comma
-targets = targets[:-2]
+comma = self.mysite.mediawiki_message(u"comma-separator")
+targets = comma.join(u'[[%s]]' % page_title
+ for page_title in new_targets)
 
 if not targets:
-targets = i18n.twtranslate(self.mysite, 
'solve_disambiguation-unknown-page')
+targets = i18n.twtranslate(self.mysite,
+   'solve_disambiguation-unknown-page')
 
 # first check whether user has customized the edit comment
 if (self.mysite.family.name in config.disambiguation_comment and
@@ -957,27 +957,29 @@
 fallback=True) % disambPage.title()
 elif disambPage.isRedirectPage():
 # when working on redirects, there's another summary message
-if unlink and not new_targets:
+if unlink_counter and not new_targets:
 self.comment = i18n.twtranslate(
 self.mysite,
 'solve_disambiguation-redirect-removed',
-{'from': disambPage.title()}
-)
+{'from': disambPage.title(),
+ 'count': unlink_counter})
 elif dn and not new_targets:
 self.comment = i18n.twtranslate(
 self.mysite,
 'solve_disambiguation-redirect-adding-dn-template',
-{'from': disambPage.title()}
-)
+{'from': disambPage.title()})
 else:
 self.comment = i18n.twtranslate(
 self.mysite, 'solve_disambiguation-redirect-resolved',
-{'from': disambPage.title(), 'to': targets})
+{'from': disambPage.title(),
+ 'to': targets,
+ 'count': len(new_targets)})
 else:
-if unlink and not new_targets:
+if unlink_counter and not new_targets:
 self.comment = i18n.twtranslate(
 self.mysite, 'solve_disambiguation-links-removed',
-{'from': disambPage.title()})
+{'from': disambPage.title(),
+ 'count': unlink_counter})
 elif dn and not new_targets:
 self.comment = i18n.twtranslate(
 self.mysite, 'solve_disambiguation-adding-dn-template',
@@ -985,7 +987,9 @@
 else:
 self.comment = i18n.twtranslate(

[MediaWiki-commits] [Gerrit] Use lower case (sanitized) folder names - change (mediawiki...Translate)

2015-02-19 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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

Change subject: Use lower case (sanitized) folder names
..

Use lower case (sanitized) folder names

Change-Id: I530a463750cb0e7467d843826e42f477ff39
---
M ffs/IntuitionTextdomains.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/ffs/IntuitionTextdomains.php b/ffs/IntuitionTextdomains.php
index fd3f49e..9ea4c9a 100644
--- a/ffs/IntuitionTextdomains.php
+++ b/ffs/IntuitionTextdomains.php
@@ -41,7 +41,7 @@
// Intuition text-domains are case-insensitive 
and internally
// converts to lowercase names starting with a 
capital letter.
// eg. "MyTool" -> "Mytool/%CODE%.json"
-   $file = preg_replace( '/\s+/', '', 
"$name/%CODE%.json" );
+   $file = preg_replace( '/\s+/', '', 
"$sanitizedName/%CODE%.json" );
}
 
if ( isset( $g['descmsg'] ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I530a463750cb0e7467d843826e42f477ff39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
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] Added grammar forms for Wikimedia Commons for Ukrainian - change (mediawiki...WikimediaMessages)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Added grammar forms for Wikimedia Commons for Ukrainian
..


Added grammar forms for Wikimedia Commons for Ukrainian

Change-Id: I827026fabeaef77123908bec28fcb05ffd397d6a
---
M WikimediaGrammarForms.php
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/WikimediaGrammarForms.php b/WikimediaGrammarForms.php
index 6d6c13a..42fe643 100644
--- a/WikimediaGrammarForms.php
+++ b/WikimediaGrammarForms.php
@@ -901,6 +901,7 @@
'genitive' => array(
'Вікіпедія' => 'Вікіпедії',
'Вікісловник' => 'Вікісловника',
+   'Вікісховище' => 'Вікісховища',
'Вікіпідручник' => 'Вікіпідручника',
'Вікіцитати' => 'Вікіцитат',
'Вікіджерела' => 'Вікіджерел',
@@ -912,6 +913,7 @@
'dative' => array(
'Вікіпедія' => 'Вікіпедії',
'Вікісловник' => 'Вікісловнику',
+   'Вікісховище' => 'Вікісховищу',
'Вікіпідручник' => 'Вікіпідручнику',
'Вікіцитати' => 'Вікіцитатам',
'Вікіджерела' => 'Вікіджерелам',
@@ -923,6 +925,7 @@
'accusative' => array(
'Вікіпедія' => 'Вікіпедію',
'Вікісловник' => 'Вікісловник',
+   'Вікісховище' => 'Вікісховище',
'Вікіпідручник' => 'Вікіпідручник',
'Вікіцитати' => 'Вікіцитати',
'Вікіджерела' => 'Вікіджерела',
@@ -934,6 +937,7 @@
'instrumental' => array(
'Вікіпедія' => 'Вікіпедією',
'Вікісловник' => 'Вікісловником',
+   'Вікісховище' => 'Вікісховищем',
'Вікіпідручник' => 'Вікіпідручником',
'Вікіцитати' => 'Вікіцитатами',
'Вікіджерела' => 'Вікіджерелами',
@@ -945,6 +949,7 @@
'locative' => array(
'Вікіпедія' => 'у Вікіпедії',
'Вікісловник' => 'у Вікісловнику',
+   'Вікісховище' => 'у Вікісховищі',
'Вікіпідручник' => 'у Вікіпідручнику',
'Вікіцитати' => 'у Вікіцитатах',
'Вікіджерела' => 'у Вікіджерелах',
@@ -956,6 +961,7 @@
'vocative' => array(
'Вікіпедія' => 'Вікіпедіє',
'Вікісловник' => 'Вікісловнику',
+   'Вікісховище' => 'Вікісховище',
'Вікіпідручник' => 'Вікіпідручнику',
'Вікіцитати' => 'Вікіцитати',
'Вікіджерела' => 'Вікіджерела',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I827026fabeaef77123908bec28fcb05ffd397d6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Base 
Gerrit-Reviewer: Alolita 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Arrbee 
Gerrit-Reviewer: Divec 
Gerrit-Reviewer: DixonD 
Gerrit-Reviewer: Jsahleen 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Pginer 
Gerrit-Reviewer: RLuts 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: SuchetaG 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] resourceloader: Simplify log message for getDefinitionMtime(... - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: resourceloader: Simplify log message for getDefinitionMtime() 
cache miss
..


resourceloader: Simplify log message for getDefinitionMtime() cache miss

* Add quotes around context (which has pipe characters in it).
* Remove hash (not useful).

Change-Id: Iff80c914add0c5a2fe27fff6398bb3384102e3d2
---
M includes/resourceloader/ResourceLoaderModule.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/resourceloader/ResourceLoaderModule.php 
b/includes/resourceloader/ResourceLoaderModule.php
index 4c2c2b2..d689044 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -524,8 +524,8 @@
return $data;
}
 
-   wfDebugLog( 'resourceloader', __METHOD__ . ": New definition 
hash for module "
-   . "{$this->getName()} in context {$context->getHash()}: 
$hash." );
+   wfDebugLog( 'resourceloader', __METHOD__ . ": New definition 
for module "
+   . "{$this->getName()} in context 
\"{$context->getHash()}\"" );
 
$timestamp = time();
$cache->set( $key, $timestamp );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff80c914add0c5a2fe27fff6398bb3384102e3d2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] API: Add authz features for RESTBase - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: API: Add authz features for RESTBase
..


API: Add authz features for RESTBase

The RESTBase team has requested the ability to check the validity of a
CSRF token and to interface with Title::userCan().

The former is accomplished by the new action=checktoken module. The
latter by a new parameter ('testactions') to the existing prop=info.

Bug: T88010
Change-Id: I2530f1315ec93f5be9fb437137992150fdc305f2
---
M RELEASE-NOTES-1.25
M autoload.php
M includes/User.php
A includes/api/ApiCheckToken.php
M includes/api/ApiMain.php
M includes/api/ApiQueryInfo.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
8 files changed, 139 insertions(+), 6 deletions(-)

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



diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 8992ce0..86395ac 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -213,6 +213,9 @@
 * list=tags has additional properties to indicate 'active' status and tag
   sources.
 * siprop=libraries was added to ApiQuerySiteInfo to list installed external 
libraries.
+* (T88010) Added action=checktoken, to test a CSRF token's validity.
+* (T88010) Added intestactions to prop=info, to allow querying of
+  Title::userCan() via the API.
 
 === Action API internal changes in 1.25 ===
 * ApiHelp has been rewritten to support i18n and paginated HTML output.
diff --git a/autoload.php b/autoload.php
index 01dba44..bf759bc 100644
--- a/autoload.php
+++ b/autoload.php
@@ -18,6 +18,7 @@
'AnsiTermColorer' => __DIR__ . '/maintenance/term/MWTerm.php',
'ApiBase' => __DIR__ . '/includes/api/ApiBase.php',
'ApiBlock' => __DIR__ . '/includes/api/ApiBlock.php',
+   'ApiCheckToken' => __DIR__ . '/includes/api/ApiCheckToken.php',
'ApiClearHasMsg' => __DIR__ . '/includes/api/ApiClearHasMsg.php',
'ApiComparePages' => __DIR__ . '/includes/api/ApiComparePages.php',
'ApiCreateAccount' => __DIR__ . '/includes/api/ApiCreateAccount.php',
diff --git a/includes/User.php b/includes/User.php
index c2db67a..ae8deb6 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3938,6 +3938,20 @@
}
 
/**
+* Get the embedded timestamp from a token.
+* @param string $val Input token
+* @return int|null
+*/
+   public static function getEditTokenTimestamp( $val ) {
+   $suffixLen = strlen( self::EDIT_TOKEN_SUFFIX );
+   if ( strlen( $val ) <= 32 + $suffixLen ) {
+   return null;
+   }
+
+   return hexdec( substr( $val, 32, -$suffixLen ) );
+   }
+
+   /**
 * Check given value against the token value stored in the session.
 * A match should confirm that the form was submitted from the
 * user's own login session, not a form submission from a third-party
@@ -3954,12 +3968,10 @@
return $val === self::EDIT_TOKEN_SUFFIX;
}
 
-   $suffixLen = strlen( self::EDIT_TOKEN_SUFFIX );
-   if ( strlen( $val ) <= 32 + $suffixLen ) {
+   $timestamp = self::getEditTokenTimestamp( $val );
+   if ( $timestamp === null ) {
return false;
}
-
-   $timestamp = hexdec( substr( $val, 32, -$suffixLen ) );
if ( $maxage !== null && $timestamp < wfTimestamp() - $maxage ) 
{
// Expired token
return false;
diff --git a/includes/api/ApiCheckToken.php b/includes/api/ApiCheckToken.php
new file mode 100644
index 000..28c6ece
--- /dev/null
+++ b/includes/api/ApiCheckToken.php
@@ -0,0 +1,81 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @since 1.25
+ * @ingroup API
+ */
+class ApiCheckToken extends ApiBase {
+
+   public function execute() {
+   $params = $this->extractRequestParams();
+   $token = $params['token'];
+   $maxage = $params['maxtokenage'];
+   $request = $this->getRequest();
+   $salts = ApiQueryTokens::getTokenTypeSalts();
+   $salt = $salts[$params['type']];
+
+   $res = array();
+
+   if ( $this->getUser()->matchEditToken( $token, $salt, $request, 
$maxage ) ) {
+   $res['result'] = 'valid';
+   } elseif ( $maxage !== null && 
$this->getUser()->matchEditToken( $token, $salt, $request ) ) {
+   $res['result'] = 'expired';
+   } else {
+   $res['result'] = 'invalid';
+   }
+
+   $ts = User::getEditTokenTimestamp( $token );
+   if ( $ts !== null ) {
+   $mwts = new MWTimestamp();
+   $mwts->timestamp->setTimestamp( $ts );
+   $res['generated']

[MediaWiki-commits] [Gerrit] Add capability for managing campaigns - change (wikimedia/iegreview)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Add capability for managing campaigns
..


Add capability for managing campaigns

Bug: T90085
Change-Id: Ie69d855e32b7256aa3ceb38ebf559a677f894c88
---
M data/i18n/en.json
M data/i18n/qqq.json
A data/templates/admin/campaign.html
A data/templates/admin/campaigns.html
M data/templates/nav_user.html
M src/App.php
A src/Controllers/Admin/Campaign.php
A src/Controllers/Admin/Campaigns.php
M src/Controllers/Admin/User.php
M src/Dao/Campaigns.php
M src/Dao/Proposals.php
M src/Dao/Reports.php
12 files changed, 422 insertions(+), 12 deletions(-)

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



diff --git a/data/i18n/en.json b/data/i18n/en.json
index 6d81318..d329907 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -1,7 +1,8 @@
 {
"@metadata": {
"authors": [
-   "Bryan Davis"
+   "Bryan Davis",
+   "Niharika Kohli"
]
},
"header-title": "IEG grant review",
@@ -21,6 +22,7 @@
"nav-admin": "Admin",
"nav-users": "Manage users",
"nav-account": "My Account",
+   "nav-campaigns": "Manage campaigns",
 
"new-account-subject": "New IEG review account",
"new-account-email": "A new IEG review account has been created for 
you.\n\nYour login info is:\n\nusername: $1\npassword: $2\n\nYou may login at: 
$3\n\nYou may change your password at: $4\n\nSincerely,\nIndividual Engagement 
Grants team",
@@ -69,8 +71,8 @@
"admin-user-viewreports": "View reports?",
"admin-user-blocked": "Is blocked:",
"admin-user-save": "Save changes",
-
"admin-users-id": "Id",
+
"admin-users-username": "Username",
"admin-users-email": "Email",
"admin-users-admin": "Admin?",
@@ -81,8 +83,29 @@
"admin-users-yes": "yes",
"admin-users-no": "no",
"admin-users-add": "Add new user",
+   "admin-campaign-add": "Manage campaign",
"admin-users-form-go": "Search",
 
+   "admin-campaign-name": "Campaign in progress:",
+   "admin-campaign-end": "End campaign?",
+   "admin-campaign-start": "Create campaign",
+   "admin-campaign-start-date": "Start date:",
+   "admin-campaign-end-date": "End date:",
+   "admin-campaign-add": "Add new campaign",
+   "admin-campaign-manage": "Manage campaigns",
+   "admin-campaign-save": "Save",
+   "admin-campaign-new": "Name of campaign:",
+   "admin-campaigns-name": "Campaign name",
+   "admin-campaigns-add": "Add a campaign",
+   "admin-campaigns-form-go": "Search",
+   "admin-campaigns-start": "Start date",
+   "admin-campaigns-end": "End date",
+   "admin-campaigns-id": "ID",
+   "admin-campaign-create-success": "Campaign created succesfully.",
+   "admin-campaign-create-fail": "Campaign creation failed. Check logs.",
+   "admin-campaign-update-success": "Campaign updated.",
+   "admin-campaign-update-fail": "Error. Check logs.",
+
"page-of-pages": "Page $1 of $2",
"no-results": "No results found",
 
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index 279c528..86ebc0a 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -25,6 +25,23 @@
"admin-users-valid": "Table column header, is user 
valid.\n{{Identical|Valid}}",
"admin-users-viewreports": "Table column header, is user allowed to run 
reports.",
"admin-users-yes": "Table cell value indicating that true\/false value 
is true.\n\nSee also:\n* {{msg-wm|Wsa-admin-users-no}}\n{{Identical|Yes}}",
+
+
+   "admin-campaign-add": "Navigation menu item, links to form for starting 
a new campaign",
+   "admin-campaign-name": "Input label, followed by textbox",
+   "admin-campaign-end": "Table column header, end date for campagin",
+   "admin-campaign-start": "Table column header, start date for campaign",
+   "admin-campaign-start-date": "Input label, followed by textbox",
+   "admin-campaign-end-date": "Input label, followed by textbox",
+   "admin-campaign-manage": "Navigation menu item, links to form for 
starting a new campaign",
+   "admin-campaigns-add": "Navigation menu item, links to form for 
starting a new campaign",
+   "admin-campaigns-name": "Input label, followed by textbox",
+   "admin-campaigns-add": "Form submit button label",
+   "admin-campaigns-form-go": "Form submit button label.",
+   "admin-campaigns-start": "Input label, followed by textbox",
+   "admin-campaigns-end": "Input label, followed by textbox",
+   "admin-campaigns-id": "Table column header, ID of 
campaign.\n{{Identical|ID}}",
+
"change-password": "Navigation menu item, links to password change 
page.\n{{Identical|Change password}}",
"credits": "Credits page heading",
"credits-p

[MediaWiki-commits] [Gerrit] Beta: CX: Enable more language pairs - change (operations/puppet)

2015-02-19 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: Beta: CX: Enable more language pairs
..

Beta: CX: Enable more language pairs

Bug: T89337 T89240 T89635 T89934 T89911
Change-Id: Iab7de52aa5690c93edbeef5c458add2b6ce23d65
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/191849/1

diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 61db786..464a244 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -36,25 +36,35 @@
 "cxserver::registry":
   source:
 - 'ca'
+- 'de'
 - 'en'
 - 'es'
+- 'fr'
 - 'id'
+- 'kk'
 - 'ms'
 - 'nn'
 - 'no'
 - 'pt'
 - 'ru'
 - 'sv'
+- 'tr'
+- 'zh'
   target:
 - 'ca'
 - 'da'
 - 'eo'
 - 'es'
 - 'id'
+- 'it'
+- 'ja'
+- 'ky'
 - 'min'
 - 'ms'
 - 'nn'
 - 'no'
+- 'pa'
+- 'pl'
 - 'pt'
 - 'ru'
 - 'uz'

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

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

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

[MediaWiki-commits] [Gerrit] Add a campaigns report - change (wikimedia/iegreview)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Add a campaigns report
..


Add a campaigns report

Bug:T87308
Change-Id: I79b8881466b943ce1ff8d27f118fe2db719a5e88

Add a report for campaign view

Bug: T87308
Change-Id: I3e167657b878585275ff596101485bc74d3e9ad1
---
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/nav_user.html
M data/templates/proposals/search.html
M data/templates/reports/report.html
M src/App.php
M src/Controllers/Proposals/Search.php
M src/Controllers/Reports/AbstractReport.php
A src/Controllers/Reports/Campaigns.php
A src/Dao/Campaigns.php
M src/Dao/Proposals.php
M src/Dao/Reports.php
12 files changed, 380 insertions(+), 2 deletions(-)

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



diff --git a/data/i18n/en.json b/data/i18n/en.json
index 1434eae..6d81318 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -17,6 +17,7 @@
"nav-reports": "Reports",
"nav-reports-aggregated": "Aggregated scores",
"nav-reports-wikitext": "Wikitext export",
+   "nav-reports-campaigns": "Prior Campaigns",
"nav-admin": "Admin",
"nav-users": "Manage users",
"nav-account": "My Account",
@@ -155,6 +156,7 @@
"proposals-search-theme": "Theme",
"proposals-search-theme-empty": "Select theme",
"proposals-search-go": "Search",
+   "proposals-search-campaigns-empty": "Campaign",
 
"proposals-list-id": "Id",
"proposals-list-title": "Title",
@@ -180,6 +182,11 @@
"report-aggregated-recommend": "Recommend",
"report-format-recommend": "$4% ($1/$3)$2",
 
+   "report-campaign-name": "Name",
+   "report-campaign-start-date": "Start Date",
+   "report-campaign-end-date": "End Date",
+   "report-campaign-status": "Status",
+
"reviews-notes": "Reviewer notes",
 
"theme-": "No theme specified",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index 9010722..279c528 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -61,6 +61,7 @@
"nav-reports": "Navigation menu label for list of report 
pages.\n{{Identical|Report}}",
"nav-reports-aggregated": "Navigation menu label for aggregate results 
report.",
"nav-reports-wikitext": "Navigation menu label for wikitext export 
report.",
+   "nav-reports-campaigns": "Navigation menu label for current and 
previous campaigns report",
"nav-users": "Navigation menu label, links to user list page",
"new-account-email": "Email body. Parameters:\n* $1 - Account 
username\n* $2 - Acocunt password\n* $3 - URL to login page of application\n* 
$4 - URL to password change page of application",
"new-account-subject": "Email subject",
@@ -123,6 +124,11 @@
"report-aggregated-recommend": "Report column header",
"report-aggregated-theme": "Report column header",
"report-format-recommend": "Report column value.\n\n* $1 - Number of 
reviewers recommending proposal\n* $2 - \"*\" if some recommendations were 
conditional\n* $3 - Total number of reviews\n* $4 - Percentage of reviews 
recomending approval.",
+   "report-campaign-name": "Report column header",
+   "report-campaign-start-date": "Report column header",
+   "report-campaign-end-date": "Report column header",
+   "report-campaign-status": "Report column header",
+   "proposals-search-campaigns-empty": "Select list usage prompt.",
"reports-wikitext-go": "Form submit button label.",
"review-ability": "Section header",
"review-ability-instructions": "Wikitext formatted section help.",
diff --git a/data/templates/nav_user.html b/data/templates/nav_user.html
index de28541..3875e2f 100644
--- a/data/templates/nav_user.html
+++ b/data/templates/nav_user.html
@@ -18,6 +18,7 @@
   {{ 
'nav-reports'|message }} 
   
 {{ 
'nav-reports-aggregated'|message }}
+{{ 
'nav-reports-campaigns'|message }}
 {{ 
'nav-reports-wikitext'|message }}
   
 
diff --git a/data/templates/proposals/search.html 
b/data/templates/proposals/search.html
index f11dbf0..2955c6c 100644
--- a/data/templates/proposals/search.html
+++ b/data/templates/proposals/search.html
@@ -23,10 +23,22 @@
 
 
   
+
+  
+{{ 'campaigns-search-title'|message 
}}
+
+  {{ 'proposals-search-campaigns-empty'|message 
}}
+  {% for id, name in campaigns %}
+{{ name }}
+  {% endfor %}
+
+  
+
   
 {{ 'proposals-search-title'|message 
}}
 
   
+
   
 {{ 'proposals-search-theme'|message 
}}
 
@@ -36,6 +48,7 @@
   {% endfor %}
 
   
+
   
 
   
diff --git a/data/templates/reports/report.html 
b/data/templates/reports/report.html
index bce35b2..af1b759 100644
--- a/data/templates/reports/report.html
+++ b/data/templates/reports/report.html
@@ -49,6 +49,10 @@
   {% set vals = vals|merge( [ row[key] ] ) %}
   {% endfor %}
   {{ spec.message|

[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Sync parserTests with core
..


Sync parserTests with core

 * This matches upstream core commit
 60ad62b807d795aecd52f946eaa58a9e50cf9f2c

 * A whole lot of noise is introduced by
 I562e437ec0bd337c9db0406f5dcab504dfa37034
   where section headers now generate an anchor.

   Here we strip those anchors when normalizing html to avoid any
   artificial failures. We do likewise for wt-headline spans.

   The rest of the busy changes are tests starting at html that probably
   should have the input itself normalized or it'll never match.

 * There's also a new tests from
 Id0a55aa4c1917bac2f8f0d4863fcb85bd3dff1ca
   that we don't pass.

Change-Id: I75dad9995e173d0bd9ef106ac6574d1e3ef42fbc
---
M lib/mediawiki.DOMUtils.js
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.js
M tests/parserTests.txt
5 files changed, 277 insertions(+), 227 deletions(-)

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




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

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

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

[MediaWiki-commits] [Gerrit] Fixed suggestion box alignment on activation of fixed header - change (mediawiki...VectorBeta)

2015-02-19 Thread Phoenix303 (Code Review)

Phoenix303 has uploaded a new change for review.

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

Change subject: Fixed suggestion box alignment on activation of fixed header
..

Fixed suggestion box alignment on activation of fixed header

Bug: T88150
Change-Id: I174ae8d8d3cc3e9e5949125418f30d800c89ed09
---
M resources/fixedHeader/header.js
M resources/fixedHeader/search-suggestions.less
2 files changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/resources/fixedHeader/header.js b/resources/fixedHeader/header.js
index 49aa3ff..03467ac 100644
--- a/resources/fixedHeader/header.js
+++ b/resources/fixedHeader/header.js
@@ -8,4 +8,5 @@
}
}
$( window ).on( 'scroll', $.debounce( 0, goPositionFixed ) );
+   mw.hook( 'ext.fixedheader.searchSuggest' ).fire();
 } );
diff --git a/resources/fixedHeader/search-suggestions.less 
b/resources/fixedHeader/search-suggestions.less
index 6e921f5..bb4455b 100644
--- a/resources/fixedHeader/search-suggestions.less
+++ b/resources/fixedHeader/search-suggestions.less
@@ -1,12 +1,12 @@
 @import '../variables-beta';
 
-.suggestions-results,
-.suggestions,
-.suggestions-special {
+.search-suggestions .suggestions-results,
+.search-suggestions,
+.search-suggestions .suggestions-special {
border: none;
 }
 
-.suggestions {
+.search-suggestions {
// Override 13px default in inline style (yuk)
font-size: 1em !important;
position: fixed !important;
@@ -40,7 +40,7 @@
 }
 
 @media screen and (min-width: 768px) {
-   .suggestions {
+   .search-suggestions {
// Add the border and the height of the header to get the top 
position
top: @header-height !important;
}

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

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

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

[MediaWiki-commits] [Gerrit] Fixed suggestion box alignment on activation of fixed header - change (mediawiki/core)

2015-02-19 Thread Phoenix303 (Code Review)

Phoenix303 has uploaded a new change for review.

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

Change subject: Fixed suggestion box alignment on activation of fixed header
..

Fixed suggestion box alignment on activation of fixed header

Bug: T88150
Change-Id: Iadc635cd1e93f5c61322fdfc5774112393d8e67b
---
M resources/src/mediawiki/mediawiki.searchSuggest.js
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/191847/1

diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js 
b/resources/src/mediawiki/mediawiki.searchSuggest.js
index 7b7ccf3..c616f70 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -163,6 +163,14 @@
// each skin or adding more stylesheets, just copy it 
from the active element so auto-fit.
.each( function () {
var $this = $( this );
+   if( $searchInput[0] === $this[0] ){
+   mw.hook( 
'ext.fixedheader.searchSuggest' ).add( function () {
+   $this
+   .data( 
'suggestions-context' )
+   .data.$container
+   .addClass( 
'search-suggestions' );
+   } );
+   }
$this
.data( 'suggestions-context' )
.data.$container

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

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

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

[MediaWiki-commits] [Gerrit] Add txt2yaml - change (operations/software)

2015-02-19 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Add txt2yaml
..

Add txt2yaml

txt2yaml is a tiny utility to convert line-oriented text files or
pipes to YAML arrays and insert/replace them in (existing) YAML
documents.  In Unix fashion, multiple invocations can be chained to
update multiple keys:

| $ txt2yaml key_1 file_1.txt < yaml.old |
| > txt2yaml key_2 file_2.txt|
| > txt2yaml key_3 file_3.txt > yaml.new

Change-Id: Id8b91cabe60249aa354b459f0d4fa4fa3ca9745f
---
A txt2yaml/txt2yaml.py
1 file changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/46/191846/1

diff --git a/txt2yaml/txt2yaml.py b/txt2yaml/txt2yaml.py
new file mode 100755
index 000..6aebde3
--- /dev/null
+++ b/txt2yaml/txt2yaml.py
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+
+import argparse
+import sys
+import yaml
+
+def main():
+# Parse command line arguments.
+parser = argparse.ArgumentParser(description='Convert text file to YAML.')
+parser.add_argument('key', metavar='KEY', help='key to insert/replace')
+parser.add_argument('file', metavar='FILE', help='text file to read')
+args = parser.parse_args()
+
+# Read YAML from stdin.
+y = yaml.load(sys.stdin)
+
+# Read text file.
+with open(args.file, 'r') as f:
+y[args.key] = map(lambda line: line.rstrip('\n'), f.readlines())
+
+# Write amended YAML to stdout.
+yaml.dump(y, sys.stdout)
+
+if __name__ == '__main__':
+main()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8b91cabe60249aa354b459f0d4fa4fa3ca9745f
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
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] [WIP] Limit trigger for section anchors to text - change (mediawiki/core)

2015-02-19 Thread Wctaiwan (Code Review)

Wctaiwan has uploaded a new change for review.

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

Change subject: [WIP] Limit trigger for section anchors to text
..

[WIP] Limit trigger for section anchors to text

Make it so that only hovering over the header text itself triggers
section anchors, rather than anywhere on the line.

I need help with updating the parser tests.

Bug: T18691
Change-Id: I49aea8ffb8662b9c3e860b72cad77d33e9839d07
---
M includes/Linker.php
M resources/src/mediawiki/mediawiki.sectionAnchor.css
2 files changed, 3 insertions(+), 12 deletions(-)


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

diff --git a/includes/Linker.php b/includes/Linker.php
index ae8695b..2d11d1b 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1751,6 +1751,7 @@
$link, $legacyAnchor = false
) {
$ret = ""
. Html::element( 'a',
array(
'href' => '#' . $anchor,
@@ -1760,6 +1761,7 @@
wfMessage( 'section-symbol' )->text()
)
. "$html"
+   . ""
. $link
. "";
if ( $legacyAnchor !== false ) {
diff --git a/resources/src/mediawiki/mediawiki.sectionAnchor.css 
b/resources/src/mediawiki/mediawiki.sectionAnchor.css
index 1a8fe0a..730f383 100644
--- a/resources/src/mediawiki/mediawiki.sectionAnchor.css
+++ b/resources/src/mediawiki/mediawiki.sectionAnchor.css
@@ -42,18 +42,7 @@
 color: #000;
 }
 
-.mw-body h1:hover .mw-headline-anchor,
-.mw-body h2:hover .mw-headline-anchor,
-.mw-body h3:hover .mw-headline-anchor,
-.mw-body h4:hover .mw-headline-anchor,
-.mw-body h5:hover .mw-headline-anchor,
-.mw-body h6:hover .mw-headline-anchor,
-.mw-body h1:focus .mw-headline-anchor,
-.mw-body h2:focus .mw-headline-anchor,
-.mw-body h3:focus .mw-headline-anchor,
-.mw-body h4:focus .mw-headline-anchor,
-.mw-body h5:focus .mw-headline-anchor,
-.mw-body h6:focus .mw-headline-anchor {
+.mw-headline-wrapper:hover .mw-headline-anchor {
 filter: alpha(opacity=100);
 opacity: 1;
 }

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

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

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

[MediaWiki-commits] [Gerrit] Removed doCascadeProtectionUpdates method to avoid DB writes... - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Removed doCascadeProtectionUpdates method to avoid DB writes on 
page views
..


Removed doCascadeProtectionUpdates method to avoid DB writes on page views

* Use special prioritized refreshLinksJobs instead, which triggers when
  transcluded pages are changed
* Also added a triggerOpportunisticLinksUpdate() method to handle
  dynamic transcludes

bug: T89389
Change-Id: I8e5a6ddb643c12e0fb5c1c68bc83f912944e6e8d
---
M includes/DefaultSettings.php
M includes/cache/BacklinkCache.php
M includes/deferred/HTMLCacheUpdate.php
M includes/deferred/LinksUpdate.php
M includes/jobqueue/jobs/RefreshLinksJob.php
M includes/page/Article.php
M includes/page/WikiPage.php
M includes/parser/ParserOutput.php
M includes/poolcounter/PoolWorkArticleView.php
9 files changed, 103 insertions(+), 61 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d4cdf9e..bddccec 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6422,6 +6422,7 @@
'PublishStashedFile' => 'PublishStashedFileJob',
'ThumbnailRender' => 'ThumbnailRenderJob',
'recentChangesUpdate' => 'RecentChangesUpdateJob',
+   'refreshLinksPrioritized' => 'RefreshLinksJob', // for cascading 
protection
'null' => 'NullJob'
 );
 
diff --git a/includes/cache/BacklinkCache.php b/includes/cache/BacklinkCache.php
index c6d9a18..c3aefc5 100644
--- a/includes/cache/BacklinkCache.php
+++ b/includes/cache/BacklinkCache.php
@@ -487,4 +487,45 @@
 
return array( 'numRows' => $numRows, 'batches' => $batches );
}
+
+   /**
+* Get a Title iterator for cascade-protected template/file use 
backlinks
+*
+* @return TitleArray
+* @since 1.25
+*/
+   public function getCascadeProtectedLinks() {
+   // This method is used to make redudant jobs anyway, so its OK 
to use
+   // a slave. Also, the set of cascade protected pages tends to 
be stable.
+   $dbr = $this->getDB();
+
+   $queries = array();
+   // @note: UNION filters any duplicate pages
+   $queries[] = $dbr->selectSQLText(
+   array( 'templatelinks', 'page_restrictions', 'page' ),
+   array( 'page_namespace', 'page_title', 'page_id' ),
+   array(
+   'tl_namespace' => $this->title->getNamespace(),
+   'tl_title' => $this->title->getDBkey(),
+   'tl_from = pr_page',
+   'pr_cascade' => 1,
+   'page_id = tl_from'
+   )
+   );
+   $queries[] = $dbr->selectSQLText(
+   array( 'imagelinks', 'page_restrictions', 'page' ),
+   array( 'page_namespace', 'page_title', 'page_id' ),
+   array(
+   'il_to' => $this->title->getDBkey(),
+   'il_from = pr_page',
+   'pr_cascade' => 1,
+   'page_id = il_from'
+   )
+   );
+
+   return TitleArray::newFromResult( $dbr->query(
+   $dbr->unionQueries( $queries, false ),
+   __METHOD__
+   ) );
+   }
 }
diff --git a/includes/deferred/HTMLCacheUpdate.php 
b/includes/deferred/HTMLCacheUpdate.php
index e02cfbc..862ac27 100644
--- a/includes/deferred/HTMLCacheUpdate.php
+++ b/includes/deferred/HTMLCacheUpdate.php
@@ -43,7 +43,6 @@
}
 
public function doUpdate() {
-
$job = new HTMLCacheUpdateJob(
$this->mTitle,
array(
@@ -63,6 +62,5 @@
$job->run(); // just do the purge query now
} );
}
-
}
 }
diff --git a/includes/deferred/LinksUpdate.php 
b/includes/deferred/LinksUpdate.php
index 9c377df..e4f00e7 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -228,12 +228,24 @@
 * Which means do LinksUpdate on all pages that include the current 
page,
 * using the job queue.
 */
-   function queueRecursiveJobs() {
+   protected function queueRecursiveJobs() {
self::queueRecursiveJobsForTable( $this->mTitle, 
'templatelinks' );
if ( $this->mTitle->getNamespace() == NS_FILE ) {
// Process imagelinks in case the title is or was a 
redirect
self::queueRecursiveJobsForTable( $this->mTitle, 
'imagelinks' );
}
+
+   $bc = $this->mTitle-

[MediaWiki-commits] [Gerrit] Error: Fix function name - change (oojs/ui)

2015-02-19 Thread Code Review

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

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

Change subject: Error: Fix function name
..

Error: Fix function name

Change-Id: I372c2904cf61bede5742a2d8badc073560537f14
---
M src/Error.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/44/191844/1

diff --git a/src/Error.js b/src/Error.js
index 4ef4231..93f4166 100644
--- a/src/Error.js
+++ b/src/Error.js
@@ -7,7 +7,7 @@
  * @cfg {boolean} [recoverable=true] Error is recoverable
  * @cfg {boolean} [warning=false] Whether this error is a warning or not.
  */
-OO.ui.Error = function OoUiElement( message, config ) {
+OO.ui.Error = function OoUiError( message, config ) {
// Configuration initialization
config = config || {};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I372c2904cf61bede5742a2d8badc073560537f14
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Added grammar forms for Wikimedia Commons for Ukrainian - change (mediawiki...WikimediaMessages)

2015-02-19 Thread Base (Code Review)

Base has uploaded a new change for review.

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

Change subject: Added grammar forms for Wikimedia Commons for Ukrainian
..

Added grammar forms for Wikimedia Commons for Ukrainian

Change-Id: I827026fabeaef77123908bec28fcb05ffd397d6a
---
M WikimediaGrammarForms.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/WikimediaGrammarForms.php b/WikimediaGrammarForms.php
index 6d6c13a..42fe643 100644
--- a/WikimediaGrammarForms.php
+++ b/WikimediaGrammarForms.php
@@ -901,6 +901,7 @@
'genitive' => array(
'Вікіпедія' => 'Вікіпедії',
'Вікісловник' => 'Вікісловника',
+   'Вікісховище' => 'Вікісховища',
'Вікіпідручник' => 'Вікіпідручника',
'Вікіцитати' => 'Вікіцитат',
'Вікіджерела' => 'Вікіджерел',
@@ -912,6 +913,7 @@
'dative' => array(
'Вікіпедія' => 'Вікіпедії',
'Вікісловник' => 'Вікісловнику',
+   'Вікісховище' => 'Вікісховищу',
'Вікіпідручник' => 'Вікіпідручнику',
'Вікіцитати' => 'Вікіцитатам',
'Вікіджерела' => 'Вікіджерелам',
@@ -923,6 +925,7 @@
'accusative' => array(
'Вікіпедія' => 'Вікіпедію',
'Вікісловник' => 'Вікісловник',
+   'Вікісховище' => 'Вікісховище',
'Вікіпідручник' => 'Вікіпідручник',
'Вікіцитати' => 'Вікіцитати',
'Вікіджерела' => 'Вікіджерела',
@@ -934,6 +937,7 @@
'instrumental' => array(
'Вікіпедія' => 'Вікіпедією',
'Вікісловник' => 'Вікісловником',
+   'Вікісховище' => 'Вікісховищем',
'Вікіпідручник' => 'Вікіпідручником',
'Вікіцитати' => 'Вікіцитатами',
'Вікіджерела' => 'Вікіджерелами',
@@ -945,6 +949,7 @@
'locative' => array(
'Вікіпедія' => 'у Вікіпедії',
'Вікісловник' => 'у Вікісловнику',
+   'Вікісховище' => 'у Вікісховищі',
'Вікіпідручник' => 'у Вікіпідручнику',
'Вікіцитати' => 'у Вікіцитатах',
'Вікіджерела' => 'у Вікіджерелах',
@@ -956,6 +961,7 @@
'vocative' => array(
'Вікіпедія' => 'Вікіпедіє',
'Вікісловник' => 'Вікісловнику',
+   'Вікісховище' => 'Вікісховище',
'Вікіпідручник' => 'Вікіпідручнику',
'Вікіцитати' => 'Вікіцитати',
'Вікіджерела' => 'Вікіджерела',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I827026fabeaef77123908bec28fcb05ffd397d6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Base 

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

[MediaWiki-commits] [Gerrit] Move "mediawiki::users::web" to www-data on silver. - change (operations/puppet)

2015-02-19 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Move "mediawiki::users::web" to www-data on silver.
..


Move "mediawiki::users::web" to www-data on silver.

Change-Id: I8e862b49712791f8469809b5419555bb9fd1c5e9
---
A hieradata/hosts/silver.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/silver.yaml b/hieradata/hosts/silver.yaml
new file mode 100644
index 000..d278b6b
--- /dev/null
+++ b/hieradata/hosts/silver.yaml
@@ -0,0 +1 @@
+mediawiki::users::web: www-data

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e862b49712791f8469809b5419555bb9fd1c5e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move "mediawiki::users::web" to www-data on silver. - change (operations/puppet)

2015-02-19 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Move "mediawiki::users::web" to www-data on silver.
..

Move "mediawiki::users::web" to www-data on silver.

Change-Id: I8e862b49712791f8469809b5419555bb9fd1c5e9
---
A hieradata/hosts/silver.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/silver.yaml b/hieradata/hosts/silver.yaml
new file mode 100644
index 000..d278b6b
--- /dev/null
+++ b/hieradata/hosts/silver.yaml
@@ -0,0 +1 @@
+mediawiki::users::web: www-data

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

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

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

[MediaWiki-commits] [Gerrit] Element.php: Add "text" configuration option - change (oojs/ui)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Element.php: Add "text" configuration option
..


Element.php: Add "text" configuration option

This makes the PHP API better match the JS API, even though it's a little
redundant on the PHP side.

Change-Id: I085e6a72a15eb31f58177201f2b088b16ccf27b7
---
M php/Element.php
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/php/Element.php b/php/Element.php
index f327154..e7a509c 100644
--- a/php/Element.php
+++ b/php/Element.php
@@ -51,8 +51,10 @@
 * @param array $config Configuration options
 * @param string[] $config['classes'] CSS class names to add
 * @param string $config['id'] HTML id attribute
-* @param array $config['content'] Content to append, strings or 
Element objects. Strings will
-*   be HTML-escaped for output, use a HtmlSnippet instance to prevent 
that.
+* @param string $config['text'] Text to insert
+* @param array $config['content'] Content to append (after text), 
strings
+*   or Element objects. Strings will be HTML-escaped for output, use an
+*   HtmlSnippet instance to prevent that.
 * @param Mixed $config['data'] Element data
 */
public function __construct( array $config = array() ) {
@@ -69,6 +71,10 @@
if ( isset( $config['id'] ) ) {
$this->setAttributes( array( 'id' => $config['id'] ) );
}
+   if ( isset( $config['text'] ) ) {
+   // JS compatibility
+   $this->appendContent( $config['text'] );
+   }
if ( isset( $config['content'] ) ) {
$this->appendContent( $config['content'] );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I085e6a72a15eb31f58177201f2b088b16ccf27b7
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Cscott 
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 '$: this.$' from code examples - change (oojs/ui)

2015-02-19 Thread Code Review

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

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

Change subject: Remove '$: this.$' from code examples
..

Remove '$: this.$' from code examples

Change-Id: I4dca9c49412e07bf8dd66401a483af6fcbcfe032
---
M src/ActionSet.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/40/191840/1

diff --git a/src/ActionSet.js b/src/ActionSet.js
index e3c2759..1d23999 100644
--- a/src/ActionSet.js
+++ b/src/ActionSet.js
@@ -20,9 +20,9 @@
  *
  * ProcessDialog.prototype.initialize = function () {
  * ProcessDialog.super.prototype.initialize.apply( this, arguments );
- * this.panel1 = new OO.ui.PanelLayout( { $: this.$, padded: true, 
expanded: false } );
+ * this.panel1 = new OO.ui.PanelLayout( { padded: true, expanded: 
false } );
  * this.panel1.$element.append( 'This dialog uses an action set 
(continue, help, cancel, back) configured with modes. This is edit mode. Click 
\'help\' to see help mode. ' );
- * this.panel2 = new OO.ui.PanelLayout( { $: this.$, padded: true, 
expanded: false } );
+ * this.panel2 = new OO.ui.PanelLayout( { padded: true, expanded: 
false } );
  * this.panel2.$element.append( 'This is help mode. Only the 
\'back\' action widget is configured to be visible here. Click \'back\' to 
return to \'edit\' mode' );
  * this.stackLayout= new OO.ui.StackLayout( {
  * items: [ this.panel1, this.panel2 ]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dca9c49412e07bf8dd66401a483af6fcbcfe032
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Prefer OO.isPlainObject to $.isPlainObject - change (oojs/ui)

2015-02-19 Thread Code Review

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

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

Change subject: Prefer OO.isPlainObject to $.isPlainObject
..

Prefer OO.isPlainObject to $.isPlainObject

Change-Id: I49a7148f3d36d949138baf8032dd09b4b22b0a2c
---
M src/WindowManager.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/41/191841/1

diff --git a/src/WindowManager.js b/src/WindowManager.js
index 28ebb11..7600a41 100644
--- a/src/WindowManager.js
+++ b/src/WindowManager.js
@@ -479,7 +479,7 @@
}
list[ name ] = windows[ i ];
}
-   } else if ( $.isPlainObject( windows ) ) {
+   } else if ( OO.isPlainObject( windows ) ) {
list = windows;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49a7148f3d36d949138baf8032dd09b4b22b0a2c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Adding TemplateParser class providing interface to Mustache ... - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Adding TemplateParser class providing interface to Mustache 
templates
..


Adding TemplateParser class providing interface to Mustache templates

The TemplateParser class provides a server-side interface to cachable
dynamically-compiled Mustache templates. It currently uses the
lightncandy library to do compilation (which is already included in
the vendor repo).

Also converting NoLocalSettings.php to use it as a proof-of-concept.

Bug: T379
Change-Id: I28cd13d4d1132bd386e2ae2f4f0d1dd88ad9162b
---
M RELEASE-NOTES-1.25
M autoload.php
A includes/NoLocalSettings.php
A includes/TemplateParser.php
M includes/WebStart.php
A includes/templates/NoLocalSettings.mustache
D includes/templates/NoLocalSettings.php
A tests/phpunit/includes/TemplateParserTest.php
8 files changed, 311 insertions(+), 99 deletions(-)

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



diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 10e49ae..6d816fe 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -99,6 +99,8 @@
   tags.
 * Added 'ChangeTagsListActive' hook, to separate the concepts of "defined" and
   "active" formerly conflated by the 'ListDefinedTags' hook.
+* Added TemplateParser class that provides a server-side interface to cachable
+  dynamically-compiled Mustache templates (currently uses lightncandy library).
 * Clickable anchors for each section heading in the content are now generated
   and appear in the gutter on hovering over the heading.
 
diff --git a/autoload.php b/autoload.php
index 01dba44..bdfbee2 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1180,6 +1180,7 @@
'TablePager' => __DIR__ . '/includes/pager/TablePager.php',
'TempFSFile' => __DIR__ . '/includes/filebackend/TempFSFile.php',
'TempFileRepo' => __DIR__ . '/includes/filerepo/FileRepo.php',
+   'TemplateParser' => __DIR__ . '/includes/TemplateParser.php',
'TestFileOpPerformance' => __DIR__ . '/maintenance/fileOpPerfTest.php',
'TextContent' => __DIR__ . '/includes/content/TextContent.php',
'TextContentHandler' => __DIR__ . 
'/includes/content/TextContentHandler.php',
diff --git a/includes/NoLocalSettings.php b/includes/NoLocalSettings.php
new file mode 100644
index 000..6de9bfc
--- /dev/null
+++ b/includes/NoLocalSettings.php
@@ -0,0 +1,63 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+# bug 30219 : can not use pathinfo() on URLs since slashes do not match
+$matches = array();
+$ext = 'php';
+$path = '/';
+foreach ( array_filter( explode( '/', $_SERVER['PHP_SELF'] ) ) as $part ) {
+   if ( !preg_match( '/\.(php5?)$/', $part, $matches ) ) {
+   $path .= "$part/";
+   } else {
+   $ext = $matches[1] == 'php5' ? 'php5' : 'php';
+   break;
+   }
+}
+
+# Check to see if the installer is running
+if ( !function_exists( 'session_name' ) ) {
+   $installerStarted = false;
+} else {
+   session_name( 'mw_installer_session' );
+   $oldReporting = error_reporting( E_ALL & ~E_NOTICE );
+   $success = session_start();
+   error_reporting( $oldReporting );
+   $installerStarted = ( $success && isset( $_SESSION['installData'] ) );
+}
+
+$templateParser = new TemplateParser();
+
+# Render error page if no LocalSettings file can be found
+try {
+   echo $templateParser->processTemplate(
+   'NoLocalSettings',
+   array(
+   'wgVersion' => ( isset( $wgVersion ) ? $wgVersion : 
'VERSION' ),
+   'path' => $path,
+   'ext' => $ext,
+   'localSettingsExists' => file_exists( MW_CONFIG_FILE ),
+   'installerStarted' => $installerStarted
+   )
+   );
+} catch ( Exception $e ) {
+   echo 'Error: ' . htmlspecialchars( $e->getMessage() );
+}
diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
new file mode 100644
index 000..57fcc24
--- /dev/null
+++ b/includes/TemplateParser.php
@@ -0,0 +1,175 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+class TemplateParser {
+   /**
+* @var string The path to the Mustache templates
+*/
+   protected $templateDir;
+
+   /**
+* @var callable[] Array of cached rendering functions
+*/
+   protected $renderers;
+
+   /**
+* @var bool Always compile template files
+*/
+   protected $forceRecompile = false;
+
+   /**
+* @param string $templateDir
+* @param boolean $forceRecompile
+*/
+   public function __construct( $templateDir = null, $forceRecompile = 
false ) {
+   $this->templateDir = $templateDir ? $templateDir : 
__DIR__.'/templates';
+   $this->forceRecompile = $forceRecompile;
+   }
+
+   /**
+* Construc

[MediaWiki-commits] [Gerrit] Element.php: Add "data" property - change (oojs/ui)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Element.php: Add "data" property
..


Element.php: Add "data" property

This makes the PHP API match the JS API.  The Element data isn't terribly
useful on the PHP side at the moment, but after T74716 allows us to
create JS widgets corresponding to PHP widgets this will allow us to
pass information from server-side to client-side.

Change-Id: I5261784081cb395747b2f5289b53baf2b7f50d3f
---
M php/Element.php
1 file changed, 31 insertions(+), 0 deletions(-)

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



diff --git a/php/Element.php b/php/Element.php
index 35ab53a..f327154 100644
--- a/php/Element.php
+++ b/php/Element.php
@@ -32,6 +32,13 @@
/* Members */
 
/**
+* Element data.
+*
+* @var mixed
+*/
+   protected $data = null;
+
+   /**
 * Mixins.
 *
 * @var array List mixed in objects.
@@ -46,12 +53,16 @@
 * @param string $config['id'] HTML id attribute
 * @param array $config['content'] Content to append, strings or 
Element objects. Strings will
 *   be HTML-escaped for output, use a HtmlSnippet instance to prevent 
that.
+* @param Mixed $config['data'] Element data
 */
public function __construct( array $config = array() ) {
// Parent constructor
parent::__construct( $this->getTagName() );
 
// Initialization
+   if ( isset( $config['data'] ) ) {
+   $this->setData( $config['data'] );
+   }
if ( isset( $config['classes'] ) && is_array( 
$config['classes'] ) ) {
$this->addClasses( $config['classes'] );
}
@@ -124,6 +135,26 @@
}
 
/**
+* Get element data.
+*
+* @return {Mixed} Element data
+*/
+   public function getData() {
+   return $this->data;
+   }
+
+   /**
+* Set element data.
+*
+* @param {Mixed} Element data
+* @chainable
+*/
+   public function setData( $data ) {
+   $this->data = $data;
+   return $this;
+   }
+
+   /**
 * Check if element supports one or more methods.
 *
 * @param string|string[] $methods Method or list of methods to check

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5261784081cb395747b2f5289b53baf2b7f50d3f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fc92e5a..f55d346 - change (mediawiki/extensions)

2015-02-19 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: fc92e5a..f55d346
..


Syncronize VisualEditor: fc92e5a..f55d346

Change-Id: I5a77cdad6a4c6c31e707894d16ee5598e5c3223d
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index fc92e5a..f55d346 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit fc92e5aaf8d44c6b5d5842ed0accebd4b91bf58e
+Subproject commit f55d346148eb22861eb86883d6d4c60f77c4e1d8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a77cdad6a4c6c31e707894d16ee5598e5c3223d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fc92e5a..f55d346 - change (mediawiki/extensions)

2015-02-19 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: fc92e5a..f55d346
..

Syncronize VisualEditor: fc92e5a..f55d346

Change-Id: I5a77cdad6a4c6c31e707894d16ee5598e5c3223d
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index fc92e5a..f55d346 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit fc92e5aaf8d44c6b5d5842ed0accebd4b91bf58e
+Subproject commit f55d346148eb22861eb86883d6d4c60f77c4e1d8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a77cdad6a4c6c31e707894d16ee5598e5c3223d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (c65f3bd) - change (mediawiki...VisualEditor)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Update VE core submodule to master (c65f3bd)
..


Update VE core submodule to master (c65f3bd)

New changes:
8b7d159 Separate out toolbar attachment in overridable method
a167a45 Prevent the default action for uncollapsed linear delete
c65f3bd Localisation updates from https://translatewiki.net.

Change-Id: I3b01db40a51ddd652a932848398b825d9ac39c2b
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index a7cd696..c65f3bd 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit a7cd696ed56d256f9c65d2b3e3287a93ecfe3e43
+Subproject commit c65f3bda73c310f27f7caeecb9e5595630ae1c43

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b01db40a51ddd652a932848398b825d9ac39c2b
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] Update VE core submodule to master (c65f3bd) - change (mediawiki...VisualEditor)

2015-02-19 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Update VE core submodule to master (c65f3bd)
..

Update VE core submodule to master (c65f3bd)

New changes:
8b7d159 Separate out toolbar attachment in overridable method
a167a45 Prevent the default action for uncollapsed linear delete
c65f3bd Localisation updates from https://translatewiki.net.

Change-Id: I3b01db40a51ddd652a932848398b825d9ac39c2b
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index a7cd696..c65f3bd 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit a7cd696ed56d256f9c65d2b3e3287a93ecfe3e43
+Subproject commit c65f3bda73c310f27f7caeecb9e5595630ae1c43

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b01db40a51ddd652a932848398b825d9ac39c2b
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] Syncronize VisualEditor: 888b5eb..fc92e5a - change (mediawiki/extensions)

2015-02-19 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 888b5eb..fc92e5a
..

Syncronize VisualEditor: 888b5eb..fc92e5a

Change-Id: I44451396a197a85e1f47598195eadbf9c3245f2f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 888b5eb..fc92e5a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 888b5eb88923365fe3d097d81d26fa704401c4e1
+Subproject commit fc92e5aaf8d44c6b5d5842ed0accebd4b91bf58e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44451396a197a85e1f47598195eadbf9c3245f2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Made TransactionProfiler log regardless of Profiler - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Made TransactionProfiler log regardless of Profiler
..


Made TransactionProfiler log regardless of Profiler

* Also avoid the use of slow closures for profiling

Change-Id: Id437e39038fd9ba80b899329a61e9f14229481f2
---
M includes/db/Database.php
1 file changed, 21 insertions(+), 29 deletions(-)

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



diff --git a/includes/db/Database.php b/includes/db/Database.php
index 8fa10a6..8ce7f3f 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1121,24 +1121,21 @@
$this->mServer, $this->mDBname, 
$this->mTrxShortId );
}
 
-   $queryProf = '';
-   $totalProf = '';
$isMaster = !is_null( $this->getLBInfo( 'master' ) );
+   # generalizeSQL will probably cut down the query to reasonable
+   # logging size most of the time. The substr is really just a 
sanity check.
+   if ( $isMaster ) {
+   $queryProf = 'query-m: ' . substr( 
DatabaseBase::generalizeSQL( $sql ), 0, 255 );
+   $totalProf = 'DatabaseBase::query-master';
+   } else {
+   $queryProf = 'query: ' . substr( 
DatabaseBase::generalizeSQL( $sql ), 0, 255 );
+   $totalProf = 'DatabaseBase::query';
+   }
+   # Include query transaction state
+   $queryProf .= $this->mTrxShortId ? " 
[TRX#{$this->mTrxShortId}]" : "";
 
$profiler = Profiler::instance();
if ( !$profiler instanceof ProfilerStub ) {
-   # generalizeSQL will probably cut down the query to 
reasonable
-   # logging size most of the time. The substr is really 
just a sanity check.
-   if ( $isMaster ) {
-   $queryProf = 'query-m: ' . substr( 
DatabaseBase::generalizeSQL( $sql ), 0, 255 );
-   $totalProf = 'DatabaseBase::query-master';
-   } else {
-   $queryProf = 'query: ' . substr( 
DatabaseBase::generalizeSQL( $sql ), 0, 255 );
-   $totalProf = 'DatabaseBase::query';
-   }
-   # Include query transaction state
-   $queryProf .= $this->mTrxShortId ? " 
[TRX#{$this->mTrxShortId}]" : "";
-
$totalProfSection = $profiler->scopedProfileIn( 
$totalProf );
$queryProfSection = $profiler->scopedProfileIn( 
$queryProf );
}
@@ -1162,22 +1159,12 @@
throw new DBUnexpectedError( $this, "DB connection was 
already closed." );
}
 
-   # Log the query time and feed it into the DB trx profiler
-   if ( $queryProf != '' ) {
-   $that = $this;
-   $queryStartTime = microtime( true );
-   $queryProfile = new ScopedCallback(
-   function () use ( $that, $queryStartTime, 
$queryProf, $isWriteQuery ) {
-   $n = $that->affectedRows();
-   $trxProf = 
Profiler::instance()->getTransactionProfiler();
-   $trxProf->recordQueryCompletion(
-   $queryProf, $queryStartTime, 
$isWriteQuery, $n );
-   }
-   );
-   }
-
# Do the query and handle errors
+   $startTime = microtime( true );
$ret = $this->doQuery( $commentedSql );
+   # Log the query time and feed it into the DB trx profiler
+   $profiler->getTransactionProfiler()->recordQueryCompletion(
+   $queryProf, $startTime, $isWriteQuery, 
$this->affectedRows() );
 
MWDebug::queryTime( $queryId );
 
@@ -1204,7 +1191,11 @@
$this->reportQueryError( $lastError, 
$lastErrno, $sql, $fname, $tempIgnore );
} else {
# Should be safe to silently retry (no 
trx and thus no callbacks)
+   $startTime = microtime( true );
$ret = $this->doQuery( $commentedSql );
+   # Log the query time and feed it into 
the DB trx profiler
+   
$profiler->getTransactionProfiler()->recordQueryCompletion(
+   $queryProf, $startTime, 
$isWriteQuery, $this->affectedRows() );
}
} else

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 888b5eb..fc92e5a - change (mediawiki/extensions)

2015-02-19 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 888b5eb..fc92e5a
..


Syncronize VisualEditor: 888b5eb..fc92e5a

Change-Id: I44451396a197a85e1f47598195eadbf9c3245f2f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 888b5eb..fc92e5a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 888b5eb88923365fe3d097d81d26fa704401c4e1
+Subproject commit fc92e5aaf8d44c6b5d5842ed0accebd4b91bf58e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44451396a197a85e1f47598195eadbf9c3245f2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (a7cd696) - change (mediawiki...VisualEditor)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Update VE core submodule to master (a7cd696)
..


Update VE core submodule to master (a7cd696)

New changes:
181561b Support generic data transfer handlers
ecdb379 Only replace selection when we know it has changed
afb37fd Remove some errant references to MediaWiki/Parsoid that don't belong
82f57e0 Update OOjs UI to v0.8.0
489ff8a Simplify AlignableNode by inheriting from ClassAttributeNode
bac7e30 Try html/plain text drop if no file handlers found

Change-Id: Id75692418c331191ea638128fe835350e334837d
---
M .docs/categories.json
M .docs/config.json
M .docs/eg-iframe.html
M VisualEditor.php
M extension.json
M lib/ve
6 files changed, 9 insertions(+), 2 deletions(-)

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



diff --git a/.docs/categories.json b/.docs/categories.json
index 16b981e..5de97ac 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -123,6 +123,7 @@
"ve.ui.DebugBar",
"ve.ui.Trigger",
"ve.ui.*TransferHandler",
+   "ve.ui.DataTransferItem",
"ve.ui.*Action",
"ve.ui.*Command",
"ve.ui.*Factory",
diff --git a/.docs/config.json b/.docs/config.json
index e30b787..38597c6 100644
--- a/.docs/config.json
+++ b/.docs/config.json
@@ -6,7 +6,7 @@
"--warnings": ["-nodoc(class,public)"],
"--builtin-classes": true,
"--warnings-exit-nonzero": true,
-   "--external": 
"HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File",
+   "--external": 
"HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File,DataTransferItem",
"--output": "../docs",
"--": [
"./external.js",
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 82fcd6a..89a5c97 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -5,7 +5,7 @@
VisualEditor Example
 

-   
+   
 


@@ -231,6 +231,7 @@



+   



@@ -302,6 +303,7 @@



+   



diff --git a/VisualEditor.php b/VisualEditor.php
index d7378fb..432c3c3 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -467,6 +467,7 @@
'lib/ve/src/ce/ve.ce.BranchNode.js',
'lib/ve/src/ce/ve.ce.ContentBranchNode.js',
'lib/ve/src/ce/ve.ce.LeafNode.js',
+   'lib/ve/src/ce/ve.ce.ClassAttributeNode.js',
'lib/ve/src/ce/ve.ce.AlignableNode.js',
'lib/ve/src/ce/ve.ce.FocusableNode.js',
'lib/ve/src/ce/ve.ce.ResizableNode.js',
@@ -542,6 +543,7 @@
'lib/ve/src/ui/ve.ui.Action.js',
'lib/ve/src/ui/ve.ui.ActionFactory.js',
'lib/ve/src/ui/ve.ui.DataTransferHandler.js',
+   'lib/ve/src/ui/ve.ui.FileTransferHandler.js',
'lib/ve/src/ui/ve.ui.DataTransferHandlerFactory.js',
'lib/ve/src/ui/ve.ui.WindowManager.js',
 
diff --git a/extension.json b/extension.json
index bb9d970..8ddaf34 100644
--- a/extension.json
+++ b/extension.json
@@ -539,6 +539,7 @@
"lib/ve/src/ce/ve.ce.BranchNode.js",
"lib/ve/src/ce/ve.ce.ContentBranchNode.js",
"lib/ve/src/ce/ve.ce.LeafNode.js",
+   "lib/ve/src/ce/ve.ce.ClassAttributeNode.js",
"lib/ve/src/ce/ve.ce.AlignableNode.js",
"lib/ve/src/ce/ve.ce.FocusableNode.js",
"lib/ve/src/ce/ve.ce.ResizableNode.js",
@@ -609,6 +610,7 @@
"lib/ve/src/ui/ve.ui.Action.js",
"lib/ve/src/ui/ve.ui.ActionFactory.js",
"lib/ve/src/ui/ve.ui.DataTransferHandler.js",
+   "lib/ve/src/ui/ve.ui.FileTransferHandler.js",

"lib/ve/src/ui/ve.ui.DataTransferHandlerFactory.js",
"lib/ve/src/ui/ve.ui.WindowManager.js",

"lib/ve/src/ui/actions/ve.ui.AnnotationAction.js",
diff --git a/lib/ve b/lib/ve
index 032c9a4..a7cd696 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 032c9a4cb0ab9967b1999b3cf0768e9c98f0ca8f
+Subproject commit a7cd696ed56d256f9c65d2b3e32

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (c65f3bd) - change (mediawiki...VisualEditor)

2015-02-19 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Update VE core submodule to master (c65f3bd)
..

Update VE core submodule to master (c65f3bd)

New changes:
181561b Support generic data transfer handlers
ecdb379 Only replace selection when we know it has changed
afb37fd Remove some errant references to MediaWiki/Parsoid that don't belong
82f57e0 Update OOjs UI to v0.8.0
489ff8a Simplify AlignableNode by inheriting from ClassAttributeNode
bac7e30 Try html/plain text drop if no file handlers found
8b7d159 Separate out toolbar attachment in overridable method
a167a45 Prevent the default action for uncollapsed linear delete
c65f3bd Localisation updates from https://translatewiki.net.

Change-Id: I962c8874f99378018f6503fec6d4dd75d410ba06
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index 032c9a4..c65f3bd 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 032c9a4cb0ab9967b1999b3cf0768e9c98f0ca8f
+Subproject commit c65f3bda73c310f27f7caeecb9e5595630ae1c43

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I962c8874f99378018f6503fec6d4dd75d410ba06
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] User only requires history access to see the username on a r... - change (mediawiki...Flow)

2015-02-19 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: User only requires history access to see the username on a 
revision
..

User only requires history access to see the username on a revision

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


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

diff --git a/includes/Templating.php b/includes/Templating.php
index cc77a5b..ff5beda 100644
--- a/includes/Templating.php
+++ b/includes/Templating.php
@@ -86,7 +86,7 @@
 * @throws FlowException
 */
public function getUserLinks( AbstractRevision $revision ) {
-   if ( !$revision->isModerated() && 
!$this->permissions->isAllowed( $revision, 'view' ) ) {
+   if ( !$revision->isModerated() && 
!$this->permissions->isAllowed( $revision, 'history' ) ) {
throw new FlowException( 'Insufficient permissions to 
see userlinks for rev_id = ' . $revision->getRevisionId()->getAlphadecimal() );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Unbreak form submission in JavaScript - change (oojs/ui)

2015-02-19 Thread Code Review

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

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

Change subject: Unbreak form submission in JavaScript
..

Unbreak form submission in JavaScript

We hook way too many events on everything.

FormLayout:
  There was no way to actually submit the form, as the 'submit'
  event's default action was always prevented.

ButtonInputWidget:
  There was no way to actually submit any form with the button, as the
  'click' event's default action was always prevented (in
  ButtonElement).

Change-Id: Ie84826c7cfd4519d132b6b5206ad67c76f8b3eef
---
M src/layouts/FormLayout.js
M src/widgets/ButtonInputWidget.js
2 files changed, 19 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/34/191834/1

diff --git a/src/layouts/FormLayout.js b/src/layouts/FormLayout.js
index 8c0d151..22bb066 100644
--- a/src/layouts/FormLayout.js
+++ b/src/layouts/FormLayout.js
@@ -46,7 +46,11 @@
 /* Events */
 
 /**
+ * The HTML form was submitted. If the submission is handled, call 
`e.preventDefault()` to prevent
+ * HTML form submission.
+ *
  * @event submit
+ * @param {jQuery.Event} e Submit event
  */
 
 /* Static Properties */
@@ -61,7 +65,6 @@
  * @param {jQuery.Event} e Submit event
  * @fires submit
  */
-OO.ui.FormLayout.prototype.onFormSubmit = function () {
-   this.emit( 'submit' );
-   return false;
+OO.ui.FormLayout.prototype.onFormSubmit = function ( e ) {
+   this.emit( 'submit', e );
 };
diff --git a/src/widgets/ButtonInputWidget.js b/src/widgets/ButtonInputWidget.js
index 9777699..8f9c813 100644
--- a/src/widgets/ButtonInputWidget.js
+++ b/src/widgets/ButtonInputWidget.js
@@ -39,6 +39,7 @@
 
// Properties (must be set before parent constructor, which calls 
#setValue)
this.useInputTag = config.useInputTag;
+   this.type = config.type;
 
// Parent constructor
OO.ui.ButtonInputWidget.super.call( this, config );
@@ -121,3 +122,15 @@
}
return this;
 };
+
+/**
+ * @inheritdoc
+ */
+OO.ui.ButtonInputWidget.prototype.onClick = function ( e ) {
+   var ret = OO.ui.ButtonElement.prototype.onClick.call( this, e );
+   if ( this.type === 'submit' ) {
+   // Never prevent default action (form submission)
+   return true;
+   }
+   return ret;
+};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie84826c7cfd4519d132b6b5206ad67c76f8b3eef
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] FormLayout: Allow adding child layouts via config - change (oojs/ui)

2015-02-19 Thread Code Review

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

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

Change subject: FormLayout: Allow adding child layouts via config
..

FormLayout: Allow adding child layouts via config

Previously the only way to add content to a FormLayout was to call
->appendContent() / .$element.append() on it, which is pretty much a
private interface.

Let's turn it into a GroupElement and allow an array of
FieldsetLayouts to be passed as 'items' configuration option.

Bug: T89750
Change-Id: I9604dfd37af5b4d931e719c4af11326504137e45
---
M demos/pages/widgets.js
M demos/widgets.php
M php/layouts/FormLayout.php
M src/layouts/FormLayout.js
4 files changed, 119 insertions(+), 53 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/32/191832/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 933098b..310d5fd 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1252,6 +1252,59 @@
}
)
]
+   } ),
+   new OO.ui.FormLayout( {
+   method: 'GET',
+   action: 'widgets.php',
+   items: [
+   new OO.ui.FieldsetLayout( {
+   label: 'Form layout',
+   items: [
+   new OO.ui.FieldLayout(
+   new 
OO.ui.TextInputWidget( {
+   name: 'username'
+   } ),
+   {
+   label: 'User 
name',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new 
OO.ui.TextInputWidget( {
+   name: 
'password',
+   type: 'password'
+   } ),
+   {
+   label: 
'Password',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new 
OO.ui.CheckboxInputWidget( {
+   name: 
'rememberme',
+   selected: true
+   } ),
+   {
+   label: 
'Remember me',
+   align: 'inline'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new 
OO.ui.ButtonInputWidget( {
+   name: 'login',
+   label: 'Log in',
+   type: 'submit',
+   flags: [ 
'primary', 'progressive' ],
+   icon: 'check'
+   } ),
+   {
+   label: null,
+   align: 'top'
+   }
+   )
+   ]
+   } )
+   ]
} )
];
 
diff --git a/demos/widgets.php b/demos/widgets.php
index 810caad..c69db6c 100644
--- a/demos/widgets.php
+++ b/demos/widgets.php
@@ -714,62 +714,59 @@
)
) );
 
-   $form = new OOUI\FormLayout( array(
+   echo new OOUI\FormLay

[MediaWiki-commits] [Gerrit] Set proper spacing between interleaved FieldsetLayouts and F... - change (oojs/ui)

2015-02-19 Thread Code Review

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

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

Change subject: Set proper spacing between interleaved FieldsetLayouts and 
FormLayouts
..

Set proper spacing between interleaved FieldsetLayouts and FormLayouts

Compare the FormLayout example in the demo before and after this patch.

Change-Id: I121046ec1812896758b26b8fe3803069513c93af
---
M src/themes/apex/layouts.less
M src/themes/mediawiki/layouts.less
2 files changed, 16 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/33/191833/1

diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less
index 47b2075..30cedfa 100644
--- a/src/themes/apex/layouts.less
+++ b/src/themes/apex/layouts.less
@@ -71,7 +71,8 @@
padding: 0;
border: none;
 
-   + .oo-ui-fieldsetLayout {
+   + .oo-ui-fieldsetLayout,
+   + .oo-ui-formLayout {
margin-top: 2em;
}
 
@@ -99,7 +100,12 @@
}
 }
 
-.theme-oo-ui-formLayout () {}
+.theme-oo-ui-formLayout () {
+   + .oo-ui-fieldsetLayout,
+   + .oo-ui-formLayout {
+   margin-top: 2em;
+   }
+}
 
 .theme-oo-ui-gridLayout () {}
 
diff --git a/src/themes/mediawiki/layouts.less 
b/src/themes/mediawiki/layouts.less
index 47b2075..30cedfa 100644
--- a/src/themes/mediawiki/layouts.less
+++ b/src/themes/mediawiki/layouts.less
@@ -71,7 +71,8 @@
padding: 0;
border: none;
 
-   + .oo-ui-fieldsetLayout {
+   + .oo-ui-fieldsetLayout,
+   + .oo-ui-formLayout {
margin-top: 2em;
}
 
@@ -99,7 +100,12 @@
}
 }
 
-.theme-oo-ui-formLayout () {}
+.theme-oo-ui-formLayout () {
+   + .oo-ui-fieldsetLayout,
+   + .oo-ui-formLayout {
+   margin-top: 2em;
+   }
+}
 
 .theme-oo-ui-gridLayout () {}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I121046ec1812896758b26b8fe3803069513c93af
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 7e6eba0..888b5eb - change (mediawiki/extensions)

2015-02-19 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 7e6eba0..888b5eb
..


Syncronize VisualEditor: 7e6eba0..888b5eb

Change-Id: I3b38f92a650010e05a033af94a39205a44048806
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 7e6eba0..888b5eb 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 7e6eba0fe87da529a277245dc51c7520358a4af0
+Subproject commit 888b5eb88923365fe3d097d81d26fa704401c4e1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b38f92a650010e05a033af94a39205a44048806
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add dependency on ext.ve.mw in ext.ve.mwreference - change (mediawiki...VisualEditor)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Add dependency on ext.ve.mw in ext.ve.mwreference
..


Add dependency on ext.ve.mw in ext.ve.mwreference

MWReferenceDialog uses ve.init.mw.Target in its setup code,
so it needs this dependency. Otherwise the tests fail intermittently;
usually only when loading from localStorage for some reason.

Change-Id: I6c0f66263e2cf6ffcf926fefaac4de1e53eac130
---
M VisualEditor.php
M extension.json
2 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index b499cf0..d7378fb 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -1272,6 +1272,7 @@
'dependencies' => array(
'ext.visualEditor.mwreference.core',
'ext.visualEditor.mwtransclusion',
+   'ext.visualEditor.mediawiki'
),
'messages' => array(
'visualeditor-dialog-reference-editing-reused',
diff --git a/extension.json b/extension.json
index 583591d..bb9d970 100644
--- a/extension.json
+++ b/extension.json
@@ -1295,7 +1295,8 @@
],
"dependencies": [
"ext.visualEditor.mwreference.core",
-   "ext.visualEditor.mwtransclusion"
+   "ext.visualEditor.mwtransclusion",
+   "ext.visualEditor.mediawiki"
],
"messages": [
"visualeditor-dialog-reference-editing-reused",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c0f66263e2cf6ffcf926fefaac4de1e53eac130
Gerrit-PatchSet: 3
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] Syncronize VisualEditor: 7e6eba0..888b5eb - change (mediawiki/extensions)

2015-02-19 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 7e6eba0..888b5eb
..

Syncronize VisualEditor: 7e6eba0..888b5eb

Change-Id: I3b38f92a650010e05a033af94a39205a44048806
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 7e6eba0..888b5eb 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 7e6eba0fe87da529a277245dc51c7520358a4af0
+Subproject commit 888b5eb88923365fe3d097d81d26fa704401c4e1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b38f92a650010e05a033af94a39205a44048806
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Made TransactionProfiler log regardless of Profiler - change (mediawiki/core)

2015-02-19 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Made TransactionProfiler log regardless of Profiler
..

Made TransactionProfiler log regardless of Profiler

* Also avoid the use of slow closures for profiling

Change-Id: Id437e39038fd9ba80b899329a61e9f14229481f2
---
M includes/db/Database.php
1 file changed, 21 insertions(+), 29 deletions(-)


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

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 8fa10a6..8ce7f3f 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1121,24 +1121,21 @@
$this->mServer, $this->mDBname, 
$this->mTrxShortId );
}
 
-   $queryProf = '';
-   $totalProf = '';
$isMaster = !is_null( $this->getLBInfo( 'master' ) );
+   # generalizeSQL will probably cut down the query to reasonable
+   # logging size most of the time. The substr is really just a 
sanity check.
+   if ( $isMaster ) {
+   $queryProf = 'query-m: ' . substr( 
DatabaseBase::generalizeSQL( $sql ), 0, 255 );
+   $totalProf = 'DatabaseBase::query-master';
+   } else {
+   $queryProf = 'query: ' . substr( 
DatabaseBase::generalizeSQL( $sql ), 0, 255 );
+   $totalProf = 'DatabaseBase::query';
+   }
+   # Include query transaction state
+   $queryProf .= $this->mTrxShortId ? " 
[TRX#{$this->mTrxShortId}]" : "";
 
$profiler = Profiler::instance();
if ( !$profiler instanceof ProfilerStub ) {
-   # generalizeSQL will probably cut down the query to 
reasonable
-   # logging size most of the time. The substr is really 
just a sanity check.
-   if ( $isMaster ) {
-   $queryProf = 'query-m: ' . substr( 
DatabaseBase::generalizeSQL( $sql ), 0, 255 );
-   $totalProf = 'DatabaseBase::query-master';
-   } else {
-   $queryProf = 'query: ' . substr( 
DatabaseBase::generalizeSQL( $sql ), 0, 255 );
-   $totalProf = 'DatabaseBase::query';
-   }
-   # Include query transaction state
-   $queryProf .= $this->mTrxShortId ? " 
[TRX#{$this->mTrxShortId}]" : "";
-
$totalProfSection = $profiler->scopedProfileIn( 
$totalProf );
$queryProfSection = $profiler->scopedProfileIn( 
$queryProf );
}
@@ -1162,22 +1159,12 @@
throw new DBUnexpectedError( $this, "DB connection was 
already closed." );
}
 
-   # Log the query time and feed it into the DB trx profiler
-   if ( $queryProf != '' ) {
-   $that = $this;
-   $queryStartTime = microtime( true );
-   $queryProfile = new ScopedCallback(
-   function () use ( $that, $queryStartTime, 
$queryProf, $isWriteQuery ) {
-   $n = $that->affectedRows();
-   $trxProf = 
Profiler::instance()->getTransactionProfiler();
-   $trxProf->recordQueryCompletion(
-   $queryProf, $queryStartTime, 
$isWriteQuery, $n );
-   }
-   );
-   }
-
# Do the query and handle errors
+   $startTime = microtime( true );
$ret = $this->doQuery( $commentedSql );
+   # Log the query time and feed it into the DB trx profiler
+   $profiler->getTransactionProfiler()->recordQueryCompletion(
+   $queryProf, $startTime, $isWriteQuery, 
$this->affectedRows() );
 
MWDebug::queryTime( $queryId );
 
@@ -1204,7 +1191,11 @@
$this->reportQueryError( $lastError, 
$lastErrno, $sql, $fname, $tempIgnore );
} else {
# Should be safe to silently retry (no 
trx and thus no callbacks)
+   $startTime = microtime( true );
$ret = $this->doQuery( $commentedSql );
+   # Log the query time and feed it into 
the DB trx profiler
+   
$profiler->getTransactionProfiler()->recordQueryCompletion(
+   $queryProf, $startTime, 
$isWriteQuery, $this->affectedRows() );

[MediaWiki-commits] [Gerrit] Remove more appfog stuff - change (mediawiki...parsoid)

2015-02-19 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Remove more appfog stuff
..

Remove more appfog stuff

 * Who knows how far this has bitrotted. Appfog is no longer a free service
   (after 30 days). We're better off encouraging use of labs or the MWF
   public parsoid instance.

 * Should have been part of I65bed1ef9829d37e00e2b9cff6a76dcb0f5c4cc1

 * Was introduced in Ieebd9b5c937a2b0a8e9d43e071acf346bf24b6c6

Change-Id: I9475cfc8c3b3883ac3caa47d37773e71cdeec4c4
---
M api/ParsoidService.js
D manifest.yml
2 files changed, 1 insertion(+), 21 deletions(-)


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

diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index 55cd643..5728450 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -99,9 +99,7 @@
 
 
// Get host and port from the environment, if available
-   // VCAP_APP_PORT is for appfog.com support
-   var port = parsoidConfig.serverPort ||
-   process.env.VCAP_APP_PORT || process.env.PORT || 8000;
+   var port = parsoidConfig.serverPort || process.env.PORT || 8000;
// default bind all
var host = parsoidConfig.serverInterface || process.env.INTERFACE;
 
diff --git a/manifest.yml b/manifest.yml
deleted file mode 100644
index 806ccba..000
--- a/manifest.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# AppFog.com configuration for parsoid
-# (useful if you want to deploy your own parsoid instance in the cloud)

-applications:
-  .:
-name: parsoid
-framework:
-  name: standalone
-  info:
-mem: 64M
-description: Standalone Application
-exec:
-runtime: node08
-command: npm run start
-infra: aws
-url:
-mem: 1G
-instances: 1

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

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

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

[MediaWiki-commits] [Gerrit] other new thank you translations - change (wikimedia...crm)

2015-02-19 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: other new thank you translations
..

other new thank you translations

Bug: T89611
Change-Id: Id73b140491c7e623ce099839da51a1481a84cdde
---
M sites/all/modules/thank_you/templates/html/thank_you.it.html
M sites/all/modules/thank_you/templates/html/thank_you.zh.html
2 files changed, 22 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/28/191828/1

diff --git a/sites/all/modules/thank_you/templates/html/thank_you.it.html 
b/sites/all/modules/thank_you/templates/html/thank_you.it.html
index ba6b099..9185bb7 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.it.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.it.html
@@ -5,17 +5,17 @@
 Caro/a donatore/trice,
 {%endif%}
 
-Ti ringraziamo per il tuo inestimabile contributo nel diffondere la 
conoscenza per tutti in tutto il mondo.
+ti ringraziamo per il tuo inestimabile contributo nel diffondere la 
conoscenza ad ogni essere umano nel mondo.
 
 {% if "RecurringRestarted" in contribution_tags %} Abbiamo recentemente 
risolto un piccolo inconveniente tecnico che ha sospeso alcune donazioni a 
ricorrenza mensile. Abbiamo riavviato la tua donazione periodica e d'ora in poi 
sarà registrata come di consueto. Non ti addebiteremo le donazioni dovute 
durante i mesi di sospensione del servizio. Grazie per la tua pazienza e per il 
tuo sostegno. Per qualsiasi informazione, puoi scrivere a don...@wikimedia.org. 
{%endif%}
 
 {% if "UnrecordedCharge" in contribution_tags %} Abbiamo da poco risolto un 
piccolo problema tecnico che faceva sì che a fronte di alcune donazioni a 
ricorrenza mensile non venisse inviata una conferma. Questa email è la conferma 
di una donazione effettuata il {{ receive_date }}. Grazie per la tua pazienza e 
per il tuo sostegno. Per qualsiasi informazione, puoi scrivere a 
don...@wikimedia.org. {%endif%}
 
-Mi chiamo Lila Tretikov e sono la Direttrice Esecutiva della Wikimedia 
Foundation. L'anno scorso, donazioni come la tua hanno alimentato i nostri 
sforzi per estendere l'enciclopedia in 287 lingue e renderla più accessibile in 
tutto il mondo. Ci battiamo soprattutto per raggiungere coloro che altrimenti 
non avrebbero alcun accesso all'istruzione. Portiamo la conoscenza a persone 
come Akshaya Iyengar, che vive a Solapur, in India. Crescendo in questo piccolo 
villaggio dedito alla produzione tessile, ha utilizzato Wikipedia come fonte 
pricipale di apprendimento. Per gli studenti di aree come questa, dove i libri 
sono un'eccezione ma esiste l'accesso ad Internet, Wikipedia è fondamentale. 
Akshaya si è infine laureata in un college indiano e adesso lavora come 
ingegnere informatico negli Stati Uniti, e proprio a Wikipedia riconosce il 
merito di metà della sua preparazione.
+Mi chiamo Lila Tretikov e sono la Direttrice Esecutiva della Wikimedia 
Foundation. L'anno scorso, donazioni come la tua hanno alimentato i nostri 
sforzi per estendere l'enciclopedia a 287 lingue e renderla più accessibile in 
tutto il mondo. Ci battiamo soprattutto per raggiungere coloro che altrimenti 
non avrebbero alcun accesso all'istruzione. Portiamo la conoscenza a persone 
come Akshaya Iyengar, che vive a Solapur, in India. Crescendo in un piccolo 
villaggio manifatturiero tessile, Akshaya ha utilizzato Wikipedia come fonte 
pricipale di apprendimento. Per gli studenti di aree come questa, dove i libri 
sono un'eccezione ma esiste l'accesso ad Internet, Wikipedia è fondamentale. 
Akshaya è riuscita a laurearsi in un college indiano e adesso lavora come 
ingegnere informatico negli Stati Uniti, e proprio a Wikipedia riconosce il 
merito di metà della sua preparazione.
 
 Non si tratta di un esempio isolato. La nostra è una missione nobile e 
presenta grandi sfide. La maggior parte delle persone che utilizzano Wikipedia 
è sorpresa nel venire a sapere che è gestita da un'organizzazione senza scopo 
di lucro, finanziata dalle vostre donazioni. Ogni anno, riceviamo donazioni da 
un numero di persone appena sufficiente per mantenere l'insieme della 
conoscenza umana a disposizione di tutti. Grazie di rendere questa missione 
possibile.
 
-A nome del mezzo miliardo di persone che legge Wikipedia, delle migliaia di 
volontari e dello staff della Fondazione, ti ringrazio per aver contribuito a 
mantenere Wikipedia online e senza pubblicità per quest'anno.
+A nome del quasi mezzo miliardo di lettori di Wikipedia, delle migliaia di 
volontari e dello staff della Fondazione, ti ringrazio per aver contribuito a 
mantenere Wikipedia online e senza pubblicità per quest'anno.
 
 Grazie,
 Lila
@@ -25,19 +25,20 @@
 Wikimedia Foundation
 https://donate.wikimedia.org/";>donate.wikimedia.org
 
+Molti datori di lavoro potrebbero sottoscrivere un contributo dello stesso 
ammontare di quello effettuato dai dipendenti, r

[MediaWiki-commits] [Gerrit] New thank you translation: sv - change (wikimedia...crm)

2015-02-19 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: New thank you translation: sv
..

New thank you translation: sv

Bug: T89611
Change-Id: I0a5da05d311dbe64e3d71a2317f48344b6d7498a
---
M sites/all/modules/thank_you/templates/html/thank_you.sv.html
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/27/191827/1

diff --git a/sites/all/modules/thank_you/templates/html/thank_you.sv.html 
b/sites/all/modules/thank_you/templates/html/thank_you.sv.html
index d528d0b..bad0f12 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.sv.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.sv.html
@@ -31,7 +31,7 @@
 
 {% if recurring %} Du har valt att skänka pengar regelbundet. Månatliga 
överföringar till Wikimedia Foundation kommer att ske till dess du meddelar oss 
att de ska upphöra. Om du vill sluta skänka pengar finns https://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Cancel_or_change_recurring_payments&basic=true&language={{
 locale }}">enkla instruktioner för att avsluta överföringarna. 
{%endif%}
 
-Detta brev kan utgöra kvitto för din donation. Inga varor eller tjänster 
har bytts, helt eller delvis, mot denna betalning. Wikimedia Foundation, Inc. 
är en ideell, skattebefriad organisation enligt amerikansk taxeringslag 
501(c)(3). Vår adress är 149 New Montgomery, 3rd Floor, San Fransisco, CA, 
94105. Amerikanskt skattefrihetsnummer: 20-0049703.
+Detta brev kan utgöra kvitto för din donation. Inga varor eller tjänster 
har bytts, helt eller delvis, mot denna betalning. Wikimedia Foundation, Inc. 
är en ideell, skattebefriad organisation enligt amerikansk taxeringslag 
501(c)(3). Vår adress är 149 New Montgomery, 3rd Floor, San Francisco, CA, 
94105. Amerikanskt skattefrihetsnummer: 20-0049703.
 
 Jag vill inte ha fler brev:
 
@@ -41,4 +41,4 @@
   Avregistrera
 
 
-
\ No newline at end of file
+
\ No newline at end of file

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

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

___
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)

2015-02-19 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: update civicrm submodule
..

update civicrm submodule

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/26/191826/1

diff --git a/civicrm b/civicrm
index d9a713e..ed088e6 16
--- a/civicrm
+++ b/civicrm
-Subproject commit d9a713eb5cebb7ebc713b85a33f5b26669626072
+Subproject commit ed088e6d79f5ffd1a5bf61bfc4ed3527b7b722e5

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

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

___
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)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: update civicrm submodule
..


update civicrm submodule

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

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



diff --git a/civicrm b/civicrm
index d9a713e..ed088e6 16
--- a/civicrm
+++ b/civicrm
-Subproject commit d9a713eb5cebb7ebc713b85a33f5b26669626072
+Subproject commit ed088e6d79f5ffd1a5bf61bfc4ed3527b7b722e5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I271598472fccbb9084eb25719a3b3b599f660ede
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
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 IE crop/stretch problems - change (mediawiki...MultimediaViewer)

2015-02-19 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix IE crop/stretch problems
..

Fix IE crop/stretch problems

It seems that IE11 sometimes does not keep the aspect ratio when
the width DOM property is set but height is not.

Also attempt to clarify what the two similar canvas setters are
good for, to the extent I could figure it out.

Bug: T89679
Change-Id: I9c87e2146e3d99d1ee00d7c00142b2ae1c3d7951
---
M resources/mmv/ui/mmv.ui.canvas.js
1 file changed, 7 insertions(+), 3 deletions(-)


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

diff --git a/resources/mmv/ui/mmv.ui.canvas.js 
b/resources/mmv/ui/mmv.ui.canvas.js
index 2ed1f2f..fef3c7d 100644
--- a/resources/mmv/ui/mmv.ui.canvas.js
+++ b/resources/mmv/ui/mmv.ui.canvas.js
@@ -102,7 +102,10 @@
};
 
/**
-* Sets contained image.
+* Sets image on the canvas; does not resize it to fit. This is used to 
make the placeholder
+* image available; it will be resized and displayed by 
#maybeDisplayPlaceholder().
+* FIXME maybeDisplayPlaceholder() receives the placeholder so it is 
very unclear why this
+* is necessary at all (apart from setting the LightboxImage, which is 
used in size calculations).
 * @param {mw.mmv.LightboxImage} imageRawMetadata
 * @param {jQuery} $imageElement
 */
@@ -117,8 +120,8 @@
};
 
/**
-* Sets contained image and also the max dimensions. Called while 
resizing the viewer.
-* Assumes set function called before.
+* Resizes image to the given dimensions and displays it on the canvas.
+* This is used to display the actual image; it assumes set function 
was already called before.
 * @param {mw.mmv.model.Thumbnail} thumbnail thumbnail information
 * @param {HTMLImageElement} imageElement
 * @param {mw.mmv.model.ThumbnailWidth} imageWidths
@@ -129,6 +132,7 @@
// we downscale larger images but do not scale up smaller ones, 
that would look ugly
if ( thumbnail.width > imageWidths.cssWidth ) {
imageElement.width = imageWidths.cssWidth;
+   imageElement.height = imageWidths.cssHeight;
}
 
if ( !this.$image.is( imageElement ) ) { // 
http://bugs.jquery.com/ticket/4087

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

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

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

[MediaWiki-commits] [Gerrit] add internal LVS service IP for zotero - change (operations/dns)

2015-02-19 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: add internal LVS service IP for zotero
..

add internal LVS service IP for zotero

Add a LVS service IP for zotero. Using .32 should be fine.

Bug:T89870
Change-Id: Id226e5ef1d0083839e260d98366312c5114938a8
---
M templates/10.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
3 files changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index a3d592a..06e5360 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -41,6 +41,7 @@
 29  1H  IN PTR  parsoidcache.svc.eqiad.wmnet.
 30  1H  IN PTR  search.svc.eqiad.wmnet.
 31  1H  IN PTR  ocg.svc.eqiad.wmnet.
+32  1H  IN PTR  zotero.svc.eqiad.wmnet.
 
 ; esams svc ips
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 0fb152c..3c393a3 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -252,6 +252,9 @@
 restbase1H  IN CNAME restbase.eqiad
 rest1H  IN CNAME restbase.eqiad
 
+zotero  1H  IN CNAME zotero.eqiad
+zotero.eqiad1H  IN A208.80.154.248
+1H  IN  2620:0:861:ed1a::3:14
 ;;; ulsfo
 text-lb.ulsfo   600 IN DYNA geoip!text-addrs/ulsfo
 login-lb.ulsfo  600 IN DYNA geoip!login-addrs/ulsfo
diff --git a/templates/wmnet b/templates/wmnet
index 70800f7..d03a8f9 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3091,6 +3091,7 @@
 parsoidcache1H  IN A10.2.2.29
 search  1H  IN A10.2.2.30
 ocg 1H  IN A10.2.2.31
+zotero  1H  IN A10.2.2.32
 labstore1H  IN A10.64.37.10
 apertium1H  IN A10.64.32.153
 

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Don't use !important for shrinking compressed texta... - change (mediawiki...Flow)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Don't use !important for shrinking compressed textarea 
height
..


Hygiene: Don't use !important for shrinking compressed textarea height

This was supposed to be in I599846b5adfcaaeb96c15ec3cc1449703872f750 (PS6) but I
somehow messed that up :)

Change-Id: I7f42d69607e1df427af92710470773b615446d45
---
M modules/engine/components/common/flow-component-events.js
M modules/styles/board/form-actions.less
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/modules/engine/components/common/flow-component-events.js 
b/modules/engine/components/common/flow-component-events.js
index b7080b8..19e0426 100644
--- a/modules/engine/components/common/flow-component-events.js
+++ b/modules/engine/components/common/flow-component-events.js
@@ -697,6 +697,7 @@
 */
function flowEventsMixinCompressTextarea( $textarea ) {
$textarea.addClass( 'flow-input-compressed' );
+   mw.flow.editor.destroy( $textarea );
}
FlowComponentEventsMixin.eventHandlers.compressTextarea = 
flowEventsMixinCompressTextarea;
 
@@ -757,6 +758,7 @@
 */
function flowEventsMixinexpandTextarea( $textarea ) {
$textarea.removeClass( 'flow-input-compressed' );
+   mw.flow.editor.load( $textarea, $textarea.val(), 'wikitext' );
}
FlowComponentEventsMixin.eventHandlers.expandTextarea = 
flowEventsMixinexpandTextarea;
 
@@ -769,7 +771,7 @@
var flowComponent = this;
 
mw.loader.using( 'ext.flow.editor', function() {
-   var $editors = $container.find( 'textarea' );
+   var $editors = $container.find( 
'textarea:not(.flow-input-compressed)' );
 
$editors.each( function() {
var $editor = $( this );
diff --git a/modules/styles/board/form-actions.less 
b/modules/styles/board/form-actions.less
index 318ba85..2f27583 100644
--- a/modules/styles/board/form-actions.less
+++ b/modules/styles/board/form-actions.less
@@ -14,11 +14,9 @@
}
 }
 
-.flow-input-compressed {
-   // The !important overrides the element-specific (min-)height set by 
autoexpand widget
-   height: 2.25em !important;
-   min-height: 2.25em !important;
-
+textarea.mw-ui-input.flow-input-compressed {
+   height: 2.25em;
+   min-height: 2.25em;
resize: none;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f42d69607e1df427af92710470773b615446d45
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: SG 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Instrument the widget-click-none WikiGrok action - change (mediawiki...WikiGrok)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Instrument the widget-click-none WikiGrok action
..


Instrument the widget-click-none WikiGrok action

When the submits no correct answers, i.e. they click "None of these",
then log the widget-click-none action.

Change-Id: Ia80cbe0bf7fb94a2d49b1adb810ba3e4846ffc74
---
M includes/Hooks.php
M resources/dialog.b/WikiGrokDialogB.js
2 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index 876d324..85c4a47 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -313,7 +313,7 @@
global $wgResourceModules, 
$wgWikiGrokResourceFileModuleBoilerplate;
 
$wikiGrokEventLoggingSchemas = array(
-   'MobileWebWikiGrok' => 10352247,
+   'MobileWebWikiGrok' => 10735928,
'MobileWebWikiGrokError' => 10353516,
);
 
diff --git a/resources/dialog.b/WikiGrokDialogB.js 
b/resources/dialog.b/WikiGrokDialogB.js
index 378a292..cce543a 100644
--- a/resources/dialog.b/WikiGrokDialogB.js
+++ b/resources/dialog.b/WikiGrokDialogB.js
@@ -153,6 +153,10 @@
} );
self.log( 'widget-click-submit' );
} );
+
+   self.$( '.footer .none' ).on( 'click', function () {
+   self.log( 'widget-click-none' );
+   } );
},
/**
 * @inheritdoc

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia80cbe0bf7fb94a2d49b1adb810ba3e4846ffc74
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Phuedx 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Hygiene: remove unused var - change (mediawiki...Flow)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: remove unused var
..


Hygiene: remove unused var

Change-Id: I7ab870330cb9b493bb89201ecae29381f2cc3a5d
---
M includes/TalkpageManager.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index b3c4a04..fc7e46f 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -119,8 +119,6 @@
 * @throws InvalidInputException
 */
public function ensureFlowRevision( Article $article, Workflow 
$workflow ) {
-   $title = $article->getTitle();
-
// Break loops (because doEditContent requires rendering, which 
will load the workflow, which will call this function)
static $doing = false;
if ( $doing ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ab870330cb9b493bb89201ecae29381f2cc3a5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: SG 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Avoid "recent-contributors" queries that cause timeouts - change (mediawiki...AbuseFilter)

2015-02-19 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid "recent-contributors" queries that cause timeouts
..

Avoid "recent-contributors" queries that cause timeouts

bug: T90036
Change-Id: I803b06f9eb7a4a61bcb0248520b4144158963983
---
M AbuseFilterVariableHolder.php
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/23/191823/1

diff --git a/AbuseFilterVariableHolder.php b/AbuseFilterVariableHolder.php
index 5783804..f77c1b9 100644
--- a/AbuseFilterVariableHolder.php
+++ b/AbuseFilterVariableHolder.php
@@ -488,14 +488,20 @@
}
 
$dbr = wfGetDB( DB_SLAVE );
-   $res = $dbr->select( 'revision',
-   'DISTINCT rev_user_text',
+   $sqlTmp = $dbr->selectSQLText(
+   'revision',
+   array( 'rev_user_text', 'rev_timestamp' 
),
array(
'rev_page' => 
$title->getArticleID(),
-   'rev_timestamp<' . 
$dbr->addQuotes( $dbr->timestamp( $cutOff ) )
+   'rev_timestamp < ' . 
$dbr->addQuotes( $dbr->timestamp( $cutOff ) )
),
__METHOD__,
-   array( 'ORDER BY' => 'rev_timestamp 
DESC', 'LIMIT' => 10 )
+   // Some pages have < 10 authors but 
many revisions (e.g. bot pages)
+   array( 'ORDER BY' => 'rev_timestamp 
DESC', 'LIMIT' => 100 )
+   );
+   $res = $dbr->query(
+   "SELECT rev_user_text FROM ($sqlTmp) AS 
tmp " .
+   "GROUP BY rev_user_text ORDER BY 
MAX(rev_timestamp) DESC LIMIT 10"
);
 
$users = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I803b06f9eb7a4a61bcb0248520b4144158963983
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
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] Hygiene: PostRevisionTestCase cleanup - change (mediawiki...Flow)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: PostRevisionTestCase cleanup
..


Hygiene: PostRevisionTestCase cleanup

* Non-existing namespace was being used - corrected
* Removed assignment of unused var

Change-Id: I7478b9f9c29b0ad9d9521e1883bd31194a80eb93
---
M tests/phpunit/PostRevisionTestCase.php
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/tests/phpunit/PostRevisionTestCase.php 
b/tests/phpunit/PostRevisionTestCase.php
index 03edf01..c16f69b 100644
--- a/tests/phpunit/PostRevisionTestCase.php
+++ b/tests/phpunit/PostRevisionTestCase.php
@@ -6,8 +6,8 @@
 use Flow\Container;
 use Flow\Data\Index\BoardHistoryIndex;
 use Flow\Data\Listener\NotificationListener;
+use Flow\Data\Listener\RecentChangesListener;
 use Flow\Data\ObjectManager;
-use Flow\Data\RecentChanges\RecentChanges as RecentChangesListener;
 use Flow\Model\AbstractRevision;
 use Flow\Model\PostRevision;
 use Flow\Model\Workflow;
@@ -134,7 +134,6 @@
if ( $this->workflow ) {
return $this->workflow;
}
-   $tuple = UserTuple::newFromUser( User::newFromName( 'UTSysop' ) 
);
 
$row = array(
'workflow_id' => UUID::create()->getBinary(),
@@ -225,7 +224,7 @@
// scope of these tests
&& !$handler instanceof 
NotificationListener
// BoardHistory requires we 
also wire together TopicListEntry objects for
-   // each revision, but thats 
also beyond our scope.
+   // each revision, but that's 
also beyond our scope.
&& !$handler instanceof 
BoardHistoryIndex;
}
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7478b9f9c29b0ad9d9521e1883bd31194a80eb93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: SG 
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 resize handle in compressed textareas - change (mediawiki...Flow)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Remove resize handle in compressed textareas
..


Remove resize handle in compressed textareas

This removes the small bottom-right resize handle

Change-Id: I5edeffddc0c41556bca17a79a8c355f864236702
---
M modules/styles/board/form-actions.less
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/styles/board/form-actions.less 
b/modules/styles/board/form-actions.less
index 05863fe..318ba85 100644
--- a/modules/styles/board/form-actions.less
+++ b/modules/styles/board/form-actions.less
@@ -18,6 +18,8 @@
// The !important overrides the element-specific (min-)height set by 
autoexpand widget
height: 2.25em !important;
min-height: 2.25em !important;
+
+   resize: none;
 }
 
 .flow-anon-warning {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5edeffddc0c41556bca17a79a8c355f864236702
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: SG 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Clarify apihelp-flow+view-topiclist-param-limit - change (mediawiki...Flow)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Clarify apihelp-flow+view-topiclist-param-limit
..


Clarify apihelp-flow+view-topiclist-param-limit

As pointed out on 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-flow%2Bview-topiclist-param-limit/sv

Change-Id: I18c855658e27603823a657b7cdafab472e9facb4
---
M i18n/en.json
M includes/api/ApiFlowViewTopicList.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index fdaec75..8d6f927 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -462,7 +462,7 @@
"apihelp-flow+view-topiclist-param-savesortby": "Save sortby option, if 
set.",
"apihelp-flow+view-topiclist-param-offset-id": "Offset value (in UUID 
format) to start fetching topics at.",
"apihelp-flow+view-topiclist-param-offset": "Offset value to start 
fetching topics at.",
-   "apihelp-flow+view-topiclist-param-limit": "Amount of topics to fetch.",
+   "apihelp-flow+view-topiclist-param-limit": "Number of topics to fetch.",
"apihelp-flow+view-topiclist-param-render": "Render the topics in 
HTML.",
"apihelp-flow+view-topiclist-example-1": "List topics on 
[[Talk:Sandbox]]",
"apihelp-flow-parsoid-utils-description": "Convert text between 
wikitext and HTML.",
diff --git a/includes/api/ApiFlowViewTopicList.php 
b/includes/api/ApiFlowViewTopicList.php
index 19417aa..52146ac 100644
--- a/includes/api/ApiFlowViewTopicList.php
+++ b/includes/api/ApiFlowViewTopicList.php
@@ -76,7 +76,7 @@
'offset-id' => 'Offset value (in UUID format) to start 
fetching topics at',
'offset' => 'Offset value to start fetching topics at',
'include-offset' => 'Includes the offset item in the 
results as well',
-   'limit' => 'Amount of topics to fetch',
+   'limit' => 'Number of topics to fetch',
'render' => 'Renders (in HTML) the topics, if set',
'toconly' => 'Whether to respond with only the 
information required for the TOC',
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18c855658e27603823a657b7cdafab472e9facb4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: SG 
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] Clarify i18n message - change (mediawiki...Flow)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Clarify i18n message
..


Clarify i18n message

As pointed out on 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-flow-example-1/pt

Change-Id: I77920984667c6a7cd222023f2520c1abb08d4b3a
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 89e4c53..d589965 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -391,7 +391,7 @@
"apihelp-flow-param-submodule": "The Flow submodule to invoke.",
"apihelp-flow-param-page": "The page to take the action on.",
"apihelp-flow-param-render": "Set this to something to include a 
block-specific rendering in the output.",
-   "apihelp-flow-example-1": "Edit the header of [[Talk:Sandbox]]",
+   "apihelp-flow-example-1": "Edit the header of \"[[Talk:Sandbox]]\"",
"apihelp-flow+close-open-topic-description": "Deprecated in favor of 
[[Special:ApiHelp/flow+lock-topic|action=flow&submodule=lock-topic]].",
"apihelp-flow+close-open-topic-param-moderationState": "State to put 
topic in, either locked or unlocked.",
"apihelp-flow+close-open-topic-param-reason": "Reason for locking or 
unlocking the topic.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6353546..c372bd7 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -396,7 +396,7 @@
"apihelp-flow-param-submodule": "{{doc-apihelp-param|flow|submodule}}",
"apihelp-flow-param-page": "{{doc-apihelp-param|flow|page}}",
"apihelp-flow-param-render": "{{doc-apihelp-param|flow|render}}",
-   "apihelp-flow-example-1": "{{doc-apihelp-example|flow}}",
+   "apihelp-flow-example-1": "{{doc-apihelp-example|flow}} (don't 
translate the [[Talk:Sandbox]] part, that's the name of the page for the API 
example)",
"apihelp-flow+close-open-topic-description": 
"{{doc-apihelp-description|flow+close-open-topic}}",
"apihelp-flow+close-open-topic-param-moderationState": 
"{{doc-apihelp-param|flow+close-open-topic|moderationState}}",
"apihelp-flow+close-open-topic-param-reason": 
"{{doc-apihelp-param|flow+close-open-topic|reason}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77920984667c6a7cd222023f2520c1abb08d4b3a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: SG 
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] Clarify new-topic API param messages - change (mediawiki...Flow)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Clarify new-topic API param messages
..


Clarify new-topic API param messages

As pointed out on 
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-flow%2Bnew-topic-param-topic/sv

Change-Id: I21a9bcf6596a54d071bcd210f85a55ddf171bf06
---
M i18n/en.json
M includes/api/ApiFlowNewTopic.php
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index d589965..fdaec75 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -433,8 +433,8 @@
"apihelp-flow+moderate-topic-example-1": "Delete the topic 
[[Topic:S2tycnas4hcucw8w]]",
"apihelp-flow+moderate-topic-param-metadataonly": "Whether to include 
only metadata about the new content, excluding everything else",
"apihelp-flow+new-topic-description": "Creates a new Flow topic on the 
given workflow.",
-   "apihelp-flow+new-topic-param-topic": "Text for new topic header.",
-   "apihelp-flow+new-topic-param-content": "Content for new topic.",
+   "apihelp-flow+new-topic-param-topic": "Text for new topic title.",
+   "apihelp-flow+new-topic-param-content": "Content for the topic's 
initial reply.",
"apihelp-flow+new-topic-example-1": "Create a new topic on 
[[Talk:Sandbox]]",
"apihelp-flow+new-topic-param-metadataonly": "Whether to include only 
metadata about the new content, excluding everything else",
"apihelp-flow+reply-description": "Replies to a post.",
diff --git a/includes/api/ApiFlowNewTopic.php b/includes/api/ApiFlowNewTopic.php
index 8043ddc..faea93a 100644
--- a/includes/api/ApiFlowNewTopic.php
+++ b/includes/api/ApiFlowNewTopic.php
@@ -34,8 +34,8 @@
 */
public function getParamDescription() {
return array(
-   'topic' => 'Text for new topic header',
-   'content' => 'Content for new topic',
+   'topic' => 'Text for new topic title',
+   'content' => 'Content for the topic\'s initial reply',
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21a9bcf6596a54d071bcd210f85a55ddf171bf06
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: SG 
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] Add link to history for hidden, deleted, and suppressed comm... - change (mediawiki...Flow)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Add link to history for hidden, deleted, and suppressed comments
..


Add link to history for hidden, deleted, and suppressed comments

Bug: T88868
Change-Id: I2b536efe4f9d8d9cb8ed041d120be6bed0905043
---
M FlowActions.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_post_moderation_state.handlebars
M i18n/en.json
M i18n/qqq.json
M includes/Templating.php
10 files changed, 38 insertions(+), 24 deletions(-)

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



diff --git a/FlowActions.php b/FlowActions.php
index f8af072..bf02e86 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -225,7 +225,7 @@
PostRevision::MODERATED_NONE => '',
PostRevision::MODERATED_HIDDEN => '',
),
-   'links' => array( 'topic', 'post', 'post-history', 
'post-revision' ),
+   'links' => array( 'topic', 'post', 'post-history', 
'topic-history', 'post-revision' ),
'actions' => array( 'reply', 'thank', 'edit-post', 
'restore-post', 'hide-post', 'delete-post', 'suppress-post' ),
'history' => array(
'i18n-message' => 'flow-rev-message-hid-post',
@@ -272,7 +272,7 @@
PostRevision::MODERATED_NONE => array( 'flow-delete', 
'flow-suppress' ),
PostRevision::MODERATED_HIDDEN => array( 'flow-delete', 
'flow-suppress' ),
),
-   'links' => array( 'topic', 'post', 'post-history', 
'post-revision', 'watch-topic', 'unwatch-topic' ),
+   'links' => array( 'topic', 'post', 'post-history', 
'topic-history', 'post-revision', 'watch-topic', 'unwatch-topic' ),
'actions' => array( 'reply', 'thank', 'edit-post', 
'restore-post', 'hide-post', 'delete-post', 'suppress-post' ),
'history' => array(
'i18n-message' => 'flow-rev-message-deleted-post',
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php 
b/handlebars/compiled/flow_block_topic.handlebars.php
index 97204b2..6e62e4e 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -38,7 +38,8 @@

 ' : '').'
 ';},'flow_topic_moderation_flag' => function ($cx, $in) {return '
-';},'flow_post_moderation_state' => function ($cx, $in) {return 
''.((LCRun3::ifvar($cx, ((isset($in['replyToId']) && is_array($in)) ? 
$in['replyToId'] : null))) ? ''.LCRun3::ch($cx, 'l10n', 
array(array(LCRun3::ch($cx, 'concat', 
array(array('flow-',((isset($in['moderateState']) && is_array($in)) ? 
$in['moderateState'] : null),'-post-content'),array()), 
'raw'),((isset($in['moderator']['name']) && is_array($in['moderator'])) ? 
$in['moderator']['name'] : null)),array()), 'encq').'' : ''.LCRun3::ch($cx, 
'l10n', array(array(LCRun3::ch($cx, 'concat', 
array(array('flow-',((isset($in['moderateState']) && is_array($in)) ? 
$in['moderateState'] : null),'-title-content'),array()), 
'raw'),((isset($in['moderator']['name']) && is_array($in['moderator'])) ? 
$in['moderator']['name'] : null)),array()), 
'encq').'').'';},'flow_topic_titlebar_summary' => function ($cx, $in) {return 
'
+';},'flow_post_moderation_state' => function ($cx, $in) {return ''.((LCRun3::ifvar($cx, ((isset($in['replyToId']) && 
is_array($in)) ? $in['replyToId'] : null))) ? ''.LCRun3::ch($cx, 'l10nParse', 
array(array(LCRun3::ch($cx, 'concat', 
array(array('flow-',((isset($in['moderateState']) && is_array($in)) ? 
$in['moderateState'] : null),'-post-content'),array()), 
'raw'),((isset($in['moderator']['name']) && is_array($in['moderator'])) ? 
$in['moderator']['name'] : null),((isset($in['links']['topic-history']['url']) 
&& is_array($in['links']['topic-history'])) ? 
$in['links']['topic-history']['url'] : null)),array()), 'encq').'' : 
''.LCRun3::ch($cx, 'l10nParse', array(array(LCRun3::ch($cx, 'concat', 
array(array('flow-',((isset($in['moderateState']) && is_array($in)) ? 
$in['moderateState'] : null),'-title-content'),array()), 
'raw'),((isset($in['moderator']['name']) && is_array($in['moderator'])) ? 
$in['moderator']['name'] : null),((isset($in['links']['topic-history']['url']) 
&& is_array($in['links']['topic-history'])) ? 
$in['links']['topic-history']['url'] : null)),array()), 'encq').'').'
+';},'flow_topic_titlebar_summary' => function ($cx, $in) {return '
 '.LCRun3::p($cx, 'flow_errors', 
array(array($in),array())).''.((LCRun3::ifvar($cx, ((isset($in['summary']) && 
is_array($in)) ? $in['summary'] : null))) ? '
'.LCRun3::ch($cx,

[MediaWiki-commits] [Gerrit] Update to latest master (enable deflate support) - change (mediawiki...deploy)

2015-02-19 Thread GWicke (Code Review)

GWicke has submitted this change and it was merged.

Change subject: Update to latest master (enable deflate support)
..


Update to latest master (enable deflate support)

Change-Id: I2d0d5a63f6d9619ee1967fb6fb1c9b2fae5c089b
---
M node_modules/istanbul/package.json
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json
M 
node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
M node_modules/js-yaml/node_modules/argparse/package.json
M node_modules/js-yaml/node_modules/esprima/package.json
M node_modules/js-yaml/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/preq/node_modules/bluebird/package.json
M node_modules/restbase-mod-table-cassandra/lib/db.js
M node_modules/restbase-mod-table-cassandra/lib/dbutils.js
M node_modules/restbase-mod-table-cassandra/package.json
M node_modules/restbase-mod-table-cassandra/test/index.js
M node_modules/swagger-router/node_modules/bluebird/package.json
M restbase
14 files changed, 82 insertions(+), 18 deletions(-)

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



diff --git a/node_modules/istanbul/package.json 
b/node_modules/istanbul/package.json
index 36c6115..24e9260 100644
--- a/node_modules/istanbul/package.json
+++ b/node_modules/istanbul/package.json
@@ -220,5 +220,6 @@
 "tarball": "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
+  "_resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git 
a/node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json 
b/node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json
index f06681c..df3570a 100644
--- 
a/node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json
+++ 
b/node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json
@@ -89,5 +89,6 @@
 "tarball": "http://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";
+  "_resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git 
a/node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
 
b/node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
index 43c805c..582645c 100644
--- 
a/node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
+++ 
b/node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
@@ -46,5 +46,6 @@
 "tarball": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";
+  "_resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/js-yaml/node_modules/argparse/package.json 
b/node_modules/js-yaml/node_modules/argparse/package.json
index 2e3773c..80208a6 100644
--- a/node_modules/js-yaml/node_modules/argparse/package.json
+++ b/node_modules/js-yaml/node_modules/argparse/package.json
@@ -57,5 +57,6 @@
 "tarball": "http://registry.npmjs.org/argparse/-/argparse-1.0.0.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.0.tgz";
+  "_resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.0.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/js-yaml/node_modules/esprima/package.json 
b/node_modules/js-yaml/node_modules/esprima/package.json
index 77d6cab..50fe250 100644
--- a/node_modules/js-yaml/node_modules/esprima/package.json
+++ b/node_modules/js-yaml/node_modules/esprima/package.json
@@ -88,5 +88,6 @@
   },
   "directories": {},
   "_shasum": "609ac5c2667eae5433b41eb9ecece2331b41498f",
-  "_resolved": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz";
+  "_resolved": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/js-yaml/package.json 
b/node_modules/js-yaml/package.json
index 7f23c70..bfc9103 100644
--- a/node_modules/js-yaml/package.json
+++ b/node_modules/js-yaml/package.json
@@ -78,5 +78,6 @@
 "tarball": "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz";
+  "_resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json 
b/node_modules/mocha/node_modules/mkdirp/package.json
index a915c51..b7fe466 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_module

[MediaWiki-commits] [Gerrit] Update to latest master (enable deflate support) - change (mediawiki...deploy)

2015-02-19 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Update to latest master (enable deflate support)
..

Update to latest master (enable deflate support)

Change-Id: I2d0d5a63f6d9619ee1967fb6fb1c9b2fae5c089b
---
M node_modules/istanbul/package.json
M node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json
M 
node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
M node_modules/js-yaml/node_modules/argparse/package.json
M node_modules/js-yaml/node_modules/esprima/package.json
M node_modules/js-yaml/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/preq/node_modules/bluebird/package.json
M node_modules/restbase-mod-table-cassandra/lib/db.js
M node_modules/restbase-mod-table-cassandra/lib/dbutils.js
M node_modules/restbase-mod-table-cassandra/package.json
M node_modules/restbase-mod-table-cassandra/test/index.js
M node_modules/swagger-router/node_modules/bluebird/package.json
M restbase
14 files changed, 82 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/22/191822/1

diff --git a/node_modules/istanbul/package.json 
b/node_modules/istanbul/package.json
index 36c6115..24e9260 100644
--- a/node_modules/istanbul/package.json
+++ b/node_modules/istanbul/package.json
@@ -220,5 +220,6 @@
 "tarball": "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";
+  "_resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git 
a/node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json 
b/node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json
index f06681c..df3570a 100644
--- 
a/node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json
+++ 
b/node_modules/js-yaml/node_modules/argparse/node_modules/lodash/package.json
@@ -89,5 +89,6 @@
 "tarball": "http://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";
+  "_resolved": "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git 
a/node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
 
b/node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
index 43c805c..582645c 100644
--- 
a/node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
+++ 
b/node_modules/js-yaml/node_modules/argparse/node_modules/sprintf-js/package.json
@@ -46,5 +46,6 @@
 "tarball": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";
+  "_resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/js-yaml/node_modules/argparse/package.json 
b/node_modules/js-yaml/node_modules/argparse/package.json
index 2e3773c..80208a6 100644
--- a/node_modules/js-yaml/node_modules/argparse/package.json
+++ b/node_modules/js-yaml/node_modules/argparse/package.json
@@ -57,5 +57,6 @@
 "tarball": "http://registry.npmjs.org/argparse/-/argparse-1.0.0.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.0.tgz";
+  "_resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.0.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/js-yaml/node_modules/esprima/package.json 
b/node_modules/js-yaml/node_modules/esprima/package.json
index 77d6cab..50fe250 100644
--- a/node_modules/js-yaml/node_modules/esprima/package.json
+++ b/node_modules/js-yaml/node_modules/esprima/package.json
@@ -88,5 +88,6 @@
   },
   "directories": {},
   "_shasum": "609ac5c2667eae5433b41eb9ecece2331b41498f",
-  "_resolved": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz";
+  "_resolved": "https://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/js-yaml/package.json 
b/node_modules/js-yaml/package.json
index 7f23c70..bfc9103 100644
--- a/node_modules/js-yaml/package.json
+++ b/node_modules/js-yaml/package.json
@@ -78,5 +78,6 @@
 "tarball": "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz";
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz";
+  "_resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz";,
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json 
b/node_modules/mocha/node_modules/mkdirp/package.json
index a915c51..b7fe466 100

[MediaWiki-commits] [Gerrit] Pull WG on WD for now - change (operations/mediawiki-config)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Pull WG on WD for now
..


Pull WG on WD for now

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c27b26f..67e139c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12590,7 +12590,7 @@
'test2wiki' => true,
'testwiki' => true,
'enwiki' => true,
-   'wikidatawiki' => true,
+   'wikidatawiki' => false,
 ),
 'wmgWikiGrokRepoMode' => array(
'default' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f02a672ff01acbfd215ed1aaeb9bb6b0187e0fe
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Pull WG on WD for now - change (operations/mediawiki-config)

2015-02-19 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Pull WG on WD for now
..

Pull WG on WD for now

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c27b26f..67e139c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12590,7 +12590,7 @@
'test2wiki' => true,
'testwiki' => true,
'enwiki' => true,
-   'wikidatawiki' => true,
+   'wikidatawiki' => false,
 ),
 'wmgWikiGrokRepoMode' => array(
'default' => false,

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

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

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

[MediaWiki-commits] [Gerrit] Math: tidy up error message handling - change (mediawiki...Math)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Math: tidy up error message handling
..


Math: tidy up error message handling

- We don't localize errors and debug logs like this, it makes them
  impossible to decipher
- Also remove some 1.21 and below back-compat while we're here

Change-Id: Idb23fe5b434fa9fa3518672d57ec6e5466d005ac
---
M MathInputCheckTexvc.php
M MathMathML.php
M MathRenderer.php
M i18n/en.json
4 files changed, 3 insertions(+), 16 deletions(-)

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



diff --git a/MathInputCheckTexvc.php b/MathInputCheckTexvc.php
index 9023fc7..b2eb6a6 100644
--- a/MathInputCheckTexvc.php
+++ b/MathInputCheckTexvc.php
@@ -60,7 +60,7 @@
public function doValidCheck() {
global $wgMathTexvcCheckExecutable;
if ( !is_executable( $wgMathTexvcCheckExecutable ) ) {
-   $msg = wfMessage( 'math_notexvccheck' 
)->inContentLanguage()->escaped();
+   $msg = 'Missing "texvccheck" executable. Please see 
math/README to configure.';
trigger_error( $msg, E_USER_NOTICE );
wfDebugLog( 'Math', $msg );
return true;
diff --git a/MathMathML.php b/MathMathML.php
index c40f8b9..824498d 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -292,13 +292,7 @@
if ( !$this->XMLValidation ) {
return true;
}
-   // depends on https://gerrit.wikimedia.org/r/#/c/66365/
-   if ( !is_callable( 'XmlTypeCheck::newFromString' ) ) {
-   $msg = wfMessage( 'math_xmlversion' 
)->inContentLanguage()->escaped();
-   trigger_error( $msg, E_USER_NOTICE );
-   wfDebugLog( 'Math', $msg );
-   return true;
-   }
+
$xmlObject = new XmlTypeCheck( $XML, null, false );
if ( !$xmlObject->wellFormed ) {
wfDebugLog( 'Math', "XML validation error:\n " . 
var_export( $XML, true ) . "\n" );
diff --git a/MathRenderer.php b/MathRenderer.php
index b1b2bc6..c50bb3c 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -457,12 +457,7 @@
 * @return string in UTF-8 encoding
 */
public function getMathml() {
-   if ( ! is_callable( 'StringUtils::isUtf8' ) ) {
-   $msg = wfMessage( 'math_latexml_xmlversion' 
)->inContentLanguage()->escaped();
-   trigger_error( $msg, E_USER_NOTICE );
-   wfDebugLog( 'Math', $msg );
-   // If we can not check if mathml output is valid, we 
skip the test and assume that it is valid.
-   } elseif ( ! StringUtils::isUtf8( $this->mathml ) ) {
+   if ( !StringUtils::isUtf8( $this->mathml ) ) {
$this->setMathml( '' );
}
return $this->mathml;
diff --git a/i18n/en.json b/i18n/en.json
index 75ec763..8072ce1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -23,7 +23,6 @@
 "math_lexing_error": "lexing error",
 "math_mathoid_error": "Conversion error. Server (\"$1\") reported: \"$2\"",
 "math_notexvc": "Missing texvc executable. Please see 
math/README to configure.",
-"math_notexvccheck": "Missing texvccheck executable. Please 
see math/README to configure.",
 "math_output_error": "Cannot store math image on filesystem.",
 "math_sample": "Insert formula here",
 "math_syntax_error": "syntax error",
@@ -31,7 +30,6 @@
 "math_tip": "Mathematical formula (LaTeX)",
 "math_unknown_error": "unknown error",
 "math_unknown_function": "unknown function \"$1\"",
-"math_xmlversion": "Warning: XML type check skipped! Check if your 
MediaWiki installation is version wmf/1.22wmf7 or newer.",
 "mw_math_latexml": "LaTeXML (experimental; uses MathML)",
 "mw_math_latexml_jax": "LaTeXML with client-side MathJax (experimental; 
uses MathML)",
 "mw_math_mathjax": "Client-side MathJax (slow; improves rendering on some 
browsers and accessibility tools)",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb23fe5b434fa9fa3518672d57ec6e5466d005ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Math: tidy up error message handling - change (mediawiki...Math)

2015-02-19 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Math: tidy up error message handling
..

Math: tidy up error message handling

- We don't localize errors and debug logs like this, it makes them
  impossible to decipher
- Also remove some 1.21 and below back-compat while we're here

Change-Id: Idb23fe5b434fa9fa3518672d57ec6e5466d005ac
---
M MathInputCheckTexvc.php
M MathMathML.php
M MathRenderer.php
M i18n/en.json
4 files changed, 3 insertions(+), 16 deletions(-)


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

diff --git a/MathInputCheckTexvc.php b/MathInputCheckTexvc.php
index 9023fc7..b2eb6a6 100644
--- a/MathInputCheckTexvc.php
+++ b/MathInputCheckTexvc.php
@@ -60,7 +60,7 @@
public function doValidCheck() {
global $wgMathTexvcCheckExecutable;
if ( !is_executable( $wgMathTexvcCheckExecutable ) ) {
-   $msg = wfMessage( 'math_notexvccheck' 
)->inContentLanguage()->escaped();
+   $msg = 'Missing "texvccheck" executable. Please see 
math/README to configure.';
trigger_error( $msg, E_USER_NOTICE );
wfDebugLog( 'Math', $msg );
return true;
diff --git a/MathMathML.php b/MathMathML.php
index c40f8b9..824498d 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -292,13 +292,7 @@
if ( !$this->XMLValidation ) {
return true;
}
-   // depends on https://gerrit.wikimedia.org/r/#/c/66365/
-   if ( !is_callable( 'XmlTypeCheck::newFromString' ) ) {
-   $msg = wfMessage( 'math_xmlversion' 
)->inContentLanguage()->escaped();
-   trigger_error( $msg, E_USER_NOTICE );
-   wfDebugLog( 'Math', $msg );
-   return true;
-   }
+
$xmlObject = new XmlTypeCheck( $XML, null, false );
if ( !$xmlObject->wellFormed ) {
wfDebugLog( 'Math', "XML validation error:\n " . 
var_export( $XML, true ) . "\n" );
diff --git a/MathRenderer.php b/MathRenderer.php
index b1b2bc6..c50bb3c 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -457,12 +457,7 @@
 * @return string in UTF-8 encoding
 */
public function getMathml() {
-   if ( ! is_callable( 'StringUtils::isUtf8' ) ) {
-   $msg = wfMessage( 'math_latexml_xmlversion' 
)->inContentLanguage()->escaped();
-   trigger_error( $msg, E_USER_NOTICE );
-   wfDebugLog( 'Math', $msg );
-   // If we can not check if mathml output is valid, we 
skip the test and assume that it is valid.
-   } elseif ( ! StringUtils::isUtf8( $this->mathml ) ) {
+   if ( !StringUtils::isUtf8( $this->mathml ) ) {
$this->setMathml( '' );
}
return $this->mathml;
diff --git a/i18n/en.json b/i18n/en.json
index 75ec763..8072ce1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -23,7 +23,6 @@
 "math_lexing_error": "lexing error",
 "math_mathoid_error": "Conversion error. Server (\"$1\") reported: \"$2\"",
 "math_notexvc": "Missing texvc executable. Please see 
math/README to configure.",
-"math_notexvccheck": "Missing texvccheck executable. Please 
see math/README to configure.",
 "math_output_error": "Cannot store math image on filesystem.",
 "math_sample": "Insert formula here",
 "math_syntax_error": "syntax error",
@@ -31,7 +30,6 @@
 "math_tip": "Mathematical formula (LaTeX)",
 "math_unknown_error": "unknown error",
 "math_unknown_function": "unknown function \"$1\"",
-"math_xmlversion": "Warning: XML type check skipped! Check if your 
MediaWiki installation is version wmf/1.22wmf7 or newer.",
 "mw_math_latexml": "LaTeXML (experimental; uses MathML)",
 "mw_math_latexml_jax": "LaTeXML with client-side MathJax (experimental; 
uses MathML)",
 "mw_math_mathjax": "Client-side MathJax (slow; improves rendering on some 
browsers and accessibility tools)",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb23fe5b434fa9fa3518672d57ec6e5466d005ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Update ZeroBanner for cherry-pick - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Update ZeroBanner for cherry-pick
..


Update ZeroBanner for cherry-pick

New changes:
ba49ec7 Show XFF header to the user in case of missig zero domain

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

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



diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner
index f000704..ba49ec7 16
--- a/extensions/ZeroBanner
+++ b/extensions/ZeroBanner
-Subproject commit f00070483c64eede246170b3f6e198d2ac04ddce
+Subproject commit ba49ec727b9a306dbfeb1885ee1e25312d8c32ae

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia83df9bd6f1dedf4a00fee7420e25c16133d5285
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
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 ZeroBanner for cherry-pick - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Update ZeroBanner for cherry-pick
..


Update ZeroBanner for cherry-pick

New changes:
c128289 Show XFF header to the user in case of missig zero domain

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

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



diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner
index 5337aac..c128289 16
--- a/extensions/ZeroBanner
+++ b/extensions/ZeroBanner
-Subproject commit 5337aac0e5edba4cf88bde5dd15fb00c2053fca1
+Subproject commit c1282899b33e8bb8e8d1ecbf3ffb7a3b1dc12eef

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff9abf30f85bcfe7200af89292f1f123887de709
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf18
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
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 ZeroBanner for cherry-pick - change (mediawiki/core)

2015-02-19 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Update ZeroBanner for cherry-pick
..

Update ZeroBanner for cherry-pick

New changes:
ba49ec7 Show XFF header to the user in case of missig zero domain

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/191819/1

diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner
index f000704..ba49ec7 16
--- a/extensions/ZeroBanner
+++ b/extensions/ZeroBanner
-Subproject commit f00070483c64eede246170b3f6e198d2ac04ddce
+Subproject commit ba49ec727b9a306dbfeb1885ee1e25312d8c32ae

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia83df9bd6f1dedf4a00fee7420e25c16133d5285
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Update ZeroBanner for cherry-pick - change (mediawiki/core)

2015-02-19 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Update ZeroBanner for cherry-pick
..

Update ZeroBanner for cherry-pick

New changes:
c128289 Show XFF header to the user in case of missig zero domain

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


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

diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner
index 5337aac..c128289 16
--- a/extensions/ZeroBanner
+++ b/extensions/ZeroBanner
-Subproject commit 5337aac0e5edba4cf88bde5dd15fb00c2053fca1
+Subproject commit c1282899b33e8bb8e8d1ecbf3ffb7a3b1dc12eef

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff9abf30f85bcfe7200af89292f1f123887de709
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf18
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Show XFF header to the user in case of missig zero domain - change (mediawiki...ZeroBanner)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Show XFF header to the user in case of missig zero domain
..


Show XFF header to the user in case of missig zero domain

Whenever zero.wikipedia.org is not whitelisted for
the current carrier, we should show XFF header together with
the ip to make debugging easier.

Change-Id: I3f33169673080b6d6a7d8e4cafa4ace72d45a311
---
M includes/ZeroSpecialPage.php
1 file changed, 18 insertions(+), 3 deletions(-)

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



diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index 0f9f431..f3efe8f 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -319,8 +319,8 @@
$host = implode( '.', $state->getWikiInfo() );
$bannerText = $this->msg( 'zero-sorry', $host )->text() . '';
 
-   $ip = $req->getIP();
-   $bannerText .= $this->msg( 'zero-sorry-ip', $ip )->text() . 
'';
+   $ip = $this->getIpString();
+   $bannerText .= $this->msg( 'zero-sorry-ip', htmlspecialchars( 
$ip ) )->text() . '';
 
$url = false;
$from = $req->getVal( 'from' );
@@ -444,7 +444,7 @@
$host = implode( '.', $state->getWikiInfo() );
$bannerText = $this->msg( 'zero-sorry', $host 
)->text() . "\n\n";
 
-   $ip = $request->getIP();
+   $ip = $this->getIpString();
$bannerText .= $this->msg( 'zero-sorry-ip', $ip 
)->text();
 
$banner = self::createImageBanner( 'red', 
'white', $bannerText, true );
@@ -507,4 +507,19 @@
}
return $languageNames;
}
+
+   /**
+* Get the IP string to be shown to the user
+* Warning: the result is unsafe (user supplied)
+* @return mixed
+*/
+   private function getIpString() {
+   $req = $this->getRequest();
+   $result = $req->getIP();
+   $xff = $req->getHeader( 'X-Forwarded-For' );
+   if ( $xff ) {
+   $result .= ' (' . $xff . ')';
+   }
+   return $result;
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f33169673080b6d6a7d8e4cafa4ace72d45a311
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: wmf/1.25wmf18
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Show XFF header to the user in case of missig zero domain - change (mediawiki...ZeroBanner)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Show XFF header to the user in case of missig zero domain
..


Show XFF header to the user in case of missig zero domain

Whenever zero.wikipedia.org is not whitelisted for
the current carrier, we should show XFF header together with
the ip to make debugging easier.

Change-Id: I3f33169673080b6d6a7d8e4cafa4ace72d45a311
---
M includes/ZeroSpecialPage.php
1 file changed, 18 insertions(+), 3 deletions(-)

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



diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index 0f9f431..f3efe8f 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -319,8 +319,8 @@
$host = implode( '.', $state->getWikiInfo() );
$bannerText = $this->msg( 'zero-sorry', $host )->text() . '';
 
-   $ip = $req->getIP();
-   $bannerText .= $this->msg( 'zero-sorry-ip', $ip )->text() . 
'';
+   $ip = $this->getIpString();
+   $bannerText .= $this->msg( 'zero-sorry-ip', htmlspecialchars( 
$ip ) )->text() . '';
 
$url = false;
$from = $req->getVal( 'from' );
@@ -444,7 +444,7 @@
$host = implode( '.', $state->getWikiInfo() );
$bannerText = $this->msg( 'zero-sorry', $host 
)->text() . "\n\n";
 
-   $ip = $request->getIP();
+   $ip = $this->getIpString();
$bannerText .= $this->msg( 'zero-sorry-ip', $ip 
)->text();
 
$banner = self::createImageBanner( 'red', 
'white', $bannerText, true );
@@ -507,4 +507,19 @@
}
return $languageNames;
}
+
+   /**
+* Get the IP string to be shown to the user
+* Warning: the result is unsafe (user supplied)
+* @return mixed
+*/
+   private function getIpString() {
+   $req = $this->getRequest();
+   $result = $req->getIP();
+   $xff = $req->getHeader( 'X-Forwarded-For' );
+   if ( $xff ) {
+   $result .= ' (' . $xff . ')';
+   }
+   return $result;
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f33169673080b6d6a7d8e4cafa4ace72d45a311
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable WikiGrok in repo mode on wikidata.org - change (operations/mediawiki-config)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Enable WikiGrok in repo mode on wikidata.org
..


Enable WikiGrok in repo mode on wikidata.org

Change-Id: Ib4db8a60edf23ed489483dfb94a9bd37b50ddfdd
---
M wmf-config/InitialiseSettings.php
M wmf-config/mobile.php
2 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b4f6d71..0e1c7f4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12589,6 +12589,11 @@
'test2wiki' => true,
'testwiki' => true,
'enwiki' => true,
+   'wikidatawiki' => true,
+),
+'wmgWikiGrokRepoMode' => array(
+   'default' => false,
+   'wikidatawiki' => true,
 ),
 'wmgEnableTextExtracts' => array(
'default' => true,
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index b2b010b..c8ed997 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -107,6 +107,8 @@
if ( $wmgUseWikiGrok ) {
require_once( "$IP/extensions/WikiGrok/WikiGrok.php" );
 
+   $wgWikiGrokRepoMode = $wmgWikiGrokRepoMode;
+
$wgWikiGrokSlowCampaigns = array(
// 
https://www.mediawiki.org/wiki/Extension:MobileFrontend/WikiGrok/Claim_suggestions#Writer
'author' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4db8a60edf23ed489483dfb94a9bd37b50ddfdd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Phuedx 
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 toggle() from Widget to Element - change (oojs/ui)

2015-02-19 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Move toggle() from Widget to Element
..

Move toggle() from Widget to Element

Change-Id: Id94b13c03bd282d5e46f98be0f5a5336f926d459
---
M src/Element.js
M src/Widget.js
M src/Window.js
3 files changed, 29 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/17/191817/1

diff --git a/src/Element.js b/src/Element.js
index 768a768..69e5f70 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -20,6 +20,7 @@
 
// Properties
this.$ = $;
+   this.visible = true;
this.data = config.data;
this.$element = $( document.createElement( this.getTagName() ) );
this.elementGroup = null;
@@ -460,6 +461,34 @@
 /* Methods */
 
 /**
+ * Toggle visibility of widget.
+ *
+ * @param {boolean} [show] Make widget visible, omit to toggle visibility
+ * @fires visible
+ * @chainable
+ */
+OO.ui.Element.prototype.toggle = function ( show ) {
+   show = show === undefined ? !this.visible : !!show;
+
+   if ( show !== this.isVisible() ) {
+   this.visible = show;
+   this.$element.toggleClass( 'oo-ui-element-hidden', 
!this.visible );
+   this.emit( 'toggle', show );
+   }
+
+   return this;
+};
+
+/**
+ * Check if element is visible.
+ *
+ * @return {boolean} Widget is visible
+ */
+OO.ui.Element.prototype.isVisible = function () {
+   return this.visible;
+};
+
+/**
  * Get element data.
  *
  * @return {Mixed} Element data
diff --git a/src/Widget.js b/src/Widget.js
index 074e38e..9e9958f 100644
--- a/src/Widget.js
+++ b/src/Widget.js
@@ -61,15 +61,6 @@
 };
 
 /**
- * Check if widget is visible.
- *
- * @return {boolean} Widget is visible
- */
-OO.ui.Widget.prototype.isVisible = function () {
-   return this.visible;
-};
-
-/**
  * Set the disabled state of the widget.
  *
  * This should probably change the widgets' appearance and prevent it from 
being used.
@@ -90,25 +81,6 @@
this.updateThemeClasses();
}
this.wasDisabled = isDisabled;
-
-   return this;
-};
-
-/**
- * Toggle visibility of widget.
- *
- * @param {boolean} [show] Make widget visible, omit to toggle visibility
- * @fires visible
- * @chainable
- */
-OO.ui.Widget.prototype.toggle = function ( show ) {
-   show = show === undefined ? !this.visible : !!show;
-
-   if ( show !== this.isVisible() ) {
-   this.visible = show;
-   this.$element.toggleClass( 'oo-ui-element-hidden', 
!this.visible );
-   this.emit( 'toggle', show );
-   }
 
return this;
 };
diff --git a/src/Window.js b/src/Window.js
index 9e8334f..4d116d3 100644
--- a/src/Window.js
+++ b/src/Window.js
@@ -328,25 +328,6 @@
 };
 
 /**
- * Toggle visibility of window.
- *
- * @param {boolean} [show] Make window visible, omit to toggle visibility
- * @fires toggle
- * @chainable
- */
-OO.ui.Window.prototype.toggle = function ( show ) {
-   show = show === undefined ? !this.visible : !!show;
-
-   if ( show !== this.isVisible() ) {
-   this.visible = show;
-   this.$element.toggleClass( 'oo-ui-element-hidden', 
!this.visible );
-   this.emit( 'toggle', show );
-   }
-
-   return this;
-};
-
-/**
  * Set the window manager.
  *
  * This will cause the window to initialize. Calling it more than once will 
cause an error.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id94b13c03bd282d5e46f98be0f5a5336f926d459
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] Temporarily remove 'm' from metawiki's $wgLocalInterwikis - change (operations/mediawiki-config)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Temporarily remove 'm' from metawiki's $wgLocalInterwikis
..


Temporarily remove 'm' from metawiki's $wgLocalInterwikis

Bug: T89916
Change-Id: I5b0327966a0cbaee84814c781c49f9a31463586a
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b4f6d71..571f8df 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -200,7 +200,8 @@
'+commonswiki' => array( 'c' ),
'+foundationwiki' => array( 'wmf', 'wikimedia' ),
'mediawikiwiki' => array( 'mw', 'mediawikiwiki' ),
-   '+metawiki' => array( 'm', 'metawikipedia' ),
+   # 'm' temporarily removed by legoktm (2015-02-19) for T89916
+   '+metawiki' => array( 'metawikipedia' ),
'+outreachwiki' => array( 'outreachwiki' ),
'sourceswiki' => array( 'mul', 'oldwikisource' ),
'+wikidatawiki' => array( 'd' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b0327966a0cbaee84814c781c49f9a31463586a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WIP:Sync parserTests with core - change (mediawiki...parsoid)

2015-02-19 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: WIP:Sync parserTests with core
..

WIP:Sync parserTests with core

 * This matches upstream core commit
 60ad62b807d795aecd52f946eaa58a9e50cf9f2c

Change-Id: I75dad9995e173d0bd9ef106ac6574d1e3ef42fbc
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 303 insertions(+), 224 deletions(-)


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


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

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

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

[MediaWiki-commits] [Gerrit] Add missing colon on syslogtag for hhvm-fatal logging - change (operations/puppet)

2015-02-19 Thread Ori.livneh (Code Review)

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

Change subject: Add missing colon on syslogtag for hhvm-fatal logging
..


Add missing colon on syslogtag for hhvm-fatal logging

Missing from I03be7b536.

Change-Id: I840043adc6f4aba9fbc9fa0ebb46d94a32b1b6eb
---
M modules/mediawiki/templates/rsyslog.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/mediawiki/templates/rsyslog.conf.erb 
b/modules/mediawiki/templates/rsyslog.conf.erb
index 70b6886..970ff11 100644
--- a/modules/mediawiki/templates/rsyslog.conf.erb
+++ b/modules/mediawiki/templates/rsyslog.conf.erb
@@ -29,7 +29,7 @@
 stop
 }
 
-if $syslogtag == "hhvm-fatal" then {
+if $syslogtag == "hhvm-fatal:" then {
 @<%= scope['::mediawiki::log_aggregator'] %>;MediaWiki
 <% if scope['::mediawiki::forward_syslog'] -%>
 @<%= scope['::mediawiki::forward_syslog'] %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I840043adc6f4aba9fbc9fa0ebb46d94a32b1b6eb
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] Add missing colon on syslogtag for hhvm-fatal logging - change (operations/puppet)

2015-02-19 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: Add missing colon on syslogtag for hhvm-fatal logging
..

Add missing colon on syslogtag for hhvm-fatal logging

Change-Id: I840043adc6f4aba9fbc9fa0ebb46d94a32b1b6eb
---
M modules/mediawiki/templates/rsyslog.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/191815/1

diff --git a/modules/mediawiki/templates/rsyslog.conf.erb 
b/modules/mediawiki/templates/rsyslog.conf.erb
index 70b6886..970ff11 100644
--- a/modules/mediawiki/templates/rsyslog.conf.erb
+++ b/modules/mediawiki/templates/rsyslog.conf.erb
@@ -29,7 +29,7 @@
 stop
 }
 
-if $syslogtag == "hhvm-fatal" then {
+if $syslogtag == "hhvm-fatal:" then {
 @<%= scope['::mediawiki::log_aggregator'] %>;MediaWiki
 <% if scope['::mediawiki::forward_syslog'] -%>
 @<%= scope['::mediawiki::forward_syslog'] %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I840043adc6f4aba9fbc9fa0ebb46d94a32b1b6eb
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] Allow to set stub read buffer size for TextPassDumper - change (mediawiki/core)

2015-02-19 Thread QChris (Code Review)

QChris has uploaded a new change for review.

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

Change subject: Allow to set stub read buffer size for TextPassDumper
..

Allow to set stub read buffer size for TextPassDumper

The default buffer size of 512KB seems to unconveniently high for
checkpoint tests. To be able to speed up tests in a follow-up commit,
we allow callers to set the buffer size to use for reads of the stub.

Bug: T70653
Change-Id: Ib63e89fac2abaac8feb542839d4d8e53c917ebe1
---
M maintenance/backupTextPass.inc
M maintenance/dumpTextPass.php
M tests/phpunit/maintenance/backupTextPassTest.php
3 files changed, 69 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/14/191814/1

diff --git a/maintenance/backupTextPass.inc b/maintenance/backupTextPass.inc
index 85ebd51..541d4d2 100644
--- a/maintenance/backupTextPass.inc
+++ b/maintenance/backupTextPass.inc
@@ -48,6 +48,8 @@
protected $maxConsecutiveFailedTextRetrievals = 200;
protected $failureTimeout = 5; // Seconds to sleep after db failure
 
+   protected $bufferSize = 512 * 1024; // In bytes. Maximum size to read 
from the stub in on go.
+
protected $php = "php";
protected $spawn = false;
 
@@ -186,6 +188,10 @@
$url = $this->processFileOpt( $val, $param );
 
switch ( $opt ) {
+   case 'buffersize':
+   // Lower bound for xml reading buffer size is 4 
KB
+   $this->bufferSize = max( intval( $val ), 4 * 
1024 );
+   break;
case 'prefetch':
require_once 
"$IP/maintenance/backupPrefetch.inc";
$this->prefetch = new BaseDump( $url );
@@ -368,12 +374,11 @@
xml_set_character_data_handler( $parser, array( &$this, 
'characterData' ) );
 
$offset = 0; // for context extraction on error reporting
-   $bufferSize = 512 * 1024;
do {
if ( $this->checkIfTimeExceeded() ) {
$this->setTimeExceeded();
}
-   $chunk = fread( $input, $bufferSize );
+   $chunk = fread( $input, $this->bufferSize );
if ( !xml_parse( $parser, $chunk, feof( $input ) ) ) {
wfDebug( "TextDumpPass::readDump encountered 
XML parsing error\n" );
 
diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 7c17607..bde5a07 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -59,6 +59,8 @@
   --server=h  Force reading from MySQL server h
   --current  Base ETA on number of pages in database instead of all 
revisions
   --spawnSpawn a subprocess for loading text records
+  --buffersize= Buffer size in bytes to use for reading the stub.
+  (Default: 512KB, Minimum: 4KB)
   --help  Display this help message
 ENDS
);
diff --git a/tests/phpunit/maintenance/backupTextPassTest.php 
b/tests/phpunit/maintenance/backupTextPassTest.php
index 0a977dc..8ed8e10 100644
--- a/tests/phpunit/maintenance/backupTextPassTest.php
+++ b/tests/phpunit/maintenance/backupTextPassTest.php
@@ -3,13 +3,13 @@
 require_once __DIR__ . "/../../../maintenance/backupTextPass.inc";
 
 /**
- * Tests for page dumps of BackupDumper
+ * Tests for TextPassDumper that rely on the database
  *
  * @group Database
  * @group Dump
  * @covers TextPassDumper
  */
-class TextPassDumperTest extends DumpTestCase {
+class TextPassDumperDatabaseTest extends DumpTestCase {
 
// We'll add several pages, revision and texts. The following variables 
hold the
// corresponding ids.
@@ -615,3 +615,61 @@
}
 
 }
+
+/**
+ * Tests for TextPassDumper that do not rely on the database
+ *
+ * (As the Database group is only detected at class level (not method level), 
we
+ * cannot bring this test case's tests into the above main test case.)
+ *
+ * @group Dump
+ * @covers TextPassDumper
+ */
+class TextPassDumperDatabaselessTest extends MediaWikiLangTestCase {
+   /**
+* Ensures that setting the buffer size is effective.
+*
+* @dataProvider bufferSizeProvider
+*/
+   function testBufferSizeSetting( $expected, $size, $msg ) {
+   $dumper = new TextPassDumperAccessor( array( "--buffersize=" . 
$size ) );
+   $this->assertEquals( $expected, $dumper->getBufferSize(), $msg);
+   }
+
+   /**
+* Ensures that setting the buffer size is effective.
+*
+* @dataProvider bufferSizeProvider
+*/
+   function bufferSizeProvider() {
+   // expected, bufferSize to initialize with, message
+   return array(
+   array( 512

[MediaWiki-commits] [Gerrit] Fix some contact autocomplete boxes - change (wikimedia...civicrm)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Fix some contact autocomplete boxes
..


Fix some contact autocomplete boxes

CRM_Utils_Hook::contactListQuery was munging the query so the
aliases didn't come out as the programmer originally intended.

Bug: T90020
Change-Id: I2cbfc568145e7873bc192fce99902733d34d46c0
---
M CRM/Contact/Page/AJAX.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index d1060a2..bc0de27 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -730,7 +730,7 @@
   $dao = CRM_Core_DAO::executeQuery($query);
   while ($dao->fetch()) {
 $result[] = array(
-  'name' => $dao->name,
+  'name' => $dao->sort_name,
   'id' => $dao->id,
 );
   }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cbfc568145e7873bc192fce99902733d34d46c0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Convert Cirrus to use PSR3 style logging - change (mediawiki...CirrusSearch)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Convert Cirrus to use PSR3 style logging
..


Convert Cirrus to use PSR3 style logging

Change-Id: Ifab7844a13fa2cf06f2caa05f69f92d44e3e41d7
---
M includes/BuildDocument/RedirectsAndIncomingLinks.php
M includes/ElasticsearchIntermediary.php
M includes/NearMatchPicker.php
M includes/OtherIndexes.php
M includes/Search/ResultsType.php
M includes/Updater.php
6 files changed, 44 insertions(+), 21 deletions(-)

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



diff --git a/includes/BuildDocument/RedirectsAndIncomingLinks.php 
b/includes/BuildDocument/RedirectsAndIncomingLinks.php
index 6f0c195..a2b6568 100644
--- a/includes/BuildDocument/RedirectsAndIncomingLinks.php
+++ b/includes/BuildDocument/RedirectsAndIncomingLinks.php
@@ -7,6 +7,7 @@
 use Elastica\Search;
 use Elastica\Query\Filtered;
 use Elastica\Query\MatchAll;
+use \MWLoggerFactory;
 
 /**
  * Adds redirects and incoming links to the documents.  These are done together
@@ -115,7 +116,8 @@
$pageIds = array_map( function( $page ) {
return $page->getId();
}, $pages );
-   wfDebugLog( 'CirrusSearchChangeFailed', 'Links 
for page ids: ' . implode( ',', $pageIds ) );
+   MWLoggerFactory::getInstance( 
'CirrusSearchChangeFailed' )->info(
+   'Links for page ids: ' . implode( ',', 
$pageIds ) );
}
}
}
diff --git a/includes/ElasticsearchIntermediary.php 
b/includes/ElasticsearchIntermediary.php
index a4ae896..d828e93 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -3,6 +3,7 @@
 namespace CirrusSearch;
 use Elastica\Exception\PartialShardFailureException;
 use Elastica\Exception\ResponseException;
+use \MWLoggerFactory;
 use \Status;
 
 /**
@@ -171,10 +172,10 @@
}
 
// Now log and clear our state.
-   wfDebugLog( 'CirrusSearchRequests', $logMessage );
+   MWLoggerFactory::getInstance( 'CirrusSearchRequests' )->debug( 
$logMessage );
if ( $this->slowMillis && $took >= $this->slowMillis ) {
$logMessage .= $this->user ? ' for ' . 
$this->user->getName() : '';
-   wfDebugLog( 'CirrusSearchSlowRequests', $logMessage );
+   MWLoggerFactory::getInstance( 
'CirrusSearchSlowRequests' )->info( $logMessage );
}
$this->requestStart = null;
return $took;
diff --git a/includes/NearMatchPicker.php b/includes/NearMatchPicker.php
index 044e37b..d0472bb 100644
--- a/includes/NearMatchPicker.php
+++ b/includes/NearMatchPicker.php
@@ -1,6 +1,7 @@
 titles[ 0 ][ 'redirectMatches' ][ 0 
] ) ) {
return $this->titles[ 0 ][ 'redirectMatches' ][ 
0 ];
}
-   wfDebugLog( 'CirrusSearch', 'NearMatchPicker built with 
busted matches.  Assuming no near match');
+   MWLoggerFactory::getInstance( 'CirrusSearch' )->info(
+   'NearMatchPicker built with busted matches.  
Assuming no near match' );
return null;
}
 
diff --git a/includes/OtherIndexes.php b/includes/OtherIndexes.php
index ed7e382..11f973a 100644
--- a/includes/OtherIndexes.php
+++ b/includes/OtherIndexes.php
@@ -1,6 +1,7 @@
 start( "updating $updatesInBulk documents in 
other indexes" );
$bulk->send();
} catch ( \Elastica\Exception\Bulk\ResponseException $e ) {
-   if ( $this->bulkResponseExceptionIsJustDocumentMissing( 
$e, null ) ) {
+   if ( $this->bulkResponseExceptionIsJustDocumentMissing( 
$e ) ) {
$exception = $e;
}
} catch ( \Elastica\Exception\ExceptionInterface $e ) {
@@ -188,8 +189,8 @@
$articleIDs = array_map( function( $title ) {
return $title->getArticleID();
}, $titles );
-   wfDebugLog( 'CirrusSearchChangeFailed', "Other Index 
$actionName for article ids: " .
-   implode( ',', $articleIDs ) );
+   MWLoggerFactory::getInstance( 
'CirrusSearchChangeFailed' )->info(
+   "Other Index $actionName for article ids: " . 
implode( ',', $articleIDs ) );
return false;
}
}
diff --git a/includes/Search/ResultsType.php b/includes/Search/ResultsType.php
index 9859ba0..ffa2cbb 100644
--- a/includes/Search/ResultsType.php
+++ b/includes/Search/ResultsType.php
@@ -3,

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: f91974e..7e6eba0 - change (mediawiki/extensions)

2015-02-19 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: f91974e..7e6eba0
..


Syncronize VisualEditor: f91974e..7e6eba0

Change-Id: Ia4be1f983ed0c102a7b4c8077a39cba85de77f7f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index f91974e..7e6eba0 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit f91974ed0f26228caecce48c40509b0e518edb3c
+Subproject commit 7e6eba0fe87da529a277245dc51c7520358a4af0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4be1f983ed0c102a7b4c8077a39cba85de77f7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: f91974e..7e6eba0 - change (mediawiki/extensions)

2015-02-19 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: f91974e..7e6eba0
..

Syncronize VisualEditor: f91974e..7e6eba0

Change-Id: Ia4be1f983ed0c102a7b4c8077a39cba85de77f7f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index f91974e..7e6eba0 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit f91974ed0f26228caecce48c40509b0e518edb3c
+Subproject commit 7e6eba0fe87da529a277245dc51c7520358a4af0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4be1f983ed0c102a7b4c8077a39cba85de77f7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Sync up with Parsoid parserTests.
..


Sync up with Parsoid parserTests.

This now aligns with Parsoid commit b3127b83a8923c7d73c7e00eb0c651e039b84521

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

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



diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index e525cac..b85516c 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -115,13 +115,27 @@
 Template:table_attribs
 !! text
 
-|style="color: red"| Foo
+|style="color:red;"|Foo
+!! endarticle
+
+!! article
+Template:table_attribs_2
+!! text
+
+|style="color:red;"|Foo
+|Bar||Baz
+!! endarticle
+
+!! article
+Template:table_header_cells
+!! text
+{{table_attribs}}!!style='color:red;'|''Bar''||style='color:brown;'|''Foo'' 
and Baz
 !! endarticle
 
 !! article
 Template:table_cells
 !! text
-{{table_attribs}} || Bar || Baz
+{{table_attribs}}||style='color:red;'|''Bar''||style='color:brown;'|''Foo'' 
and Baz
 !! endarticle
 
 !! article
@@ -5636,7 +5650,7 @@
 !! end
 
 !! test
-Template-generated table cell attributes and cell content
+1. Template-generated table cell attributes and cell content
 !! wikitext
 {|
 |{{table_attribs}}
@@ -5648,33 +5662,67 @@
 !! html
 
 
- Foo
+Foo
 
- Foo
+Foo
 
- Foo
+Foo
 
- Foo
+Foo
 
- Foo
+Foo
 
 
 !! end
 
 !! test
-Template-generated table cell attributes and cell content (2)
+2. Template-generated table cell attributes and cell content
 !! wikitext
 {|
-|align=center {{table_cells}}
+|{{table_attribs_2}}
 |}
-!! html
+!! html/php
 
 
- Foo 
- Bar 
- Baz
+Foo
+
+Bar
+Baz
 
 
+!! html/parsoid
+
+Foo
+BarBaz
+
+!! end
+
+!! test
+3. Template-generated table cell attributes and cell content
+!! wikitext
+{|
+!align=center {{table_header_cells}}
+|-
+|align=center {{table_cells}}
+|}
+!! html/php
+
+
+Foo
+Bar
+Foo and Baz
+
+
+Foo
+Bar
+Foo and Baz
+
+
+!! html/parsoid
+
+FooBarFoo and 
Baz
+FooBarFoo and Baz
+
 !! end
 
 !! test
@@ -8829,12 +8877,18 @@
 # From plwiki:PLOS_ONE
 !! test
 Parsoid: Page property magic word with magic word contents
-!! options
-parsoid
 !! wikitext
 {{DISPLAYTITLE:''{{PAGENAME}}''}}
-!! html
+!! html/parsoid
 
+!! end
+
+!! test
+Parsoid: Template-generated DISPLAYTITLE
+!! wikitext
+echo|DISPLAYTITLE}}:Foo}}
+!! html/parsoid
+
 !! end
 
 !! test
@@ -13120,12 +13174,18 @@
 
 !! test
 Parsoid: Defaultsort
-!! options
-parsoid
 !! wikitext
 {{DEFAULTSORT:Foo}}
-!! html
+!! html/parsoid
 
+!! end
+
+!! test
+Parsoid: Defaultsort (template-generated)
+!! wikitext
+echo|DEFAULTSORT}}:Foo}}
+!! html/parsoid
+
 !! end
 
 ###
@@ -19658,10 +19718,16 @@
 A foo
 B foo
 C 
+
 !! html
 A [1]
 B [2]
 C [3]
+
+↑ foo
+↑ foo
+↑
+
 !!end
 
 !!test
@@ -19671,9 +19737,13 @@
 !! wikitext
 A foo
 B 
+
 !! html
 A [1]
 B [1]
+
+↑ 1.0 1.1 foo
+
 !!end
 
 !!test
@@ -19684,10 +19754,14 @@
 A foo
 B 
 C 
+
 !! html
 A [1]
 B [1]
 C [1]
+
+↑ 1.0 1.1 1.2 foo
+
 !!end
 
 # NOTE: constructor is a predefined property in JS and constructor as a 
ref-name can clash with it if not handled properly)
@@ -19697,8 +19771,12 @@
 parsoid
 !! wikitext
 A foo
+
 !! html
 A [1]
+
+↑ foo
+
 !!end
 
 !!test
@@ -19833,9 +19911,14 @@
 !! wikitext
 A foo B
 C bar D
+
 !! html
 A [1] B
 C [2] D
+
+↑ foo
+↑ bar
+
 !!end
 
 !!test
@@ -19849,6 +19932,7 @@
 
 
 c
+
 !! html
 a
 
@@ -19857,6 +19941,10 @@
 [2]
 
 c
+
+↑
+↑
+
 !!end
 
 !!test
@@ -19867,9 +19955,14 @@
 foo A
 bar
  B
+
 !! html
 [1] A
 [2] B
+
+↑ foo
+↑ bar
+
 !!end
 
 !!test
@@ -19985,13 +20078,22 @@
 !! wikitext
 A foo
 B bar
+C baz
 
 
+
+
 !! html
 A [a 1]
-B [b 1]
+B [b 1]
+C [1]
 
 ↑ 
foo
+
+↑ 
baz
+
+
+↑ bar
 
 !!end
 
@@ -20099,13 +20201,50 @@
 !! end
 
 !! test
+References: 8. T88019: Remove s from templates inside  that's 
itself inside a template
+!! options
+parsoid
+!! wikitext
+X{{echo|foo {{echo|bar}} and {{echo|baz}} boo}}
+
+!! html
+X[1]
+↑ 
foo bar and baz boo
+!!end
+
+# This test only works in wt2html now as the  are always 
generated
+# unless selser is active. Once T72722 is fixed, we should add a changes test
+# here to ensure that unrelated changes don't add the new  in
+# wt2wt.
+!! test
+References: 9. Generate missing references list at the end
+!! options
+parsoid
+!! wikitext
+A foo
+B bar
+!! html
+A [1] B [inexistent 1]
+
+↑ foo
+
+
+↑ bar
+
+!! end
+
+!! test
 Entities in ref name
 !! options
 parsoid
 !! wikitext
 hi
+
 !! html
 [1]
+
+↑ hi
+
 !! end
 
 # This test is wt2html only because we're permitting the serializer to produce
@@ -21386,6 +21525,7 @@
 '''foo'' test
 '''foo'' test
 '''foo'' and  bar
+
 !! html
 'a foo bar
 a' foo bar
@@ -21394,6 +21534,9 @@
 'foo [1]
 'foo test
 'foo and  bar
+
+↑ test
+
 !! end
 
 !! test
@@ -21507,8 +21650,12 @@
 !! wikitext
 foo ''a''
  b
+
 !!

[MediaWiki-commits] [Gerrit] Add a warning about $wgVisualEditorPluginModules race condition - change (mediawiki...VisualEditor)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Add a warning about $wgVisualEditorPluginModules race condition
..


Add a warning about $wgVisualEditorPluginModules race condition

Warn developers not to delist a plugin module and remove it in a single
deployment, since the relevant cache layers are not synchronized, making a race
condition possible. See I627a0d5d8 for an example.

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

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



diff --git a/VisualEditor.php b/VisualEditor.php
index 46b3f30..b499cf0 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -1493,6 +1493,11 @@
 
 // Array of ResourceLoader module names (strings) that should be loaded when 
VisualEditor is
 // loaded. Other extensions that extend VisualEditor should add to this array.
+//
+// WARNING: When removing a module, first remove it from this array, wait for 
the change
+// to propagate, and only then remove the module code and module registration. 
Otherwise
+// there may be a period of time during which VisualEditor depends on a module 
that no
+// longer exists.
 $wgVisualEditorPluginModules = array();
 
 // Array of modules to load based on a preference. Keys are preference names, 
values are

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I488bafa08a5eab6b40fa73bb5ca031fb5a6aa9ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Temporarily remove 'm' from metawiki's $wgLocalInterwikis - change (operations/mediawiki-config)

2015-02-19 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Temporarily remove 'm' from metawiki's $wgLocalInterwikis
..

Temporarily remove 'm' from metawiki's $wgLocalInterwikis

Bug: T89916
Change-Id: I5b0327966a0cbaee84814c781c49f9a31463586a
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b4f6d71..571f8df 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -200,7 +200,8 @@
'+commonswiki' => array( 'c' ),
'+foundationwiki' => array( 'wmf', 'wikimedia' ),
'mediawikiwiki' => array( 'mw', 'mediawikiwiki' ),
-   '+metawiki' => array( 'm', 'metawikipedia' ),
+   # 'm' temporarily removed by legoktm (2015-02-19) for T89916
+   '+metawiki' => array( 'metawikipedia' ),
'+outreachwiki' => array( 'outreachwiki' ),
'sourceswiki' => array( 'mul', 'oldwikisource' ),
'+wikidatawiki' => array( 'd' ),

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

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

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

[MediaWiki-commits] [Gerrit] Allow edit summaries to be up to 767 bytes long - change (mediawiki/core)

2015-02-19 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Allow edit summaries to be up to 767 bytes long
..

Allow edit summaries to be up to 767 bytes long

This is just the db part. The changes to UI validation code will
come in a dependent patch later.

This changes the max size of various _comment fields to be
767 bytes. This size is chosen to be consistent with the largest
we can get away with well still having covering indexes.

It also unifies the various data types of these fields to
varbinary. (Note, this was previously done and reverted in
r80547, but I don't think the reason for revert applies to
the edit summary fields)

This does not increase the size on MyISAM, since MyISAM has a
much smaller max index size (on the other hand, we don't have
any covering indexes on these fields in default install, and
MyISAM folks probably aren't messing with defaults, so maybe that
is not something to worry about?)

Note: This patch increases min mysql version to 5.0.3.

Bug: T6715
Change-Id: I8558e80a18e4591f07f2c3e80f792ea4435c4e71
---
M includes/db/Database.php
M includes/db/DatabaseMysqlBase.php
M includes/db/DatabaseSqlite.php
M includes/installer/MysqlInstaller.php
M includes/installer/MysqlUpdater.php
A maintenance/archives/patch-editsummary-length.sql
M maintenance/tables.sql
7 files changed, 63 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/191811/1

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 8fa10a6..2609c4f 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -46,6 +46,10 @@
/** Maximum time to wait before retry */
const DEADLOCK_DELAY_MAX = 150;
 
+   /** How long an edit summary */
+   const SHORT_EDIT_SUMMARY = 255;
+   const LONG_EDIT_SUMMARY = 767;
+
protected $mLastQuery = '';
protected $mDoneWrites = false;
protected $mPHPError = false;
@@ -4375,4 +4379,16 @@
trigger_error( "DB transaction callbacks still pending 
(from $callers)." );
}
}
+
+   /**
+* Get the max length of an edit summary
+*
+* Innodb supports larger length than some other engines
+* @note If changing this, also change MysqlInstaller::getSchemaVars
+* @since 1.25
+* @return integer (Either self::SHORT_EDIT_SUMMARY or 
self::LONG_EDIT_SUMMARY)
+*/
+   public function getEditSummaryLength() {
+   return self::SHORT_EDIT_SUMMARY;
+   }
 }
diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index c1f2969..4a45c4c 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -1103,6 +1103,7 @@
 */
protected function getDefaultSchemaVars() {
$vars = parent::getDefaultSchemaVars();
+   $vars['wgEditSummaryLength'] = $this->getEditSummaryLength();
$vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE', 
$GLOBALS['wgDBTableOptions'] );
$vars['wgDBTableOptions'] = str_replace(
'CHARSET=mysql4',
@@ -1180,6 +1181,27 @@
public function isView( $name, $prefix = null ) {
return in_array( $name, $this->listViews( $prefix ) );
}
+
+   /**
+* Get the max length of an edit summary
+*
+* Innodb supports larger length than some other engines.
+* In particular, the MyISAM engine puts length limits on the total
+* size of an index which would interfere with covering indexes.
+* OTOH, there are no covering indexes on this field in the default
+* config, and people who a custom doing their indexes probably
+* aren't using MyISAM. So maybe no need to worry?
+*
+* @since 1.25
+* @return integer
+*/
+   public function getEditSummaryLength() {
+   global $wgDBTableOptions;
+   if ( strstr( $wgDBTableOptions, 'InnoDB' ) !== false ) {
+   return self::LONG_EDIT_SUMMARY;
+   }
+   return self::SHORT_EDIT_SUMMARY;
+   }
 }
 
 /**
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 95c44df..28ada5f 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -806,7 +806,7 @@
// CREATE TABLE hacks to allow schema file sharing with 
MySQL
 
// binary/varbinary column type -> blob
-   $s = preg_replace( '/\b(var)?binary(\(\d+\))/i', 
'BLOB', $s );
+   $s = preg_replace( '/\b(var)?binary(\([^)]+\))/i', 
'BLOB', $s );
// no such thing as unsigned
$s = preg_replace( '/\b(un)?signed\b/i', '', $s );

[MediaWiki-commits] [Gerrit] Add a warning about $wgVisualEditorPluginModules race condition - change (mediawiki...VisualEditor)

2015-02-19 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Add a warning about $wgVisualEditorPluginModules race condition
..

Add a warning about $wgVisualEditorPluginModules race condition

Warn developers not to delist a plugin module and remove it in a single
deployment, since the relevant cache layers are not synchronized, making a race
condition possible. See I627a0d5d8 for an example.

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


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

diff --git a/VisualEditor.php b/VisualEditor.php
index 46b3f30..b499cf0 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -1493,6 +1493,11 @@
 
 // Array of ResourceLoader module names (strings) that should be loaded when 
VisualEditor is
 // loaded. Other extensions that extend VisualEditor should add to this array.
+//
+// WARNING: When removing a module, first remove it from this array, wait for 
the change
+// to propagate, and only then remove the module code and module registration. 
Otherwise
+// there may be a period of time during which VisualEditor depends on a module 
that no
+// longer exists.
 $wgVisualEditorPluginModules = array();
 
 // Array of modules to load based on a preference. Keys are preference names, 
values are

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

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

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

[MediaWiki-commits] [Gerrit] Make logging less noisy in debug mode - change (mediawiki...MultimediaViewer)

2015-02-19 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Make logging less noisy in debug mode
..

Make logging less noisy in debug mode

Suppress logger console output if the logger is disabled.

Change-Id: I5f45bb7fc68f33880f8a4d1737f0055335fe5071
---
M resources/mmv/logging/mmv.logging.ActionLogger.js
M resources/mmv/logging/mmv.logging.AttributionLogger.js
M resources/mmv/logging/mmv.logging.DimensionLogger.js
M resources/mmv/logging/mmv.logging.DurationLogger.js
M resources/mmv/logging/mmv.logging.Logger.js
M resources/mmv/logging/mmv.logging.PerformanceLogger.js
6 files changed, 42 insertions(+), 8 deletions(-)


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

diff --git a/resources/mmv/logging/mmv.logging.ActionLogger.js 
b/resources/mmv/logging/mmv.logging.ActionLogger.js
index 7d55dd0..63fe9bd 100644
--- a/resources/mmv/logging/mmv.logging.ActionLogger.js
+++ b/resources/mmv/logging/mmv.logging.ActionLogger.js
@@ -130,7 +130,9 @@
var actionText = this.logActions[action] || action,
self = this;
 
-   mw.log( actionText );
+   if ( this.isEnabled() ) {
+   mw.log( actionText );
+   }
 
if ( forceEventLog || self.isInSample( action ) ) {
return this.loadDependencies().then( function () {
@@ -169,6 +171,18 @@
return Math.floor( Math.random() * factor ) === 0;
};
 
+   /**
+* Returns whether logging this event is enabled. This is intended for 
console logging, which
+* (in debug mode) should be done even if the request is not being 
sampled, as long as logging
+* is enabled for some sample.
+* @param {string} action The key representing the action
+* @returns {boolean} True if this logging is enabled
+*/
+   L.isEnabled = function ( action ) {
+   var factor = this.getActionFactor( action );
+   return $.isNumeric( factor ) && factor >= 1;
+   };
+
mw.mmv.logging.ActionLogger = ActionLogger;
mw.mmv.actionLogger = new ActionLogger();
 }( mediaWiki, jQuery, OO ) );
diff --git a/resources/mmv/logging/mmv.logging.AttributionLogger.js 
b/resources/mmv/logging/mmv.logging.AttributionLogger.js
index 330ef30..44d4773 100644
--- a/resources/mmv/logging/mmv.logging.AttributionLogger.js
+++ b/resources/mmv/logging/mmv.logging.AttributionLogger.js
@@ -56,9 +56,12 @@
loggedIn: !mw.user.isAnon(),
samplingFactor: this.samplingFactor
};
-   mw.log( 'author: ' + ( data.authorPresent ? 'present' : 
'absent' ) +
-   ', source: ' + ( data.sourcePresent ? 'present' : 
'absent' ) +
-   ', license: ' + ( data.licensePresent ? 'present' : 
'absent' ) );
+
+   if ( this.isEnabled() ) {
+   mw.log( 'author: ' + ( data.authorPresent ? 'present' : 
'absent' ) +
+   ', source: ' + ( data.sourcePresent ? 'present' 
: 'absent' ) +
+   ', license: ' + ( data.licensePresent ? 
'present' : 'absent' ) );
+   }
 
this.log( data );
};
diff --git a/resources/mmv/logging/mmv.logging.DimensionLogger.js 
b/resources/mmv/logging/mmv.logging.DimensionLogger.js
index ca18f0c..1bcad32 100644
--- a/resources/mmv/logging/mmv.logging.DimensionLogger.js
+++ b/resources/mmv/logging/mmv.logging.DimensionLogger.js
@@ -66,7 +66,10 @@
context: context,
samplingFactor: this.samplingFactor
};
-   mw.log( 'mw.mmw.logger.DimensionLogger', data );
+
+   if ( this.isEnabled() ) {
+   mw.log( 'mw.mmw.logger.DimensionLogger', data );
+   }
 
this.log( data );
};
diff --git a/resources/mmv/logging/mmv.logging.DurationLogger.js 
b/resources/mmv/logging/mmv.logging.DurationLogger.js
index 99728fb..591048e 100644
--- a/resources/mmv/logging/mmv.logging.DurationLogger.js
+++ b/resources/mmv/logging/mmv.logging.DurationLogger.js
@@ -136,7 +136,9 @@
} );
}
 
-   mw.log( 'mw.mmw.logger.DurationLogger', e );
+   if ( this.isEnabled() ) {
+   mw.log( 'mw.mmw.logger.DurationLogger', e );
+   }
 
this.log( e );
 
diff --git a/resources/mmv/logging/mmv.logging.Logger.js 
b/resources/mmv/logging/mmv.logging.Logger.js
index af36f5e..fffe72c 100644
--- a/resources/mmv/logging/mmv.logging.Logger.js
+++ b/resources/mmv/logging/mmv.logging.Logger.js
@@ -103,6 +103,16 @@
};
 
/**
+* Returns whether logging this event is enabled. This is int

[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)

2015-02-19 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Sync up with Parsoid parserTests.
..

Sync up with Parsoid parserTests.

This now aligns with Parsoid commit b3127b83a8923c7d73c7e00eb0c651e039b84521

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/191808/1

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index e525cac..b85516c 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -115,13 +115,27 @@
 Template:table_attribs
 !! text
 
-|style="color: red"| Foo
+|style="color:red;"|Foo
+!! endarticle
+
+!! article
+Template:table_attribs_2
+!! text
+
+|style="color:red;"|Foo
+|Bar||Baz
+!! endarticle
+
+!! article
+Template:table_header_cells
+!! text
+{{table_attribs}}!!style='color:red;'|''Bar''||style='color:brown;'|''Foo'' 
and Baz
 !! endarticle
 
 !! article
 Template:table_cells
 !! text
-{{table_attribs}} || Bar || Baz
+{{table_attribs}}||style='color:red;'|''Bar''||style='color:brown;'|''Foo'' 
and Baz
 !! endarticle
 
 !! article
@@ -5636,7 +5650,7 @@
 !! end
 
 !! test
-Template-generated table cell attributes and cell content
+1. Template-generated table cell attributes and cell content
 !! wikitext
 {|
 |{{table_attribs}}
@@ -5648,33 +5662,67 @@
 !! html
 
 
- Foo
+Foo
 
- Foo
+Foo
 
- Foo
+Foo
 
- Foo
+Foo
 
- Foo
+Foo
 
 
 !! end
 
 !! test
-Template-generated table cell attributes and cell content (2)
+2. Template-generated table cell attributes and cell content
 !! wikitext
 {|
-|align=center {{table_cells}}
+|{{table_attribs_2}}
 |}
-!! html
+!! html/php
 
 
- Foo 
- Bar 
- Baz
+Foo
+
+Bar
+Baz
 
 
+!! html/parsoid
+
+Foo
+BarBaz
+
+!! end
+
+!! test
+3. Template-generated table cell attributes and cell content
+!! wikitext
+{|
+!align=center {{table_header_cells}}
+|-
+|align=center {{table_cells}}
+|}
+!! html/php
+
+
+Foo
+Bar
+Foo and Baz
+
+
+Foo
+Bar
+Foo and Baz
+
+
+!! html/parsoid
+
+FooBarFoo and 
Baz
+FooBarFoo and Baz
+
 !! end
 
 !! test
@@ -8829,12 +8877,18 @@
 # From plwiki:PLOS_ONE
 !! test
 Parsoid: Page property magic word with magic word contents
-!! options
-parsoid
 !! wikitext
 {{DISPLAYTITLE:''{{PAGENAME}}''}}
-!! html
+!! html/parsoid
 
+!! end
+
+!! test
+Parsoid: Template-generated DISPLAYTITLE
+!! wikitext
+echo|DISPLAYTITLE}}:Foo}}
+!! html/parsoid
+
 !! end
 
 !! test
@@ -13120,12 +13174,18 @@
 
 !! test
 Parsoid: Defaultsort
-!! options
-parsoid
 !! wikitext
 {{DEFAULTSORT:Foo}}
-!! html
+!! html/parsoid
 
+!! end
+
+!! test
+Parsoid: Defaultsort (template-generated)
+!! wikitext
+echo|DEFAULTSORT}}:Foo}}
+!! html/parsoid
+
 !! end
 
 ###
@@ -19658,10 +19718,16 @@
 A foo
 B foo
 C 
+
 !! html
 A [1]
 B [2]
 C [3]
+
+↑ foo
+↑ foo
+↑
+
 !!end
 
 !!test
@@ -19671,9 +19737,13 @@
 !! wikitext
 A foo
 B 
+
 !! html
 A [1]
 B [1]
+
+↑ 1.0 1.1 foo
+
 !!end
 
 !!test
@@ -19684,10 +19754,14 @@
 A foo
 B 
 C 
+
 !! html
 A [1]
 B [1]
 C [1]
+
+↑ 1.0 1.1 1.2 foo
+
 !!end
 
 # NOTE: constructor is a predefined property in JS and constructor as a 
ref-name can clash with it if not handled properly)
@@ -19697,8 +19771,12 @@
 parsoid
 !! wikitext
 A foo
+
 !! html
 A [1]
+
+↑ foo
+
 !!end
 
 !!test
@@ -19833,9 +19911,14 @@
 !! wikitext
 A foo B
 C bar D
+
 !! html
 A [1] B
 C [2] D
+
+↑ foo
+↑ bar
+
 !!end
 
 !!test
@@ -19849,6 +19932,7 @@
 
 
 c
+
 !! html
 a
 
@@ -19857,6 +19941,10 @@
 [2]
 
 c
+
+↑
+↑
+
 !!end
 
 !!test
@@ -19867,9 +19955,14 @@
 foo A
 bar
  B
+
 !! html
 [1] A
 [2] B
+
+↑ foo
+↑ bar
+
 !!end
 
 !!test
@@ -19985,13 +20078,22 @@
 !! wikitext
 A foo
 B bar
+C baz
 
 
+
+
 !! html
 A [a 1]
-B [b 1]
+B [b 1]
+C [1]
 
 ↑ 
foo
+
+↑ 
baz
+
+
+↑ bar
 
 !!end
 
@@ -20099,13 +20201,50 @@
 !! end
 
 !! test
+References: 8. T88019: Remove s from templates inside  that's 
itself inside a template
+!! options
+parsoid
+!! wikitext
+X{{echo|foo {{echo|bar}} and {{echo|baz}} boo}}
+
+!! html
+X[1]
+↑ 
foo bar and baz boo
+!!end
+
+# This test only works in wt2html now as the  are always 
generated
+# unless selser is active. Once T72722 is fixed, we should add a changes test
+# here to ensure that unrelated changes don't add the new  in
+# wt2wt.
+!! test
+References: 9. Generate missing references list at the end
+!! options
+parsoid
+!! wikitext
+A foo
+B bar
+!! html
+A [1] B [inexistent 1]
+
+↑ foo
+
+
+↑ bar
+
+!! end
+
+!! test
 Entities in ref name
 !! options
 parsoid
 !! wikitext
 hi
+
 !! html
 [1]
+
+↑ hi
+
 !! end
 
 # This test is wt2html only because we're permitting the serializer to produce
@@ -21386,6 +21525,7 @@
 '''foo'' test
 '''foo'' test
 '''foo'' and  bar
+
 !! html
 'a foo bar
 a' foo bar
@@ -21394,6 +21534,9 @@
 'foo [1]
 'foo test
 'foo and  bar
+
+↑ test
+
 !! end
 
 !! test
@@ -21507,8 +21650,12 @@
 !!

[MediaWiki-commits] [Gerrit] Split the Collection model and add JSON serialization - change (mediawiki...Gather)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Split the Collection model and add JSON serialization
..


Split the Collection model and add JSON serialization

And also add JSON serialization on the models.

On the list of collections page it will use CollectionInfo which is the base
model plus a count attribute.

On the details page of a collection it will use the full Collection, which has
the base plus the items of the collection fully expanded.

This should work but is part of a bigger patch for creating the storage for the
index file. Check previous and next patches also.

Change-Id: Ia36e9d61d771241f55aa8202f7a9dcf6f8dd3f64
---
M Gather.php
M extension.json
M includes/models/Collection.php
A includes/models/CollectionBase.php
A includes/models/CollectionInfo.php
M includes/models/CollectionItem.php
6 files changed, 229 insertions(+), 135 deletions(-)

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



diff --git a/Gather.php b/Gather.php
index 70b2c01..f8f02d6 100644
--- a/Gather.php
+++ b/Gather.php
@@ -43,6 +43,8 @@
'Gather\Hooks' => 'Gather.hooks',
 
'Gather\models\CollectionItem' => 'models/CollectionItem',
+   'Gather\models\CollectionBase' => 'models/CollectionBase',
+   'Gather\models\CollectionInfo' => 'models/CollectionInfo',
'Gather\models\Collection' => 'models/Collection',
'Gather\models\WithImage' => 'models/WithImage',
 
diff --git a/extension.json b/extension.json
index da9426b..13648fe 100644
--- a/extension.json
+++ b/extension.json
@@ -26,6 +26,8 @@
"AutoloadClasses": {
"Gather\\Hooks": "includes/Gather.hooks.php",
"Gather\\models\\CollectionItem": 
"includes/models/CollectionItem.php",
+   "Gather\\models\\CollectionBase": 
"includes/models/CollectionBase.php",
+   "Gather\\models\\CollectionInfo": 
"includes/models/CollectionInfo.php",
"Gather\\models\\Collection": "includes/models/Collection.php",
"Gather\\models\\WithImage": "includes/models/WithImage.php",
"Gather\\stores\\Collection": "includes/stores/Collection.php",
diff --git a/includes/models/Collection.php b/includes/models/Collection.php
index 01eddc7..e9234d6 100644
--- a/includes/models/Collection.php
+++ b/includes/models/Collection.php
@@ -6,16 +6,13 @@
 
 namespace Gather\models;
 
-use \User;
-use \Title;
 use \IteratorAggregate;
 use \ArrayIterator;
-use \SpecialPage;
 
 /**
- * A collection of items, which are represented by the CollectionItem class.
+ * A collection with a list of items, which are represented by the 
CollectionItem class.
  */
-class Collection implements IteratorAggregate, WithImage {
+class Collection extends CollectionBase implements IteratorAggregate {
 
/**
 * The internal collection of items.
@@ -23,63 +20,6 @@
 * @var CollectionItem[]
 */
protected $items = array();
-
-   /**
-* The internal id of a collection
-*
-* @var int id
-*/
-   protected $id;
-
-   /**
-* Owner of collection
-* @var User
-*/
-   protected $owner;
-
-   /**
-* @var string
-*/
-   protected $title;
-
-   /**
-* @var string
-*/
-   protected $description;
-
-   /**
-* Whether collection is public or private
-* Collection by default is true
-*
-* @var bool
-*/
-   protected $public;
-
-   /**
-* Image that represents the collection.
-*
-* @var File
-*/
-   protected $image;
-
-   /**
-* @param int $id id of the collection. Null if not persisted yet
-* @param User $user User that owns the collection
-* @param string $title Title of the collection
-* @param string $description Description of the collection
-* @param File $image Main image of the collection
-* @param boolean $public Whether the collection is public or private
-*/
-   public function __construct( $id = null, User $user, $title = '', 
$description = '',
-   $image = null, $public = true ) {
-
-   $this->id = $id;
-   $this->owner = $user;
-   $this->title = $title;
-   $this->description = $description;
-   $this->image = $image;
-   $this->public = $public;
-   }
 
/**
 * Adds a item to the collection.
@@ -111,49 +51,10 @@
}
 
/**
-* @return User
+* @return array list of items
 */
-   public function getOwner() {
-   return $this->owner;
-   }
-
-   /**
-* @return string
-*/
-   public function getTitle() {
-   return $this->title;
-   }
-
-   /**
-* @return string
-

[MediaWiki-commits] [Gerrit] Fix some contact autocomplete boxes - change (wikimedia...civicrm)

2015-02-19 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Fix some contact autocomplete boxes
..

Fix some contact autocomplete boxes

CRM_Utils_Hook::contactListQuery was munging the query so the
aliases didn't come out as the programmer originally intended.

Bug: T90020
Change-Id: I2cbfc568145e7873bc192fce99902733d34d46c0
---
M CRM/Contact/Page/AJAX.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index d1060a2..bc0de27 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -730,7 +730,7 @@
   $dao = CRM_Core_DAO::executeQuery($query);
   while ($dao->fetch()) {
 $result[] = array(
-  'name' => $dao->name,
+  'name' => $dao->sort_name,
   'id' => $dao->id,
 );
   }

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

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

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

[MediaWiki-commits] [Gerrit] Don't enable the UI if CentralAuth is not installed - change (mediawiki...WikiGrok)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Don't enable the UI if CentralAuth is not installed
..


Don't enable the UI if CentralAuth is not installed

Bug: T90010
Change-Id: I7bc1cbf190e052d7e6226a87b71ac67d9db96def
---
M WikiGrok.php
M includes/Hooks.php
2 files changed, 12 insertions(+), 3 deletions(-)

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



diff --git a/WikiGrok.php b/WikiGrok.php
index 959168b..e0f5453 100644
--- a/WikiGrok.php
+++ b/WikiGrok.php
@@ -165,6 +165,7 @@
 
 /**
  * Controls whether the WikiGrok UI is enabled
+ * For WikiGrok UI to show up CentralAuth needs to be installed too.
  */
 $wgWikiGrokUIEnable = false;
 
diff --git a/includes/Hooks.php b/includes/Hooks.php
index e3593a2..876d324 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -19,6 +19,14 @@
  * Hook handlers class
  */
 class Hooks {
+   /**
+* Utility function for determining whether the UI is enabled
+* @return bool
+*/
+   protected function isUIEnabled() {
+   $config = self::getConfig();
+   return $config->get( 'WikiGrokUIEnable') && class_exists( 
'ApiCentralAuthToken' );
+   }
 
/**
 * OutputPageParserOutput hook handler
@@ -226,7 +234,7 @@
$config = self::getConfig();
$inBeta = MobileContext::singleton()->isBetaGroupMember();
 
-   if ( $config->get( 'WikiGrokUIEnable') ) {
+   if ( self::isUIEnabled() ) {
$out->addModules( 'ext.wikigrok.startup' );
 
if ( $inBeta && $config->get( 
'WikiGrokUIEnableInSidebar' ) ) {
@@ -247,8 +255,8 @@
public static function onMinervaDiscoveryTools( &$items ) {
$config = self::getConfig();
 
-   if ( MobileContext::singleton()->isBetaGroupMember() &&
-   $config->get( 'WikiGrokUIEnable') &&
+   if ( self::isUIEnabled() &&
+   MobileContext::singleton()->isBetaGroupMember() &&
$config->get( 'WikiGrokUIEnableInSidebar' )
) {
$items += array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bc1cbf190e052d7e6226a87b71ac67d9db96def
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
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] Check for $_SESSION being set before sending to FauxRequest - change (mediawiki...SemanticForms)

2015-02-19 Thread tosfos (Code Review)

tosfos has uploaded a new change for review.

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

Change subject: Check for $_SESSION being set before sending to FauxRequest
..

Check for $_SESSION being set before sending to FauxRequest

Fix for PHP notice caused by I1607be3b6
Bug: T89773

Change-Id: I5b731a14b5668cc4f1a92a4d4b95e2423f4dd819
---
M includes/SF_AutoeditAPI.php
1 file changed, 10 insertions(+), 2 deletions(-)


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

diff --git a/includes/SF_AutoeditAPI.php b/includes/SF_AutoeditAPI.php
index 44f385b..3cfac3c 100644
--- a/includes/SF_AutoeditAPI.php
+++ b/includes/SF_AutoeditAPI.php
@@ -836,7 +836,11 @@
if ( $preloadContent !== '' ) {
 
// Spoof $wgRequest for SFFormPrinter::formHTML().
-   $wgRequest = new FauxRequest( $this->mOptions, true, 
$_SESSION );
+   if ( isset( $_SESSION ) ) {
+   $wgRequest = new FauxRequest( $this->mOptions, 
true, $_SESSION );
+   } else {
+   $wgRequest = new FauxRequest( $this->mOptions, 
true );
+   }
// call SFFormPrinter::formHTML to get at the form html 
of the existing page
list ( $formHTML, $formJS, $targetContent, 
$form_page_title, $generatedTargetNameFormula ) =
$sfgFormPrinter->formHTML(
@@ -862,7 +866,11 @@
}
 
// Spoof $wgRequest for SFFormPrinter::formHTML().
-   $wgRequest = new FauxRequest( $this->mOptions, true, $_SESSION 
);
+   if ( isset( $_SESSION ) ) {
+   $wgRequest = new FauxRequest( $this->mOptions, true, 
$_SESSION );
+   } else {
+   $wgRequest = new FauxRequest( $this->mOptions, true );
+   }
 
// get wikitext for submitted data and form
list ( $formHTML, $formJS, $targetContent, $generatedFormName, 
$generatedTargetNameFormula ) =

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b731a14b5668cc4f1a92a4d4b95e2423f4dd819
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: tosfos 

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

[MediaWiki-commits] [Gerrit] Put back removed code coverage annotation - change (mediawiki...Thanks)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Put back removed code coverage annotation
..


Put back removed code coverage annotation

Change-Id: I12b1880990e5f404881122e9e3bbaba72ddb7f3b
---
M Thanks.hooks.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index f9fc91b..dd5ee8c 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -268,6 +268,7 @@
 * @return boolean
 */
public static function registerUnitTests( array &$files ) {
+   // @codeCoverageIgnoreStart
$files[] = __DIR__ . '/tests/';
return true;
// @codeCoverageIgnoreEnd

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12b1880990e5f404881122e9e3bbaba72ddb7f3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update VisualEditor for cherry-picks - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Update VisualEditor for cherry-picks
..


Update VisualEditor for cherry-picks

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 21c206f..e468dd4 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 21c206fd6ce0ad06328733af61cdbbb7342f8106
+Subproject commit e468dd45547e15506f5642345437333e7cd4dd02

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9752186d63ad0ce2d8b6493eac44666a568cdee0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf18
Gerrit-Owner: Ori.livneh 
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] Merge branch 'master' into REL1_23 - change (mediawiki...googleAnalytics)

2015-02-19 Thread DavisNT (Code Review)

DavisNT has uploaded a new change for review.

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

Change subject: Merge branch 'master' into REL1_23
..

Merge branch 'master' into REL1_23

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/googleAnalytics 
refs/changes/04/191804/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica1de21ab5fd647f6d532cd322cf247e99c7643d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/googleAnalytics
Gerrit-Branch: REL1_23
Gerrit-Owner: DavisNT 

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

[MediaWiki-commits] [Gerrit] Update VisualEditor for cherry-picks - change (mediawiki/core)

2015-02-19 Thread jenkins-bot (Code Review)

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

Change subject: Update VisualEditor for cherry-picks
..


Update VisualEditor for cherry-picks

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index e898fcc..549615f 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit e898fcc6902de0c017a403276c0c4e900631c792
+Subproject commit 549615fbe2daaf4b8fa8309f1e4fc0b777175568

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92bb4777fd4a147fed70cc80c00cf6c2279dc235
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: Ori.livneh 
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] Merge branch 'master' into REL1_24 - change (mediawiki...googleAnalytics)

2015-02-19 Thread DavisNT (Code Review)

DavisNT has uploaded a new change for review.

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

Change subject: Merge branch 'master' into REL1_24
..

Merge branch 'master' into REL1_24

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/googleAnalytics 
refs/changes/03/191803/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff64da58a5de68d65922727dc1c0e323faba3307
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/googleAnalytics
Gerrit-Branch: REL1_24
Gerrit-Owner: DavisNT 

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

[MediaWiki-commits] [Gerrit] Combine and clean up the v2 api specs - change (mediawiki...parsoid)

2015-02-19 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Combine and clean up the v2 api specs
..

Combine and clean up the v2 api specs

 * For simpler pasting in http://editor.swagger.io/#/

 * Still uses an unsupported "extends" keyword but still a little
   clearer overall.

 * Continues on I267b2320772824751ea75ff02a0ec03f08d7b2b5

Change-Id: Ibd59f7b0043a815c5adf3e569512b81de288035f
---
A docs/specs/apiv2.yaml
D docs/specs/html2wt.yaml
D docs/specs/wt2html.yaml
D docs/specs/wt2pagebundle.yaml
4 files changed, 288 insertions(+), 275 deletions(-)


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

diff --git a/docs/specs/apiv2.yaml b/docs/specs/apiv2.yaml
new file mode 100644
index 000..6921595
--- /dev/null
+++ b/docs/specs/apiv2.yaml
@@ -0,0 +1,288 @@
+swagger: '2.0'
+info:
+  title: Parsoid conversion API
+  version: '2.0.0'
+basePath: /v2
+paths:
+
+  /{domain}/html/{title}:
+parameters:
+  - name: domain
+in: path
+type: string
+required: true
+default: en.wikipedia.org
+  - name: title
+in: path
+type: string
+required: true
+default: Main_Page
+get:
+  responses:
+302:
+  description: Redirect
+
+  /{domain}/html/{title}/{revision}:
+parameters:
+  - name: domain
+in: path
+type: string
+required: true
+default: en.wikipedia.org
+  - name: title
+in: path
+type: string
+required: true
+default: Main_Page
+  - name: revision
+in: path
+type: string
+required: true
+default: 1
+get:
+  produces:
+- text/html; profile=mediawiki.org/specs/html/1.0.0
+  responses:
+200:
+  description: HTML
+  schema:
+$ref: '#/definitions/HTML'
+post:
+  produces:
+- text/html; profile=mediawiki.org/specs/html/1.0.0
+  parameters:
+- in: body
+  name: body
+  required: true
+  schema:
+$ref: '#/definitions/Wt2HtmlSource'
+  responses:
+200:
+  description: HTML
+  schema:
+$ref: '#/definitions/HTML'
+
+  /{domain}/html/:
+parameters:
+  - name: domain
+in: path
+type: string
+required: true
+default: en.wikipedia.org
+post:
+  produces:
+- text/html; profile=mediawiki.org/specs/html/1.0.0
+  parameters:
+- in: body
+  name: body
+  schema:
+$ref: '#/definitions/Wt2HtmlSource'
+  responses:
+200:
+  description: HTML
+  schema:
+$ref: '#/definitions/HTML'
+
+  /{domain}/pagebundle/{title}:
+parameters:
+  - name: domain
+in: path
+type: string
+required: true
+default: en.wikipedia.org
+  - name: title
+in: path
+type: string
+required: true
+default: Main_Page
+get:
+  responses:
+302:
+  description: Redirect
+
+  /{domain}/pagebundle/{title}/{revision}:
+parameters:
+  - name: domain
+in: path
+type: string
+required: true
+default: en.wikipedia.org
+  - name: title
+in: path
+type: string
+required: true
+default: Main_Page
+  - name: revision
+in: path
+type: string
+required: true
+default: 1
+get:
+  produces:
+- application/json
+  responses:
+200:
+  description: Page bundle
+  schema:
+$ref: '#/definitions/PageBundle'
+post:
+  produces:
+- application/json
+  parameters:
+- in: body
+  name: body
+  required: true
+  schema:
+$ref: '#/definitions/Wt2HtmlSource'
+  responses:
+200:
+  description: Page bundle
+  schema:
+$ref: '#/definitions/PageBundle'
+
+  /{domain}/pagebundle/:
+parameters:
+  - name: domain
+in: path
+type: string
+required: true
+default: en.wikipedia.org
+post:
+  produces:
+- application/json
+  parameters:
+- in: body
+  name: body
+  schema:
+$ref: '#/definitions/Wt2HtmlSource'
+  responses:
+200:
+  description: Page bundle
+  schema:
+$ref: '#/definitions/PageBundle'
+
+  /{domain}/wt/:
+parameters:
+  - name: domain
+in: path
+type: string
+required: true
+default: en.wikipedia.org
+post:
+  produces:
+- application/json
+  parameters:
+- in: body
+  name: body
+  required: true
+  schema:
+$ref: '#/definitions/Html2

[MediaWiki-commits] [Gerrit] Update VisualEditor for cherry-picks - change (mediawiki/core)

2015-02-19 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Update VisualEditor for cherry-picks
..

Update VisualEditor for cherry-picks

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/191801/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 21c206f..e468dd4 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 21c206fd6ce0ad06328733af61cdbbb7342f8106
+Subproject commit e468dd45547e15506f5642345437333e7cd4dd02

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9752186d63ad0ce2d8b6493eac44666a568cdee0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf18
Gerrit-Owner: Ori.livneh 

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

1 2 3 4 5 >

1 - 100 of 482 matches

Mail list logo