[MediaWiki-commits] [Gerrit] Index optimizer tweaks for ApiQueryRecentChanges - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Index optimizer tweaks for ApiQueryRecentChanges
..

Index optimizer tweaks for ApiQueryRecentChanges

* Add redundant rc_new cond if RC_NEW is requested
* Remove FORCE INDEX so the mysql has more options

Change-Id: I96bced55bd9be5847e048af9ad4ccb02af6b00b2
---
M includes/api/ApiQueryRecentChanges.php
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/251690/1

diff --git a/includes/api/ApiQueryRecentChanges.php 
b/includes/api/ApiQueryRecentChanges.php
index 0a11f4b..46a858f 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -150,7 +150,6 @@
 *  AND rc_timestamp < $end AND rc_namespace = 
$namespace
 */
$this->addTables( 'recentchanges' );
-   $index = array( 'recentchanges' => 'rc_timestamp' ); // May 
change
$this->addTimestampWhereRange( 'rc_timestamp', $params['dir'], 
$params['start'], $params['end'] );
 
if ( !is_null( $params['continue'] ) ) {
@@ -178,7 +177,11 @@
 
if ( !is_null( $params['type'] ) ) {
try {
-   $this->addWhereFld( 'rc_type', 
RecentChange::parseToRCType( $params['type'] ) );
+   $typeConst = RecentChange::parseToRCType( 
$params['type'] );
+   $this->addWhereFld( 'rc_type', $typeConst );
+   if ( $typeConst === RC_NEW ) {
+   $this->addWhereFld( 'rc_new', 1 ); // 
allow index usage
+   }
} catch ( Exception $e ) {
ApiBase::dieDebug( __METHOD__, $e->getMessage() 
);
}
@@ -246,7 +249,6 @@
 
if ( !is_null( $params['user'] ) ) {
$this->addWhereFld( 'rc_user_text', $params['user'] );
-   $index['recentchanges'] = 'rc_user_text';
}
 
if ( !is_null( $params['excludeuser'] ) ) {
@@ -362,7 +364,6 @@
 
$this->token = $params['token'];
$this->addOption( 'LIMIT', $params['limit'] + 1 );
-   $this->addOption( 'USE INDEX', $index );
 
$count = 0;
/* Perform the actual query. */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96bced55bd9be5847e048af9ad4ccb02af6b00b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] TOC: Fix problems on RTL wikis - change (mediawiki/core)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: TOC: Fix problems on RTL wikis
..

TOC: Fix problems on RTL wikis

This is a follow-up to c7894deb.

Bug: T118029
Change-Id: I0cd614063daff20e226a2ba1f819cebd71a2244b
---
M resources/src/mediawiki.skinning/content.css
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/251700/1

diff --git a/resources/src/mediawiki.skinning/content.css 
b/resources/src/mediawiki.skinning/content.css
index a5dd692..d7daabc 100644
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -98,7 +98,8 @@
 /* Ignored by IE7 and lower */
 .tocnumber:after {
content: "";
-   padding-right: 0.5em;
+   display: inline-block;
+   width: 0.5em;
 }
 
 /* Warning */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cd614063daff20e226a2ba1f819cebd71a2244b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] Return to status quo after load is back to normal - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Return to status quo after load is back to normal
..

Return to status quo after load is back to normal

This increases the load of db1054 and db1060 back to normal.
Otherwise, db1063 and db1067 may be too stressed and impact on
the latency of queries.

Change-Id: I903c90625fe3b74c5d6d23adbbd92416e7712fd9
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 53956ea..f21c30d 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,8 +102,8 @@
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1018' => 200, # 1.4TB  64GB
-   'db1054' => 0, # 2.8TB  96GB, api
-   'db1060' => 0,   # 2.8TB  96GB, api
+   'db1054' => 200, # 2.8TB  96GB, api
+   'db1060' => 200, # 2.8TB  96GB, api
'db1063' => 400, # 2.8TB 128GB
'db1067' => 500, # 2.8TB 160GB
),

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

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

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

[MediaWiki-commits] [Gerrit] bring ciphersuite commentary up to date - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: bring ciphersuite commentary up to date
..

bring ciphersuite commentary up to date

Change-Id: I4e9eac747eff7405236c7e1ed369fa893d4bf7c9
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/251709/1

diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb 
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 82293af..55a8c65 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -17,9 +17,8 @@
 #   - strong: Only TLSv1.2 with PFS+AEAD ciphers.  In practice this is a
 # very short list, and requires a very modern client.  No
 # tradeoff is made for compatibility.  Known to work with:
-# New FF/Chrome, IE11, Java8, Android 4.4+, OpenSSL 1.0.x
-# Definitely broken with: All Safari (OSX/iOS).
-# IE11 support requires either DHE support or an ECDSA key.
+# FF/Chrome, IE11, Safari 9, Java8, Android 4.4+, OpenSSL 1.0.x
+# IE11 requires server-side DHE support or an ECDSA key.
 #   - mid:Supports TLSv1.0 and higher, and adds several forward-secret
 # options which are not AEAD.  This is compatible with many
 # more clients than "strong".  With a DHE-capable server,
@@ -31,7 +30,7 @@
 # - An optional argument, that if non-nil will set HSTS to max-age of
 #   N days
 #
-# For servers which support it (nginx, or apache-2.4 on Jessie), DHE cipher
+# For servers which support it (currently only nginx @ WMF), DHE cipher
 # variants that are appropriate for the compatibility mode selected will be
 # enabled, generally increasing forward-secrecy and compatibility, but
 # sacrificing some rare/ancient/un-updated Java6 clients.

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

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

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

[MediaWiki-commits] [Gerrit] bring ciphersuite commentary up to date - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: bring ciphersuite commentary up to date
..


bring ciphersuite commentary up to date

Change-Id: I4e9eac747eff7405236c7e1ed369fa893d4bf7c9
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb 
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 82293af..55a8c65 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -17,9 +17,8 @@
 #   - strong: Only TLSv1.2 with PFS+AEAD ciphers.  In practice this is a
 # very short list, and requires a very modern client.  No
 # tradeoff is made for compatibility.  Known to work with:
-# New FF/Chrome, IE11, Java8, Android 4.4+, OpenSSL 1.0.x
-# Definitely broken with: All Safari (OSX/iOS).
-# IE11 support requires either DHE support or an ECDSA key.
+# FF/Chrome, IE11, Safari 9, Java8, Android 4.4+, OpenSSL 1.0.x
+# IE11 requires server-side DHE support or an ECDSA key.
 #   - mid:Supports TLSv1.0 and higher, and adds several forward-secret
 # options which are not AEAD.  This is compatible with many
 # more clients than "strong".  With a DHE-capable server,
@@ -31,7 +30,7 @@
 # - An optional argument, that if non-nil will set HSTS to max-age of
 #   N days
 #
-# For servers which support it (nginx, or apache-2.4 on Jessie), DHE cipher
+# For servers which support it (currently only nginx @ WMF), DHE cipher
 # variants that are appropriate for the compatibility mode selected will be
 # enabled, generally increasing forward-secrecy and compatibility, but
 # sacrificing some rare/ancient/un-updated Java6 clients.

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

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

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

[MediaWiki-commits] [Gerrit] largeBannerLimit: Use KV store instead of cookies for campa... - change (mediawiki...CentralNotice)

[AndyRussG (Code Review)]

AndyRussG has uploaded a new change for review.

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

Change subject: largeBannerLimit:  Use KV store instead of cookies for campaign 
categories using legacy
..

largeBannerLimit:  Use KV store instead of cookies for campaign categories 
using legacy

Bug: T117650
Change-Id: I4178de871faa3f7afcc967bdd78ce8476dd21ae9
---
M CentralNotice.modules.php
M CentralNotice.php
M i18n/en.json
M i18n/qqq.json
M resources/subscribing/ext.centralNotice.largeBannerLimit.js
5 files changed, 91 insertions(+), 27 deletions(-)


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

diff --git a/CentralNotice.modules.php b/CentralNotice.modules.php
index 193e952..fb6d511 100644
--- a/CentralNotice.modules.php
+++ b/CentralNotice.modules.php
@@ -168,8 +168,8 @@
'centralnotice-large-banner-limit-days-help',
'centralnotice-large-banner-limit-randomize',
'centralnotice-large-banner-limit-randomize-help',
-   'centralnotice-large-banner-limit-cookie-name',
-   'centralnotice-large-banner-limit-cookie-name-help',
+   'centralnotice-large-banner-limit-identifier',
+   'centralnotice-large-banner-limit-identifier-help',
)
 );
 
@@ -269,6 +269,7 @@
'dependencies'  => array(
'ext.centralNotice.display',
'mediawiki.cookie',
+   'ext.centralNotice.kvStore',
),
'targets'   => array( 'desktop', 'mobile' ),
 );
diff --git a/CentralNotice.php b/CentralNotice.php
index 724d614..0cdbf0d 100644
--- a/CentralNotice.php
+++ b/CentralNotice.php
@@ -340,10 +340,10 @@
'labelMsg' => 
'centralnotice-large-banner-limit-randomize',
'helpMsg' => 
'centralnotice-large-banner-limit-randomize-help',
),
-   'cookieName' => array(
+   'identifier' => array(
'type' => 'string',
-   'labelMsg' => 
'centralnotice-large-banner-limit-cookie-name',
-   'helpMsg' => 
'centralnotice-large-banner-limit-cookie-name-help',
+   'labelMsg' => 
'centralnotice-large-banner-limit-identifier',
+   'helpMsg' => 
'centralnotice-large-banner-limit-identifier-help',
'defaultValue' => 
'centralnotice-frbanner-seen-fullscreen',
),
),
diff --git a/i18n/en.json b/i18n/en.json
index d9c693b..188987c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -290,6 +290,6 @@
"centralnotice-large-banner-limit-days-help": "Number of days to 
suppress large banner display after initial impression.",
"centralnotice-large-banner-limit-randomize": "Randomize bucket 
transition",
"centralnotice-large-banner-limit-randomize-help": "Normal bucket 
transition is A to C, B to D. When checked, readers will randomly move to 
buckets C or D.",
-   "centralnotice-large-banner-limit-cookie-name": "Large banner cookie 
name",
-   "centralnotice-large-banner-limit-cookie-name-help": "Large banner 
display is suppressed across campaigns with the same cookie. Default value 
'centralnotice-frbanner-seen-fullscreen' is compatible with on-wiki fundraising 
scripts."
+   "centralnotice-large-banner-limit-identifier": "Large banner 
identifier/cookie name",
+   "centralnotice-large-banner-limit-identifier-help": "Large banner 
display is suppressed across campaigns with the same identifier. Depending on 
the campaign category, this may be implemented as a cookie. Default value 
'centralnotice-frbanner-seen-fullscreen' is compatible with on-wiki fundraising 
scripts."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ca9888e..a6d1456 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -314,6 +314,6 @@
"centralnotice-large-banner-limit-days-help": "Help text for the form 
control to set large banner suppression length",
"centralnotice-large-banner-limit-randomize": "Label for the form 
control to randomize bucket transition",
"centralnotice-large-banner-limit-randomize-help": "Help text for the 
form control to randomize bucket transition",
-   "centralnotice-large-banner-limit-cookie-name": "Label for the form 
control to set large banner cookie name",
-   "centralnotice-large-banner-limit-cookie-name-help": "Help text for the 
form control to set large banner cookie name"
+   "centralnotice-large-banner-limit-identifier": "Label for the form 
control to set large banner identifier/cookie name",
+   "centralnotice-large-banner-limit-identifier-help": "Help text for the 
form control to set large banner identifier/cookie name"
 }
diff --git 

[MediaWiki-commits] [Gerrit] Remove @copyright tags I do not want keep updating - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Remove @copyright tags I do not want keep updating
..

Remove @copyright tags I do not want keep updating

I am content with @author and years can be found in
git log if really needed for something.

Change-Id: I6daef031b2eff2a0827c7852688e1ef9a8b72564
---
M api/ApiQueryLanguageStats.php
M api/ApiQueryMessageCollection.php
M api/ApiQueryMessageGroupStats.php
M api/ApiQueryMessageGroups.php
M api/ApiQueryMessageTranslations.php
M api/ApiQueryTranslationAids.php
M api/ApiSearchTranslations.php
M api/ApiStatsQuery.php
M api/ApiTTMServer.php
M api/ApiTranslateUser.php
10 files changed, 4 insertions(+), 9 deletions(-)


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

diff --git a/api/ApiQueryLanguageStats.php b/api/ApiQueryLanguageStats.php
index 220b281..d6de92e 100644
--- a/api/ApiQueryLanguageStats.php
+++ b/api/ApiQueryLanguageStats.php
@@ -3,7 +3,7 @@
  * Api module for language group stats.
  *
  * @file
- * @copyright Copyright © 2012-2013, Niklas Laxström
+ * @author Niklas Laxström
  * @license GPL-2.0+
  */
 
diff --git a/api/ApiQueryMessageCollection.php 
b/api/ApiQueryMessageCollection.php
index c74e616..740f57d 100644
--- a/api/ApiQueryMessageCollection.php
+++ b/api/ApiQueryMessageCollection.php
@@ -4,7 +4,6 @@
  *
  * @file
  * @author Niklas Laxström
- * @copyright Copyright © 2010-2013, Niklas Laxström
  * @license GPL-2.0+
  */
 
diff --git a/api/ApiQueryMessageGroupStats.php 
b/api/ApiQueryMessageGroupStats.php
index a1059fc..39c146d 100644
--- a/api/ApiQueryMessageGroupStats.php
+++ b/api/ApiQueryMessageGroupStats.php
@@ -4,8 +4,8 @@
  *
  * @file
  * @author Tim Gerundt
+ * @author Niklas Laxström
  * @copyright Copyright © 2012-2013, Tim Gerundt
- * @copyright Copyright © 2012-2013, Niklas Laxström
  * @license GPL-2.0+
  */
 
diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index 8409767..15f8f78 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -5,7 +5,6 @@
  * @file
  * @author Niklas Laxström
  * @author Harry Burt
- * @copyright Copyright © 2010-2013, Niklas Laxström
  * @copyright Copyright © 2012-2013, Harry Burt
  * @license GPL-2.0+
  */
diff --git a/api/ApiQueryMessageTranslations.php 
b/api/ApiQueryMessageTranslations.php
index 6b5aa6e..b7436ed 100644
--- a/api/ApiQueryMessageTranslations.php
+++ b/api/ApiQueryMessageTranslations.php
@@ -4,7 +4,6 @@
  *
  * @file
  * @author Niklas Laxström
- * @copyright Copyright © 2011-2013, Niklas Laxström
  * @license GPL-2.0+
  */
 
diff --git a/api/ApiQueryTranslationAids.php b/api/ApiQueryTranslationAids.php
index 74d3b83..70ef669 100644
--- a/api/ApiQueryTranslationAids.php
+++ b/api/ApiQueryTranslationAids.php
@@ -4,7 +4,6 @@
  *
  * @file
  * @author Niklas Laxström
- * @copyright Copyright © 2012-2013, Niklas Laxström
  * @license GPL-2.0+
  */
 
diff --git a/api/ApiSearchTranslations.php b/api/ApiSearchTranslations.php
index e07785b..9035799 100644
--- a/api/ApiSearchTranslations.php
+++ b/api/ApiSearchTranslations.php
@@ -2,6 +2,7 @@
 /**
  * API module for search translations
  * @since 2015.07
+ * @license GPL-2.0+
  */
 class ApiSearchTranslations extends ApiBase {
 
diff --git a/api/ApiStatsQuery.php b/api/ApiStatsQuery.php
index bf1e1e9..9612f6a 100644
--- a/api/ApiStatsQuery.php
+++ b/api/ApiStatsQuery.php
@@ -3,7 +3,7 @@
  * A base module for querying message group related stats.
  *
  * @file
- * @copyright Copyright © 2012-2013, Niklas Laxström
+ * @author Niklas Laxström
  * @license GPL-2.0+
  */
 
diff --git a/api/ApiTTMServer.php b/api/ApiTTMServer.php
index 4fdc562..5abf3f9 100644
--- a/api/ApiTTMServer.php
+++ b/api/ApiTTMServer.php
@@ -4,7 +4,6 @@
  *
  * @file
  * @author Niklas Laxström
- * @copyright Copyright © 2012-2013, Niklas Laxström
  * @license GPL-2.0+
  */
 
diff --git a/api/ApiTranslateUser.php b/api/ApiTranslateUser.php
index 1c81d7f..fab75f9 100644
--- a/api/ApiTranslateUser.php
+++ b/api/ApiTranslateUser.php
@@ -3,7 +3,6 @@
  * API module.
  * @file
  * @author Niklas Laxström
- * @copyright Copyright © 2012-2013, Niklas Laxström
  * @license GPL-2.0+
  */
 

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

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

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

[MediaWiki-commits] [Gerrit] TEST: DO NOT MERGE - change (mediawiki...TimedMediaHandler)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: TEST: DO NOT MERGE
..

TEST: DO NOT MERGE

Change-Id: Ie2ce639247bf38721b372ed3fe200fcb2d9f91d0
---
D README
A README.md
M TimedMediaHandler.hooks.php
M TimedMediaHandler.php
M WebVideoTranscode/WebVideoTranscode.php
A extension.json
6 files changed, 677 insertions(+), 497 deletions(-)


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

diff --git a/README b/README
deleted file mode 100644
index c37c5ad..000
--- a/README
+++ /dev/null
@@ -1,127 +0,0 @@
-== TimedMediaHandler ==
-
-This extension provides a media handler for the Ogg, WebM, mp4 container 
format.
-When enabled, a player will be automatically embedded in the file description
-page, or any wiki page while still using the same syntax as for images.
-
-* Broad support for input file formats
-* Transcoder to make video at web resolutions when embedding clips in a page
-* include support for timed Text per the w3c "track" recommendation
-* use embedPlayer mwEmbed javascript module for playback
-
-To install this extension, add the following to the end of your
-LocalSettings.php:
-
-   // You need mwEmbedSupport ( if not already added )
-   require( "$IP/extensions/MwEmbedSupport/MwEmbedSupport.php" );
-
-   // TimedMediaHandler
-require( "$IP/extensions/TimedMediaHandler/TimedMediaHandler.php" );
-
-
-== Running Transcodes ==
-
-Transcoding a video to another resolution or format takes a good amount which
-prevents that processing to be handled as a web service. Instead, the extension
-implements an asynchronous job, named webVideoTranscode, which you must be
-running regularly as your web server user.
-
-The job can be run using the MediaWiki maintenance/runJobs.php utility (do not
-forget to su as a webserver user):
-
-  php runJobs.php --type webVideoTranscode --maxjobs 1
-
-
-== Kaltura HTML5 player library ==
-
-TimedMediaHandler uses the Kaltura HTML5 player library for video playback, it
-relies on the  element as well as JavaScript.
-
-For more information about the player library visit:
-  http://www.html5video.org/kaltura-player/docs
-
-
-== Libav ==
-
-We use Libav for two purposes:
- - creating still images of videos (aka thumbnails)
- - transcoding WebM, H.264 videos
-
-Wikimedia currently uses libav as shipped in Ubuntu 12.04 (libav 0.8.x).
-For best experience use that or any later release from http://libav.org.
-
-On Ubuntu/Debian:
-  apt-get install libav-tools
-
-For H.264 support:
-  apt-get install libav-tools libavcodec-extra-53
-
-If you operating system does not include the required libav software,
-you can download static builds for multiple platforms at:
-  http://firefogg.org/nightly/
-
-You can also build libav/ffmpeg from source.
-Guide for building ffmpeg with H.264 for Ubuntu:
-https://ffmpeg.org/trac/ffmpeg/wiki/UbuntuCompilationGuide
-
-Some old versions of FFmpeg had a bug which made it extremely slow to seek in
-large theora videos in order to generate a thumbnail.  If you are using an old
-version of FFmpeg and find that performance is extremely poor (tens of seconds)
-to generate thumbnails of theora videos that are several minutes or more in
-length. Please update to a more recent version.
-
-In MediaWiki configuration, after the require line in LocalSettings.php, you
-will have to specify the FFmpeg binary location with:
-
-$wgFFmpegLocation = '/path/to/ffmpeg';
-
-Default being `/usr/bin/avconv`.
-
-
-== ffmpeg2theora ==
-
-We use ffmpeg2theora for extract metadata from videos, you will need a copy on
-your server. For best experience, use the latest release of ffmpeg2theora. At a
-minimum you need to use ffmpeg2thoera 0.27.
-
-You can download static ffmpeg2theora builds for multiple platforms at:
-http://firefogg.org/nightly/
-
-Set the ffmpeg2theora binary location with:
-
-$wgFFmpeg2theoraLocation = '/path/to/ffmpeg2theora';
-
-Default being `/usr/bin/ffmpeg2theora`.
-
-oggThumb

-
-We use oggvideotools for creating still images of videos, you will need a copy 
on your
-server.
-
-Set the oggThumb binary location with:
-
-$wgOggThumbLocation = '/path/to/oggThumb';
-
-Download oggThumb from: http://dev.streamnik.de/oggvideotools.html
-
-== PEAR File_Ogg ==
-
-Tim Starling, a Wikimedia developer, forked the PEAR File_Ogg package and
-improved it significantly to support this extension.
-
-The PEAR bundle is licensed under the LGPL, you can get informations about
-this package on the pear webpage:
-
-  http://pear.php.net/package/File_Ogg
-
-== getID3 ==
-
-getID3 is used for metadata of WebM files.
-
-getID3() by James Heinrich 
-available at http://getid3.sourceforge.net
-or http://www.getid3.org/
-
-getID3 code is released under the GNU GPL:
-http://www.gnu.org/copyleft/gpl.html
diff --git a/README.md b/README.md
new 

[MediaWiki-commits] [Gerrit] impressionDiet: fix and minor improvements in use KV store f... - change (mediawiki...CentralNotice)

[AndyRussG (Code Review)]

AndyRussG has uploaded a new change for review.

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

Change subject: impressionDiet: fix and minor improvements in use KV store 
feature
..

impressionDiet: fix and minor improvements in use KV store feature

Bug: T117650
Change-Id: Id0d7560db0f7c721ebac0c221224c3d373102a37
---
M i18n/en.json
M resources/subscribing/ext.centralNotice.impressionDiet.js
2 files changed, 49 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/08/251708/1

diff --git a/i18n/en.json b/i18n/en.json
index a32c7ff..c27b2fa 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -277,7 +277,7 @@
"centralnotice-impression-diet": "Impression diet",
"centralnotice-impression-diet-help": "Limit the number of banners seen 
by any one individual.",
"centralnotice-impression-diet-identifier": "Identifier/hide cookie 
name",
-   "centralnotice-impression-diet-identifier-help": "An identifier for 
persistent client-side data stored by this feature (such as impression counts). 
This field is optional for most campaigns. If you leave it blank, campaigns in 
the same category will share impression counts. To share this data across 
several campaign categories, specify the same identifier for each campaign. 
Note: certain campaign categories are configured to use cookies for this 
feature. For campaigns in those categories, this identifier will be the cookie 
name, and is not optional. Also note that if the identifier is changed during a 
campaign, all counts to date will be lost.",
+   "centralnotice-impression-diet-identifier-help": "An identifier for 
persistent client-side data stored by this feature (such as impression counts). 
This field is optional for most campaigns. If you leave it blank, campaigns in 
the same category will share impression counts, or, if this campaign does not 
use the category feature, counts will be specific to this campaign. To share 
this data across several campaign categories, specify the same identifier for 
each campaign. Note: certain campaign categories are configured to use cookies 
for this feature. For campaigns in those categories, this identifier will be 
the cookie name, and is not optional. Also note that if the identifier is 
changed during a campaign, all counts to date will be lost.",
"centralnotice-impression-diet-maximum-seen": "Maximum impressions any 
individual will see",
"centralnotice-impression-diet-maximum-seen-help": "If the cycle is 
configured to restart, this limits the number of impressions seen per cycle 
rather than the total number of impressions seen.",
"centralnotice-impression-diet-restart-cycle-delay": "How long to wait 
before restarting the cycle, in seconds (optional)",
diff --git a/resources/subscribing/ext.centralNotice.impressionDiet.js 
b/resources/subscribing/ext.centralNotice.impressionDiet.js
index be72473..634860b 100644
--- a/resources/subscribing/ext.centralNotice.impressionDiet.js
+++ b/resources/subscribing/ext.centralNotice.impressionDiet.js
@@ -55,60 +55,63 @@
hide = null,
pastDate, waitForHideImps, waitForShowImps;
 
-   // Only use cookies for certain campaign on the legacy track
-   // Do this here since it's needed in for storageAvailable() 
(below)
+   // Only use cookies for certain campaigns on the legacy track
+   // Do this here since it's needed for storageAvailable() (below)
useCookies = cn.getDataProperty( 'campaignCategoryUsesLegacy' );
 
+   // URL forced a banner
if ( forceFlag ) {
-   // URL forced a banner.
+   return;
+   }
+
+   // Also just show a banner if we have no way to store counts
+   if ( !storageAvailable() ) {
+   return;
+   }
+
+   identifier = mixinParams.identifier;
+   counts = getCounts();
+
+   // Compare counts against campaign settings and decide whether 
to
+   // show a banner
+   pastDate = counts.waitUntil < new Date().getTime();
+   waitForHideImps = counts.waitCount < mixinParams.skipInitial;
+   waitForShowImps = counts.waitSeenCount < 
mixinParams.maximumSeen;
+
+   if ( !pastDate ) {
+   // We're still waiting for the next cycle to begin.
+   hide = 'waitdate';
+   counts.waitCount += 1;
+   } else if ( pastDate && waitForHideImps ) {
+   // We're still skipping initial impressions.
+   hide = 'waitimps';
+   counts.waitCount += 1;
+   } else if ( pastDate && !waitForHideImps && waitForShowImps ) {
+

[MediaWiki-commits] [Gerrit] Add php code sniffer - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Add php code sniffer
..


Add php code sniffer

Originally from Siebrand: https://gerrit.wikimedia.org/r/#/c/243160/

Bug: T90943
Change-Id: Ic7d101ca2b2be0592e0391f35ad9fe247eddfb12
---
M .jshintignore
M composer.json
M ffs/MediaWikiComplexMessages.php
M messagegroups/FileBasedMessageGroup.php
A phpcs.xml
M scripts/magic-export.php
M scripts/plural-comparison.php
M tests/phpunit/data/Example-result.i18n.php
M tests/phpunit/data/Example.i18n.php
9 files changed, 44 insertions(+), 32 deletions(-)

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



diff --git a/.jshintignore b/.jshintignore
index e7bc219..6310582 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,4 +1,6 @@
+extensions/
 node_modules/
+vendor/
 
 # upstream libs
 resources/js/jquery.autosize.js
diff --git a/composer.json b/composer.json
index 2a1da67..e2ee904 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
},
{
"name": "Siebrand Mazeland",
-   "email": "s.mazel...@xs4all.nl",
+   "email": "siebr...@kitano.nl",
"role": "Developer"
}
],
@@ -38,11 +38,21 @@
"composer/installers": ">=1.0.1",
"mediawiki/universal-language-selector": "*"
},
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9",
+   "mediawiki/mediawiki-codesniffer": "0.4.0"
+   },
"suggest": {
"mediawiki/babel": "Users can easily indicate their language 
proficiency on their user page",
"mediawiki/translation-notifications": "Manage communication 
with translators",
"mustangostang/spyc": "More recent version of the bundled spyc 
library",
"romaricdrigon/metayaml": "If you want to validate message 
group configurations",
"ruflin/elastica": "Support for translation memory and search 
in ElasticSearch"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude extensions",
+   "phpcs -p -s"
+   ]
}
 }
diff --git a/ffs/MediaWikiComplexMessages.php b/ffs/MediaWikiComplexMessages.php
index 3034b8e..cd03e2f 100644
--- a/ffs/MediaWikiComplexMessages.php
+++ b/ffs/MediaWikiComplexMessages.php
@@ -51,9 +51,7 @@
return wfMessage( 'translate-magic-' . $this->id )->text();
}
 
-   #
-   # Data retrieval
-   #
+   // Data retrieval
protected $init = false;
 
public function getGroups() {
@@ -250,13 +248,9 @@
return $data;
}
 
-   #
-   # /Data retrieval
-   #
+   // /Data retrieval
 
-   #
-   # Output
-   #
+   // Output
public function header( $title ) {
$colspan = array( 'colspan' => 3 );
$header = Xml::element( 'th', $colspan, $this->getTitle() . ' - 
' . $title );
@@ -365,13 +359,10 @@
) );
}
 
-   #
-   # /Output
-   #
+   // /Output
 
-   #
-   # Save to database
-   #
+   // Save to database
+
 
function getKeyForSave() {
return $this->databaseMsg . '/' . $this->language;
@@ -436,13 +427,9 @@
$this->init = false;
}
 
-   #
-   # !Save to database
-   #
+   // /Save to database
 
-   #
-   # Export
-   #
+   // Export
public function validate( &$errors = array(), $filter = false ) {
$used = array();
foreach ( array_keys( $this->data ) as $group ) {
@@ -587,9 +574,7 @@
return "'$data'";
}
 
-   #
-   # /Export
-   #
+   // /Export
public function highlight( $key, $values ) {
return $values;
}
diff --git a/messagegroups/FileBasedMessageGroup.php 
b/messagegroups/FileBasedMessageGroup.php
index 0b5c383..a36dfd6 100644
--- a/messagegroups/FileBasedMessageGroup.php
+++ b/messagegroups/FileBasedMessageGroup.php
@@ -110,7 +110,9 @@
 * @since 2014.02 Made public
 */
public function replaceVariables( $pattern, $code ) {
+   // @codingStandardsIgnoreStart Ignore 
MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
global $IP, $wgTranslateGroupRoot;
+   // @codingStandardsIgnoreEnd
 
$variables = array(
'%CODE%' => $this->mapCode( $code ),
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..d81a292
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+
+
+   
+   .
+   
+   
+   vendor
+
diff --git a/scripts/magic-export.php b/scripts/magic-export.php
index 

[MediaWiki-commits] [Gerrit] Clean up token handling - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Clean up token handling
..

Clean up token handling

Use csrf (alias edit for MW 1.24 and 1.25 compatibility) token
everywhere. Converted some tokens delivered via html to use
mediawiki.Api.postWithToken instead.

Any clients using the removed custom tokens (none I am aware of)
must be updated to use the new token.

Bug: T117797
Change-Id: Idf49025f84cbc9c07c75ff37cab46630bb04224f
---
M Translate.php
M TranslateUtils.php
M api/ApiAggregateGroups.php
M api/ApiGroupReview.php
M api/ApiTranslateSandbox.php
M api/ApiTranslationReview.php
M api/ApiTranslationStash.php
M resources/js/ext.translate.editor.helpers.js
M resources/js/ext.translate.messagetable.js
M resources/js/ext.translate.proofread.js
M resources/js/ext.translate.special.aggregategroups.js
M resources/js/ext.translate.special.managetranslatorsandbox.js
M resources/js/ext.translate.special.pagemigration.js
M resources/js/ext.translate.special.pagepreparation.js
M resources/js/ext.translate.storage.js
M resources/js/ext.translate.translationstashstorage.js
M resources/js/ext.translate.workflowselector.js
M specials/SpecialAggregateGroups.php
D tests/phpunit/api/ApiTokensTest.php
M utils/MessageTable.php
20 files changed, 80 insertions(+), 265 deletions(-)


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

diff --git a/Translate.php b/Translate.php
index 9afeb5f..3d4f559 100644
--- a/Translate.php
+++ b/Translate.php
@@ -98,11 +98,6 @@
 $wgAPIModules['translationstash'] = 'ApiTranslationStash';
 $wgAPIModules['ttmserver'] = 'ApiTTMServer';
 $wgAPIModules['searchtranslations'] = 'ApiSearchTranslations';
-$wgHooks['ApiTokensGetTokenTypes'][] = 
'ApiTranslationReview::injectTokenFunction';
-$wgHooks['ApiTokensGetTokenTypes'][] = 'ApiGroupReview::injectTokenFunction';
-$wgHooks['ApiTokensGetTokenTypes'][] = 
'ApiAggregateGroups::injectTokenFunction';
-$wgHooks['ApiTokensGetTokenTypes'][] = 
'ApiTranslateSandbox::injectTokenFunction';
-$wgHooks['ApiTokensGetTokenTypes'][] = 
'ApiTranslationStash::injectTokenFunction';
 
 // Register hooks.
 $wgHooks['EditPage::showEditForm:initial'][] = 'TranslateEditAddons::addTools';
diff --git a/TranslateUtils.php b/TranslateUtils.php
index feca1ea..cfb39a9 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -368,7 +368,8 @@
 * @since 2012-05-03
 */
public static function getTokenAction( $token ) {
-   return "action=tokens=$token";
+   // Remove this function when support for MW 1.24 is dropped.
+   return "action=query=tokens=csrf";
}
 
/**
diff --git a/api/ApiAggregateGroups.php b/api/ApiAggregateGroups.php
index b8c5922..ca18b14 100644
--- a/api/ApiAggregateGroups.php
+++ b/api/ApiAggregateGroups.php
@@ -17,7 +17,6 @@
  */
 class ApiAggregateGroups extends ApiBase {
protected static $right = 'translate-manage';
-   protected static $salt = 'translate-manage';
 
public function execute() {
if ( !$this->getUser()->isAllowed( self::$right ) ) {
@@ -186,19 +185,8 @@
return true;
}
 
-   public function getTokenSalt() {
-   return self::$salt;
-   }
-
public function needsToken() {
return 'csrf';
-   }
-
-   // This function maintains backwards compatibility with self::getToken()
-   // below. If salt is removed from self::getToken() and nothing else 
(e.g.
-   // JS) generates the token directly, this could probably be removed.
-   protected function getWebUITokenSalt( array $params ) {
-   return self::$salt;
}
 
public function getAllowedParams() {
@@ -222,7 +210,7 @@
),
'token' => array(
ApiBase::PARAM_TYPE => 'string',
-   ApiBase::PARAM_REQUIRED => false,
+   ApiBase::PARAM_REQUIRED => true,
),
);
}
@@ -280,26 +268,5 @@
}
 
return $pages;
-   }
-
-   // These two functions implement pre-1.24 token fetching via the
-   // ApiTokensGetTokenTypes hook, kept for backwards compatibility.
-   public static function getToken() {
-   $user = RequestContext::getMain()->getUser();
-   if ( !$user->isAllowed( self::$right ) ) {
-   return false;
-   }
-
-   return $user->getEditToken( self::$salt );
-   }
-
-   public static function injectTokenFunction( &$list ) {
-   $list['aggregategroups'] = array( __CLASS__, 'getToken' );
-
-   return true; // Hooks must return bool
-   }
-
-   public static function getRight() {
-   

[MediaWiki-commits] [Gerrit] Icrement extension's version - change (mediawiki...HitCounters)

[Kghbln (Code Review)]

Kghbln has uploaded a new change for review.

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

Change subject: Icrement extension's version
..

Icrement extension's version

* Thanks to the great fixed that have been done very recently the
  version should now be incremented to 0.2 for better reference
  (needs tagging as a follow up)

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


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

diff --git a/extension.json b/extension.json
index 18cf126..4194547 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "HitCounters",
"namemsg": "hitcounters-extensionname",
-   "version": "0.1",
+   "version": "0.2",
"author": [
"[//mwstake.org Mark A. Hershberger]"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e7fd6135ac152409356ad5803f1261e44887b58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HitCounters
Gerrit-Branch: master
Gerrit-Owner: Kghbln 

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

[MediaWiki-commits] [Gerrit] Increment version to v2.2.1 - change (mediawiki...SemanticRating)

[Kghbln (Code Review)]

Kghbln has uploaded a new change for review.

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

Change subject: Increment version to v2.2.1
..

Increment version to v2.2.1

* Follow up to commit 5cb7499 of 2015-08-19 so that this extension
  now shows up nicely on special page "Version"

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticRating 
refs/changes/05/251705/1

diff --git a/SemanticRating.php b/SemanticRating.php
index efdb3cf..6a401b5 100644
--- a/SemanticRating.php
+++ b/SemanticRating.php
@@ -40,7 +40,7 @@
 $GLOBALS['wgExtensionCredits']['semantic'][] = array (
'path' => __FILE__,
'name' => 'SemanticRating',
-   'version' => '2.2',
+   'version' => '2.2.1',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]',
'...'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica4f6f6fbc6386d53affe46df3a1ae5809f8cfa6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticRating
Gerrit-Branch: master
Gerrit-Owner: Kghbln 

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

[MediaWiki-commits] [Gerrit] Do not call MediaWikiChat::getAvatar() if and when SocialPro... - change (mediawiki...MediaWikiChat)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

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

Change subject: Do not call MediaWikiChat::getAvatar() if and when 
SocialProfile isn't available
..

Do not call MediaWikiChat::getAvatar() if and when SocialProfile isn't available

Fixes Brickimedia/brickimedia#416.

Change-Id: Iebecbdb888779b3f77db72afaad4bd9637c191e9
---
M MediaWikiChat.hooks.php
M MediaWikiChat.php
2 files changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/MediaWikiChat.hooks.php b/MediaWikiChat.hooks.php
index ad67e23..c8f5dc0 100644
--- a/MediaWikiChat.hooks.php
+++ b/MediaWikiChat.hooks.php
@@ -88,12 +88,14 @@
 
foreach ( $users as $id => $away ) {
$user = User::newFromId( $id );
-   $avatar = MediaWikiChat::getAvatar( $id 
);
$style = "display: block;
background-position: right 1em 
center;
background-repeat: no-repeat;
-   background-image: url($avatar);
word-wrap: break-word;";
+   if ( class_exists( 'SocialProfileHooks' 
) ) {
+   $avatar = 
MediaWikiChat::getAvatar( $id );
+   $style .= "background-image: 
url($avatar);";
+   }
if ( $away > 12 ) {
$style .= "-webkit-filter: 
grayscale(1); /* old webkit */
-webkit-filter: 
grayscale(100%); /* new webkit */
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index d297327..349d1eb 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -16,7 +16,7 @@
 $wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'MediaWikiChat',
-   'version' => '2.15.1',
+   'version' => '2.15.2',
'author' => 'Adam Carter/UltrasonicNXT',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' => 'chat-desc',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebecbdb888779b3f77db72afaad4bd9637c191e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] Follow-up I24066af: Remove load of non-existent Prioritizer ... - change (oojs/core)

[jenkins-bot (Code Review)]

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

Change subject: Follow-up I24066af: Remove load of non-existent Prioritizer 
test file
..


Follow-up I24066af: Remove load of non-existent Prioritizer test file

Will not exist until I953220e is merged.

Change-Id: I1bc646488746c5468e20c7a48b8bbacbbbeac19b
---
M tests/index.html
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/tests/index.html b/tests/index.html
index 665d96e..73258c4 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -12,7 +12,6 @@



-   




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bc646488746c5468e20c7a48b8bbacbbbeac19b
Gerrit-PatchSet: 2
Gerrit-Project: oojs/core
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: 4a582d7..6247a2f - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 4a582d7..6247a2f
..

Syncronize VisualEditor: 4a582d7..6247a2f

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/99/251699/1

diff --git a/VisualEditor b/VisualEditor
index 4a582d7..6247a2f 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4a582d7abf5d785a7b68c35c6063d74b6dd490c0
+Subproject commit 6247a2f430ecf02b4b4907b150e948fe6dfb4a7e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f858c73320329130677e0f85dc36ed2531638fe
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] WikiEditor integration: Fix dependencies for switch button - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: WikiEditor integration: Fix dependencies for switch button
..


WikiEditor integration: Fix dependencies for switch button

Change-Id: Ic8fb607e8c467e89c0b9af0a9baab84e59b19ba8
---
M extension.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
2 files changed, 12 insertions(+), 9 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7b0496b..7184cc9 100644
--- a/extension.json
+++ b/extension.json
@@ -283,7 +283,8 @@
"visualeditor-ca-editsource-section",
"postedit-confirmation-created",
"postedit-confirmation-restored",
-   "postedit-confirmation-saved"
+   "postedit-confirmation-saved",
+   "visualeditor-mweditmodeve-tool"
],
"position": "top"
},
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index cdf38a8..420ed59 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -382,14 +382,16 @@
mw.loader.load( 'ext.visualEditor.switching' );
$caVeEdit.click( init.onEditTabClick );
$( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
-   $( '.wikiEditor-ui-toolbar' ).prepend(
-   new OO.ui.ButtonWidget( {
-   framed: false,
-   icon: 'edit',
-   title: mw.msg( 
'visualeditor-mweditmodeve-tool' ),
-   classes: [ 
've-init-mw-desktopArticleTarget-editSwitch' ]
-   } ).on( 'click', 
init.activateVe ).$element
-   );
+   mw.loader.using( 'oojs-ui', function () 
{
+   $( '.wikiEditor-ui-toolbar' 
).prepend(
+   new OO.ui.ButtonWidget( 
{
+   framed: false,
+   icon: 'edit',
+   title: mw.msg( 
'visualeditor-mweditmodeve-tool' ),
+   classes: [ 
've-init-mw-desktopArticleTarget-editSwitch' ]
+   } ).on( 'click', 
init.activateVe ).$element
+   );
+   } );
} );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8fb607e8c467e89c0b9af0a9baab84e59b19ba8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Esanders 
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: 4a582d7..6247a2f - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 4a582d7..6247a2f
..


Syncronize VisualEditor: 4a582d7..6247a2f

Change-Id: I6f858c73320329130677e0f85dc36ed2531638fe
---
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 4a582d7..6247a2f 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4a582d7abf5d785a7b68c35c6063d74b6dd490c0
+Subproject commit 6247a2f430ecf02b4b4907b150e948fe6dfb4a7e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f858c73320329130677e0f85dc36ed2531638fe
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] set cache_misc to "mid" ciphersuite - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: set cache_misc to "mid" ciphersuite
..

set cache_misc to "mid" ciphersuite

Rationale here is that "misc" services are not general-purpose
production wikis: they are tooling used by employees and
more-advanced volunteers.  We can set and/or expect a higher
standard here since some of these services are fairly
sercurity-sensitive anyways.

Change-Id: Ib33432ddd40915b5e61a5cfc61cd5b79d865c985
---
M hieradata/role/common/cache/misc.yaml
M modules/tlsproxy/manifests/instance.pp
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/251704/1

diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 6494805..e3cb1c3 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -1 +1,2 @@
 cluster: cache_misc
+tlsproxy::ciphersuite: mid
diff --git a/modules/tlsproxy/manifests/instance.pp 
b/modules/tlsproxy/manifests/instance.pp
index 4c59942..04595cf 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -1,10 +1,12 @@
 # This defines the actual nginx daemon/instance which tlsproxy "sites" belong 
to
-class tlsproxy::instance {
+class tlsproxy::instance(
+$ciphersuite = 'compat'
+) {
 # Tune kernel settings
 include webserver::sysctl_settings
 
 $nginx_worker_connections = '32768'
-$nginx_ssl_conf = ssl_ciphersuite('nginx', 'compat')
+$nginx_ssl_conf = ssl_ciphersuite('nginx', $ciphersuite)
 
 class { 'nginx': managed => false, }
 

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

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

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

[MediaWiki-commits] [Gerrit] Use Arabic numerals in Punjabi (pa) locale - change (mediawiki/core)

[Nemo bis (Code Review)]

Nemo bis has uploaded a new change for review.

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

Change subject: Use Arabic numerals in Punjabi (pa) locale
..

Use Arabic numerals in Punjabi (pa) locale

A handful users requesting and no opposition.

Bug: T113688
Change-Id: Ie31f0b3a66f389706968860f871086d053c73d3e
---
M RELEASE-NOTES-1.27
M languages/messages/MessagesPa.php
2 files changed, 2 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/251710/1

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 13b9ba2..d894515 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -92,6 +92,8 @@
 regularly. Below only new and removed languages are listed, as well as
 changes to languages because of Bugzilla reports.
 
+* (T113688) Change default numerals from Gurmukhi to Arabic for Punjabi locale.
+
 === Other changes in 1.27 ===
 * ProfilerOutputUdp was removed. Note that there is a ProfilerOutputStats 
class.
 * WikiPage::doDeleteArticleReal() and WikiPage::doDeleteArticle() now
diff --git a/languages/messages/MessagesPa.php 
b/languages/messages/MessagesPa.php
index 988e0b0..d5460f3 100644
--- a/languages/messages/MessagesPa.php
+++ b/languages/messages/MessagesPa.php
@@ -179,18 +179,6 @@
'pagesincategory_files' => array( '0', 'ਫ਼ਾਈਲਾਂ', 'files' ),
 );
 
-$digitTransformTable = array(
-   '0' => '੦', # 
-   '1' => '੧', # 
-   '2' => '੨', # 
-   '3' => '੩', # 
-   '4' => '੪', # 
-   '5' => '੫', # 
-   '6' => '੬', # 
-   '7' => '੭', # 
-   '8' => '੮', # 
-   '9' => '੯', # 
-);
 $linkTrail = 
'/^([ਁਂਃਅਆਇਈਉਊਏਐਓਔਕਖਗਘਙਚਛਜਝਞਟਠਡਢਣਤਥਦਧਨਪਫਬਭਮਯਰਲਲ਼ਵਸ਼ਸਹ਼ਾਿੀੁੂੇੈੋੌ੍ਖ਼ਗ਼ਜ਼ੜਫ਼ੰੱੲੳa-z]+)(.*)$/sDu';
 
 $digitGroupingPattern = "##,##,###";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie31f0b3a66f389706968860f871086d053c73d3e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

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

[MediaWiki-commits] [Gerrit] BannerHistoryLogger: preserve inactive log up to 365 days - change (mediawiki...CentralNotice)

[AndyRussG (Code Review)]

AndyRussG has uploaded a new change for review.

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

Change subject: BannerHistoryLogger: preserve inactive log up to 365 days
..

BannerHistoryLogger: preserve inactive log up to 365 days

Change-Id: I968638d44489ded1f08df4a759d0fd864870d1e2
---
M resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
1 file changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/resources/subscribing/ext.centralNotice.bannerHistoryLogger.js 
b/resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
index 0e18086..aa6715a 100644
--- a/resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
+++ b/resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
@@ -19,6 +19,10 @@
inSample,
 
BANNER_HISTORY_KV_STORE_KEY = 'banner_history',
+
+   // Maximum time (in days) that the banner history store KV 
store item
+   // will persist if no entries are added to it.
+   BANNER_HISTORY_KV_STORE_TTL = 365,
BANNER_HISTORY_LOG_ENTRY_VERSION = 1, // Update when log format 
changes
EVENT_LOGGING_SCHEMA = 'CentralNoticeBannerHistory',
 
@@ -118,7 +122,8 @@
cn.kvStore.setItem(
BANNER_HISTORY_KV_STORE_KEY,
log,
-   cn.kvStore.contexts.GLOBAL
+   cn.kvStore.contexts.GLOBAL,
+   BANNER_HISTORY_KV_STORE_TTL
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I968638d44489ded1f08df4a759d0fd864870d1e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 

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

[MediaWiki-commits] [Gerrit] TOC: Fix problems on RTL wikis - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: TOC: Fix problems on RTL wikis
..


TOC: Fix problems on RTL wikis

This is a follow-up to c7894deb.

Bug: T118029
Change-Id: I0cd614063daff20e226a2ba1f819cebd71a2244b
---
M resources/src/mediawiki.skinning/content.css
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.skinning/content.css 
b/resources/src/mediawiki.skinning/content.css
index a5dd692..d7daabc 100644
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -98,7 +98,8 @@
 /* Ignored by IE7 and lower */
 .tocnumber:after {
content: "";
-   padding-right: 0.5em;
+   display: inline-block;
+   width: 0.5em;
 }
 
 /* Warning */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cd614063daff20e226a2ba1f819cebd71a2244b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Jack Phoenix 
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 erroneous comments - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: remove erroneous comments
..

remove erroneous comments

Change-Id: I1c36ec944f28baddd9f84a7c24ec86b1688f6c14
---
M modules/tlsproxy/manifests/instance.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/251703/1

diff --git a/modules/tlsproxy/manifests/instance.pp 
b/modules/tlsproxy/manifests/instance.pp
index 5173e33..4c59942 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -10,11 +10,11 @@
 
 file { '/etc/nginx/nginx.conf':
 content => template('tlsproxy/nginx.conf.erb'),
-tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster 
3.6.2+
+tag => 'nginx',
 }
 
 file { '/etc/logrotate.d/nginx':
 source => 'puppet:///modules/tlsproxy/logrotate',
-tag=> 'nginx', # workaround PUP-2689, can remove w/ puppetmaster 
3.6.2+
+tag=> 'nginx',
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] remove erroneous comments - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: remove erroneous comments
..


remove erroneous comments

Change-Id: I1c36ec944f28baddd9f84a7c24ec86b1688f6c14
---
M modules/tlsproxy/manifests/instance.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/tlsproxy/manifests/instance.pp 
b/modules/tlsproxy/manifests/instance.pp
index 5173e33..4c59942 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -10,11 +10,11 @@
 
 file { '/etc/nginx/nginx.conf':
 content => template('tlsproxy/nginx.conf.erb'),
-tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster 
3.6.2+
+tag => 'nginx',
 }
 
 file { '/etc/logrotate.d/nginx':
 source => 'puppet:///modules/tlsproxy/logrotate',
-tag=> 'nginx', # workaround PUP-2689, can remove w/ puppetmaster 
3.6.2+
+tag=> 'nginx',
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Return to status quo after load is back to normal - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Return to status quo after load is back to normal
..


Return to status quo after load is back to normal

This increases the load of db1054 and db1060 back to normal.
Otherwise, db1063 and db1067 may be too stressed and impact on
the latency of queries.

Change-Id: I903c90625fe3b74c5d6d23adbbd92416e7712fd9
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 53956ea..f21c30d 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,8 +102,8 @@
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1018' => 200, # 1.4TB  64GB
-   'db1054' => 0, # 2.8TB  96GB, api
-   'db1060' => 0,   # 2.8TB  96GB, api
+   'db1054' => 200, # 2.8TB  96GB, api
+   'db1060' => 200, # 2.8TB  96GB, api
'db1063' => 400, # 2.8TB 128GB
'db1067' => 500, # 2.8TB 160GB
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I903c90625fe3b74c5d6d23adbbd92416e7712fd9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tests: Remove reference to nonexistent Prioritizer.test.js file - change (oojs/core)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: tests: Remove reference to nonexistent Prioritizer.test.js file
..

tests: Remove reference to nonexistent Prioritizer.test.js file

Change-Id: I1bc646488746c5468e20c7a48b8bbacbbbeac19b
---
M tests/index.html
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/91/251691/1

diff --git a/tests/index.html b/tests/index.html
index 665d96e..73258c4 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -12,7 +12,6 @@



-   




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bc646488746c5468e20c7a48b8bbacbbbeac19b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
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] Depool db1054 (s2 API server) - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Depool db1054 (s2 API server)
..


Depool db1054 (s2 API server)

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index f21c30d..c27007a 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,8 +102,8 @@
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1018' => 200, # 1.4TB  64GB
-   'db1054' => 200, # 2.8TB  96GB, api
-   'db1060' => 200, # 2.8TB  96GB, api
+#  'db1054' => 200, # 2.8TB  96GB, api
+   'db1060' => 0,   # 2.8TB  96GB, api
'db1063' => 400, # 2.8TB 128GB
'db1067' => 500, # 2.8TB 160GB
),
@@ -205,7 +205,7 @@
'db1021' => 1,
),
'api' => array(
-   'db1054' => 1,
+#  'db1054' => 1,
'db1060' => 1,
),
'watchlist' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e478a6bdb7829140b8174a3d06900916bdfb481
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Repool db1054 - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Repool db1054
..


Repool db1054

Change-Id: I80d2450c3ab2f50f088adbd55acbe6c2d198d015
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index c27007a..53956ea 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,7 +102,7 @@
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1018' => 200, # 1.4TB  64GB
-#  'db1054' => 200, # 2.8TB  96GB, api
+   'db1054' => 0, # 2.8TB  96GB, api
'db1060' => 0,   # 2.8TB  96GB, api
'db1063' => 400, # 2.8TB 128GB
'db1067' => 500, # 2.8TB 160GB
@@ -205,7 +205,7 @@
'db1021' => 1,
),
'api' => array(
-#  'db1054' => 1,
+   'db1054' => 1,
'db1060' => 1,
),
'watchlist' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80d2450c3ab2f50f088adbd55acbe6c2d198d015
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Depool db1054 (s2 API server) - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Depool db1054 (s2 API server)
..

Depool db1054 (s2 API server)

Change-Id: I8e478a6bdb7829140b8174a3d06900916bdfb481
---
M wmf-config/db-eqiad.php
1 file changed, 33 insertions(+), 11 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index f21c30d..d609c5c 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -89,8 +89,8 @@
's1' => array(
'db1052' => 0,   # 2.8TB  96GB
'db1053' => 0,   # 2.8TB  96GB, vslow, dump
-   'db1051' => 50,  # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
-   'db1055' => 50,  # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   'db1051' => 50,  # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager, pagesave
+   'db1055' => 50,  # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager, pagesave
'db1057' => 200, # 2.8TB  96GB
'db1065' => 100, # 2.8TB 160GB, api
'db1066' => 100, # 2.8TB 160GB, api
@@ -100,24 +100,24 @@
's2' => array(
'db1024' => 0,   # 1.4TB  64GB
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
-   'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager, pagesave
'db1018' => 200, # 1.4TB  64GB
-   'db1054' => 200, # 2.8TB  96GB, api
-   'db1060' => 200, # 2.8TB  96GB, api
+#  'db1054' => 200, # 2.8TB  96GB, api
+   'db1060' => 0,   # 2.8TB  96GB, api
'db1063' => 400, # 2.8TB 128GB
'db1067' => 500, # 2.8TB 160GB
),
/* s3 */ 'DEFAULT' => array(
'db1038' => 0,   # 1.4TB  64GB
'db1027' => 0,   # 1.4TB  64GB, vslow, dump
-   'db1015' => 50,  # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   'db1015' => 50,  # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager, pagesave
'db1035' => 300, # 1.4TB  64GB
'db1044' => 400, # 1.4TB  64GB
),
's4' => array(
'db1040' => 0,   # 1.4TB  64GB
'db1042' => 0,   # 1.4TB  64GB, vslow, dump
-   'db1019' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   'db1019' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager, pagesave
'db1056' => 100, # 2.8TB  96GB, api
'db1059' => 100, # 2.8TB  96GB, api
'db1064' => 500, # 2.8TB 160GB
@@ -126,7 +126,7 @@
's5' => array(
'db1058' => 0,   # 2.8TB  96GB
'db1049' => 0,   # 2.8TB  64GB, vslow, dump
-   'db1026' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   'db1026' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager, pagesave
'db1045' => 0,   # 1.4TB  64GB, api
'db1070' => 500, # 2.8TB 160GB
'db1071' => 500, # 2.8TB 160GB
@@ -135,14 +135,14 @@
'db1023' => 0,   # 1.4TB  64GB
'db1022' => 100, # 1.4TB  64GB
'db1030' => 0,   # 1.4TB  64GB, vslow, dump
-   'db1037' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   'db1037' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager, pagesave
'db1050' => 400, # 2.8TB  64GB
'db1061' => 500, # 2.8TB 128GB
),
's7' => array(
'db1033' => 0,   # 1.4TB  64GB,
'db1028' => 0,   # 1.4TB  64GB, vslow, dump
-   'db1034' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   'db1034' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager, pagesave
'db1041' => 300, # 1.4TB  64GB
'db1039' => 300, # 1.4TB  64GB
'db1062' => 500, # 2.8TB 128GB
@@ -186,6 +186,10 @@
'db1051' => 1,
'db1055' => 1,
),
+   'pagesave' => array(
+   'db1051' => 1,
+   'db1055' => 1,
+   ),
'dump' => array(
'db1053' => 1,
),
@@ -205,7 +209,7 @@
'db1021' => 1,
),
'api' => array(
-   'db1054' => 1,
+#  

[MediaWiki-commits] [Gerrit] [bugfix] Ignore asterisk while comparing reported lines - change (pywikibot/core)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: [bugfix] Ignore asterisk while comparing reported lines
..

[bugfix] Ignore asterisk while comparing reported lines

cosmetic_changes may add a space between asterisk and text. Comparison
whether the line is already reported will fail in that case.

- Add a space between the * and the text.
- remove preleading unicode indicator and use single quotes for the affected
  lines

re-oder code for reporting:
- prevent return statement inside the method
- check whether the file is already reported
  before checking the report length
- use reported = True as default return value

Bug: T102467
Change-Id: I46a29e6417b0ffe6abfeb9ee773c19f0af3f7323
---
M scripts/checkimages.py
1 file changed, 37 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/95/251695/1

diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index 8b6eef8..5096d52 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -342,19 +342,19 @@
 
 # The text added in the report
 report_text = {
-'commons': u"\n*[[:File:%s]] " + timeselected,
-'ar': u"\n*[[:ملف:%s]] " + timeselected,
-'de': u"\n*[[:Datei:%s]] " + timeselected,
-'en': u"\n*[[:File:%s]] " + timeselected,
-'fa': u"n*[[:پرونده:%s]] " + timeselected,
-'ga': u"\n*[[:File:%s]] " + timeselected,
-'hu': u"\n*[[:Kép:%s]] " + timeselected,
-'it': u"\n*[[:File:%s]] " + timeselected,
-'ja': u"\n*[[:File:%s]] " + timeselected,
-'ko': u"\n*[[:그림:%s]] " + timeselected,
-'ta': u"\n*[[:படிமம்:%s]] " + timeselected,
-'ur': u"\n*[[:تصویر:%s]] " + timeselected,
-'zh': u"\n*[[:File:%s]] " + timeselected,
+'commons': '\n* [[:File:%s]] ' + timeselected,
+'ar': '\n* [[:ملف:%s]] ' + timeselected,
+'de': '\n* [[:Datei:%s]] ' + timeselected,
+'en': '\n* [[:File:%s]] ' + timeselected,
+'fa': 'n* [[:پرونده:%s]] ' + timeselected,
+'ga': '\n* [[:File:%s]] ' + timeselected,
+'hu': '\n* [[:Kép:%s]] ' + timeselected,
+'it': '\n* [[:File:%s]] ' + timeselected,
+'ja': '\n* [[:File:%s]] ' + timeselected,
+'ko': '\n* [[:그림:%s]] ' + timeselected,
+'ta': '\n* [[:படிமம்:%s]] ' + timeselected,
+'ur': '\n* [[:تصویر:%s]] ' + timeselected,
+'zh': '\n* [[:File:%s]] ' + timeselected,
 }
 
 # The summary of the report
@@ -578,8 +578,9 @@
 self.rep_text = i18n.translate(self.site, report_text)
 self.com = i18n.translate(self.site, msg_comm10)
 hiddentemplatesRaw = i18n.translate(self.site, HiddenTemplate)
-self.hiddentemplates = set([pywikibot.Page(self.site, tmp)
-for tmp in hiddentemplatesRaw])
+self.hiddentemplates = set(
+[pywikibot.Page(self.site, tmp, ns=self.site.namespaces.TEMPLATE)
+ for tmp in hiddentemplatesRaw])
 self.pageHidden = i18n.translate(self.site, PageWithHiddenTemplates)
 self.pageAllowed = i18n.translate(self.site, PageWithAllowedTemplates)
 self.comment = i18n.twtranslate(self.site.lang,
@@ -721,7 +722,7 @@
 pywikibot.output(
 u"Seems that %s has only the description and not the file..."
 % self.image_to_report)
-repme = u"\n*[[:File:%s]] problems '''with the APIs'''"
+repme = "\n* [[:File:%s]] problems '''with the APIs'''"
 self.report_image(self.image_to_report, self.rep_page, self.com,
   repme)
 return
@@ -914,8 +915,8 @@
 # It's not only on commons but the image needs a check
 # the second usually is a url or something like that.
 # Compare the two in equal way, both url.
-repme = (u"\n*[[:File:%s]] is also on '''Commons''': "
- u"[[commons:File:%s]]"
+repme = ("\n* [[:File:%s]] is also on '''Commons''': "
+ "[[commons:File:%s]]"
  % (self.imageName,
 commons_image_with_this_hash.title(
 withNamespace=False)))
@@ -1050,18 +1051,18 @@
 
 if self.duplicatesReport or only_report:
 if only_report:
-repme = (u"\n*[[:File:%s]] has the following duplicates "
- u"('''forced mode'''):"
+repme = ('\n* [[:File:%s]] has the following duplicates '
+ "('''forced mode'''):"
  % self.image.title(asUrl=True))
 else:
-repme = (u"\n*[[:File:%s]] has the following duplicates:"
+repme = ('\n* [[:File:%s]] has the following duplicates:'
  % self.image.title(asUrl=True))
 
 for dup_page in duplicates:
 if 

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-11-07T10:00:01+0000 - change (mediawiki...Wikidata)

[WikidataBuilder (Code Review)]

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2015-11-07T10:00:01+
..

New Wikidata Build - 2015-11-07T10:00:01+

Change-Id: I2e8921f91b0ec7f2b48f8fbf465acc355c320c01
---
M composer.lock
M extensions/Wikibase/client/i18n/gl.json
M extensions/Wikibase/client/i18n/sr-ec.json
M extensions/Wikibase/client/i18n/tcy.json
M extensions/Wikibase/composer.json
M extensions/Wikibase/lib/i18n/sr-ec.json
M extensions/Wikibase/lib/includes/store/sql/PropertyInfoTable.php
M extensions/Wikibase/purtle/tests/phpunit/NTriplesRdfWriterTest.php
M extensions/Wikibase/purtle/tests/phpunit/TurtleRdfWriterTest.php
M extensions/Wikibase/purtle/tests/phpunit/XmlRdfWriterTest.php
M extensions/Wikibase/repo/i18n/ast.json
M extensions/Wikibase/repo/i18n/sr-ec.json
M extensions/Wikibase/repo/includes/Dumpers/DumpGenerator.php
M extensions/Wikibase/repo/includes/Parsers/MwTimeIsoParser.php
M 
extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
M extensions/Wikibase/repo/includes/store/sql/DispatchStats.php
M extensions/Wikibase/repo/includes/store/sql/ItemsPerSiteBuilder.php
M extensions/Wikibase/repo/includes/store/sql/SqlChangeDispatchCoordinator.php
M extensions/Wikibase/repo/maintenance/importProperties.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
A extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlStoreTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
24 files changed, 277 insertions(+), 100 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/93/251693/1

diff --git a/composer.lock b/composer.lock
index fcad5f5..1ad08c9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1448,12 +1448,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "ea44b4bb7ad356b979f94d8c88cfdc799729f450"
+"reference": "5c86696b001250484d746830b09d29aa34b29d74"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ea44b4bb7ad356b979f94d8c88cfdc799729f450;,
-"reference": "ea44b4bb7ad356b979f94d8c88cfdc799729f450",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5c86696b001250484d746830b09d29aa34b29d74;,
+"reference": "5c86696b001250484d746830b09d29aa34b29d74",
 "shasum": ""
 },
 "require": {
@@ -1483,7 +1483,7 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.4.0"
+"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
 },
 "type": "mediawiki-extension",
 "autoload": {
@@ -1523,7 +1523,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2015-11-05 21:16:49"
+"time": "2015-11-06 21:29:23"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/gl.json 
b/extensions/Wikibase/client/i18n/gl.json
index 9d0bc27..aa1ce00 100644
--- a/extensions/Wikibase/client/i18n/gl.json
+++ b/extensions/Wikibase/client/i18n/gl.json
@@ -8,7 +8,7 @@
},
"wikibase-client-desc": "Cliente para a extensión Wikibase",
"tooltip-t-wikibase": "Ligazón ao elemento conectado no repositorio de 
datos",
-   "apihelp-query+pageterms-description": "Obter os termos asociados a 
unha páxina a través dun elemento de datos asociado.",
+   "apihelp-query+pageterms-description": "Obter os termos asociados a 
unha páxina a través dun elemento de datos asociado. Nunha páxina de entidade 
da wikibase, os termos de entidade usanse directamente.\nAdvertencia: Nunha 
wiki repositorio, os termos de páxina só funcionan directamente en páxinas de 
entidades, non en páxinas conectadas a un elemento. Isto pode cambiar nun 
futuro.",
"apihelp-query+pageterms-example-simple": "Obter todos os termos 
asociados á páxina \"London\", na lingua do usuario.",
"apihelp-query+pageterms-example-label-en": "Obter as etiquetas e os 
pseudónimos asociados á páxina \"London\", en inglés.",
"apihelp-query+pageterms-example-item": "Obter as etiquetas e alias do 
elemento Q84.",
diff --git a/extensions/Wikibase/client/i18n/sr-ec.json 
b/extensions/Wikibase/client/i18n/sr-ec.json
index 9565807..5cfa541 100644
--- a/extensions/Wikibase/client/i18n/sr-ec.json
+++ 

[MediaWiki-commits] [Gerrit] Repool db1054 - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Repool db1054
..

Repool db1054

Change-Id: I80d2450c3ab2f50f088adbd55acbe6c2d198d015
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index c27007a..53956ea 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,7 +102,7 @@
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1018' => 200, # 1.4TB  64GB
-#  'db1054' => 200, # 2.8TB  96GB, api
+   'db1054' => 0, # 2.8TB  96GB, api
'db1060' => 0,   # 2.8TB  96GB, api
'db1063' => 400, # 2.8TB 128GB
'db1067' => 500, # 2.8TB 160GB
@@ -205,7 +205,7 @@
'db1021' => 1,
),
'api' => array(
-#  'db1054' => 1,
+   'db1054' => 1,
'db1060' => 1,
),
'watchlist' => array(

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

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

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

[MediaWiki-commits] [Gerrit] Use Arabic numerals in Punjabi (pa) locale - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Use Arabic numerals in Punjabi (pa) locale
..


Use Arabic numerals in Punjabi (pa) locale

A handful users requesting and no opposition.

Bug: T113688
Change-Id: Ie31f0b3a66f389706968860f871086d053c73d3e
---
M RELEASE-NOTES-1.27
M languages/messages/MessagesPa.php
2 files changed, 2 insertions(+), 12 deletions(-)

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



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 13b9ba2..d894515 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -92,6 +92,8 @@
 regularly. Below only new and removed languages are listed, as well as
 changes to languages because of Bugzilla reports.
 
+* (T113688) Change default numerals from Gurmukhi to Arabic for Punjabi locale.
+
 === Other changes in 1.27 ===
 * ProfilerOutputUdp was removed. Note that there is a ProfilerOutputStats 
class.
 * WikiPage::doDeleteArticleReal() and WikiPage::doDeleteArticle() now
diff --git a/languages/messages/MessagesPa.php 
b/languages/messages/MessagesPa.php
index 988e0b0..d5460f3 100644
--- a/languages/messages/MessagesPa.php
+++ b/languages/messages/MessagesPa.php
@@ -179,18 +179,6 @@
'pagesincategory_files' => array( '0', 'ਫ਼ਾਈਲਾਂ', 'files' ),
 );
 
-$digitTransformTable = array(
-   '0' => '੦', # 
-   '1' => '੧', # 
-   '2' => '੨', # 
-   '3' => '੩', # 
-   '4' => '੪', # 
-   '5' => '੫', # 
-   '6' => '੬', # 
-   '7' => '੭', # 
-   '8' => '੮', # 
-   '9' => '੯', # 
-);
 $linkTrail = 
'/^([ਁਂਃਅਆਇਈਉਊਏਐਓਔਕਖਗਘਙਚਛਜਝਞਟਠਡਢਣਤਥਦਧਨਪਫਬਭਮਯਰਲਲ਼ਵਸ਼ਸਹ਼ਾਿੀੁੂੇੈੋੌ੍ਖ਼ਗ਼ਜ਼ੜਫ਼ੰੱੲੳa-z]+)(.*)$/sDu';
 
 $digitGroupingPattern = "##,##,###";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie31f0b3a66f389706968860f871086d053c73d3e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Nikerabbit 
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] AdminUi: fix minor mixin control hide issue - change (mediawiki...CentralNotice)

[AndyRussG (Code Review)]

AndyRussG has uploaded a new change for review.

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

Change subject: AdminUi: fix minor mixin control hide issue
..

AdminUi: fix minor mixin control hide issue

Change-Id: Ib2aab3db213cad564238a5c8cac8ec5ffee308ff
---
M templates/campaignMixinParamControls.mustache
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/templates/campaignMixinParamControls.mustache 
b/templates/campaignMixinParamControls.mustache
index b67c674..1a4ecda 100644
--- a/templates/campaignMixinParamControls.mustache
+++ b/templates/campaignMixinParamControls.mustache
@@ -1,5 +1,5 @@
-
-
+
+
 {{#params}}



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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2aab3db213cad564238a5c8cac8ec5ffee308ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-11-07T10:00:01+0000 - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: New Wikidata Build - 2015-11-07T10:00:01+
..


New Wikidata Build - 2015-11-07T10:00:01+

Change-Id: I2e8921f91b0ec7f2b48f8fbf465acc355c320c01
---
M composer.lock
M extensions/Wikibase/client/i18n/gl.json
M extensions/Wikibase/client/i18n/sr-ec.json
M extensions/Wikibase/client/i18n/tcy.json
M extensions/Wikibase/composer.json
M extensions/Wikibase/lib/i18n/sr-ec.json
M extensions/Wikibase/lib/includes/store/sql/PropertyInfoTable.php
M extensions/Wikibase/purtle/tests/phpunit/NTriplesRdfWriterTest.php
M extensions/Wikibase/purtle/tests/phpunit/TurtleRdfWriterTest.php
M extensions/Wikibase/purtle/tests/phpunit/XmlRdfWriterTest.php
M extensions/Wikibase/repo/i18n/ast.json
M extensions/Wikibase/repo/i18n/sr-ec.json
M extensions/Wikibase/repo/includes/Dumpers/DumpGenerator.php
M extensions/Wikibase/repo/includes/Parsers/MwTimeIsoParser.php
M 
extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
M extensions/Wikibase/repo/includes/store/sql/DispatchStats.php
M extensions/Wikibase/repo/includes/store/sql/ItemsPerSiteBuilder.php
M extensions/Wikibase/repo/includes/store/sql/SqlChangeDispatchCoordinator.php
M extensions/Wikibase/repo/maintenance/importProperties.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/RemoveClaimsTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
A extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlStoreTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
24 files changed, 277 insertions(+), 100 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index fcad5f5..1ad08c9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1448,12 +1448,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "ea44b4bb7ad356b979f94d8c88cfdc799729f450"
+"reference": "5c86696b001250484d746830b09d29aa34b29d74"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ea44b4bb7ad356b979f94d8c88cfdc799729f450;,
-"reference": "ea44b4bb7ad356b979f94d8c88cfdc799729f450",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5c86696b001250484d746830b09d29aa34b29d74;,
+"reference": "5c86696b001250484d746830b09d29aa34b29d74",
 "shasum": ""
 },
 "require": {
@@ -1483,7 +1483,7 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.4.0"
+"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
 },
 "type": "mediawiki-extension",
 "autoload": {
@@ -1523,7 +1523,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2015-11-05 21:16:49"
+"time": "2015-11-06 21:29:23"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/gl.json 
b/extensions/Wikibase/client/i18n/gl.json
index 9d0bc27..aa1ce00 100644
--- a/extensions/Wikibase/client/i18n/gl.json
+++ b/extensions/Wikibase/client/i18n/gl.json
@@ -8,7 +8,7 @@
},
"wikibase-client-desc": "Cliente para a extensión Wikibase",
"tooltip-t-wikibase": "Ligazón ao elemento conectado no repositorio de 
datos",
-   "apihelp-query+pageterms-description": "Obter os termos asociados a 
unha páxina a través dun elemento de datos asociado.",
+   "apihelp-query+pageterms-description": "Obter os termos asociados a 
unha páxina a través dun elemento de datos asociado. Nunha páxina de entidade 
da wikibase, os termos de entidade usanse directamente.\nAdvertencia: Nunha 
wiki repositorio, os termos de páxina só funcionan directamente en páxinas de 
entidades, non en páxinas conectadas a un elemento. Isto pode cambiar nun 
futuro.",
"apihelp-query+pageterms-example-simple": "Obter todos os termos 
asociados á páxina \"London\", na lingua do usuario.",
"apihelp-query+pageterms-example-label-en": "Obter as etiquetas e os 
pseudónimos asociados á páxina \"London\", en inglés.",
"apihelp-query+pageterms-example-item": "Obter as etiquetas e alias do 
elemento Q84.",
diff --git a/extensions/Wikibase/client/i18n/sr-ec.json 
b/extensions/Wikibase/client/i18n/sr-ec.json
index 9565807..5cfa541 100644
--- a/extensions/Wikibase/client/i18n/sr-ec.json
+++ b/extensions/Wikibase/client/i18n/sr-ec.json
@@ -5,14 +5,15 @@

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6247a2f..69bce26 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 6247a2f..69bce26
..

Syncronize VisualEditor: 6247a2f..69bce26

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


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

diff --git a/VisualEditor b/VisualEditor
index 6247a2f..69bce26 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 6247a2f430ecf02b4b4907b150e948fe6dfb4a7e
+Subproject commit 69bce265791ade69e64cfeffa85bdf6fb1a7680c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11700637c1df36764d3b323576f26f2b8349d53a
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] Drop any beforeunload handlers when loading from existing wi... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Drop any beforeunload handlers when loading from existing 
wikitext
..


Drop any beforeunload handlers when loading from existing wikitext

Bug: T117769
Change-Id: I823737b17e5af8ed15bc2b62db61a31886e8d418
---
M modules/ve-mw/init/ve.init.mw.TargetLoader.js
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.TargetLoader.js 
b/modules/ve-mw/init/ve.init.mw.TargetLoader.js
index d54ab33..585f7bf 100644
--- a/modules/ve-mw/init/ve.init.mw.TargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.TargetLoader.js
@@ -135,6 +135,8 @@
ve.track( 'trace.restbaseLoad.enter' );
if ( conf.fullRestbaseUrl && $( '#wpTextbox1' 
).length ) {
fromEditedState = true;
+   window.onbeforeunload = null;
+   $( window ).off( 'beforeunload' );
restbaseXhr = $.post(
conf.fullRestbaseUrl + 
'v1/transform/wikitext/to/html/' +
encodeURIComponent( 
pageName ) +

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I823737b17e5af8ed15bc2b62db61a31886e8d418
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6247a2f..69bce26 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 6247a2f..69bce26
..


Syncronize VisualEditor: 6247a2f..69bce26

Change-Id: I11700637c1df36764d3b323576f26f2b8349d53a
---
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 6247a2f..69bce26 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 6247a2f430ecf02b4b4907b150e948fe6dfb4a7e
+Subproject commit 69bce265791ade69e64cfeffa85bdf6fb1a7680c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11700637c1df36764d3b323576f26f2b8349d53a
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] Merge branch 'master' of https://gerrit.wikimedia.org/r/p/me... - change (mediawiki...HitCounters)

[MarkAHershberger (Code Review)]

MarkAHershberger has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HitCounters
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HitCounters

Conflicts:
HitCounters.body.php
HitCounters.hooks.php

Change-Id: I3dc2e2b1329f56fa26dcd4c8d33ad7d764957929
---
M HitCounters.body.php
M HitCounters.hooks.php
2 files changed, 0 insertions(+), 15 deletions(-)


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

diff --git a/HitCounters.body.php b/HitCounters.body.php
index 4735703..a2d59bb 100644
--- a/HitCounters.body.php
+++ b/HitCounters.body.php
@@ -81,11 +81,7 @@
wfDebugLog( "HitCounters", __METHOD__ . ": got 
" .
var_export( self::$mViews, true ) .
" from select." );
-<<< HEAD   (f73e27 Fix a variety of bugs)
self::cacheStore( $cache, $key, self::$mviews );
-===
-   self::cacheStore( $cache, $key, self::$mViews );
->>> BRANCH (26b7e2 Icrement extension's version)
}
}
return self::$mViews;
diff --git a/HitCounters.hooks.php b/HitCounters.hooks.php
index c2de62a..5bd06d9 100644
--- a/HitCounters.hooks.php
+++ b/HitCounters.hooks.php
@@ -46,11 +46,7 @@
$extraStats['hitcounters-statistics-header-views']
['hitcounters-statistics-views-peredit'] =
$wgContLang->formatNum( $totalViews
-<<< HEAD   (f73e27 Fix a variety of bugs)
? sprintf( '%2.f', $totalViews / 
SiteStats::edits() )
-===
-   ? sprintf( '%.2f', $totalViews / 
SiteStats::edits() )
->>> BRANCH (26b7e2 Icrement extension's version)
: 0 );
$extraStats['hitcounters-statistics-mostpopular'] =
self::getMostViewedPages( $statsPage );
@@ -75,14 +71,7 @@
if ( $title instanceof Title ) {
$ret[ $title->getPrefixedText() 
]['number'] = $row->value;
$ret[ $title->getPrefixedText() 
]['name'] =
-<<< HEAD   (f73e27 Fix a variety of bugs)
-   $statsPage->msg(
-   
'hitcounters-page-label',
-   Linker::link( $title )
-   )->title( 
$statsPage->getTitle() );
-===
\Linker::link( $title );
->>> BRANCH (26b7e2 Icrement extension's version)
}
}
$res->free();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dc2e2b1329f56fa26dcd4c8d33ad7d764957929
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HitCounters
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] Merge branch 'REL1_25' of https://gerrit.wikimedia.org/r/p/m... - change (mediawiki...HitCounters)

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'REL1_25' of 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HitCounters into REL1_25
..


Merge branch 'REL1_25' of 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HitCounters into REL1_25

Change-Id: I50d7b2c4c8525381b429b386bd4bc3c345d6b984
---
M HitCounters.body.php
M ViewCountUpdate.php
M drop_field.sql
M extension.json
M hit_counter_extension.sql
M i18n/de.json
M i18n/en.json
M i18n/gl.json
M i18n/it.json
M i18n/ko.json
M i18n/ksh.json
M i18n/mk.json
M i18n/pl.json
M i18n/qqq.json
M i18n/ru.json
M i18n/tr.json
M initial_count.sql
M page_counter.sql
M rename_table.sql
19 files changed, 1 insertion(+), 259 deletions(-)

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



diff --git a/HitCounters.body.php b/HitCounters.body.php
index 80ca19d..cba4fc7 100644
--- a/HitCounters.body.php
+++ b/HitCounters.body.php
@@ -11,7 +11,6 @@
 class HitCounters {
protected static $mViews;
 
-<<< HEAD   (26b7e2 Icrement extension's version)
protected static function cacheStore( $cache, $key, $views ) {
if ( $views < 100 ) {
// Only cache for a minute
@@ -118,92 +117,6 @@
'INNER JOIN',
$wgDBprefix . 'page.page_id = ' .
$wgDBprefix . 'hit_counter.page_id' )
-===
-   /**
-* @return int The view count for the page
-*/
-   public static function getCount( Title $title ) {
-   if ( $title === null ) {
-   throw new MWException( "Asked for count without a 
title!" );
-   }
-   if ( $title->isSpecialPage() ) {
-   return null;
-   }
-
-   /*
-* Use the cache to avoid hitting the DB if available since
-* page views are pretty common and this is a tiny bit of
-* information.
-*/
-   $cache = wfGetCache( CACHE_ANYTHING );
-   $key = wfMemcKey( 'viewcount', $title->getDBkey() );
-   $views = $cache->get( $key );
-   if ( !$views ) {
-   $dbr = wfGetDB( DB_SLAVE );
-   $row = $dbr->select(
-   array( 'hit_counter' ),
-   array( 'hits' => 'page_counter' ),
-   array( 'page_id' => $title->getArticleID() ),
-   __METHOD__ );
-
-   if ( $row !== false && $current = $row->current() ) {
-   $views = $current->hits;
-   /* update only once a day */
-   $cache->set( $key, $views, 24 * 3600 );
-   }
-   }
-
-   return $views;
-   }
-
-   public static function views() {
-   # Should check for MiserMode here
-   $cache = wfGetCache( CACHE_ANYTHING );
-   $key = wfMemcKey( 'sitestats', 'activeusers-updated' );
-   // Re-calculate the count if the last tally is old...
-   if ( !self::$mViews ) {
-   self::$mViews = $cache->get( $key );
-   wfDebugLog( "HitCounters", __METHOD__ . ": got " . 
var_export( self::$mViews, true ) .
-   " from cache." );
-   if ( !self::$mViews ) {
-   $dbr = wfGetDB( DB_SLAVE );
-   self::$mViews = $dbr->selectField( 
'hit_counter', 'SUM(page_counter)', '',
-   __METHOD__ );
-   wfDebugLog( "HitCounters", __METHOD__ . ": got 
" . var_export( self::$mViews, true ) .
-   " from select." );
-   $cache->set( $key, self::$mViews, 24 * 3600 ); 
// don't update for 1 day
-   }
-   }
-   return self::$mViews;
-   }
-
-   /**
-* We can't choose our parameters since this is a hook and we
-* don't really need to use the $parser and $cache parameters.
-*
-* @SuppressWarnings(PHPMD.UnusedFormalParameter)
-*/
-   public static function numberOfViews( Parser &$parser, PPFrame $frame, 
$args ) {
-   return self::getCount( $frame->title );
-   }
-
-   public static function getQueryInfo() {
-   global $wgDBprefix;
-
-   return array(
-   'tables' => array( 'page', 'hit_counter' ),
-   'fields' => array(
-   'namespace' => 'page_namespace',
-   'title' => 

[MediaWiki-commits] [Gerrit] Handle exceptions in stomp job runner - change (wikimedia...SmashPig)

[jenkins-bot (Code Review)]

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

Change subject: Handle exceptions in stomp job runner
..


Handle exceptions in stomp job runner

Change-Id: Ic070fa7cbf348feb27d28021f081b81584a5ed56
---
M Maintenance/StompJobRunner.php
1 file changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/Maintenance/StompJobRunner.php b/Maintenance/StompJobRunner.php
index 916d595..f22a5b8 100644
--- a/Maintenance/StompJobRunner.php
+++ b/Maintenance/StompJobRunner.php
@@ -45,11 +45,20 @@
}
 
if ( $jobObj instanceof \SmashPig\Core\Jobs\RunnableJob 
) {
-   if ( $jobObj->execute() ) {
+   $success = false;
+   try {
+   if ( $jobObj->execute() ) {
+   $success = true;
+   } else {
+   Logger::info( "Job tells us 
that it did not successfully execute. Sending to damaged message queue.", 
$jobObj );
+   }
+   } catch ( SmashPigException $ex ) {
+   Logger::info( "Job threw exception 
{$ex->getMessage()}. Sending to damaged message queue.", $jobObj );
+   }
+   if ( $success ) {
$successCount += 1;
$this->datastore->queueAckObject();
} else {
-   Logger::info( "Job tells us that it did 
not successfully execute. Sending to damaged message queue.", $jobObj );

$this->damagedDatastore->queueAddObject( $jobObj );
$this->datastore->queueAckObject();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic070fa7cbf348feb27d28021f081b81584a5ed56
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
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] Only load switching module (depending on OOUI etc.) on edit ... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Only load switching module (depending on OOUI etc.) on edit 
pages
..


Only load switching module (depending on OOUI etc.) on edit pages

This wasn't as bad as T112401 (that was blocking render), but we
still shouldn't be loading the module on page views.

Bug: T118088
Change-Id: If86701ed7ff4e8d6defb1c682aa9a38c211be0fa
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 13 insertions(+), 11 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index ae684a5..3b6f091 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -416,18 +416,20 @@
 
if ( pageCanLoadVE ) {
// Allow instant switching to edit mode, 
without refresh
-   mw.loader.load( 'ext.visualEditor.switching' );
$caVeEdit.click( init.onEditTabClick );
-   $( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
-   $( '.wikiEditor-ui-toolbar' ).prepend(
-   new OO.ui.ButtonWidget( {
-   framed: false,
-   icon: 'edit',
-   title: mw.msg( 
'visualeditor-mweditmodeve-tool' ),
-   classes: [ 
've-init-mw-desktopArticleTarget-editSwitch' ]
-   } ).on( 'click', 
init.activateVe ).$element
-   );
-   } );
+   if ( [ 'edit', 'submit' ].indexOf( 
mw.config.get( 'wgAction' ) ) !== -1 ) {
+   mw.loader.load( 
'ext.visualEditor.switching' );
+   $( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
+   $( '.wikiEditor-ui-toolbar' 
).prepend(
+   new OO.ui.ButtonWidget( 
{
+   framed: false,
+   icon: 'edit',
+   title: mw.msg( 
'visualeditor-mweditmodeve-tool' ),
+   classes: [ 
've-init-mw-desktopArticleTarget-editSwitch' ]
+   } ).on( 'click', 
init.activateVe ).$element
+   );
+   } );
+   }
}
},
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If86701ed7ff4e8d6defb1c682aa9a38c211be0fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.5
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update VisualEditor for If86701ed - change (mediawiki/core)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Update VisualEditor for If86701ed
..

Update VisualEditor for If86701ed

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/251739/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index ec764bc..04e80c5 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit ec764bc8654463f789f063609c9b1c0fa6012513
+Subproject commit 04e80c5365bd68797daac2cf792baf51445ff6e4

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8260043461feca66954193858cb7ba1a7e7b6c63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.5
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Update VisualEditor for If86701ed - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update VisualEditor for If86701ed
..


Update VisualEditor for If86701ed

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index ec764bc..04e80c5 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit ec764bc8654463f789f063609c9b1c0fa6012513
+Subproject commit 04e80c5365bd68797daac2cf792baf51445ff6e4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8260043461feca66954193858cb7ba1a7e7b6c63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.5
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use coding convention - change (mediawiki...NumerAlpha)

[jenkins-bot (Code Review)]

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

Change subject: Use coding convention
..


Use coding convention

Change-Id: I7b495ee93fe30873a950be17139734886a90c590
---
M NumerAlpha.class.php
1 file changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/NumerAlpha.class.php b/NumerAlpha.class.php
index d38a8c9..3af42a5 100755
--- a/NumerAlpha.class.php
+++ b/NumerAlpha.class.php
@@ -28,7 +28,7 @@
static $listTypes = null;
 
// Hook our callback function into the parser
-   static public function onParserFirstCallInit ( Parser &$parser ) {
+   public static function onParserFirstCallInit ( Parser &$parser ) {
 
// When the parser sees the  tag, it executes
// the wfSampleRender function (see below)
@@ -235,7 +235,7 @@
 *  Call parser function like {{#counter: Counter name | type = 
Counter type | set = 5 }}
 *
 **/
-   static public function renderCounter ( &$parser, $frame, $args ) {
+   public static function renderCounter ( &$parser, $frame, $args ) {
 
self::$frame = $frame;
 
@@ -255,7 +255,7 @@
 
}
 
-   static protected function getNumeralValue ( $list ) {
+   protected static function getNumeralValue ( $list ) {
$counterValue = str_pad(
$list[ 'count' ],
$list[ 'padlength' ],
@@ -267,7 +267,7 @@
}
 
 
-   static protected function getAlphaValue ( $list ) {
+   protected static function getAlphaValue ( $list ) {
 
$num = $list[ 'count' ];
 
@@ -282,7 +282,7 @@
 
}
 
-   static protected function getRomanValue ( $list ) {
+   protected static function getRomanValue ( $list ) {
 
$num = $list[ 'count' ];
 
@@ -312,7 +312,7 @@
 
}
 
-   static public function renderNumeralTag ( $input, array $argv, Parser 
$parser, PPFrame $frame ) {
+   public static function renderNumeralTag ( $input, array $argv, Parser 
$parser, PPFrame $frame ) {
if ( isset( $argv['reset'] ) && $argv['reset'] == "yes" OR 
isset( $argv['reset'] ) && $argv['reset'] == "1" ) {
self::$numer[1] = 1;
}
@@ -331,7 +331,7 @@
) ) . '';
}
 
-   static public function renderAlphaTag ( $input, array $argv, Parser 
$parser, PPFrame $frame ) {
+   public static function renderAlphaTag ( $input, array $argv, Parser 
$parser, PPFrame $frame ) {
 
if (isset($argv['reset']) && $argv['reset'] == "yes" OR 
isset($argv['reset']) && $argv['reset'] == "1") {self::$numer[0] = 1;}
if (isset($argv['begin']) && $argv['begin'] != "") 
{self::$numer[0] = $argv['begin'];}
@@ -347,7 +347,7 @@
}
 
// ...render unto Caesar?
-   static public function renderRomanTag ( $input, array $argv, Parser 
$parser, PPFrame $frame ) {
+   public static function renderRomanTag ( $input, array $argv, Parser 
$parser, PPFrame $frame ) {
 
if (isset($argv['reset']) && $argv['reset'] == "yes" OR 
isset($argv['reset']) && $argv['reset'] == "1") {self::$numer[2] = 1;}
if (isset($argv['begin']) && $argv['begin'] != "") 
{self::$numer[2] = $argv['begin'];}
@@ -363,4 +363,4 @@
 
}
 
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b495ee93fe30873a950be17139734886a90c590
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/NumerAlpha
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Jamesmontalvo3 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ApiHelp: Fix undefined variable warning - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: ApiHelp: Fix undefined variable warning
..


ApiHelp: Fix undefined variable warning

Change-Id: I5b2790af9182dd76cd52be284f56e4833ac464c6
---
M includes/api/ApiHelp.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index db7c149..e587162 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -310,6 +310,7 @@
);
}
 
+   $flags = $module->getHelpFlags();
$help['flags'] .= Html::openElement( 'div',
array( 'class' => 'apihelp-block apihelp-flags' 
) );
$msg = $context->msg( 'api-help-flags' );
@@ -319,7 +320,7 @@
);
}
$help['flags'] .= Html::openElement( 'ul' );
-   foreach ( $module->getHelpFlags() as $flag ) {
+   foreach ( $flags as $flag ) {
$help['flags'] .= Html::rawElement( 'li', null,
self::wrap( $context->msg( 
"api-help-flag-$flag" ), "apihelp-flag-$flag" )
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b2790af9182dd76cd52be284f56e4833ac464c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
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 casing of function calls in API - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Fix casing of function calls in API
..

Fix casing of function calls in API

Change-Id: I44b343568e5713118c41f29a73e112162dd3e635
---
M includes/api/ApiCreateAccount.php
M includes/api/ApiEditPage.php
M includes/api/ApiFeedWatchlist.php
M includes/api/ApiFormatBase.php
M includes/api/ApiHelp.php
M includes/api/ApiMain.php
M includes/api/ApiOpenSearch.php
M includes/api/ApiParamInfo.php
M includes/api/ApiQueryBase.php
M includes/api/ApiQueryCategoryMembers.php
M includes/api/ApiQueryImageInfo.php
M includes/api/ApiQueryInfo.php
M includes/api/ApiQueryRevisionsBase.php
M includes/api/ApiQuerySiteinfo.php
M includes/api/ApiSetNotificationTimestamp.php
15 files changed, 31 insertions(+), 31 deletions(-)


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

diff --git a/includes/api/ApiCreateAccount.php 
b/includes/api/ApiCreateAccount.php
index 00b7de9..1368bda 100644
--- a/includes/api/ApiCreateAccount.php
+++ b/includes/api/ApiCreateAccount.php
@@ -95,7 +95,7 @@
Hooks::run( 'AddNewAccountApiForm', array( $this, $loginForm ) 
);
$loginForm->load();
 
-   $status = $loginForm->addNewaccountInternal();
+   $status = $loginForm->addNewAccountInternal();
LoggerFactory::getInstance( 'authmanager' )->info( 'Account 
creation attempt via API', array(
'event' => 'accountcreation',
'status' => $status,
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 90d976a..78913e1 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -244,12 +244,12 @@
$this->dieUsageMsg( array( 'nosuchrevid', 
$params['undoafter'] ) );
}
 
-   if ( $undoRev->getPage() != $pageObj->getID() ) {
-   $this->dieUsageMsg( array( 'revwrongpage', 
$undoRev->getID(),
+   if ( $undoRev->getPage() != $pageObj->getId() ) {
+   $this->dieUsageMsg( array( 'revwrongpage', 
$undoRev->getId(),
$titleObj->getPrefixedText() ) );
}
-   if ( $undoafterRev->getPage() != $pageObj->getID() ) {
-   $this->dieUsageMsg( array( 'revwrongpage', 
$undoafterRev->getID(),
+   if ( $undoafterRev->getPage() != $pageObj->getId() ) {
+   $this->dieUsageMsg( array( 'revwrongpage', 
$undoafterRev->getId(),
$titleObj->getPrefixedText() ) );
}
 
@@ -268,7 +268,7 @@
// If no summary was given and we only undid one rev,
// use an autosummary
if ( is_null( $params['summary'] ) &&
-   $titleObj->getNextRevisionID( 
$undoafterRev->getID() ) == $params['undo']
+   $titleObj->getNextRevisionID( 
$undoafterRev->getId() ) == $params['undo']
) {
$params['summary'] = wfMessage( 'undo-summary' )
->params( $params['undo'], 
$undoRev->getUserText() )->inContentLanguage()->text();
diff --git a/includes/api/ApiFeedWatchlist.php 
b/includes/api/ApiFeedWatchlist.php
index 0ddb3c3..e8afcb6 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -181,7 +181,7 @@
// Probably a formerly-valid title that's now 
conflicting with an
// interwiki prefix or the like.
if ( isset( $info['pageid'] ) ) {
-   $title = Title::newFromId( $info['pageid'] );
+   $title = Title::newFromID( $info['pageid'] );
$curidParam = array( 'curid' => $info['pageid'] 
);
}
if ( !$title || $title->isExternal() ) {
diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php
index 3c10518..17966af 100644
--- a/includes/api/ApiFormatBase.php
+++ b/includes/api/ApiFormatBase.php
@@ -207,7 +207,7 @@
 
// API handles its own clickjacking protection.
// Note, that $wgBreakFrames will still override 
$wgApiFrameOptions for format mode.
-   $out->allowClickJacking();
+   $out->allowClickjacking();
$out->output();
} else {
// For non-HTML output, clear all errors that might 
have been
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index e587162..a8f1cd8 100644

[MediaWiki-commits] [Gerrit] Add class member definition for params - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Add class member definition for params
..

Add class member definition for params

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


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

diff --git a/includes/api/ApiFeedRecentChanges.php 
b/includes/api/ApiFeedRecentChanges.php
index 5adde87..5c0a4af 100644
--- a/includes/api/ApiFeedRecentChanges.php
+++ b/includes/api/ApiFeedRecentChanges.php
@@ -26,6 +26,8 @@
  */
 class ApiFeedRecentChanges extends ApiBase {
 
+   private $params;
+
/**
 * This module uses a custom feed wrapper printer.
 *

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3e23d3b..a8dbf5f - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 3e23d3b..a8dbf5f
..

Syncronize VisualEditor: 3e23d3b..a8dbf5f

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/90/251790/1

diff --git a/VisualEditor b/VisualEditor
index 3e23d3b..a8dbf5f 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3e23d3b96d8baf84f4aaa0338d1d58c28651a3ff
+Subproject commit a8dbf5f828bfd08fd269c410a983e598cdb34908

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b4499808684a9d2b6a28aaa16e8ef683ca8b337
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] Syncronize VisualEditor: 3e23d3b..a8dbf5f - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 3e23d3b..a8dbf5f
..


Syncronize VisualEditor: 3e23d3b..a8dbf5f

Change-Id: I8b4499808684a9d2b6a28aaa16e8ef683ca8b337
---
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 3e23d3b..a8dbf5f 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3e23d3b96d8baf84f4aaa0338d1d58c28651a3ff
+Subproject commit a8dbf5f828bfd08fd269c410a983e598cdb34908

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b4499808684a9d2b6a28aaa16e8ef683ca8b337
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] Remove '?loadtesting' from maps stats - change (wikimedia...golden)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Remove '?loadtesting' from maps stats
..

Remove '?loadtesting' from maps stats

Maps load testing is done with an extra query parameter.
We should remove it from analyzing to keep the data more accurate.

Change-Id: I45ff0c716335d07f1628af6b98f21184988da5a7
---
M maps/tiles.R
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/40/251740/1

diff --git a/maps/tiles.R b/maps/tiles.R
index 8e5316f..3163ceb 100644
--- a/maps/tiles.R
+++ b/maps/tiles.R
@@ -8,7 +8,7 @@
 # - tile requests per style per zoom, e.g. "osm-z10", "osm-z11", ...
 
 main <- function(date = NULL) {
-  
+
   # Date handling
   if(is.null(date)) {
 date <- Sys.Date() - 1
@@ -29,6 +29,7 @@
AND webrequest_source = 'maps'
AND http_status IN('200','304')
AND uri_path RLIKE 
'^/([^/]+)/([0-9]{1,2})/(-?[0-9]+)/(-?[0-9]+)(@([0-9]\\.?[0-9]?)x)?\\.([a-z]+)$'
+   AND uri_query <> '?loadtesting'
) prepared
GROUP BY style, zoom, scale, format, user_id, cache;")
   results <- query_hive(query)
@@ -50,12 +51,12 @@
   percentile95 = ceiling(quantile(x$n, 0.95)),
   percentile99 = ceiling(quantile(x$n, 0.99)))
   })
-  
+
   # Clean up those results:
   results <- results[order(results$style, results$zoom, results$scale, 
results$format, results$cache), ]
   results$date <- date
   output <- results[, union('date', names(results))]
-  
+
   # Write out
   conditional_write(output, file.path(base_path, "tile_aggregates.tsv"))
 
@@ -66,6 +67,7 @@
 #FROM wmf.webrequest
 #WHERE webrequest_source = 'maps' AND year = 2015 
AND month = 8
 #  AND http_status IN('200','304')
-#  AND uri_path RLIKE 
'^/([^/]+)/([0-9]{1,2})/(-?[0-9]+)/(-?[0-9]+)(@([0-9]\\.?[0-9]?)x)?\\.([a-z]+)$'")
+#  AND uri_path RLIKE 
'^/([^/]+)/([0-9]{1,2})/(-?[0-9]+)/(-?[0-9]+)(@([0-9]\\.?[0-9]?)x)?\\.([a-z]+)$'
+#  AND uri_query <> '?loadtesting'")
 # lapply(seq(as.Date(earliest_ts[1, 1]),Sys.Date()-1, "day"), main)
 # ^ equivalent to: lapply(seq(as.Date("2015-08-28"), Sys.Date() - 1, "day"), 
main)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45ff0c716335d07f1628af6b98f21184988da5a7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] Remove various unused variables - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Remove various unused variables
..

Remove various unused variables

Change-Id: I4b1b20b4126735cb32a80e473fe48d523bcb24d1
---
M includes/api/ApiHelp.php
M includes/api/ApiParamInfo.php
M includes/api/ApiParse.php
M includes/api/ApiProtect.php
M includes/api/ApiQueryAllUsers.php
M includes/api/ApiQueryBacklinks.php
M includes/api/ApiQueryImageInfo.php
M includes/api/ApiQuerySiteinfo.php
M includes/api/ApiResult.php
M includes/api/ApiUpload.php
10 files changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index a8f1cd8..b1942bc 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -711,7 +711,6 @@
$suboptions,
$haveModules
);
-   $numSubmodules = count( $submodules );
}
 
$module->modifyHelp( $help, $suboptions, $haveModules );
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 63db63e..a808ac0 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -177,7 +177,6 @@
 * @return ApiResult
 */
private function getModuleInfo( $module ) {
-   $result = $this->getResult();
$ret = array();
$path = $module->getModulePath();
 
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 1b2efa5..9de5a02 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -714,7 +714,6 @@
 
private function formatLimitReportData( $limitReportData ) {
$result = array();
-   $apiResult = $this->getResult();
 
foreach ( $limitReportData as $name => $value ) {
$entry = array();
diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php
index 22bd29c..d07301c 100644
--- a/includes/api/ApiProtect.php
+++ b/includes/api/ApiProtect.php
@@ -56,7 +56,6 @@
}
 
$restrictionTypes = $titleObj->getRestrictionTypes();
-   $db = $this->getDB();
 
$protections = array();
$expiryarray = array();
diff --git a/includes/api/ApiQueryAllUsers.php 
b/includes/api/ApiQueryAllUsers.php
index eb3e553..ffcb2f5 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -264,7 +264,6 @@
}
 
if ( $fld_implicitgroups || $fld_groups || $fld_rights 
) {
-   $user = User::newFromId( $row->user_id );
$implicitGroups = User::newFromId( 
$row->user_id )->getAutomaticGroups();
if ( isset( $row->groups ) && $row->groups !== 
'' ) {
$groups = array_merge( $implicitGroups, 
explode( '|', $row->groups ) );
diff --git a/includes/api/ApiQueryBacklinks.php 
b/includes/api/ApiQueryBacklinks.php
index 1df14e0..6a31e19 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -357,7 +357,6 @@
// Parse and validate continuation parameter
$this->cont = array();
if ( $this->params['continue'] !== null ) {
-   $db = $this->getDB();
$cont = explode( '|', $this->params['continue'] );
 
switch ( count( $cont ) ) {
diff --git a/includes/api/ApiQueryImageInfo.php 
b/includes/api/ApiQueryImageInfo.php
index b23fbcf..0a8e2c9 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -225,8 +225,6 @@
 * @return array|null Key-val array of 'width' and 'height', or null
 */
public function getScale( $params ) {
-   $p = $this->getModulePrefix();
-
if ( $params['urlwidth'] != -1 ) {
$scale = array();
$scale['width'] = $params['urlwidth'];
diff --git a/includes/api/ApiQuerySiteinfo.php 
b/includes/api/ApiQuerySiteinfo.php
index 4f90e5f..7047339 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -456,7 +456,6 @@
);
}
 
-   $result = $this->getResult();
ApiResult::setIndexedTagName( $data, 'db' );
 
return $this->getResult()->addValue( 'query', $property, $data 
);
diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index cd4165b..3468cf6 100644
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -830,7 +830,6 @@
 
// BC 

[MediaWiki-commits] [Gerrit] Remove !defined( 'MEDIAWIKI' ) from two files - change (mediawiki...TimedMediaHandler)

[jenkins-bot (Code Review)]

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

Change subject: Remove !defined( 'MEDIAWIKI' ) from two files
..


Remove !defined( 'MEDIAWIKI' ) from two files

Remove !defined( 'MEDIAWIKI' ) from ApiTranscodeReset.php and
ApiTranscodeStatus.php

Change-Id: Iacd0eb6cdb0de2ebe7eda1500dc8df749678ec4a
---
M ApiTranscodeReset.php
M ApiTranscodeStatus.php
2 files changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/ApiTranscodeReset.php b/ApiTranscodeReset.php
index 597d17e..899188d 100644
--- a/ApiTranscodeReset.php
+++ b/ApiTranscodeReset.php
@@ -1,8 +1,4 @@
 getPageSet()->getAllTitlesByNamespace();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacd0eb6cdb0de2ebe7eda1500dc8df749678ec4a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: Umherirrender 
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/update phpdoc - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Add/update phpdoc
..

Add/update phpdoc

Change-Id: I9cb6f041a0242c3257a24aac6538f7fbbca60cb0
---
M includes/api/ApiContinuationManager.php
M includes/api/ApiMessage.php
M includes/api/ApiOpenSearch.php
M includes/api/ApiResult.php
4 files changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/includes/api/ApiContinuationManager.php 
b/includes/api/ApiContinuationManager.php
index 354f4e7..74d0352 100644
--- a/includes/api/ApiContinuationManager.php
+++ b/includes/api/ApiContinuationManager.php
@@ -39,6 +39,7 @@
 * @param ApiBase $module Module starting the continuation
 * @param ApiBase[] $allModules Contains ApiBase instances that will be 
executed
 * @param array $generatedModules Names of modules that depend on the 
generator
+* @throws UsageException
 */
public function __construct(
ApiBase $module, array $allModules = array(), array 
$generatedModules = array()
diff --git a/includes/api/ApiMessage.php b/includes/api/ApiMessage.php
index 370911a..5c3434f 100644
--- a/includes/api/ApiMessage.php
+++ b/includes/api/ApiMessage.php
@@ -172,7 +172,6 @@
 *  - string: passed to RawMessage::__construct
 * @param string|null $code
 * @param array|null $data
-* @return ApiMessage
 */
public function __construct( $msg, $code = null, array $data = null ) {
if ( $msg instanceof RawMessage ) {
diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index f25f2d3..5ce43cc 100644
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -311,7 +311,7 @@
 * Extension:ActiveAbstract.
 *
 * @param string $text
-* @param int $len Target length; actual result will continue to the 
end of a sentence.
+* @param int $length Target length; actual result will continue to the 
end of a sentence.
 * @return string
 */
public static function trimExtract( $text, $length ) {
diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index 3468cf6..e28cb82 100644
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -327,6 +327,7 @@
/**
 * Validate a value for addition to the result
 * @param mixed $value
+* @return array|mixed|string
 */
private static function validateValue( $value ) {
global $wgContLang;
@@ -738,7 +739,7 @@
 * Set the array data type for a path
 * @since 1.25
 * @param array|string|null $path See ApiResult::addValue()
-* @param string $type See ApiResult::META_TYPE
+* @param string $tag See ApiResult::META_TYPE
 * @param string $kvpKeyName See ApiResult::META_KVP_KEY_NAME
 */
public function addArrayType( $path, $tag, $kvpKeyName = null ) {
@@ -766,7 +767,7 @@
 * Set the array data type for a path recursively
 * @since 1.25
 * @param array|string|null $path See ApiResult::addValue()
-* @param string $type See ApiResult::META_TYPE
+* @param string $tag See ApiResult::META_TYPE
 * @param string $kvpKeyName See ApiResult::META_KVP_KEY_NAME
 */
public function addArrayTypeRecursive( $path, $tag, $kvpKeyName = null 
) {
@@ -796,7 +797,7 @@
 *
 * @see ApiResult::getResultData()
 * @since 1.25
-* @param array $data
+* @param array $dataIn
 * @param array $transforms
 * @return array|object
 */

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

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

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

[MediaWiki-commits] [Gerrit] Always return true from hooks; docstrings - change (mediawiki...ORES)

[jenkins-bot (Code Review)]

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

Change subject: Always return true from hooks; docstrings
..


Always return true from hooks; docstrings

Bug: T112856
Change-Id: I2f3e463e2caa6b1d6f27d40376fd2047d61f797e
---
M includes/Hooks.php
1 file changed, 27 insertions(+), 0 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index 5b7c740..41aeabb 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -12,6 +12,12 @@
 use RCCacheEntry;
 use RecentChange;
 
+/**
+ * TODO:
+ * - Fix mw-core EnhancedChangesList::recentChangesBlockGroup to rollup
+ * extension recentChangesFlags into the top-level grouped line.
+ * - Fix mw-core "old" recent changes view to respect recentChangesFlags.
+ */
 class Hooks {
/**
 * @param DatabaseUpdater $updater
@@ -19,8 +25,13 @@
public static function onLoadExtensionSchemaUpdates( DatabaseUpdater 
$updater ) {
$updater->addExtensionTable( 'ores_classification', __DIR__ . 
'/../sql/ores_classification.sql' );
$updater->addExtensionTable( 'ores_model', __DIR__ . 
'/../sql/ores_model.sql' );
+
+   return true;
}
 
+   /**
+* Ask the ORES server for scores on this recent change
+*/
public static function onRecentChange_save( RecentChange $rc ) {
if ( $rc->getAttribute( 'rc_type' ) === RC_EDIT ) {
$job = new FetchScoreJob( $rc->getTitle(), array(
@@ -28,9 +39,13 @@
) );
JobQueueGroup::singleton()->push( $job );
}
+
+   return true;
}
 
/**
+* Add an ORES filter to the recent changes results
+*
 * @param ChangesListSpecialPage $clsp
 * @param $filters
 */
@@ -39,9 +54,13 @@
'msg' => 'ores-reverted-filter',
'default' => false,
);
+
+   return true;
}
 
/**
+* Pull in ORES score columns during recent changes queries
+*
 * @param $name
 * @param array $tables
 * @param array $fields
@@ -61,9 +80,13 @@
'rc_this_oldid = ores_rev AND ores_model = 
\'reverted\' ' .
'AND ores_is_predicted = 1 AND ores_class = 
\'true\'' );
}
+
+   return true;
}
 
/**
+* Label recent changes with ORES scores (for each change in an 
expanded group)
+*
 * @param EnhancedChangesList $ecl
 * @param array $data
 * @param RCCacheEntry[] $block
@@ -82,6 +105,8 @@
$ecl->getOutput()->addModuleStyles( 
'ext.ores.styles' );
}
}
+
+   return true;
}
 
// FIXME: Repeated code.
@@ -98,6 +123,8 @@
$ocl->getOutput()->addModuleStyles( 
'ext.ores.styles' );
}
}
+
+   return true;
}
 
protected static function getRevertThreshold( $score ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f3e463e2caa6b1d6f27d40376fd2047d61f797e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
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 new extension-unittests-composer template - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Add new extension-unittests-composer template
..


Add new extension-unittests-composer template

This adds a new extension-unittests-composer template for running the
extension test with composer.

Adds tests:

- phplint

- php-composer-validate

- mwext-testextension-zend-composer

- mwext-testextension-hhvm-composer

- mediawiki-gate

Adds tests in experimental section:

- mwext-qunit-composer

- npm

- php-composer-test

This should make it easer for extension needing to use the tests that
tests extension but also install the required packages in composer and
test against it.

Bug: T90303
Bug: T115061
Change-Id: I895e057f9b7cdac614205e0373a138fb2c7c3a0b
---
M zuul/layout.yaml
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4a2c7ad..20ba68c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1708,6 +1708,26 @@
   - npm
   - php-composer-test
 
+  - name: extension-unittests-composer
+check:
+ - phplint
+ - php-composer-validate
+test:
+ - phplint
+ - mwext-testextension-zend-composer
+ - mwext-testextension-hhvm-composer
+ - php-composer-validate
+gate-and-submit:
+ - mediawiki-gate
+ - phplint
+ - mwext-testextension-zend-composer
+ - mwext-testextension-hhvm-composer
+ - php-composer-validate
+experimental:
+ - mwext-qunit-composer
+ - npm
+ - php-composer-test
+
   - name: extension-unittests-generic
 check:
  - phplint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I895e057f9b7cdac614205e0373a138fb2c7c3a0b
Gerrit-PatchSet: 7
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
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 old logging - change (mediawiki...EducationProgram)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Remove old logging
..

Remove old logging

Bug: T48577
Change-Id: I5ae45cbd968a6d913a14bb59cddd0abbd2fb00bd
---
M includes/pagers/ArticleTable.php
1 file changed, 0 insertions(+), 10 deletions(-)


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

diff --git a/includes/pagers/ArticleTable.php b/includes/pagers/ArticleTable.php
index 0fe3fc6..c612ddc 100644
--- a/includes/pagers/ArticleTable.php
+++ b/includes/pagers/ArticleTable.php
@@ -390,16 +390,6 @@
$html
);
}
-   else {
-   wfDebugLog(
-   'bug46577',
-   json_encode( array(
-   'title' => $article->getPageTitle(),
-   'pageid' => $article->getPageId(),
-   'id' => $article->getId(),
-   ) )
-   );
-   }
 
$attr = array(
'href' => '#',

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

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

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

[MediaWiki-commits] [Gerrit] Update grunt-jsonlint to 1.0.5 - change (mediawiki...WikidataPageBanner)

[jenkins-bot (Code Review)]

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

Change subject: Update grunt-jsonlint to 1.0.5
..


Update grunt-jsonlint to 1.0.5

This package update is minor packages updates inside the package.

This is also the first update since 2013 for this package.

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

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



diff --git a/package.json b/package.json
index d711712..9da6b39 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,6 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.4.0",
-"grunt-jsonlint": "1.0.4"
+"grunt-jsonlint": "1.0.5"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I439a2888790158a7c0417ef46eb6302e6964ad0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
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 grunt-jsonlint to 1.0.5 - change (mediawiki...EventLogging)

[jenkins-bot (Code Review)]

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

Change subject: Update grunt-jsonlint to 1.0.5
..


Update grunt-jsonlint to 1.0.5

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

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



diff --git a/package.json b/package.json
index 5ef6f44..5b9a8b5 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,6 @@
 "grunt-banana-checker": "0.4.0",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-jscs": "1.8.0",
-"grunt-jsonlint": "1.0.4"
+"grunt-jsonlint": "1.0.5"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b90bb3b1d752a93be26099942833191f9b0c5ce
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Umherirrender 
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 packages - change (mediawiki...Metrolook)

[jenkins-bot (Code Review)]

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

Change subject: Update packages
..


Update packages

Update grunt-jscs to 2.3.0

Update grunt-jsonlint to 1.0.6

Change-Id: I215297030ee4ffae6880f2be19e0d29f42184626
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index b34053c..4822cca 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.2.0",
-"grunt-jsonlint": "1.0.5"
+"grunt-jscs": "2.3.0",
+"grunt-jsonlint": "1.0.6"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I215297030ee4ffae6880f2be19e0d29f42184626
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 
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 bug fixes and translations - change (mediawiki...HitCounters)

[MarkAHershberger (Code Review)]

MarkAHershberger has uploaded a new change for review.

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

Change subject: Merge bug fixes and translations
..

Merge bug fixes and translations

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a2d82e78fdb3793057ab563344ef3dbd021522c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HitCounters
Gerrit-Branch: REL1_26
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] Add new package jscs-preset-wikimedia - change (mediawiki...Metrolook)

[jenkins-bot (Code Review)]

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

Change subject: Add new package jscs-preset-wikimedia
..


Add new package jscs-preset-wikimedia

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

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



diff --git a/package.json b/package.json
index 4822cca..6d608fb 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
 "grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.4.0",
 "grunt-jscs": "2.3.0",
-"grunt-jsonlint": "1.0.6"
+"grunt-jsonlint": "1.0.6",
+"jscs-preset-wikimedia": "~1.0.0"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id812ccb532f2d4aa7e279be5f2e1a7ddeb12abc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Slight Stomp job runner loop refactor - change (wikimedia...SmashPig)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Slight Stomp job runner loop refactor
..

Slight Stomp job runner loop refactor

A little less repetition.

Change-Id: Ib48a0ba0acc0bfe0f6341fb4544c69547d535764
---
M Maintenance/StompJobRunner.php
1 file changed, 10 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/28/251728/1

diff --git a/Maintenance/StompJobRunner.php b/Maintenance/StompJobRunner.php
index f22a5b8..f98094f 100644
--- a/Maintenance/StompJobRunner.php
+++ b/Maintenance/StompJobRunner.php
@@ -44,8 +44,9 @@
break;
}
 
+   $success = false;
+
if ( $jobObj instanceof \SmashPig\Core\Jobs\RunnableJob 
) {
-   $success = false;
try {
if ( $jobObj->execute() ) {
$success = true;
@@ -53,22 +54,20 @@
Logger::info( "Job tells us 
that it did not successfully execute. Sending to damaged message queue.", 
$jobObj );
}
} catch ( SmashPigException $ex ) {
-   Logger::info( "Job threw exception 
{$ex->getMessage()}. Sending to damaged message queue.", $jobObj );
-   }
-   if ( $success ) {
-   $successCount += 1;
-   $this->datastore->queueAckObject();
-   } else {
-   
$this->damagedDatastore->queueAddObject( $jobObj );
-   $this->datastore->queueAckObject();
+   Logger::warning( "Job threw exception 
{$ex->getMessage()}. Sending to damaged message queue.", $jobObj );
}
} else {
-   $this->damagedDatastore->queueAddObject( 
$jobObj );
-   $this->datastore->queueAckObject();
Logger::warning(
get_class( $jobObj ) . " is not an 
instance of RunnableJob. Could not execute and sending to damaged message 
queue."
);
}
+   if ( $success ) {
+   $successCount += 1;
+   } else {
+   $this->damagedDatastore->queueAddObject( 
$jobObj );
+   }
+
+   $this->datastore->queueAckObject();
 
} while (
( ( time() - $startTime ) < $this->getOption( 
'time-limit' ) ) &&

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib48a0ba0acc0bfe0f6341fb4544c69547d535764
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
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] Wrap sendBeacon in try/catch to prevent AdBlock issue - change (mediawiki...CentralNotice)

[AndyRussG (Code Review)]

AndyRussG has uploaded a new change for review.

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

Change subject: Wrap sendBeacon in try/catch to prevent AdBlock issue
..

Wrap sendBeacon in try/catch to prevent AdBlock issue

Bug: T110182
Change-Id: I9153ce2e68f92dce7afe0ef260d42e777dd4532b
---
M resources/subscribing/ext.centralNotice.display.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/subscribing/ext.centralNotice.display.js 
b/resources/subscribing/ext.centralNotice.display.js
index 8d519ca..905afb9 100644
--- a/resources/subscribing/ext.centralNotice.display.js
+++ b/resources/subscribing/ext.centralNotice.display.js
@@ -182,7 +182,7 @@
url.extend( state.getDataCopy( true ) );
 
if ( navigator.sendBeacon ) {
-   navigator.sendBeacon( url.toString() );
+   try { navigator.sendBeacon( url.toString() ); } catch ( 
e ) {}
} else {
setTimeout( function () {
document.createElement( 'img' ).src = 
url.toString();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9153ce2e68f92dce7afe0ef260d42e777dd4532b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 

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

[MediaWiki-commits] [Gerrit] Only load switching module (depending on OOUI etc.) on edit ... - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Only load switching module (depending on OOUI etc.) on edit 
pages
..

Only load switching module (depending on OOUI etc.) on edit pages

This wasn't as bad as T112401 (that was blocking render), but we
still shouldn't be loading the module on page views.

Bug: T118088
Change-Id: If86701ed7ff4e8d6defb1c682aa9a38c211be0fa
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 15 insertions(+), 12 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 420ed59..8b042e8 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -379,20 +379,23 @@
$caVeEdit.remove();
} else if ( pageCanLoadVE ) {
// Allow instant switching to edit mode, 
without refresh
-   mw.loader.load( 'ext.visualEditor.switching' );
$caVeEdit.click( init.onEditTabClick );
-   $( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
-   mw.loader.using( 'oojs-ui', function () 
{
-   $( '.wikiEditor-ui-toolbar' 
).prepend(
-   new OO.ui.ButtonWidget( 
{
-   framed: false,
-   icon: 'edit',
-   title: mw.msg( 
'visualeditor-mweditmodeve-tool' ),
-   classes: [ 
've-init-mw-desktopArticleTarget-editSwitch' ]
-   } ).on( 'click', 
init.activateVe ).$element
-   );
+
+   if ( [ 'edit', 'submit' ].indexOf( 
mw.config.get( 'wgAction' ) ) !== -1 ) {
+   mw.loader.load( 
'ext.visualEditor.switching' );
+   $( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
+   mw.loader.using( 'oojs-ui', 
function () {
+   $( 
'.wikiEditor-ui-toolbar' ).prepend(
+   new 
OO.ui.ButtonWidget( {
+   framed: 
false,
+   icon: 
'edit',
+   title: 
mw.msg( 'visualeditor-mweditmodeve-tool' ),
+   
classes: [ 've-init-mw-desktopArticleTarget-editSwitch' ]
+   } ).on( 
'click', init.activateVe ).$element
+   );
+   } );
} );
-   } );
+   }
}
 
// Alter the edit tab (#ca-edit)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If86701ed7ff4e8d6defb1c682aa9a38c211be0fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Only load switching module (depending on OOUI etc.) on edit ... - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Only load switching module (depending on OOUI etc.) on edit 
pages
..

Only load switching module (depending on OOUI etc.) on edit pages

This wasn't as bad as T112401 (that was blocking render), but we
still shouldn't be loading the module on page views.

Bug: T118088
Change-Id: If86701ed7ff4e8d6defb1c682aa9a38c211be0fa
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 13 insertions(+), 11 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index ae684a5..3b6f091 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -416,18 +416,20 @@
 
if ( pageCanLoadVE ) {
// Allow instant switching to edit mode, 
without refresh
-   mw.loader.load( 'ext.visualEditor.switching' );
$caVeEdit.click( init.onEditTabClick );
-   $( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
-   $( '.wikiEditor-ui-toolbar' ).prepend(
-   new OO.ui.ButtonWidget( {
-   framed: false,
-   icon: 'edit',
-   title: mw.msg( 
'visualeditor-mweditmodeve-tool' ),
-   classes: [ 
've-init-mw-desktopArticleTarget-editSwitch' ]
-   } ).on( 'click', 
init.activateVe ).$element
-   );
-   } );
+   if ( [ 'edit', 'submit' ].indexOf( 
mw.config.get( 'wgAction' ) ) !== -1 ) {
+   mw.loader.load( 
'ext.visualEditor.switching' );
+   $( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
+   $( '.wikiEditor-ui-toolbar' 
).prepend(
+   new OO.ui.ButtonWidget( 
{
+   framed: false,
+   icon: 'edit',
+   title: mw.msg( 
'visualeditor-mweditmodeve-tool' ),
+   classes: [ 
've-init-mw-desktopArticleTarget-editSwitch' ]
+   } ).on( 'click', 
init.activateVe ).$element
+   );
+   } );
+   }
}
},
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If86701ed7ff4e8d6defb1c682aa9a38c211be0fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.5
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] sudo journalctl: make missing restrions obvious - change (operations/puppet)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: sudo journalctl: make missing restrions obvious
..

sudo journalctl: make missing restrions obvious

sudoers command argument wildcard '*' does not restrict anthing. journalctl
allows multiple -u arguments, thus this does not restrict invoking journalctl
on one unit.

Bug: T115067
Change-Id: I941fd1f797c3b57fb97fdfbf1c9cd27ece0e9daa
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/251714/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index bc7126b..e68c2fa 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -358,7 +358,7 @@
  'ALL = NOPASSWD: /bin/systemctl mask kartotherian.service',
  'ALL = NOPASSWD: /bin/systemctl unmask kartotherian.service',
  'ALL = (kartotherian) NOPASSWD: ALL',
- 'ALL = NOPASSWD: /bin/journalctl -u kartotherian *']
+ 'ALL = NOPASSWD: /bin/journalctl *']
   wdqs-admins:
 gid: 755
 description: Admins for the WikiData Query Service project
@@ -382,7 +382,7 @@
  'ALL = NOPASSWD: /bin/systemctl mask tilerator.service',
  'ALL = NOPASSWD: /bin/systemctl unmask tilerator.service',
  'ALL = (tilerator) NOPASSWD: ALL',
- 'ALL = NOPASSWD: /bin/journalctl -u tilerator *']
+ 'ALL = NOPASSWD: /bin/journalctl *']
   mobileapps-admin:
 description: Group of mobileapps admins
 gid: 759

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

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

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

[MediaWiki-commits] [Gerrit] Icrement extension's version - change (mediawiki...HitCounters)

[jenkins-bot (Code Review)]

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

Change subject: Icrement extension's version
..


Icrement extension's version

* Thanks to the great fixed that have been done very recently the
  version should now be incremented to 0.2 for better reference
  (needs tagging as a follow up)

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

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



diff --git a/extension.json b/extension.json
index 18cf126..4194547 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "HitCounters",
"namemsg": "hitcounters-extensionname",
-   "version": "0.1",
+   "version": "0.2",
"author": [
"[//mwstake.org Mark A. Hershberger]"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e7fd6135ac152409356ad5803f1261e44887b58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HitCounters
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: MarkAHershberger 
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: Get the list of unique modules required to download in ... - change (mediawiki...bundler)

[Adishaporwal (Code Review)]

Adishaporwal has uploaded a new change for review.

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

Change subject: WIP: Get the list of unique modules required to download in 
bundler
..

WIP: Get the list of unique modules required to download in bundler

List of modules stored in 'Set()' to get the list of unique modules required to 
download.

Bug: T114788
Change-Id: I9b770109a466b105a1ff41ab4f438d854bdb401a
---
M lib/modules.js
1 file changed, 27 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/bundler
 refs/changes/19/251719/1

diff --git a/lib/modules.js b/lib/modules.js
index 4d6ab7f..01b101a 100644
--- a/lib/modules.js
+++ b/lib/modules.js
@@ -26,12 +26,35 @@
oldid: revision,
}).then(function(resp) {
resp = resp.parse;
+
+   //list of modules stored in form of 'set' to get the list of 
*unique* modules
+modules = new Set();
+modulescripts = new Set();
+modulestyles = new Set();
+jsconfigvars = new Set();
+
+for(module in resp.modules){
+modules.prototype.add(module);
+}
+
+for(modulescript in resp.modulescripts){
+modulescripts.prototype.add(modulescript);
+}
+
+for(modulestyle in resp.modulestyles){
+modulestyles.prototype.add(modulestyle);
+}
+
+for(jsconfigvar in resp.jsconfigvars){
+jsconfigvars.prototype.add(jsconfigvar);
+}
+
// Trim down the size of the response by omitting redundant 
fields.
return {
-   modules: resp.modules,
-   modulescripts: resp.modulescripts,
-   modulestyles: resp.modulestyles,
-   jsconfigvars: resp.jsconfigvars,
+   modules,
+   modulescripts,
+   modulestyles,
+   jsconfigvars,
};
});
 });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b770109a466b105a1ff41ab4f438d854bdb401a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Adishaporwal 

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

[MediaWiki-commits] [Gerrit] Apply wfBCP47() to HTTP response header Content-Language - change (mediawiki/core)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Apply wfBCP47() to HTTP response header Content-Language
..

Apply wfBCP47() to HTTP response header Content-Language

See https://tools.ietf.org/html/rfc7231#section-3.1.3 for Content-Language.
This references https://tools.ietf.org/html/rfc5646 aka BCP 47.

Example: https://crh.wikipedia.org/wiki/Ba%C5%9F_Saife should contain
 Content-language: crh-Latn
instead of
 Content-language: crh-latn

Change-Id: Ice4f40911c3761c2542430935bc1898bc4e7a4d4
---
M includes/OutputPage.php
M includes/cache/HTMLFileCache.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 81724c5..46f844b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2274,7 +2274,7 @@
ob_start();
 
$response->header( 'Content-type: ' . $config->get( 'MimeType' 
) . '; charset=UTF-8' );
-   $response->header( 'Content-language: ' . $config->get( 
'LanguageCode' ) );
+   $response->header( 'Content-language: ' . wfBCP47( 
$config->get( 'LanguageCode' ) ) );
 
// Avoid Internet Explorer "compatibility view" in IE 8-10, so 
that
// jQuery etc. can work correctly.
diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 483eaa5..6df32e4 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -148,7 +148,7 @@
 
$context->getOutput()->sendCacheControl();
header( "Content-Type: $wgMimeType; charset=UTF-8" );
-   header( "Content-Language: $wgLanguageCode" );
+   header( 'Content-Language: ' . wfBCP47( $wgLanguageCode ) );
if ( $this->useGzip() ) {
if ( wfClientAcceptsGzip() ) {
header( 'Content-Encoding: gzip' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice4f40911c3761c2542430935bc1898bc4e7a4d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] Update extension-gate template - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update extension-gate template
..

Update extension-gate template

This update adds a few more test to the template to make it easiar to test
extensions/skins.

This adds:

- phplint
- php-composer-validate

And in experimental:

- npm
- php-composer-test

Tests.

Change-Id: I96da1b352a9ee114fbdd7f0d33232a6856b08ced
---
M zuul/layout.yaml
1 file changed, 12 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/15/251715/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e493352..5a7795c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1743,15 +1743,25 @@
   - 'mwext-{name}-jslint'
 
   - name: extension-gate
+check:
+  - phplint
+  - php-composer-validate
 test:
+  - phplint
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-qunit
+  - php-composer-validate
 zend:
   - mediawiki-extensions-zend
 gate-and-submit:
+  - phplint
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-zend
   - mediawiki-extensions-qunit
+  - php-composer-validate
+experimental:
+  - npm
+  - php-composer-test
 
   # Template for MediaWiki extensions.
   # Triggers qunit jobs
@@ -2362,8 +2372,9 @@
 
   - name: mediawiki/skins/Example
 template:
- - name: composer-test
+ - name: mw-checks-test
  - name: npm
+ - name: composer-test
 check:
  - jsonlint
 
@@ -2461,23 +2472,6 @@
  - name: npm
 check:
  - jsonlint
-
-  - name: mediawiki/skins/Timeless
-template:
- - name: npm
-check:
- - jsonlint
- - jshint
- - phplint
- - php-composer-validate
-test:
- - phplint
- - php-composer-validate
-gate-and-submit:
- - phplint
- - php-composer-validate
-experimental:
- - php-composer-test
 
   - name: mediawiki/skins/Tomas
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Drop any beforeunload handlers when loading from existing wi... - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Drop any beforeunload handlers when loading from existing 
wikitext
..

Drop any beforeunload handlers when loading from existing wikitext

Bug: T117769
Change-Id: I823737b17e5af8ed15bc2b62db61a31886e8d418
(cherry picked from commit 2910cd238447f24cb9c7a11bac04c75f73ee28ef)
---
M modules/ve-mw/init/ve.init.mw.TargetLoader.js
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.TargetLoader.js 
b/modules/ve-mw/init/ve.init.mw.TargetLoader.js
index d54ab33..585f7bf 100644
--- a/modules/ve-mw/init/ve.init.mw.TargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.TargetLoader.js
@@ -135,6 +135,8 @@
ve.track( 'trace.restbaseLoad.enter' );
if ( conf.fullRestbaseUrl && $( '#wpTextbox1' 
).length ) {
fromEditedState = true;
+   window.onbeforeunload = null;
+   $( window ).off( 'beforeunload' );
restbaseXhr = $.post(
conf.fullRestbaseUrl + 
'v1/transform/wikitext/to/html/' +
encodeURIComponent( 
pageName ) +

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I823737b17e5af8ed15bc2b62db61a31886e8d418
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.5
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 

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

[MediaWiki-commits] [Gerrit] [Timeless] Add composer-test test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [Timeless] Add composer-test test
..

[Timeless] Add composer-test test

Change-Id: I720ee4c2428030292a0aec176b3e9623a031deff
Source-change: https://gerrit.wikimedia.org/r/#/c/250218/
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/18/251718/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4a2c7ad..1dec10d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2464,20 +2464,12 @@
 
   - name: mediawiki/skins/Timeless
 template:
+ - name: composer-test
  - name: npm
 check:
  - jsonlint
  - jshint
  - phplint
- - php-composer-validate
-test:
- - phplint
- - php-composer-validate
-gate-and-submit:
- - phplint
- - php-composer-validate
-experimental:
- - php-composer-test
 
   - name: mediawiki/skins/Tomas
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Update grunt-jsonlint to 1.0.6 - change (mediawiki/core)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update grunt-jsonlint to 1.0.6
..

Update grunt-jsonlint to 1.0.6

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/251721/1

diff --git a/package.json b/package.json
index 209d325..764b575 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 "grunt-contrib-jshint": "0.11.3",
 "grunt-contrib-watch": "0.6.1",
 "grunt-jscs": "2.1.0",
-"grunt-jsonlint": "1.0.5",
+"grunt-jsonlint": "1.0.6",
 "grunt-karma": "0.12.1",
 "karma": "0.13.10",
 "karma-chrome-launcher": "0.2.0",

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

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

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

[MediaWiki-commits] [Gerrit] Update packages - change (mediawiki...Metrolook)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update packages
..

Update packages

Update grunt-jscs to 2.3.0

Update grunt-jsonlint to 1.0.6

Change-Id: I215297030ee4ffae6880f2be19e0d29f42184626
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/22/251722/1

diff --git a/package.json b/package.json
index b34053c..4822cca 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.2.0",
-"grunt-jsonlint": "1.0.5"
+"grunt-jscs": "2.3.0",
+"grunt-jsonlint": "1.0.6"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I215297030ee4ffae6880f2be19e0d29f42184626
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Merge branch 'REL1_25' of https://gerrit.wikimedia.org/r/p/m... - change (mediawiki...HitCounters)

[MarkAHershberger (Code Review)]

MarkAHershberger has uploaded a new change for review.

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

Change subject: Merge branch 'REL1_25' of 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HitCounters into REL1_25
..

Merge branch 'REL1_25' of 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/HitCounters into REL1_25

Change-Id: I50d7b2c4c8525381b429b386bd4bc3c345d6b984
---
M HitCounters.body.php
M ViewCountUpdate.php
M drop_field.sql
M extension.json
M hit_counter_extension.sql
M i18n/de.json
M i18n/en.json
M i18n/gl.json
M i18n/it.json
M i18n/ko.json
M i18n/ksh.json
M i18n/mk.json
M i18n/pl.json
M i18n/qqq.json
M i18n/ru.json
M i18n/tr.json
M initial_count.sql
M page_counter.sql
M rename_table.sql
19 files changed, 1 insertion(+), 259 deletions(-)


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

diff --git a/HitCounters.body.php b/HitCounters.body.php
index 80ca19d..cba4fc7 100644
--- a/HitCounters.body.php
+++ b/HitCounters.body.php
@@ -11,7 +11,6 @@
 class HitCounters {
protected static $mViews;
 
-<<< HEAD   (26b7e2 Icrement extension's version)
protected static function cacheStore( $cache, $key, $views ) {
if ( $views < 100 ) {
// Only cache for a minute
@@ -118,92 +117,6 @@
'INNER JOIN',
$wgDBprefix . 'page.page_id = ' .
$wgDBprefix . 'hit_counter.page_id' )
-===
-   /**
-* @return int The view count for the page
-*/
-   public static function getCount( Title $title ) {
-   if ( $title === null ) {
-   throw new MWException( "Asked for count without a 
title!" );
-   }
-   if ( $title->isSpecialPage() ) {
-   return null;
-   }
-
-   /*
-* Use the cache to avoid hitting the DB if available since
-* page views are pretty common and this is a tiny bit of
-* information.
-*/
-   $cache = wfGetCache( CACHE_ANYTHING );
-   $key = wfMemcKey( 'viewcount', $title->getDBkey() );
-   $views = $cache->get( $key );
-   if ( !$views ) {
-   $dbr = wfGetDB( DB_SLAVE );
-   $row = $dbr->select(
-   array( 'hit_counter' ),
-   array( 'hits' => 'page_counter' ),
-   array( 'page_id' => $title->getArticleID() ),
-   __METHOD__ );
-
-   if ( $row !== false && $current = $row->current() ) {
-   $views = $current->hits;
-   /* update only once a day */
-   $cache->set( $key, $views, 24 * 3600 );
-   }
-   }
-
-   return $views;
-   }
-
-   public static function views() {
-   # Should check for MiserMode here
-   $cache = wfGetCache( CACHE_ANYTHING );
-   $key = wfMemcKey( 'sitestats', 'activeusers-updated' );
-   // Re-calculate the count if the last tally is old...
-   if ( !self::$mViews ) {
-   self::$mViews = $cache->get( $key );
-   wfDebugLog( "HitCounters", __METHOD__ . ": got " . 
var_export( self::$mViews, true ) .
-   " from cache." );
-   if ( !self::$mViews ) {
-   $dbr = wfGetDB( DB_SLAVE );
-   self::$mViews = $dbr->selectField( 
'hit_counter', 'SUM(page_counter)', '',
-   __METHOD__ );
-   wfDebugLog( "HitCounters", __METHOD__ . ": got 
" . var_export( self::$mViews, true ) .
-   " from select." );
-   $cache->set( $key, self::$mViews, 24 * 3600 ); 
// don't update for 1 day
-   }
-   }
-   return self::$mViews;
-   }
-
-   /**
-* We can't choose our parameters since this is a hook and we
-* don't really need to use the $parser and $cache parameters.
-*
-* @SuppressWarnings(PHPMD.UnusedFormalParameter)
-*/
-   public static function numberOfViews( Parser &$parser, PPFrame $frame, 
$args ) {
-   return self::getCount( $frame->title );
-   }
-
-   public static function getQueryInfo() {
-   global $wgDBprefix;
-
-   return array(
-   'tables' => array( 'page', 'hit_counter' ),
-   'fields' => array(
-   'namespace' => 

[MediaWiki-commits] [Gerrit] Update packages - change (mediawiki...Vector)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update packages
..

Update packages

Update grunt-jscs to 2.3.0

Update grunt-jsonlint to 1.0.6

Change-Id: Ie175abf1d692dac78afe02b2d70867c1369353b4
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/27/251727/1

diff --git a/package.json b/package.json
index b34053c..4822cca 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.2.0",
-"grunt-jsonlint": "1.0.5"
+"grunt-jscs": "2.3.0",
+"grunt-jsonlint": "1.0.6"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie175abf1d692dac78afe02b2d70867c1369353b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Handle exceptions in stomp job runner - change (wikimedia...SmashPig)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Handle exceptions in stomp job runner
..

Handle exceptions in stomp job runner

Change-Id: Ic070fa7cbf348feb27d28021f081b81584a5ed56
---
M Maintenance/StompJobRunner.php
1 file changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/26/251726/1

diff --git a/Maintenance/StompJobRunner.php b/Maintenance/StompJobRunner.php
index 916d595..f22a5b8 100644
--- a/Maintenance/StompJobRunner.php
+++ b/Maintenance/StompJobRunner.php
@@ -45,11 +45,20 @@
}
 
if ( $jobObj instanceof \SmashPig\Core\Jobs\RunnableJob 
) {
-   if ( $jobObj->execute() ) {
+   $success = false;
+   try {
+   if ( $jobObj->execute() ) {
+   $success = true;
+   } else {
+   Logger::info( "Job tells us 
that it did not successfully execute. Sending to damaged message queue.", 
$jobObj );
+   }
+   } catch ( SmashPigException $ex ) {
+   Logger::info( "Job threw exception 
{$ex->getMessage()}. Sending to damaged message queue.", $jobObj );
+   }
+   if ( $success ) {
$successCount += 1;
$this->datastore->queueAckObject();
} else {
-   Logger::info( "Job tells us that it did 
not successfully execute. Sending to damaged message queue.", $jobObj );

$this->damagedDatastore->queueAddObject( $jobObj );
$this->datastore->queueAckObject();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic070fa7cbf348feb27d28021f081b81584a5ed56
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
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] ApiHelp: Fix undefined variable warning - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: ApiHelp: Fix undefined variable warning
..

ApiHelp: Fix undefined variable warning

Change-Id: I5b2790af9182dd76cd52be284f56e4833ac464c6
---
M includes/api/ApiHelp.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index db7c149..e587162 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -310,6 +310,7 @@
);
}
 
+   $flags = $module->getHelpFlags();
$help['flags'] .= Html::openElement( 'div',
array( 'class' => 'apihelp-block apihelp-flags' 
) );
$msg = $context->msg( 'api-help-flags' );
@@ -319,7 +320,7 @@
);
}
$help['flags'] .= Html::openElement( 'ul' );
-   foreach ( $module->getHelpFlags() as $flag ) {
+   foreach ( $flags as $flag ) {
$help['flags'] .= Html::rawElement( 'li', null,
self::wrap( $context->msg( 
"api-help-flag-$flag" ), "apihelp-flag-$flag" )
);

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

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

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

[MediaWiki-commits] [Gerrit] [Translate] Add composer-test test - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: [Translate] Add composer-test test
..


[Translate] Add composer-test test

Remove php-composer-test because composer-test now runs it.

Remove phpcs test, composer now runs it.

Source-change: https://gerrit.wikimedia.org/r/#/c/243682/

Change-Id: I87fe3a1400c84c2121d7406f3ce9476f7734c984
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 461e33a..8e7170e 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -999,7 +999,6 @@
  - '{name}-phpcs-HEAD':
 name:
   - mwext-cldr
-  - mwext-Translate
   - mwext-TranslationNotifications
 
 - project:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e493352..4a2c7ad 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7271,16 +7271,14 @@
 
   - name: mediawiki/extensions/Translate
 template:
+  - name: composer-test
   - name: extension-qunit-generic
   - name: extension-rubylint
   - name: extension-unittests
   - name: npm
-  - name: extension-phpcs
 check:
   - jshint
   - jsonlint
-experimental:
-  - php-composer-test
 
   - name: mediawiki/extensions/TranslationNotifications
 template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87fe3a1400c84c2121d7406f3ce9476f7734c984
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Paladox 
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 new package jscs-preset-wikimedia - change (mediawiki...Metrolook)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add new package jscs-preset-wikimedia
..

Add new package jscs-preset-wikimedia

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/24/251724/1

diff --git a/package.json b/package.json
index 4822cca..6d608fb 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
 "grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.4.0",
 "grunt-jscs": "2.3.0",
-"grunt-jsonlint": "1.0.6"
+"grunt-jsonlint": "1.0.6",
+"jscs-preset-wikimedia": "~1.0.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id812ccb532f2d4aa7e279be5f2e1a7ddeb12abc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Add Schema class - change (mediawiki...EventLogging)

[jenkins-bot (Code Review)]

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

Change subject: Add Schema class
..


Add Schema class

Based on Schema class from MobileFrontend. The features offered by the class
are particularly useful for RelatedArticles and other extensions that
try not to depend on MobileFrontend. The class allows inheriting classes
to log events based on a sampling rate if sampling is enabled.

Bug: T117140
Change-Id: Iea00d534371353c3ae5c06c74a08aa10cb60047b
---
M EventLogging.php
A modules/ext.eventLogging.Schema.js
M modules/ext.eventLogging.core.js
A modules/ext.eventLogging.init.js
4 files changed, 125 insertions(+), 1 deletion(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Jdlrobson: Looks good to me, approved
  Gergő Tisza: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/EventLogging.php b/EventLogging.php
index 854ac5f..76b46bb 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -180,6 +180,12 @@
 );
 
 // Modules
+$wgResourceModules[ 'ext.eventLogging.init' ] = array(
+   'scripts'   => 'modules/ext.eventLogging.init.js',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'EventLogging',
+   'targets'   => array( 'desktop', 'mobile' ),
+);
 
 $wgResourceModules[ 'ext.eventLogging' ] = array(
'scripts'   => 'modules/ext.eventLogging.core.js',
@@ -187,6 +193,7 @@
'remoteExtPath' => 'EventLogging',
'dependencies'  => array(
'json',
+   'ext.eventLogging.init'
),
'targets'   => array( 'desktop', 'mobile' ),
 );
@@ -212,6 +219,17 @@
'position'  => 'top',
 );
 
+$wgResourceModules[ 'ext.eventLogging.Schema' ] = array(
+   'scripts'   => 'modules/ext.eventLogging.Schema.js',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'EventLogging',
+   'dependencies'  => array(
+   'mediawiki.user',
+   'ext.eventLogging.init'
+   ),
+   'targets'   => array( 'desktop', 'mobile' ),
+);
+
 // Hooks
 
 $wgExtensionFunctions[] = 'EventLoggingHooks::onSetup';
diff --git a/modules/ext.eventLogging.Schema.js 
b/modules/ext.eventLogging.Schema.js
new file mode 100644
index 000..de045b1
--- /dev/null
+++ b/modules/ext.eventLogging.Schema.js
@@ -0,0 +1,95 @@
+( function ( mw, $ ) {
+   'use strict';
+
+   // 2^32 - 1
+   var MAX_INT32_UNSIGNED = 4294967295;
+
+   /**
+* The class allows inheriting classes to log events based on a sampling
+* rate if sampling is enabled.
+*
+* How to use:
+*
+* var mySchema = new mw.eventLog.Schema( 'Name', 0.01, { skin: 
'minerva' } );
+* // Log the following event at the default sampling rate of 0.01.
+* mySchema.log( { 'action': 'viewed' } );
+* // Log the following event at the sampling rate of 0.2.
+* mySchema.log( { 'action': 'clicked' }, 0.2 );
+*
+* @class mw.eventLog.Schema
+* @constructor
+* @param {string} name Schema name to log to.
+* @param {number} samplingRate The rate at which sampling is performed.
+*  The values are between 0 and 1 inclusive.
+* @param {Object} [defaults] A set of defaults to log to the schema. 
Once
+*  these defaults are set the values will be logged along with any 
additional
+*  fields that are passed to the log method.
+*/
+   function Schema( name, samplingRate, defaults ) {
+   var randomNumber;
+
+   if ( !name ) {
+   throw new Error( 'name is required' );
+   }
+   // Theoretically samplingRate can be 0
+   if ( samplingRate === undefined ) {
+   throw new Error( 'samplingRate is required' );
+   }
+
+   this.name = name;
+   this.samplingRate = samplingRate;
+   this.defaults = defaults || {};
+
+   // Get the first 32-bit integer from the random session ID and
+   // scale it down to [0, 1] range.
+   randomNumber = parseInt(
+   mw.user.generateRandomSessionId().slice( 0, 8 ),
+   16
+   ) / MAX_INT32_UNSIGNED;
+
+   /**
+* Random number that is used for determining whether the user 
is in the sample
+*
+* @return {number} number Between 0 and 1 inclusive
+*/
+   this.getRandomNumber = function () {
+   return randomNumber;
+   };
+   }
+
+   /**
+* Whether the user is bucketed. Returns true the randomly generated 
number
+* during initialization is smaller than the samplingRate.
+*
+* @param {number} samplingRate 

[MediaWiki-commits] [Gerrit] Merge bug fixes and translations - change (mediawiki...HitCounters)

[jenkins-bot (Code Review)]

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

Change subject: Merge bug fixes and translations
..


Merge bug fixes and translations

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a2d82e78fdb3793057ab563344ef3dbd021522c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HitCounters
Gerrit-Branch: REL1_26
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: MarkAHershberger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Test: do not merge - change (mediawiki...Echo)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Test: do not merge
..

Test: do not merge

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


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

diff --git a/package.json b/package.json
index 56f6fdf..5453c1f 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
 "grunt-contrib-jshint": "0.11.3",
 "grunt-contrib-watch": "0.6.1",
 "grunt-banana-checker": "0.4.0",
-"grunt-jscs": "1.8.0",
+"grunt-jscs": "2.3.0",
+"jscs-preset-wikimedia": "~1.0.0",
 "grunt-jsonlint": "1.0.4"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Update grunt-jsonlint to 1.0.6 - change (mediawiki...Echo)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update grunt-jsonlint to 1.0.6
..

Update grunt-jsonlint to 1.0.6

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


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

diff --git a/package.json b/package.json
index 56f6fdf..bd2cf8e 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,6 @@
 "grunt-contrib-watch": "0.6.1",
 "grunt-banana-checker": "0.4.0",
 "grunt-jscs": "1.8.0",
-"grunt-jsonlint": "1.0.4"
+"grunt-jsonlint": "1.0.6"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Use mw.loader.using instead of weird hacks to load O... - change (mediawiki...VisualEditor)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Revert "Use mw.loader.using instead of weird hacks to load OOjs 
UI on action=edit"
..

Revert "Use mw.loader.using instead of weird hacks to load OOjs UI on 
action=edit"

This reverts commit bd9b6181275dd84c10eb597e3e6a8cd6d4bda86a.

Change-Id: Ia560f9f995a6df8aeeab5a718048990acd2e5123
---
M .jsduck/categories.json
M .jsduck/mw-categories.json
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
R modules/ve-mw/ui/dialogs/ve.ui.MWVESwitchConfirmDialog.js
6 files changed, 41 insertions(+), 49 deletions(-)


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

diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index c803a53..87a42c5 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -11,12 +11,6 @@
]
},
{
-   "name": "Switching",
-   "classes": [
-   "mw.libs.ve.SwitchConfirmDialog"
-   ]
-   },
-   {
"name": "User Interface",
"classes": [
"ve.ui.MW*Page",
diff --git a/.jsduck/mw-categories.json b/.jsduck/mw-categories.json
index 12657b2..446e510 100644
--- a/.jsduck/mw-categories.json
+++ b/.jsduck/mw-categories.json
@@ -11,12 +11,6 @@
]
},
{
-   "name": "Switching",
-   "classes": [
-   "mw.libs.ve.SwitchConfirmDialog"
-   ]
-   },
-   {
"name": "User Interface",
"classes": [
"ve.ui.MW*Page",
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 4b65639..1962b80 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -45,6 +45,9 @@
'ext.visualEditor.desktopArticleTarget.init',
'ext.visualEditor.targetLoader'
) );
+   if ( in_array( Action::getActionName( RequestContext::getMain() 
), array( 'edit', 'submit' ) ) ) {
+   $output->addModules( 'ext.visualEditor.switching' );
+   }
$output->addModuleStyles( array( 
'ext.visualEditor.desktopArticleTarget.noscript' ) );
// add scroll offset js variable to output
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
diff --git a/extension.json b/extension.json
index a3ebf2b..8701829 100644
--- a/extension.json
+++ b/extension.json
@@ -970,11 +970,12 @@
},
"ext.visualEditor.switching": {
"scripts": [
-   
"modules/ve-mw/init/ve.init.MWVESwitchConfirmDialog.js"
+   
"modules/ve-mw/ui/dialogs/ve.ui.MWVESwitchConfirmDialog.js"
],
"dependencies": [
"oojs",
-   "oojs-ui"
+   "oojs-ui",
+   "ext.visualEditor.core"
],
"messages": [
"visualeditor-mweditmodeve-title",
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 75c6664..672ea79 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -417,7 +417,6 @@
 
if ( pageCanLoadVE ) {
// Allow instant switching to edit mode, 
without refresh
-   mw.loader.load( 'ext.visualEditor.switching' );
$caVeEdit.click( init.onEditTabClick );
}
},
@@ -504,7 +503,8 @@
},
 
onEditTabClick: function ( e ) {
-   var wikitextModified = $( '#wpTextbox1' ).val() !== 
initialWikitext;
+   var wikitextModified = $( '#wpTextbox1' ).val() !== 
initialWikitext,
+   windowManager, switchWindow;
 
// Default mouse button is normalised by jQuery to key 
code 1.
// Only do our handling if no keys are pressed, mouse 

[MediaWiki-commits] [Gerrit] DM redlinks solutions - change (mediawiki...WikiLexicalData)

[Hiong3-eng5 (Code Review)]

Hiong3-eng5 has uploaded a new change for review.

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

Change subject: DM redlinks solutions
..

DM redlinks solutions

Parses Dm with no expression, both enclosed dmId and not.
Parses Dm with wrong expressions. Both of these are redirected
to the correct DM via the DM id.

DM with incorrect id, will retain red links, and will lead to
the DM error message.

Bug:T118066
Change-Id: I493cd004a242713c78c660aa13f7335f0473
---
M App.php
A OmegaWiki.hooks.php
2 files changed, 97 insertions(+), 0 deletions(-)


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

diff --git a/App.php b/App.php
index 03294fb..75457c1 100644
--- a/App.php
+++ b/App.php
@@ -70,6 +70,7 @@
 );
 
 $wgAutoloadClasses['WikiLexicalDataHooks'] = $dir . 'Wikidata.hooks.php';
+$wgAutoloadClasses['OmegaWikiHooks'] = $dir . 'OmegaWiki.hooks.php';
 
 $wgAutoloadClasses['WikidataArticle'  ] = $dir . 
'includes/WikidataArticle.php';
 $wgAutoloadClasses['WikidataEditPage' ] = $dir . 
'includes/WikidataEditPage.php';
@@ -169,6 +170,9 @@
 $wgHooks['LoadExtensionSchemaUpdates'][] = 'WikiLexicalDataHooks::loadSchema';
 $wgHooks['SpecialStatsAddExtra'][] = 
'WikiLexicalDataHooks::onSpecialStatsAddExtra';
 
+# OmegaWikiHooks
+$wgHooks['OutputPageBeforeHTML'][] = 'OmegaWikiHooks::checkDMRedLinks';
+
 // Jobs
 require_once( $wgWldSetupScriptPath . "OWJobs.php" );
 
diff --git a/OmegaWiki.hooks.php b/OmegaWiki.hooks.php
new file mode 100644
index 000..245cef2
--- /dev/null
+++ b/OmegaWiki.hooks.php
@@ -0,0 +1,93 @@
+ $dmId ) {
+   if ( self::dmIdExists( $dmId ) === true ) {
+   foreach( $dmStringLink as $link => 
$nullLink ) {
+   $matchPattern = '/(\(|)' . 
$dmId . '(\)|)&/';
+   if ( preg_match( $matchPattern, 
$link ) ) {// echo 'yes';
+   $dmStringLink[$link] = 
preg_replace(
+   
'/action=editredlink=1\" class=\"new/',
+   '',
+   $link
+   );
+   } else {
+   }
+   }
+   } else {
+   // In case the dm does not exists, I 
deleted the
+   // dmId. The dm will still show the red 
link, but
+   // will be directed as an invalid dm.
+   $pattern = '/(\(|)' . $dmId . '(\)|)/';
+   $dmStringLink[$link] = preg_replace(
+   $pattern,
+   '',
+   $link
+   );
+   }
+   }
+   foreach ( $dmStringLink as $pattern => $replace ) {
+   $text = str_replace(
+   $pattern,
+   $replace,
+   $text
+   );
+   };
+   }
+   return $out;
+   }
+
+   /** @brief Check if dmId exists.
+* 
+* @todo refactor this to the OmegaWiki PHP API.
+*/
+   protected static function dmIdExists( $dmId ) {
+   $dc = wdGetDataSetContext();
+   $dbr = wfGetDB( DB_SLAVE );
+
+   $queryResult = $dbr->selectField(
+   "{$dc}_defined_meaning",
+   'defined_meaning_id',
+   array(
+   'defined_meaning_id' => $dmId,
+   'remove_transaction_id' => null
+   ),
+   __METHOD__
+   );
+   // false returned if not found
+   if ( $queryResult ) {
+   return true;
+   }
+   return false;
+
+   }
+
+}
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I493cd004a242713c78c660aa13f7335f0473
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Hiong3-eng5 

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 69bce26..3e23d3b - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 69bce26..3e23d3b
..


Syncronize VisualEditor: 69bce26..3e23d3b

Change-Id: I9e7b97ce6e649ab4f7ed0a438463f2dc5d41c6cc
---
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 69bce26..3e23d3b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 69bce265791ade69e64cfeffa85bdf6fb1a7680c
+Subproject commit 3e23d3b96d8baf84f4aaa0338d1d58c28651a3ff

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e7b97ce6e649ab4f7ed0a438463f2dc5d41c6cc
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: 69bce26..3e23d3b - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 69bce26..3e23d3b
..

Syncronize VisualEditor: 69bce26..3e23d3b

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


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

diff --git a/VisualEditor b/VisualEditor
index 69bce26..3e23d3b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 69bce265791ade69e64cfeffa85bdf6fb1a7680c
+Subproject commit 3e23d3b96d8baf84f4aaa0338d1d58c28651a3ff

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e7b97ce6e649ab4f7ed0a438463f2dc5d41c6cc
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] Only load switching module (depending on OOUI etc.) on edit ... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Only load switching module (depending on OOUI etc.) on edit 
pages
..


Only load switching module (depending on OOUI etc.) on edit pages

This wasn't as bad as T112401 (that was blocking render), but we
still shouldn't be loading the module on page views.

Bug: T118088
Change-Id: If86701ed7ff4e8d6defb1c682aa9a38c211be0fa
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 15 insertions(+), 12 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 420ed59..8b042e8 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -379,20 +379,23 @@
$caVeEdit.remove();
} else if ( pageCanLoadVE ) {
// Allow instant switching to edit mode, 
without refresh
-   mw.loader.load( 'ext.visualEditor.switching' );
$caVeEdit.click( init.onEditTabClick );
-   $( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
-   mw.loader.using( 'oojs-ui', function () 
{
-   $( '.wikiEditor-ui-toolbar' 
).prepend(
-   new OO.ui.ButtonWidget( 
{
-   framed: false,
-   icon: 'edit',
-   title: mw.msg( 
'visualeditor-mweditmodeve-tool' ),
-   classes: [ 
've-init-mw-desktopArticleTarget-editSwitch' ]
-   } ).on( 'click', 
init.activateVe ).$element
-   );
+
+   if ( [ 'edit', 'submit' ].indexOf( 
mw.config.get( 'wgAction' ) ) !== -1 ) {
+   mw.loader.load( 
'ext.visualEditor.switching' );
+   $( '#wpTextbox1' ).on( 
'wikiEditor-toolbar-doneInitialSections', function () {
+   mw.loader.using( 'oojs-ui', 
function () {
+   $( 
'.wikiEditor-ui-toolbar' ).prepend(
+   new 
OO.ui.ButtonWidget( {
+   framed: 
false,
+   icon: 
'edit',
+   title: 
mw.msg( 'visualeditor-mweditmodeve-tool' ),
+   
classes: [ 've-init-mw-desktopArticleTarget-editSwitch' ]
+   } ).on( 
'click', init.activateVe ).$element
+   );
+   } );
} );
-   } );
+   }
}
 
// Alter the edit tab (#ca-edit)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If86701ed7ff4e8d6defb1c682aa9a38c211be0fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Allow Wiki-Sysadmins to configure the template used for Fore... - change (mediawiki/core)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Allow Wiki-Sysadmins to configure the template used for 
ForeignStructeredUpload
..

Allow Wiki-Sysadmins to configure the template used for ForeignStructeredUpload

The Template works fine for WMF wikis, or, to say it exactly, for wikis 
uploading to
commonswiki. But other, mostly third party wikis, maybe doesn't use 
Template:Information,
or a localized version, or a completly own template for the file info pages.

This change allows these wikis, to configure mostly all of the structre around 
the information
of an uploaded image, including the template being used, if the descriptions 
should be wrapped
around language templates, and what template/text is used for the source = own 
part.

The template message ("upload-information-template") allows to set some magic 
words for the
replacement with the information of the user:
 * templateName: Is the template name, which is hardcoded in the code 
("Information"), if a wiki
   uses another template, it can simply omit this magic word and hardcode it's 
own template name
 * description: The description entered by the user (wrapped inside a language 
template (like
   {{en|description message}}) or the plain description, if the interface 
message
   "upload-information-language" exists, which turns the language template 
wrapping of
 * date: The user entered date, when this image was created
 * source: The source of this image ("{{own}}", if the message key 
"upload-information-own" does
   not exist, otherwise the plain content of "upload-information-own"
 * author: The name of the user uploading this image, wrapped around [[User: 
and ]] (e.g.
   "[[User:Florian|Florian]]"
 * license: "{{self|cc-by-sa-4.0}}" (for a foreign target) or an empty string 
(for a local target)
 * categories: Categories, the user choosed for this file, wrapped around 
[[Category: and ]] (e.g.
   "[[Category:My great images]]")

The interface message "upload-information-own" can be created, which will be 
used for the "source"
part of the template (it doesn't matter, if the pre-defined, hardcoded 
template, or the template
of the interface message is used). If it doesn't exist, "{{own}}" is used.

If the interface message "upload-information-language" exists, the description 
isn't wrapped around
language templates (e.g. "{{en|My great description}}"). The content doesn't 
matter and isn't used
anywhere.

Bug: T118097
Change-Id: I6e517834e505e2612279d9b02c0da74504abdaea
---
M resources/Resources.php
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
2 files changed, 60 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/251797/1

diff --git a/resources/Resources.php b/resources/Resources.php
index d15fc27..55a680e 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1153,6 +1153,7 @@
'mediawiki.ForeignStructuredUpload' => array(
'scripts' => 
'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js',
'dependencies' => array(
+   'mediawiki.api.messages',
'mediawiki.ForeignUpload',
),
),
diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js 
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
index c336676..76a9f0e 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
@@ -21,7 +21,20 @@
this.descriptions = [];
this.categories = [];
 
+   // parent constructor
mw.ForeignUpload.call( this, target, apiconfig );
+
+   // preload information template message
+   this.apiPromise.then( function (api) {
+   api.getMessages( [
+   // Use this template, instead of a pre-defined 
Template:Information, if defined
+   'upload-information-template',
+   // Use this as the {{own}} template, instead of 
{{own}}, if defined
+   'upload-information-own',
+   // If this message exists, don't wrap the 
descriptions into language templates
+   'upload-information-language'
+   ] );
+   } );
}
 
OO.inheritClass( ForeignStructuredUpload, mw.ForeignUpload );
@@ -83,24 +96,38 @@
 * @return {string}
 */
ForeignStructuredUpload.prototype.getText = function () {
-   return (
-   '== {{int:filedesc}} ==\n' +
-   '{{' +
-   this.getTemplateName() +
-   '\n|description=' +
-  

[MediaWiki-commits] [Gerrit] Add a messages api module to easily retrieve a set of messages - change (mediawiki/core)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Add a messages api module to easily retrieve a set of messages
..

Add a messages api module to easily retrieve a set of messages

Bug: T40280
Change-Id: I6e3fc4beb56c3120702ca291adf6e1521a0bc21f
---
M resources/Resources.php
A resources/src/mediawiki/api/messages.js
2 files changed, 55 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/251796/1

diff --git a/resources/Resources.php b/resources/Resources.php
index b1b1541..d15fc27 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -911,6 +911,12 @@
'mediawiki.api',
),
),
+   'mediawiki.api.messages' => array(
+   'scripts' => 'resources/src/mediawiki/api/messages.js',
+   'dependencies' => array(
+   'mediawiki.api',
+   ),
+   ),
'mediawiki.content.json' => array(
'position' => 'top',
'styles' => 
'resources/src/mediawiki/mediawiki.content.json.css',
diff --git a/resources/src/mediawiki/api/messages.js 
b/resources/src/mediawiki/api/messages.js
new file mode 100644
index 000..a6a2f20
--- /dev/null
+++ b/resources/src/mediawiki/api/messages.js
@@ -0,0 +1,49 @@
+/**
+ * Allows to retrieve a specific or a set of
+ * messages to be added to mw.messages and returned
+ * by the Api.
+ *
+ * @class mw.Api.plugin.messages
+ * @since 1.27
+ */
+( function ( mw, $ ) {
+   'use strict';
+
+   $.extend( mw.Api.prototype, {
+   /**
+* @param {array} messages Messages to retrieve
+* @return {jQuery.Promise}
+*  parameter)
+*/
+   getMessages: function ( messages ) {
+   var api = this,
+   apiPromise;
+
+   apiPromise = api.get( {
+   action: 'query',
+   meta: 'allmessages',
+   ammessages: messages.join( '|' ),
+   amlang: mw.config.get('wgUserLanguage')
+   } )
+   
+   return apiPromise.then( function ( data ) {
+   var result = [];
+   if ( data && data.query && 
data.query.allmessages ) {
+   $.each( data.query.allmessages, 
function ( i, obj ) {
+   if ( obj['*'] ) {
+   mw.messages.set( 
obj.name, obj['*'] );
+   result[obj.name] = 
obj['*'];
+   }
+   } );
+   }
+   return result;
+   } );
+   }
+   } );
+
+   /**
+* @class mw.Api
+* @mixins mw.Api.plugin.messages
+*/
+
+}( mediaWiki, jQuery ) );

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

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

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

[MediaWiki-commits] [Gerrit] Pass wpExistingTags in the request when multiple revisions a... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Pass wpExistingTags in the request when multiple revisions are 
selected
..


Pass wpExistingTags in the request when multiple revisions are selected

Not doing so breaks the option to remove all tags.

Bug: T102186
Change-Id: I961b29d78ec7dd7a48f3bb4633f9c057125cce5b
---
M includes/specials/SpecialEditTags.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/includes/specials/SpecialEditTags.php 
b/includes/specials/SpecialEditTags.php
index d2b2e70..6545541 100644
--- a/includes/specials/SpecialEditTags.php
+++ b/includes/specials/SpecialEditTags.php
@@ -275,6 +275,7 @@
protected function buildCheckBoxes() {
// If there is just one item, provide the user with a 
multi-select field
$list = $this->getList();
+   $tags = array();
if ( $list->length() == 1 ) {
$list->reset();
$tags = $list->current()->getTags();
@@ -295,14 +296,9 @@
$html .= '';
$tagSelect = $this->getTagSelect( $tags, $this->msg( 
'tags-edit-new-tags' )->plain() );
$html .= '' . $tagSelect[0] . '' . 
$tagSelect[1];
-   // also output the tags currently applied as a hidden 
form field, so we
-   // know what to remove from the revision/log entry when 
the form is submitted
-   $html .= Html::hidden( 'wpExistingTags', implode( ',', 
$tags ) );
-   $html .= '';
} else {
// Otherwise, use a multi-select field for adding tags, 
and a list of
// checkboxes for removing them
-   $tags = array();
 
// @codingStandardsIgnoreStart 
Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
for ( $list->reset(); $list->current(); $list->next() ) 
{
@@ -328,9 +324,13 @@
'class' => 
'mw-edittags-remove-checkbox',
) );
}
-   $html .= '';
}
 
+   // also output the tags currently applied as a hidden form 
field, so we
+   // know what to remove from the revision/log entry when the 
form is submitted
+   $html .= Html::hidden( 'wpExistingTags', implode( ',', $tags ) 
);
+   $html .= '';
+
return $html;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I961b29d78ec7dd7a48f3bb4633f9c057125cce5b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cenarium 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Cenarium 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Allow patrol of moves - change (mediawiki/core)

[Cenarium (Code Review)]

Cenarium has uploaded a new change for review.

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

Change subject: Allow patrol of  moves
..

Allow patrol of  moves

This allows to patrol moves when RC patrol is enabled, from recent
changes (or from the null revision). Reverting the move from recent
changes is also possible, with the effect of patroling it.

Bug: T98617
Change-Id: Ie0fa417feaf930c096b69521fc54d57aecd6cd51
---
M includes/DefaultSettings.php
M includes/MovePage.php
M includes/actions/MarkpatrolledAction.php
M includes/changes/ChangesList.php
M includes/changes/EnhancedChangesList.php
M includes/changes/OldChangesList.php
M includes/logging/MoveLogFormatter.php
M includes/specials/SpecialMovepage.php
8 files changed, 118 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/251794/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index bf6e245..b9d0921 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6194,7 +6194,8 @@
 $wgRCWatchCategoryMembership = false;
 
 /**
- * Use RC Patrolling to check for vandalism
+ * Use RC Patrolling to check for vandalism (from recent changes and 
watchlists)
+ * New pages and new files are included.
  */
 $wgUseRCPatrol = true;
 
@@ -6204,6 +6205,11 @@
 $wgUseNPPatrol = true;
 
 /**
+ * Use file patrolling to check new files on Special:Newfiles
+ */
+$wgUseFilePatrol = true;
+
+/**
  * Log autopatrol actions to the log table
  */
 $wgLogAutopatrol = true;
diff --git a/includes/MovePage.php b/includes/MovePage.php
index 736cd8d..7b7e301 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -501,23 +501,6 @@
Hooks::run( 'NewRevisionFromEditComplete',
array( $newpage, $nullRevision, 
$nullRevision->getParentId(), $user ) );
 
-   $newpage->doEditUpdates( $nullRevision, $user,
-   array( 'changed' => false, 'moved' => true, 
'oldcountable' => $oldcountable ) );
-
-   // If the default content model changes, we need to populate 
rev_content_model
-   if ( $defaultContentModelChanging ) {
-   $dbw->update(
-   'revision',
-   array( 'rev_content_model' => $contentModel ),
-   array( 'rev_page' => $nt->getArticleID(), 
'rev_content_model IS NULL' ),
-   __METHOD__
-   );
-   }
-
-   if ( !$moveOverRedirect ) {
-   WikiPage::onArticleCreate( $nt );
-   }
-
# Recreate the redirect, this time in the other direction.
if ( $redirectContent ) {
$redirectArticle = WikiPage::factory( $this->oldTitle );
@@ -537,13 +520,37 @@
 
Hooks::run( 'NewRevisionFromEditComplete',
array( $redirectArticle, 
$redirectRevision, false, $user ) );
-
-   $redirectArticle->doEditUpdates( 
$redirectRevision, $user, array( 'created' => true ) );
}
}
 
+   # Associate null revision id
+   $logEntry->setAssociatedRevId( $nullRevision->getId() );
+
# Log the move
$logid = $logEntry->insert();
+
+   # Publish recent change now to ensure it gets the same 
timestamp as the null rev
$logEntry->publish( $logid );
+
+   # Now we can make the post-edit updates
+   $newpage->doEditUpdates( $nullRevision, $user,
+   array( 'changed' => false, 'moved' => true, 
'oldcountable' => $oldcountable ) );
+   if ( $redirectContent && $newid ) {
+   $redirectArticle->doEditUpdates( $redirectRevision, 
$user, array( 'created' => true ) );
+   }
+
+   // If the default content model changes, we need to populate 
rev_content_model
+   if ( $defaultContentModelChanging ) {
+   $dbw->update(
+   'revision',
+   array( 'rev_content_model' => $contentModel ),
+   array( 'rev_page' => $nt->getArticleID(), 
'rev_content_model IS NULL' ),
+   __METHOD__
+   );
+   }
+
+   if ( !$moveOverRedirect ) {
+   WikiPage::onArticleCreate( $nt );
+   }
}
 }
diff --git a/includes/actions/MarkpatrolledAction.php 
b/includes/actions/MarkpatrolledAction.php
index 4016f67..ec873d9 100644
--- a/includes/actions/MarkpatrolledAction.php
+++ b/includes/actions/MarkpatrolledAction.php
@@ -63,8 +63,14 @@
}
 
# It would be nice to see where the 

[MediaWiki-commits] [Gerrit] Use a more useful error message when DB connection fails - change (operations...dbtree)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Use a more useful error message when DB connection fails
..

Use a more useful error message when DB connection fails

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/dbtree 
refs/changes/91/251791/1

diff --git a/index.php b/index.php
index 9f13dd0..53ab713 100644
--- a/index.php
+++ b/index.php
@@ -22,7 +22,7 @@
 {
 e("db connect: host");
 $db = @mysql_connect($db_host, $db_user, $db_pass)
-or die('database'); mysql_select_db($db_name);
+or die('database connection failed'); mysql_select_db($db_name);
 }
 return $db;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c49bec5434efc27a78952e85a054a2de3bea8f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/dbtree
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Remove !defined( 'MEDIAWIKI' ) from 1 file - change (mediawiki...TimedMediaHandler)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Remove !defined( 'MEDIAWIKI' )  from 1 file
..

Remove !defined( 'MEDIAWIKI' )  from 1 file

Remove !defined( 'MEDIAWIKI' )  from ApiQueryVideoInfo.php file.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/93/251793/1

diff --git a/ApiQueryVideoInfo.php b/ApiQueryVideoInfo.php
index 6523916..cdcfc70 100644
--- a/ApiQueryVideoInfo.php
+++ b/ApiQueryVideoInfo.php
@@ -7,11 +7,6 @@
  *
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   // Eclipse helper - will be ignored in production
-   require_once( "ApiBase.php" );
-}
-
 class ApiQueryVideoInfo extends ApiQueryImageInfo {
 
public function __construct( $query, $moduleName, $prefix = 'vi' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67fbb17995fddc9ba6f43a7d80091ba177129402
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Update TestVideoTranscode.php test - change (mediawiki...TimedMediaHandler)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update TestVideoTranscode.php test
..

Update TestVideoTranscode.php test

Change-Id: Icb2b126bfbf33621ac5c0943bddd32b6067538ee
---
M tests/phpunit/TestVideoTranscode.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/92/251792/1

diff --git a/tests/phpunit/TestVideoTranscode.php 
b/tests/phpunit/TestVideoTranscode.php
index af0e6f1..83d4559 100644
--- a/tests/phpunit/TestVideoTranscode.php
+++ b/tests/phpunit/TestVideoTranscode.php
@@ -54,6 +54,9 @@
if( $codec == 'vp8' ){
$hasWebM = true;
}
+   if ( $codec == 'vp8' ) {
+   $hasWebM = true;
+   }
$targetEncodes[ $row->transcode_key ] = $row;
};
// Make sure we have ogg and webm:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb2b126bfbf33621ac5c0943bddd32b6067538ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Allow patrol of uploads - change (mediawiki/core)

[Cenarium (Code Review)]

Cenarium has uploaded a new change for review.

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

Change subject: Allow patrol of uploads
..

Allow patrol of uploads

This allows to patrol file uploads, both new files and new file
versions, from the description page, provided $wgUseFilePatrol
is set to true. Special:NewFiles can be filtered to hide patrolled
files.

Bug: T11501
Change-Id: If71af58719a4461f12d125455b7bef07164525ca
---
M includes/DefaultSettings.php
M includes/User.php
M includes/changes/ChangesList.php
M includes/changes/RecentChange.php
M includes/filerepo/file/LocalFile.php
M includes/page/Article.php
M includes/specials/SpecialNewimages.php
M languages/i18n/en.json
M languages/i18n/qqq.json
9 files changed, 140 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/251795/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index bf6e245..b9d0921 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6194,7 +6194,8 @@
 $wgRCWatchCategoryMembership = false;
 
 /**
- * Use RC Patrolling to check for vandalism
+ * Use RC Patrolling to check for vandalism (from recent changes and 
watchlists)
+ * New pages and new files are included.
  */
 $wgUseRCPatrol = true;
 
@@ -6204,6 +6205,11 @@
 $wgUseNPPatrol = true;
 
 /**
+ * Use file patrolling to check new files on Special:Newfiles
+ */
+$wgUseFilePatrol = true;
+
+/**
  * Log autopatrol actions to the log table
  */
 $wgLogAutopatrol = true;
diff --git a/includes/User.php b/includes/User.php
index b09e4e4..14de569 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3311,6 +3311,18 @@
}
 
/**
+* Check whether to enable new files patrol features for this user
+* @return bool True or false
+*/
+   public function useFilePatrol() {
+   global $wgUseRCPatrol, $wgUseFilePatrol;
+   return (
+   ( $wgUseRCPatrol || $wgUseFilePatrol )
+   && ( $this->isAllowedAny( 'patrol', 
'patrolmarks' ) )
+   );
+   }
+
+   /**
 * Get the WebRequest object to use with this object
 *
 * @return WebRequest
diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 2494ef1..6081a17 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -638,9 +638,11 @@
if ( $rc instanceof RecentChange ) {
$isPatrolled = $rc->mAttribs['rc_patrolled'];
$rcType = $rc->mAttribs['rc_type'];
+   $rcLogType = $rc->mAttribs['rc_log_type'];
} else {
$isPatrolled = $rc->rc_patrolled;
$rcType = $rc->rc_type;
+   $rcLogType = $rc->rc_log_type;
}
 
if ( !$isPatrolled ) {
@@ -650,6 +652,9 @@
if ( $user->useNPPatrol() && $rcType == RC_NEW ) {
return true;
}
+   if ( $user->useFilePatrol() && $rcLogType == 'upload' ) 
{
+   return true;
+   }
}
 
return false;
diff --git a/includes/changes/RecentChange.php 
b/includes/changes/RecentChange.php
index b0b88d3..df3b5bc 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -456,11 +456,13 @@
 * @return array Array of permissions errors, see 
Title::getUserPermissionsErrors()
 */
public function doMarkPatrolled( User $user, $auto = false ) {
-   global $wgUseRCPatrol, $wgUseNPPatrol;
+   global $wgUseRCPatrol, $wgUseNPPatrol, $wgUseFilePatrol;
$errors = array();
-   // If recentchanges patrol is disabled, only new pages
-   // can be patrolled
-   if ( !$wgUseRCPatrol && ( !$wgUseNPPatrol || 
$this->getAttribute( 'rc_type' ) != RC_NEW ) ) {
+   // If recentchanges patrol is disabled, only new pages or new 
file versions
+   // can be patrolled, provided the appropriate config variable 
is set
+   if ( !$wgUseRCPatrol && ( !$wgUseNPPatrol || 
$this->getAttribute( 'rc_type' ) != RC_NEW ) &&
+   ( !$wgUseFilePatrol || !( $this->getAttribute( 
'rc_type' ) == RC_LOG &&
+   $this->getAttribute( 'rc_log_type' ) == 'upload' ) ) ) {
$errors[] = array( 'rcpatroldisabled' );
}
// Automatic patrol needs "autopatrol", ordinary patrol needs 
"patrol"
diff --git a/includes/filerepo/file/LocalFile.php 
b/includes/filerepo/file/LocalFile.php
index cd64f0d..1f78a48 100644
--- a/includes/filerepo/file/LocalFile.php
+++ 

[MediaWiki-commits] [Gerrit] Fix casing of function calls in API - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix casing of function calls in API
..


Fix casing of function calls in API

Change-Id: I44b343568e5713118c41f29a73e112162dd3e635
---
M includes/api/ApiCreateAccount.php
M includes/api/ApiEditPage.php
M includes/api/ApiFeedWatchlist.php
M includes/api/ApiFormatBase.php
M includes/api/ApiHelp.php
M includes/api/ApiMain.php
M includes/api/ApiOpenSearch.php
M includes/api/ApiParamInfo.php
M includes/api/ApiQueryBase.php
M includes/api/ApiQueryCategoryMembers.php
M includes/api/ApiQueryImageInfo.php
M includes/api/ApiQueryInfo.php
M includes/api/ApiQueryRevisionsBase.php
M includes/api/ApiQuerySiteinfo.php
M includes/api/ApiSetNotificationTimestamp.php
15 files changed, 31 insertions(+), 31 deletions(-)

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



diff --git a/includes/api/ApiCreateAccount.php 
b/includes/api/ApiCreateAccount.php
index 00b7de9..1368bda 100644
--- a/includes/api/ApiCreateAccount.php
+++ b/includes/api/ApiCreateAccount.php
@@ -95,7 +95,7 @@
Hooks::run( 'AddNewAccountApiForm', array( $this, $loginForm ) 
);
$loginForm->load();
 
-   $status = $loginForm->addNewaccountInternal();
+   $status = $loginForm->addNewAccountInternal();
LoggerFactory::getInstance( 'authmanager' )->info( 'Account 
creation attempt via API', array(
'event' => 'accountcreation',
'status' => $status,
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 90d976a..78913e1 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -244,12 +244,12 @@
$this->dieUsageMsg( array( 'nosuchrevid', 
$params['undoafter'] ) );
}
 
-   if ( $undoRev->getPage() != $pageObj->getID() ) {
-   $this->dieUsageMsg( array( 'revwrongpage', 
$undoRev->getID(),
+   if ( $undoRev->getPage() != $pageObj->getId() ) {
+   $this->dieUsageMsg( array( 'revwrongpage', 
$undoRev->getId(),
$titleObj->getPrefixedText() ) );
}
-   if ( $undoafterRev->getPage() != $pageObj->getID() ) {
-   $this->dieUsageMsg( array( 'revwrongpage', 
$undoafterRev->getID(),
+   if ( $undoafterRev->getPage() != $pageObj->getId() ) {
+   $this->dieUsageMsg( array( 'revwrongpage', 
$undoafterRev->getId(),
$titleObj->getPrefixedText() ) );
}
 
@@ -268,7 +268,7 @@
// If no summary was given and we only undid one rev,
// use an autosummary
if ( is_null( $params['summary'] ) &&
-   $titleObj->getNextRevisionID( 
$undoafterRev->getID() ) == $params['undo']
+   $titleObj->getNextRevisionID( 
$undoafterRev->getId() ) == $params['undo']
) {
$params['summary'] = wfMessage( 'undo-summary' )
->params( $params['undo'], 
$undoRev->getUserText() )->inContentLanguage()->text();
diff --git a/includes/api/ApiFeedWatchlist.php 
b/includes/api/ApiFeedWatchlist.php
index 0ddb3c3..e8afcb6 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -181,7 +181,7 @@
// Probably a formerly-valid title that's now 
conflicting with an
// interwiki prefix or the like.
if ( isset( $info['pageid'] ) ) {
-   $title = Title::newFromId( $info['pageid'] );
+   $title = Title::newFromID( $info['pageid'] );
$curidParam = array( 'curid' => $info['pageid'] 
);
}
if ( !$title || $title->isExternal() ) {
diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php
index 3c10518..17966af 100644
--- a/includes/api/ApiFormatBase.php
+++ b/includes/api/ApiFormatBase.php
@@ -207,7 +207,7 @@
 
// API handles its own clickjacking protection.
// Note, that $wgBreakFrames will still override 
$wgApiFrameOptions for format mode.
-   $out->allowClickJacking();
+   $out->allowClickjacking();
$out->output();
} else {
// For non-HTML output, clear all errors that might 
have been
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index e587162..a8f1cd8 100644
--- a/includes/api/ApiHelp.php
+++ 

[MediaWiki-commits] [Gerrit] Add class member definition for params - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add class member definition for params
..


Add class member definition for params

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

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



diff --git a/includes/api/ApiFeedRecentChanges.php 
b/includes/api/ApiFeedRecentChanges.php
index 5adde87..5c0a4af 100644
--- a/includes/api/ApiFeedRecentChanges.php
+++ b/includes/api/ApiFeedRecentChanges.php
@@ -26,6 +26,8 @@
  */
 class ApiFeedRecentChanges extends ApiBase {
 
+   private $params;
+
/**
 * This module uses a custom feed wrapper printer.
 *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56cc77bad61691c123ecfae8e004b69141959e57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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