date:20170114

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove VisualEditor browser test inside MobileFrontend

2017-01-14 Thread MtDu (Code Review)

MtDu has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332082 )

Change subject: Remove VisualEditor browser test inside MobileFrontend
..

Remove VisualEditor browser test inside MobileFrontend

There is a test in tests/browser/features/editor_ve.feature.
However, it is skipped on all environments. This patch removes this test.

Bug: T150338
Change-Id: I58152a592b3ca94586907d4e852055db10308a85
---
D tests/browser/features/editor_ve.feature
1 file changed, 0 insertions(+), 23 deletions(-)


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

diff --git a/tests/browser/features/editor_ve.feature 
b/tests/browser/features/editor_ve.feature
deleted file mode 100644
index fb5e845..000
--- a/tests/browser/features/editor_ve.feature
+++ /dev/null
@@ -1,23 +0,0 @@
-@chrome @editing @en.m.wikipedia.beta.wmflabs.org @extension-visualeditor 
@firefox @skip @vagrant @login
-Feature: VisualEditor Mobile
-
-  # Tests are skipped due to https://phabricator.wikimedia.org/T88559
-  Background:
-Given I am logged into the mobile website
-  And I am in beta mode
-  And I am editing a new article with VisualEditor
-
-  Scenario: Switch from VisualEditor to source editor
-When I switch to editing the source
-  And I see the wikitext editor overlay
-  And I click the wikitext editor overlay close button
-Then I should not see the wikitext editor overlay
-
-  Scenario: I can edit a page using VisualEditor
-When I edit the article using VisualEditor
-Then I should see the edit reflected in the article content
-
-  Scenario: Going back from save screen in VisualEditor
-When I click the escape button
-Then I should see the article content
-  And I should no longer see the VisualEditor

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Bypass warming red link cache for wikitext requests

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331934 )

Change subject: Bypass warming red link cache for wikitext requests
..


Bypass warming red link cache for wikitext requests

Wikitext editor doesn't need to know about redlinks
on the page, so this is a waste of time. If the user
switches to VE, they will do a fresh metadata request
at that point.

Change-Id: I57f3fe3fca47dde03bba7905f763abc8a43d0653
---
M ApiVisualEditor.php
1 file changed, 30 insertions(+), 25 deletions(-)

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



diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index d09ac29..e132470 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -445,34 +445,39 @@
// We do the lookup for the current version. 
This might not be entirely complete
// if we're loading an oldid, but it'll 
probably be close enough, and LinkCache
// will automatically request any additional 
data it needs.
-   $links = [];
-   $wikipage = WikiPage::factory( $title );
-   $popts = $wikipage->makeParserOptions( 
'canonical' );
-   $cached = ParserCache::singleton()->get( 
$article, $popts, true );
-   $links = [
-   // Array of linked pages that are 
missing
-   'missing' => [],
-   // For current revisions: 1 (treat all 
non-missing pages as known)
-   // For old revisions: array of linked 
pages that are known
-   'known' => $restoring || !$cached ? [] 
: 1,
-   ];
-   if ( $cached ) {
-   foreach ( $cached->getLinks() as 
$namespace => $cachedTitles ) {
-   foreach ( $cachedTitles as 
$cachedTitleText => $exists ) {
-   $cachedTitle = 
Title::makeTitle( $namespace, $cachedTitleText );
-   if ( 
!$cachedTitle->isKnown() ) {
-   
$links['missing'][] = $cachedTitle->getPrefixedText();
-   } elseif ( 
$links['known'] !== 1 ) {
-   
$links['known'][] = $cachedTitle->getPrefixedText();
+   // We only do this for visual edits, as the 
wikitext editor doesn't need to know
+   // about redlinks on the page. If the user 
switches to VE, they will do a fresh
+   // metadata request at that point.
+   $links = null;
+   if ( $params['paction'] !== 'wikitext' ) {
+   $wikipage = WikiPage::factory( $title );
+   $popts = $wikipage->makeParserOptions( 
'canonical' );
+   $cached = 
ParserCache::singleton()->get( $article, $popts, true );
+   $links = [
+   // Array of linked pages that 
are missing
+   'missing' => [],
+   // For current revisions: 1 
(treat all non-missing pages as known)
+   // For old revisions: array of 
linked pages that are known
+   'known' => $restoring || 
!$cached ? [] : 1,
+   ];
+   if ( $cached ) {
+   foreach ( $cached->getLinks() 
as $namespace => $cachedTitles ) {
+   foreach ( $cachedTitles 
as $cachedTitleText => $exists ) {
+   $cachedTitle = 
Title::makeTitle( $namespace, $cachedTitleText );
+   if ( 
!$cachedTitle->isKnown() ) {
+   
$links['missing'][] = $cachedTitle->getPrefixedText();
+   } elseif ( 
$links['known'] !== 1 ) {
+   
$links['known'][] = $cachedTitle->getPrefixedText();
+   }

[MediaWiki-commits] [Gerrit] operations/puppet[production]: diamond module: Add trailing commas

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332098 )

Change subject: diamond module: Add trailing commas
..

diamond module: Add trailing commas

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: Ie592c0f27eb6387d30e9ac29f35963e2e741b81f
---
M modules/diamond/manifests/collector/minimalpuppetagent.pp
M modules/diamond/manifests/collector/nagios.pp
M modules/diamond/manifests/collector/nagios_lib.pp
M modules/diamond/manifests/collector/servicestats_lib.pp
M modules/diamond/manifests/init.pp
5 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/332098/1

diff --git a/modules/diamond/manifests/collector/minimalpuppetagent.pp 
b/modules/diamond/manifests/collector/minimalpuppetagent.pp
index 00c6cec..aca9eb9 100644
--- a/modules/diamond/manifests/collector/minimalpuppetagent.pp
+++ b/modules/diamond/manifests/collector/minimalpuppetagent.pp
@@ -11,7 +11,7 @@
 # puppet, since /var/lib/puppet doesn't have +x set
 sudo::user { 'diamond_sudo_for_puppet':
 user   => 'diamond',
-privileges => ['ALL=(puppet) NOPASSWD: /bin/cat 
/var/lib/puppet/state/last_run_summary.yaml']
+privileges => ['ALL=(puppet) NOPASSWD: /bin/cat 
/var/lib/puppet/state/last_run_summary.yaml'],
 }
 
 diamond::collector { 'MinimalPuppetAgent':
diff --git a/modules/diamond/manifests/collector/nagios.pp 
b/modules/diamond/manifests/collector/nagios.pp
index 67d58c1..97c6cfe 100644
--- a/modules/diamond/manifests/collector/nagios.pp
+++ b/modules/diamond/manifests/collector/nagios.pp
@@ -27,12 +27,12 @@
 ensure  => $ensure,
 content => ordered_json({
 name=> $title,
-command => $command
+command => $command,
 }),
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-notify  => Service['diamond']
+notify  => Service['diamond'],
 }
 }
 
diff --git a/modules/diamond/manifests/collector/nagios_lib.pp 
b/modules/diamond/manifests/collector/nagios_lib.pp
index 8a61b01..e75fd00 100644
--- a/modules/diamond/manifests/collector/nagios_lib.pp
+++ b/modules/diamond/manifests/collector/nagios_lib.pp
@@ -1,7 +1,7 @@
 # support class, to be include'd multiple times
 class diamond::collector::nagios_lib {
 diamond::collector { 'Nagios':
-source   => 'puppet:///modules/diamond/collector/nagios.py'
+source   => 'puppet:///modules/diamond/collector/nagios.py',
 }
 
 file { '/etc/diamond/nagios.d':
diff --git a/modules/diamond/manifests/collector/servicestats_lib.pp 
b/modules/diamond/manifests/collector/servicestats_lib.pp
index 60ec86d..2b525bc 100644
--- a/modules/diamond/manifests/collector/servicestats_lib.pp
+++ b/modules/diamond/manifests/collector/servicestats_lib.pp
@@ -3,8 +3,8 @@
 diamond::collector { 'ServiceStats':
 source   => 'puppet:///modules/diamond/collector/servicestats.py',
 settings => {
-  initsystem => $::initsystem
-}
+  initsystem => $::initsystem,
+},
 }
 
 file { '/usr/share/diamond/collectors/servicestats/servicestats_lib.py':
diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index f717f2f..79284c2 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -131,15 +131,15 @@
   'TCPFastOpenActive', 'TCPFastOpenActiveFail',
   'TCPFastOpenPassive', 'TCPFastOpenPassiveFail',
   'TCPFastOpenListenOverflow', 'TCPFastOpenCookieReqd',
-  'TCPSynRetrans', 'TCPOrigDataSent'
+  'TCPSynRetrans', 'TCPOrigDataSent',
 ],
 gauges=> [
   'CurrEstab', 'MaxConn',
   'TCPFastOpenActive', 'TCPFastOpenActiveFail',
   'TCPFastOpenPassive', 'TCPFastOpenPassiveFail',
-  'TCPFastOpenListenOverflow', 'TCPFastOpenCookieReqd'
+  'TCPFastOpenListenOverflow', 'TCPFastOpenCookieReqd',
 ],
-}
+},
 }
 
 diamond::collector { 'Ntpd': }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Jenkins job validation (DO NOT SUBMIT)

2017-01-14 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332030 )

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

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I78f8d59ed5f4dc8977e4b8c482fd773a5dd0281c
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/332030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78f8d59ed5f4dc8977e4b8c482fd773a5dd0281c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-01-14T10:00:01+0000

2017-01-14 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332033 )

Change subject: New Wikidata Build - 2017-01-14T10:00:01+
..

New Wikidata Build - 2017-01-14T10:00:01+

Change-Id: I4b7436067c353a850b201df24c79f465080da03a
---
M composer.lock
M extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php
M extensions/Wikibase/client/includes/Hooks/NoLangLinkHandler.php
M extensions/Wikibase/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/includes/ClaimSummaryBuilder.php
M extensions/Wikibase/repo/includes/Content/ItemContent.php
M extensions/Wikibase/repo/includes/Content/PropertyContent.php
M extensions/Wikibase/repo/includes/Hooks/LabelPrefetchHookHandlers.php
M extensions/Wikibase/repo/includes/Specials/SpecialSetSiteLink.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/Specials/SpecialSetSiteLinkTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/ValueParserFactoryTest.php
M vendor/composer/installed.json
13 files changed, 153 insertions(+), 69 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index cb78ea3..72b8c61 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1606,12 +1606,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "1b3dcf8d1315722793a0354e00e636dcad2b6a4c"
+"reference": "97b8f7fc8d7391ac4b6df0eb25faea0fe7fdd008"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/1b3dcf8d1315722793a0354e00e636dcad2b6a4c;,
-"reference": "1b3dcf8d1315722793a0354e00e636dcad2b6a4c",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/97b8f7fc8d7391ac4b6df0eb25faea0fe7fdd008;,
+"reference": "97b8f7fc8d7391ac4b6df0eb25faea0fe7fdd008",
 "shasum": ""
 },
 "require": {
@@ -1686,7 +1686,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2017-01-12 14:42:28"
+"time": "2017-01-13 17:12:25"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git 
a/extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php 
b/extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php
index 32f348a..28196c4 100644
--- a/extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php
+++ b/extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php
@@ -44,8 +44,11 @@
 */
private $jobScheduler;
 
+   /**
+* @return self
+*/
public static function newFromGlobalState() {
-   return new DataUpdateHookHandlers(
+   return new self(

WikibaseClient::getDefaultInstance()->getStore()->getUsageUpdater(),
JobQueueGroup::singleton()
);
diff --git a/extensions/Wikibase/client/includes/Hooks/NoLangLinkHandler.php 
b/extensions/Wikibase/client/includes/Hooks/NoLangLinkHandler.php
index 4803a49..1de6693 100644
--- a/extensions/Wikibase/client/includes/Hooks/NoLangLinkHandler.php
+++ b/extensions/Wikibase/client/includes/Hooks/NoLangLinkHandler.php
@@ -43,6 +43,9 @@
$handler->doHandle( $parser, $langs );
}
 
+   /**
+* @return self
+*/
private static function newFromGlobalState() {
$wikibaseClient = WikibaseClient::getDefaultInstance();
$settings = $wikibaseClient->getSettings();
@@ -52,7 +55,7 @@
$settings->getSetting( 'namespaces' )
);
 
-   return new NoLangLinkHandler( $namespaceChecker );
+   return new self( $namespaceChecker );
}
 
public function __construct( NamespaceChecker $namespaceChecker ) {
diff --git 
a/extensions/Wikibase/client/includes/Hooks/ParserOutputUpdateHookHandlers.php 
b/extensions/Wikibase/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
index 0620588..ddaeea5 100644
--- 
a/extensions/Wikibase/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
+++ 
b/extensions/Wikibase/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
@@ -37,13 +37,16 @@
 */
private $parserOutputDataUpdater;
 
+   /**
+* @return self
+*/
public static function newFromGlobalState() {
global $wgLang;
StubUserLang::unstub( $wgLang );
 
$wikibaseClient = WikibaseClient::getDefaultInstance();
 
-   return new

[MediaWiki-commits] [Gerrit] mediawiki...UIFeedback[master]: Fix extension UIFeedback failing tests

2017-01-14 Thread DatGuy (Code Review)

DatGuy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332036 )

Change subject: Fix extension UIFeedback failing tests
..

Fix extension UIFeedback failing tests

Extension UIFeedback failing tests due to missing apihelp messages

Bug: T155048
Change-Id: I075200d35e5c2eb9eae85636a70d30b3818fcfd9
---
M ApiUiFeedback.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 54 insertions(+), 36 deletions(-)


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

diff --git a/ApiUiFeedback.php b/ApiUiFeedback.php
index 2c9b06d..078 100644
--- a/ApiUiFeedback.php
+++ b/ApiUiFeedback.php
@@ -151,11 +151,7 @@
 
}
 
-   // Description
-   public function getDescription() {
-   return 'This Api handles requests from the UIFeedback 
Extension';
-   }
-
+   // apihelp-related stuff
// parameter.
public function getAllowedParams() {
return array(
@@ -206,38 +202,14 @@
);
}
 
-   // Describe the parameter
-   public function getParamDescription() {
-   return array_merge( parent::getParamDescription(), array(
-   'mode'   => 'method to use in the api 
(feedback, review, count)',
-   'ui-feedback-anonymous'  => 'true, if the user want to 
post the feedback privately',
-   'ui-feedback-username'   => 'the username of the user ',
-   'ui-feedback-notify' => '1, if the user wants be be 
notified about updated on this issue',
-   'ui-feedback-task'   => 'the task (position in the 
list of tasks)',
-   'ui-feedback-task-other' => 'free text, if other is 
selected in task',
-   'ui-feedback-done'   => '0: no, 1: yes, undefined',
-   'ui-feedback-type'   => '0: Screenshot, 1: 
Questionnaire',
-   'ui-feedback-url'=> 'the url from where the 
feedback came',
-   'ui-feedback-importance' => 'an integer for the 
importance, 0-5',
-   'ui-feedback-happened'   => '0 unknown, 1 not expected, 
2 confused, 3 missing feature, 4 other',
-   'ui-feedback-text1'  => 'the comment (free text)',
-   'ui-feedback-useragent'  => 'the useragent',
-   'file'   => 'binary data (the rendered 
png)',
-   'id' => 'for review-mode: 
feedback-id',
-   'status' => 'for review-mode: 
review-status',
-   'comment'=> 'for review-mode: 
review-comment',
-   'type'   => 'type of stat-request',
-   'click'  => '',
-   'show'   => '',
-   'sent'   => '',
-   ) );
-   }
-
-   // Get examples
// TODO
-   public function getExamples() {
+   /**
+   * @see ApiBase::getExamplesMessages()
+   */
+   protected function getExamplesMessages() {
return array(
-   'api.php?action=apisampleoutput=O_o=xml' => 
'Get a sideways look (and the usual predictions)'
+   'api.php?action=apisampleoutput=O_o=xml' 
+   => 'apihelp-uifeedback-example'
);
}
 }
diff --git a/i18n/en.json b/i18n/en.json
index fc8de1a..0cd700f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -104,5 +104,28 @@
"ui-feedback-special-screenshot-error": "something went wrong finding 
the screenshot",
"ui-feedback-special-review": "Review",
"ui-feedback-special-previous-notes": "Previous Notes",
-   "ui-feedback-special-info": "Info"
+   "ui-feedback-special-info": "Info",
+   "apihelp-uifeedback-description": "This Api handles requests from the 
UIFeedback Extension",
+   "apihelp-uifeedback-example": "Get a sideways look (and the usual 
predictions)",
+   "apihelp-uifeedback-param-mode": "method to use in the api (feedback, 
review, count)",
+   "apihelp-uifeedback-param-ui-feedback-anonymous": "true, if the user 
want to post the feedback privately",
+   "apihelp-uifeedback-param-ui-feedback-username": "the username of the 
user ",
+   "apihelp-uifeedback-param-ui-feedback-notify": "1, if the user wants be 
be notified about updated on this issue",
+   "apihelp-uifeedback-param-ui-feedback-task": "the task (position in the 
list of tasks)",
+   "apihelp-uifeedback-param-ui-feedback-task-other": "free text, if other 
is selected in task",
+   "apihelp-uifeedback-param-ui-feedback-done": "0: no, 1: yes, undefined",
+

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_21]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332024 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
(cherry picked from commit 9119233629673d4370992463aa94628526cdca41)
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 11049ae..b067786 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_21
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_22]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332023 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
(cherry picked from commit 9119233629673d4370992463aa94628526cdca41)
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 11049ae..b067786 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_22
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ImageTweaks[master]: Fix extension ImageTweaks failing tests

2017-01-14 Thread DatGuy (Code Review)

DatGuy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332038 )

Change subject: Fix extension ImageTweaks failing tests
..

Fix extension ImageTweaks failing tests

Extension ImageTweaks failing tests due to missing apihelp messages

Bug: T155049
Change-Id: I30c45582f499a67bf83c896427ab9bcd53367f6d
---
M ApiImageTweaks.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 19 insertions(+), 6 deletions(-)


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

diff --git a/ApiImageTweaks.php b/ApiImageTweaks.php
index 7fc9727..6be4646 100644
--- a/ApiImageTweaks.php
+++ b/ApiImageTweaks.php
@@ -109,10 +109,9 @@
);
}
 
-   public function getDescription() {
-   return 'Create a derivative image based on an image already on 
the wiki. Note: There is a strong likelihood that you will go over the URL 
length limit with a request to this API module, so you should use a POST 
request instead.';
-   }
-
+   /**
+   * @deprecated since MediaWiki core 1.25
+   */
public function getExamples() {
return array(
);
diff --git a/i18n/en.json b/i18n/en.json
index 2fccee6..c192e61 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,5 +17,12 @@
"imagetweaks-editor-flip-h": "Flip horizontally",
"imagetweaks-editor-crop": "Crop",
"imagetweaks-editor-crop-button": "Crop",
-   "imagetweaks-editor-cancel": "Cancel"
+   "imagetweaks-editor-cancel": "Cancel",
+   "apihelp-imagetweaks-description": "Create a derivative image based on 
an image already on the wiki. Note: There is a strong likelihood that you will 
go over the URL length limit with a request to this API module, so you should 
use a POST request instead.",
+   "apihelp-imagetweaks-param-text": "Initial page text for new files.",
+   "apihelp-imagetweaks-param-comment": "Upload comment. Also used as the 
initial page text for new files if $1text is not specified.",
+   "apihelp-imagetweaks-param-file": "File contents.",
+   "apihelp-imagetweaks-param-destfile": "Target file.",
+   "apihelp-imagetweaks-param-filters": "What filters to add to the 
image.",
+   "apihelp-imagetweaks-param-stash": "If set, the server will stash the 
file temporarily instead of adding it to the repository."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a685189..21c9fac 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -20,5 +20,12 @@
"imagetweaks-editor-flip-h": "Button for flipping an image horizontally 
(over the Y axis) in the image editor.",
"imagetweaks-editor-crop": "Opens a cropping interface in the image 
editor.\n{{Identical|Crop}}",
"imagetweaks-editor-crop-button": "Finishes a crop in the image 
editor.\n{{Identical|Crop}}",
-   "imagetweaks-editor-cancel": "Cancels an interactive editing action, 
like cropping.\n{{Identical|Cancel}}"
+   "imagetweaks-editor-cancel": "Cancels an interactive editing action, 
like cropping.\n{{Identical|Cancel}}",
+   "apihelp-imagetweaks-description": 
"{{doc-apihelp-description|imagetweaks}}",
+   "apihelp-imagetweaks-param-text": 
"{{doc-apihelp-param|imagetweaks|text}}",
+   "apihelp-imagetweaks-param-comment": 
"{{doc-apihelp-param|imagetweaks|comment}}",
+   "apihelp-imagetweaks-param-file": 
"{{doc-apihelp-param|imagetweaks|file}}",
+   "apihelp-imagetweaks-param-destfile": 
"{{doc-apihelp-param|imagetweaks|destfile}}",
+   "apihelp-imagetweaks-param-filters": 
"{{doc-apihelp-param|imagetweaks|filters}}",
+   "apihelp-imagetweaks-param-stash": 
"{{doc-apihelp-param|imagetweaks|stash}}"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30c45582f499a67bf83c896427ab9bcd53367f6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageTweaks
Gerrit-Branch: master
Gerrit-Owner: DatGuy 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix typo in i18n message "wdqs-app-editor-addprefixes"

2017-01-14 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332042 )

Change subject: Fix typo in i18n message "wdqs-app-editor-addprefixes"
..

Fix typo in i18n message "wdqs-app-editor-addprefixes"

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


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/42/332042/1

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 793f3f1..61193b3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -41,7 +41,7 @@
"wdqs-app-result-formatter-title-datetime": "Tooltip shown on dates in 
the table result view",
"wdqs-app-shorturl-page-title": "Title of link message on the left side 
of the editor",
"wdqs-app-editor-placeholder": "Placeholder message in editor box",
-   "wdqs-app-editor-addprefixes": "Butten message in the prefix menu",
+   "wdqs-app-editor-addprefixes": "Button message in the prefix menu",
"wdqs-dialog-examples-preview-query": "Label to preview query in 
example dialog",
"wdqs-dialog-examples-preview-result": "Label to preview result in 
example dialog",
"wdqs-ve-find": "Label to find some item\n{{Identical|Find}}",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05681f09b3d50f3300f76c780d1b9684ad958265
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Fix and improve default regexes

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329761 )

Change subject: Fix and improve default regexes
..


Fix and improve default regexes

- Remove superfluous flags.
- Clean up 'header' using multiline.
- Expand 'pre' and 'table' to support HTML attributes (mostly 'style').
- Update 'property' to support parameters (currently, it supports
  "|from=" but it might support more in the future).
- Localize 'property' and 'invoke' using magic words.
- Add singleline to 'invoke'.

Change-Id: Ib805bf70cb1cc99711138d7d6c7e40971f31b602
---
M pywikibot/textlib.py
1 file changed, 10 insertions(+), 8 deletions(-)

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



diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 9f7782e..dce6608 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -221,13 +221,13 @@
 _regex_cache.update({
 'comment':  re.compile(r'(?s)'),
 # section headers
-'header':   re.compile(r'\r?\n=+.+=+ *\r?\n'),
+'header':   re.compile(r'(?m)^=+.+=+ *$'),
 # preformatted text
-'pre':  re.compile(r'(?ism).*?'),
+'pre':  re.compile(r'(?is)].*?'),
 'source':   re.compile(r'(?is)'),
-'score':re.compile(r'(?ism)].*?'),
+'score':re.compile(r'(?is)].*?'),
 # inline references
-'ref':  re.compile(r'(?ism)].*?'),
+'ref':  re.compile(r'(?is)].*?'),
 'template': NESTED_TEMPLATE_REGEX,
 # lines that start with a space are shown in a monospace font and
 # have whitespace preserved.
@@ -235,7 +235,7 @@
 # tables often have whitespace that is used to improve wiki
 # source code readability.
 # TODO: handle nested tables.
-'table':re.compile(r'(?ims)^{\|.*?^\|}|.*?'),
+'table':re.compile(r'(?ims)^{\|.*?^\|}|].*?'),
 'hyperlink':compileLinkR(),
 'gallery':  re.compile(r'(?is).*?'),
 # this matches internal wikilinks, but also interwiki, categories, and
@@ -247,11 +247,13 @@
  site.validLanguageLinks() +
  list(site.family.obsolete.keys(,
 # Wikibase property inclusions
-'property': re.compile(r'(?i)\{\{\s*#property:\s*p\d+\s*\}\}'),
+'property': (r'(?i)\{\{\s*\#(?:%s):\s*p\d+.*?\}\}',
+ lambda site: 
'|'.join(site.getmagicwords('property'))),
 # Module invocations (currently only Lua)
-'invoke':   re.compile(r'(?i)\{\{\s*#invoke:.*?}\}'),
+'invoke':   (r'(?is)\{\{\s*\#(?:%s):.*?\}\}',
+ lambda site: '|'.join(site.getmagicwords('invoke'))),
 # categories
-'category': ('\[\[ *(?:%s)\s*:.*?\]\]',
+'category': (r'\[\[ *(?:%s)\s*:.*?\]\]',
  lambda site: '|'.join(site.namespaces[14])),
 # files
 'file': (FILE_LINK_REGEX,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib805bf70cb1cc99711138d7d6c7e40971f31b602
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Matěj Suchánek 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Convert space after § to non-breaking spaces

2017-01-14 Thread Harjotsingh (Code Review)

Harjotsingh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332037 )

Change subject: Convert space after § to non-breaking spaces
..

Convert space after § to non-breaking spaces

Bug: T119463
Change-Id: I2b68849bcacbc356cafa2a35cf570379284fef4f
---
M includes/parser/Parser.php
M tests/parser/parserTests.txt
2 files changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/332037/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 79fc172..9fedff4 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1339,6 +1339,7 @@
'/(.) (?=\\?|:|;|!|%|\\302\\273)/' => '\\1',
# french spaces, Guillemet-right
'/(\\302\\253) /' => '\\1',
+   '/(§) (.)/' => '§', # Bug T119463
'/(!\s*important)/' => ' \\1', # Beware of CSS 
magic word !important, T13874.
];
$text = preg_replace( array_keys( $fixtags ), array_values( 
$fixtags ), $text );
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 3853a12..9ca617a 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -2406,6 +2406,14 @@
 !! end
 
 !! test
+Non-breaking spaces after §
+!! wikitext
+U.S § 152
+!! html
+U.S §152
+!! end
+
+!! test
 HTML pre followed by indent-pre
 !! wikitext
 foo

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [XenForoAuth] Make unit test voting

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332039 )

Change subject: [XenForoAuth] Make unit test voting
..

[XenForoAuth] Make unit test voting

Passed on I891d4c666c33cad149310c396fc98d401d661d6e and experimental on
Ic489c8b846b6468232aef5ef04a40ef84cadec33

Change-Id: I981002968131424102230665816a40ba0f39bbe0
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/39/332039/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3e036e4..86d4aa3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7678,7 +7678,7 @@
   - name: mediawiki/extensions/XenForoAuth
 template:
   - name: composer-test
-  - name: extension-unittests-composer-non-voting
+  - name: extension-unittests-composer
   - name: npm
 check:
   - jsonlint

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...citoid[master]: Added verification to PMCID and PMID parameters in "addPubMe...

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331879 )

Change subject: Added verification to PMCID and PMID parameters in 
"addPubMedIndentifiers"
..


Added verification to PMCID and PMID parameters in "addPubMedIndentifiers"

Bug: T149513
Change-Id: I7695e65efb7019ab4f161d258e50c49f9c792bd8
---
M lib/Exporter.js
M test/features/scraping/index.js
2 files changed, 22 insertions(+), 6 deletions(-)

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



diff --git a/lib/Exporter.js b/lib/Exporter.js
index 895e263..942e60e 100644
--- a/lib/Exporter.js
+++ b/lib/Exporter.js
@@ -276,6 +276,8 @@
 var citation = cr.response.body[0];
 var gotData = false; // Whether or not we retrieved any useful data from 
PubMed
 
+var rePMCID = new RegExp('\\bPMC\\d{7}\\b');
+var rePMID = new RegExp('^[1-9]\\d{0,7}\\b');
 // Try to get PMCID or PMID from extra field
 if ((!citation.PMCID || !citation.PMID) && citation.extra) {
 //get pmid from extra fields
@@ -283,8 +285,10 @@
 for (var f in extraFields) {
 //could add them all, but let's not do this in case of conflicting 
fields
 var keyValue = extraFields[f].split(': ');
-if (keyValue[0] === 'PMID' || keyValue[0] === 'PMCID') {
-citation[keyValue[0]] = keyValue[1].trim().replace('PMC','');
+if (keyValue[0] === 'PMID' && keyValue[1].trim().match(rePMID)) {
+  citation['PMID'] = keyValue[1].trim();
+} else if (keyValue[0] === 'PMCID' && 
keyValue[1].trim().match(rePMCID)) {
+  citation['PMCID'] = keyValue[1].trim();
 }
 }
 }
@@ -295,7 +299,7 @@
 }
 
 // Fill in remaining IDs from pubmed api
-return pubMedRequest((citation.DOI || (citation.PMCID ? "PMC" + 
citation.PMCID : false) || citation.PMID),
+return pubMedRequest((citation.DOI || (citation.PMCID ? citation.PMCID : 
false) || citation.PMID),
 userAgent, defaultLogger).then(function(results){
 if (!citation.PMID && results.records[0].pmid){
 gotData = true;
@@ -303,7 +307,7 @@
 }
 if (!citation.PMCID && results.records[0].pmcid) {
 gotData = true;
-citation.PMCID = results.records[0].pmcid.replace('PMC','');
+citation.PMCID = results.records[0].pmcid;
 }
 if (!citation.DOI && results.records[0].doi) {
 gotData = true;
@@ -599,4 +603,4 @@
 module.exports.fixURL = fixURL;
 
 module.exports.validateISSN = validateISSN;
-module.exports.validateISBN = validateISBN;
\ No newline at end of file
+module.exports.validateISBN = validateISBN;
diff --git a/test/features/scraping/index.js b/test/features/scraping/index.js
index ddd3ca6..c3b92d7 100644
--- a/test/features/scraping/index.js
+++ b/test/features/scraping/index.js
@@ -97,7 +97,19 @@
 assert.deepEqual(res.body[0].publicationTitle, undefined); //TODO: 
Investigate why this is undefined
 });
 });
+it('PMCID but no PMID', function() {
+
+it('webpage', function() {
+return server.query('PMC2096233',
+'mediawiki', 'en', 'true').then(function(res) {
+assert.status(res, 200);
+console.log(res);
+assert.deepEqual(!!res.body[0].PMCID, true, 'PMC2096233');
+assert.deepEqual(res.body[0].PMID, undefined, 'PMID is null');
+});
+});
+
+});
 
 
 });
-

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Jenkins job validation (DO NOT SUBMIT)

2017-01-14 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332029 )

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

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I78f8d59ed5f4dc8977e4b8c482fd773a5dd0281c
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/332029/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/jenkins.php
@@ -0,0 +1 @@
+https://gerrit.wikimedia.org/r/332029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78f8d59ed5f4dc8977e4b8c482fd773a5dd0281c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [OnlineStatusBar] Make unit test voting

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332028 )

Change subject: [OnlineStatusBar] Make unit test voting
..


[OnlineStatusBar] Make unit test voting

Unit test was fixed with I0858ddd3412db9d0ac3bc08bcbe68dfa8405e0de

Change-Id: Id13c4a3b1fe0779722bae70a9cc732cd1142ca5a
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f16cbee..3e036e4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6079,7 +6079,7 @@
 template:
   - name: jshint
   - name: jsonlint
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: npm
 
   - name: mediawiki/extensions/OnlyRecentRecentChanges

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id13c4a3b1fe0779722bae70a9cc732cd1142ca5a
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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] mediawiki/core[master]: Allow CJK languages to specify flag spacing for enhanced cha...

2017-01-14 Thread TTO (Code Review)

TTO has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332031 )

Change subject: Allow CJK languages to specify flag spacing for enhanced change 
lists
..

Allow CJK languages to specify flag spacing for enhanced change lists

Even in a monospaced font, the width of a regular space (U+0020) is not the
same as the width of a CJK character. This causes enhanced changes lists,
like RecentChanges, to appear jagged/misaligned, because the different
flag markers at the beginning of each line do not align.

This change gives CJK languages the opportunity to specify a custom space
character to use for aligning the flags.

The $nothing parameter to ChangesList::recentChangesFlags is set to '' in
a few extensions, but other than that it is not used, so it is safe to
change it to a boolean.

Bug: T135575
Change-Id: I4ddc1499ee18320e645c935806b44e2226ef5ab4
---
M includes/DefaultSettings.php
M includes/changes/ChangesList.php
M includes/changes/OldChangesList.php
M languages/i18n/en.json
M languages/i18n/qqq.json
5 files changed, 40 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/332031/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 856a3f9..6193503 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6802,6 +6802,9 @@
  * $wgRecentChangesFlags['flag'] => [
  *   // message for the letter displayed next to rows on changes lists
  *   'letter' => 'letter-msg',
+ *   // message for the space displayed in the corresponding "column" in
+ *   // change rows which do not have this flag
+ *   'space' => 'space-msg',
  *   // message for the tooltip of the letter
  *   'title' => 'tooltip-msg',
  *   // optional (defaults to 'tooltip-msg'), message to use in the legend box
@@ -6820,12 +6823,14 @@
 $wgRecentChangesFlags = [
'newpage' => [
'letter' => 'newpageletter',
+   'space' => 'newpagespace',
'title' => 'recentchanges-label-newpage',
'legend' => 'recentchanges-legend-newpage',
'grouping' => 'any',
],
'minor' => [
'letter' => 'minoreditletter',
+   'space' => 'minoreditspace',
'title' => 'recentchanges-label-minor',
'legend' => 'recentchanges-legend-minor',
'class' => 'minoredit',
@@ -6833,6 +6838,7 @@
],
'bot' => [
'letter' => 'boteditletter',
+   'space' => 'boteditspace',
'title' => 'recentchanges-label-bot',
'legend' => 'recentchanges-legend-bot',
'class' => 'botedit',
@@ -6840,6 +6846,7 @@
],
'unpatrolled' => [
'letter' => 'unpatrolledletter',
+   'space' => 'unpatrolledspace',
'title' => 'recentchanges-label-unpatrolled',
'legend' => 'recentchanges-legend-unpatrolled',
'grouping' => 'any',
diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 77038ed..6949b9b 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -132,16 +132,19 @@
 
/**
 * Returns the appropriate flags for new page, minor change and 
patrolling
+*
 * @param array $flags Associative array of 'flag' => Bool
-* @param string $nothing To use for empty space
+* @param bool $blanksAsSpaces Set to false for no blanks between 
flags. This
+*   parameter was a string before 1.29, so some callers set it to an 
empty
+*   string for the same effect as passing false.
 * @return string
 */
-   public function recentChangesFlags( $flags, $nothing = '' ) {
+   public function recentChangesFlags( $flags, $blanksAsSpaces = true ) {
$f = '';
foreach ( array_keys( $this->getConfig()->get( 
'RecentChangesFlags' ) ) as $flag ) {
-   $f .= isset( $flags[$flag] ) && $flags[$flag]
-   ? self::flag( $flag, $this->getContext() )
-   : $nothing;
+   if ( $blanksAsSpaces || ( isset( $flags[$flag] ) && 
$flags[$flag] ) ) {
+   $f .= self::flag( $flag, $this->getContext(), 
isset( $flags[$flag] ) && $flags[$flag] );
+   }
}
 
return $f;
@@ -176,14 +179,17 @@
}
 
/**
-* Make an "" element for a given change flag. The flag 
indicating a new page, minor edit,
-* bot edit, or unpatrolled edit. In English it typically contains "N", 
"m", "b", or "!".
+* Make an "" element for a given change. The flag indicating a 
new page,
+* minor edit, bot edit, or unpatrolled edit. In English it typically 
contains
+* "N",

[MediaWiki-commits] [Gerrit] mediawiki...SpellingApi[master]: Fix extension SpellingApi failing tests

2017-01-14 Thread DatGuy (Code Review)

DatGuy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332032 )

Change subject: Fix extension SpellingApi failing tests
..

Fix extension SpellingApi failing tests

Extension SpellingApi failing tests due to missing apihelp messages

Bug: T155032
Change-Id: I9d3147214f80f0edd321753bdeb58850d38b879d
---
M api/ApiQuerySpellcheck.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 9 insertions(+), 14 deletions(-)


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

diff --git a/api/ApiQuerySpellcheck.php b/api/ApiQuerySpellcheck.php
index 0019043..7b0eace 100644
--- a/api/ApiQuerySpellcheck.php
+++ b/api/ApiQuerySpellcheck.php
@@ -68,15 +68,4 @@
),
);
}
-
-   public function getDescription() {
-   return 'Check the spelling of a text string.';
-   }
-
-   public function getParamDescription() {
-   return array(
-   'text'   => 'Text, the spelling of which you 
want to check.',
-   'langcode'   => 'Language code. The default is the 
the code of $wgContLang.',
-   );
-   }
 }
diff --git a/i18n/en.json b/i18n/en.json
index f62e28b..e65cb21 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,8 @@
"Amire80"
]
},
-   "spellingapi-desc": "Provides an API module for checking spelling"
+   "spellingapi-desc": "Provides an API module for checking spelling",
+   "apihelp-spellingapi-description": "Check the spelling of a text 
string.",
+   "apihelp-spellingapi-param-text": "Text, the spelling of which you want 
to check.",
+   "apihelp-spellingapi-param-langcode": "Language code. The default is 
the the code of $wgContLang."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b5f24fe..c762ba9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -7,5 +7,8 @@
"Umherirrender"
]
},
-   "spellingapi-desc": "{{desc|name=Spelling 
Api|url=https://www.mediawiki.org/wiki/Extension:SpellingApi}};
-}
+   "spellingapi-desc": "{{desc|name=Spelling 
Api|url=https://www.mediawiki.org/wiki/Extension:SpellingApi}};,
+   "apihelp-spellingapi-description": 
"{{doc-apihelp-description|spellingapi}}",
+   "apihelp-spellingapi-param-text": 
"{{doc-apihelp-param|spellingapi|text}}",
+   "apihelp-spellingapi-param-langcode": 
"{{doc-apihelp-param|spellingapi|langcode}}"
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d3147214f80f0edd321753bdeb58850d38b879d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpellingApi
Gerrit-Branch: master
Gerrit-Owner: DatGuy 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add custom InterwikiLookup to MediaWikiTitleCodec

2017-01-14 Thread Yurik (Code Review)

Yurik has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332040 )

Change subject: Add custom InterwikiLookup to MediaWikiTitleCodec
..

Add custom InterwikiLookup to MediaWikiTitleCodec

This patch allows for a custom InterwikiLookup service
when constructing MediaWikiTitleCodec instances.
If not specified, it continues to get the service from
MediaWikiServices::getInstance()->getInterwikiLookup().

This patch will allow a fully customized instance
creation, without any global state.

Change-Id: Ica87aff5df4534aae0a32e307b27d88b3df023b4
---
M includes/title/MediaWikiTitleCodec.php
1 file changed, 12 insertions(+), 4 deletions(-)


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

diff --git a/includes/title/MediaWikiTitleCodec.php 
b/includes/title/MediaWikiTitleCodec.php
index 1bf05d9..b7fa36d 100644
--- a/includes/title/MediaWikiTitleCodec.php
+++ b/includes/title/MediaWikiTitleCodec.php
@@ -21,6 +21,7 @@
  * @license GPL 2+
  * @author Daniel Kinzler
  */
+use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Linker\LinkTarget;
 
@@ -52,16 +53,24 @@
protected $localInterwikis;
 
/**
+* @var InterwikiLookup
+*/
+   protected $interwikiLookup;
+
+   /**
 * @param Language $language The language object to use for localizing 
namespace names.
 * @param GenderCache $genderCache The gender cache for generating 
gendered namespace names
 * @param string[]|string $localInterwikis
+* @param InterwikiLookup|null $interwikiLookup
 */
public function __construct( Language $language, GenderCache 
$genderCache,
-   $localInterwikis = []
+   $localInterwikis = [], $interwikiLookup = null
) {
$this->language = $language;
$this->genderCache = $genderCache;
$this->localInterwikis = (array)$localInterwikis;
+   $this->interwikiLookup = $interwikiLookup ? :
+   MediaWikiServices::getInstance()->getInterwikiLookup();
}
 
/**
@@ -310,7 +319,6 @@
if ( preg_match( $prefixRegexp, $dbkey, $m ) ) {
$p = $m[1];
$ns = $this->language->getNsIndex( $p );
-   $interwikiLookup = 
MediaWikiServices::getInstance()->getInterwikiLookup();
if ( $ns !== false ) {
# Ordinary namespace
$dbkey = $m[2];
@@ -320,13 +328,13 @@
if ( 
$this->language->getNsIndex( $x[1] ) ) {
# Disallow Talk:File:x 
type titles...
throw new 
MalformedTitleException( 'title-invalid-talk-namespace', $text );
-   } elseif ( 
$interwikiLookup->isValidInterwiki( $x[1] ) ) {
+   } elseif ( 
$this->interwikiLookup->isValidInterwiki( $x[1] ) ) {
// TODO: get rid of 
global state!
# Disallow 
Talk:Interwiki:x type titles...
throw new 
MalformedTitleException( 'title-invalid-talk-namespace', $text );
}
}
-   } elseif ( $interwikiLookup->isValidInterwiki( 
$p ) ) {
+   } elseif ( 
$this->interwikiLookup->isValidInterwiki( $p ) ) {
# Interwiki link
$dbkey = $m[2];
$parts['interwiki'] = 
$this->language->lc( $p );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica87aff5df4534aae0a32e307b27d88b3df023b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] wikidata...gui[master]: Add explanatory tooltips for GraphResultBrowser display icons

2017-01-14 Thread Divadsn (Code Review)

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332041 )

Change subject: Add explanatory tooltips for GraphResultBrowser display icons
..

Add explanatory tooltips for GraphResultBrowser display icons

Following new i18n messages has been added:
* wdqs-app-resultbrowser-stabilize
* wdqs-app-resultbrowser-hierarchical-lr
* wdqs-app-resultbrowser-hierarchical-ud
* wdqs-app-resultbrowser-hierarchical-rl

Change-Id: I80493f707461c73418b7440dc904505c19910b81
---
M i18n/en.json
M i18n/qqq.json
M wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
3 files changed, 25 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/41/332041/1

diff --git a/i18n/en.json b/i18n/en.json
index f989c61..d1676c2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -40,6 +40,10 @@
 "wdqs-app-shorturl-page-title": "Short URL to this page",
 "wdqs-app-editor-placeholder": "(Input a SPARQL query or choose a query 
example)",
 "wdqs-app-editor-addprefixes": "Add Standard Prefixes",
+"wdqs-app-resultbrowser-stabilize": "Stabilize network",
+"wdqs-app-resultbrowser-hierarchical-lr": "Hierarchical Layout left to 
right",
+"wdqs-app-resultbrowser-hierarchical-ud": "Hierarchical Layout up to down",
+"wdqs-app-resultbrowser-hierarchical-rl": "Hierarchical Layout right to 
left",
 "wdqs-dialog-examples-preview-query": "Preview query",
 "wdqs-dialog-examples-preview-result": "Preview result",
 "wdqs-ve-find": "Find",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 793f3f1..b7d21e6 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -42,6 +42,10 @@
"wdqs-app-shorturl-page-title": "Title of link message on the left side 
of the editor",
"wdqs-app-editor-placeholder": "Placeholder message in editor box",
"wdqs-app-editor-addprefixes": "Butten message in the prefix menu",
+   "wdqs-app-resultbrowser-stabilize": "Button message in graph browser 
toolbar",
+   "wdqs-app-resultbrowser-hierarchical-lr": "Button message in graph 
browser toolbar",
+   "wdqs-app-resultbrowser-hierarchical-ud": "Button message in graph 
browser toolbar",
+   "wdqs-app-resultbrowser-hierarchical-rl": "Button message in graph 
browser toolbar",
"wdqs-dialog-examples-preview-query": "Label to preview query in 
example dialog",
"wdqs-dialog-examples-preview-result": "Label to preview result in 
example dialog",
"wdqs-ve-find": "Label to find some item\n{{Identical|Find}}",
diff --git a/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
index 94b6628..f9c6a17 100644
--- a/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
@@ -87,23 +87,32 @@
 
$( '' ).click( function() {
network.stabilize( 100 );
-   } ).append( '' )
-   .appendTo( $toolbar );
+   } ).append(
+   ''
+   ).appendTo( $toolbar );
 
$( '' ).click( function() {
setLayout( 'LR' );
-   } ).append( '' )
-   .appendTo( $toolbar );
+   } ).append( ''
+   ).appendTo( $toolbar );
 
$( '' ).click( function() {
setLayout( 'UD' );
-   } ).append( '' )
-   .appendTo( $toolbar );
+   } ).append( ''
+   ).appendTo( $toolbar );
 
$( '' ).click( function() {
setLayout( 'RL' );
-   } ).append( '' )
-   .appendTo( $toolbar );
+   } ).append( ''
+   ).appendTo( $toolbar );
 
return $toolbar;
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80493f707461c73418b7440dc904505c19910b81
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [XenForoAuth] Make unit test voting

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332039 )

Change subject: [XenForoAuth] Make unit test voting
..


[XenForoAuth] Make unit test voting

Passed on I891d4c666c33cad149310c396fc98d401d661d6e and experimental on
Ic489c8b846b6468232aef5ef04a40ef84cadec33

Change-Id: I981002968131424102230665816a40ba0f39bbe0
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3e036e4..86d4aa3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7678,7 +7678,7 @@
   - name: mediawiki/extensions/XenForoAuth
 template:
   - name: composer-test
-  - name: extension-unittests-composer-non-voting
+  - name: extension-unittests-composer
   - name: npm
 check:
   - jsonlint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I981002968131424102230665816a40ba0f39bbe0
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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] mediawiki...WikiLexicalData[master]: Use getter instead of property

2017-01-14 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332043 )

Change subject: Use getter instead of property
..

Use getter instead of property

TextContent has the dedicated getter getNativeData() to access to the
object property mText, so let’s use it. I proposed to change the visibility
of the object property, so this extension would be broken if/when the
visibility is changed, but anyway it’s better to access through the getter.

Bug: T155298
Change-Id: I97a7c69a770844949bb4cf3de74b43dd85d4aaf6
---
M includes/api/owAddAnnotation.php
M includes/api/owAddDefinition.php
M includes/api/owAddSyntrans.php
M includes/api/owAddToCollection.php
4 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/includes/api/owAddAnnotation.php b/includes/api/owAddAnnotation.php
index c354e1b..b32c8a3 100644
--- a/includes/api/owAddAnnotation.php
+++ b/includes/api/owAddAnnotation.php
@@ -478,7 +478,7 @@
);
}
 
-   $text = $wikiText->mText;
+   $text = $wikiText->getNativeData();
 
// Check if the page is redirected,
// then adjust accordingly.
@@ -488,7 +488,7 @@
$csvWikiPageTitle = Title::newFromText( $redirectedText 
);
$csvWikiPage = new WikiPage ( $csvWikiPageTitle );
$wikiText = $csvWikiPage->getContent( Revision::RAW );
-   $text = $wikiText->mText;
+   $text = $wikiText->getNativeData();
}
 
$process = array (
diff --git a/includes/api/owAddDefinition.php b/includes/api/owAddDefinition.php
index 90979b4..ce6f6d7 100644
--- a/includes/api/owAddDefinition.php
+++ b/includes/api/owAddDefinition.php
@@ -149,7 +149,7 @@
) )
);
 
-   $text = $wikiText->mText;
+   $text = $wikiText->getNativeData();
 
// Check if the page is redirected,
// then adjust accordingly.
@@ -159,7 +159,7 @@
$csvWikiPageTitle = Title::newFromText( $redirectedText 
);
$csvWikiPage = new WikiPage ( $csvWikiPageTitle );
$wikiText = $csvWikiPage->getContent( Revision::RAW );
-   $text = $wikiText->mText;
+   $text = $wikiText->getNativeData();
}
 
$this->getResult()->addValue( null, $this->getModuleName(),
diff --git a/includes/api/owAddSyntrans.php b/includes/api/owAddSyntrans.php
index 8deae41..365ebe7 100644
--- a/includes/api/owAddSyntrans.php
+++ b/includes/api/owAddSyntrans.php
@@ -192,7 +192,7 @@
) )
);
 
-   $text = $wikiText->mText;
+   $text = $wikiText->getNativeData();
 
// Check if the page is redirected,
// then adjust accordingly.
@@ -202,7 +202,7 @@
$csvWikiPageTitle = Title::newFromText( $redirectedText 
);
$csvWikiPage = new WikiPage ( $csvWikiPageTitle );
$wikiText = $csvWikiPage->getContent( Revision::RAW );
-   $text = $wikiText->mText;
+   $text = $wikiText->getNativeData();
}
 
$this->getResult()->addValue( null, $this->getModuleName(),
diff --git a/includes/api/owAddToCollection.php 
b/includes/api/owAddToCollection.php
index 477de84..8c6e69f 100644
--- a/includes/api/owAddToCollection.php
+++ b/includes/api/owAddToCollection.php
@@ -155,7 +155,7 @@
) )
);
 
-   $text = $wikiText->mText;
+   $text = $wikiText->getNativeData();
 
// Check if the page is redirected,
// then adjust accordingly.
@@ -165,7 +165,7 @@
$csvWikiPageTitle = Title::newFromText( $redirectedText 
);
$csvWikiPage = new WikiPage ( $csvWikiPageTitle );
$wikiText = $csvWikiPage->getContent( Revision::RAW );
-   $text = $wikiText->mText;
+   $text = $wikiText->getNativeData();
}
 
$this->getResult()->addValue( null, $this->getModuleName(),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97a7c69a770844949bb4cf3de74b43dd85d4aaf6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Seb35 

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...WhitelistPages[master]: Version 0.5.0: rewritten to use the TitleReadWhitelist hook

2017-01-14 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332045 )

Change subject: Version 0.5.0: rewritten to use the TitleReadWhitelist hook
..

Version 0.5.0: rewritten to use the TitleReadWhitelist hook

Old PHP entry point dropped, a modern MW (1.25+) is now required to use
this extension.

Change-Id: I7e21e9b67f38a4c7ad1899cbbc80d7aed1bd292e
---
M WhitelistPages.class.php
D WhitelistPages.php
M extension.json
3 files changed, 18 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WhitelistPages 
refs/changes/45/332045/1

diff --git a/WhitelistPages.class.php b/WhitelistPages.class.php
index 7f771ab..9db878e 100644
--- a/WhitelistPages.class.php
+++ b/WhitelistPages.class.php
@@ -6,38 +6,40 @@
  * @ingroup Extensions
  * @author Jack Phoenix 
  * @author Misza 
- * @date 19 November 2015
+ * @date 21 December 2016
  * @license https://en.wikipedia.org/wiki/Public_domain Public domain
  */
 
 class WhitelistPages {
 
-   public static function main() {
-   global $wgWhitelistRead, $wgGroupPermissions;
+   /**
+* @param Title $title Title object being checked against
+* @param User $user Current user object
+* @param bool &$whitelisted Whether this title is whitelisted
+*/
+   public static function onTitleReadWhitelist( $title, $user, 
&$whitelisted ) {
+   global $wgGroupPermissions;
 
$message = wfMessage( 'public_read_whitelist' 
)->inContentLanguage();
 
-   // If MediaWiki:Public read whitelist is empty, bail out
+   // If [[MediaWiki:Public read whitelist]] is empty, bail out
if ( $message->isDisabled() ) {
-   return;
+   return true;
}
 
// If anonymous users can read the wiki, then it's not a 
private one
// and we don't need this feature for non-private wikis
if ( $wgGroupPermissions['*']['read'] ) {
-   return;
-   }
-
-   // $wgWhitelistRead is *false* by default instead of being an 
empty array
-   if ( $wgWhitelistRead === false ) {
-   $wgWhitelistRead = array();
+   return true;
}
 
// Explode along newlines
$whitelistedPages = explode( "\n", trim( $message->plain() ) );
+   if ( in_array( $title->getPrefixedText(), $whitelistedPages ) ) 
{
+   $whitelisted = true;
+   }
 
-   // Merge with current list
-   $wgWhitelistRead = array_merge( $wgWhitelistRead, 
$whitelistedPages );
+   return true;
}
 
 }
\ No newline at end of file
diff --git a/WhitelistPages.php b/WhitelistPages.php
deleted file mode 100644
index 7186bac..000
--- a/WhitelistPages.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
- * @author Misza 
- * @date 19 November 2015
- * @license https://en.wikipedia.org/wiki/Public_domain Public domain
- */
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'Whitelist Pages',
-   'author' => array( 'Jack Phoenix', 'Misza' ),
-   'version' => '0.4.0',
-   'descriptionmsg' => 'whitelistpages-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:Whitelist_Pages',
-);
-
-$wgMessagesDirs['WhitelistPages'] = __DIR__ . '/i18n';
-
-$wgAutoloadClasses['WhitelistPages'] = __DIR__ . '/WhitelistPages.class.php';
-
-$wgExtensionFunctions[] = 'WhitelistPages::main';
diff --git a/extension.json b/extension.json
index 1c2596c..a9bee68 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "Whitelist Pages",
-   "version": "0.4.0",
+   "version": "0.5.0",
"author": [
"Jack Phoenix",
"Misza"
@@ -16,8 +16,8 @@
"AutoloadClasses": {
"WhitelistPages": "WhitelistPages.class.php"
},
-   "ExtensionFunctions": [
-   "WhitelistPages::main"
+   "Hooks": [
+   "TitleReadWhitelist": "WhitelistPages::onTitleReadWhitelist"
],
"manifest_version": 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e21e9b67f38a4c7ad1899cbbc80d7aed1bd292e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WhitelistPages
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] wikidata...gui[master]: Fix typo in i18n message "wdqs-app-editor-addprefixes"

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332042 )

Change subject: Fix typo in i18n message "wdqs-app-editor-addprefixes"
..


Fix typo in i18n message "wdqs-app-editor-addprefixes"

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

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/i18n/qqq.json b/i18n/qqq.json
index 793f3f1..61193b3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -41,7 +41,7 @@
"wdqs-app-result-formatter-title-datetime": "Tooltip shown on dates in 
the table result view",
"wdqs-app-shorturl-page-title": "Title of link message on the left side 
of the editor",
"wdqs-app-editor-placeholder": "Placeholder message in editor box",
-   "wdqs-app-editor-addprefixes": "Butten message in the prefix menu",
+   "wdqs-app-editor-addprefixes": "Button message in the prefix menu",
"wdqs-dialog-examples-preview-query": "Label to preview query in 
example dialog",
"wdqs-dialog-examples-preview-result": "Label to preview result in 
example dialog",
"wdqs-ve-find": "Label to find some item\n{{Identical|Find}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05681f09b3d50f3300f76c780d1b9684ad958265
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Inject SpecialMyLanguageFallbackChain dependencies

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332013 )

Change subject: Inject SpecialMyLanguageFallbackChain dependencies
..


Inject SpecialMyLanguageFallbackChain dependencies

Bug: T155286
Change-Id: I4c51a2eb8e620ce89963259b596cfaa0799c67df
---
M repo/Wikibase.php
M repo/includes/Specials/SpecialMyLanguageFallbackChain.php
M repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
3 files changed, 18 insertions(+), 8 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a056e5d..2772e83 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -307,8 +307,11 @@
$wgSpecialPages['ListProperties'] = 
Wikibase\Repo\Specials\SpecialListProperties::class;
$wgSpecialPages['DispatchStats'] = 
Wikibase\Repo\Specials\SpecialDispatchStats::class;
$wgSpecialPages['EntityData'] = 
Wikibase\Repo\Specials\SpecialEntityData::class;
-   $wgSpecialPages['MyLanguageFallbackChain']
-   = Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain::class;
+   $wgSpecialPages['MyLanguageFallbackChain'] = function() {
+   return new 
Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain(
+   
\Wikibase\Repo\WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory()
+   );
+   };
$wgSpecialPages['MergeItems'] = 
Wikibase\Repo\Specials\SpecialMergeItems::class;
$wgSpecialPages['RedirectEntity'] = 
Wikibase\Repo\Specials\SpecialRedirectEntity::class;
 
diff --git a/repo/includes/Specials/SpecialMyLanguageFallbackChain.php 
b/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
index a48bc9a..f3ea890 100644
--- a/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
+++ b/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
@@ -29,15 +29,17 @@
/**
 * @var LanguageFallbackChainFactory
 */
-   private $factory;
+   private $languageFallbackChainFactory;
 
/**
-* @since 0.4
+* @param LanguageFallbackChainFactory $languageFallbackChainFactory
 */
-   public function __construct() {
+   public function __construct(
+   LanguageFallbackChainFactory $languageFallbackChainFactory
+   ) {
parent::__construct( 'MyLanguageFallbackChain' );
 
-   $this->factory = 
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory();
+   $this->languageFallbackChainFactory = 
$languageFallbackChainFactory;
}
 
/**
@@ -77,7 +79,9 @@
 */
public function getLanguageFallbackChain() {
if ( $this->chain === null ) {
-   $this->setLanguageFallbackChain( 
$this->factory->newFromContext( $this->getContext() ) );
+   $this->setLanguageFallbackChain(
+   
$this->languageFallbackChainFactory->newFromContext( $this->getContext() )
+   );
}
return $this->chain;
}
diff --git 
a/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php 
b/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
index ef5075a..b0baa79 100644
--- 
a/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
+++ 
b/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
@@ -4,6 +4,7 @@
 
 use SpecialPageTestBase;
 use Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @covers Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain
@@ -19,7 +20,9 @@
 class SpecialMyLanguageFallbackChainTest extends SpecialPageTestBase {
 
protected function newSpecialPage() {
-   return new SpecialMyLanguageFallbackChain();
+   return new SpecialMyLanguageFallbackChain(
+   
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory()
+   );
}
 
public function testExecute() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c51a2eb8e620ce89963259b596cfaa0799c67df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing

[MediaWiki-commits] [Gerrit] mediawiki...BSSMWConnector[master]: Fix autoload entry

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332047 )

Change subject: Fix autoload entry
..

Fix autoload entry

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BSSMWConnector 
refs/changes/47/332047/1

diff --git a/BSSMWConnector.php b/BSSMWConnector.php
index 4f2ac2d..dcc1b1f 100644
--- a/BSSMWConnector.php
+++ b/BSSMWConnector.php
@@ -17,7 +17,7 @@
 $GLOBALS['wgMessagesDirs']['BSSMWConnectorHooks'] = __DIR__ .'/i18n';
 
 $GLOBALS['wgAutoloadClasses']['BSSMWConnectorHooks'] = 
__DIR__.'/includes/BSSMWConnectorHooks.php';
-$GLOBALS['wgAutoloadClasses']['SMWCNamespaceManager'] = 
__DIR__.'/includes/SMWCNamespaceManager.php';
+$GLOBALS['wgAutoloadClasses']['BSSMWCNamespaceManager'] = 
__DIR__.'/includes/BSSMWCNamespaceManager.php';
 $GLOBALS['wgAutoloadClasses']['BSSFVisualEditor'] = 
__DIR__.'/includes/forminputs/BSSFVisualEditor.php';
 $GLOBALS['wgAutoloadClasses']['BSGridResultPrinter'] = 
__DIR__.'/includes/formats/Grid/BSGridResultPrinter.php';
 $GLOBALS['wgAutoloadClasses']['BSPropertyRegistry'] = 
__DIR__.'/includes/BSPropertyRegistry.php';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbd9d3b805c50f98e765c61aaf6ac6a5ea723063
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BSSMWConnector
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...RSS[master]: Fix support for {{{link}}} in Atom feeds. According to RFC42...

2017-01-14 Thread Dmbaturin (Code Review)

Dmbaturin has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332050 )

Change subject: Fix support for {{{link}}} in Atom feeds. According to RFC4287, 
the  element conveys as "permanent, universally unique identifier for an 
entry or feed." It must be an RFC3987 IRI, which doesn't have to be, and often 
is not a URL. The URL in Atom feed 
..

Fix support for {{{link}}} in Atom feeds.
According to RFC4287, the  element conveys as "permanent, universally unique
identifier for an entry or feed." It must be an RFC3987 IRI, which doesn't have 
to be,
and often is not a URL.
The URL in Atom feed is supposed to be in the href= attribute of the  tag.
Since RSS feeds use  tag content rather than attribute for this, some 
fixup
is necessary.

Change-Id: If41c9874ece434df03a280b31c8e964abdba00f6
---
M RSSData.php
M RSSParser.php
2 files changed, 15 insertions(+), 6 deletions(-)


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

diff --git a/RSSData.php b/RSSData.php
index 9ac81c5..aa3cb99 100644
--- a/RSSData.php
+++ b/RSSData.php
@@ -41,7 +41,21 @@
 * mark up their RSS, some more 
precautions are
 * needed.
 */
-   $bit[$name] = trim( $n->nodeValue );
+   if( $name == "link" ) {
+   /**
+* In Atom feeds, the URL is in 
the href= attribute
+* of the  tag, while in 
RSS it's in the
+* content of the  tag
+*/
+   $href = 
$n->attributes->getNamedItem( "href" )->nodeValue;
+   if( !is_null( $href ) ) {
+   $bit[$name] = trim( 
$href );
+   } else {
+   $bit[$name] = trim( 
$n->nodeValue );
+   }
+   } else {
+   $bit[$name] = trim( 
$n->nodeValue );
+   }
}
}
$this->items[] = $bit;
diff --git a/RSSParser.php b/RSSParser.php
index 5d5759d..4374121 100644
--- a/RSSParser.php
+++ b/RSSParser.php
@@ -395,11 +395,6 @@
foreach ( array_keys( $item ) as $info ) {
if ( $item[$info] != "" ) {
switch ( $info ) {
-   // ATOM  elements and RSS  elements 
are item link urls
-   case 'id':
-   $txt = $this->sanitizeUrl( $item['id'] 
);
-   $renderedItem = str_replace( 
'{{{link}}}', $txt, $renderedItem );
-   break;
case 'link':
$txt = $this->sanitizeUrl( 
$item['link'] );
$renderedItem = str_replace( 
'{{{link}}}', $txt, $renderedItem );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If41c9874ece434df03a280b31c8e964abdba00f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RSS
Gerrit-Branch: master
Gerrit-Owner: Dmbaturin 

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

[MediaWiki-commits] [Gerrit] mediawiki...Material[master]: Remove ext.json

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331880 )

Change subject: Remove ext.json
..


Remove ext.json

It contains only empty messages

17:15:30 Running "banana:Material" (banana) task
17:15:30 >> The "ext" translation has 2 blank translations:
17:15:30 >> The translation of "material-desc" is blank.
17:15:30 >> The translation of "material-guest" is blank.
17:15:30 Warning: Task "banana:Material" failed. Use --force to continue.

Change-Id: Idb1a0742201ebd724d75c10810a987167897948d
---
D i18n/ext.json
1 file changed, 0 insertions(+), 9 deletions(-)

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



diff --git a/i18n/ext.json b/i18n/ext.json
deleted file mode 100644
index c5a03af..000
--- a/i18n/ext.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-   "@metadata": {
-   "authors": [
-   "Fitoschido"
-   ]
-   },
-   "material-desc": "",
-   "material-guest": ""
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb1a0742201ebd724d75c10810a987167897948d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Material
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: SamanthaNguyen 
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] mediawiki...Push[master]: Fix extension Push failing tests

2017-01-14 Thread DatGuy (Code Review)

DatGuy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332044 )

Change subject: Fix extension Push failing tests
..

Fix extension Push failing tests

Extension Push failing tests due to missing apihelp messages

Bug: T155030
Change-Id: I31192102b84f415393e4093d4b9ab924dd24e32f
---
M api/ApiPush.php
M api/ApiPushImages.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 42 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Push 
refs/changes/44/332044/1

diff --git a/api/ApiPush.php b/api/ApiPush.php
index 43da2cb..5d43eae 100644
--- a/api/ApiPush.php
+++ b/api/ApiPush.php
@@ -392,23 +392,22 @@
);
}
 
-   public function getParamDescription() {
-   return array(
-   'page' => 'The names of the page to push. Delimitered 
by |',
-   'targets' => 'The urls of the wikis to push to. 
Delimitered by |',
-   );
-   }
-
-   public function getDescription() {
-   return array(
-   'Pushes the content of one ore more pages to one or 
more target wikis.'
-   );
-   }
-
+   /*
+   * @deprecated since MediaWiki core 1.25
+   */
protected function getExamples() {
return array(
'api.php?action=push=Main 
page=http://en.wikipedia.org/w',
);
}
 
+   /**
+   * @see ApiBase::getExamplesMessages()
+   */
+   protected function getExamplesMessages() {
+   return array(
+   'action=push=Main 
page=http://en.wikipedia.org/w'
+   => 'apihelp-push-example',
+   );
+   }
 }
diff --git a/api/ApiPushImages.php b/api/ApiPushImages.php
index 4f9f733..c7c7cc4 100644
--- a/api/ApiPushImages.php
+++ b/api/ApiPushImages.php
@@ -344,23 +344,22 @@
);
}
 
-   public function getParamDescription() {
-   return array(
-   'images' => 'The names of the images to push. 
Delimitered by |',
-   'targets' => 'The urls of the wikis to push to. 
Delimitered by |',
-   );
-   }
-
-   public function getDescription() {
-   return array(
-   'Pushes the content of one ore more pages to one or 
more target wikis.'
-   );
-   }
-
+   /*
+   * @deprecated since MediaWiki core 1.25
+   */
protected function getExamples() {
return array(

'api.php?action=pushimages=File:Foo.bar=http://en.wikipedia.org/w',
);
}
 
+   /**
+   * @see ApiBase::getExamplesMessages()
+   */
+   protected function getExamplesMessages() {
+   return array(
+   
'action=pushimages=File:Foo.bar=http://en.wikipedia.org/w'
+   => 'apihelp-pushimages-example',
+   );
+   }
 }
diff --git a/i18n/en.json b/i18n/en.json
index 65ecfad..196d304 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -81,5 +81,13 @@
"push-special-pushing-file": "$1: Pushing file $2...",
"push-special-return": "Push more pages",
"push-api-err-nocurl": "cURL is not installed.\nSet 
$egPushDirectFileUploads to false on public wikis, or install cURL for private 
wikis",
-   "push-api-err-nofilesupport": "The local MediaWiki does not have 
support for posting files.\nOn public wikis, set $egPushDirectFileUploads to 
false.\nOn private wikis, apply the patch linked from the Push documentation or 
update MediaWiki itself."
+   "push-api-err-nofilesupport": "The local MediaWiki does not have 
support for posting files.\nOn public wikis, set $egPushDirectFileUploads to 
false.\nOn private wikis, apply the patch linked from the Push documentation or 
update MediaWiki itself.",
+   "apihelp-push-description": "Pushes the content of one ore more pages 
to one or more target wikis.",
+   "apihelp-push-param-page": "The names of the page to push. Delimitered 
by |",
+   "apihelp-push-param-targets": "The urls of the wikis to push to. 
Delimitered by |",
+   "apihelp-push-example": "Push page 'Main page' to the English 
Wikipedia.",
+   "apihelp-pushimages-description": "Pushes the content of one ore more 
pages to one or more target wikis.",
+   "apihelp-pushimages-param-images": "The names of the images to push. 
Delimitered by |",
+   "apihelp-pushimages-param-targets": "The urls of the wikis to push to. 
Delimitered by |",
+   "apihelp-pushimages-example": "Push file 'Foo.bar' to the English 
Wikipedia."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9611d64..49f0f3f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -90,5 +90,13 @@
"push-special-pushing-file": "Parameters:\n* $1 -

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set wgBabelMainCategory for cswikiversity to Uživatel %code%

2017-01-14 Thread Urbanecm (Code Review)

Urbanecm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332046 )

Change subject: Set wgBabelMainCategory for cswikiversity to Uživatel %code%
..

Set wgBabelMainCategory for cswikiversity to Uživatel %code%

Bug: T155301
Change-Id: I08b2a3abb9af97da91e80253f4b84fff205f6044
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 409e7da..317450f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15531,6 +15531,7 @@
'cawiktionary' => 'Usuaris %code%', // T49287
'checkuserwiki' => 'User %code%',
'commonswiki' => 'User %code%',
+   'cswikiversity' => 'Uživatel %code%', // T15530
'enwiki' => 'User %code%',
'enwikibooks' => 'User %code%',
'enwiktionary' => 'User %code%',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikiLexicalData[master]: Remove dead autoload entry

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332049 )

Change subject: Remove dead autoload entry
..

Remove dead autoload entry

NeedsTranslationTo.php not part of this repo

Change-Id: If182212ff00448f00754d919cf3bf9e8732741a6
---
M App.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/App.php b/App.php
index 37125e4..cf3e407 100644
--- a/App.php
+++ b/App.php
@@ -86,7 +86,6 @@
 $wgAutoloadClasses['DefaultWikidataApplication'] = $dir . 
'OmegaWiki/Wikidata.php';
 $wgAutoloadClasses['DefinedMeaning'] = $dir . 'OmegaWiki/DefinedMeaning.php';
 $wgAutoloadClasses['DefinedMeaningModel'] = $dir . 
'OmegaWiki/DefinedMeaningModel.php';
-$wgAutoloadClasses['NeedsTranslationTo'] = $dir . 
'OmegaWiki/NeedsTranslationTo.php';
 $wgAutoloadClasses['Search'] = $dir . 'OmegaWiki/Search.php';
 
 // Special Pages

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If182212ff00448f00754d919cf3bf9e8732741a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [Persona] MOzilla service is now closed

2017-01-14 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332026 )

Change subject: [Persona] MOzilla service is now closed
..

[Persona] MOzilla service is now closed

> Persona is no longer actively developed by Mozilla. Mozilla kept
> operational and security support of the persona.org service until
> November 2016.
> On November 30th, 2016, the persona.org services were shut down.

Bug: T155291
Change-Id: If6b352b208d5dede6733ddde97cb62500729fab1
---
M zuul/layout.yaml
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/26/332026/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 296f05c..c20f246 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6192,13 +6192,6 @@
   - name: extension-unittests-generic
   - name: npm
 
-  - name: mediawiki/extensions/Persona
-template:
-  - name: jshint
-  - name: jsonlint
-  - name: extension-unittests-generic
-  - name: npm
-
   - name: mediawiki/extensions/PGFTikZ
 template:
   - name: jshint

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_24]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332021 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_24
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [Persona] Mozilla service is now closed

2017-01-14 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332026 )

Change subject: [Persona] Mozilla service is now closed
..


[Persona] Mozilla service is now closed

> Persona is no longer actively developed by Mozilla. Mozilla kept
> operational and security support of the persona.org service until
> November 2016.
> On November 30th, 2016, the persona.org services were shut down.

Bug: T155291
Change-Id: If6b352b208d5dede6733ddde97cb62500729fab1
---
M zuul/layout.yaml
1 file changed, 0 insertions(+), 7 deletions(-)



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 296f05c..c20f246 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6192,13 +6192,6 @@
   - name: extension-unittests-generic
   - name: npm
 
-  - name: mediawiki/extensions/Persona
-template:
-  - name: jshint
-  - name: jsonlint
-  - name: extension-unittests-generic
-  - name: npm
-
   - name: mediawiki/extensions/PGFTikZ
 template:
   - name: jshint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6b352b208d5dede6733ddde97cb62500729fab1
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
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] mediawiki...MultiMaps[REL1_23]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332022 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 11049ae..b067786 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_23
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LinkSuggest[master]: Fix extension LinkSuggest failing tests

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332006 )

Change subject: Fix extension LinkSuggest failing tests
..


Fix extension LinkSuggest failing tests

Extension LinkSuggest failing tests due to missing apihelp messages.

Bug: T155027
Change-Id: I5ac529265c7d348aecaf336cffbab875384d61af
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index db41387..77d9fa7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,6 +4,9 @@
},
"apihelp-linksuggest-example-1": "Search for pages in the main 
namespace beginning with Ashley.",
"apihelp-linksuggest-example-2": "Create a thumbnail of 
[[:File:Whatever.jpg]].",
+   "apihelp-linksuggest-description": "Suggest link to editors on edit 
view",
+   "apihelp-linksuggest-param-get": "Get the display",
+   "apihelp-linksuggest-param-query": "Show suggestions of links",
"linksuggest-desc": "Suggests links to editors on edit view",
"tog-disablelinksuggest": "Do not show link suggest"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5294b27..6aa96da 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,6 +8,9 @@
},
"apihelp-linksuggest-example-1": "{{doc-apihelp-example|linksuggest}}",
"apihelp-linksuggest-example-2": "{{doc-apihelp-example|linksuggest}}",
+   "apihelp-linksuggest-description": 
"{{doc-apihelp-description|linksuggest}}",
+   "apihelp-linksuggest-param-get": 
"{{doc-apihelp-param|linksuggest|get}}",
+   "apihelp-linksuggest-param-query": 
"{{doc-apihelp-param|linksuggest|query}}",
"linksuggest-desc": "{{desc|name=Link 
Suggest|url=https://www.mediawiki.org/wiki/Extension:LinkSuggest}};,
"tog-disablelinksuggest": "Used as checkbox label in 
[[Special:Preferences]]."
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ac529265c7d348aecaf336cffbab875384d61af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkSuggest
Gerrit-Branch: master
Gerrit-Owner: DatGuy 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
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] mediawiki/extensions[master]: Unregister archived extensions

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332025 )

Change subject: Unregister archived extensions
..

Unregister archived extensions

NewTalkGlobal: https://www.mediawiki.org/wiki/Extension:NewTalkGlobal
SecureHTML: https://www.mediawiki.org/wiki/Extension:SecureHTML
Persona: https://phabricator.wikimedia.org/T154928#2936722

Change-Id: I261e9a54c0eaebecf1f6831acb5c733a40010f21
---
M .gitmodules
D NewTalkGlobal
D Persona
D SecureHTML
4 files changed, 0 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/25/332025/2

diff --git a/.gitmodules b/.gitmodules
index 7e96535..2d399ee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1530,10 +1530,6 @@
path = NewSignupPage
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NewSignupPage
branch = .
-[submodule "NewTalkGlobal"]
-   path = NewTalkGlobal
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NewTalkGlobal
-   branch = .
 [submodule "NewUserActions"]
path = NewUserActions
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NewUserActions
@@ -1813,10 +1809,6 @@
 [submodule "PerformanceInspector"]
path = PerformanceInspector
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/PerformanceInspector
-   branch = .
-[submodule "Persona"]
-   path = Persona
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Persona
branch = .
 [submodule "Petition"]
path = Petition
@@ -2153,10 +2145,6 @@
 [submodule "SectionDisqus"]
path = SectionDisqus
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SectionDisqus
-   branch = .
-[submodule "SecureHTML"]
-   path = SecureHTML
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SecureHTML
branch = .
 [submodule "SecurePasswords"]
path = SecurePasswords
diff --git a/NewTalkGlobal b/NewTalkGlobal
deleted file mode 16
index 968e4b8..000
--- a/NewTalkGlobal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 968e4b8f7649d930958e29636f0f581212f002b6
diff --git a/Persona b/Persona
deleted file mode 16
index 4c859c8..000
--- a/Persona
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4c859c8f3e000e7fed65f219fe714ec273b40d24
diff --git a/SecureHTML b/SecureHTML
deleted file mode 16
index 57e4ff9..000
--- a/SecureHTML
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 57e4ff990d420a193133e916576225572c9d3b0c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I261e9a54c0eaebecf1f6831acb5c733a40010f21
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Deconfigure NewTalkGlobal and SecureHTML

2017-01-14 Thread Hashar (Code Review)

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332027 )

Change subject: Deconfigure NewTalkGlobal and SecureHTML
..

Deconfigure NewTalkGlobal and SecureHTML

Both are archived extensions per
https://gerrit.wikimedia.org/r/#/c/332025/

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/27/332027/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c20f246..f16cbee 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4319,11 +4319,6 @@
 check:
   - jsonlint
 
-  - name: mediawiki/extensions/NewTalkGlobal
-template:
-  - name: extension-unittests-generic
-  - name: jsonlint
-
   - name: mediawiki/extensions/NewUserActions
 template:
   - name: composer-test
@@ -6557,13 +6552,6 @@
 
   - name: mediawiki/extensions/SectionDisqus
 template:
-  - name: jsonlint
-  - name: extension-unittests-generic
-  - name: npm
-
-  - name: mediawiki/extensions/SecureHTML
-template:
-  - name: jshint
   - name: jsonlint
   - name: extension-unittests-generic
   - name: npm

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [OnlineStatusBar] Make unit test voting

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332028 )

Change subject: [OnlineStatusBar] Make unit test voting
..

[OnlineStatusBar] Make unit test voting

Unit test was fixed with I0858ddd3412db9d0ac3bc08bcbe68dfa8405e0de

Change-Id: Id13c4a3b1fe0779722bae70a9cc732cd1142ca5a
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/28/332028/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c20f246..45f93b7 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6084,7 +6084,7 @@
 template:
   - name: jshint
   - name: jsonlint
-  - name: extension-unittests-non-voting
+  - name: extension-unittests-generic
   - name: npm
 
   - name: mediawiki/extensions/OnlyRecentRecentChanges

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Namespace aliases on Bhojpuri Wikipedia (bhwiki)

2017-01-14 Thread Urbanecm (Code Review)

Urbanecm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332015 )

Change subject: Namespace aliases on Bhojpuri Wikipedia (bhwiki)
..

Namespace aliases on Bhojpuri Wikipedia (bhwiki)

Bug: T155278
Change-Id: I430519c3d349bb4865fde01f225a0ac9eb300a60
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 409e7da..2b1a87a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2799,6 +2799,16 @@
'Author' => 100,
'Author_talk' => 101,
],
+   '+bhwiki' => [ // T155278
+   'बिसेस' => NS_SPECIAL,
+   'सदस्य' => NS_USER,
+   'स' => NS_USER,
+   'सदस्य' => NS_USER,
+   'U' => NS_USER,
+   'वि' => NS_PROJECT,
+   'वि' => NS_PROJECT,
+   'WP' => NS_PROJECT,
+   ],
'+bjnwiki' => [
'Wikipidia_pamandiran' => NS_PROJECT_TALK,
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_26]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332019 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_26
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_28]: Fix openstreetmap tiles url

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332017 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_28
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_27]: Fix openstreetmap tiles url

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332018 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_27
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_21]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332024 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
(cherry picked from commit 9119233629673d4370992463aa94628526cdca41)
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps 
refs/changes/24/332024/1

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 11049ae..b067786 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_21
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Deconfigure NewTalkGlobal and SecureHTML

2017-01-14 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332027 )

Change subject: Deconfigure NewTalkGlobal and SecureHTML
..


Deconfigure NewTalkGlobal and SecureHTML

Both are archived extensions per
https://gerrit.wikimedia.org/r/#/c/332025/

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

Approvals:
  jenkins-bot: Verified



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c20f246..f16cbee 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4319,11 +4319,6 @@
 check:
   - jsonlint
 
-  - name: mediawiki/extensions/NewTalkGlobal
-template:
-  - name: extension-unittests-generic
-  - name: jsonlint
-
   - name: mediawiki/extensions/NewUserActions
 template:
   - name: composer-test
@@ -6557,13 +6552,6 @@
 
   - name: mediawiki/extensions/SectionDisqus
 template:
-  - name: jsonlint
-  - name: extension-unittests-generic
-  - name: npm
-
-  - name: mediawiki/extensions/SecureHTML
-template:
-  - name: jshint
   - name: jsonlint
   - name: extension-unittests-generic
   - name: npm

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id11fae6e6bac9edb3ced9d88e7c722aa39e908be
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Unregister archived extensions

2017-01-14 Thread Hashar (Code Review)

Hashar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332025 )

Change subject: Unregister archived extensions
..


Unregister archived extensions

NewTalkGlobal: https://www.mediawiki.org/wiki/Extension:NewTalkGlobal
SecureHTML: https://www.mediawiki.org/wiki/Extension:SecureHTML
Persona: https://phabricator.wikimedia.org/T154928#2936722

Change-Id: I261e9a54c0eaebecf1f6831acb5c733a40010f21
---
M .gitmodules
D NewTalkGlobal
D Persona
D SecureHTML
4 files changed, 0 insertions(+), 15 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index 7e96535..2d399ee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1530,10 +1530,6 @@
path = NewSignupPage
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NewSignupPage
branch = .
-[submodule "NewTalkGlobal"]
-   path = NewTalkGlobal
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NewTalkGlobal
-   branch = .
 [submodule "NewUserActions"]
path = NewUserActions
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NewUserActions
@@ -1813,10 +1809,6 @@
 [submodule "PerformanceInspector"]
path = PerformanceInspector
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/PerformanceInspector
-   branch = .
-[submodule "Persona"]
-   path = Persona
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Persona
branch = .
 [submodule "Petition"]
path = Petition
@@ -2153,10 +2145,6 @@
 [submodule "SectionDisqus"]
path = SectionDisqus
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SectionDisqus
-   branch = .
-[submodule "SecureHTML"]
-   path = SecureHTML
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SecureHTML
branch = .
 [submodule "SecurePasswords"]
path = SecurePasswords
diff --git a/NewTalkGlobal b/NewTalkGlobal
deleted file mode 16
index 968e4b8..000
--- a/NewTalkGlobal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 968e4b8f7649d930958e29636f0f581212f002b6
diff --git a/Persona b/Persona
deleted file mode 16
index 4c859c8..000
--- a/Persona
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4c859c8f3e000e7fed65f219fe714ec273b40d24
diff --git a/SecureHTML b/SecureHTML
deleted file mode 16
index 57e4ff9..000
--- a/SecureHTML
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 57e4ff990d420a193133e916576225572c9d3b0c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I261e9a54c0eaebecf1f6831acb5c733a40010f21
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...BoilerPlate[master]: Update npm dependencies to latest

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331001 )

Change subject: Update npm dependencies to latest
..


Update npm dependencies to latest

Drop grunt-cli which is now provided by grunt.

Change-Id: I3a62014d189ca18fb9056935f60d6d277abb110b
---
M package.json
1 file changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/package.json b/package.json
index d6d0f28..2d4f37a 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
 "test": "grunt test"
   },
   "devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.3",
-"grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.5.0",
-"grunt-jsonlint": "1.0.7"
+"grunt": "1.0.1",
+"grunt-contrib-jshint": "1.1.0",
+"grunt-banana-checker": "0.5.0",
+"grunt-jscs": "3.0.1",
+"grunt-jsonlint": "1.1.0"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a62014d189ca18fb9056935f60d6d277abb110b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BoilerPlate
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
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] mediawiki...MultiMaps[REL1_27]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332018 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_27
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_28]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332017 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_28
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_23]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332022 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 11049ae..b067786 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_23
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_26]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332019 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps 
refs/changes/19/332019/1

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_26
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[master]: Fix openstreetmap tiles url

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332016 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_24]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332021 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps 
refs/changes/21/332021/1

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_24
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_25]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332020 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_25
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_22]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332023 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
(cherry picked from commit 9119233629673d4370992463aa94628526cdca41)
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 11049ae..b067786 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_22
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[master]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332016 )

Change subject: Fix openstreetmap tiles url
..

Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_25]: Fix openstreetmap tiles url

2017-01-14 Thread Pastakhov (Code Review)

Pastakhov has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332020 )

Change subject: Fix openstreetmap tiles url
..


Fix openstreetmap tiles url

Allow use http and https protocols

Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
---
M services/Leaflet/ext.leaflet.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/services/Leaflet/ext.leaflet.js b/services/Leaflet/ext.leaflet.js
index 8d80495..37e6c91 100644
--- a/services/Leaflet/ext.leaflet.js
+++ b/services/Leaflet/ext.leaflet.js
@@ -140,7 +140,7 @@
map = L.map(element, mapOptions).fitWorld();
 
// add an OpenStreetMap tile layer
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+   L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: ' http://osm.org/copyright;>OpenStreetMap contributors'
}).addTo(map);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76cf8562ffc16894777286682e36b63ef530e3c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiMaps
Gerrit-Branch: REL1_25
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add custom InterwikiLookup to MediaWikiTitleCodec

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332040 )

Change subject: Add custom InterwikiLookup to MediaWikiTitleCodec
..


Add custom InterwikiLookup to MediaWikiTitleCodec

This patch allows for a custom InterwikiLookup service
when constructing MediaWikiTitleCodec instances.
If not specified, it continues to get the service from
MediaWikiServices::getInstance()->getInterwikiLookup().

This patch will allow a fully customized instance
creation, without any global state.

Change-Id: Ica87aff5df4534aae0a32e307b27d88b3df023b4
---
M includes/title/MediaWikiTitleCodec.php
1 file changed, 12 insertions(+), 4 deletions(-)

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



diff --git a/includes/title/MediaWikiTitleCodec.php 
b/includes/title/MediaWikiTitleCodec.php
index 1bf05d9..7a71714 100644
--- a/includes/title/MediaWikiTitleCodec.php
+++ b/includes/title/MediaWikiTitleCodec.php
@@ -21,6 +21,7 @@
  * @license GPL 2+
  * @author Daniel Kinzler
  */
+use MediaWiki\Interwiki\InterwikiLookup;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Linker\LinkTarget;
 
@@ -52,16 +53,24 @@
protected $localInterwikis;
 
/**
+* @var InterwikiLookup
+*/
+   protected $interwikiLookup;
+
+   /**
 * @param Language $language The language object to use for localizing 
namespace names.
 * @param GenderCache $genderCache The gender cache for generating 
gendered namespace names
 * @param string[]|string $localInterwikis
+* @param InterwikiLookup|null $interwikiLookup
 */
public function __construct( Language $language, GenderCache 
$genderCache,
-   $localInterwikis = []
+   $localInterwikis = [], $interwikiLookup = null
) {
$this->language = $language;
$this->genderCache = $genderCache;
$this->localInterwikis = (array)$localInterwikis;
+   $this->interwikiLookup = $interwikiLookup ?:
+   MediaWikiServices::getInstance()->getInterwikiLookup();
}
 
/**
@@ -310,7 +319,6 @@
if ( preg_match( $prefixRegexp, $dbkey, $m ) ) {
$p = $m[1];
$ns = $this->language->getNsIndex( $p );
-   $interwikiLookup = 
MediaWikiServices::getInstance()->getInterwikiLookup();
if ( $ns !== false ) {
# Ordinary namespace
$dbkey = $m[2];
@@ -320,13 +328,13 @@
if ( 
$this->language->getNsIndex( $x[1] ) ) {
# Disallow Talk:File:x 
type titles...
throw new 
MalformedTitleException( 'title-invalid-talk-namespace', $text );
-   } elseif ( 
$interwikiLookup->isValidInterwiki( $x[1] ) ) {
+   } elseif ( 
$this->interwikiLookup->isValidInterwiki( $x[1] ) ) {
// TODO: get rid of 
global state!
# Disallow 
Talk:Interwiki:x type titles...
throw new 
MalformedTitleException( 'title-invalid-talk-namespace', $text );
}
}
-   } elseif ( $interwikiLookup->isValidInterwiki( 
$p ) ) {
+   } elseif ( 
$this->interwikiLookup->isValidInterwiki( $p ) ) {
# Interwiki link
$dbkey = $m[2];
$parts['interwiki'] = 
$this->language->lc( $p );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica87aff5df4534aae0a32e307b27d88b3df023b4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: link scholarship committee and correct link for faq

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332068 )

Change subject: link scholarship committee and correct link for faq
..


link scholarship committee and correct link for faq

Change-Id: Ic8d3f9bbb40771932cfcc969bee3400f453759f6
---
M data/i18n/en.json
M data/templates/base.html
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/data/i18n/en.json b/data/i18n/en.json
index 6c84992..9e0c9a5 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -150,7 +150,7 @@
"form-info-true": "I certify that all of the information provided with 
my application is true and accurate to the best of my knowledge and belief. The 
Wikimedia Foundation reserves the right to require grant recipients to pay back 
all or part of the grant if any of the information I provide is found to be 
untrue or inaccurate.",
 
"form-privacy": "Privacy",
-   "form-review": "All information contained in this application will be 
reviewed by the members of the Wikimania Scholarship Committee. All personal 
information will be held strictly confidential by the Committee, and the https://wikimediafoundation.org/\;>Wikimedia Foundation.",
+   "form-review": "All information contained in this application will be 
reviewed by the members of the https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\;>Wikimania
 Scholarship Committee. All personal information will be held strictly 
confidential by the Committee, and the https://wikimediafoundation.org/\;>Wikimedia Foundation.",
"form-chapteragree": "Wikimedia movement organizations (Chapters, 
Thematic organizations, and User Groups) also offer scholarships for Wikimania, 
separate from the Wikimedia Foundation Scholarship Program. While this 
application is submitted for a Wikimedia Foundation Scholarship, a Wikimedia 
movement organization may request access to applications that are relevant to 
their country or community, for the purpose of selecting and awarding their 
own, independently awarded scholarships. \n Please indicate whether or not 
you would like your information shared with other, independent Wikimedia 
movement organizations.",
 
"form-rights-heading": "Applicant Rights & Consent to Data Processing 
and Transfer",
diff --git a/data/templates/base.html b/data/templates/base.html
index 10e30bf..fbbd291 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -78,7 +78,7 @@
   
   
 
-  http://wikimania2016.wikimedia.org/wiki/Scholarships/FAQ;>{{ 
'footer-faq'|message }}
+  http://wikimania2017.wikimedia.org/wiki/Scholarships/FAQ;>{{ 
'footer-faq'|message }}
   {{ 'footer-credits'|message 
}}
   {{ 'footer-privacy'|message 
}}
   {{ 
'footer-contact'|message }}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8d3f9bbb40771932cfcc969bee3400f453759f6
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Matanya 
Gerrit-Reviewer: BryanDavis 
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] mediawiki...TimedMediaHandler[master]: Cap .ogv transcode frame rate to 60 fps (1000 fps bug)

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332066 )

Change subject: Cap .ogv transcode frame rate to 60 fps (1000 fps bug)
..


Cap .ogv transcode frame rate to 60 fps (1000 fps bug)

ffmpeg sometimes reports that WebM source videos are at 1000 fps
which ffmpeg2theora dutifully tries to process output for, creating
many duplicate frames.

This causes playback troubles, poorer compression, and much larger
encoding times, and is generally annoying as heck.

As a workaround, cap ffmpeg2theora's .ogv output to 60fps, which is
the highest actual frame rate we see in the wild. Along with the
'noUpscaling' option we already use this will not inflate files that
have a correct frame rate.

This will still create dupe frames on input that's really 30 fps or
whatever, but a LOT less. :)

Bug: T135671
Change-Id: Ie58aed3a3884fde9353c33233da400b8c0d35bad
---
M WebVideoTranscode/WebVideoTranscode.php
1 file changed, 11 insertions(+), 6 deletions(-)

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



diff --git a/WebVideoTranscode/WebVideoTranscode.php 
b/WebVideoTranscode/WebVideoTranscode.php
index eaccdb9..c1b8d1c 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -88,7 +88,7 @@
'framerate'  => '15',
'audioQuality'   => '-1',
'channels'   => '2',
-   'noUpscaling'=> 'true',
+   'noUpscaling'=> 'true', // also 
caps to source frame rate
'twopass'=> 'false', // 
will be overridden by $wgTmhTheoraTwoPassEncoding
'optimize'   => 'true',
'keyframeInterval'   => '128',
@@ -100,9 +100,10 @@
[
'maxSize'=> '426x240',
'videoBitrate'   => '512',
+   'framerate'  => '60', // max to 
reduce "1000fps bug" problems
'audioQuality'   => '0',
'channels'   => '2',
-   'noUpscaling'=> 'true',
+   'noUpscaling'=> 'true', // also 
caps to source frame rate
'twopass'=> 'false', // 
will be overridden by $wgTmhTheoraTwoPassEncoding
'optimize'   => 'true',
'keyframeInterval'   => '128',
@@ -114,9 +115,10 @@
[
'maxSize'=> '640x360',
'videoBitrate'   => '1024',
+   'framerate'  => '60', // max to 
reduce "1000fps bug" problems
'audioQuality'   => '1',
'channels'   => '2',
-   'noUpscaling'=> 'true',
+   'noUpscaling'=> 'true', // also 
caps to source frame rate
'twopass'=> 'false', // 
will be overridden by $wgTmhTheoraTwoPassEncoding
'optimize'   => 'true',
'keyframeInterval'   => '128',
@@ -128,9 +130,10 @@
[
'maxSize'=> '854x480',
'videoBitrate'   => '2048',
+   'framerate'  => '60', // max to 
reduce "1000fps bug" problems
'audioQuality'   => '2',
'channels'   => '2',
-   'noUpscaling'=> 'true',
+   'noUpscaling'=> 'true', // also 
caps to source frame rate
'twopass'=> 'false', // 
will be overridden by $wgTmhTheoraTwoPassEncoding
'optimize'   => 'true',
'keyframeInterval'   => '128',
@@ -143,8 +146,9 @@
[
'maxSize'=> '1280x720',
'videoQuality'   => 6,
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special case opus mime detction

2017-01-14 Thread TheDJ (Code Review)

TheDJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332072 )

Change subject: Special case opus mime detction
..

Special case opus mime detction

Bug: T151352
Change-Id: I44be5d6b407752b39fc8148d31e9f01de28014dc
---
M includes/libs/mime/MimeAnalyzer.php
M includes/libs/mime/mime.info
M includes/libs/mime/mime.types
3 files changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/332072/1

diff --git a/includes/libs/mime/MimeAnalyzer.php 
b/includes/libs/mime/MimeAnalyzer.php
index e42d1a9..6ea3c21 100644
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -83,7 +83,7 @@
 * what will break? In practice this probably isn't a problem anyway -- 
Bryan)
 */
protected static $wellKnownTypes = <

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

[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: Correctly handle the (default!) case where [[MediaWiki:Helpp...

2017-01-14 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332073 )

Change subject: Correctly handle the (default!) case where 
[[MediaWiki:Helppage]] points to an external URL
..

Correctly handle the (default!) case where [[MediaWiki:Helppage]] points to an 
external URL

Bug: T155319
Change-Id: I9fdda8817262cbc8e96dcfd40b6f4594da81a5e4
---
M Nimbus.skin.php
1 file changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus 
refs/changes/73/332073/1

diff --git a/Nimbus.skin.php b/Nimbus.skin.php
index edaa0fb..e03ef5d 100644
--- a/Nimbus.skin.php
+++ b/Nimbus.skin.php
@@ -124,7 +124,24 @@
$recent_changes_link = SpecialPage::getTitleFor( 
'Recentchanges' );
$top_fans_link = SpecialPage::getTitleFor( 'TopUsers' );
$special_pages_link = SpecialPage::getTitleFor( 'Specialpages' 
);
-   $help_link = Title::newFromText( wfMessage( 'helppage' 
)->inContentLanguage()->text() );
+
+   // By default it's an (external) URL, hence not a valid Title.
+   // But because MediaWiki is by nature very customizable, someone
+   // might've changed it to point to a local page. Tricky!
+   // @see https://phabricator.wikimedia.org/T155319
+   $helpPage = $this->skin->msg( 'helppage' 
)->inContentLanguage()->plain();
+   if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $helpPage ) 
) {
+   $help_link = Linker::makeExternalLink(
+   $helpPage,
+   $this->skin->msg( 'help' )->plain()
+   );
+   } else {
+   $help_link = Linker::link(
+   Title::newFromText( $helpPage ),
+   $this->skin->msg( 'help' )->plain()
+   );
+   }
+
$upload_file = SpecialPage::getTitleFor( 'Upload' );
$what_links_here = SpecialPage::getTitleFor( 'Whatlinkshere' );
$preferences_link = SpecialPage::getTitleFor( 'Preferences' );
@@ -228,8 +245,9 @@
) .
'' . 
"\n";
}
+
+   echo $help_link;
?>
-   plain() ?>
plain() ?>



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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fdda8817262cbc8e96dcfd40b6f4594da81a5e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
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] mediawiki...Nimbus[master]: Correctly handle the (default!) case where [[MediaWiki:Helpp...

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332073 )

Change subject: Correctly handle the (default!) case where 
[[MediaWiki:Helppage]] points to an external URL
..


Correctly handle the (default!) case where [[MediaWiki:Helppage]] points to an 
external URL

Bug: T155319
Change-Id: I9fdda8817262cbc8e96dcfd40b6f4594da81a5e4
---
M Nimbus.skin.php
1 file changed, 20 insertions(+), 2 deletions(-)

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



diff --git a/Nimbus.skin.php b/Nimbus.skin.php
index edaa0fb..628ac37 100644
--- a/Nimbus.skin.php
+++ b/Nimbus.skin.php
@@ -124,7 +124,24 @@
$recent_changes_link = SpecialPage::getTitleFor( 
'Recentchanges' );
$top_fans_link = SpecialPage::getTitleFor( 'TopUsers' );
$special_pages_link = SpecialPage::getTitleFor( 'Specialpages' 
);
-   $help_link = Title::newFromText( wfMessage( 'helppage' 
)->inContentLanguage()->text() );
+
+   // By default it's an (external) URL, hence not a valid Title.
+   // But because MediaWiki is by nature very customizable, someone
+   // might've changed it to point to a local page. Tricky!
+   // @see https://phabricator.wikimedia.org/T155319
+   $helpPage = $this->skin->msg( 'helppage' 
)->inContentLanguage()->plain();
+   if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $helpPage ) 
) {
+   $help_link = Linker::makeExternalLink(
+   $helpPage,
+   $this->skin->msg( 'help' )->plain()
+   );
+   } else {
+   $help_link = Linker::linkKnown(
+   Title::newFromText( $helpPage ),
+   $this->skin->msg( 'help' )->plain()
+   );
+   }
+
$upload_file = SpecialPage::getTitleFor( 'Upload' );
$what_links_here = SpecialPage::getTitleFor( 'Whatlinkshere' );
$preferences_link = SpecialPage::getTitleFor( 'Preferences' );
@@ -228,8 +245,9 @@
) .
'' . 
"\n";
}
+
+   echo $help_link;
?>
-   plain() ?>
plain() ?>



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fdda8817262cbc8e96dcfd40b6f4594da81a5e4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
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] mediawiki...SemanticWebBrowser[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332062 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I1d8bfdc07f3d9c8ca44b6b2f3b55a2c2297281e7
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticWebBrowser 
refs/changes/62/332062/1

diff --git a/.gitignore b/.gitignore
index 3a22afb..c369f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
 # Editors
 *.kate-swp
 *~
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d8bfdc07f3d9c8ca44b6b2f3b55a2c2297281e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticWebBrowser
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...SharedCssJs[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332063 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I84d7dec7b54d6f021a356b48834f34eb5f4f008f
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SharedCssJs 
refs/changes/63/332063/1

diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
 .svn
 *~
 *.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84d7dec7b54d6f021a356b48834f34eb5f4f008f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SharedCssJs
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticUpdateOnPurge[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332061 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I62c031040ba518a180e4482c2af10205da9550f0
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
 .svn
 *~
 *.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62c031040ba518a180e4482c2af10205da9550f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticUpdateOnPurge
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: l10n: Tamil namespaces

2017-01-14 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332065 )

Change subject: l10n: Tamil namespaces
..

l10n: Tamil namespaces

Bug: T142287
Change-Id: Ib46d530b301516b44976b65996a51a2b2fc9a6d1
---
M ProofreadPage.namespaces.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/ProofreadPage.namespaces.php b/ProofreadPage.namespaces.php
index 51e7f8e..fc4f832 100644
--- a/ProofreadPage.namespaces.php
+++ b/ProofreadPage.namespaces.php
@@ -353,6 +353,14 @@
'index_talk' => 'Indexdiskussion'
 ];
 
+/** Tamil (தமிழ்) */
+$proofreadPageNamespacesNames['ta'] = [
+   'page' => 'பக்கம்',
+   'page_talk' => 'பக்கம்_பேச்சு',
+   'index' => 'அட்டவணை',
+   'index_talk' => 'அட்டவணை_பேச்சு'
+];
+
 /** Telugu (తెలుగు) */
 $proofreadPageNamespacesNames['te'] = [
'page' => 'పుట',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib46d530b301516b44976b65996a51a2b2fc9a6d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Seb35 

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: l10n: Tamil namespaces

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332065 )

Change subject: l10n: Tamil namespaces
..


l10n: Tamil namespaces

Bug: T142287
Change-Id: Ib46d530b301516b44976b65996a51a2b2fc9a6d1
---
M ProofreadPage.namespaces.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/ProofreadPage.namespaces.php b/ProofreadPage.namespaces.php
index 51e7f8e..fc4f832 100644
--- a/ProofreadPage.namespaces.php
+++ b/ProofreadPage.namespaces.php
@@ -353,6 +353,14 @@
'index_talk' => 'Indexdiskussion'
 ];
 
+/** Tamil (தமிழ்) */
+$proofreadPageNamespacesNames['ta'] = [
+   'page' => 'பக்கம்',
+   'page_talk' => 'பக்கம்_பேச்சு',
+   'index' => 'அட்டவணை',
+   'index_talk' => 'அட்டவணை_பேச்சு'
+];
+
 /** Telugu (తెలుగు) */
 $proofreadPageNamespacesNames['te'] = [
'page' => 'పుట',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib46d530b301516b44976b65996a51a2b2fc9a6d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Seb35 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add npm jobs

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332064 )

Change subject: Add npm jobs
..

Add npm jobs

Related changes:
SemanticHighcharts: I05719dba3099e3137cbf634dc986922a31c85d52
SemanticInternalObjects: Id64a4aee241459dbc45cad6a869d2f71d7dd3710
SemanticPageSeries: I062643d82e58e93b11d655ee2532d3e617222e1e
SemanticRating: I08608fafee94a55c6cd871d83e527f741092ee80
SemanticSifter: I048a27e5101707d1ab4050bad3bb9552024fe7cd
SemanticTasks: Ieaf4fe2012c44f1fbbea6fa67f330441e1319369
SemanticTitle: Ia5f4b0b77c03e750f05c04538bff9605dccc3f53
SemanticUpdateOnPurge: I62c031040ba518a180e4482c2af10205da9550f0
SemanticWebBrowser: I1d8bfdc07f3d9c8ca44b6b2f3b55a2c2297281e7
SharedCssJs: I84d7dec7b54d6f021a356b48834f34eb5f4f008f

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/64/332064/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 86d4aa3..910b59f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6593,30 +6593,35 @@
 template:
   - name: jsonlint
   - name: extension-unittests-non-voting
+  - name: npm
 
   - name: mediawiki/extensions/SemanticRating
 template:
   - name: jshint
   - name: jsonlint
   - name: extension-unittests-non-voting
+  - name: npm
 
   - name: mediawiki/extensions/SemanticSifter
 template:
   - name: jsonlint
   - name: jshint
   - name: extension-unittests-non-voting
+  - name: npm
 
   - name: mediawiki/extensions/SemanticWebBrowser
 template:
   - name: jshint
   - name: jsonlint
   - name: extension-unittests-generic
+  - name: npm
 
   - name: mediawiki/extensions/SharedCssJs
 template:
   - name: jshint
   - name: jsonlint
   - name: extension-unittests-generic
+  - name: npm
 
   - name: mediawiki/extensions/SharedHelpPages
 template:
@@ -8086,6 +8091,7 @@
   - name: mw-checks-test
   - name: jshint
   - name: jsonlint
+  - name: npm
 
   - name: mediawiki/extensions/SemanticMediaWiki
 template:
@@ -8104,24 +8110,28 @@
   - name: mw-checks-test
   - name: jshint
   - name: jsonlint
+  - name: npm
 
   - name: mediawiki/extensions/SemanticTasks
 template:
   - name: mw-checks-test
   - name: jshint
   - name: jsonlint
+  - name: npm
 
   - name: mediawiki/extensions/SemanticTitle
 template:
   - name: mw-checks-test
   - name: jshint
   - name: jsonlint
+  - name: npm
 
   - name: mediawiki/extensions/SemanticUpdateOnPurge
 template:
   - name: mw-checks-test
   - name: jshint
   - name: jsonlint
+  - name: npm
 
   - name: mediawiki/extensions/Sentry
 template:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: v3.4 - Fix the height of the image upload frame in QuizGame ...

2017-01-14 Thread SamanthaNguyen (Code Review)

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332074 )

Change subject: v3.4 - Fix the height of the image upload frame in QuizGame 
special page
..

v3.4 - Fix the height of the image upload frame in QuizGame special page

- Also remove inline styling for the elements related to the frame

Bug: T155325
Change-Id: I7a1845cd4263d4076ce439372352e1a213158d03
---
M QuestionGameHome.body.php
M extension.json
M questiongame.css
3 files changed, 20 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuizGame 
refs/changes/74/332074/1

diff --git a/QuestionGameHome.body.php b/QuestionGameHome.body.php
index 876d5ff..88303f8 100644
--- a/QuestionGameHome.body.php
+++ b/QuestionGameHome.body.php
@@ -1437,11 +1437,10 @@
 
' .
$this->msg( 'quizgame-create-add-picture' 
)->text() . '
-   
+   
 
-   
-   
+   


diff --git a/extension.json b/extension.json
index bdef660..9ecf76e 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "QuizGame",
-   "version": "3.3",
+   "version": "3.4",
"author": [
"Aaron Wright",
"Ashish Datta",
diff --git a/questiongame.css b/questiongame.css
index d80a9e9..47f2294 100644
--- a/questiongame.css
+++ b/questiongame.css
@@ -1,3 +1,18 @@
+/* image upload frame */
+#quizgame-picture-upload {
+   display: block;
+}
+
+#real-form {
+   display: block;
+}
+
+.imageUpload-frame {
+   border: 0;
+   width: 650px;
+   overflow: hidden;
+}
+
 /* Quizboard */
 .quiz-leaderboard-nav {
float: right;
@@ -82,11 +97,6 @@
font-size: 12px;
font-weight: bold;
margin: 0px 6px 0px 0px;
-}
-
-.imageUpload-frame {
-   height: 90px;
-   border: medium none;
 }
 
 .startButton {
@@ -801,4 +811,4 @@
font-size: 13px;
text-decoration: none;
font-weight: bold;
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a1845cd4263d4076ce439372352e1a213158d03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuizGame
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...RSS[master]: Fix support for {{{link}}} in Atom feeds for general case.

2017-01-14 Thread Dmbaturin (Code Review)

Dmbaturin has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332051 )

Change subject: Fix support for {{{link}}} in Atom feeds for general case.
..

Fix support for {{{link}}} in Atom feeds for general case.

According to RFC4287, the  element conveys a "permanent, universally unique
identifier for an entry or feed." It must be an RFC3987 IRI, which doesn't have 
to be,
and often is not a URL.
The URL in Atom feed is supposed to be in the href= attribute of the  tag.
Since RSS feeds use  tag content rather than attribute for this, some 
fixup
is necessary.

Bug: T155308
Change-Id: Id42d62325204525a41b17b4cf97837cd3f177e11
---
M RSSData.php
M RSSParser.php
2 files changed, 15 insertions(+), 6 deletions(-)


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

diff --git a/RSSData.php b/RSSData.php
index 9ac81c5..aa3cb99 100644
--- a/RSSData.php
+++ b/RSSData.php
@@ -41,7 +41,21 @@
 * mark up their RSS, some more 
precautions are
 * needed.
 */
-   $bit[$name] = trim( $n->nodeValue );
+   if( $name == "link" ) {
+   /**
+* In Atom feeds, the URL is in 
the href= attribute
+* of the  tag, while in 
RSS it's in the
+* content of the  tag
+*/
+   $href = 
$n->attributes->getNamedItem( "href" )->nodeValue;
+   if( !is_null( $href ) ) {
+   $bit[$name] = trim( 
$href );
+   } else {
+   $bit[$name] = trim( 
$n->nodeValue );
+   }
+   } else {
+   $bit[$name] = trim( 
$n->nodeValue );
+   }
}
}
$this->items[] = $bit;
diff --git a/RSSParser.php b/RSSParser.php
index 5d5759d..4374121 100644
--- a/RSSParser.php
+++ b/RSSParser.php
@@ -395,11 +395,6 @@
foreach ( array_keys( $item ) as $info ) {
if ( $item[$info] != "" ) {
switch ( $info ) {
-   // ATOM  elements and RSS  elements 
are item link urls
-   case 'id':
-   $txt = $this->sanitizeUrl( $item['id'] 
);
-   $renderedItem = str_replace( 
'{{{link}}}', $txt, $renderedItem );
-   break;
case 'link':
$txt = $this->sanitizeUrl( 
$item['link'] );
$renderedItem = str_replace( 
'{{{link}}}', $txt, $renderedItem );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id42d62325204525a41b17b4cf97837cd3f177e11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RSS
Gerrit-Branch: master
Gerrit-Owner: Dmbaturin 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticPageSeries[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332056 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I062643d82e58e93b11d655ee2532d3e617222e1e
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
 .svn
 *~
 *.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I062643d82e58e93b11d655ee2532d3e617222e1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageSeries
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticRating[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332057 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I08608fafee94a55c6cd871d83e527f741092ee80
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..a7abe44
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+node_modules/
+vendor/
+
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: i18n: Add some messages

2017-01-14 Thread Seb35 (Code Review)

Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332052 )

Change subject: i18n: Add some messages
..

i18n: Add some messages

The messages for translating the tab were missing, better is to declare
them to make them translatable in Translatewiki.

Bug: T142287
Change-Id: Id151e5091a0eaba11235149adcfb51e7c9e55f6a
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 07219b9..e3da5bf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,6 +2,10 @@
"@metadata": {
"authors": []
},
+   "nstab-page": "Page",
+   "nstab-index": "Index",
+   "tooltip-ca-nstab-page": "View the book page",
+   "tooltip-ca-nstab-index": "View the book index",
"indexpages": "List of index pages",
"pageswithoutscans": "Pages without scans",
"proofreadpage_desc": "Allow easy comparison of text to the original 
scan",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5394a8f..4d7a408 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -27,6 +27,10 @@
"Pikne"
]
},
+   "nstab-page": "Text on the tab of book pages in the \"Page\" namespace 
on Wikisource",
+   "nstab-index": "Text on the tab of book indexes in the \"Index\" 
namespace on Wikisource",
+   "tooltip-ca-nstab-page": "Used as tooltip for tab of Page 
namespace.\n\nSee also:\n* {{msg-mw|Nstab-page}}",
+   "tooltip-ca-nstab-index": "Used as tooltip for tab of Index 
namespace.\n\nSee also:\n* {{msg-mw|Nstab-index}}",
"indexpages": "{{doc-special|IndexPages}}",
"pageswithoutscans": "{{doc-special|PagesWithoutScans}}\nThe special 
page lists texts without scans; that is, the texts that have not been 
transcluded into any other page.",
"proofreadpage_desc": "{{desc|name=Proofread 
Page|url=https://www.mediawiki.org/wiki/Extension:Proofread_Page}};,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id151e5091a0eaba11235149adcfb51e7c9e55f6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Seb35 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add *.leventhalmap.org to the copyupload whitelist

2017-01-14 Thread Urbanecm (Code Review)

Urbanecm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332053 )

Change subject: Add *.leventhalmap.org to the copyupload whitelist
..

Add *.leventhalmap.org to the copyupload whitelist

Bug: T155309
Change-Id: Icb92d777c4049ef0cc7d5b2e98a9669ef93c8742
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 409e7da..11dcc66 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12573,6 +12573,7 @@
'contentdm.lib.byu.edu',// Harold B. Lee Library - 
T139095
'*.ic.uva.nl',  // University of Amsterdam 
- T150167
'digitalmedia.fws.gov', // U.S. Fish and Wildlife 
Service - T154671
+   '*.leventhalmap.org',   // Leventhal Map Center at 
the Boston Public Library - T155309
],
 ],
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticTitle[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332060 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Ia5f4b0b77c03e750f05c04538bff9605dccc3f53
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
 .svn
 *~
 *.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5f4b0b77c03e750f05c04538bff9605dccc3f53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticTitle
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticTasks[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332059 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Ieaf4fe2012c44f1fbbea6fa67f330441e1319369
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticTasks 
refs/changes/59/332059/1

diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
 .svn
 *~
 *.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaf4fe2012c44f1fbbea6fa67f330441e1319369
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticTasks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticSifter[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332058 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I048a27e5101707d1ab4050bad3bb9552024fe7cd
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticSifter 
refs/changes/58/332058/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..a7abe44
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+node_modules/
+vendor/
+
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I048a27e5101707d1ab4050bad3bb9552024fe7cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticSifter
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticHighcharts[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332054 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I05719dba3099e3137cbf634dc986922a31c85d52
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticHighcharts 
refs/changes/54/332054/1

diff --git a/.gitignore b/.gitignore
index d1502b0..8ec4b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+node_modules/
 vendor/
 composer.lock
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05719dba3099e3137cbf634dc986922a31c85d52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticHighcharts
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticInternalObjects[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332055 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Id64a4aee241459dbc45cad6a869d2f71d7dd3710
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
 .svn
 *~
 *.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id64a4aee241459dbc45cad6a869d2f71d7dd3710
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticInternalObjects
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: i18n: Add some messages

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332052 )

Change subject: i18n: Add some messages
..


i18n: Add some messages

The messages for translating the tab were missing, better is to declare
them to make them translatable in Translatewiki.

Bug: T142287
Change-Id: Id151e5091a0eaba11235149adcfb51e7c9e55f6a
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 07219b9..e3da5bf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,6 +2,10 @@
"@metadata": {
"authors": []
},
+   "nstab-page": "Page",
+   "nstab-index": "Index",
+   "tooltip-ca-nstab-page": "View the book page",
+   "tooltip-ca-nstab-index": "View the book index",
"indexpages": "List of index pages",
"pageswithoutscans": "Pages without scans",
"proofreadpage_desc": "Allow easy comparison of text to the original 
scan",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5394a8f..4d7a408 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -27,6 +27,10 @@
"Pikne"
]
},
+   "nstab-page": "Text on the tab of book pages in the \"Page\" namespace 
on Wikisource",
+   "nstab-index": "Text on the tab of book indexes in the \"Index\" 
namespace on Wikisource",
+   "tooltip-ca-nstab-page": "Used as tooltip for tab of Page 
namespace.\n\nSee also:\n* {{msg-mw|Nstab-page}}",
+   "tooltip-ca-nstab-index": "Used as tooltip for tab of Index 
namespace.\n\nSee also:\n* {{msg-mw|Nstab-index}}",
"indexpages": "{{doc-special|IndexPages}}",
"pageswithoutscans": "{{doc-special|PagesWithoutScans}}\nThe special 
page lists texts without scans; that is, the texts that have not been 
transcluded into any other page.",
"proofreadpage_desc": "{{desc|name=Proofread 
Page|url=https://www.mediawiki.org/wiki/Extension:Proofread_Page}};,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id151e5091a0eaba11235149adcfb51e7c9e55f6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Cap .ogv transcode frame rate to 60 fps (1000 fps bug)

2017-01-14 Thread Brion VIBBER (Code Review)

Brion VIBBER has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332066 )

Change subject: Cap .ogv transcode frame rate to 60 fps (1000 fps bug)
..

Cap .ogv transcode frame rate to 60 fps (1000 fps bug)

ffmpeg sometimes reports that WebM source videos are at 1000 fps
which ffmpeg2theora dutifully tries to process output for, creating
many duplicate frames.

This causes playback troubles, poorer compression, and much larger
encoding times, and is generally annoying as heck.

As a workaround, cap ffmpeg2theora's .ogv output to 60fps, which is
the highest actual frame rate we see in the wild. Along with the
'noUpscaling' option we already use this will not inflate files that
have a correct frame rate.

This will still create dupe frames on input that's really 30 fps or
whatever, but a LOT less. :)

Bug: T135671
Change-Id: Ie58aed3a3884fde9353c33233da400b8c0d35bad
---
M WebVideoTranscode/WebVideoTranscode.php
1 file changed, 11 insertions(+), 6 deletions(-)


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

diff --git a/WebVideoTranscode/WebVideoTranscode.php 
b/WebVideoTranscode/WebVideoTranscode.php
index eaccdb9..c1b8d1c 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -88,7 +88,7 @@
'framerate'  => '15',
'audioQuality'   => '-1',
'channels'   => '2',
-   'noUpscaling'=> 'true',
+   'noUpscaling'=> 'true', // also 
caps to source frame rate
'twopass'=> 'false', // 
will be overridden by $wgTmhTheoraTwoPassEncoding
'optimize'   => 'true',
'keyframeInterval'   => '128',
@@ -100,9 +100,10 @@
[
'maxSize'=> '426x240',
'videoBitrate'   => '512',
+   'framerate'  => '60', // max to 
reduce "1000fps bug" problems
'audioQuality'   => '0',
'channels'   => '2',
-   'noUpscaling'=> 'true',
+   'noUpscaling'=> 'true', // also 
caps to source frame rate
'twopass'=> 'false', // 
will be overridden by $wgTmhTheoraTwoPassEncoding
'optimize'   => 'true',
'keyframeInterval'   => '128',
@@ -114,9 +115,10 @@
[
'maxSize'=> '640x360',
'videoBitrate'   => '1024',
+   'framerate'  => '60', // max to 
reduce "1000fps bug" problems
'audioQuality'   => '1',
'channels'   => '2',
-   'noUpscaling'=> 'true',
+   'noUpscaling'=> 'true', // also 
caps to source frame rate
'twopass'=> 'false', // 
will be overridden by $wgTmhTheoraTwoPassEncoding
'optimize'   => 'true',
'keyframeInterval'   => '128',
@@ -128,9 +130,10 @@
[
'maxSize'=> '854x480',
'videoBitrate'   => '2048',
+   'framerate'  => '60', // max to 
reduce "1000fps bug" problems
'audioQuality'   => '2',
'channels'   => '2',
-   'noUpscaling'=> 'true',
+   'noUpscaling'=> 'true', // also 
caps to source frame rate
'twopass'=> 'false', // 
will be overridden by $wgTmhTheoraTwoPassEncoding
'optimize'   => 'true',
'keyframeInterval'   => '128',
@@ -143,8 +146,9 @@
[
'maxSize'=> '1280x720',
'videoQuality'   => 6,
+   'framerate'  =>

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: link Wikimania Scholarship Committee

2017-01-14 Thread Matanya (Code Review)

Matanya has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332068 )

Change subject: link Wikimania Scholarship Committee
..

link Wikimania Scholarship Committee

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/68/332068/1

diff --git a/data/i18n/en.json b/data/i18n/en.json
index 6c84992..6a8c9a7 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -150,7 +150,7 @@
"form-info-true": "I certify that all of the information provided with 
my application is true and accurate to the best of my knowledge and belief. The 
Wikimedia Foundation reserves the right to require grant recipients to pay back 
all or part of the grant if any of the information I provide is found to be 
untrue or inaccurate.",
 
"form-privacy": "Privacy",
-   "form-review": "All information contained in this application will be 
reviewed by the members of the Wikimania Scholarship Committee. All personal 
information will be held strictly confidential by the Committee, and the https://wikimediafoundation.org/\;>Wikimedia Foundation.",
+   "form-review": "All information contained in this application will be 
reviewed by the members of the https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee/\;>Wikimania
 Scholarship Committee. All personal information will be held strictly 
confidential by the Committee, and the https://wikimediafoundation.org/\;>Wikimedia Foundation.",
"form-chapteragree": "Wikimedia movement organizations (Chapters, 
Thematic organizations, and User Groups) also offer scholarships for Wikimania, 
separate from the Wikimedia Foundation Scholarship Program. While this 
application is submitted for a Wikimedia Foundation Scholarship, a Wikimedia 
movement organization may request access to applications that are relevant to 
their country or community, for the purpose of selecting and awarding their 
own, independently awarded scholarships. \n Please indicate whether or not 
you would like your information shared with other, independent Wikimedia 
movement organizations.",
 
"form-rights-heading": "Applicant Rights & Consent to Data Processing 
and Transfer",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8d3f9bbb40771932cfcc969bee3400f453759f6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Matanya 

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

[MediaWiki-commits] [Gerrit] mediawiki...MP3MediaHandler[master]: MP3MediaHandler should handle audio/mpeg as well as audio/mp3

2017-01-14 Thread MarkAHershberger (Code Review)

MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332069 )

Change subject: MP3MediaHandler should handle audio/mpeg as well as audio/mp3
..

MP3MediaHandler should handle audio/mpeg as well as audio/mp3

Ran into this when I found that mp3 uploads were (on my system) being
classified as audio/mpeg instead of the extension's expected
audio/mp3.

Bug: T155315
Change-Id: I3a52702d422130d3b48b19bf12ebf205377738bb
---
M MP3MediaHandler.php
M extension.json
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MP3MediaHandler 
refs/changes/69/332069/1

diff --git a/MP3MediaHandler.php b/MP3MediaHandler.php
index 172004f..2fc50b0 100644
--- a/MP3MediaHandler.php
+++ b/MP3MediaHandler.php
@@ -3,6 +3,7 @@
 # Stream MP3 using HTML5  tag
 
 $wgMediaHandlers['audio/mp3'] = 'MP3MediaHandler';
+$wgMediaHandlers['audio/mpeg'] = 'MP3MediaHandler';
 $wgFileExtensions[] = 'mp3';
 
 $wgExtensionCredits['parserhook'][] = array(
@@ -123,4 +124,3 @@
}
 
 }
-
diff --git a/extension.json b/extension.json
index 6721ecb..a4bbb9e 100644
--- a/extension.json
+++ b/extension.json
@@ -15,7 +15,8 @@
"MP3OutputRenderer": "MP3MediaHandler.php"
},
"MediaHandlers": {
-   "audio/mp3": "MP3MediaHandler"
+   "audio/mp3": "MP3MediaHandler",
+   "audio/mpeg": "MP3MediaHandler"
},
"MessagesDirs": {
"MP3MediaHandler": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a52702d422130d3b48b19bf12ebf205377738bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MP3MediaHandler
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] mediawiki...BlueSpiceSkin[master]: Split author list in extension.json

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332070 )

Change subject: Split author list in extension.json
..

Split author list in extension.json

Use one entry for each author, gives better output on Special:Version

Change-Id: I86d6e349f386a3e6814526754efd3aa9b2808d74
---
M skin.json
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/70/332070/1

diff --git a/skin.json b/skin.json
index a6d0662..fda16ba 100644
--- a/skin.json
+++ b/skin.json
@@ -2,7 +2,13 @@
"name": "BlueSpiceSkin",
"version": "2.27.1-alpha",
"license-name": "GPL-2.0+",
-   "author": "Radovan Kubani, Robert Vogel, Patric Wirth, Tobias Weichart 
et. al.",
+   "author": [
+   "Radovan Kubani",
+   "Robert Vogel",
+   "Patric Wirth",
+   "Tobias Weichart",
+   "..."
+   ],
"url": "http://bluespice.com;,
"descriptionmsg": "bluespiceskin-desc",
"type": "skin",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86d6e349f386a3e6814526754efd3aa9b2808d74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Fix author list in extension.json

2017-01-14 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332071 )

Change subject: Fix author list in extension.json
..

Fix author list in extension.json

ArticleInfo: Split list to have better output on Special:Version
ExtendedEditBar: Strip off unrelated infos

Change-Id: I9de0158729e6197ca89698d5d97c347dd4126feb
---
M ArticleInfo/extension.json
M ExtendedEditBar/extension.json
2 files changed, 5 insertions(+), 2 deletions(-)


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

diff --git a/ArticleInfo/extension.json b/ArticleInfo/extension.json
index 002700e..fc84427 100644
--- a/ArticleInfo/extension.json
+++ b/ArticleInfo/extension.json
@@ -2,7 +2,10 @@
"name": "ArticleInfo",
"version": "2.27.1-alpha",
"url": "https://help.bluespice.com/index.php/Articleinfo;,
-   "author": "Markus Glaser, Stephan Muggli",
+   "author": [
+   "Markus Glaser",
+   "Stephan Muggli"
+   ],
"descriptionmsg": "bs-articleinfo-desc",
"type": "bluespice",
"bsgExtensions": {
diff --git a/ExtendedEditBar/extension.json b/ExtendedEditBar/extension.json
index dd9eab3..a080eb3 100644
--- a/ExtendedEditBar/extension.json
+++ b/ExtendedEditBar/extension.json
@@ -2,7 +2,7 @@
"name": "ExtendedEditBar",
"version": "2.27.1-alpha",
"url": "https://help.bluespice.com/index.php/ExtendedEditbar;,
-   "author": "MediaWiki Extension, packaging by Markus Glaser",
+   "author": "Markus Glaser",
"descriptionmsg": "bs-extendededitbar-desc",
"type": "bluespice",
"bsgExtensions": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9de0158729e6197ca89698d5d97c347dd4126feb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Open preview links in new tab

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331932 )

Change subject: Open preview links in new tab
..


Open preview links in new tab

Bug: T155159
Change-Id: Idddc6b25303c17382ba1bc763b9001b727e1040e
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 5 insertions(+), 0 deletions(-)

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

Objections:
  Schnark: There's a problem with this change, please improve



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 9148a77..0ab38e5 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1081,7 +1081,12 @@
body = doc.body;
// Import body to current document, then 
resolve attributes against original document (parseDocument called #fixBase)
document.adoptNode( body );
+   // TODO: This code is very similar to 
ve.ui.PreviewElement
ve.resolveAttributes( body, doc, 
ve.dm.Converter.static.computedAttributes );
+   // Make all links open in a new window (sync 
view)
+   Array.prototype.forEach.call( 
body.querySelectorAll( 'a[href]' ), function ( el ) {
+   el.setAttribute( 'target', '_blank' );
+   } );
target.saveDialog.showPreview( $( body 
).contents() );
} else {
target.saveDialog.showPreview( $( '' ).text(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idddc6b25303c17382ba1bc763b9001b727e1040e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Schnark 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added "autoHideSeconds" setting in mw.notify()

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331989 )

Change subject: Added "autoHideSeconds" setting in mw.notify()
..


Added "autoHideSeconds" setting in mw.notify()

"autoHideSeconds" is now option of Notification, instead of global variable.

Bug: T155228
Change-Id: If0d141b67515546f1605f24c2f4a50a05d5f2ba4
---
M resources/src/mediawiki/mediawiki.notification.js
1 file changed, 8 insertions(+), 7 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.notification.js 
b/resources/src/mediawiki/mediawiki.notification.js
index e1287db..7a3fb0a 100644
--- a/resources/src/mediawiki/mediawiki.notification.js
+++ b/resources/src/mediawiki/mediawiki.notification.js
@@ -71,6 +71,7 @@
$notificationContent.appendTo( $notification );
 
// Private state parameters, meant for internal use only
+   // autoHideSeconds: Number of seconds to wait before 
auto-hiding notifications.
// isOpen: Set to true after .start() is called to avoid double 
calls.
// Set back to false after .close() to avoid 
duplicating the close animation.
// isPaused: false after .resume(), true after .pause(). Avoids 
duplicating or breaking the hide timeouts.
@@ -79,6 +80,8 @@
//  to stop replacement of a tagged notification with 
another notification using the same message.
// options: The options passed to the notification with a 
little sanitization. Used by various methods.
// $notification: jQuery object containing the notification DOM 
node.
+   // Set hide delay
+   this.autoHideSeconds = options.autoHideSeconds;
this.isOpen = false;
this.isPaused = true;
this.message = message;
@@ -190,7 +193,7 @@
// Already finished, so don't try to re-clear it
delete notif.timeout;
notif.close();
-   }, notification.autoHideSeconds * 1000 );
+   }, this.autoHideSeconds * 1000 );
}
};
 
@@ -370,6 +373,9 @@
 *   A boolean indicating whether the notifification should 
automatically
 *   be hidden after shown. Or if it should persist.
 *
+* - autoHideSeconds:
+*   Number of seconds to wait before auto-hiding notifications.
+*
 * - tag:
 *   An optional string. When a notification is tagged only one 
message
 *   with that tag will be displayed. Trying to display a new 
notification
@@ -387,16 +393,11 @@
 */
defaults: {
autoHide: true,
+   autoHideSeconds: 5,
tag: false,
title: undefined,
type: false
},
-
-   /**
-* @property {number}
-* Number of seconds to wait before auto-hiding notifications.
-*/
-   autoHideSeconds: 5,
 
/**
 * @property {number}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0d141b67515546f1605f24c2f4a50a05d5f2ba4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: MtDu 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (538c3a2)

2017-01-14 Thread DLynch (Code Review)

DLynch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332092 )

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

Update VE core submodule to master (538c3a2)

New changes:
c0c5ca9 ce.Surface: Don't hardcode string types for paste

Change-Id: I97e8d5be9086749caeb9e4aa8f347bab5353d66f
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/ve b/lib/ve
index de003cf..538c3a2 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit de003cf1f7aafa36bc5f51d208fac9cc2b50ec4e
+Subproject commit 538c3a2815e28559cb67432267ff0c0dde81fdda

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97e8d5be9086749caeb9e4aa8f347bab5353d66f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server module: Linting changes

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332102 )

Change subject: install_server module: Linting changes
..

install_server module: Linting changes

Add trailing commas to abide by the Coding Style guidelines

Use full names for class names, as relative names are not allowed in
future Puppet versions

Change-Id: I0009a7ad444784b937b07fc595dd1960b103a107
---
M modules/install_server/manifests/dhcp_server.pp
M modules/install_server/manifests/preseed_server.pp
M modules/install_server/manifests/tftp_server.pp
M modules/install_server/tests/dhcp_server.pp
M modules/install_server/tests/preseed_server.pp
M modules/install_server/tests/tftp_server.pp
M modules/install_server/tests/web_server.pp
7 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/332102/1

diff --git a/modules/install_server/manifests/dhcp_server.pp 
b/modules/install_server/manifests/dhcp_server.pp
index 5d4a52c..529ab26 100644
--- a/modules/install_server/manifests/dhcp_server.pp
+++ b/modules/install_server/manifests/dhcp_server.pp
@@ -14,7 +14,7 @@
 
 class install_server::dhcp_server {
 
-include standard
+include ::standard
 
 file { '/etc/dhcp':
 ensure  => directory,
diff --git a/modules/install_server/manifests/preseed_server.pp 
b/modules/install_server/manifests/preseed_server.pp
index a04dd04..565b3cc 100644
--- a/modules/install_server/manifests/preseed_server.pp
+++ b/modules/install_server/manifests/preseed_server.pp
@@ -20,6 +20,6 @@
 group   => 'root',
 source  => 'puppet:///modules/install_server/autoinstall',
 recurse => true,
-links   => manage
+links   => manage,
 }
 }
diff --git a/modules/install_server/manifests/tftp_server.pp 
b/modules/install_server/manifests/tftp_server.pp
index 5cfc14c..018c86a 100644
--- a/modules/install_server/manifests/tftp_server.pp
+++ b/modules/install_server/manifests/tftp_server.pp
@@ -14,7 +14,7 @@
 
 class install_server::tftp_server {
 
-include standard
+include ::standard
 
 file { '/srv/tftpboot':
 # config files in the puppet repository,
@@ -22,7 +22,7 @@
 source   => [
 'puppet:///modules/install_server/tftpboot',
 # lint:ignore:puppet_url_without_modules
-'puppet:///volatile/tftpboot'
+'puppet:///volatile/tftpboot',
 # lint:endignore
 ],
 sourceselect => all,
diff --git a/modules/install_server/tests/dhcp_server.pp 
b/modules/install_server/tests/dhcp_server.pp
index fd8d98a..f5d20d3 100644
--- a/modules/install_server/tests/dhcp_server.pp
+++ b/modules/install_server/tests/dhcp_server.pp
@@ -1,2 +1,2 @@
 #
-include install_server::dhcp_server
+include ::install_server::dhcp_server
diff --git a/modules/install_server/tests/preseed_server.pp 
b/modules/install_server/tests/preseed_server.pp
index 4634097..16383e7 100644
--- a/modules/install_server/tests/preseed_server.pp
+++ b/modules/install_server/tests/preseed_server.pp
@@ -1,2 +1,2 @@
 #
-include install_server::preseed_server
+include ::install_server::preseed_server
diff --git a/modules/install_server/tests/tftp_server.pp 
b/modules/install_server/tests/tftp_server.pp
index 713ed88..fdb294a 100644
--- a/modules/install_server/tests/tftp_server.pp
+++ b/modules/install_server/tests/tftp_server.pp
@@ -1,2 +1,2 @@
 #
-include install_server::tftp_server
+include ::install_server::tftp_server
diff --git a/modules/install_server/tests/web_server.pp 
b/modules/install_server/tests/web_server.pp
index 49f62e3..216be9e 100644
--- a/modules/install_server/tests/web_server.pp
+++ b/modules/install_server/tests/web_server.pp
@@ -1,2 +1,2 @@
 #
-include install_server::web_server
+include ::install_server::web_server

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: geowiki module: Lint changes + modes/umask quoting

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332101 )

Change subject: geowiki module: Lint changes + modes/umask quoting
..

geowiki module: Lint changes + modes/umask quoting

Use full names for class names, as relative names are not allowed in
future Puppet versions

Quote mode and umask values. Unquoted mode values in a File resource
type in later Puppet versions will generate an error, as will unquoted
umask values for Exec resource types.

Bug: T93645

Change-Id: Ica9a6038b8a84293cda8dfadf2f3bf2f05a06a23
---
M modules/geowiki/manifests/job.pp
M modules/geowiki/manifests/job/data.pp
M modules/geowiki/manifests/job/limn.pp
M modules/geowiki/manifests/job/monitoring.pp
M modules/geowiki/manifests/mysql_conf.pp
M modules/geowiki/manifests/private_data.pp
6 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/332101/1

diff --git a/modules/geowiki/manifests/job.pp b/modules/geowiki/manifests/job.pp
index 7a635cf..6d49d61 100644
--- a/modules/geowiki/manifests/job.pp
+++ b/modules/geowiki/manifests/job.pp
@@ -6,7 +6,7 @@
 
 include ::geowiki::params
 include ::geowiki::mysql_conf
-include geoip
+include ::geoip
 
 # This is not a complete list of
 # python packages that geowiki requires.
diff --git a/modules/geowiki/manifests/job/data.pp 
b/modules/geowiki/manifests/job/data.pp
index 3e7f73a..9ceba53 100644
--- a/modules/geowiki/manifests/job/data.pp
+++ b/modules/geowiki/manifests/job/data.pp
@@ -4,7 +4,7 @@
 # editor geocoding statistics, saved back into a db.
 #
 class geowiki::job::data inherits geowiki::job {
-include passwords::mysql::globaldev
+include ::passwords::mysql::globaldev
 
 # install MySQL conf files for db acccess
 $globaldev_mysql_user = $passwords::mysql::globaldev::user
diff --git a/modules/geowiki/manifests/job/limn.pp 
b/modules/geowiki/manifests/job/limn.pp
index 656e0f9..fb8468b 100644
--- a/modules/geowiki/manifests/job/limn.pp
+++ b/modules/geowiki/manifests/job/limn.pp
@@ -2,7 +2,7 @@
 # Installs a cron job to create limn files from the geocoded editor data.
 #
 class geowiki::job::limn inherits geowiki::job {
-require geowiki::private_data
+require ::geowiki::private_data
 
 git::clone { 'geowiki-data-public':
 ensure=> 'latest',
diff --git a/modules/geowiki/manifests/job/monitoring.pp 
b/modules/geowiki/manifests/job/monitoring.pp
index cd260b6..4c6b1ab 100644
--- a/modules/geowiki/manifests/job/monitoring.pp
+++ b/modules/geowiki/manifests/job/monitoring.pp
@@ -5,7 +5,7 @@
 # Disabled for now due to restructuring of geowiki.
 #
 class geowiki::job::monitoring inherits geowiki::job {
-include passwords::geowiki
+include ::passwords::geowiki
 
 $geowiki_http_user= $passwords::geowiki::user
 $geowiki_http_pass= $passwords::geowiki::pass
diff --git a/modules/geowiki/manifests/mysql_conf.pp 
b/modules/geowiki/manifests/mysql_conf.pp
index 256ba51..b3fa2f6 100644
--- a/modules/geowiki/manifests/mysql_conf.pp
+++ b/modules/geowiki/manifests/mysql_conf.pp
@@ -4,7 +4,7 @@
 #
 class geowiki::mysql_conf {
 include ::geowiki::params
-include passwords::mysql::research
+include ::passwords::mysql::research
 
 $research_mysql_user = $passwords::mysql::research::user
 $research_mysql_pass = $passwords::mysql::research::pass
diff --git a/modules/geowiki/manifests/private_data.pp 
b/modules/geowiki/manifests/private_data.pp
index 25f30a1..84a9534 100644
--- a/modules/geowiki/manifests/private_data.pp
+++ b/modules/geowiki/manifests/private_data.pp
@@ -17,7 +17,7 @@
 # It only needs backup (as the repo is not living in gerrit)
 # Other hosts need to rsync it over
 if $::fqdn == $::geowiki::params::private_data_bare_host {
-include role::backup::host
+include ::role::backup::host
 backup::set { 'a-geowiki-data-private-bare': }
 }
 else {
@@ -37,8 +37,8 @@
 origin=> "file://${::geowiki::params::private_data_bare_path}",
 owner => $::geowiki::params::user,
 group => 'www-data',
-mode  => 0750,
-umask => 027,
+mode  => '0750',
+umask => '027',
 require   => File[$::geowiki::params::private_data_bare_path],
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs module: Linting changes

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332111 )

Change subject: toollabs module: Linting changes
..

toollabs module: Linting changes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Change-Id: Ia13239f3397ed78fcf8863a9846eb63cb823331d
---
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/checker.pp
M modules/toollabs/manifests/compute.pp
M modules/toollabs/manifests/cronrunner.pp
M modules/toollabs/manifests/dev_environ.pp
M modules/toollabs/manifests/exec_environ.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/kube2proxy.pp
M modules/toollabs/manifests/kubebuilder.pp
M modules/toollabs/manifests/mailrelay.pp
M modules/toollabs/manifests/master.pp
M modules/toollabs/manifests/node/all.pp
M modules/toollabs/manifests/proxy.pp
M modules/toollabs/manifests/puppetmaster.pp
M modules/toollabs/manifests/redis.pp
M modules/toollabs/manifests/services.pp
M modules/toollabs/manifests/shadow.pp
M modules/toollabs/manifests/static.pp
18 files changed, 57 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/332111/1

diff --git a/modules/toollabs/manifests/bastion.pp 
b/modules/toollabs/manifests/bastion.pp
index 67674ac2..af003b2 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -8,10 +8,10 @@
 $nproc = 30,
 ) inherits toollabs {
 
-include gridengine::admin_host
-include gridengine::submit_host
-include toollabs::dev_environ
-include toollabs::exec_environ
+include ::gridengine::admin_host
+include ::gridengine::submit_host
+include ::toollabs::dev_environ
+include ::toollabs::exec_environ
 
 if os_version('ubuntu trusty') {
 
@@ -199,7 +199,7 @@
 ensure  => absent,
 }
 
-include ldap::role::config::labs
+include ::ldap::role::config::labs
 $ldapconfig = $ldap::role::config::labs::ldapconfig
 
 $cron_host = hiera('active_cronrunner')
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 7e63c61..c9125bd 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -7,8 +7,8 @@
 
 class toollabs::checker inherits toollabs {
 
-include gridengine::submit_host
-include toollabs::infrastructure
+include ::gridengine::submit_host
+include ::toollabs::infrastructure
 
 require_package('python-flask',
 'python-psycopg2',
@@ -62,7 +62,7 @@
 owner  => "${::labsproject}.toolschecker",
 group  => 'www-data',
 mode   => '0400',
-source => "/var/lib/puppet/ssl/certs/${::fqdn}.pem"
+source => "/var/lib/puppet/ssl/certs/${::fqdn}.pem",
 }
 
 file { '/var/lib/toolschecker/puppetcerts/key.pem':
@@ -70,7 +70,7 @@
 owner  => "${::labsproject}.toolschecker",
 group  => 'www-data',
 mode   => '0400',
-source => "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem"
+source => "/var/lib/puppet/ssl/private_keys/${::fqdn}.pem",
 }
 
 file { '/etc/init/toolschecker.conf':
@@ -86,7 +86,7 @@
 privileges => [
 'ALL=(tools.toolschecker-k8s-ws) NOPASSWD: ALL',
 'ALL=(tools.toolschecker-ge-ws) NOPASSWD: ALL',
-]
+],
 }
 
 service { 'toolschecker':
diff --git a/modules/toollabs/manifests/compute.pp 
b/modules/toollabs/manifests/compute.pp
index 58643c6..ceb5446 100644
--- a/modules/toollabs/manifests/compute.pp
+++ b/modules/toollabs/manifests/compute.pp
@@ -6,9 +6,9 @@
 
 class toollabs::compute inherits toollabs {
 
-include gridengine
-include toollabs::exec_environ
-include toollabs::hba
+include ::gridengine
+include ::toollabs::exec_environ
+include ::toollabs::hba
 
 motd::script { 'exechost-banner':
 ensure => present,
diff --git a/modules/toollabs/manifests/cronrunner.pp 
b/modules/toollabs/manifests/cronrunner.pp
index 4d43bb6..92dc2d0 100644
--- a/modules/toollabs/manifests/cronrunner.pp
+++ b/modules/toollabs/manifests/cronrunner.pp
@@ -5,9 +5,9 @@
 source => 
"puppet:///modules/toollabs/40-${::labsproject}-submithost-banner.sh",
 }
 
-include gridengine::submit_host
-include toollabs
-include toollabs::hba
+include ::gridengine::submit_host
+include ::toollabs
+include ::toollabs::hba
 
 # We need to include exec environment here since the current
 # version of jsub checks the local environment to find the full
@@ -15,7 +15,7 @@
 # that jsub is always run in an environment identical to the exec
 # nodes. This is kind of terrible, so we need to fix that eventually.
 # Until then...
-include toollabs::exec_environ
+include

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs role modules: Linting changes

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332110 )

Change subject: toollabs role modules: Linting changes
..

toollabs role modules: Linting changes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645

Change-Id: I63c46f70481387788cdba11de77d2473cdc8a767
---
M modules/role/manifests/toollabs/clush/master.pp
M modules/role/manifests/toollabs/docker/builder.pp
M modules/role/manifests/toollabs/docker/registry.pp
M modules/role/manifests/toollabs/etcd/flannel.pp
M modules/role/manifests/toollabs/etcd/k8s.pp
M modules/role/manifests/toollabs/k8s/bastion.pp
M modules/role/manifests/toollabs/k8s/master.pp
M modules/role/manifests/toollabs/k8s/webproxy.pp
M modules/role/manifests/toollabs/k8s/worker.pp
M modules/role/manifests/toollabs/legacy.pp
M modules/role/manifests/toollabs/logging/centralserver.pp
M modules/role/manifests/toollabs/logging/sender.pp
M modules/role/manifests/toollabs/node/compute/dedicated.pp
M modules/role/manifests/toollabs/node/compute/general.pp
M modules/role/manifests/toollabs/node/web.pp
M modules/role/manifests/toollabs/proxy.pp
M modules/role/manifests/toollabs/redis.pp
M modules/role/manifests/toollabs/services.pp
18 files changed, 31 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/332110/1

diff --git a/modules/role/manifests/toollabs/clush/master.pp 
b/modules/role/manifests/toollabs/clush/master.pp
index eb869a2..9949778 100644
--- a/modules/role/manifests/toollabs/clush/master.pp
+++ b/modules/role/manifests/toollabs/clush/master.pp
@@ -55,7 +55,7 @@
 ensure  => present,
 command => '/usr/local/sbin/tools-clush-generator 
/etc/clustershell/tools.yaml',
 hour=> '*/1',
-user=> 'root'
+user=> 'root',
 }
 
 $groups_config = {
@@ -65,7 +65,7 @@
 'Tools' => {
 'map' => '/usr/local/sbin/tools-clush-interpreter --hostgroups 
/etc/clustershell/tools.yaml map $GROUP',
 'list' => '/usr/local/sbin/tools-clush-interpreter --hostgroups 
/etc/clustershell/tools.yaml list',
-}
+},
 }
 
 file { '/etc/clustershell/groups.conf':
diff --git a/modules/role/manifests/toollabs/docker/builder.pp 
b/modules/role/manifests/toollabs/docker/builder.pp
index e6d0166..2cbe48f 100644
--- a/modules/role/manifests/toollabs/docker/builder.pp
+++ b/modules/role/manifests/toollabs/docker/builder.pp
@@ -18,8 +18,8 @@
 'auths' => {
 "${docker_registry}" => {
 'auth' => $docker_auth,
-}
-}
+},
+},
 }
 
 file { '/root/.docker':
diff --git a/modules/role/manifests/toollabs/docker/registry.pp 
b/modules/role/manifests/toollabs/docker/registry.pp
index 5aa21bb..5d6002f 100644
--- a/modules/role/manifests/toollabs/docker/registry.pp
+++ b/modules/role/manifests/toollabs/docker/registry.pp
@@ -2,7 +2,7 @@
 class role::toollabs::docker::registry {
 include ::toollabs::infrastructure
 
-require role::labs::lvm::srv
+require ::role::labs::lvm::srv
 
 sslcert::certificate { 'star.tools.wmflabs.org':
 before   => Class['::docker::registry'],
diff --git a/modules/role/manifests/toollabs/etcd/flannel.pp 
b/modules/role/manifests/toollabs/etcd/flannel.pp
index 6878a62..5a5a66f 100644
--- a/modules/role/manifests/toollabs/etcd/flannel.pp
+++ b/modules/role/manifests/toollabs/etcd/flannel.pp
@@ -2,7 +2,7 @@
 class role::toollabs::etcd::flannel {
 include ::etcd
 
-include base::firewall
+include ::base::firewall
 include ::role::toollabs::etcd::expose_metrics
 
 $worker_hosts = join(hiera('k8s::worker_hosts'), ' ')
@@ -14,12 +14,12 @@
 ferm::service { 'flannel-clients':
 proto  => 'tcp',
 port   => '2379',
-srange => "@resolve((${worker_hosts} ${peer_hosts} ${proxy_hosts} 
${bastion_hosts} ${checker_hosts}))"
+srange => "@resolve((${worker_hosts} ${peer_hosts} ${proxy_hosts} 
${bastion_hosts} ${checker_hosts}))",
 }
 
 ferm::service { 'flannel-peers':
 proto  => 'tcp',
 port   => '2380',
-srange => "@resolve((${peer_hosts}))"
+srange => "@resolve((${peer_hosts}))",
 }
 }
diff --git a/modules/role/manifests/toollabs/etcd/k8s.pp 
b/modules/role/manifests/toollabs/etcd/k8s.pp
index eb246a4..0ea5875 100644
--- a/modules/role/manifests/toollabs/etcd/k8s.pp
+++ b/modules/role/manifests/toollabs/etcd/k8s.pp
@@ -1,7 +1,7 @@
 # filtertags: labs-project-tools
 class role::toollabs::etcd::k8s {
 include ::etcd
-include base::firewall
+include ::base::firewall
 
 include ::role::toollabs::etcd::expose_metrics
 
@@ -12,12 +12,12 @@
 ferm::service { 'etcd-clients':
 proto  => 'tcp',
 port   => '2379',
-

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Move title validation for Special:CreateCollaborationHub to ...

2017-01-14 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332114 )

Change subject: Move title validation for Special:CreateCollaborationHub to 
that field
..

Move title validation for Special:CreateCollaborationHub to that field

This will make the error be output directly on the field in question.
Additionally, add validation checks for wrong namespace.

Change-Id: I1e35786a982905bb8a43292368dab7e42c61c100
---
M i18n/en.json
M i18n/qqq.json
M includes/SpecialCreateCollaborationHub.php
3 files changed, 51 insertions(+), 9 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 311394b..5517edd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -120,5 +120,6 @@
"collaborationkit-green3": "Khaki",
"collaborationkit-black": "Black",
"collaborationkit-column-active": "Active members",
-   "collaborationkit-column-inactive": "Inactive members"
+   "collaborationkit-column-inactive": "Inactive members",
+   "collaborationkit-createhub-wrongnamespace": "This page name cannot be 
used as a Collaboration Hub. Collaboration Hubs can only be created in the 
{{PLURAL:$1|$2 namespace|following namespaces: $2}}"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4a9d86c..10011f9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -120,5 +120,6 @@
"collaborationkit-green3": "Color label",
"collaborationkit-black": "Color label",
"collaborationkit-column-active": "Column header for the list of active 
members of a collaboration hub project",
-   "collaborationkit-column-inactive": "Column header for the list of 
members of a project who are no longer active on wiki."
+   "collaborationkit-column-inactive": "Column header for the list of 
members of a project who are no longer active on wiki.",
+   "collaborationkit-createhub-wrongnamespace": "Error message from 
Special:CreateCollaborationHub if the title specified is not allowed to be used 
with the CollaborationHubContent content model. Normally this means that the 
title is in the wrong namespace. $1 - Number of namespaces that 
CollaborationHub is allowed on. $2 - Comma separated list of namespace names 
that are allowed to be used."
 }
diff --git a/includes/SpecialCreateCollaborationHub.php 
b/includes/SpecialCreateCollaborationHub.php
index fd101ef..9633186 100644
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -37,6 +37,8 @@
'type' => 'text',
'cssclass' => 'mw-ck-title-input',
'label-message' => 
'collaborationkit-createhub-title',
+   'validation-callback' => [ $this, 
'titleValidate' ],
+   'required' => true
],
// Display name can be different from page title
'display_name' => [
@@ -97,6 +99,40 @@
}
 
/**
+* Callback to validate given title
+*
+* @param $value string The title value to test
+* @return bool|string|Message True on success, or Message for error
+*/
+   public function titleValidate( $value ) {
+   $title = Title::newFromText( $value );
+   if ( !$title ) {
+   return $this->msg( 
'collaborationkit-createhub-invalidtitle' );
+   }
+
+   // TODO: Add an option to import it to itself as target if the
+   // page already exists, archiving the existing page to a 
subpage (T136475)
+   if ( $title->exists() ) {
+   return $this->msg( 'collaborationkit-createhub-exists' 
);
+   }
+
+   $handler = new CollaborationHubContentHandler();
+   if ( !$handler->canBeUsedOn( $title ) ) {
+   // Most likely a namespace issue.
+   $allowedNSConfig = $this->getConfig()->get( 
'CollaborationListAllowedNamespaces' );
+   $allowedNS = array_keys( array_filter( $allowedNSConfig 
) );
+   $lang = $this->getLanguage();
+   $textNS = array_map( [ $lang, 'getFormattedNsText' ], 
$allowedNS );
+var_dump( $textNS, $allowedNS );
+   return $this->msg( 
'collaborationkit-createhub-wrongnamespace' )
+   ->numParams( count( $textNS ) )
+   ->params( $lang->commaList( $textNS ) );
+   }
+
+   return true;
+   }
+
+   /**
 * Build and return the aossociative array for the content source field.
 * @param $mapping array
 * @return array
@@ -116,14 +152,18 @@
public function onSubmit( array

[MediaWiki-commits] [Gerrit] mediawiki...WebPlatformSearchAutocomplete[master]: Fix extension failing tests due to missing apihelp

2017-01-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331992 )

Change subject: Fix extension failing tests due to missing apihelp
..


Fix extension failing tests due to missing apihelp

Extension WebPlatformSearchAutocomplete failing tests due to missing
apihelp messages.

Bug: T155033
Change-Id: I8bd10fa4513894ead43ba754fa519d0e282d196c
---
M i18n/en.json
M i18n/qqq.json
M includes/api/ApiWebplatformSearch.php
3 files changed, 22 insertions(+), 15 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 7a3e8d1..abb343d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,8 @@
"Robert Vogel"
]
},
-   "webplatformsearchautocomplete-desc": "Provides customized autocomplete 
functionality for webplatform.org search"
+   "webplatformsearchautocomplete-desc": "Provides customized autocomplete 
functionality for webplatform.org search",
+   "apihelp-webplatformsearch-description": "Search the webplatform.org 
wiki",
+   "apihelp-webplatformsearch-param-term": "Search string",
+   "apihelp-webplatformsearch-example": "Show autocomplete result of 
typing 'Te'"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 026ef72..dab9e15 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -5,5 +5,8 @@
"Shirayuki"
]
},
-   "webplatformsearchautocomplete-desc": "{{desc|name=Web Platform Search 
Autocomplete|url=http://www.hallowelt.biz}};
+   "webplatformsearchautocomplete-desc": "{{desc|name=Web Platform Search 
Autocomplete|url=http://www.hallowelt.biz}};,
+   "apihelp-webplatformsearch-description": 
"{{doc-apihelp-description|webplatformsearch}}",
+   "apihelp-webplatformsearch-param-term": 
"{{doc-apihelp-param|webplatformsearch|term}}",
+   "apihelp-webplatformsearch-example": 
"{{doc-apihelp-example|webplatformsearch}}"
 }
diff --git a/includes/api/ApiWebplatformSearch.php 
b/includes/api/ApiWebplatformSearch.php
index 1214e91..cf3263b 100644
--- a/includes/api/ApiWebplatformSearch.php
+++ b/includes/api/ApiWebplatformSearch.php
@@ -1,7 +1,5 @@
 getMain()->setCacheMaxAge( $wgSearchSuggestCacheExpiry );
$this->getMain()->setCacheMode( 'public' );
-   
+
$db = $this->getDB( DB_SLAVE );
$res = $db->select(
'page',
@@ -88,22 +86,25 @@
);
}
 
-   public function getParamDescription() {
-   return array(
-   'term' => 'Search string'
-   );
-   }
-
-   public function getDescription() {
-   return 'Search the webplatform.org wiki';
-   }
-
+   /**
+   * @deprecated since MediaWiki core 1.25
+   */
public function getExamples() {
return array(
'api.php?action=webplatformsearch=Te'
);
}
 
+   /**
+   * @see ApiBase::getExamplesMessages()
+   */
+   protected function getExamplesMessages() {
+   return array(
+   'action=webplatformsearch=Te'
+   => 'apihelp-webplatformsearch-example'
+   );
+   }
+
public function getHelpUrls() {
return 'https://www.webplatform.org';
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8bd10fa4513894ead43ba754fa519d0e282d196c
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/WebPlatformSearchAutocomplete
Gerrit-Branch: master
Gerrit-Owner: DatGuy 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Phantom42 
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] mediawiki...VisualEditor[master]: Correct BlockImageNode to MWBlockImageNode in comment

2017-01-14 Thread Tchanders (Code Review)

Tchanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332091 )

Change subject: Correct BlockImageNode to MWBlockImageNode in comment
..

Correct BlockImageNode to MWBlockImageNode in comment

Change-Id: I99058f97ac74b57c648be51cdb267d24a197b16a
---
M modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
index d83e1b8..f7f938c 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
@@ -29,7 +29,7 @@
this.captionVisible = false;
this.typeToRdfa = this.getTypeToRdfa();
 
-   // DOM Hierarchy for BlockImageNode:
+   // DOM Hierarchy for MWBlockImageNode:
//this.$element (ve-ce-mwBlockImageNode-{type})
//  this.$a
//this.$image

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99058f97ac74b57c648be51cdb267d24a197b16a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint module: Linting changes

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332096 )

Change subject: contint module: Linting changes
..

contint module: Linting changes

Add trailing commas to abide by the Coding Style guidelines

Use full names for class names, as relative names are not allowed in
future Puppet versions

Bug: T93645
Change-Id: Ibb12d8d8cbe17344ef74ef83a5aa6eee40767c15
---
M modules/contint/manifests/browsers.pp
M modules/contint/manifests/browsertests.pp
M modules/contint/manifests/composer.pp
M modules/contint/manifests/firewall.pp
M modules/contint/manifests/firewall/labs.pp
M modules/contint/manifests/package_builder.pp
M modules/contint/manifests/packages/analytics.pp
M modules/contint/manifests/packages/androidsdk.pp
M modules/contint/manifests/packages/apt.pp
M modules/contint/manifests/packages/labs.pp
M modules/contint/manifests/packages/ops.pp
M modules/contint/manifests/packages/ruby.pp
M modules/contint/manifests/php.pp
M modules/contint/manifests/phpunit.pp
M modules/contint/manifests/proxy_jenkins.pp
M modules/contint/manifests/proxy_zuul.pp
M modules/contint/manifests/slave_scripts.pp
M modules/contint/manifests/website/labs.pp
18 files changed, 27 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/332096/1

diff --git a/modules/contint/manifests/browsers.pp 
b/modules/contint/manifests/browsers.pp
index 46d6eb0..d4bd15a 100644
--- a/modules/contint/manifests/browsers.pp
+++ b/modules/contint/manifests/browsers.pp
@@ -43,7 +43,7 @@
 }
 
 
-class { 'xvfb':
+class { '::xvfb':
 display=> 94,
 resolution => '1280x1024x24',
 }
diff --git a/modules/contint/manifests/browsertests.pp 
b/modules/contint/manifests/browsertests.pp
index 51eae39..8cdc452 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -2,10 +2,10 @@
 #
 class contint::browsertests {
 
-include contint::packages::ruby
+include ::contint::packages::ruby
 
 # Provides phantomjs, firefox and xvfb
-include contint::browsers
+include ::contint::browsers
 
 # For Selenium jobs recording (T113520)
 package { 'libav-tools':
diff --git a/modules/contint/manifests/composer.pp 
b/modules/contint/manifests/composer.pp
index 6ee3c8c..3dcedea 100644
--- a/modules/contint/manifests/composer.pp
+++ b/modules/contint/manifests/composer.pp
@@ -5,7 +5,7 @@
 #
 class contint::composer {
 
-require contint::deployment_dir
+require ::contint::deployment_dir
 
 git::clone { 'jenkins CI Composer':
 ensure => 'latest',
diff --git a/modules/contint/manifests/firewall.pp 
b/modules/contint/manifests/firewall.pp
index 79c6a99..ea950af 100644
--- a/modules/contint/manifests/firewall.pp
+++ b/modules/contint/manifests/firewall.pp
@@ -1,19 +1,19 @@
 # vim: set ts=4 sw=4 et:
 class contint::firewall {
 
-include base::firewall
-include network::constants
+include ::base::firewall
+include ::network::constants
 
 # Restrict some services to be only reacheable from localhost over both
 # IPv4 and IPv6 (to be safe)
 
 # Jenkins on port 8080, reacheable via Apache proxying the requests
 ferm::rule { 'jenkins_localhost_only':
-rule => 'proto tcp dport 8080 { saddr (127.0.0.1 ::1) ACCEPT; }'
+rule => 'proto tcp dport 8080 { saddr (127.0.0.1 ::1) ACCEPT; }',
 }
 # Zuul status page on port 8001, reacheable via Apache proxying the 
requests
 ferm::rule { 'zuul_localhost_only':
-rule => 'proto tcp dport 8001 { saddr (127.0.0.1 ::1) ACCEPT; }'
+rule => 'proto tcp dport 8001 { saddr (127.0.0.1 ::1) ACCEPT; }',
 }
 
 # Gearman is used between Zuul and the Jenkin master, both on the same
diff --git a/modules/contint/manifests/firewall/labs.pp 
b/modules/contint/manifests/firewall/labs.pp
index 93fa0c1..ca371f7 100644
--- a/modules/contint/manifests/firewall/labs.pp
+++ b/modules/contint/manifests/firewall/labs.pp
@@ -9,11 +9,11 @@
 ferm::service { 'contint1001_ssh_to_slaves':
 proto  => 'tcp',
 port   => '22',
-srange => '@resolve(contint1001.wikimedia.org)'
+srange => '@resolve(contint1001.wikimedia.org)',
 }
 ferm::service { 'contint2001_ssh_to_slaves':
 proto  => 'tcp',
 port   => '22',
-srange => '@resolve(contint2001.wikimedia.org)'
+srange => '@resolve(contint2001.wikimedia.org)',
 }
 }
diff --git a/modules/contint/manifests/package_builder.pp 
b/modules/contint/manifests/package_builder.pp
index 885188a..fc0de36 100644
--- a/modules/contint/manifests/package_builder.pp
+++ b/modules/contint/manifests/package_builder.pp
@@ -32,7 +32,7 @@
 ],
 # Cowdancer is confused by /var/cache/pbuilder being a symlink
 # causing it to fail to properly --update cow images. T125999
-basepath =>

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dataset module: Linting changes

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332097 )

Change subject: dataset module: Linting changes
..

dataset module: Linting changes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: I6090bd9f3fc5d0112ec370f472f2106e3ab4d194
---
M modules/dataset/manifests/common.pp
M modules/dataset/manifests/cron/kiwix.pp
M modules/dataset/manifests/cron/rsync/labs.pp
M modules/dataset/manifests/cron/rsync/nginxlogs.pp
M modules/dataset/manifests/cron/rsync/peers.pp
M modules/dataset/manifests/cron/wikitech_dumps.pp
M modules/dataset/manifests/dirs.pp
M modules/dataset/manifests/html.pp
M modules/dataset/manifests/init.pp
M modules/dataset/manifests/rsync/pagecounts_ez.pp
M modules/dataset/manifests/rsync/peers.pp
M modules/dataset/manifests/rsync/phab_dump.pp
M modules/dataset/manifests/rsync/public.pp
M modules/dataset/manifests/user.pp
14 files changed, 29 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/332097/1

diff --git a/modules/dataset/manifests/common.pp 
b/modules/dataset/manifests/common.pp
index c0417cf..85f8ace 100644
--- a/modules/dataset/manifests/common.pp
+++ b/modules/dataset/manifests/common.pp
@@ -3,5 +3,5 @@
 ensure => present,
 }
 
-include vm::higher_min_free_kbytes
+include ::vm::higher_min_free_kbytes
 }
diff --git a/modules/dataset/manifests/cron/kiwix.pp 
b/modules/dataset/manifests/cron/kiwix.pp
index 46cfaf0..b1ed8bd 100644
--- a/modules/dataset/manifests/cron/kiwix.pp
+++ b/modules/dataset/manifests/cron/kiwix.pp
@@ -9,7 +9,7 @@
 $ensure = 'absent'
 }
 
-include dataset::common
+include ::dataset::common
 
 group { 'mirror':
 ensure => 'present',
diff --git a/modules/dataset/manifests/cron/rsync/labs.pp 
b/modules/dataset/manifests/cron/rsync/labs.pp
index 50f5403..f6fad4f 100644
--- a/modules/dataset/manifests/cron/rsync/labs.pp
+++ b/modules/dataset/manifests/cron/rsync/labs.pp
@@ -1,5 +1,5 @@
 class dataset::cron::rsync::labs($enable=true) {
-include dataset::common
+include ::dataset::common
 
 if ($enable) {
 $ensure = 'present'
diff --git a/modules/dataset/manifests/cron/rsync/nginxlogs.pp 
b/modules/dataset/manifests/cron/rsync/nginxlogs.pp
index 6bbd3bf..c9624fc 100644
--- a/modules/dataset/manifests/cron/rsync/nginxlogs.pp
+++ b/modules/dataset/manifests/cron/rsync/nginxlogs.pp
@@ -4,7 +4,7 @@
 $user   = 'root',
 )
 {
-include dataset::common
+include ::dataset::common
 
 $ensure = $enable ? {
 true=> 'present',
diff --git a/modules/dataset/manifests/cron/rsync/peers.pp 
b/modules/dataset/manifests/cron/rsync/peers.pp
index 116789e..a6c86fa 100644
--- a/modules/dataset/manifests/cron/rsync/peers.pp
+++ b/modules/dataset/manifests/cron/rsync/peers.pp
@@ -1,5 +1,5 @@
 class dataset::cron::rsync::peers($enable=true) {
-include dataset::common
+include ::dataset::common
 
 if ($enable) {
 $ensure = 'present'
diff --git a/modules/dataset/manifests/cron/wikitech_dumps.pp 
b/modules/dataset/manifests/cron/wikitech_dumps.pp
index 38dcf03..987085c 100644
--- a/modules/dataset/manifests/cron/wikitech_dumps.pp
+++ b/modules/dataset/manifests/cron/wikitech_dumps.pp
@@ -11,7 +11,7 @@
 $ensure = 'absent'
 }
 
-include dataset::dirs
+include ::dataset::dirs
 
 $wikitechdir = "${dataset::dirs::otherdir}/wikitech"
 
diff --git a/modules/dataset/manifests/dirs.pp 
b/modules/dataset/manifests/dirs.pp
index b4214ea..4cdfcb2 100644
--- a/modules/dataset/manifests/dirs.pp
+++ b/modules/dataset/manifests/dirs.pp
@@ -77,7 +77,7 @@
 # needs to be relative because it is mounted via NFS at differing names
 file { "${publicdir}/wikidatawiki/entities":
 ensure => 'link',
-target => "../${relative_wikidatawiki}"
+target => "../${relative_wikidatawiki}",
 }
 
 # Legacy
diff --git a/modules/dataset/manifests/html.pp 
b/modules/dataset/manifests/html.pp
index 9ba1d39..d358587 100644
--- a/modules/dataset/manifests/html.pp
+++ b/modules/dataset/manifests/html.pp
@@ -7,7 +7,7 @@
 $analytics  = true,
 ) {
 
-include dataset::dirs
+include ::dataset::dirs
 
 if ($other) {
 file { "${dataset::dirs::otherdir}/index.html":
diff --git a/modules/dataset/manifests/init.pp 
b/modules/dataset/manifests/init.pp
index ee86c95..c60f017 100644
--- a/modules/dataset/manifests/init.pp
+++ b/modules/dataset/manifests/init.pp
@@ -17,12 +17,12 @@
 $grabs   = {}
 ) {
 
-include dataset::common
-require dataset::user
+include ::dataset::common
+require ::dataset::user
 
 $rsync_public_enable = has_key($rsync,'public')
-class { 'dataset::rsync::public': enable => $rsync_public_enable }
-class

[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool module: Linting changes

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332095 )

Change subject: conftool module: Linting changes
..

conftool module: Linting changes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645

Change-Id: I30679b88deb7764b40c477047dc0d45418ee5fc2
---
M modules/conftool/manifests/credentials.pp
M modules/conftool/manifests/init.pp
M modules/conftool/manifests/master.pp
M modules/conftool/manifests/scripts.pp
4 files changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/332095/1

diff --git a/modules/conftool/manifests/credentials.pp 
b/modules/conftool/manifests/credentials.pp
index 46229ad..17d33cb 100644
--- a/modules/conftool/manifests/credentials.pp
+++ b/modules/conftool/manifests/credentials.pp
@@ -16,7 +16,7 @@
 settings => {
 username => 'conftool',
 password => $::conftool::password,
-}
+},
 }
 
 }
diff --git a/modules/conftool/manifests/init.pp 
b/modules/conftool/manifests/init.pp
index 8e745e6..2fe6895 100644
--- a/modules/conftool/manifests/init.pp
+++ b/modules/conftool/manifests/init.pp
@@ -11,7 +11,7 @@
 $hosts   = [
 'https://conf1001.eqiad.wmnet:2379',
 'https://conf1002.eqiad.wmnet:2379',
-'https://conf1003.eqiad.wmnet:2379'
+'https://conf1003.eqiad.wmnet:2379',
 ],
 $tcpircbot_host = 'icinga.wikimedia.org',
 $tcpircbot_port = 9200,
@@ -37,13 +37,13 @@
 tcpircbot_host => $tcpircbot_host,
 tcpircbot_port => $tcpircbot_port,
 driver_options => {
-allow_reconnect => true
-}
+allow_reconnect => true,
+},
 }),
 }
 
 if $auth {
 # Install basic auth data
-require etcd::auth::common
+require ::etcd::auth::common
 }
 }
diff --git a/modules/conftool/manifests/master.pp 
b/modules/conftool/manifests/master.pp
index 67ed8ee..d1effbc 100644
--- a/modules/conftool/manifests/master.pp
+++ b/modules/conftool/manifests/master.pp
@@ -4,7 +4,7 @@
 #
 class conftool::master($sync_dir = '/etc/conftool/data') {
 
-require conftool
+require ::conftool
 
 require ::puppetmaster::base_repo
 
@@ -20,7 +20,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0500',
-content => template('conftool/conftool-merge.erb')
+content => template('conftool/conftool-merge.erb'),
 }
 
 if $::conftool::auth {
@@ -28,8 +28,8 @@
 etcd_role { 'conftool':
 ensure => present,
 acls   => {
-'/conftool/*' => 'RW'
-}
+'/conftool/*' => 'RW',
+},
 }
 
 if $::conftool::password != undef {
diff --git a/modules/conftool/manifests/scripts.pp 
b/modules/conftool/manifests/scripts.pp
index f03e3f7..84ecb6a 100644
--- a/modules/conftool/manifests/scripts.pp
+++ b/modules/conftool/manifests/scripts.pp
@@ -13,7 +13,7 @@
 #include conftool::scripts
 #}
 class conftool::scripts {
-require conftool
+require ::conftool
 
 file { '/usr/local/bin/pooler-loop':
 ensure => present,
@@ -28,7 +28,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0555',
-content => template('conftool/pool.erb')
+content => template('conftool/pool.erb'),
 }
 
 file { '/usr/local/bin/depool':
@@ -36,7 +36,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0555',
-content => template('conftool/depool.erb')
+content => template('conftool/depool.erb'),
 }
 
 file { '/usr/local/bin/drain':
@@ -44,7 +44,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0555',
-content => template('conftool/drain.erb')
+content => template('conftool/drain.erb'),
 }
 
 file { '/usr/local/bin/decommission':
@@ -52,7 +52,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0555',
-content => template('conftool/decommission.erb')
+content => template('conftool/decommission.erb'),
 }
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: postgresql module: Linting changes

2017-01-14 Thread Juniorsys (Code Review)

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332104 )

Change subject: postgresql module: Linting changes
..

postgresql module: Linting changes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Quote values in selectors

Add missing trailing comma

Bug: T93645

Change-Id: If0b97e0ee2f597f479e48861c45d6cbf50100fd2
---
M modules/postgresql/manifests/dirs.pp
M modules/postgresql/manifests/master.pp
M modules/postgresql/manifests/packages.pp
M modules/postgresql/manifests/postgis.pp
M modules/postgresql/manifests/server.pp
M modules/postgresql/manifests/slave.pp
M modules/postgresql/manifests/user.pp
M modules/postgresql/tests/ganglia.pp
M modules/postgresql/tests/master.pp
M modules/postgresql/tests/postgis.pp
M modules/postgresql/tests/server.pp
M modules/postgresql/tests/slave.pp
M modules/postgresql/tests/spatial.pp
M modules/postgresql/tests/user.pp
14 files changed, 37 insertions(+), 37 deletions(-)


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

diff --git a/modules/postgresql/manifests/dirs.pp 
b/modules/postgresql/manifests/dirs.pp
index a4948c8..ccc32d3 100644
--- a/modules/postgresql/manifests/dirs.pp
+++ b/modules/postgresql/manifests/dirs.pp
@@ -26,9 +26,9 @@
 #
 class postgresql::dirs(
 $pgversion= $::lsbdistcodename ? {
-jessie  => '9.4',
-precise => '9.1',
-trusty  => '9.3',
+'jessie'  => '9.4',
+'precise' => '9.1',
+'trusty'  => '9.3',
 },
 $ensure   = 'present',
 $root_dir = '/var/lib/postgresql',
diff --git a/modules/postgresql/manifests/master.pp 
b/modules/postgresql/manifests/master.pp
index 6b3b554..dd86259 100644
--- a/modules/postgresql/manifests/master.pp
+++ b/modules/postgresql/manifests/master.pp
@@ -38,9 +38,9 @@
 $master_server=$::fqdn,
 $includes=[],
 $pgversion = $::lsbdistcodename ? {
-jessie  => '9.4',
-precise => '9.1',
-trusty  => '9.3',
+'jessie'  => '9.4',
+'precise' => '9.1',
+'trusty'  => '9.3',
 },
 $ensure='present',
 $max_wal_senders=5,
@@ -53,7 +53,7 @@
 
 $data_dir = "${root_dir}/${pgversion}/main"
 
-class { 'postgresql::server':
+class { '::postgresql::server':
 ensure=> $ensure,
 pgversion => $pgversion,
 includes  => [ $includes, 'master.conf'],
diff --git a/modules/postgresql/manifests/packages.pp 
b/modules/postgresql/manifests/packages.pp
index cefed50..4d88cc2 100644
--- a/modules/postgresql/manifests/packages.pp
+++ b/modules/postgresql/manifests/packages.pp
@@ -22,9 +22,9 @@
 #
 class postgresql::packages(
 $pgversion= $::lsbdistcodename ? {
-jessie  => '9.4',
-precise => '9.1',
-trusty  => '9.3',
+'jessie'  => '9.4',
+'precise' => '9.1',
+'trusty'  => '9.3',
 },
 $ensure   = 'present',
 ) {
diff --git a/modules/postgresql/manifests/postgis.pp 
b/modules/postgresql/manifests/postgis.pp
index 6eae8b4..864b680 100644
--- a/modules/postgresql/manifests/postgis.pp
+++ b/modules/postgresql/manifests/postgis.pp
@@ -15,15 +15,15 @@
 class postgresql::postgis(
 $ensure = 'present',
 $postgresql_postgis_package = $::lsbdistcodename ? {
-jessie  => 'postgresql-9.4-postgis-2.3',
-precise => 'postgresql-9.1-postgis',
-trusty  => 'postgresql-9.3-postgis-2.1',
+'jessie'  => 'postgresql-9.4-postgis-2.3',
+'precise' => 'postgresql-9.1-postgis',
+'trusty'  => 'postgresql-9.3-postgis-2.1',
 },
 $install_postgis_scripts = $::lsbdistcodename ? {
-jessie  => true,
-precise => false,
-trusty  => true,
-default => true,
+'jessie'  => true,
+'precise' => false,
+'trusty'  => true,
+default   => true,
 },
 ) {
 validate_bool($install_postgis_scripts)
diff --git a/modules/postgresql/manifests/server.pp 
b/modules/postgresql/manifests/server.pp
index 49d4572..1a9ac0e 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -29,9 +29,9 @@
 #
 class postgresql::server(
 $pgversion= $::lsbdistcodename ? {
-jessie  => '9.4',
-precise => '9.1',
-trusty  => '9.3',
+'jessie'  => '9.4',
+'precise' => '9.1',
+'trusty'  => '9.3',
 },
 $ensure   = 'present',
 $includes = [],
@@ -50,8 +50,8 @@
 $data_dir = "${root_dir}/${pgversion}/main"
 
 $service_name = $::lsbdistcodename ? {
-jessie => "postgresql@${pgversion}-main",
-default => 'postgresql'
+'jessie' => "postgresql@${pgversion}-main",
+default  => 'postgresql',
 }
 exec { 'pgreload':
 command => "/usr/bin/pg_ctlcluster ${pgversion} main reload",
diff --git

1 2 >

1 - 100 of 145 matches

Mail list logo