date:20160106

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

2016-01-06 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2016-01-06T10:00:01+
..

New Wikidata Build - 2016-01-06T10:00:01+

Change-Id: Iff57db2cb59004919c84827c37912c8232db99a8
---
M composer.lock
M extensions/Wikibase/client/i18n/la.json
M extensions/Wikibase/composer.json
M extensions/Wikibase/lib/i18n/lki.json
M extensions/Wikibase/lib/tests/phpunit/changes/EntityChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/store/FieldPropertyInfoProviderTest.php
A extensions/Wikibase/lib/tests/phpunit/store/RedirectRevisionTest.php
M extensions/Wikibase/repo/i18n/de.json
M extensions/Wikibase/repo/i18n/fr.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/it.json
M extensions/Wikibase/repo/i18n/lki.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/includes/content/EntityHandler.php
M extensions/Wikibase/repo/includes/specials/SpecialEntitiesWithoutPage.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/CachingCommonsMediaFileNameLookupTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/DataTypeSelectorTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/content/EntityHandlerTest.php
R 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/Values/ObjectUriRdfBuilderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutPageTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
23 files changed, 330 insertions(+), 123 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 5887e42..a628236 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1448,12 +1448,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "20a83bd7b45506722f93a332be6d07ca96cec058"
+"reference": "ca2aefbf10b3ea6da8687193ceb216c87d709c77"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/20a83bd7b45506722f93a332be6d07ca96cec058;,
-"reference": "20a83bd7b45506722f93a332be6d07ca96cec058",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ca2aefbf10b3ea6da8687193ceb216c87d709c77;,
+"reference": "ca2aefbf10b3ea6da8687193ceb216c87d709c77",
 "shasum": ""
 },
 "require": {
@@ -1482,7 +1482,7 @@
 "mediawiki/mediawiki": "<1.25"
 },
 "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
+"jakub-onderka/php-parallel-lint": "0.9.2",
 "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
 },
 "type": "mediawiki-extension",
@@ -1524,7 +1524,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-01-05 05:20:28"
+"time": "2016-01-06 00:30:13"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/la.json 
b/extensions/Wikibase/client/i18n/la.json
index 7f904ad..d1400c3 100644
--- a/extensions/Wikibase/client/i18n/la.json
+++ b/extensions/Wikibase/client/i18n/la.json
@@ -15,5 +15,6 @@
"wikibase-rc-hide-wikidata": "$1 Vicidata",
"wikibase-rc-hide-wikidata-hide": "Celare",
"wikibase-rc-hide-wikidata-show": "Monstrare",
-   "wikibase-rc-wikibase-edit-title": "Recensio apud Wikidata facta"
+   "wikibase-rc-wikibase-edit-title": "Recensio apud Wikidata facta",
+   "wikibase-watchlist-show-changes-pref": "Mutationes apud {{WBREPONAME}} 
factas, siquae paginas observandas afficiant, in earum indice ostendere"
 }
diff --git a/extensions/Wikibase/composer.json 
b/extensions/Wikibase/composer.json
index 66e89d3..3e31c9b 100644
--- a/extensions/Wikibase/composer.json
+++ b/extensions/Wikibase/composer.json
@@ -22,7 +22,6 @@
},
"require": {
"php": ">=5.3.2",
-
"data-values/data-values": "~1.0",
"data-values/common": "~0.3.0",
"data-values/geo": "~1.0",
@@ -34,7 +33,6 @@
"data-values/serialization": "~1.0",
"data-values/javascript": "~0.6.0|~0.7.0",
"data-values/value-view": "~0.15.6",
-
"wikibase/data-model": "~4.0",
"wikibase/data-model-serialization": "~2.0",
"wikibase/internal-serialization": "~2.0",
@@ -42,11 +40,10 @@

[MediaWiki-commits] [Gerrit] (WIP) Make bunch of jslint jobs voting (WIP) - change (integration/config)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: (WIP) Make bunch of jslint jobs voting (WIP)
..

(WIP) Make bunch of jslint jobs voting (WIP)

Verified each of them had recent build passing.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/00/262700/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f6012e6..e610b51 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -750,8 +750,6 @@
 voting: false
   - name: mwext-Configure-jslint # bug 61596
 voting: false
-  - name: mwext-ContributionReporting-jslint # obsolete - bug 61598
-voting: false
   - name: mwext-ContributionTracking-jslint # bug 61599
 voting: false
   - name: mwext-CustomUserSignup-jslint # bug 61600
@@ -759,8 +757,6 @@
   - name: mwext-Drafts-jslint # bug 61603
 voting: false
   - name: mwext-DumpHTML-jslint # bug 61604
-voting: false
-  - name: mwext-DynamicSidebar-jslint # bug 61605
 voting: false
   - name: mwext-FundraisingChart-jslint # bug 66192
 voting: false
@@ -774,10 +770,6 @@
 voting: false
   - name: mwext-ReaderFeedback-jslint # bug 61622
 voting: false
-  - name: mwext-ReplaceSet-jslint # bug 61623
-voting: false
-  - name: mwext-ReplaceText-jslint # bug 61624
-voting: false
   - name: mwext-SVGEdit-jslint # bug 61625
 voting: false
   - name: mwext-SecurePoll-jslint # bug 61626
@@ -787,8 +779,6 @@
   - name: mwext-SemanticExpressiveness-jslint # bug 61629
 voting: false
   - name: mwext-SemanticImageInput-jslint # bug 61632
-voting: false
-  - name: mwext-SemanticMaps-jslint # bug 61633
 voting: false
   - name: mwext-SemanticResultFormats-jslint # bug 61634
 voting: false
@@ -809,193 +799,39 @@
   - name: wikimedia-fundraising-crm-jslint
 voting: false
 # Start of new currently disabled extensions checks from mass extension import 
- Addshore
-  - name: mwext-AjaxLogin-jslint
-voting: false
   - name: mwext-ApiExplorer-jslint
 voting: false
   - name: mwext-ArticleCreationWorkflow-jslint
-voting: false
-  - name: mwext-ArticleIndex-jslint
 voting: false
   - name: mwext-BiblioPlus-jslint
 voting: false
   - name: mwext-BibManager-jslint
 voting: false
-  - name: mwext-BreadCrumbs2-jslint
-voting: false
-  - name: mwext-Carp-jslint
-voting: false
-  - name: mwext-CategorySlideShow-jslint
-voting: false
-  - name: mwext-CategorySortHeaders-jslint
-voting: false
-  - name: mwext-CategoryTests-jslint
-voting: false
-  - name: mwext-CentralLogging-jslint
-voting: false
-  - name: mwext-Checkpoint-jslint
-voting: false
-  - name: mwext-CloseWikis-jslint
-voting: false
-  - name: mwext-Commentbox-jslint
-voting: false
-  - name: mwext-CommentPages-jslint
-voting: false
-  - name: mwext-Comments-jslint
-voting: false
-  - name: mwext-CommunityTwitter-jslint
-voting: false
-  - name: mwext-ConditionalShowSection-jslint
-voting: false
-  - name: mwext-CongressLookup-jslint
-voting: false
   - name: mwext-Contest-jslint
-voting: false
-  - name: mwext-Contributors-jslint
 voting: false
   - name: mwext-Convert2Wiki-jslint
 voting: false
-  - name: mwext-CopyToClipboard-jslint
-voting: false
-  - name: mwext-CreatePage-jslint
-voting: false
-  - name: mwext-CreateRedirect-jslint
-voting: false
-  - name: mwext-CreditTab-jslint
-voting: false
-  - name: mwext-CryoKey-jslint
-voting: false
   - name: mwext-CSS-jslint
-voting: false
-  - name: mwext-DataTransfer-jslint
-voting: false
-  - name: mwext-DeleteOwn-jslint
-voting: false
-  - name: mwext-Description2-jslint
-voting: false
-  - name: mwext-DeviceMapLogCapture-jslint
-voting: false
-  - name: mwext-Diagnosis-jslint
 voting: false
   - name: mwext-Dice-jslint
 voting: false
-  - name: mwext-DidYouKnow-jslint
-voting: false
-  - name: mwext-DidYouMean-jslint
-voting: false
   - name: mwext-DisqusTag-jslint
-voting: false
-  - name: mwext-DjangoAnalytics-jslint
-voting: false
-  - name: mwext-DownloadCounter-jslint
-voting: false
-  - name: mwext-DPLforum-jslint
-voting: false
-  - name: mwext-Duplicator-jslint
-voting: false
-  - name: mwext-DynamicPageList-jslint
-voting: false
-  - name: mwext-EditSubpages-jslint
-voting: false
-  - name: mwext-EnhanceContactForm-jslint
-voting: false
-  - name: mwext-ErrorHandler-jslint
-voting: false
-  - name: mwext-EtherpadLite-jslint
 voting: false
   - name: mwext-examples-jslint
 voting: false
-  - name: mwext-ExternalArticles-jslint
-voting: false
-  - name: mwext-ExternalData-jslint
-voting: false
-  - name: mwext-ExtraLanguageLink-jslint
-voting: false
   - name: mwext-ExtTab-jslint

[MediaWiki-commits] [Gerrit] Reinstall spare analytics1017 as Jessie for mw dev summit Ju... - change (operations/puppet)

2016-01-06 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Reinstall spare analytics1017 as Jessie for mw dev summit 
Jupyter hacking
..


Reinstall spare analytics1017 as Jessie for mw dev summit Jupyter hacking

Change-Id: I997497324c666afeefbab8ae006e8ad9269333bd
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index aafa4bc..4ce8dd1 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -31,6 +31,8 @@
 host analytics1017 {
hardware ethernet 90:b1:1c:12:8f:9a;
fixed-address analytics1017.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host analytics1021 {

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

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

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

[MediaWiki-commits] [Gerrit] Reinstall spare analytics1017 as Jessie for mw dev summit Ju... - change (operations/puppet)

2016-01-06 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Reinstall spare analytics1017 as Jessie for mw dev summit 
Jupyter hacking
..

Reinstall spare analytics1017 as Jessie for mw dev summit Jupyter hacking

Change-Id: I997497324c666afeefbab8ae006e8ad9269333bd
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index aafa4bc..4ce8dd1 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -31,6 +31,8 @@
 host analytics1017 {
hardware ethernet 90:b1:1c:12:8f:9a;
fixed-address analytics1017.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host analytics1021 {

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

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

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

[MediaWiki-commits] [Gerrit] Add PMID as hint - change (mediawiki...Citoid)

2016-01-06 Thread Mvolz (Code Review)

Mvolz has submitted this change and it was merged.

Change subject: Add PMID as hint
..


Add PMID as hint

Bug: T122427
Change-Id: I424ba86220f9170afc7871596e3a7f64cecc01e2
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 5238500..c8bf905 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,7 +10,7 @@
"citoid-citefromiddialog-mode-manual": "Manual",
"citoid-citefromiddialog-mode-reuse": "Re-use",
"citoid-citefromiddialog-search": "Search",
-   "citoid-citefromiddialog-search-label": "URL or DOI",
+   "citoid-citefromiddialog-search-label": "URL, DOI or PMID",
"citoid-citefromiddialog-search-placeholder": "e.g. 
http://www.example.com;,
"citoid-citefromiddialog-search-progress": "Searching, please wait...",
"citoid-citefromiddialog-title": "Add a citation",
@@ -20,4 +20,4 @@
"citoid-referencecontextitem-convert-button": "Convert",
"citoid-referencecontextitem-convert-message": "This reference consists 
of just an external link. You can use the 
\"{{int:citoid-referencecontextitem-convert-button}}\" button below to generate 
a properly formatted reference.",
"citoid-unknown-error": "An unknown error has occured that prevented us 
from creating a citation. Please try again later."
-}
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I424ba86220f9170afc7871596e3a7f64cecc01e2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mvolz 
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] Make bunch of mwext jslint jobs voting - change (integration/config)

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

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

Change subject: Make bunch of mwext jslint jobs voting
..


Make bunch of mwext jslint jobs voting

Verified each of them had recent build passing.

Bug: T62619
Change-Id: Ibf7acab21b8ac73e7401e89159deed296c4b166a
---
M zuul/layout.yaml
1 file changed, 0 insertions(+), 456 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f6012e6..043b437 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -750,8 +750,6 @@
 voting: false
   - name: mwext-Configure-jslint # bug 61596
 voting: false
-  - name: mwext-ContributionReporting-jslint # obsolete - bug 61598
-voting: false
   - name: mwext-ContributionTracking-jslint # bug 61599
 voting: false
   - name: mwext-CustomUserSignup-jslint # bug 61600
@@ -759,8 +757,6 @@
   - name: mwext-Drafts-jslint # bug 61603
 voting: false
   - name: mwext-DumpHTML-jslint # bug 61604
-voting: false
-  - name: mwext-DynamicSidebar-jslint # bug 61605
 voting: false
   - name: mwext-FundraisingChart-jslint # bug 66192
 voting: false
@@ -774,10 +770,6 @@
 voting: false
   - name: mwext-ReaderFeedback-jslint # bug 61622
 voting: false
-  - name: mwext-ReplaceSet-jslint # bug 61623
-voting: false
-  - name: mwext-ReplaceText-jslint # bug 61624
-voting: false
   - name: mwext-SVGEdit-jslint # bug 61625
 voting: false
   - name: mwext-SecurePoll-jslint # bug 61626
@@ -787,8 +779,6 @@
   - name: mwext-SemanticExpressiveness-jslint # bug 61629
 voting: false
   - name: mwext-SemanticImageInput-jslint # bug 61632
-voting: false
-  - name: mwext-SemanticMaps-jslint # bug 61633
 voting: false
   - name: mwext-SemanticResultFormats-jslint # bug 61634
 voting: false
@@ -800,202 +790,40 @@
 voting: false
   - name: mwext-Survey-jslint # bug 61637
 voting: false
-  - name: mwext-TocTree-jslint # bug 61640
-voting: false
   - name: mwext-WikiObjectModel-jslint # bug 66193 abandoned?
-voting: false
-  - name: mwext-ZeroBanner-jslint # bug 65817
 voting: false
   - name: wikimedia-fundraising-crm-jslint
 voting: false
 # Start of new currently disabled extensions checks from mass extension import 
- Addshore
-  - name: mwext-AjaxLogin-jslint
-voting: false
   - name: mwext-ApiExplorer-jslint
 voting: false
   - name: mwext-ArticleCreationWorkflow-jslint
-voting: false
-  - name: mwext-ArticleIndex-jslint
 voting: false
   - name: mwext-BiblioPlus-jslint
 voting: false
   - name: mwext-BibManager-jslint
 voting: false
-  - name: mwext-BreadCrumbs2-jslint
-voting: false
-  - name: mwext-Carp-jslint
-voting: false
-  - name: mwext-CategorySlideShow-jslint
-voting: false
-  - name: mwext-CategorySortHeaders-jslint
-voting: false
-  - name: mwext-CategoryTests-jslint
-voting: false
-  - name: mwext-CentralLogging-jslint
-voting: false
-  - name: mwext-Checkpoint-jslint
-voting: false
-  - name: mwext-CloseWikis-jslint
-voting: false
-  - name: mwext-Commentbox-jslint
-voting: false
-  - name: mwext-CommentPages-jslint
-voting: false
-  - name: mwext-Comments-jslint
-voting: false
-  - name: mwext-CommunityTwitter-jslint
-voting: false
-  - name: mwext-ConditionalShowSection-jslint
-voting: false
-  - name: mwext-CongressLookup-jslint
-voting: false
   - name: mwext-Contest-jslint
-voting: false
-  - name: mwext-Contributors-jslint
 voting: false
   - name: mwext-Convert2Wiki-jslint
 voting: false
-  - name: mwext-CopyToClipboard-jslint
-voting: false
-  - name: mwext-CreatePage-jslint
-voting: false
-  - name: mwext-CreateRedirect-jslint
-voting: false
-  - name: mwext-CreditTab-jslint
-voting: false
-  - name: mwext-CryoKey-jslint
-voting: false
   - name: mwext-CSS-jslint
-voting: false
-  - name: mwext-DataTransfer-jslint
-voting: false
-  - name: mwext-DeleteOwn-jslint
-voting: false
-  - name: mwext-Description2-jslint
-voting: false
-  - name: mwext-DeviceMapLogCapture-jslint
-voting: false
-  - name: mwext-Diagnosis-jslint
 voting: false
   - name: mwext-Dice-jslint
 voting: false
-  - name: mwext-DidYouKnow-jslint
-voting: false
-  - name: mwext-DidYouMean-jslint
-voting: false
   - name: mwext-DisqusTag-jslint
-voting: false
-  - name: mwext-DjangoAnalytics-jslint
-voting: false
-  - name: mwext-DownloadCounter-jslint
-voting: false
-  - name: mwext-DPLforum-jslint
-voting: false
-  - name: mwext-Duplicator-jslint
-voting: false
-  - name: mwext-DynamicPageList-jslint
-voting: false
-  - name: mwext-EditSubpages-jslint
-voting: false
-  - name: mwext-EnhanceContactForm-jslint
-voting: false
-  - name: mwext-ErrorHandler-jslint
-voting: false
-  - name: mwext-EtherpadLite-jslint
-voting: false
-  - name:

[MediaWiki-commits] [Gerrit] Pass jshint and add it to 'npm test' command - change (mediawiki...ContributionTracking)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Pass jshint and add it to 'npm test' command
..

Pass jshint and add it to 'npm test' command

Bug: T63599
Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
---
M Gruntfile.js
M modules/jquery.contributionTracking.js
M package.json
3 files changed, 17 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContributionTracking 
refs/changes/03/262703/1

diff --git a/Gruntfile.js b/Gruntfile.js
index a42ad79..beb732b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,12 +8,19 @@
 module.exports = function ( grunt ) {
'use strict';
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.initConfig( {
banana: {
all: ['i18n/']
+   },
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
}
} );
 
-   grunt.registerTask( 'test', [ 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/jquery.contributionTracking.js 
b/modules/jquery.contributionTracking.js
index 4e54990..3315dd3 100644
--- a/modules/jquery.contributionTracking.js
+++ b/modules/jquery.contributionTracking.js
@@ -40,9 +40,9 @@
var serializedForm = form.serializeArray();
var finalObj = {};
 
-   for (key in serializedForm){
-   if(serializedForm[key]['value'] != ""){
-   finalObj[serializedForm[key]['name']] = 
serializedForm[key]['value'];
+   for (var key in serializedForm){
+   if(serializedForm[key].value !== ""){
+   finalObj[serializedForm[key].name] = 
serializedForm[key].value;
}
}
return finalObj;
@@ -70,9 +70,9 @@
return;
}
 
-   if(data["error"]){
+   if(data.error){
//TODO: localization. And i18n. And stuff.
-   window.alert("The following error has 
occurred:\r\n" + data["error"]["info"]);
+   window.alert("The following error has 
occurred:\r\n" + data.error.info);
$(buttonID).removeAttr("disabled");
$(".ajax_me:disabled").removeAttr("disabled");
return;
@@ -85,13 +85,13 @@
}
$( '#hideyform' ).append( $( '', {
'id': 'immediate-repost',
-   'action': data["returns"]["action"]["url"],
+   'action': data.returns.action.url,
} ) );
-   for ( key in data["returns"]["fields"] ) {
+   for ( var key in data.returns.fields ) {
$( '#immediate_repost' ).append( $( '', {
'id': key,
'name': key,
-   'value': data["returns"]["fields"][key],
+   'value': data.returns.fields[key],
} ) );
}
$('#immediate_repost').submit();
diff --git a/package.json b/package.json
index 0683523..e43f212 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   "devDependencies": {
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
+"grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.4.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContributionTracking
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] Removing some inline styles again - change (mediawiki...SocialProfile)

2016-01-06 Thread Jack Phoenix (Code Review)

Jack Phoenix has uploaded a new change for review.

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

Change subject: Removing some inline styles again
..

Removing some inline styles again

Bug: T87148
Change-Id: Ica0ba19d27e22d9d0a337a6e98e5dbb771d551bb
---
M SystemGifts/SpecialSystemGiftManager.php
M SystemGifts/SpecialSystemGiftManagerLogo.php
M SystemGifts/SystemGift.css
M UserProfile/SpecialUploadAvatar.php
M UserProfile/UserProfile.css
5 files changed, 120 insertions(+), 60 deletions(-)


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

diff --git a/SystemGifts/SpecialSystemGiftManager.php 
b/SystemGifts/SpecialSystemGiftManager.php
index 6ac6a39..0bba14c 100644
--- a/SystemGifts/SpecialSystemGiftManager.php
+++ b/SystemGifts/SpecialSystemGiftManager.php
@@ -114,10 +114,9 @@
$deleteLink = '';
if ( $user->isAllowed( 'awardsmanage' ) ) {
$removePage = SpecialPage::getTitleFor( 
'RemoveMasterSystemGift' );
-   $deleteLink = '' .
-   $this->msg( 'delete' )->plain() 
. '';
+   '">' . $this->msg( 'delete' 
)->plain() . '';
}
 
$output .= '
@@ -141,18 +140,18 @@
}
 
$form .= '
-   
+   

-   ' . 
$this->msg( 'ga-giftname' )->plain() . '
-   
+   ' . $this->msg( 
'ga-giftname' )->plain() . '
+   


-   ' . $this->msg( 'ga-giftdesc' )->plain() . '
-   ' . ( isset( 
$gift['gift_description'] ) ? $gift['gift_description'] : '' ) . 
'
+   ' . 
$this->msg( 'ga-giftdesc' )->plain() . '
+   ' . ( isset( 
$gift['gift_description'] ) ? $gift['gift_description'] : '' ) . 
'


-   ' . 
$this->msg( 'ga-gifttype' )->plain() . '
-   
+   ' . $this->msg( 
'ga-gifttype' )->plain() . '
+   
' . "\n";
$g = new SystemGifts();
foreach ( $g->getCategories() as $category => $id ) {
@@ -168,8 +167,8 @@



-   ' . $this->msg( 
'ga-threshold' )->plain() . '
-   ' . $this->msg( 'ga-threshold' 
)->plain() . '
+   
';
 
@@ -177,13 +176,14 @@
$sgml = SpecialPage::getTitleFor( 
'SystemGiftManagerLogo' );
$gift_image = '';
+   '" alt="gift" />';
$form .= '
-   ' . 
$this->msg( 'ga-giftimage' )->plain() . '
-   ' . $gift_image .
-   '' .
-   $this->msg( 'ga-img' )->plain() . '
-   
+   ' . $this->msg( 
'ga-giftimage' )->plain() . '
+   ' .
+   $gift_image .
+   '' .
+   $this->msg( 'ga-img' )->plain() . '
+   
';
}
 
diff --git a/SystemGifts/SpecialSystemGiftManagerLogo.php 
b/SystemGifts/SpecialSystemGiftManagerLogo.php
index c30698c..cd6f491 100644
--- a/SystemGifts/SpecialSystemGiftManagerLogo.php
+++ b/SystemGifts/SpecialSystemGiftManagerLogo.php
@@ -55,6 +55,9 @@
throw new UserBlockedError( $user->getBlock() );
}
 
+   // Add CSS
+   $out->addModuleStyles( 'ext.socialprofile.systemgifts.css' );
+
$this->gift_id = $this->getRequest()->getInt( 'gift_id' );
$this->initLogo();
$this->executeLogo();
@@ -507,26 +510,26 @@
$ext = 'png';
}
 
-   $output .= '
+   $output .= '

-   ' . $this->msg( 'ga-large' )->plain() . 
'
-   
+   ' . $this->msg( 
'ga-large' )->plain() . '
+   


-   ' . $this->msg( 'ga-mediumlarge' 
)->plain() . '
-   
+   ' . $this->msg( 
'ga-mediumlarge' )->plain() . '
+   


-

[MediaWiki-commits] [Gerrit] Add jsonlint to npm test command - change (mediawiki...ContributionTracking)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Add jsonlint to npm test command
..

Add jsonlint to npm test command

Bug: T63599
Change-Id: I8f1d9c4f2caa957baa5015e85d7f50525b98
---
M Gruntfile.js
M package.json
2 files changed, 9 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContributionTracking 
refs/changes/04/262704/1

diff --git a/Gruntfile.js b/Gruntfile.js
index beb732b..7db22bd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,6 +9,7 @@
'use strict';
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.initConfig( {
banana: {
all: ['i18n/']
@@ -18,9 +19,15 @@
'**/*.js',
'!node_modules/**'
]
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index e43f212..f2b1966 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
+"grunt-jsonlint": "1.0.7",
 "grunt-banana-checker": "0.4.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f1d9c4f2caa957baa5015e85d7f50525b98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContributionTracking
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] [ContributionTracking] drop jslint job (uses npm) - change (integration/config)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: [ContributionTracking] drop jslint job (uses npm)
..

[ContributionTracking] drop jslint job (uses npm)

Drop the mwext-*-jslint job in favor of running jshint/jsonlint via npm.

Source changes:

jshinthttps://gerrit.wikimedia.org/r/#/c/262703/
jsonlint  https://gerrit.wikimedia.org/r/#/c/262704/

Bug: T63599
Change-Id: Ie29433061abef0261c104d0168c40da996d759dd
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/05/262705/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 081d3d8..01a89df 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -692,7 +692,6 @@
   - mwext-CongressLookup
   - mwext-Contest
   - mwext-ContributionReporting
-  - mwext-ContributionTracking
   - mwext-Contributors
   - mwext-Convert2Wiki
   - mwext-CopyToClipboard
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 043b437..ecca4cf 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -750,8 +750,6 @@
 voting: false
   - name: mwext-Configure-jslint # bug 61596
 voting: false
-  - name: mwext-ContributionTracking-jslint # bug 61599
-voting: false
   - name: mwext-CustomUserSignup-jslint # bug 61600
 voting: false
   - name: mwext-Drafts-jslint # bug 61603
@@ -2973,7 +2971,6 @@
 
   - name: mediawiki/extensions/ContributionTracking
 template:
-  - name: extension-jslint
   - name: extension-unittests-generic
   - name: npm
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie29433061abef0261c104d0168c40da996d759dd
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] Removing some inline styles again - change (mediawiki...SocialProfile)

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

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

Change subject: Removing some inline styles again
..


Removing some inline styles again

Bug: T87148
Change-Id: Ica0ba19d27e22d9d0a337a6e98e5dbb771d551bb
---
M SystemGifts/SpecialSystemGiftManager.php
M SystemGifts/SpecialSystemGiftManagerLogo.php
M SystemGifts/SystemGift.css
M UserProfile/SpecialUploadAvatar.php
M UserProfile/UserProfile.css
5 files changed, 122 insertions(+), 60 deletions(-)

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



diff --git a/SystemGifts/SpecialSystemGiftManager.php 
b/SystemGifts/SpecialSystemGiftManager.php
index 6ac6a39..0bba14c 100644
--- a/SystemGifts/SpecialSystemGiftManager.php
+++ b/SystemGifts/SpecialSystemGiftManager.php
@@ -114,10 +114,9 @@
$deleteLink = '';
if ( $user->isAllowed( 'awardsmanage' ) ) {
$removePage = SpecialPage::getTitleFor( 
'RemoveMasterSystemGift' );
-   $deleteLink = '' .
-   $this->msg( 'delete' )->plain() 
. '';
+   '">' . $this->msg( 'delete' 
)->plain() . '';
}
 
$output .= '
@@ -141,18 +140,18 @@
}
 
$form .= '
-   
+   

-   ' . 
$this->msg( 'ga-giftname' )->plain() . '
-   
+   ' . $this->msg( 
'ga-giftname' )->plain() . '
+   


-   ' . $this->msg( 'ga-giftdesc' )->plain() . '
-   ' . ( isset( 
$gift['gift_description'] ) ? $gift['gift_description'] : '' ) . 
'
+   ' . 
$this->msg( 'ga-giftdesc' )->plain() . '
+   ' . ( isset( 
$gift['gift_description'] ) ? $gift['gift_description'] : '' ) . 
'


-   ' . 
$this->msg( 'ga-gifttype' )->plain() . '
-   
+   ' . $this->msg( 
'ga-gifttype' )->plain() . '
+   
' . "\n";
$g = new SystemGifts();
foreach ( $g->getCategories() as $category => $id ) {
@@ -168,8 +167,8 @@



-   ' . $this->msg( 
'ga-threshold' )->plain() . '
-   ' . $this->msg( 'ga-threshold' 
)->plain() . '
+   
';
 
@@ -177,13 +176,14 @@
$sgml = SpecialPage::getTitleFor( 
'SystemGiftManagerLogo' );
$gift_image = '';
+   '" alt="gift" />';
$form .= '
-   ' . 
$this->msg( 'ga-giftimage' )->plain() . '
-   ' . $gift_image .
-   '' .
-   $this->msg( 'ga-img' )->plain() . '
-   
+   ' . $this->msg( 
'ga-giftimage' )->plain() . '
+   ' .
+   $gift_image .
+   '' .
+   $this->msg( 'ga-img' )->plain() . '
+   
';
}
 
diff --git a/SystemGifts/SpecialSystemGiftManagerLogo.php 
b/SystemGifts/SpecialSystemGiftManagerLogo.php
index c30698c..cd6f491 100644
--- a/SystemGifts/SpecialSystemGiftManagerLogo.php
+++ b/SystemGifts/SpecialSystemGiftManagerLogo.php
@@ -55,6 +55,9 @@
throw new UserBlockedError( $user->getBlock() );
}
 
+   // Add CSS
+   $out->addModuleStyles( 'ext.socialprofile.systemgifts.css' );
+
$this->gift_id = $this->getRequest()->getInt( 'gift_id' );
$this->initLogo();
$this->executeLogo();
@@ -507,26 +510,26 @@
$ext = 'png';
}
 
-   $output .= '
+   $output .= '

-   ' . $this->msg( 'ga-large' )->plain() . 
'
-   
+   ' . $this->msg( 
'ga-large' )->plain() . '
+   


-   ' . $this->msg( 'ga-mediumlarge' 
)->plain() . '
-   
+   ' . $this->msg( 
'ga-mediumlarge' )->plain() . '
+   


-   ' . $this->msg( 'ga-medium' )->plain()

[MediaWiki-commits] [Gerrit] Reworded the message when editing the current version of an ... - change (mediawiki/core)

2016-01-06 Thread Devirk (Code Review)

Devirk has uploaded a new change for review.

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

Change subject: Reworded the message when editing the current version of an 
article.
..

Reworded the message when editing the current version of an article.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/262701/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0b31abc..000ed44 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -707,7 +707,7 @@
"edit-conflict": "Edit conflict.",
"edit-no-change": "Your edit was ignored because no change was made to 
the text.",
"postedit-confirmation-created": "The page has been created.",
-   "postedit-confirmation-restored": "The page has been restored.",
+   "postedit-confirmation-restored": "Your edit has been saved.",
"postedit-confirmation-saved": "Your edit was saved.",
"edit-already-exists": "Could not create a new page.\nIt already 
exists.",
"addsection-preload": "",

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

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

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

[MediaWiki-commits] [Gerrit] Add SQLite Support to LDAP Authentication extension - change (mediawiki...LdapAuthentication)

2016-01-06 Thread saper (Code Review)

saper has uploaded a new change for review.

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

Change subject: Add SQLite Support to LDAP Authentication extension
..

Add SQLite Support to LDAP Authentication extension

Bug: T108355
Change-Id: Ie142ae60637d85e3829f3f7e189388be23e4c4ca
---
M LdapAuthentication.php
A schema/ldap-sqlite.sql
2 files changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/LdapAuthentication.php b/LdapAuthentication.php
index 44e47d4..f306138 100644
--- a/LdapAuthentication.php
+++ b/LdapAuthentication.php
@@ -107,6 +107,9 @@
case 'postgres':
$updater->addExtensionTable( 'ldap_domains', 
"$base/schema/ldap-postgres.sql" );
break;
+   case 'sqlite':
+   $updater->addExtensionTable( 'ldap_domains', 
"$base/schema/ldap-sqlite.sql" );
+   break;
}
return true;
 }
diff --git a/schema/ldap-sqlite.sql b/schema/ldap-sqlite.sql
new file mode 100644
index 000..0193935
--- /dev/null
+++ b/schema/ldap-sqlite.sql
@@ -0,0 +1,13 @@
+CREATE TABLE /*_*/ldap_domains (
+   -- IF for domain
+   domain_id INTEGER PRIMARY KEY AUTOINCREMENT,
+
+   -- domain itself
+   domain TEXT,
+
+   -- User to which this domain belongs
+   user_id TEXT
+
+) /*$wgDBTableOptions*/;
+
+CREATE INDEX /*i*/user_id on /*_*/ldap_domains (user_id);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie142ae60637d85e3829f3f7e189388be23e4c4ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LdapAuthentication
Gerrit-Branch: master
Gerrit-Owner: saper 

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

[MediaWiki-commits] [Gerrit] Pass jshint and add it to 'npm test' command - change (mediawiki...Quiz)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Pass jshint and add it to 'npm test' command
..

Pass jshint and add it to 'npm test' command

Bug: T63620
Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
---
M Gruntfile.js
M modules/ext.quiz.js
M package.json
3 files changed, 12 insertions(+), 2 deletions(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
index 9c56558..ccbcf3f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,11 +1,18 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
grunt.initConfig( {
banana: {
all: 'i18n/'
+   },
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
},
jsonlint: {
all: [
@@ -15,6 +22,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/ext.quiz.js b/modules/ext.quiz.js
index 66aa9f7..b62713b 100644
--- a/modules/ext.quiz.js
+++ b/modules/ext.quiz.js
@@ -39,10 +39,12 @@
// Shuffle questions
function shuffle( area ) {
var div = area.childNodes;
+   var quizText;
+
for( var i = 0, questions = []; i < div.length; ++i ) {
if( div[i].className ) {
if( questions.length === 0 && div[i].className 
=== 'quizText' ) {
-   var quizText = div[i];
+   quizText = div[i];
} else {
questions.push( div[i] );
if( div[i].className === 'shuffle' || 
div[i].className === 'noshuffle' ) {
diff --git a/package.json b/package.json
index 72eb4aa..5f3eb9f 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
 "grunt-banana-checker": "0.4.0",
+   "grunt-contrib-jshint": "0.11.3",
 "grunt-jsonlint": "1.0.7"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
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] Add jshint to 'npm test' command - change (mediawiki...TocTree)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Add jshint to 'npm test' command
..

Add jshint to 'npm test' command

Bug: T63640
Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
---
M Gruntfile.js
M package.json
2 files changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
index 1cc437d..fc81769 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,6 +7,7 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
var conf = grunt.file.readJSON( 'extension.json' );
@@ -17,9 +18,15 @@
'**/*.json',
'!node_modules/**'
]
+   },
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index edf0833..72994f0 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
 "grunt-banana-checker": "0.4.0",
+"grunt-contrib-jshint": "0.11.3",
 "grunt-jsonlint": "1.0.4"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TocTree
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] Setup RelatedArticles browser tests job - change (integration/config)

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

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

Change subject: Setup RelatedArticles browser tests job
..


Setup RelatedArticles browser tests job

Bug: T120715
Change-Id: I94459b7dd4013ea7894741cb1523950323c7b9e9
---
M jjb/browsertests.yaml
M zuul/ext_dependencies.py
M zuul/layout.yaml
3 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index cd09b1f..3c4793b 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -347,6 +347,22 @@
 jobs:
  - 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
 
+# RelatedArticles
+- project:
+name: RelatedArticles
+defaults: browsertests
+folder: tests
+headless: 'false'
+mediawiki_credentials_id: Selenium_user-at-beta.wmflabs.org
+mediawiki_url: en.m.wikipedia.beta.wmflabs.org
+platform: linux
+recipients: *emails-qa
+repository: mediawiki/extensions/RelatedArticles
+
+jobs:
+ - 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
+browser: chrome
+
 # UploadWizard
 - project:
 name: UploadWizard-api
diff --git a/zuul/ext_dependencies.py b/zuul/ext_dependencies.py
index 94b2534..52b0adb 100755
--- a/zuul/ext_dependencies.py
+++ b/zuul/ext_dependencies.py
@@ -34,6 +34,7 @@
 'PronunciationRecording': ['UploadWizard'],
 'ProofreadPage': ['LabeledSectionTransclusion'],
 'QuickSurveys': ['EventLogging'],
+'RelatedArticles': ['BetaFeatures', 'Cards', 'MobileFrontend'],
 'Score': ['VisualEditor'],
 'SyntaxHighlight_GeSHi': ['VisualEditor'],
 'Thanks': ['Echo', 'Flow', 'MobileFrontend'],
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 043b437..a9a2235 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6532,6 +6532,7 @@
   - name: composer-test
   - name: extension-unittests-generic
   - name: npm
+  - name: rake
 check:
   - jsonlint
   - jshint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94459b7dd4013ea7894741cb1523950323c7b9e9
Gerrit-PatchSet: 5
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jhobs 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add full define support in extension registration. - change (mediawiki/core)

2016-01-06 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Add full define support in extension registration.
..

Add full define support in extension registration.

This how it is now set.

"define": [
"Example": "example"
]

It can also have mutiple defines now.

This is how an array should be set.

"define": [
"Example": "example",
"Example2": "Example2"
]

Change-Id: I3d8f2dcbc97e284223741d67008b34ae522c9564
---
M includes/registration/ExtensionProcessor.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/262709/1

diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index aac0c799..7c7eb2e 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -90,6 +90,7 @@
 * @var array
 */
protected static $notAttributes = array(
+   'define',
'callback',
'Hooks',
'namespaces',
@@ -152,6 +153,11 @@
 * @return array
 */
public function extractInfo( $path, array $info, $version ) {
+   if ( isset( $info['define'] ) ) {
+   foreach ( $info['define'] as $name => $val ) {
+   $this->defines[$name] = $val;
+   }
+   }
$this->extractConfig( $info );
$this->extractHooks( $info );
$dir = dirname( $path );

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

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

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

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...JsonConfig)

2016-01-06 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Add extension.json, empty PHP entry point
..

Add extension.json, empty PHP entry point

Bug: T88054
Change-Id: I394829630ea6fc8d71219c70ccffc6cecdee345b
---
A JsonConfig.hooks.php
M JsonConfig.php
A extension.json
3 files changed, 140 insertions(+), 138 deletions(-)


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

diff --git a/JsonConfig.hooks.php b/JsonConfig.hooks.php
new file mode 100644
index 000..082fc19
--- /dev/null
+++ b/JsonConfig.hooks.php
@@ -0,0 +1,78 @@
+ __DIR__,
+   'remoteExtPath' => 'JsonConfig',
+   'styles' => array( 'modules/JsonConfig.css' ),
+   'position' => 'top',
+   );
+
+   $prefix = 'JsonConfig\JCSingleton::on';
+   foreach ( array(
+   'ContentHandlerDefaultModelFor',
+   'ContentHandlerForModelID',
+   'CodeEditorGetPageLanguage',
+   'EditFilterMergedContent',
+   'BeforePageDisplay',
+   'MovePageIsValidMove',
+   'AbortMove',
+   'ArticleDeleteComplete',
+   'ArticleUndelete',
+   'PageContentSaveComplete',
+   'TitleMoveComplete',
+   'userCan',
+   'UnitTestsList'
+   ) as $hook ) {
+   $wgHooks[$hook][] = $prefix . $hook;
+   }
+   }
+
+   /**
+* Quick check if the current wiki will store any configurations.
+* Faster than doing a full parsing of the $wgJsonConfigs in the 
JCSingleton::init()
+* @return bool
+*/
+   function jsonConfigIsStorage() {
+   static $isStorage = null;
+   if ( $isStorage === null ) {
+   global $wgJsonConfigs;
+   $isStorage = false;
+   foreach ( $wgJsonConfigs as $jc ) {
+   if ( ( array_key_exists( 'isLocal', $jc ) && 
$jc['isLocal'] ) ||
+   ( array_key_exists( 'store', $jc ) )
+   ) {
+   $isStorage = true;
+   break;
+   }
+   }
+   }
+
+   return $isStorage;
+   }
+
+   public static function onCanonicalNamespaces( array &$namespaces ) {
+   if ( jsonConfigIsStorage() ) {
+   // Class loader will not be called until it gets here
+   \JsonConfig\JCSingleton::onCanonicalNamespaces( 
$namespaces );
+   }
+
+   return true;
+   }
+
+}
diff --git a/JsonConfig.php b/JsonConfig.php
index b6f1974..854cdb6 100644
--- a/JsonConfig.php
+++ b/JsonConfig.php
@@ -11,142 +11,17 @@
  * @license GNU General Public Licence 2.0 or later
  */
 
-// Needs to be called within MediaWiki; not standalone
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo( "This is a MediaWiki extension and cannot run standalone.\n" );
-   die( -1 );
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'JsonConfig' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['JsonConfig'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['JsonConfigNamespaces'] = __DIR__ . 
'/JsonConfig.namespaces.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for JsonConfig extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the JsonConfig extension requires MediaWiki 
1.25+' );
 }
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'JsonConfig',
-   'version' => '0.1.0',
-   'author' => array( 'Yuri Astrakhan' ),
-   'descriptionmsg' => 'jsonconfig-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:JsonConfig',
-);
-
-define( 'NS_CONFIG', 482 );
-define( 'NS_CONFIG_TALK', 483 );
-
-$cwd = __DIR__ . DIRECTORY_SEPARATOR;
-$wgMessagesDirs['JsonConfig'] = $cwd . 'i18n';
-
-// @todo: this entry should be done only if $wgJsonConfigEnabled === true && 
namespace is actually used by config

[MediaWiki-commits] [Gerrit] Bump browserNoActivityTimeout to 2 mins instead of 1 min for... - change (mediawiki/core)

2016-01-06 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Bump browserNoActivityTimeout to 2 mins instead of 1 min for 
karma
..

Bump browserNoActivityTimeout to 2 mins instead of 1 min for karma

Change-Id: Ic36258f0302caff7979efe233f56cfe6ab5fc40a
---
M Gruntfile.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/13/262713/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 946b652..6276727 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -61,7 +61,7 @@
singleRun: true,
autoWatch: false,
// Some tests in extensions don't yield for 
more than the default 10s (T89075)
-   browserNoActivityTimeout: 60 * 1000
+   browserNoActivityTimeout: 60 * 2000
},
main: {
browsers: [ 'Chrome' ]

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

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

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

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

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

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

Change subject: New Wikidata Build - 2016-01-06T10:00:01+
..


New Wikidata Build - 2016-01-06T10:00:01+

Change-Id: Iff57db2cb59004919c84827c37912c8232db99a8
---
M composer.lock
M extensions/Wikibase/client/i18n/la.json
M extensions/Wikibase/composer.json
M extensions/Wikibase/lib/i18n/lki.json
M extensions/Wikibase/lib/tests/phpunit/changes/EntityChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/store/FieldPropertyInfoProviderTest.php
A extensions/Wikibase/lib/tests/phpunit/store/RedirectRevisionTest.php
M extensions/Wikibase/repo/i18n/de.json
M extensions/Wikibase/repo/i18n/fr.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/it.json
M extensions/Wikibase/repo/i18n/lki.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/includes/content/EntityHandler.php
M extensions/Wikibase/repo/includes/specials/SpecialEntitiesWithoutPage.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/CachingCommonsMediaFileNameLookupTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/DataTypeSelectorTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/content/EntityHandlerTest.php
R 
extensions/Wikibase/repo/tests/phpunit/includes/rdf/Values/ObjectUriRdfBuilderTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntitiesWithoutPageTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
23 files changed, 330 insertions(+), 123 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 5887e42..a628236 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1448,12 +1448,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "20a83bd7b45506722f93a332be6d07ca96cec058"
+"reference": "ca2aefbf10b3ea6da8687193ceb216c87d709c77"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/20a83bd7b45506722f93a332be6d07ca96cec058;,
-"reference": "20a83bd7b45506722f93a332be6d07ca96cec058",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ca2aefbf10b3ea6da8687193ceb216c87d709c77;,
+"reference": "ca2aefbf10b3ea6da8687193ceb216c87d709c77",
 "shasum": ""
 },
 "require": {
@@ -1482,7 +1482,7 @@
 "mediawiki/mediawiki": "<1.25"
 },
 "require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
+"jakub-onderka/php-parallel-lint": "0.9.2",
 "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
 },
 "type": "mediawiki-extension",
@@ -1524,7 +1524,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-01-05 05:20:28"
+"time": "2016-01-06 00:30:13"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/la.json 
b/extensions/Wikibase/client/i18n/la.json
index 7f904ad..d1400c3 100644
--- a/extensions/Wikibase/client/i18n/la.json
+++ b/extensions/Wikibase/client/i18n/la.json
@@ -15,5 +15,6 @@
"wikibase-rc-hide-wikidata": "$1 Vicidata",
"wikibase-rc-hide-wikidata-hide": "Celare",
"wikibase-rc-hide-wikidata-show": "Monstrare",
-   "wikibase-rc-wikibase-edit-title": "Recensio apud Wikidata facta"
+   "wikibase-rc-wikibase-edit-title": "Recensio apud Wikidata facta",
+   "wikibase-watchlist-show-changes-pref": "Mutationes apud {{WBREPONAME}} 
factas, siquae paginas observandas afficiant, in earum indice ostendere"
 }
diff --git a/extensions/Wikibase/composer.json 
b/extensions/Wikibase/composer.json
index 66e89d3..3e31c9b 100644
--- a/extensions/Wikibase/composer.json
+++ b/extensions/Wikibase/composer.json
@@ -22,7 +22,6 @@
},
"require": {
"php": ">=5.3.2",
-
"data-values/data-values": "~1.0",
"data-values/common": "~0.3.0",
"data-values/geo": "~1.0",
@@ -34,7 +33,6 @@
"data-values/serialization": "~1.0",
"data-values/javascript": "~0.6.0|~0.7.0",
"data-values/value-view": "~0.15.6",
-
"wikibase/data-model": "~4.0",
"wikibase/data-model-serialization": "~2.0",
"wikibase/internal-serialization": "~2.0",
@@ -42,11 +40,10 @@
"wikibase/data-model-javascript": "^1.0.2",
"wikibase/javascript-api": "~1.0",

[MediaWiki-commits] [Gerrit] Fix comment typo in SearchIndexField interface - change (mediawiki...Wikibase)

2016-01-06 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Fix comment typo in SearchIndexField interface
..

Fix comment typo in SearchIndexField interface

Change-Id: I86e4fd0a5720531ff7e3eacfb45853081d2b1a07
---
M repo/includes/Search/Elastic/Fields/SearchIndexField.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/Search/Elastic/Fields/SearchIndexField.php 
b/repo/includes/Search/Elastic/Fields/SearchIndexField.php
index 4365c59..eee59fc 100644
--- a/repo/includes/Search/Elastic/Fields/SearchIndexField.php
+++ b/repo/includes/Search/Elastic/Fields/SearchIndexField.php
@@ -5,7 +5,7 @@
 use Wikibase\DataModel\Entity\EntityDocument;
 
 /**
- * Each field is intended to be by CirrusSearch as an
+ * Each field is intended to be used by CirrusSearch as an
  * additional property of a page.
  *
  * The data returned by the field must match the field

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

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

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

[MediaWiki-commits] [Gerrit] tests: TestZuulLayout -> TestZuulSchedLayout - change (integration/config)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: tests: TestZuulLayout -> TestZuulSchedLayout
..

tests: TestZuulLayout -> TestZuulSchedLayout

The test suite uses an instance of Zuul scheduler and looks more like an
integration test.  I would like to reuse the name for a suite that raw
parse the yaml layout file, ie without having to spawn the Zuul
scheduler.

Rename TestZuulLayout to TestZuulSchedLayout

Change-Id: I9a641ed6455c9e1e2931f010ee626b36d427f77a
---
R tests/test_zuul_sched_layout.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/06/262706/1

diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_sched_layout.py
similarity index 99%
rename from tests/test_zuul_layout.py
rename to tests/test_zuul_sched_layout.py
index eff8310..8fb276c 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_sched_layout.py
@@ -30,7 +30,7 @@
 return
 
 
-class TestZuulLayout(unittest.TestCase):
+class TestZuulSchedLayout(unittest.TestCase):
 
 sched = None
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a641ed6455c9e1e2931f010ee626b36d427f77a
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] Rake entry point and rubocop fix up - change (mediawiki...RelatedArticles)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Rake entry point and rubocop fix up
..

Rake entry point and rubocop fix up

Introduce the rake test entry point which is invoked by CI.

Add a basic rubocop configuration based on
https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby

Fix up a few ruby issues.

Bug: T120715
Change-Id: I3df0a3b13155259ec6cb5010e7aaa3bf9aa7b230
---
A .rubocop.yml
A Rakefile
M tests/browser/features/support/pages/login_page.rb
M tests/browser/features/support/pages/special_preferences_page.rb
M tests/browser/features/support/step_definitions/common_steps.rb
5 files changed, 44 insertions(+), 4 deletions(-)


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

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 000..dbd993a
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,23 @@
+AllCops:
+  # Only enforce rules that have an entry in the style guide
+  StyleGuideCopsOnly: true
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+# Pick one and stay consistent
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+#  EnforcedStyle: double_quotes
+
+Style/TrivialAccessors:
+  ExactNameMatch: true
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000..d6feb16
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,14 @@
+require 'bundler/setup'
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
+  # the next line makes it explicit that you want .rubocop.yml from the
+  # directory where `bundle exec rake` is executed
+  task.options = ['-c', '.rubocop.yml']
+end
+
+task default: [:test]
+
+desc 'Run all build/tests commands (CI entry point)'
+task test: [:rubocop]
diff --git a/tests/browser/features/support/pages/login_page.rb 
b/tests/browser/features/support/pages/login_page.rb
index de791cc..6fd0eb9 100644
--- a/tests/browser/features/support/pages/login_page.rb
+++ b/tests/browser/features/support/pages/login_page.rb
@@ -7,7 +7,8 @@
 
   def login_with(username, password)
 # deal with autocomplete
-self.username_element.when_present.clear
+username_element.when_present.clear
+
 self.username = username
 self.password = password
 login
diff --git a/tests/browser/features/support/pages/special_preferences_page.rb 
b/tests/browser/features/support/pages/special_preferences_page.rb
index 0bf0c97..d9e1d6f 100644
--- a/tests/browser/features/support/pages/special_preferences_page.rb
+++ b/tests/browser/features/support/pages/special_preferences_page.rb
@@ -7,8 +7,10 @@
   button(:submit_button, css: '#prefcontrol')
 
   def enable_read_more
-self.beta_features_tab_element.when_present.click
-read_more_checkbox_element.when_present.click if 
read_more_checkbox_element.attribute('checked').nil?
+beta_features_tab_element.when_present.click
+if read_more_checkbox_element.attribute('checked').nil?
+  read_more_checkbox_element.when_present.click
+end
 submit_button_element.when_present.click
   end
 end
diff --git a/tests/browser/features/support/step_definitions/common_steps.rb 
b/tests/browser/features/support/step_definitions/common_steps.rb
index 3d639af..2e18796 100644
--- a/tests/browser/features/support/step_definitions/common_steps.rb
+++ b/tests/browser/features/support/step_definitions/common_steps.rb
@@ -67,7 +67,7 @@
 end
 
 Then(/^ReadMore is enabled as a beta feature$/) do
-  visit(SpecialPreferencesPage).enable_read_more()
+  visit(SpecialPreferencesPage).enable_read_more
 end
 
 Then(/^I must see ReadMore$/) do

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3df0a3b13155259ec6cb5010e7aaa3bf9aa7b230
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: dev
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] tests: mw exts having npm do not need extension-jslint - change (integration/config)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: tests: mw exts having npm do not need extension-jslint
..

tests: mw exts having npm do not need extension-jslint

The more specific jobs mwext-*-jslint were introduced so we can make
them non voting until jshint/jsonlint pass.  Whenever npm is already
invoked, it should be used to run jshint/jsonlint.

Test MediaWiki extensions in Zuul having 'npm' template no more have the
'extension-jslint' template.

Change-Id: Ib4755d66369c44da0282d703d4c260434b50b03b
---
A tests/test_zuul_layout.py
1 file changed, 37 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/08/262708/1

diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
new file mode 100644
index 000..767de0f
--- /dev/null
+++ b/tests/test_zuul_layout.py
@@ -0,0 +1,37 @@
+# Parse Zuul layout.yaml file
+#
+# Copyright (c) 2016 - Antoine "hashar" Musso
+# Copyright (c) 2016 - Wikimedia Foundation Inc.
+
+import os
+import unittest
+
+import yaml
+
+
+class TestZuulLayout(unittest.TestCase):
+
+layout = None
+
+@classmethod
+def setUpClass(cls):
+wmf_zuul_layout = os.path.join(
+os.path.dirname(os.path.abspath(__file__)),
+'../zuul/layout.yaml')
+with open(wmf_zuul_layout, 'r') as f:
+cls.layout = yaml.load(f)
+
+def test_mwext_legacy_jslint_replaced_by_npm(self):
+exts = sorted([
+p['name']
+for p in self.layout['projects']
+if p['name'].startswith('mediawiki/extensions/')
+and {'name': 'npm'} in p.get('template', [])
+and {'name': 'extension-jslint'} in p.get('template', [])
+])
+
+self.maxDiff = None
+self.longMessage = True
+self.assertListEqual(
+[], exts,
+'MediaWiki extensions having npm do not need "extension-jslint"')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4755d66369c44da0282d703d4c260434b50b03b
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] Update /qqq documentation - change (mediawiki...Citoid)

2016-01-06 Thread Code Review

Matěj Suchánek has uploaded a new change for review.

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

Change subject: Update /qqq documentation
..

Update /qqq documentation

Follow-up on I424ba86220f9170afc7871596e3a7f64cecc01e2

Bug: T122427
Change-Id: I49376f0d1b4f459a5371cecb82be313273f5e475
---
M i18n/qqq.json
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/14/262714/1

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 000909a..d3f952a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,8 +19,8 @@
"citoid-citefromiddialog-mode-manual": "Label of tab in citation 
dialog, used to select mode.\n{{Identical|Manual}}",
"citoid-citefromiddialog-mode-reuse": "Label of tab in citation dialog, 
used to select mode.\n{{Identical|Re-use}}",
"citoid-citefromiddialog-search": "Text for the search 
button.\n{{Identical|Search}}",
-   "citoid-citefromiddialog-search-label": "Label for the URL/DOI search 
field.",
-   "citoid-citefromiddialog-search-placeholder": "Placeholder for the 
URL/DOI search field.\n\n'''NOTE:''' Do not translate example.com as it is a 
domain name specifically reserved by IANA for examples.",
+   "citoid-citefromiddialog-search-label": "Label for the URL/DOI/PMID 
search field.",
+   "citoid-citefromiddialog-search-placeholder": "Placeholder for the 
URL/DOI/PMID search field.\n\n'''NOTE:''' Do not translate example.com as it is 
a domain name specifically reserved by IANA for examples.",
"citoid-citefromiddialog-search-progress": "Message for when the search 
is in progress",
"citoid-citefromiddialog-title": "The title displayed on the dialog",
"citoid-citefromiddialog-use-general-error-message": "Label notifying 
the user there was a problem creating their reference, and offering to use the 
full citation tool.\n* $1 – link to open the citation dialog; link label: 
{{msg-mw|Citoid-citefromiddialog-mode-manual}}",
@@ -29,4 +29,4 @@
"citoid-referencecontextitem-convert-button": "Label for the button to 
convert a plain reference to a Citoid reference.\n{{Identical|Convert}}",
"citoid-referencecontextitem-convert-message": "Message explaining the 
functionality of the button to convert a plain reference to a Citoid 
reference.",
"citoid-unknown-error": "Error message indicating that the service to 
create citations has returned an error or is temporarily malfunctioning, asking 
the user to try again later."
-}
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49376f0d1b4f459a5371cecb82be313273f5e475
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 

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

[MediaWiki-commits] [Gerrit] adding robh yubikey - change (operations/puppet)

2016-01-06 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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

Change subject: adding robh yubikey
..

adding robh yubikey

adding my yubikey pub key

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/262720/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 1abfc47..f60a467 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -488,8 +488,9 @@
 gid: 500
 name: robh
 realname: Rob Halsell
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EBIwAAAQEAoDAuzkYEIeGVC10zh3i6WnyJjhWK/JpQbSFlWfb5t02kGPvmi8m+fdCPhvqiOpOCcQqTL1Knia6AeRNMx+dj3qxctsas/RnJtIUbACK5gH6aKg0OMmcG9LNiVLN5knx1UMHhQ7Ma6KSiDLeqsID009j7+Fj8qgGup7lKOQs7WYRpaXlAyR0hdKeyxcXWh+GPQEZAhl0DHrjFgdDcc5n2K8GBRESfdfCKm0SomHYGWPsTIpWrY13se0kUJzWXIafzr0U/czEdVDuSuil6P65d9cU7vypcUC3i5d2L4QiO4MBVNcXluFuFNZ8UY/QAlixz/5x/ARbgjcMvXwJQWjhh+w==
-rob@laptop]
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EBIwAAAQEAoDAuzkYEIeGVC10zh3i6WnyJjhWK/JpQbSFlWfb5t02kGPvmi8m+fdCPhvqiOpOCcQqTL1Knia6AeRNMx+dj3qxctsas/RnJtIUbACK5gH6aKg0OMmcG9LNiVLN5knx1UMHhQ7Ma6KSiDLeqsID009j7+Fj8qgGup7lKOQs7WYRpaXlAyR0hdKeyxcXWh+GPQEZAhl0DHrjFgdDcc5n2K8GBRESfdfCKm0SomHYGWPsTIpWrY13se0kUJzWXIafzr0U/czEdVDuSuil6P65d9cU7vypcUC3i5d2L4QiO4MBVNcXluFuFNZ8UY/QAlixz/5x/ARbgjcMvXwJQWjhh+w==
 rob@laptop
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCToz4UdLA8A2/faeEyeeiW3rU1VT54aj3r856dfI+Rd0u8DsaZ6B8cVBQwNo36mbdMsc+c+uql68wjRxl7lnpmvbS3bL1fCrBRBvK7mYC4dzso3y4UjaS+irz9NIwB9Byk23eVhVQ7wll/zuBHQHnWITWjZSLFbrV4JKLBekxR1i7s9EJFZj0V2oP17E91JUVUFu4FcFbMH1KCV9xhSGXbOp9y3H4zaH/DL42dboDtQ2wA3zsf1KG2TTXlSN34Cz9OMDsP4NB4Wd6C3LlYpwShI24wfZnsojZP+a845ZRD5DHbOtp/owtUn6urw1iOJn1fxdwTB6Uk21TUymGDH2W5
 rob@yubikey
 uid: 2007
   marc:
 ensure: absent

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

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

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

[MediaWiki-commits] [Gerrit] Remove non-existent preferences from $wgDefaultUserOptions - change (mediawiki...UploadWizard)

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

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

Change subject: Remove non-existent preferences from $wgDefaultUserOptions
..


Remove non-existent preferences from $wgDefaultUserOptions

Follow-up to 76047a82cd5aae29d5bacfe91bedeaaec50c5a90 (r105436).

Change-Id: Ic2fcc93572d245973714090f2fda876ba9d9c9e2
---
M UploadWizard.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/UploadWizard.php b/UploadWizard.php
index f8e3a0a..8d2bfe6 100644
--- a/UploadWizard.php
+++ b/UploadWizard.php
@@ -174,8 +174,6 @@
 $wgRemoveGroups['sysop'][] = 'upwizcampeditors';
 
 $wgDefaultUserOptions['upwiz_deflicense'] = 'default';
-$wgDefaultUserOptions['upwiz_def3rdparty'] = 'default';
-$wgDefaultUserOptions['upwiz_deflicensetype'] = 'default';
 $wgDefaultUserOptions['upwiz_maxsimultaneous'] = 'default';
 
 // Init the upload wizard config array

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2fcc93572d245973714090f2fda876ba9d9c9e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] hygiene: Goodbye custom event emitter and class code - change (mediawiki...MobileFrontend)

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

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

Change subject: hygiene: Goodbye custom event emitter and class code
..


hygiene: Goodbye custom event emitter and class code

This patch is not as scary as it looks.
Best starting point is noting the removal of eventemitter and the changes
in Class.js, the rest just reflect these changes.

Changes:
* Introduce OO.mfExtend - a function that hopefully we can upstream to OOJS but
in mean time helps us with adoption.
* Remove EventEmitter code
* All classes previously inheriting from EventEmitter now mix it in
* ModuleLoader in mobile.modules now depends on OO. OOJS now loads
before it
* Remove _parent magic: Previously a View magically inherited defaults and 
templatePartials from
its parent. This was a little confusing and broken, as it only worked for
the immediate parent. Let's remove this code and bring ourselves a little
closer to oojs! This now means you must use $.extend explicitly on 
templatePartials and
defaults
* extend function is now moved from Class to View. Will be deprecated later to 
make
us more consistent.
* Class is left in repository given that there are various usages in places 
such as Gather.

Depends-On:  Icaf2d24c2764658fa775600965529f1a609262b6
Change-Id: I5374b2384b1e464cc5312b95bb482ed79f1df70e
---
M includes/Resources.php
M resources/mobile.abusefilter/AbuseFilterOverlay.js
M resources/mobile.betaoptin/BetaOptinPanel.js
M resources/mobile.categories.overlays/CategoryAddOverlay.js
M resources/mobile.categories.overlays/CategoryOverlay.js
M resources/mobile.contentOverlays/PointerOverlay.js
M resources/mobile.drawers/CtaDrawer.js
M resources/mobile.drawers/Drawer.js
M resources/mobile.infiniteScroll/InfiniteScroll.js
M resources/mobile.issues/CleanupOverlay.js
M resources/mobile.languages/LanguageOverlay.js
M resources/mobile.loggingSchemas/SchemaMobileWeb.js
M resources/mobile.loggingSchemas/SchemaMobileWebClickTracking.js
M resources/mobile.loggingSchemas/SchemaMobileWebSearch.js
M resources/mobile.loggingSchemas/SchemaMobileWebUIClickTracking.js
M resources/mobile.loggingSchemas/SchemaMobileWebWatching.js
M resources/mobile.modules/modules.js
M resources/mobile.nearby/Nearby.js
M resources/mobile.notifications.overlay/NotificationsOverlay.js
M resources/mobile.oo/Class.js
D resources/mobile.oo/eventemitter.js
M resources/mobile.search/MobileWebSearchLogger.js
M resources/mobile.search/SearchOverlay.js
M resources/mobile.startup/OverlayManager.js
M resources/mobile.startup/Router.js
M resources/mobile.startup/Schema.js
M resources/mobile.swipe/Swipe.js
M resources/mobile.talk.overlays/TalkOverlay.js
M resources/mobile.talk.overlays/TalkSectionAddOverlay.js
M resources/mobile.view/View.js
D tests/qunit/mobile.oo/test_Class.js
D tests/qunit/mobile.oo/test_eventemitter.js
M tests/qunit/mobile.overlays/test_Overlay.js
M tests/qunit/mobile.startup/test_OverlayManager.js
M tests/qunit/mobile.startup/test_Schema.js
M tests/qunit/mobile.view/test_View.js
36 files changed, 224 insertions(+), 306 deletions(-)

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



diff --git a/includes/Resources.php b/includes/Resources.php
index 5031ee9..fbc6907 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -172,6 +172,9 @@
 */
 $wgResourceModules = array_merge( $wgResourceModules, array(
'mobile.modules' => $wgMFResourceFileModuleBoilerplate + array(
+   'dependencies' => array(
+   'oojs',
+   ),
'scripts' => array(
'resources/mobile.modules/modules.js',
),
@@ -183,7 +186,6 @@
),
'scripts' => array(
'resources/mobile.oo/Class.js',
-   'resources/mobile.oo/eventemitter.js',
),
),
'mobile.view' => $wgMFResourceFileModuleBoilerplate + array(
diff --git a/resources/mobile.abusefilter/AbuseFilterOverlay.js 
b/resources/mobile.abusefilter/AbuseFilterOverlay.js
index d2cfff2..5bfd2cc 100644
--- a/resources/mobile.abusefilter/AbuseFilterOverlay.js
+++ b/resources/mobile.abusefilter/AbuseFilterOverlay.js
@@ -1,4 +1,4 @@
-( function ( M ) {
+( function ( M, $ ) {
var AbuseFilterOverlay,
Button = M.require( 'mobile.startup/Button' ),
Overlay = M.require( 'mobile.overlays/Overlay' );
@@ -15,17 +15,17 @@
 * @cfg {Object} defaults Default options hash.
 * @cfg {Object} defaults.confirmButton options for a confirm 
Button
 */
-   defaults: {
+   defaults: $.extend( {}, Overlay.prototype.defaults, {
confirmButton: new Button( {
additionalClassNames: 'cancel',
progressive: true,

[MediaWiki-commits] [Gerrit] adding robh yubikey - change (operations/puppet)

2016-01-06 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: adding robh yubikey
..


adding robh yubikey

adding my yubikey pub key

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

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 1abfc47..f60a467 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -488,8 +488,9 @@
 gid: 500
 name: robh
 realname: Rob Halsell
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EBIwAAAQEAoDAuzkYEIeGVC10zh3i6WnyJjhWK/JpQbSFlWfb5t02kGPvmi8m+fdCPhvqiOpOCcQqTL1Knia6AeRNMx+dj3qxctsas/RnJtIUbACK5gH6aKg0OMmcG9LNiVLN5knx1UMHhQ7Ma6KSiDLeqsID009j7+Fj8qgGup7lKOQs7WYRpaXlAyR0hdKeyxcXWh+GPQEZAhl0DHrjFgdDcc5n2K8GBRESfdfCKm0SomHYGWPsTIpWrY13se0kUJzWXIafzr0U/czEdVDuSuil6P65d9cU7vypcUC3i5d2L4QiO4MBVNcXluFuFNZ8UY/QAlixz/5x/ARbgjcMvXwJQWjhh+w==
-rob@laptop]
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EBIwAAAQEAoDAuzkYEIeGVC10zh3i6WnyJjhWK/JpQbSFlWfb5t02kGPvmi8m+fdCPhvqiOpOCcQqTL1Knia6AeRNMx+dj3qxctsas/RnJtIUbACK5gH6aKg0OMmcG9LNiVLN5knx1UMHhQ7Ma6KSiDLeqsID009j7+Fj8qgGup7lKOQs7WYRpaXlAyR0hdKeyxcXWh+GPQEZAhl0DHrjFgdDcc5n2K8GBRESfdfCKm0SomHYGWPsTIpWrY13se0kUJzWXIafzr0U/czEdVDuSuil6P65d9cU7vypcUC3i5d2L4QiO4MBVNcXluFuFNZ8UY/QAlixz/5x/ARbgjcMvXwJQWjhh+w==
 rob@laptop
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCToz4UdLA8A2/faeEyeeiW3rU1VT54aj3r856dfI+Rd0u8DsaZ6B8cVBQwNo36mbdMsc+c+uql68wjRxl7lnpmvbS3bL1fCrBRBvK7mYC4dzso3y4UjaS+irz9NIwB9Byk23eVhVQ7wll/zuBHQHnWITWjZSLFbrV4JKLBekxR1i7s9EJFZj0V2oP17E91JUVUFu4FcFbMH1KCV9xhSGXbOp9y3H4zaH/DL42dboDtQ2wA3zsf1KG2TTXlSN34Cz9OMDsP4NB4Wd6C3LlYpwShI24wfZnsojZP+a845ZRD5DHbOtp/owtUn6urw1iOJn1fxdwTB6Uk21TUymGDH2W5
 rob@yubikey
 uid: 2007
   marc:
 ensure: absent

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

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

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

[MediaWiki-commits] [Gerrit] reclaim rubidium to spares - change (operations/puppet)

2016-01-06 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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

Change subject: reclaim rubidium to spares
..

reclaim rubidium to spares

system being put back to spare pool

T118213

Change-Id: I07f69fbb648339c2eb2239175bab609d53302553
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 2 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/262721/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 94a3e0b..abc437b 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -46,7 +46,7 @@
esac; \
\
case $(debconf-get netcfg/get_hostname) in \
-   acamar|achernar|baham|lithium|radon|rubidium|rhodium) echo 
partman/raid1-lvm.cfg ;; \
+   acamar|achernar|baham|lithium|radon|rhodium) echo 
partman/raid1-lvm.cfg ;; \
analytics100[3-9]) echo partman/analytics-cisco.cfg ;; \
analytics1017) echo partman/raid1-30G.cfg ;; \
analytics1015) echo partman/raid1-lvm-ext4.cfg ;; \
@@ -115,7 +115,7 @@
rdb100[7-8]) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc100[1-3]) echo partman/mw.cfg ;; \
-pc200[4-6]) echo partman/raid0-lvm-srv.cfg ;; \
+   pc200[4-6]) echo partman/raid0-lvm-srv.cfg ;; \
pybal-test200[1-3]) echo partman/flat.cfg virtual.cfg;; \
rdb100[1-6]) echo partman/mw.cfg ;; \
restbase100[12356]) echo partman/cassandrahosts-3ssd.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 4ce8dd1..0fc489e 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6281,14 +6281,6 @@
filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-
-host rubidium {
-   hardware ethernet 18:03:73:f1:4f:70;
-   fixed-address rubidium.wikimedia.org;
-   option pxelinux.pathprefix "jessie-installer/";
-   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
 host ruthenium {
hardware ethernet 18:03:73:f1:58:82;
fixed-address ruthenium.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] reclaim rubidium to spares - change (operations/dns)

2016-01-06 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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

Change subject: reclaim rubidium to spares
..

reclaim rubidium to spares

spares dont get production dns entries

T118213

Change-Id: I1c7a0ccecbd171993f72ddf09eb0371ffbeca4ea
---
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/22/262722/1

diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index b660656..93d4d63 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -33,7 +33,7 @@
 18  1H  IN PTR  virt1000.wikimedia.org.
 20  1H  IN PTR  labs-recursor0.wikimedia.org.
 39  1H  IN PTR  radium.wikimedia.org.
-40  1H  IN PTR  rubidium.wikimedia.org.
+
 42  1H  IN PTR  cp1008.wikimedia.org.
 43  1H  IN PTR  vl1001-eth0.lvs1007.eqiad.wmnet.
 44  1H  IN PTR  vl1001-eth0.lvs1008.eqiad.wmnet.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 24d9c2a..3e61e25 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -175,7 +175,6 @@
 1H  IN  2620:0:860:201:208:80:152:244
 ripe-atlas-ulsfo 1H  IN A198.35.26.244
 1H  IN  2620:0:863:201:198:35:26:244
-rubidium1H  IN A208.80.154.40
 seaborgium  1H  IN A208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 serpens 1H  IN A208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver  1H  IN A208.80.154.136

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

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

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

[MediaWiki-commits] [Gerrit] reclaim rubidium to spares - change (operations/puppet)

2016-01-06 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: reclaim rubidium to spares
..


reclaim rubidium to spares

system being put back to spare pool

T118213

Change-Id: I07f69fbb648339c2eb2239175bab609d53302553
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 2 insertions(+), 10 deletions(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 94a3e0b..abc437b 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -46,7 +46,7 @@
esac; \
\
case $(debconf-get netcfg/get_hostname) in \
-   acamar|achernar|baham|lithium|radon|rubidium|rhodium) echo 
partman/raid1-lvm.cfg ;; \
+   acamar|achernar|baham|lithium|radon|rhodium) echo 
partman/raid1-lvm.cfg ;; \
analytics100[3-9]) echo partman/analytics-cisco.cfg ;; \
analytics1017) echo partman/raid1-30G.cfg ;; \
analytics1015) echo partman/raid1-lvm-ext4.cfg ;; \
@@ -115,7 +115,7 @@
rdb100[7-8]) echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc100[1-3]) echo partman/mw.cfg ;; \
-pc200[4-6]) echo partman/raid0-lvm-srv.cfg ;; \
+   pc200[4-6]) echo partman/raid0-lvm-srv.cfg ;; \
pybal-test200[1-3]) echo partman/flat.cfg virtual.cfg;; \
rdb100[1-6]) echo partman/mw.cfg ;; \
restbase100[12356]) echo partman/cassandrahosts-3ssd.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 4ce8dd1..0fc489e 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6281,14 +6281,6 @@
filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-
-host rubidium {
-   hardware ethernet 18:03:73:f1:4f:70;
-   fixed-address rubidium.wikimedia.org;
-   option pxelinux.pathprefix "jessie-installer/";
-   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
 host ruthenium {
hardware ethernet 18:03:73:f1:58:82;
fixed-address ruthenium.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] reclaim rubidium to spares - change (operations/dns)

2016-01-06 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: reclaim rubidium to spares
..


reclaim rubidium to spares

spares dont get production dns entries

T118213

Change-Id: I1c7a0ccecbd171993f72ddf09eb0371ffbeca4ea
---
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index b660656..93d4d63 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -33,7 +33,7 @@
 18  1H  IN PTR  virt1000.wikimedia.org.
 20  1H  IN PTR  labs-recursor0.wikimedia.org.
 39  1H  IN PTR  radium.wikimedia.org.
-40  1H  IN PTR  rubidium.wikimedia.org.
+
 42  1H  IN PTR  cp1008.wikimedia.org.
 43  1H  IN PTR  vl1001-eth0.lvs1007.eqiad.wmnet.
 44  1H  IN PTR  vl1001-eth0.lvs1008.eqiad.wmnet.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 24d9c2a..3e61e25 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -175,7 +175,6 @@
 1H  IN  2620:0:860:201:208:80:152:244
 ripe-atlas-ulsfo 1H  IN A198.35.26.244
 1H  IN  2620:0:863:201:198:35:26:244
-rubidium1H  IN A208.80.154.40
 seaborgium  1H  IN A208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 serpens 1H  IN A208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver  1H  IN A208.80.154.136

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c7a0ccecbd171993f72ddf09eb0371ffbeca4ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Restore changes to WikiRevision that were lost in cdeba4cfc7c - change (mediawiki/core)

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

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

Change subject: Restore changes to WikiRevision that were lost in cdeba4cfc7c
..


Restore changes to WikiRevision that were lost in cdeba4cfc7c

The commit cdeba4cfc7c unintentionally "reverted" part of commits
0623aeb922e and b14d581dab1.

Change-Id: I19334bd6b871ab0555c6db873a67e9350114
---
M includes/import/WikiRevision.php
1 file changed, 13 insertions(+), 3 deletions(-)

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



diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 6c238cf..7476636 100644
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -490,7 +490,7 @@
$prevId = $dbw->selectField( 'revision', 'rev_id',
array(
'rev_page' => $pageId,
-   'rev_timestamp <= ' . $dbw->timestamp( 
$this->timestamp ),
+   'rev_timestamp <= ' . $dbw->addQuotes( 
$dbw->timestamp( $this->timestamp ) ),
),
__METHOD__,
array( 'ORDER BY' => array(
@@ -534,6 +534,16 @@
 
function importLogItem() {
$dbw = wfGetDB( DB_MASTER );
+
+   $user = User::newFromName( $this->getUser() );
+   if ( $user ) {
+   $userId = intval( $user->getId() );
+   $userText = $user->getName();
+   } else {
+   $userId = 0;
+   $userText = $this->getUser();
+   }
+
# @todo FIXME: This will not record autoblocks
if ( !$this->getTitle() ) {
wfDebug( __METHOD__ . ": skipping invalid 
{$this->type}/{$this->action} log time, timestamp " .
@@ -566,8 +576,8 @@
'log_type' => $this->type,
'log_action' => $this->action,
'log_timestamp' => $dbw->timestamp( $this->timestamp ),
-   'log_user' => User::idFromName( $this->user_text ),
-   # 'log_user_text' => $this->user_text,
+   'log_user' => $userId,
+   'log_user_text' => $userText,
'log_namespace' => $this->getTitle()->getNamespace(),
'log_title' => $this->getTitle()->getDBkey(),
'log_comment' => $this->getComment(),

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

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

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

[MediaWiki-commits] [Gerrit] Checkout and then rebase instead of cherry-pick - change (operations...puppet-compiler)

2016-01-06 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Checkout and then rebase instead of cherry-pick
..


Checkout and then rebase instead of cherry-pick

Cherry-picking won't work for cases like 
https://gerrit.wikimedia.org/r/#/c/244237/
where it depends on the parent commit to even apply the patch.

Change-Id: I475b8cffe425c2eb1d2e68c102fd8e3bdcdc041d
---
M puppet_compiler/prepare.py
M puppet_compiler/tests/test_prepare.py
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/puppet_compiler/prepare.py b/puppet_compiler/prepare.py
index 66a1e77..0b5ece2 100644
--- a/puppet_compiler/prepare.py
+++ b/puppet_compiler/prepare.py
@@ -137,7 +137,8 @@
 self.change_id, revision)
 git.fetch('-q', 'https://gerrit.wikimedia.org/r/operations/puppet',
   ref)
-git.cherry_pick('FETCH_HEAD')
+git.checkout('FETCH_HEAD')
+git.pull('--rebase', 'origin', 'production')
 
 def _sh(command):
 try:
diff --git a/puppet_compiler/tests/test_prepare.py 
b/puppet_compiler/tests/test_prepare.py
index af8a13c..7f16c09 100644
--- a/puppet_compiler/tests/test_prepare.py
+++ b/puppet_compiler/tests/test_prepare.py
@@ -63,7 +63,8 @@
 self.m._fetch_change()
 calls = [
 mock.call(['git', 'fetch', '-q', 
'https://gerrit.wikimedia.org/r/operations/puppet', 
'refs/changes/50/227450/1']),
-mock.call(['git', 'cherry-pick', 'FETCH_HEAD'])
+mock.call(['git', 'checkout', 'FETCH_HEAD']),
+mock.call(['git', 'pull', '--rebase', 'origin', 'production'])
 ]
 mocker.assert_has_calls(calls)
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I475b8cffe425c2eb1d2e68c102fd8e3bdcdc041d
Gerrit-PatchSet: 4
Gerrit-Project: operations/software/puppet-compiler
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump src to 80b21a18 for deploy - change (mediawiki...deploy)

2016-01-06 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Bump src to 80b21a18 for deploy
..

Bump src to 80b21a18 for deploy

Change-Id: I11edad7f8c6aa6130c1439df404be75499fa1d62
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/23/262723/1

diff --git a/src b/src
index fbd5417..80b21a1 16
--- a/src
+++ b/src
-Subproject commit fbd54170ba0c18e8a6400ecf5f873d73bc466467
+Subproject commit 80b21a18d7f7baa65cc97bde67696536eb235360

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11edad7f8c6aa6130c1439df404be75499fa1d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] Fix Javadoc errors in MccMncStateHandler class - change (apps...wikipedia)

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

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

Change subject: Fix Javadoc errors in MccMncStateHandler class
..


Fix Javadoc errors in MccMncStateHandler class

This patch fixes a few Javadoc errors in the MccMncStateHandler class.

Change-Id: I5b7659f215875e87a1c4f117eacf52f7f3ac3a83
---
M app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java 
b/app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java
index 752559e..d4eb0f7 100644
--- a/app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java
+++ b/app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java
@@ -17,10 +17,10 @@
  * and the user isn't currently opted out of event logging.
  * http://lists.wikimedia.org/pipermail/wikimedia-l/2014-April/071131.html
  *
- * @param ctx application context
+ * @param app app instance
  * @param site currently active site
  * @param customHeaders HashMap of custom headers
- * @return
+ * @return API enriched with MCC-MNC headers, or null if headers aren't 
necessary
  */
 public Api makeApiWithMccMncHeaderEnrichment(WikipediaApp app, Site site,
  HashMap 
customHeaders) {
@@ -43,7 +43,7 @@
  *
  * This is the equivalent of #makeApiWithMccMncHeaderEnrichment for 
Retrofit
  *
- * @param ctx Application context
+ * @param app app instance
  * @param domain currently active API domain
  * @param request Retrofit request
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b7659f215875e87a1c4f117eacf52f7f3ac3a83
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [Fix]: Set prperly Wikipedia doc_subpages in Famly(). - change (pywikibot/core)

2016-01-06 Thread Mpaa (Code Review)

Mpaa has uploaded a new change for review.

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

Change subject: [Fix]: Set prperly Wikipedia doc_subpages in Famly().
..

[Fix]: Set prperly Wikipedia doc_subpages in Famly().

Family.doc_subpage for Wikipedia family is now properly set in
Family.__init__().

Bug: T122956
Change-Id: I23e078406f1947b299b562b9a9e9df670a2e2c14
---
M pywikibot/families/wikipedia_family.py
1 file changed, 23 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/24/262724/1

diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index 23de9d6..fc85045 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -363,29 +363,6 @@
 'nds', 'co', 'mi', 'mr', 'id', 'lv', 'sw', 'tt', 'uk', 'vo', 'ga',
 'na', 'es', 'nl', 'da', 'dk', 'sv', 'test']
 
-def get_known_families(self, site):
-"""Override the family interwiki prefixes for each site."""
-# In Swedish Wikipedia 's:' is part of page title not a family
-# prefix for 'wikisource'.
-if site.code == 'sv':
-d = self.known_families.copy()
-d.pop('s')
-d['src'] = 'wikisource'
-return d
-else:
-return self.known_families
-
-def code2encodings(self, code):
-"""Return a list of historical encodings for a specific site."""
-# Historic compatibility
-if code == 'pl':
-return 'utf-8', 'iso8859-2'
-if code == 'ru':
-return 'utf-8', 'iso8859-5'
-if code in self.latin1old:
-return 'utf-8', 'iso-8859-1'
-return self.code2encoding(code),
-
 # Subpages for documentation.
 # TODO: List is incomplete, to be completed for missing languages.
 # TODO: Remove comments for appropriate pages
@@ -414,3 +391,26 @@
 'sv': (u'/dok', ),
 'uk': (u'/Документація', ),
 }
+
+def get_known_families(self, site):
+"""Override the family interwiki prefixes for each site."""
+# In Swedish Wikipedia 's:' is part of page title not a family
+# prefix for 'wikisource'.
+if site.code == 'sv':
+d = self.known_families.copy()
+d.pop('s')
+d['src'] = 'wikisource'
+return d
+else:
+return self.known_families
+
+def code2encodings(self, code):
+"""Return a list of historical encodings for a specific site."""
+# Historic compatibility
+if code == 'pl':
+return 'utf-8', 'iso8859-2'
+if code == 'ru':
+return 'utf-8', 'iso8859-5'
+if code in self.latin1old:
+return 'utf-8', 'iso-8859-1'
+return self.code2encoding(code)

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

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

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

[MediaWiki-commits] [Gerrit] Add largest allowed range as parameter to block form message - change (mediawiki/core)

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

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

Change subject: Add largest allowed range as parameter to block form message
..


Add largest allowed range as parameter to block form message

Change-Id: I17bcd5de01bb301193d849ec060fc3b5be6b14ab
---
M includes/specials/SpecialBlock.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/includes/specials/SpecialBlock.php 
b/includes/specials/SpecialBlock.php
index e125d94..b7f5e49 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -321,7 +321,8 @@
protected function preText() {
$this->getOutput()->addModules( array( 
'mediawiki.special.block', 'mediawiki.userSuggest' ) );
 
-   $text = $this->msg( 'blockiptext' )->parse();
+   $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' );
+   $text = $this->msg( 'blockiptext', $blockCIDRLimit['IPv4'], 
$blockCIDRLimit['IPv6'] )->parse();
 
$otherBlockMessages = array();
if ( $this->target !== null ) {
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0c72d77..9da9db1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2196,7 +2196,7 @@
"unblock-summary": "",
"blockip": "Block {{GENDER:$1|user}}",
"blockip-legend": "Block user",
-   "blockiptext": "Use the form below to block write access from a 
specific IP address or username.\nThis should be done only to prevent 
vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in 
a specific reason below (for example, citing particular pages that were 
vandalized).",
+   "blockiptext": "Use the form below to block write access from a 
specific IP address or username.\nThis should be done only to prevent 
vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].\nFill in 
a specific reason below (for example, citing particular pages that were 
vandalized).\nYou can block IP ranges using the 
[https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR] syntax; the 
largest allowed range is /$1 for IPv4 and /$2 for IPv6.",
"ipaddressorusername": "IP address or username:",
"ipbexpiry": "Expiry:",
"ipbreason": "Reason:",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 329e901..a134725 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2371,7 +2371,7 @@
"unblock-summary": "{{doc-specialpagesummary|unblock}}",
"blockip": "Used as the text of a link in the sidebar toolbox. Clicking 
this link takes you to [[Special:Block]], with a relevant username or IP 
address (e.g. \"Username\" on [[User talk:Username]], 
[[Special:Contributions/Username]], etc.) already filled in.\n\nParameters:\n* 
$1 - username, for GENDER support\n{{Identical|Block user}}",
"blockip-legend": "Legend/Header for the fieldset around the input form 
of [[Special:Block]].\n\n{{Identical|Block user}}",
-   "blockiptext": "Used in the {{msg-mw|Blockip}} form in 
[[Special:Block]].\n\nRefers to {{msg-mw|Policy-url}}.\n\nThis message may 
follow the message {{msg-mw|Ipb-otherblocks-header}} and other block 
messages.\n\nSee also:\n* {{msg-mw|Unblockiptext}}",
+   "blockiptext": "Used in the {{msg-mw|Blockip}} form in 
[[Special:Block]].\n\nRefers to {{msg-mw|Policy-url}}.\n\nThis message may 
follow the message {{msg-mw|Ipb-otherblocks-header}} and other block 
messages.\n\nParameters:\n* $1 - CIDR suffix of the largest allowed IPv4 block 
(as an integer)\n* $2 - CIDR suffix of the largest allowed IPv6 block (as an 
integer)\n\nSee also:\n* {{msg-mw|Unblockiptext}}",
"ipaddressorusername": "{{Identical|IP address or username}}",
"ipbexpiry": "{{Identical|Expiry}}",
"ipbreason": "Label of the block reason dropdown in [[Special:BlockIP]] 
and the unblock reason textfield in 
[{{fullurl:Special:IPBlockList|action=unblock}} 
Special:IPBlockList?action=unblock].\n\n{{Identical|Reason}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17bcd5de01bb301193d849ec060fc3b5be6b14ab
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Bináris 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Fixes: [Bug] Save button inactive when changing mono language - change (data-values/value-view)

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

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

Change subject: Fixes: [Bug] Save button inactive when changing mono language
..


Fixes: [Bug] Save button inactive when changing mono language

Bug: T95419
Change-Id: I3f38c3d77d2284fdf4a4d208d018676d3b1bd7b4
---
M lib/jquery.ui/jquery.ui.languagesuggester.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/lib/jquery.ui/jquery.ui.languagesuggester.js 
b/lib/jquery.ui/jquery.ui.languagesuggester.js
index 5cb88d6..01dd579 100644
--- a/lib/jquery.ui/jquery.ui.languagesuggester.js
+++ b/lib/jquery.ui/jquery.ui.languagesuggester.js
@@ -31,6 +31,7 @@
.on( 'selected.languagesuggester', function( event, item ) {
self._selectedValue = item.getValue();
self.element.val( item.getLabel() );
+   self._trigger( 'change' );
} );
 
return retVal;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f38c3d77d2284fdf4a4d208d018676d3b1bd7b4
Gerrit-PatchSet: 1
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jonas Kress (WMDE) 
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] ve.ce.minImgDataUri was considered invalid in Safari - change (VisualEditor/VisualEditor)

2016-01-06 Thread DLynch (Code Review)

DLynch has uploaded a new change for review.

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

Change subject: ve.ce.minImgDataUri was considered invalid in Safari
..

ve.ce.minImgDataUri was considered invalid in Safari

...so use a (slightly bigger) data-encoded GIF that Safari won't complain about.

Change-Id: I7fe677dd306f81e7a9b7a15a07e90ce42e6ffad9
---
M src/ce/ve.ce.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/25/262725/1

diff --git a/src/ce/ve.ce.js b/src/ce/ve.ce.js
index ed718d8..3e78f82 100644
--- a/src/ce/ve.ce.js
+++ b/src/ce/ve.ce.js
@@ -18,7 +18,7 @@
 /**
  * Data URI for minimal GIF image.
  */
-ve.ce.minImgDataUri = 'data:image/gif;base64,R0lGODdhAQABAADcACwAAQABAAA';
+ve.ce.minImgDataUri = 
'data:image/gif;base64,R0lGODlhAQABAIAAAP///yH5BAEALAABAAEAAAIBRAA7';
 ve.ce.unicornImgDataUri = 
'data:image/png;base64,iVBORw0KGgoNSUhEUg8TCAQAAADly58hAmJLR0QAAKqNIzIJcEhZcwAACxMAAAsTAQCanBgHdElNRQfeChIMMi319aEqzUlEQVQoz4XSMUoDURAG4K8NIljaeQZrCwsRb5FWL5Daa1iIjQewTycphAQloBEUAoogFmqMsiBmHSzcdfOWlcyU3/+YGXgsqJZMbvv/wLqZDCw1B9rCBSaOmgOHQsfQvVYT7wszIbPSxO9CCF8ebNXx1J2TIvDoxlrKU3mBIYz1U87mMISB3QqXk7e/A4bp1WV/CiE3sFHymZ4X4cO57yLWdVDyjoknr47/MPRcput1k+ljt/O4V1vu2bXViq9qPNW3WfGoxrk37UVfxQ999n1bP+Vh5gBJRU5ErkJggg==';
 ve.ce.chimeraImgDataUri = 
'data:image/png;base64,iVBORw0KGgoNSUhEUgAAABMTCAYAAAByUDbMBGdBTUEAALGPC/xhBQAAAThJREFUOMvF088rRFEYxvGpKdnwJ8iStVnMytZ2ipJmI6xmZKEUe5aUULMzCxtlSkzNjCh2lClFSUpDmYj8KBZq6vreetLbrXs5Rjn1aWbuuee575z7nljsH8YkepoNaccsHrGFgWbCWpHCLZb+oroFzKOEbpeFHVp8gitsYltzSRyiqrkKhsKCevGMfWQwor/2ghns4BQTGMMcnlBA3Aa14U5VLeMDnqrq1/cDpHGv35eqrI5pG+Y/qYYp3WiN6zOHs8DcA7IK/BqLWMOuY5inQjwbNqheGnYMO9d+XtiwFu1BQU/y96ooKRO2Yq6vqog3jAbfZgKvuDELfGWFXQeu76GB9bD26MQRNnSMotTVJvGoxs2rx2oR/B47Rtd3pyBv3lCYnEtYWo0Yps8l7F3HKErjJ2G/Hp/F9YtlR3MQiABJRU5ErkJggg==';
 ve.ce.nailImgDataUri = 
'data:image/png;base64,iVBORw0KGgoNSUhEUgAAABMTCAYAAAByUDbMsElEQVQ4y%2B3RzYnCYBSF4ScOOtjBdGGKkCBYRZYWYE%2B2MNvgShAFp4JpQUZwoXFhAoPk0y%2F4s%2FLAXdzFfTn3HF6gT0yxxBZ%2FKDBsC%2FrCBmXDHDCOBfWwDoDqWcXCJjdAJfaxsCIC9h067lzsg3ta6zS0GFSWZTCLhS9C76VpWoffjYWNkyQ5BkAl8ravjzDHrnKSV6FfDb%2BN8n9O80cA3%2B7O%2BmgJW%2BMXffxU%2B0McPlcnctpQa2TeZewASUVORK5CYII%3D';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fe677dd306f81e7a9b7a15a07e90ce42e6ffad9
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/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] Run puppet twice on new instance creation, with apt-get in b... - change (operations/puppet)

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

Andrew Bogott has uploaded a new change for review.

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

Change subject: Run puppet twice on new instance creation, with apt-get in 
between.
..

Run puppet twice on new instance creation, with apt-get in between.

Instances haven't really been truly up and settled until after the
first cron-based puppet run.  I'm just making that explicit on the
first go.

Change-Id: I27bc2725c457422c58908df0a6a025691835da96
---
M modules/labs_vmbuilder/files/firstboot.sh
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/262726/1

diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index 33eb33f..bffd855 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -103,5 +103,9 @@
 /etc/init.d/salt-minion restart
 
 puppet agent --enable
-# Force initial puppet run
+# Run puppet, twice.  The second time is just to pick up packages
+#  that may have been unavailable in apt before the first puppet run
+#  updated sources.list
 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff 
--waitforcert=10 --certname=${fqdn} --server=${master}
+apt-get update
+puppet agent -t

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

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

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

[MediaWiki-commits] [Gerrit] Run puppet twice on new instance creation, with apt-get in b... - change (operations/puppet)

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

Andrew Bogott has submitted this change and it was merged.

Change subject: Run puppet twice on new instance creation, with apt-get in 
between.
..


Run puppet twice on new instance creation, with apt-get in between.

Instances haven't really been truly up and settled until after the
first cron-based puppet run.  I'm just making that explicit on the
first go.

Change-Id: I27bc2725c457422c58908df0a6a025691835da96
---
M modules/labs_vmbuilder/files/firstboot.sh
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index 33eb33f..bffd855 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -103,5 +103,9 @@
 /etc/init.d/salt-minion restart
 
 puppet agent --enable
-# Force initial puppet run
+# Run puppet, twice.  The second time is just to pick up packages
+#  that may have been unavailable in apt before the first puppet run
+#  updated sources.list
 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff 
--waitforcert=10 --certname=${fqdn} --server=${master}
+apt-get update
+puppet agent -t

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

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

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

[MediaWiki-commits] [Gerrit] Rm b/c code - change (mediawiki...GeoData)

2016-01-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Rm b/c code
..

Rm b/c code

Change-Id: Ie87101b4650b5d54942085526efe22aa63061dfc
---
M includes/GeoDataHooks.php
1 file changed, 3 insertions(+), 14 deletions(-)


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

diff --git a/includes/GeoDataHooks.php b/includes/GeoDataHooks.php
index 37c9578..4280ec4 100644
--- a/includes/GeoDataHooks.php
+++ b/includes/GeoDataHooks.php
@@ -271,13 +271,8 @@
if ( !$wgGeoDataUseCirrusSearch && $wgGeoDataBackend != 
'elastic' ) {
return true;
}
-   if ( isset( $config[ 'page' ] ) ) {
-   // Post CirrusSearch 
I2d92dc973a66180dc39c646254ce9b11ec269edc
-   $pageConfig = $config[ 'page' ];
-   } else {
-   // Pre CirrusSearch 
I2d92dc973a66180dc39c646254ce9b11ec269edc
-   $pageConfig = $config;
-   }
+   $pageConfig = $config['page'];
+
$pageConfig['properties']['coordinates'] = array(
'type' => 'nested',
'properties' => array(
@@ -300,13 +295,7 @@
'precision' => $wgGeoDataCoordinatesCompression,
);
}
-   if ( isset( $config[ 'page' ] ) ) {
-   // Post CirrusSearch 
I2d92dc973a66180dc39c646254ce9b11ec269edc
-   $config[ 'page' ] = $pageConfig;
-   } else {
-   // Pre CirrusSearch 
I2d92dc973a66180dc39c646254ce9b11ec269edc
-   $config = $pageConfig;
-   }
+   $config['page'] = $pageConfig;
return true;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Improve docs, fix deprecated functons usage, rm unused method - change (mediawiki...GeoData)

2016-01-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Improve docs, fix deprecated functons usage, rm unused method
..

Improve docs, fix deprecated functons usage, rm unused method

Change-Id: Ic79ace426cb4dd377750966d7ce6722202c4c8b0
---
M includes/CoordinatesParserFunction.php
M includes/GeoData.body.php
M includes/GeoDataHooks.php
M includes/api/ApiQueryGeoSearchElastic.php
4 files changed, 21 insertions(+), 31 deletions(-)


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

diff --git a/includes/CoordinatesParserFunction.php 
b/includes/CoordinatesParserFunction.php
index 5f989f4..25dce4a 100644
--- a/includes/CoordinatesParserFunction.php
+++ b/includes/CoordinatesParserFunction.php
@@ -31,7 +31,7 @@
 *
 * @param Parser $parser
 * @param PPFrame $frame
-* @param Array $args
+* @param array $args
 * @throws MWException
 * @return Mixed
 */
@@ -71,7 +71,7 @@
/**
 * Parses parser function input
 * @param PPFrame $frame
-* @param Array $args
+* @param PPNode[] $args
 */
private function parseArgs( $frame, $args ) {
$first = trim( $frame->expand( array_shift( $args ) ) );
@@ -231,7 +231,7 @@
 * @return String
 */
private function errorText( Status $s ) {
-   $errors = array_merge( $s->getErrorsArray(), 
$s->getWarningsArray() );
+   $errors = $s->getStatusArray();
if ( !count( $errors ) ) {
return '';
}
diff --git a/includes/GeoData.body.php b/includes/GeoData.body.php
index 605be8f..9ead1f2 100644
--- a/includes/GeoData.body.php
+++ b/includes/GeoData.body.php
@@ -23,7 +23,7 @@
/**
 * Returns primary coordinates of the given page, if any
 * @param Title $title
-* @return Coord|bool: Coordinates or false
+* @return Coord|bool Coordinates or false
 */
public static function getPageCoordinates( Title $title ) {
$coords = self::getAllCoordinates( $title->getArticleID(), 
array( 'gt_primary' => 1 ) );
@@ -36,10 +36,10 @@
/**
 * Retrieves all coordinates for the given page id
 *
-* @param int $pageId: ID of the page
-* @param Array $conds: Conditions for Database::select()
-* @param int $dbType: Database to select from DM_MASTER or DB_SLAVE
-* @return Array: Array of Coord objects
+* @param int $pageId ID of the page
+* @param array $conds Conditions for Database::select()
+* @param int $dbType Database to select from DM_MASTER or DB_SLAVE
+* @return array Array of Coord objects
 */
public static function getAllCoordinates( $pageId, $conds = array(), 
$dbType = DB_SLAVE ) {
$db = wfGetDB( $dbType );
@@ -56,9 +56,9 @@
 * Parses coordinates
 * See https://en.wikipedia.org/wiki/Template:Coord for sample inputs
 *
-* @param Array $parts: Array of coordinate components
-* @param String $globe: Globe name
-* @return Status: Status object, in case of success its value is a 
Coord object.
+* @param array $parts Array of coordinate components
+* @param string $globe Globe name
+* @return Status Status object, in case of success its value is a 
Coord object.
 */
public static function parseCoordinates( $parts, $globe ) {
global $wgGlobes;
@@ -142,9 +142,9 @@
/**
 * Parses coordinate suffix such as N, S, E or W
 *
-* @param String $str: String to test
-* @param Array $coordInfo
-* @return int: Sign modifier or 0 if not a suffix
+* @param string $str String to test
+* @param array $coordInfo
+* @return int Sign modifier or 0 if not a suffix
 */
public static function parseSuffix( $str, $coordInfo ) {
global $wgContLang;
@@ -167,17 +167,5 @@
);
}
return $result;
-   }
-
-   /**
-* Given an array of non-normalised probabilities, this function will 
select
-* an element and return the appropriate key.
-*
-* @param $weights array
-*
-* @return int
-*/
-   public static function pickRandom( $weights ) {
-   return ArrayUtils::pickRandom( $weights );
}
 }
diff --git a/includes/GeoDataHooks.php b/includes/GeoDataHooks.php
index 4280ec4..fb7a79b 100644
--- a/includes/GeoDataHooks.php
+++ b/includes/GeoDataHooks.php
@@ -54,7 +54,7 @@
 * UnitTestsList hook handler
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList
 *
-* @param Array $files
+*

[MediaWiki-commits] [Gerrit] Remove Schema.extend - change (mediawiki...MobileFrontend)

2016-01-06 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Remove Schema.extend
..

Remove Schema.extend

Use OO.mfExtend instead

Change-Id: Ib74b95e3576ad9a2d14e243e1d1870b590362268
---
M resources/mobile.loggingSchemas/SchemaMobileWebSectionUsage.js
M resources/mobile.startup/Schema.js
2 files changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/resources/mobile.loggingSchemas/SchemaMobileWebSectionUsage.js 
b/resources/mobile.loggingSchemas/SchemaMobileWebSectionUsage.js
index db3b0f7..c9a4383 100644
--- a/resources/mobile.loggingSchemas/SchemaMobileWebSectionUsage.js
+++ b/resources/mobile.loggingSchemas/SchemaMobileWebSectionUsage.js
@@ -9,7 +9,7 @@
 * @class SchemaMobileWebSectionUsage
 * @extends Schema
 */
-   SchemaMobileWebSectionUsage = Schema.extend( {
+   OO.mfExtend( Schema, SchemaMobileWebSectionUsage, {
/**
 * @inheritdoc
 */
diff --git a/resources/mobile.startup/Schema.js 
b/resources/mobile.startup/Schema.js
index 40b556b..fdf03a7 100644
--- a/resources/mobile.startup/Schema.js
+++ b/resources/mobile.startup/Schema.js
@@ -168,10 +168,6 @@
 
deleteBeacon();
};
-   // FIXME: Needed to give time for Gather to update
-   Schema.extend = Class.extend;
-   mw.log.deprecate( Schema, 'extend', Schema.extend,
-   'Schema.extend is deprecated. Do not use this. Use OO.mfExtend' 
);
 
M.define( 'mobile.startup/Schema', Schema );
 

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

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

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

[MediaWiki-commits] [Gerrit] Exclude disambiguation pages from Special:ShortPages - change (mediawiki...Disambiguator)

2016-01-06 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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

Change subject: Exclude disambiguation pages from Special:ShortPages
..

Exclude disambiguation pages from Special:ShortPages

Depends on core change I9ac910bc.

Bug: T53124
Change-Id: I2a7003f90055c8f0e7a4ed1906d541d2cfc5ec58
---
M Disambiguator.hooks.php
M extension.json
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Disambiguator 
refs/changes/30/262730/1

diff --git a/Disambiguator.hooks.php b/Disambiguator.hooks.php
index 0e70fb7..7f0e75f 100644
--- a/Disambiguator.hooks.php
+++ b/Disambiguator.hooks.php
@@ -45,6 +45,23 @@
}
 
/**
+* Modify the Special:ShortPages query to ignore disambiguation pages
+* @param array &$tables
+* @param array &$conds
+* @param array &$joinConds
+* @param array &$options
+* @return bool
+*/
+   public static function onShortPagesQuery( &$tables, &$conds, 
&$joinConds, &$options ) {
+   $tables[] = 'page_props';
+   $conds['pp_page'] = null;
+   $joinConds['page_props'] = array(
+   'LEFT JOIN', array( 'page_id = pp_page', 'pp_propname' 
=> 'disambiguation' )
+   );
+   return true;
+   }
+
+   /**
 * Modify the Special:Random query to ignore disambiguation pages
 * @param array &$tables
 * @param array &$conds
diff --git a/extension.json b/extension.json
index 18b740a..680e2cc 100644
--- a/extension.json
+++ b/extension.json
@@ -22,6 +22,9 @@
"LonelyPagesQuery": [
"DisambiguatorHooks::onLonelyPagesQuery"
],
+   "ShortPagesQuery": [
+   "DisambiguatorHooks::onShortPagesQuery"
+   ],
"RandomPageQuery": [
"DisambiguatorHooks::onRandomPageQuery"
],

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

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

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

[MediaWiki-commits] [Gerrit] Labs Jessie: Run puppet twice on new instance creation, with... - change (operations/puppet)

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

Andrew Bogott has uploaded a new change for review.

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

Change subject: Labs Jessie: Run puppet twice on new instance creation, with 
apt-get in between.
..

Labs Jessie: Run puppet twice on new instance creation, with apt-get in between.

Instances haven't really been truly up and settled until after the
first cron-based puppet run.  I'm just making that explicit on the
first go.

Change-Id: Iaec2b1c7458c78f0a764d79e2f8f5fe8a6c874a3
---
M modules/labs_bootstrapvz/files/firstboot.sh
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/262731/1

diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index 08fefa0..22baa2a 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -131,5 +131,9 @@
 systemctl restart salt-minion.service
 
 puppet agent --enable
-# Force initial puppet run
+# Run puppet, twice.  The second time is just to pick up packages
+#  that may have been unavailable in apt before the first puppet run
+#  updated sources.list
 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff 
--waitforcert=10 --certname=${fqdn} --server=${master}
+apt-get update
+puppet agent -t

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

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

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

[MediaWiki-commits] [Gerrit] Rm b/c code - change (mediawiki...GeoData)

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

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

Change subject: Rm b/c code
..


Rm b/c code

Change-Id: Ie87101b4650b5d54942085526efe22aa63061dfc
---
M includes/GeoDataHooks.php
1 file changed, 3 insertions(+), 14 deletions(-)

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



diff --git a/includes/GeoDataHooks.php b/includes/GeoDataHooks.php
index 37c9578..4280ec4 100644
--- a/includes/GeoDataHooks.php
+++ b/includes/GeoDataHooks.php
@@ -271,13 +271,8 @@
if ( !$wgGeoDataUseCirrusSearch && $wgGeoDataBackend != 
'elastic' ) {
return true;
}
-   if ( isset( $config[ 'page' ] ) ) {
-   // Post CirrusSearch 
I2d92dc973a66180dc39c646254ce9b11ec269edc
-   $pageConfig = $config[ 'page' ];
-   } else {
-   // Pre CirrusSearch 
I2d92dc973a66180dc39c646254ce9b11ec269edc
-   $pageConfig = $config;
-   }
+   $pageConfig = $config['page'];
+
$pageConfig['properties']['coordinates'] = array(
'type' => 'nested',
'properties' => array(
@@ -300,13 +295,7 @@
'precision' => $wgGeoDataCoordinatesCompression,
);
}
-   if ( isset( $config[ 'page' ] ) ) {
-   // Post CirrusSearch 
I2d92dc973a66180dc39c646254ce9b11ec269edc
-   $config[ 'page' ] = $pageConfig;
-   } else {
-   // Pre CirrusSearch 
I2d92dc973a66180dc39c646254ce9b11ec269edc
-   $config = $pageConfig;
-   }
+   $config['page'] = $pageConfig;
return true;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Add initial .gitignore file - change (wikimedia...analytics)

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

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

Change subject: Add initial .gitignore file
..


Add initial .gitignore file

This ignores the .tox subdir along with vim swap files.

Change-Id: I0f073815f4647d7cd306530b4bac18d61b4bdbec
---
A .gitignore
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7da2043
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.tox/
+.*.sw?

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f073815f4647d7cd306530b4bac18d61b4bdbec
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/analytics
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Prevent app from inserting HTML tags into edit summaries - change (apps...wikipedia)

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

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

Change subject: Prevent app from inserting HTML tags into edit summaries
..


Prevent app from inserting HTML tags into edit summaries

Presently, in some circumstances, the app can insert HTML tags into edit
summaries, which doesn't make much sense since edit summaries are
plaintext. This patch prevents that from occurring by stripping any HTML
in the edit summary at the last minute.

Bug: T122714
Change-Id: I339794acdd9cc28650058283aa3789e43429074b
---
M app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java 
b/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index 24c0a4f..e94bbac 100644
--- a/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -255,6 +255,8 @@
 
 String summaryText = TextUtils.isEmpty(sectionHeading) ? "" : 
("/* " + sectionHeading + " */ ");
 summaryText += editPreviewFragment.getSummary();
+// Summaries are plaintext, so remove any HTML that's made its 
way into the summary
+summaryText = Html.fromHtml(summaryText).toString();
 
 new EditTask(EditSectionActivity.this, title, 
sectionText.getText().toString(),
 sectionID, token, summaryText, 
app.getUserInfoStorage().isLoggedIn()) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I339794acdd9cc28650058283aa3789e43429074b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Deskana 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add empty lib/ directory in oozie/popularity_score - change (wikimedia...analytics)

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

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

Change subject: Add empty lib/ directory in oozie/popularity_score
..


Add empty lib/ directory in oozie/popularity_score

The spark launcher in oozie expects to have a lib directory here,
even if it is completely empty. This was missed in my prior
commits because it was empty.

Change-Id: Ib39d96f09a046c0a0e823b71b34dce09cae6533d
---
A oozie/popularity_score/lib/.gitkeep
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/oozie/popularity_score/lib/.gitkeep 
b/oozie/popularity_score/lib/.gitkeep
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/oozie/popularity_score/lib/.gitkeep

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib39d96f09a046c0a0e823b71b34dce09cae6533d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/analytics
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move a function to where it belongs - change (mediawiki...GeoData)

2016-01-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Move a function to where it belongs
..

Move a function to where it belongs

Change-Id: I2c95d824a5743dd24b426f625bce491639690743
---
M includes/api/ApiQueryGeoSearch.php
M includes/api/ApiQueryGeoSearchDb.php
M tests/MiscGeoDataTest.php
3 files changed, 29 insertions(+), 29 deletions(-)


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

diff --git a/includes/api/ApiQueryGeoSearch.php 
b/includes/api/ApiQueryGeoSearch.php
index 1677927..4688526 100644
--- a/includes/api/ApiQueryGeoSearch.php
+++ b/includes/api/ApiQueryGeoSearch.php
@@ -115,34 +115,6 @@
}
}
 
-   /**
-* Returns a range of tenths of degree
-*
-* @param float $start
-* @param float $end
-* @param int|null $granularity
-*
-* @return array
-*/
-   public static function intRange( $start, $end, $granularity = null ) {
-   global $wgGeoDataIndexGranularity;
-
-   if ( !$granularity ) {
-   $granularity = $wgGeoDataIndexGranularity;
-   }
-   $start = round( $start * $granularity );
-   $end = round( $end * $granularity );
-   // @todo: works only on Earth
-   if ( $start > $end ) {
-   return array_merge(
-   range( -180 * $granularity, $end ),
-   range( $start, 180 * $granularity )
-   );
-   } else {
-   return range( $start, $end );
-   }
-   }
-
public function getAllowedParams() {
global $wgMaxGeoSearchRadius, $wgDefaultGlobe, $wgGeoDataDebug;
$params = array (
diff --git a/includes/api/ApiQueryGeoSearchDb.php 
b/includes/api/ApiQueryGeoSearchDb.php
index dfa29f0..cccadf7 100644
--- a/includes/api/ApiQueryGeoSearchDb.php
+++ b/includes/api/ApiQueryGeoSearchDb.php
@@ -102,4 +102,32 @@
}
$this->addOption( 'USE INDEX', array( 'geo_tags' => 
'gt_spatial' ) );
}
+
+   /**
+* Returns a range of tenths of degree
+*
+* @param float $start
+* @param float $end
+* @param int|null $granularity
+*
+* @return array
+*/
+   public static function intRange( $start, $end, $granularity = null ) {
+   global $wgGeoDataIndexGranularity;
+
+   if ( !$granularity ) {
+   $granularity = $wgGeoDataIndexGranularity;
+   }
+   $start = round( $start * $granularity );
+   $end = round( $end * $granularity );
+   // @todo: works only on Earth
+   if ( $start > $end ) {
+   return array_merge(
+   range( -180 * $granularity, $end ),
+   range( $start, 180 * $granularity )
+   );
+   } else {
+   return range( $start, $end );
+   }
+   }
 }
diff --git a/tests/MiscGeoDataTest.php b/tests/MiscGeoDataTest.php
index 62a98c1..ee3b973 100644
--- a/tests/MiscGeoDataTest.php
+++ b/tests/MiscGeoDataTest.php
@@ -8,7 +8,7 @@
 * @dataProvider getIntRangeData
 */
public function testIntRange( $min, $max, $expected ) {
-   $this->assertEquals( $expected, ApiQueryGeoSearch::intRange( 
$min, $max ) );
+   $this->assertEquals( $expected, ApiQueryGeoSearchDb::intRange( 
$min, $max ) );
}
 
public function getIntRangeData() {

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

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

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

[MediaWiki-commits] [Gerrit] Gather should use OO.mfExtend - change (mediawiki...Gather)

2016-01-06 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Gather should use OO.mfExtend
..

Gather should use OO.mfExtend

Change-Id: I9363c4d23bde8caf0541fd0dfb13abe15b6583e3
---
M resources/ext.gather.logging/SchemaGather.js
M resources/ext.gather.logging/SchemaGatherFlags.js
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/34/262734/1

diff --git a/resources/ext.gather.logging/SchemaGather.js 
b/resources/ext.gather.logging/SchemaGather.js
index 80cdff5..ee86910 100644
--- a/resources/ext.gather.logging/SchemaGather.js
+++ b/resources/ext.gather.logging/SchemaGather.js
@@ -13,7 +13,7 @@
 * @class SchemaGather
 * @extends Schema
 */
-   SchemaGather = Schema.extend( {
+   OO.mfExtend( Schema, SchemaGather, {
/**
 * @inheritdoc
 */
diff --git a/resources/ext.gather.logging/SchemaGatherFlags.js 
b/resources/ext.gather.logging/SchemaGatherFlags.js
index 4c08e18..a3954a0 100644
--- a/resources/ext.gather.logging/SchemaGatherFlags.js
+++ b/resources/ext.gather.logging/SchemaGatherFlags.js
@@ -7,7 +7,7 @@
 * @class SchemaGatherFlags
 * @extends Schema
 */
-   SchemaGatherFlags = Schema.extend( {
+   OO.mfExtend( Schema, SchemaGatherFlags, {
/**
 * @inheritdoc
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9363c4d23bde8caf0541fd0dfb13abe15b6583e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: dev
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Add missing dependencies for image update script - change (mediawiki...mathoid)

2016-01-06 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Add missing dependencies for image update script
..

Add missing dependencies for image update script

Change-Id: I72f86662d7191281464e37c1e34a542101baf570

Use dev config for testing

Change-Id: I23fad24d9d0832ec073113e770ee17a13208ca0b

Update documentation

Change-Id: Iab41826d844225ca54ffa09f18783a2d42145d69

Update node modules

Change-Id: I4d5dd658cbc8f59b880aa2296f34a6e65c8f

Update readme

Change-Id: I83a34d00b8f7ae144962f42b3cd46f32191a89bd

Add speech output format

Change-Id: I2df5c2c3d1d466434dc16df0defdd59641a6700e

Rename noSpeak to nospeech

* Add config option speechOn, which enables speech output by
 default.
* Prior to this change, speech was enabled by default for all request
  once it was activated.

Change-Id: I2df5c2c3d1d466434dc16df0defdd59641a6700e

Enable speech by default for /speech endpoint

* otherwise the endpoint would not print anything

Change-Id: I47ccd7548ca478023475a6d9f95aea10403edeb6

Update MathJax node version

* Kill mathoid worker on MathJax Processing Errors,
  otherwise mathoid just becomes unresponsive, which is worse.

Change-Id: I70b01c312ed80152308ef900bb9cf593607ffe92
---
M .gitignore
M README.md
M config.dev.yaml
M config.prod.yaml
A doc/test_results/ns/performance_mml.txt
A doc/test_results/ns/performance_png.txt
A doc/test_results/ns/performance_svg.txt
A doc/test_results/ns/performance_texvcinfo.txt
M doc/test_results/performance_mml.txt
M doc/test_results/performance_png.txt
M doc/test_results/performance_svg.txt
M doc/test_results/performance_texvcinfo.txt
M package.json
M routes/mathoid.js
M test/features/math/mathjax-texvc.js
M test/features/math/simple.js
M test/utils/server.js
17 files changed, 341 insertions(+), 120 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid 
refs/changes/39/260539/2

diff --git a/.gitignore b/.gitignore
index 19c009f..c817e86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 .idea
 mathoid*.iml
 config.vagrant.yaml
+Thumbs.db
diff --git a/README.md b/README.md
index a9e92be..439c25c 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,20 @@
 
 
 ## Installation
-see http://formulasearchengine.com/mathoid
+Install node 4.2.3, iojs-v2.5.0 or a compatible node version and npm version 
2.14.7 or similar.
+Thereafter, install mathoid by running
+```bash
+npm install mathoid
+nodejs /node_modules/mathoid/server.js
+```
+To install mathoid as a unix service there is a 
[script](scripts/gen-init-scripts.rb).
 
+### Running the tests
+To run the tests you need to install mocha.
+After that you can run the tests from the mathoid folder.
+```bash
+npm test
+```
 
 ## API Description
 
@@ -19,6 +31,7 @@
 
 Additional entry points for individual formats are
 * /texvcinfo does not do any rendering. Only displays information regarding 
the texvc input.
+* /speech returns the speech output only
 * /mml only MathML
 * /svg only SVG
 * /png only PNG
@@ -44,7 +57,7 @@
   * mml (MathML input, used in latexml rendering mode)
   * ascii (ascii mathml input, experimental)
 
- noSpeak
+ nospeech
 * optional
 * if speech output is enabled this switch suppresses speech output for one 
particular request
 
@@ -52,8 +65,9 @@
 * svg: creates and svg image (turned on by default)
 * img: creates a img element with dimension information about the svg image
 * png: creates png images using java
-* speakText: creates speech output using speech rule engine
+* speech: creates speech output using speech rule engine
 * texvcinfo: displays information regarding the texvc input (experimental)
+* speechOn: default setting for speech output. 'true' is equivalent to the old 
speakText.
 
 ## Performance
 The performance tests can be run by executing the 
[performance.sh](scripts/performance.sh) script.
@@ -63,11 +77,17 @@
 
 |format  |time|sd|
 |||--|
-| [texvcinfo](doc/test_results/performance_texvcinfo.txt) |0008|0006.5|
-| [mml](doc/test_results/performance_mml.txt) |1207|0626.4|
-| [svg](doc/test_results/performance_svg.txt) |1295|0434.7|
-| [png](doc/test_results/performance_png.txt) |3116|2301.2|
+| [texvcinfo](doc/test_results/performance_texvcinfo.txt) |0004|003.0|
+| [mml](doc/test_results/performance_mml.txt) |0308|057.8|
+| [svg](doc/test_results/performance_svg.txt) |0313|048.1|
+| [png](doc/test_results/performance_png.txt) |1656|988.3|
 
+|format (without speech support)   |time|sd|
+|--||--|
+| [texvcinfo](doc/test_results/ns/performance_texvcinfo.txt) |0005|004.6|
+| [mml](doc/test_results/ns/performance_mml.txt) |0031|008.0|
+| [svg](doc/test_results/ns/performance_svg.txt)

[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki/debian)

2016-01-06 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Initial commit
..


Initial commit

Based off of the 1.19 packaging work in Debian. Intended for packaging
1.25.5.

Change-Id: I9d7b04c3077df5e9a3ec6dcb887340bbf0f9f83e
---
A README.Debian
A changelog
A compat
A control
A copyright
A etc/apache.conf
A mediawiki-classes.install
A mediawiki.dirs
A mediawiki.docs
A mediawiki.install
A mediawiki.links
A mediawiki.lintian-overrides
A mediawiki.postinst
A mediawiki.postrm
A mediawiki.preinst
A mediawiki.prerm
A patches/debian_specific_config.patch
A patches/mimetypes.patch
A patches/series
A phpmod/mediawiki.ini
A rules
A source/format
A source/include-binaries
A upstream/signing-key.asc
A watch
25 files changed, 2,131 insertions(+), 0 deletions(-)

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



diff --git a/README.Debian b/README.Debian
new file mode 100644
index 000..d9756ef
--- /dev/null
+++ b/README.Debian
@@ -0,0 +1,76 @@
+mediawiki for Debian
+
+
+
+Optional features:
+   - Image thumbnailing :
+ Install 'php5-gd' or 'imagemagick' to use this feature.
+
+Configuration:
+   The configuration uses an easy web-based system ; just go to this URL :
+   http://www.myserver.org/mediawiki/mw-config/index.php
+   (replace by your own servername)
+ You may of course configure your webserver to serve this URL. A 
default
+ configuration can be found in /etc/mediawiki/. Apache users
+ may have linked this in their configuration automatically if they 
asked
+ the installer to do so.
+   Then just copy the generated config to the real system location :
+   mv /var/lib/mediawiki/mw-config/LocalSettings.php \
+/etc/mediawiki
+   You should change file permissions for LocalSettings.php as required to
+   prevent other users on the server from reading passwords and
+   altering configuration data.
+   .
+   Warning: to make this work, we have to define MW_INSTALL_PATH. This is 
done
+   automatically in this package. However, you may change this later if 
you plan
+   to set up multisite wikis.
+   After being configured, you should begin your surf on your new wiki 
using this url:
+   http://www.myserver.org/mediawiki
+   (replace by your own servername)
+   Enjoy !!!
+
+Security concerns:
+  1) privilege separation:
+   Once installed, you can improve security by separating sql 
privileges. Thus having your standard
+   sql account be granted only SELECT/INSERT/DELETE/UPDATE on your 
mediawiki database, and an additional
+   account used for maintenance with additional CREATE/DROP/ALTER rights.
+   To use this feature, you only need to setup an additional 
account in the database and provide
+   the new credentials into /etc/mediawiki/LocalSettings.php
+   then don't forget to lower rights of the primary account.
+  2) file upload check:
+   You can activate file upload virus checking by installing the 
'clamav' package and setting the
+   following in LocalSettings.php:
+   $wgAntivirus = 'clamav';
+
+Upgrading the database:
+   When upgrading to new releases, the database may need an upgrade before 
your wiki is able to
+   work. Here is a rapid sketch:
+   1) Dump your database to a text file.
+  mysqldump --add-drop-table -u  -p  > 
/path/to/file.sql
+   2)   You will need an AdminSettings.php file.
+   If you don't have any, a sample is not available (sorry!).
+   You may fill in this file and copy it in /etc/mediawiki.
+   If you use the mysql root account, you may delete it afterward.
+   3)  Then run this command:
+  php /var/lib/mediawiki/maintenance/update.php
+   This shall need a proper php5 binary, as provided in php5-cli
+
+Configuring apache and MySQL:
+   A good how-to to correctly setup the application used by mediawiki can 
be found there:
+   
http://www.mediawiki.org/wiki/Manual:Running_MediaWiki_on_Debian_GNU/Linux
+   But, of course, you should NOT do the part that talks about mediawiki 
installation itself :)
+
+Editing and Syntax:
+   MediaWiki syntax is rather complex.
+   To prevent this README file from becoming a manual,
+   we don't provide here instructions on MediaWiki syntax.
+   But you can point your browser to this page:
+   http://meta.wikimedia.org/wiki/Help:Editing
+   Where you will find all that you'd like to know about it!
+
+Contributing:
+   Help is welcome in maintaining the mediawiki package! The git 
repository is
+   , patches can be 
sent via
+   Gerrit (), 
through the
+   GitHub mirror

[MediaWiki-commits] [Gerrit] Rework JavaScript - change (mediawiki...TocTree)

2016-01-06 Thread Gerrit Patch Uploader (Code Review)

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Rework JavaScript
..

Rework JavaScript

* Support LivePreview by using hook 'wikipage.content'
* Avoid unnecessary public object mw.tocTree
* Apply coding conventions for JavaScript
** Closure
** $( '' ) instead of $( '' )

Change-Id: Ibe9e37fe009314a4da9488c23a9fd757c41b16ee
---
M modules/ext.toctree.js
1 file changed, 11 insertions(+), 15 deletions(-)


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

diff --git a/modules/ext.toctree.js b/modules/ext.toctree.js
index b091e10..30b6f7b 100644
--- a/modules/ext.toctree.js
+++ b/modules/ext.toctree.js
@@ -11,8 +11,8 @@
  * @licence GNU General Public Licence 2.0 or later
  */
 
-mw.tocTree = {
-   processClickEvent: function ( event ) {
+( function ( mw, $ ) {
+   function processClickEvent( event ) {
var $ul = $( 'ul', $( this ).parent().parent() );
$ul.toggle();
 
@@ -25,10 +25,10 @@
.text( '+' )
.attr( 'title', mw.msg( 'showtoc' ) );
}
-   },
+   }
 
-   init: function() {
-   var $toc = $( '#toc' );
+   function init( $content ) {
+   var $toc = $content.find( '#toc' );
 
if ( $toc.length > 0 ) {
if ( mw.user.options.get( 'toc-floated' ) ) {
@@ -39,7 +39,7 @@
var $mainUl = $( 'ul:first', $toc );
var $mainList = $( 'li', $toc );
 
-   $mainList.each( function( i ) {
+   $mainList.each( function ( i ) {
if ( $( this ).hasClass( 'toclevel-1' ) ) {
$( this ).css( 'position', 'relative' );
var $subList = $( 'ul', $( this ) );
@@ -49,7 +49,7 @@
$mainUl.addClass( 
'tocUl' );
}
 
-   var $toggleLink = $( '' 
).addClass( 'toggleSymbol' );
+   var $toggleLink = $( '' 
).addClass( 'toggleSymbol' );
 
if ( mw.user.options.get( 
'toc-expand' ) ) {
$toggleLink
@@ -64,9 +64,9 @@
 
$subList.hide();
}
-   $toggleLink.click( 
mw.tocTree.processClickEvent );
+   $toggleLink.click( 
processClickEvent );
 
-   var $toggleSpan = $( '' 
).addClass( 'toggleNode' );
+   var $toggleSpan = $( '' 
).addClass( 'toggleNode' );
$toggleSpan.append( '[', 
$toggleLink, ']' );
 
$( this ).prepend( $toggleSpan 
);
@@ -74,11 +74,7 @@
}
} );
}
-
-   return true;
}
-};
 
-jQuery( function( $ ) {
-   mw.tocTree.init();
-} );
+   mw.hook( 'wikipage.content' ).add( init );
+}( mediaWiki, jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe9e37fe009314a4da9488c23a9fd757c41b16ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TocTree
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] RequestContext: Load the request object for getRequest on fi... - change (mediawiki/core)

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

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

Change subject: RequestContext: Load the request object for getRequest on first 
call
..


RequestContext: Load the request object for getRequest on first call

Instead of relying on the global $wgRequest, which probably isn't initialized
so far, create the request object when RequestContext::getRequest() is called
the first time.

Change-Id: I6115ba44e474619d02d456a103758fe73ed298e0
---
M includes/Setup.php
M includes/context/RequestContext.php
2 files changed, 10 insertions(+), 7 deletions(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index bd20ac3..f72f5ca 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -614,15 +614,13 @@
$wgDBerrorLogTZ = $wgLocaltimezone;
 }
 
+// initialize the request object in $wgRequest
+$wgRequest = RequestContext::getMain()->getRequest(); // BackCompat
+
 // Useful debug output
 if ( $wgCommandLineMode ) {
-   $wgRequest = new FauxRequest( array() );
-
wfDebug( "\n\nStart command line script $self\n" );
 } else {
-   // Can't stub this one, it sets up $_GET and $_REQUEST in its 
constructor
-   $wgRequest = new WebRequest;
-
$debug = "\n\nStart request {$wgRequest->getMethod()} 
{$wgRequest->getRequestURL()}\n";
 
if ( $wgDebugPrintHttpHeaders ) {
diff --git a/includes/context/RequestContext.php 
b/includes/context/RequestContext.php
index 4f8e65d..8c13e97 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -121,8 +121,13 @@
 */
public function getRequest() {
if ( $this->request === null ) {
-   global $wgRequest; # fallback to $wg till we can 
improve this
-   $this->request = $wgRequest;
+   global $wgCommandLineMode;
+   // create the WebRequest object on the fly
+   if ( $wgCommandLineMode ) {
+   $this->request = new FauxRequest( array() );
+   } else {
+   $this->request = new WebRequest();
+   }
}
 
return $this->request;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6115ba44e474619d02d456a103758fe73ed298e0
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Cleanup HTML output - change (mediawiki...Kartographer)

2016-01-06 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Cleanup HTML output
..

Cleanup HTML output

For parsing consistency always output
  
as the root element.)

Change-Id: I9ff808430cd91125554a167071db4b25944f9f42
---
M Kartographer.hooks.php
M modules/kartographer.js
D styles/live.less
D styles/static.less
R styles/styles.less
5 files changed, 24 insertions(+), 24 deletions(-)


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

diff --git a/Kartographer.hooks.php b/Kartographer.hooks.php
index 0719dec..c6c0823 100644
--- a/Kartographer.hooks.php
+++ b/Kartographer.hooks.php
@@ -131,19 +131,24 @@
}
 
$html = '';
+   $attrs = array(
+   'class' => 'mw-kartographer mw-kartographer-' . $mode,
+   );
switch ( $mode ) {
case 'static':
// 
http://.../img/{source},{zoom},{lat},{lon},{width}x{height} [ @{scale}x ] 
.{format}
// Optional query value:  ? data = 
{title}|{group1}|{group2}|...
global $wgKartographerMapServer, 
$wgKartographerSrcsetScales;
 
-   $statParams = sprintf( 
'%s/img/%s,%s,%s,%s,%sx%s', $wgKartographerMapServer, $style,
-   $zoom, $lat, $lon, $width, 
$height );
-   $attrs = array(
-   'class' => 
'mw-kartographer-img',
-   'src' => $statParams . '.jpeg' 
. $dataParam,
-   'width' => $width,
-   'height' => $height,
+   $statParams = sprintf( 
'%s/img/%s,%s,%s,%s,%sx%s',
+   $wgKartographerMapServer, $style,
+   $zoom, $lat, $lon, $width, $height
+   );
+
+   $imgAttrs = array(
+   'src' => $statParams . '.jpeg' . 
$dataParam,
+   'width' => $width,
+   'height' => $height,
);
if ( $wgKartographerSrcsetScales ) {
$srcSet = array();
@@ -151,22 +156,23 @@
$s = '@' . $scale . 'x';
$srcSet[$scale] = $statParams . 
$s . '.jpeg' . $dataParam;
}
-   $attrs['srcset'] = Html::srcSet( 
$srcSet );
+   $imgAttrs['srcset'] = Html::srcSet( 
$srcSet );
}
 
$output->addModules( 'ext.kartographer.static' 
);
-   $html = Html::rawElement( 'img', $attrs );
+   $html = Html::rawElement( 'div', $attrs,
+   Html::rawElement( 'img', $imgAttrs )
+   );
break;
 
case 'interactive':
-   $attrs = array(
-   'class' => 
'mw-kartographer-live',
-   'style' => 
"width:${width}px;height:${height}px",
-   'data-style' => $style,
-   'data-zoom' => $zoom,
-   'data-lat' => $lat,
-   'data-lon' => $lon,
-   );
+   $attrs = array_merge( $attrs, array(
+   'style' => 
"width:${width}px;height:${height}px;",
+   'data-style' => $style,
+   'data-zoom' => $zoom,
+   'data-lat' => $lat,
+   'data-lon' => $lon,
+   ) );
if ( $groups ) {
$attrs['data-overlays'] = 
FormatJson::encode( $groups, false,
FormatJson::ALL_OK );
diff --git a/modules/kartographer.js b/modules/kartographer.js
index 92cf5c0..680fe0e 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -37,7 +37,7 @@
urlFormat = '/{z}/{x}/{y}' + scale + '.png';
mapData =

[MediaWiki-commits] [Gerrit] _oid meeting - change (mediawiki...mathoid)

2016-01-06 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: _oid meeting
..

_oid meeting

Expose the json data for the D3 formula visualisation data
via a new endpoint called graph.

Change-Id: I9c7432bee53694c34958cadff76c646580a31457
---
M routes/mathoid.js
M test/features/math/simple.js
2 files changed, 31 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid 
refs/changes/37/262737/1

diff --git a/routes/mathoid.js b/routes/mathoid.js
index f982c8e..779d677 100644
--- a/routes/mathoid.js
+++ b/routes/mathoid.js
@@ -31,7 +31,7 @@
 };
 
 
-function emitError(txt,detail) {
+function emitError(txt, detail) {
 if (detail === undefined) {
 detail = txt;
 }
@@ -66,6 +66,10 @@
 q = sanitizedTex;
 } else {
 emitError(feedback.error.name + ': ' + feedback.error.message, 
feedback);
+}
+if (app.conf.texvcinfo && outFormat === "graph") {
+res.json(texvcInfo.texvcinfo(q, {"format": "json", "compact": 
true}));
+return;
 }
 if (app.conf.texvcinfo && outFormat === "texvcinfo") {
 res.json(feedback).end();
@@ -105,7 +109,7 @@
 if (sanitizedTex !== undefined) {
 data.sanetex = sanitizedTex;
 }
-if ( speech ){
+if (speech) {
 data.speech = data.speakText;
 }
 switch (outFormat) {
@@ -167,7 +171,7 @@
 speech = false;
 }
 function setOutFormat(fmt) {
-if (app.conf[fmt]) {
+if (app.conf[fmt] || (fmt === 'graph' && app.conf.texvcinfo)) {
 outFormat = fmt;
 } else {
 emitFormatError(fmt);
@@ -184,6 +188,12 @@
 break;
 case "texvcinfo":
 setOutFormat('texvcinfo');
+if (!/tex$/i.test(type)) {
+emitError('texvcinfo accepts only tex or inline-tex as the 
input type, "' + type + '" given!');
+}
+break;
+case "graph":
+setOutFormat('graph');
 if (!/tex$/i.test(type)) {
 emitError('texvcinfo accepts only tex or inline-tex as the 
input type, "' + type + '" given!');
 }
@@ -207,7 +217,7 @@
 } else {
 outFormat = "json";
 }
-handleRequest(res, q, type, outFormat, {speech:speech});
+handleRequest(res, q, type, outFormat, {speech: speech});
 
 });
 
diff --git a/test/features/math/simple.js b/test/features/math/simple.js
index df232d8..1e3f54d 100644
--- a/test/features/math/simple.js
+++ b/test/features/math/simple.js
@@ -170,9 +170,9 @@
 it(data.query.q, function () {
 this.timeout(3);
 return preq.post({
-uri: baseURL,
-body: data.query
-})
+uri: baseURL,
+body: data.query
+})
 .then(function (res) {
 assert.status(res, data.response.status);
 Object.keys(data.response.body).forEach(function (key) 
{
@@ -246,20 +246,29 @@
 });
 it("display texvcinfo", function () {
 return preq.post({
-uri: baseURL+"texvcinfo",
-body: {q: "\\hbar+\\mathcal{S}"}
+uri: baseURL + "texvcinfo",
+body: {q: "\\mathcal{S}"}
 }).then(function (res) {
 assert.status(res, 200);
-assert.ok(res.body.identifiers.indexOf("\\hbar")===0);
+assert.ok(res.body.identifiers.indexOf("\\mathcal{S}") === 0);
+});
+});
+it("display graph", function () {
+return preq.post({
+uri: baseURL + "graph",
+body: {q: "\\frac{a}{b}"}
+}).then(function (res) {
+assert.status(res, 200);
+assert.notDeepEqual(res.body.name === 'root');
 });
 });
 it("get speech text", function () {
 return preq.post({
-uri: baseURL+"speech",
+uri: baseURL + "speech",
 body: {q: "E=mc^2"}
 }).then(function (res) {
 assert.status(res, 200);
-assert.deepEqual(res.body,"upper E equals m c squared");
+assert.deepEqual(res.body, "upper E equals m c squared");
 });
 });
 });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c7432bee53694c34958cadff76c646580a31457
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt

[MediaWiki-commits] [Gerrit] Add symlink to config.prod.yaml - change (mediawiki...deploy)

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

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

Change subject: Add symlink to config.prod.yaml
..


Add symlink to config.prod.yaml

Bug: T122498
Change-Id: I82c092e70039a703934c22901e344804d9488092
---
A config.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/config.yaml b/config.yaml
new file mode 12
index 000..84c9049
--- /dev/null
+++ b/config.yaml
@@ -0,0 +1 @@
+src/config.prod.yaml
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82c092e70039a703934c22901e344804d9488092
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove queue of event batches from mysql consumer - change (eventlogging)

2016-01-06 Thread Mforns (Code Review)

Mforns has uploaded a new change for review.

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

Change subject: Remove queue of event batches from mysql consumer
..

Remove queue of event batches from mysql consumer

Since the mysql consumer uses Kafka, there is no more need
to have the deque of event batches, nor the worker thread.
The mysql writer can block while inserting and let Kafka
buffer the incomming events. Note that the mysql consumer
still groups (batches) the events by schema to insert them
together in a single insert statement, but it does not queue
them for insertion, rather inserts them directly when the
batch is big enough (or old enough).

Bug: T121151
Change-Id: If247ed99b3f828b82295689b2e4ade5d21eb5c04
---
M eventlogging/handlers.py
M eventlogging/jrm.py
M eventlogging/utils.py
M tests/test_jrm.py
4 files changed, 69 insertions(+), 163 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/eventlogging 
refs/changes/38/262738/1

diff --git a/eventlogging/handlers.py b/eventlogging/handlers.py
index a7c8993..db308a2 100644
--- a/eventlogging/handlers.py
+++ b/eventlogging/handlers.py
@@ -15,8 +15,6 @@
 import imp
 import inspect
 
-from functools import partial
-
 import logging
 import logging.handlers
 import os
@@ -29,10 +27,10 @@
 import uuid
 
 from .compat import items, json
-from .utils import PeriodicThread, uri_delete_query_item
+from .utils import uri_delete_query_item
 from .factory import writes, reads
 from .streams import stream, pub_socket, sub_socket, udp_socket
-from .jrm import store_sql_events, DB_FLUSH_INTERVAL
+from .jrm import store_sql_events
 from .topic import TopicNotFound
 
 __all__ = ('load_plugins',)
@@ -255,27 +253,10 @@
 kafka_producer.send_messages(message_topic, message)
 
 
-def insert_stats(stats, inserted_count):
-"""
-Callback function to increment mysql inserted metric in statsd,
-that is called after successful insertion of events into mysql.
-
-stats   - Instance of stats.StatsClient
-inserted_count  - Number of events that have been inserted
-"""
-if stats:
-stats.incr('overall.inserted', inserted_count)
-
-
 @writes('mysql', 'sqlite')
 def sql_writer(uri, replace=False, statsd_host=''):
 """Writes to an RDBMS, creating tables for SCIDs and rows for events."""
 import sqlalchemy
-
-# Don't pass 'replace' and 'statsd_host' parameter to SQLAlchemy.
-uri = uri_delete_query_item(uri, 'replace')
-uri = uri_delete_query_item(uri, 'statsd_host')
-
 logger = logging.getLogger('Log')
 
 # Create a statsd client instance if statsd_host is specified
@@ -283,73 +264,53 @@
 if statsd_host:
 stats = statsd.StatsClient(statsd_host, 8125, prefix='eventlogging')
 
-meta = sqlalchemy.MetaData(bind=uri)
-# Each scid stores a buffer and the timestamp of the first insertion.
-events = collections.defaultdict(lambda: ([], time.time()))
-events_batch = collections.deque()
-# Since the worker is unaware of the statsd host, create a partial
-# that binds the statsd client argument to the callback
-worker = PeriodicThread(interval=DB_FLUSH_INTERVAL,
-target=store_sql_events,
-args=(meta, events_batch),
-kwargs={'replace': replace,
-'on_insert_callback':
-partial(insert_stats, stats)})
-worker.start()
+# Don't pass 'replace' and 'statsd_host' parameter to SQLAlchemy.
+uri = uri_delete_query_item(uri, 'replace')
+uri = uri_delete_query_item(uri, 'statsd_host')
 
+meta = sqlalchemy.MetaData(bind=uri)
 if meta.bind.dialect.name == 'mysql':
 @sqlalchemy.event.listens_for(sqlalchemy.pool.Pool, 'checkout')
 def ping(dbapi_connection, connection_record, connection_proxy):
 # Just before executing an insert, call mysql_ping() to verify
 # that the connection is alive, and reconnect if necessary.
 dbapi_connection.ping(True)
+
+# For each SCID (schema, revision) we store an event batch and
+# the timestamp of the first event. Whenever the batch reaches
+# the size specified by batch_size or it hasn't received events
+# for more than batch_time seconds it is flushed into mysql.
+events = collections.defaultdict(lambda: ([], time.time()))
+batch_size = 5000
+batch_time = 300
+
 try:
-batch_size = 5000
-batch_time = 300  # in seconds
-# Max number of batches pending insertion.
-queue_size = 1000
-sleep_seconds = 5
-# Link the main thread to the worker thread so we
-# don't keep filling the queue if the worker died.
-while worker.is_alive():
-# If the queue is too big, wait for the worker to empty it.
-while len(events_batch) > queue_size:
-

[MediaWiki-commits] [Gerrit] Update signing key and watch file - change (mediawiki/debian)

2016-01-06 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Update signing key and watch file
..

Update signing key and watch file

* Sync with https://www.mediawiki.org/keys/keys.txt
* Use HTTPS for watch file

Change-Id: I61a194aae725b73364292df95f63979639ec2b8a
---
M upstream/signing-key.asc
M watch
2 files changed, 48 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/39/262739/1

diff --git a/upstream/signing-key.asc b/upstream/signing-key.asc
index 4b513da..74714f1 100644
--- a/upstream/signing-key.asc
+++ b/upstream/signing-key.asc
@@ -299,4 +299,50 @@
 cuxVGndtnTXP+onv6Hbaf/ppMYxdwiLSwMSIEOQoVEXumJHW+G2Qq7ROrZmZUasf
 9AWnFoBvSo9zXpbgedVaAr1Vk+i/UALTtAjfJ2OH3bJswJfFzbunGoOYxDIc+8I=
 =vhcr
--END PGP PUBLIC KEY BLOCK-
\ No newline at end of file
+-END PGP PUBLIC KEY BLOCK-
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - https://gpgtools.org
+
+mQENBFNgNjEBCAC7tUYBdS/dja7kiGpPbCLNTjJpPnlXnGOxLo0CxkkXSutHI+eP
+00DZdLzw7pJc0LsR37b0voulP9X0ufl9lPWcVtNG6dlOMG9mLpBUO3fmfe16fUbi
+neqjgkQ4Zk5Dw8VLrVoyGWZDrbzsiyfVl7w3x/81o3j0i1uudg3UWeyXJrXDm/oc
+h506FFhwzUNp8OxMeL7aNk1SoF1o1/msSveIuzv2MIbUI2VqUjECcjWBCZAFMYiw
+teYG5ce/UBfucFfCaR9D0Xm/dVs2RQkacM9DF831DjbD/G1mMx5HVYBFNDBXO3lh
+F8Iq1atqdKweFPFAXGvPVQ9T0Vi/1GCZaKYJABEBAAG0IUNoYWQgSG9yb2hvZSA8
+Y2hhZEB3aWtpbWVkaWEub3JnPokBQAQTAQoAKgIbAwUJFpJegAULCQgHAwUVCgkI
+CwUWAgMBAAIeAQIXgAUCU2A6MQIZAQAKCRByvBxdIxB/ijhdB/wOh2lVM9aQ6oGj
+G7z0gxCDlRWeMnY4sAx3FDveoxBywuaq/4wkJXXrO6Uk0cVXkeakgn9RqGAlQKHR
+9+IU+FZf5cS2vf/rSV/xoKiLie/zLHLkkxIu0Ctpf9okSFjXuWLkVKoQ8MbEoUMQ
+Sg24laMDlTKqVfLc4cW/4MNhBNIgVuLQsm6w2FIWM67e1vMgK1dAG5ne4fXQwKla
+ORjnb66LF7wE/6gsZUI92T7C9qBi6eeHcccdrdNEOasnmxVPz7NnK4zf3eGb3MkU
+06/I9JlmIty6xOYD6Fc9klf0eBgGhnsXHRRUMTnyYpuNJqQyssDT1lgo42Z9n840
+KwB2j4EMiQE9BBMBCgAnBQJTYDYxAhsDBQkWkl6ABQsJCAcDBRUKCQgLBRYCAwEA
+Ah4BAheAAAoJEHK8HF0jEH+KXGoH/iXYRFeHT79gUag2X+fghbmAxxa5XLYLTfGO
+Il83yipNPxPpgav0DQwJ5jlkyDwiwxwtCliFy346crSkjdXUMnhtSfdUK3O262Iu
+s7EWw5uNPxgYJKlMJHqy/FeKGLqR5To2TRZpPf8XvcfuKG8utYf0jADHFz1AulxL
+xwXS/nF2kF5tyDVkv0RA3m/er2GPndigMvySTKNu0v1LbG4wSPxC6QE6npElAgP+
+aVcYLvFmnLj3w6AAQusyqTzx9LW4tFt3Ou7G/AJil9HYR15GIzrEAsVRowNzKOzJ
+eh9dQNrmQqQJ6QVZL62+KEXIG4jyT/ZzkqLP/lyCEt51Cugqu5G0I2tleWJhc2Uu
+aW8vZGVtb24gPGRlbW9uQGtleWJhc2UuaW8+iQEtBBMBCgAXBQJTYDYxAhsDAwsJ
+BwMVCggCHgECF4AACgkQcrwcXSMQf4rf4gf/eCaI/afmvbIkWlRmmoDUs29ywvkL
+wduZC6VNdeHhKhcE8jwGMYU8KvhVAEb2hvfs5gcEpke5gtXNeINTJdWEGbotdC0D
+Y9msM04sEaLQ3zDnirxATWUGCQ7R2uO1Qbt3UpWP672/rPk+D9fqjt49OJ5k4j10
+8s9lkVGBYuO1+QHtbDHBM19hy1gInY3yaHDNPY1wYgvYF+cX3trguo9J6irHommF
+TnQRZUkht/VUgY4CAqnTuVsRY3D1y48jbGqfQdQGR5IAsaO/7z2uXjs3xt5XQRq8
+gPuw/WrLlQ7tHJvxePDhgn2khLCREPqfMWGyUZFWcd7oywu/XyZxMR8ilLkBDQRT
+YDYxAQgA+/NFLUBpNsI4wkWq99s7lsab4gnVbtS1DB4ezfJuoXW/sRG88QaomFAl
+TYTUyevJHBWrjv8aPrDTLs0ImZUit5CDoJ8JqvD8wwkM1MC/0EZUGeWzp58kwCTA
+eDwsswBkcY7P4pVhzRQsq1hgJd6xueeho0xLO1WDRuC0yXoLL0KbecN5a8j+iTG+
+eOXmIWKduVFpBoDQDt2vqUHDR4f50j6lXc6cB1MEPvTr6fxDyY4lDJ+h4FZ/wUqQ
+nSlSYj6/lHxdEgyRLTUwAmWImsbyERGbAcOONnuVRlR1neYC1kUpQi33bc1OcTrR
+lCbUc0OsvLaV9F5NIhO2Y+jZyPHfwQARAQABiQEkBBgBCgAPBQJTYDYxAhsMBQkW
+kl6AAAoJEHK8HF0jEH+Kr6QH92SQHeKCKdzNOmd0jtjH+noCM0KisvtJnUt7RVVx
+NwPCLeZqC8Xf8i9Mmv2CrMVyesIQwcyG31+7q9YZ9jSG2nEdeY8v+hZqKDzsLUjS
+DWOpNgyu9jsbVGQ2Ijb2b6Qwyh8WqbElMxaWBeXbGiBgsNBOWrG8wtFLH4+oehvW
+S0bzxMJWT9imJqQNas/1CVoKBJtVnM15wOXjXZYUarnj+Ku/HAtnGpilPerhRmNF
+QDEOuZJgEOsHT0NuZvGcBtR399fa8RxtP/Ymud/HA73ymjMPnE+/rc+Bs/TCvDtr
+jUugJFudE4bbWlmq/2dYreAtqCtO9sMbhSRtbUGfjcHF7g==
+=ysCu
+-END PGP PUBLIC KEY BLOCK-
diff --git a/watch b/watch
index dd80936..c448cf6 100644
--- a/watch
+++ b/watch
@@ -1,4 +1,4 @@
 version=3
 
 opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/" \
-http://releases.wikimedia.org/mediawiki/1.25/ mediawiki-([0-9.]*).tar.gz \
+https://releases.wikimedia.org/mediawiki/1.25/ mediawiki-([0-9.]*).tar.gz \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61a194aae725b73364292df95f63979639ec2b8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Convert MobileApp extension to use extension.json - change (mediawiki...MobileApp)

2016-01-06 Thread Ananay (Code Review)

Ananay has uploaded a new change for review.

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

Change subject: Convert MobileApp extension to use extension.json
..

Convert MobileApp extension to use extension.json

Bug: T88056
Change-Id: Ife8101919ebcb168addfb3b43885a696751b7391
---
M MobileApp.php
A extension.json
2 files changed, 84 insertions(+), 67 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp 
refs/changes/40/262740/1

diff --git a/MobileApp.php b/MobileApp.php
index 978fc94..58c31f0 100644
--- a/MobileApp.php
+++ b/MobileApp.php
@@ -8,72 +8,11 @@
  * @copyright © 2014 Yuvi Panda
  * @licence GNU General Public Licence 2.0 or later
  */
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo( "This is an extension to the MediaWiki package and cannot be run 
standalone.\n" );
-   die( -1 );
+
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'MobileApp' );
+   $wgMessagesDirs['MobileApp'] = __DIR__ . '/i18n';
+} else {
+   die( 'This version of the MobileApp extension requires MediaWiki 1.25+' 
);
 }
 
-$localBasePath = __DIR__;
-$remoteExtPath = 'MobileApp';
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'MobileApp',
-   'author' => array( 'Yuvi Panda' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:MobileApp',
-   'descriptionmsg' => 'mobileapp-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-$wgMessagesDirs['MobileApp'] = __DIR__ . "/i18n";
-
-$wgAutoloadClasses['MobileAppResourceLoaderModule'] = __DIR__ . 
'/MobileAppResourceLoaderModule.php';
-$wgAutoloadClasses['MobileAppHooks'] = __DIR__ . '/MobileApp.hooks.php';
-
-$wgHooks['ListDefinedTags'][] = 'MobileAppHooks::onListDefinedTags';
-$wgHooks['ChangeTagsListActive'][] = 'MobileAppHooks::onListDefinedTags';
-$wgHooks['RecentChange_save'][] = 'MobileAppHooks::onRecentChange_save';
-
-$wgResourceModules['mobile.app.site'] = array( 'class' => 
'MobileAppResourceLoaderModule' );
-
-$wgCommonMobileAppModuleDef = array(
-   'localBasePath' => $localBasePath,
-   'remoteExtPath' => $remoteExtPath
-);
-
-$wgResourceModules['mobile.app.pagestyles.android'] = array(
-   'styles' => array(
-   'styles/android.less',
-   'styles/editlinks.less',
-   'styles/issues.less',
-   'styles/disambig.less',
-   'styles/tables.less',
-   'styles/ipa.less',
-   'styles/enwiki.less',
-   'styles/parsoid.less',
-   'styles/widenImages.less'
-   )
-) + $wgCommonMobileAppModuleDef;
-
-$wgResourceModules['mobile.app.pagestyles.android.night'] = array(
-   'styles' => array(
-   'styles/night.less',
-   )
-) + $wgCommonMobileAppModuleDef;
-
-$wgResourceModules['mobile.app.pagestyles.ios'] = array(
-   'styles' => array(
-   'styles/editlinks.less',
-   'styles/enwiki.less',
-   'styles/issues.less',
-   'styles/disambig.less'
-   )
-) + $wgCommonMobileAppModuleDef;
-
-$wgResourceModules['mobile.app.preview'] = array(
-   'styles' => array(
-   'styles/preview.less',
-   'styles/enwiki.less'
-   )
-) + $wgCommonMobileAppModuleDef;
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..42ef58c
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,78 @@
+{
+   "name": "MobileApp",
+   "author": [
+   "Yuvi Panda"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:MobileApp;,
+   "descriptionmsg": "mobileapp-desc",
+   "license-name": "GPL-2.0+",
+   "type": "other",
+   "MessagesDirs": {
+   "MobileApp": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "MobileAppResourceLoaderModule": 
"MobileAppResourceLoaderModule.php",
+   "MobileAppHooks": "MobileApp.hooks.php"
+   },
+   "ResourceModules": {
+   "mobile.app.site": {
+   "class": "MobileAppResourceLoaderModule"
+   },
+   "mobile.app.pagestyles.android": {
+   "styles": [
+   "styles/android.less",
+   "styles/editlinks.less",
+   "styles/issues.less",
+   "styles/disambig.less",
+   "styles/tables.less",
+   "styles/ipa.less",
+

[MediaWiki-commits] [Gerrit] Fix false message output method on Special:ExpandTemplates - change (mediawiki/core)

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

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

Change subject: Fix false message output method on Special:ExpandTemplates
..


Fix false message output method on Special:ExpandTemplates

Follow up: I480c2165c908ca7c8e08ed5990e386ddb515f3b0

Bug: T122907
Change-Id: I9882f327878422b0f579cae088a7178a1e8aa00e
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialExpandTemplates.php 
b/includes/specials/SpecialExpandTemplates.php
index 17c224c..14d8675 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -207,7 +207,7 @@
$form
->setSubmitTextMsg( 'expand_templates_ok' )
->setWrapperLegendMsg( 'expandtemplates' )
-   ->setHeaderText( $this->msg( 'expand_templates_intro' 
)->text() )
+   ->setHeaderText( $this->msg( 'expand_templates_intro' 
)->parse() )
->setSubmitCallback( array( $this, 'onSubmitInput' ) )
->showAlways();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9882f327878422b0f579cae088a7178a1e8aa00e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Namespace this extension - change (mediawiki...GeoData)

2016-01-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Namespace this extension
..

Namespace this extension

Needs an OK from Wikidata team when they're ready.

Bug: T122339
Change-Id: I2a52a7f44f747cd13c34edd1ef19c96f66d548f0
---
M GeoData.php
M includes/BoundingBox.php
M includes/Coord.php
M includes/CoordinatesOutput.php
M includes/CoordinatesParserFunction.php
M includes/GeoData.body.php
R includes/Hooks.php
R includes/Math.php
M includes/api/ApiQueryCoordinates.php
M includes/api/ApiQueryGeoSearch.php
M includes/api/ApiQueryGeoSearchDb.php
M includes/api/ApiQueryGeoSearchElastic.php
M tests/BoundingBoxTest.php
M tests/CoordTest.php
M tests/GeoDataMathTest.php
M tests/GeoSearchTest.php
M tests/MiscGeoDataTest.php
M tests/ParseCoordTest.php
18 files changed, 144 insertions(+), 58 deletions(-)


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

diff --git a/GeoData.php b/GeoData.php
index e708765..a9e30bb 100644
--- a/GeoData.php
+++ b/GeoData.php
@@ -13,35 +13,35 @@
 
 $dir = __DIR__;
 
-$wgAutoloadClasses['ApiQueryCoordinates'] = 
"$dir/includes/api/ApiQueryCoordinates.php";
-$wgAutoloadClasses['ApiQueryGeoSearch'] = 
"$dir/includes/api/ApiQueryGeoSearch.php";
-$wgAutoloadClasses['ApiQueryGeoSearchDb'] = 
"$dir/includes/api/ApiQueryGeoSearchDb.php";
-$wgAutoloadClasses['ApiQueryGeoSearchElastic'] = 
"$dir/includes/api/ApiQueryGeoSearchElastic.php";
+$wgAutoloadClasses['GeoData\ApiQueryCoordinates'] = 
"$dir/includes/api/ApiQueryCoordinates.php";
+$wgAutoloadClasses['GeoData\ApiQueryGeoSearch'] = 
"$dir/includes/api/ApiQueryGeoSearch.php";
+$wgAutoloadClasses['GeoData\ApiQueryGeoSearchDb'] = 
"$dir/includes/api/ApiQueryGeoSearchDb.php";
+$wgAutoloadClasses['GeoData\ApiQueryGeoSearchElastic'] = 
"$dir/includes/api/ApiQueryGeoSearchElastic.php";
 
-$wgAutoloadClasses['BoundingBox'] = "$dir/includes/BoundingBox.php";
-$wgAutoloadClasses['Coord'] = "$dir/includes/Coord.php";
-$wgAutoloadClasses['CoordinatesOutput'] = 
"$dir/includes/CoordinatesOutput.php";
-$wgAutoloadClasses['CoordinatesParserFunction'] = 
"$dir/includes/CoordinatesParserFunction.php";
-$wgAutoloadClasses['GeoData'] = "$dir/includes/GeoData.body.php";
-$wgAutoloadClasses['GeoDataHooks'] = "$dir/includes/GeoDataHooks.php";
-$wgAutoloadClasses['GeoDataMath'] = "$dir/includes/GeoDataMath.php";
+$wgAutoloadClasses['GeoData\BoundingBox'] = "$dir/includes/BoundingBox.php";
+$wgAutoloadClasses['GeoData\Coord'] = "$dir/includes/Coord.php";
+$wgAutoloadClasses['GeoData\CoordinatesOutput'] = 
"$dir/includes/CoordinatesOutput.php";
+$wgAutoloadClasses['GeoData\CoordinatesParserFunction'] = 
"$dir/includes/CoordinatesParserFunction.php";
+$wgAutoloadClasses['GeoData\GeoData'] = "$dir/includes/GeoData.body.php";
+$wgAutoloadClasses['GeoData\Hooks'] = "$dir/includes/Hooks.php";
+$wgAutoloadClasses['GeoData\Math'] = "$dir/includes/Math.php";
 
 $wgMessagesDirs['GeoData'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['GeoData'] = "$dir/GeoData.i18n.php";
 $wgExtensionMessagesFiles['GeoDataMagic'] = "$dir/GeoData.i18n.magic.php";
 
-$wgAPIPropModules['coordinates'] = 'ApiQueryCoordinates';
+$wgAPIPropModules['coordinates'] = 'GeoData\ApiQueryCoordinates';
 
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'GeoDataHooks::onLoadExtensionSchemaUpdates';
-$wgHooks['ParserFirstCallInit'][] = 'GeoDataHooks::onParserFirstCallInit';
-$wgHooks['UnitTestsList'][] = 'GeoDataHooks::onUnitTestsList';
-$wgHooks['ArticleDeleteComplete'][] = 'GeoDataHooks::onArticleDeleteComplete';
-$wgHooks['LinksUpdate'][] = 'GeoDataHooks::onLinksUpdate';
-$wgHooks['FileUpload'][] = 'GeoDataHooks::onFileUpload';
-$wgHooks['OutputPageParserOutput'][] = 
'GeoDataHooks::onOutputPageParserOutput';
-$wgHooks['CirrusSearchMappingConfig'][] = 
'GeoDataHooks::onCirrusSearchMappingConfig';
-$wgHooks['CirrusSearchBuildDocumentParse'][] = 
'GeoDataHooks::onCirrusSearchBuildDocumentParse';
-$wgHooks['ParserTestTables'][] = 'GeoDataHooks::onParserTestTables';
+$wgHooks['LoadExtensionSchemaUpdates'][] = 
'GeoData\Hooks::onLoadExtensionSchemaUpdates';
+$wgHooks['ParserFirstCallInit'][] = 'GeoData\Hooks::onParserFirstCallInit';
+$wgHooks['UnitTestsList'][] = 'GeoData\Hooks::onUnitTestsList';
+$wgHooks['ArticleDeleteComplete'][] = 'GeoData\Hooks::onArticleDeleteComplete';
+$wgHooks['LinksUpdate'][] = 'GeoData\Hooks::onLinksUpdate';
+$wgHooks['FileUpload'][] = 'GeoData\Hooks::onFileUpload';
+$wgHooks['OutputPageParserOutput'][] = 
'GeoData\Hooks::onOutputPageParserOutput';
+$wgHooks['CirrusSearchMappingConfig'][] = 
'GeoData\Hooks::onCirrusSearchMappingConfig';
+$wgHooks['CirrusSearchBuildDocumentParse'][] = 
'GeoData\Hooks::onCirrusSearchBuildDocumentParse';
+$wgHooks['ParserTestTables'][] = 'GeoData\Hooks::onParserTestTables';
 
 // Use the proper search backend
 $wgExtensionFunctions[] = 'efInitGeoData';
@@ -49,7 +49,7 @@
 function

[MediaWiki-commits] [Gerrit] Add hook to allow extensions to modify query used by Special... - change (mediawiki/core)

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

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

Change subject: Add hook to allow extensions to modify query used by 
Special:ShortPages
..


Add hook to allow extensions to modify query used by Special:ShortPages

Also fix USE INDEX so that it won't break if another table is joined.

See related change at I2a7003f9.

Bug: T53124
Change-Id: I9ac910bc4c24196b1f19e2fc7f1e5b88a0dac41b
---
M docs/hooks.txt
M includes/specials/SpecialShortpages.php
2 files changed, 22 insertions(+), 6 deletions(-)

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



diff --git a/docs/hooks.txt b/docs/hooks.txt
index fe88fa7..f2f04f3 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -2568,6 +2568,13 @@
 
 'SetupAfterCache': Called in Setup.php, after cache objects are set
 
+'ShortPagesQuery': Allow extensions to modify the query used by
+Special:ShortPages.
+&$tables: tables to join in the query
+&$conds: conditions for the query
+&$joinConds: join conditions for the query
+&$options: options for the query
+
 'ShowMissingArticle': Called when generating the output for a non-existent 
page.
 $article: The article object corresponding to the page
 
diff --git a/includes/specials/SpecialShortpages.php 
b/includes/specials/SpecialShortpages.php
index ba11862..74a1322e 100644
--- a/includes/specials/SpecialShortpages.php
+++ b/includes/specials/SpecialShortpages.php
@@ -38,18 +38,27 @@
}
 
public function getQueryInfo() {
+   $tables = array( 'page' );
+   $conds = array(
+   'page_namespace' => MWNamespace::getContentNamespaces(),
+   'page_is_redirect' => 0
+   );
+   $joinConds = array();
+   $options = array( 'USE INDEX' => array( 'page' => 
'page_redirect_namespace_len' ) );
+
+   // Allow extensions to modify the query
+   Hooks::run( 'ShortPagesQuery', array( &$tables, &$conds, 
&$joinConds, &$options ) );
+
return array(
-   'tables' => array( 'page' ),
+   'tables' => $tables,
'fields' => array(
'namespace' => 'page_namespace',
'title' => 'page_title',
'value' => 'page_len'
),
-   'conds' => array(
-   'page_namespace' => 
MWNamespace::getContentNamespaces(),
-   'page_is_redirect' => 0
-   ),
-   'options' => array( 'USE INDEX' => 
'page_redirect_namespace_len' )
+   'conds' => $conds,
+   'join_conds' => $joinConds,
+   'options' => $options
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ac910bc4c24196b1f19e2fc7f1e5b88a0dac41b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Exclude disambiguation pages from Special:ShortPages - change (mediawiki...Disambiguator)

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

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

Change subject: Exclude disambiguation pages from Special:ShortPages
..


Exclude disambiguation pages from Special:ShortPages

Depends on core change I9ac910bc.

Bug: T53124
Change-Id: I2a7003f90055c8f0e7a4ed1906d541d2cfc5ec58
---
M Disambiguator.hooks.php
M extension.json
2 files changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/Disambiguator.hooks.php b/Disambiguator.hooks.php
index 0e70fb7..7f0e75f 100644
--- a/Disambiguator.hooks.php
+++ b/Disambiguator.hooks.php
@@ -45,6 +45,23 @@
}
 
/**
+* Modify the Special:ShortPages query to ignore disambiguation pages
+* @param array &$tables
+* @param array &$conds
+* @param array &$joinConds
+* @param array &$options
+* @return bool
+*/
+   public static function onShortPagesQuery( &$tables, &$conds, 
&$joinConds, &$options ) {
+   $tables[] = 'page_props';
+   $conds['pp_page'] = null;
+   $joinConds['page_props'] = array(
+   'LEFT JOIN', array( 'page_id = pp_page', 'pp_propname' 
=> 'disambiguation' )
+   );
+   return true;
+   }
+
+   /**
 * Modify the Special:Random query to ignore disambiguation pages
 * @param array &$tables
 * @param array &$conds
diff --git a/extension.json b/extension.json
index 18b740a..680e2cc 100644
--- a/extension.json
+++ b/extension.json
@@ -22,6 +22,9 @@
"LonelyPagesQuery": [
"DisambiguatorHooks::onLonelyPagesQuery"
],
+   "ShortPagesQuery": [
+   "DisambiguatorHooks::onShortPagesQuery"
+   ],
"RandomPageQuery": [
"DisambiguatorHooks::onRandomPageQuery"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a7003f90055c8f0e7a4ed1906d541d2cfc5ec58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Disambiguator
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update signing key and watch file - change (mediawiki/debian)

2016-01-06 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Update signing key and watch file
..


Update signing key and watch file

* Sync with https://www.mediawiki.org/keys/keys.txt
* Use HTTPS for watch file

Change-Id: I61a194aae725b73364292df95f63979639ec2b8a
---
M upstream/signing-key.asc
M watch
2 files changed, 48 insertions(+), 2 deletions(-)

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



diff --git a/upstream/signing-key.asc b/upstream/signing-key.asc
index 4b513da..74714f1 100644
--- a/upstream/signing-key.asc
+++ b/upstream/signing-key.asc
@@ -299,4 +299,50 @@
 cuxVGndtnTXP+onv6Hbaf/ppMYxdwiLSwMSIEOQoVEXumJHW+G2Qq7ROrZmZUasf
 9AWnFoBvSo9zXpbgedVaAr1Vk+i/UALTtAjfJ2OH3bJswJfFzbunGoOYxDIc+8I=
 =vhcr
--END PGP PUBLIC KEY BLOCK-
\ No newline at end of file
+-END PGP PUBLIC KEY BLOCK-
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - https://gpgtools.org
+
+mQENBFNgNjEBCAC7tUYBdS/dja7kiGpPbCLNTjJpPnlXnGOxLo0CxkkXSutHI+eP
+00DZdLzw7pJc0LsR37b0voulP9X0ufl9lPWcVtNG6dlOMG9mLpBUO3fmfe16fUbi
+neqjgkQ4Zk5Dw8VLrVoyGWZDrbzsiyfVl7w3x/81o3j0i1uudg3UWeyXJrXDm/oc
+h506FFhwzUNp8OxMeL7aNk1SoF1o1/msSveIuzv2MIbUI2VqUjECcjWBCZAFMYiw
+teYG5ce/UBfucFfCaR9D0Xm/dVs2RQkacM9DF831DjbD/G1mMx5HVYBFNDBXO3lh
+F8Iq1atqdKweFPFAXGvPVQ9T0Vi/1GCZaKYJABEBAAG0IUNoYWQgSG9yb2hvZSA8
+Y2hhZEB3aWtpbWVkaWEub3JnPokBQAQTAQoAKgIbAwUJFpJegAULCQgHAwUVCgkI
+CwUWAgMBAAIeAQIXgAUCU2A6MQIZAQAKCRByvBxdIxB/ijhdB/wOh2lVM9aQ6oGj
+G7z0gxCDlRWeMnY4sAx3FDveoxBywuaq/4wkJXXrO6Uk0cVXkeakgn9RqGAlQKHR
+9+IU+FZf5cS2vf/rSV/xoKiLie/zLHLkkxIu0Ctpf9okSFjXuWLkVKoQ8MbEoUMQ
+Sg24laMDlTKqVfLc4cW/4MNhBNIgVuLQsm6w2FIWM67e1vMgK1dAG5ne4fXQwKla
+ORjnb66LF7wE/6gsZUI92T7C9qBi6eeHcccdrdNEOasnmxVPz7NnK4zf3eGb3MkU
+06/I9JlmIty6xOYD6Fc9klf0eBgGhnsXHRRUMTnyYpuNJqQyssDT1lgo42Z9n840
+KwB2j4EMiQE9BBMBCgAnBQJTYDYxAhsDBQkWkl6ABQsJCAcDBRUKCQgLBRYCAwEA
+Ah4BAheAAAoJEHK8HF0jEH+KXGoH/iXYRFeHT79gUag2X+fghbmAxxa5XLYLTfGO
+Il83yipNPxPpgav0DQwJ5jlkyDwiwxwtCliFy346crSkjdXUMnhtSfdUK3O262Iu
+s7EWw5uNPxgYJKlMJHqy/FeKGLqR5To2TRZpPf8XvcfuKG8utYf0jADHFz1AulxL
+xwXS/nF2kF5tyDVkv0RA3m/er2GPndigMvySTKNu0v1LbG4wSPxC6QE6npElAgP+
+aVcYLvFmnLj3w6AAQusyqTzx9LW4tFt3Ou7G/AJil9HYR15GIzrEAsVRowNzKOzJ
+eh9dQNrmQqQJ6QVZL62+KEXIG4jyT/ZzkqLP/lyCEt51Cugqu5G0I2tleWJhc2Uu
+aW8vZGVtb24gPGRlbW9uQGtleWJhc2UuaW8+iQEtBBMBCgAXBQJTYDYxAhsDAwsJ
+BwMVCggCHgECF4AACgkQcrwcXSMQf4rf4gf/eCaI/afmvbIkWlRmmoDUs29ywvkL
+wduZC6VNdeHhKhcE8jwGMYU8KvhVAEb2hvfs5gcEpke5gtXNeINTJdWEGbotdC0D
+Y9msM04sEaLQ3zDnirxATWUGCQ7R2uO1Qbt3UpWP672/rPk+D9fqjt49OJ5k4j10
+8s9lkVGBYuO1+QHtbDHBM19hy1gInY3yaHDNPY1wYgvYF+cX3trguo9J6irHommF
+TnQRZUkht/VUgY4CAqnTuVsRY3D1y48jbGqfQdQGR5IAsaO/7z2uXjs3xt5XQRq8
+gPuw/WrLlQ7tHJvxePDhgn2khLCREPqfMWGyUZFWcd7oywu/XyZxMR8ilLkBDQRT
+YDYxAQgA+/NFLUBpNsI4wkWq99s7lsab4gnVbtS1DB4ezfJuoXW/sRG88QaomFAl
+TYTUyevJHBWrjv8aPrDTLs0ImZUit5CDoJ8JqvD8wwkM1MC/0EZUGeWzp58kwCTA
+eDwsswBkcY7P4pVhzRQsq1hgJd6xueeho0xLO1WDRuC0yXoLL0KbecN5a8j+iTG+
+eOXmIWKduVFpBoDQDt2vqUHDR4f50j6lXc6cB1MEPvTr6fxDyY4lDJ+h4FZ/wUqQ
+nSlSYj6/lHxdEgyRLTUwAmWImsbyERGbAcOONnuVRlR1neYC1kUpQi33bc1OcTrR
+lCbUc0OsvLaV9F5NIhO2Y+jZyPHfwQARAQABiQEkBBgBCgAPBQJTYDYxAhsMBQkW
+kl6AAAoJEHK8HF0jEH+Kr6QH92SQHeKCKdzNOmd0jtjH+noCM0KisvtJnUt7RVVx
+NwPCLeZqC8Xf8i9Mmv2CrMVyesIQwcyG31+7q9YZ9jSG2nEdeY8v+hZqKDzsLUjS
+DWOpNgyu9jsbVGQ2Ijb2b6Qwyh8WqbElMxaWBeXbGiBgsNBOWrG8wtFLH4+oehvW
+S0bzxMJWT9imJqQNas/1CVoKBJtVnM15wOXjXZYUarnj+Ku/HAtnGpilPerhRmNF
+QDEOuZJgEOsHT0NuZvGcBtR399fa8RxtP/Ymud/HA73ymjMPnE+/rc+Bs/TCvDtr
+jUugJFudE4bbWlmq/2dYreAtqCtO9sMbhSRtbUGfjcHF7g==
+=ysCu
+-END PGP PUBLIC KEY BLOCK-
diff --git a/watch b/watch
index dd80936..c448cf6 100644
--- a/watch
+++ b/watch
@@ -1,4 +1,4 @@
 version=3
 
 opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/" \
-http://releases.wikimedia.org/mediawiki/1.25/ mediawiki-([0-9.]*).tar.gz \
+https://releases.wikimedia.org/mediawiki/1.25/ mediawiki-([0-9.]*).tar.gz \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61a194aae725b73364292df95f63979639ec2b8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Add jshint to 'npm test' command - change (mediawiki...ZeroBanner)

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

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

Change subject: Add jshint to 'npm test' command
..


Add jshint to 'npm test' command

Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
---
M Gruntfile.js
M package.json
2 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 9c56558..ccbcf3f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,11 +1,18 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
grunt.initConfig( {
banana: {
all: 'i18n/'
+   },
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
},
jsonlint: {
all: [
@@ -15,6 +22,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 72eb4aa..335401b 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
 "grunt-banana-checker": "0.4.0",
+"grunt-contrib-jshint": "0.11.3",
 "grunt-jsonlint": "1.0.7"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tests: TestZuulLayout -> TestZuulScheduler - change (integration/config)

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

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

Change subject: tests: TestZuulLayout -> TestZuulScheduler
..


tests: TestZuulLayout -> TestZuulScheduler

The test suite uses an instance of Zuul scheduler and looks more like an
integration test.  I would like to reuse the name for a suite that raw
parse the yaml layout file, ie without having to spawn the Zuul
scheduler.

Rename TestZuulLayout to TestZuulScheduler

Change-Id: I9a641ed6455c9e1e2931f010ee626b36d427f77a
---
R tests/test_zuul_scheduler.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_scheduler.py
similarity index 99%
rename from tests/test_zuul_layout.py
rename to tests/test_zuul_scheduler.py
index eff8310..3a860ce 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_scheduler.py
@@ -1,4 +1,4 @@
-# Verify Wikimedia Zuul layout functionalities
+# Verify Wikimedia Zuul scheduler functionalities
 #
 # Copyright (c) 2014 - Antoine "hashar" Musso
 # Copyright (c) 2014 - Wikimedia Foundation Inc.
@@ -30,7 +30,7 @@
 return
 
 
-class TestZuulLayout(unittest.TestCase):
+class TestZuulScheduler(unittest.TestCase):
 
 sched = None
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a641ed6455c9e1e2931f010ee626b36d427f77a
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add jshint to 'npm test' command - change (mediawiki...ZeroBanner)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Add jshint to 'npm test' command
..

Add jshint to 'npm test' command

Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
---
M Gruntfile.js
M package.json
2 files changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
index 9c56558..ccbcf3f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,11 +1,18 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
grunt.initConfig( {
banana: {
all: 'i18n/'
+   },
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
},
jsonlint: {
all: [
@@ -15,6 +22,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 72eb4aa..335401b 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
 "grunt-banana-checker": "0.4.0",
+"grunt-contrib-jshint": "0.11.3",
 "grunt-jsonlint": "1.0.7"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
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] Converted WikiLove to new extension registration - change (mediawiki...WikiLove)

2016-01-06 Thread Mhutti1 (Code Review)

Mhutti1 has uploaded a new change for review.

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

Change subject: Converted WikiLove to new extension registration
..

Converted WikiLove to new extension registration

Created extension.json, removed obsolete i18n file and edited
WikiLove.php

Bug: T87996
Change-Id: Ifd383097406b8215fe5a49dd65b2afb122dc789a
---
D WikiLove.i18n.php
M WikiLove.php
A extension.json
3 files changed, 408 insertions(+), 306 deletions(-)


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

diff --git a/WikiLove.i18n.php b/WikiLove.i18n.php
deleted file mode 100644
index 05b24ad..000
--- a/WikiLove.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim0537f00da971af5a' ) ) {
-   function wfJsonI18nShim0537f00da971af5a( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim0537f00da971af5a';
-}
diff --git a/WikiLove.php b/WikiLove.php
index 558c2f3..b221641 100644
--- a/WikiLove.php
+++ b/WikiLove.php
@@ -26,274 +26,15 @@
  * @licence MIT License
  */
 
-# Alert the user that this is not a valid entry point to MediaWiki if they try 
to access the file directly.
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo << __FILE__,
-   'name' => 'WikiLove',
-   'version' => '1.3.0',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:WikiLove',
-   'author' => array(
-   'Ryan Kaldari',
-   'Jan Paul Posma',
-   'Sam Reed',
-   ),
-   'descriptionmsg' => 'wikilove-desc',
-);
-
-// default user options
-$wgWikiLoveGlobal  = false; // enable the extension for all users, removing 
the user preference
-$wgWikiLoveTabIcon = true;  // use an icon for skins that support them (i.e. 
Vector)
-$wgWikiLoveLogging = false; // enable logging of giving of WikiLove
-
-// current directory including trailing slash
-$dir = dirname( __FILE__ ) . '/';
-
-// add autoload classes
-$wgAutoloadClasses['ApiWikiLove'] = $dir . 'ApiWikiLove.php';
-$wgAutoloadClasses['WikiLoveHooks']   = $dir . 
'WikiLove.hooks.php';
-$wgAutoloadClasses['WikiLoveLocal']   = $dir . 
'WikiLove.local.php';
-
-// i18n messages
-$wgMessagesDirs['WikiLove'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['WikiLove'] = $dir . 'WikiLove.i18n.php';
-
-// register hooks
-$wgHooks['GetPreferences'][]  = 
'WikiLoveHooks::getPreferences';
-$wgHooks['SkinTemplateNavigation'][]  = 
'WikiLoveHooks::skinTemplateNavigation';
-$wgHooks['BeforePageDisplay'][]   = 
'WikiLoveHooks::beforePageDisplay';
-$wgHooks['LoadExtensionSchemaUpdates'][]  = 
'WikiLoveHooks::loadExtensionSchemaUpdates';
-$wgHooks['MakeGlobalVariablesScript'][]   = 
'WikiLoveHooks::makeGlobalVariablesScript';
-$wgHooks['ListDefinedTags'][] = 
'WikiLoveHooks::onListDefinedTags';
-$wgHooks['ChangeTagsListActive'][]= 
'WikiLoveHooks::onListDefinedTags';
-$wgHooks['UserMergeAccountFields'][]  = 
'WikiLoveHooks::onUserMergeAccountFields';
-
-// api modules
-$wgAPIModules['wikilove'] = 'ApiWikiLove';
-
-$extWikiLoveTpl = array(
-   'localBasePath' => dirname( __FILE__ ) . '/resources',
-   'remoteExtPath' => 'WikiLove/resources',
-);
-
-// messages for default options, because we want to use them in the default
-// options module, but also for

[MediaWiki-commits] [Gerrit] Add jshint to 'npm test' command - change (mediawiki...AjaxLogin)

2016-01-06 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Add jshint to 'npm test' command
..

Add jshint to 'npm test' command

Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
---
M Gruntfile.js
M package.json
2 files changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
index 4337316..ac0f1fe 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,11 +1,18 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
grunt.initConfig( {
banana: {
all: 'i18n/'
+   },
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**',
+   ]
},
jsonlint: {
all: [
@@ -16,6 +23,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 72eb4aa..335401b 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
 "grunt-banana-checker": "0.4.0",
+"grunt-contrib-jshint": "0.11.3",
 "grunt-jsonlint": "1.0.7"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AjaxLogin
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] Remove OpenImages - change (translatewiki)

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

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

Change subject: Remove OpenImages
..


Remove OpenImages

Not updated in two years

Change-Id: I241f8117f3ccf012ccd88c8d4038cd374ac2c368
---
M REPOCONF
M TranslateSettings.php
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M bin/twn-wikistats
R groups/archive/OpenImages/OpenImages.yaml
8 files changed, 1 insertion(+), 24 deletions(-)

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



diff --git a/REPOCONF b/REPOCONF
index 1196fe6..fe484e7 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -32,7 +32,6 @@
 REPO_MIFOS=git://github.com/openMF/community-app.git
 REPO_NFCRINGCONTROL=git://github.com/mclear/NFC_Ring_Control.git
 REPO_NOCC=https://svn.code.sf.net/p/nocc/code/trunk
-REPO_OPENIMAGES=https://scm.mmbase.org/openimages/trunk/src/main/native2ascii/eu/openimages
 REPO_OSM=git://git.openstreetmap.org/rails.git
 REPO_POTLATCH2=git://github.com/systemed/potlatch2.git
 REPO_PYWIKIBOT=https://gerrit.wikimedia.org/r/pywikibot/i18n
diff --git a/TranslateSettings.php b/TranslateSettings.php
index 8911d68..b491663 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -297,8 +297,8 @@
 # No longer in use.
 wfAddNamespace( 1232, 'Wikia' );
 
+# No longer in use.
 wfAddNamespace( 1234, 'OpenImages' );
-$wgTranslateGroupFiles[] = "$GROUPS/OpenImages/OpenImages.yaml";
 
 wfAddNamespace( 1236, 'Europeana' );
 $wgTranslateGroupFiles[] = "$GROUPS/Europeana/Europeana.yaml";
diff --git a/bin/repocommit b/bin/repocommit
index a36cc17..57285ab 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -165,14 +165,6 @@
svn add --force * --auto-props --parents --depth infinity -q
svn commit --message "$COMMITMSG"
 
-elif [ "$PROJECT" = "openimages" ]
-then
-   cd "$DIR/$PROJECT"
-   svn add -q --force *.properties
-   svn propset -q svn:mime-type text/plain *.properties
-   svn propset -q svn:eol-style native *.properties
-   svn commit --message "$COMMITMSG"
-
 else
echo "`basename $0`: Unknown project"
exit 1
diff --git a/bin/repocreate b/bin/repocreate
index 654b883..029b88d 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -72,11 +72,6 @@
checkVar 'REPO_NOCC'
svn checkout "$REPO_NOCC" $PROJECT
 
-elif [ "$PROJECT" = "openimages" ]
-then
-   checkVar 'REPO_OPENIMAGES'
-   svn checkout "$REPO_OPENIMAGES" $PROJECT
-
 else
echo "`basename $0`: Unknown project"
exit 1
diff --git a/bin/repoexport b/bin/repoexport
index 6410cea..b3c916f 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -151,10 +151,6 @@
 then
php "$EXPORTER" --target . --group=out-okawix-* --lang='*' --skip 
en,qqq $THRESHOLD
 
-elif [ "$PROJECT" = "openimages" ]
-then
-   php "$EXPORTER" --target . --group=out-openimages-* --lang='*' --skip 
en,qqq $THRESHOLD
-
 elif [ "$PROJECT" = "osm" ]
 then
php "$EXPORTER" --target . --group=out-osm-* --lang='*' --skip en,qqq 
$THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index 9e79b63..f293cef 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -166,10 +166,6 @@
 then
svn up -q $PROJECT
 
-elif [ "$PROJECT" = "openimages" ]
-then
-   svn up -q $PROJECT
-
 elif [ "$PROJECT" = "osm" ]
 then
doUpdate "$PROJECT" "$CLUPDATE"
diff --git a/bin/twn-wikistats b/bin/twn-wikistats
index ff866bb..1488206 100755
--- a/bin/twn-wikistats
+++ b/bin/twn-wikistats
@@ -14,7 +14,6 @@
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:Kiwix/stats" "$PARAMS 
--groups=out-kiwix"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:MantisBT/stats/trunk" "$PARAMS 
--groups=out-mantis-0-all"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:Mifos/stats" "$PARAMS 
--groups=out-mifos"
-$BASEDIR/wikistats "$WIKI" "$USER" "Translating:Open Images/stats/trunk" 
"$PARAMS --groups=out-openimages-0-all"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:OpenStreetMap/stats/trunk" 
"$PARAMS --groups=out-osm-0-all"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:Pywikibot/stats" "$PARAMS 
--groups=out-pywikipedia-0-all"
 $BASEDIR/wikistats "$WIKI" "$USER" "Translating:Intuition/stats" "$PARAMS 
--groups=tsint-0-all"
diff --git a/groups/OpenImages/OpenImages.yaml 
b/groups/archive/OpenImages/OpenImages.yaml
similarity index 100%
rename from groups/OpenImages/OpenImages.yaml
rename to groups/archive/OpenImages/OpenImages.yaml

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I241f8117f3ccf012ccd88c8d4038cd374ac2c368
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Add jshint to 'npm test' command - change (mediawiki...AjaxLogin)

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

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

Change subject: Add jshint to 'npm test' command
..


Add jshint to 'npm test' command

Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
---
M Gruntfile.js
M package.json
2 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 4337316..ac0f1fe 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,11 +1,18 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
grunt.initConfig( {
banana: {
all: 'i18n/'
+   },
+   jshint: {
+   all: [
+   '**/*.js',
+   '!node_modules/**',
+   ]
},
jsonlint: {
all: [
@@ -16,6 +23,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 72eb4aa..335401b 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
 "grunt-banana-checker": "0.4.0",
+"grunt-contrib-jshint": "0.11.3",
 "grunt-jsonlint": "1.0.7"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibae36050a1d8054b7280804513a258bc7cd8960f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AjaxLogin
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] Replace Title::userIsWatching - change (labs...heritage)

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

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

Change subject: Replace Title::userIsWatching
..


Replace Title::userIsWatching

Bug: T122754
Change-Id: Iffa958377f2f22e4de9142bfc709a2cb63a0d725
---
M common/skins/Vector.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Reedy: Looks good to me, but someone else must approve
  Jean-Frédéric: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/common/skins/Vector.php b/common/skins/Vector.php
index 2455752..227a5c8 100644
--- a/common/skins/Vector.php
+++ b/common/skins/Vector.php
@@ -16,14 +16,14 @@
public function execute() {
global $wgLang, $wgVectorUseIconWatch;
 
-   $this->skin = $this->data['skin'];
+   $this->skin = $this->getSkin();
 
// Build additional attributes for navigation urls
//$nav = $this->skin->buildNavigationUrls();
$nav = $this->data['content_navigation'];
 
if ( $wgVectorUseIconWatch ) {
-   $mode = $this->skin->getTitle()->userIsWatching() ? 
'unwatch' : 'watch';
+   $mode = $this->skin->isWatched( $this->skin-
Gerrit-Reviewer: Jean-Frédéric 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update /qqq documentation - change (mediawiki...Citoid)

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

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

Change subject: Update /qqq documentation
..


Update /qqq documentation

Follow-up on I424ba86220f9170afc7871596e3a7f64cecc01e2

Bug: T122427
Change-Id: I49376f0d1b4f459a5371cecb82be313273f5e475
---
M i18n/qqq.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/i18n/qqq.json b/i18n/qqq.json
index 000909a..d3f952a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,8 +19,8 @@
"citoid-citefromiddialog-mode-manual": "Label of tab in citation 
dialog, used to select mode.\n{{Identical|Manual}}",
"citoid-citefromiddialog-mode-reuse": "Label of tab in citation dialog, 
used to select mode.\n{{Identical|Re-use}}",
"citoid-citefromiddialog-search": "Text for the search 
button.\n{{Identical|Search}}",
-   "citoid-citefromiddialog-search-label": "Label for the URL/DOI search 
field.",
-   "citoid-citefromiddialog-search-placeholder": "Placeholder for the 
URL/DOI search field.\n\n'''NOTE:''' Do not translate example.com as it is a 
domain name specifically reserved by IANA for examples.",
+   "citoid-citefromiddialog-search-label": "Label for the URL/DOI/PMID 
search field.",
+   "citoid-citefromiddialog-search-placeholder": "Placeholder for the 
URL/DOI/PMID search field.\n\n'''NOTE:''' Do not translate example.com as it is 
a domain name specifically reserved by IANA for examples.",
"citoid-citefromiddialog-search-progress": "Message for when the search 
is in progress",
"citoid-citefromiddialog-title": "The title displayed on the dialog",
"citoid-citefromiddialog-use-general-error-message": "Label notifying 
the user there was a problem creating their reference, and offering to use the 
full citation tool.\n* $1 – link to open the citation dialog; link label: 
{{msg-mw|Citoid-citefromiddialog-mode-manual}}",
@@ -29,4 +29,4 @@
"citoid-referencecontextitem-convert-button": "Label for the button to 
convert a plain reference to a Citoid reference.\n{{Identical|Convert}}",
"citoid-referencecontextitem-convert-message": "Message explaining the 
functionality of the button to convert a plain reference to a Citoid 
reference.",
"citoid-unknown-error": "Error message indicating that the service to 
create citations has returned an error or is temporarily malfunctioning, asking 
the user to try again later."
-}
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49376f0d1b4f459a5371cecb82be313273f5e475
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Mvolz 
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] Lock box version for VMWare Fusion - change (mediawiki/vagrant)

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

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

Change subject: Lock box version for VMWare Fusion
..


Lock box version for VMWare Fusion

For the Puppet Labs box on vmware_fusion, Puppet was upgraded to 4.2.1,
which fails with the manifests_dir option.

Locked the box version to 1.0.1 so it is still running Puppet 3, and the
box can successfully provision on VMWare Fusion.

Change-Id: Ia177e12a18ac9ddc8201abe0844467dc7473a968
---
M Vagrantfile
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index 43e34e5..2ff682c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -71,6 +71,7 @@
   # VMWare Fusion provider. Enable with `--provider=vmware_fusion`
   config.vm.provider :vmware_fusion do |_vw, override|
 override.vm.box = 'puppetlabs/ubuntu-14.04-64-puppet'
+override.vm.box_version = '1.0.1'
 override.vm.network :private_network, ip: settings[:static_ip]
   end
 

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

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

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

[MediaWiki-commits] [Gerrit] Remove now obsolete OpenDJ server module and related templat... - change (operations/puppet)

2016-01-06 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Remove now obsolete OpenDJ server module and related 
templates/files
..


Remove now obsolete OpenDJ server module and related templates/files

They have been superceded by openldap::labs and nembus/neptunium are
decomissioned.

Change-Id: I2f2f37c26ee17094dbff49fb73c298ff9c258569
---
D modules/ldap/files/dnsdomain2.ldif
D modules/ldap/files/global-aci.ldif
D modules/ldap/files/nova_sun.ldif
D modules/ldap/files/openjdk-6/java.security
D modules/ldap/files/openssh-lpk.ldif
D modules/ldap/files/puppet.ldif
D modules/ldap/files/sudo.ldif
D modules/ldap/files/user.ldif
D modules/ldap/manifests/role/server.pp
D modules/ldap/manifests/server.pp
D modules/ldap/templates/base.ldif.erb
D modules/ldap/templates/opendj.default.erb
12 files changed, 0 insertions(+), 816 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/modules/ldap/files/dnsdomain2.ldif 
b/modules/ldap/files/dnsdomain2.ldif
deleted file mode 100644
index 68532a6..000
--- a/modules/ldap/files/dnsdomain2.ldif
+++ /dev/null
@@ -1,37 +0,0 @@
-# A schema for storing DNS zones in LDAP
-#
-# ORDERING is not necessary, and some servers don't support
-# integerOrderingMatch. Omit or change if you like
-
-dn: cn=schema
-attributeTypes: ( 1.3.6.1.4.1.2428.20.0.0  NAME 'dNSTTL' DESC 'An integer 
denoting time to live' EQUALITY integerMatch ORDERING integerOrderingMatch 
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-attributeTypes: ( 1.3.6.1.4.1.2428.20.0.1 NAME 'dNSClass' DESC 'The class of a 
resource record' EQUALITY caseIgnoreIA5Match SYNTAX 
1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.11 NAME 'wKSRecord' DESC 'a well known 
service description, RFC 1035' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.12 NAME 'pTRRecord' DESC 'domain name 
pointer, RFC 1035' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.13 NAME 'hInfoRecord' DESC 'host 
information, RFC 1035' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.14 NAME 'mInfoRecord' DESC 'mailbox or 
mail list information, RFC 1035' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.16 NAME 'tXTRecord' DESC 'text string, 
RFC 1035' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch 
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.17 NAME 'rPRecord' DESC 'for 
Responsible Person, RFC 1183' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.18 NAME 'aFSDBRecord' DESC 'for AFS 
Data Base location, RFC 1183' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.24 NAME 'SigRecord' DESC 'Signature, 
RFC 2535' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch 
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.25 NAME 'KeyRecord' DESC 'Key, RFC 
2535' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch SYNTAX 
1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.27 NAME 'gPosRecord' DESC 
'Geographical Position, RFC 1712' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.28 NAME 'aAAARecord' DESC 'IPv6 
address, RFC 1886' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.29 NAME 'LocRecord' DESC 'Location, 
RFC 1876' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreIA5SubstringsMatch 
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.30 NAME 'nXTRecord' DESC 
'non-existant, RFC 2535' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.33 NAME 'sRVRecord' DESC 'service 
location, RFC 2782' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.35 NAME 'nAPTRRecord' DESC 'Naming 
Authority Pointer, RFC 2915' EQUALITY caseIgnoreIA5Match SUBSTR 
caseIgnoreIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) 
-attributeTypes: ( 1.3.6.1.4.1.2428.20.1.36 NAME 'kXRecord' DESC 'Key Exchange 
Delegation, RFC 2230' EQUALITY caseIgnoreIA5Match SUBSTR

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

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

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

Change subject: Update some packages
..


Update some packages

Update grunt-jscs to 2.6.0

Update grunt-banana-checker to 0.4.0

Change-Id: I867cdc525642a2542db05913c8f7d73318fe10e4
---
M Gruntfile.js
M package.json
2 files changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 0f6f573..f419e3f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,8 +12,9 @@
jshintrc: true
},
all: [
-   '*.js',
-   'modules/**/*.js'
+   '**/*.js',
+   '!node_modules/**',
+   '!lib/**'
]
},
jscs: {
diff --git a/package.json b/package.json
index 76a1ada..72ac16c 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-contrib-watch": "0.6.1",
-"grunt-jscs": "2.1.0",
-"grunt-banana-checker": "0.3.0",
+"grunt-jscs": "2.6.0",
+"grunt-banana-checker": "0.4.0",
 "grunt-jsonlint": "1.0.7"
   },
   "dependencies": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I867cdc525642a2542db05913c8f7d73318fe10e4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Setup.php: Ensure that defaults for 'rcdays' and 'watchlistd... - change (mediawiki/core)

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

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

Change subject: Setup.php: Ensure that defaults for 'rcdays' and 
'watchlistdays' are not invalid
..


Setup.php: Ensure that defaults for 'rcdays' and 'watchlistdays' are not invalid

I ran into this when I set $wgRCMaxAge = 3600*24 (1 day) when testing
recent changes stuff.

Change-Id: Ib618f0e47f30ebe1ad44f4c70fee5789bfa8c095
---
M includes/Setup.php
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index c863722..9e4d2a3 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -264,6 +264,7 @@
 }
 unset( $repo ); // no global pollution; destroy reference
 
+$rcMaxAgeDays = $wgRCMaxAge / ( 3600 * 24 );
 if ( $wgRCFilterByAge ) {
// Trim down $wgRCLinkDays so that it only lists links which are valid
// as determined by $wgRCMaxAge.
@@ -273,12 +274,22 @@
// @codingStandardsIgnoreStart 
Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
for ( $i = 0; $i < count( $wgRCLinkDays ); $i++ ) {
// @codingStandardsIgnoreEnd
-   if ( $wgRCLinkDays[$i] >= $wgRCMaxAge / ( 3600 * 24 ) ) {
+   if ( $wgRCLinkDays[$i] >= $rcMaxAgeDays ) {
$wgRCLinkDays = array_slice( $wgRCLinkDays, 0, $i + 1, 
false );
break;
}
}
 }
+// Ensure that default user options are not invalid, since that breaks 
Special:Preferences
+$wgDefaultUserOptions['rcdays'] = min(
+   $wgDefaultUserOptions['rcdays'],
+   ceil( $rcMaxAgeDays )
+);
+$wgDefaultUserOptions['watchlistdays'] = min(
+   $wgDefaultUserOptions['watchlistdays'],
+   ceil( $rcMaxAgeDays )
+);
+unset( $rcMaxAgeDays );
 
 if ( $wgSkipSkin ) {
$wgSkipSkins[] = $wgSkipSkin;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib618f0e47f30ebe1ad44f4c70fee5789bfa8c095
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add lang to the firstheading - change (mediawiki...Example)

2016-01-06 Thread Isarra (Code Review)

Isarra has uploaded a new change for review.

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

Change subject: Add lang to the firstheading
..

Add lang to the firstheading

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


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

diff --git a/ExampleTemplate.php b/ExampleTemplate.php
index 9231a16..cd01b69 100644
--- a/ExampleTemplate.php
+++ b/ExampleTemplate.php
@@ -30,7 +30,7 @@
echo $this->getIndicators();
?>
 
-   
+   
html( 'title' ) ?>

getMsg( 
'tagline' )->parse() ?>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63a8c02322edeb8b9ab3a26297f817e46ba5d808
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Example
Gerrit-Branch: master
Gerrit-Owner: Isarra 

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

[MediaWiki-commits] [Gerrit] Labs jessie image: override the debian grub with a copy of ... - change (operations/puppet)

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

Andrew Bogott has uploaded a new change for review.

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

Change subject: Labs jessie image:  override the debian grub with a copy of our 
current puppetized grub defaults.
..

Labs jessie image:  override the debian grub with a copy of our current 
puppetized grub defaults.

Bug: T122734
Change-Id: Ia1aa07610c8dbc2c83271e05da304ce88cc21c08
---
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml 
b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
index 9603776..24fe76c 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -174,6 +174,9 @@
 src: /etc/apt/sources.list.d/wikimedia.list
 dst: /etc/apt/sources.list.d/wikimedia.list
   -
+src: /etc/default/grub
+dst: /etc/default/grub
+  -
 src: /etc/apt/preferences.d/wikimedia.pref
 dst: /etc/apt/preferences.d/wikimedia.pref
   -

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

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

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

[MediaWiki-commits] [Gerrit] Enable memory cgroups for labs debian instances - change (operations/puppet)

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

Andrew Bogott has uploaded a new change for review.

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

Change subject: Enable memory cgroups for labs debian instances
..

Enable memory cgroups for labs debian instances

This won't take effect until reboot, but a followup patch will
apply it to the base image as well.

Bug: T122734
Change-Id: I13f1989070e24127a75addeb538c2be58633dd2a
---
M modules/base/manifests/labs.pp
1 file changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/modules/base/manifests/labs.pp b/modules/base/manifests/labs.pp
index f910e82..feb7835 100644
--- a/modules/base/manifests/labs.pp
+++ b/modules/base/manifests/labs.pp
@@ -21,5 +21,16 @@
 mode   => '0444',
 source => 'puppet:///modules/base/labs/nfs-common.default',
 }
+
+# enable memory cgroups
+augeas { 'grub2':
+incl=> '/etc/default/grub',
+lens=> 'Shellvars_list.lns',
+changes => [
+'set GRUB_CMDLINE_LINUX/value[. = "cgroup_enable=memory"] 
cgroup_enable=memory',
+'set GRUB_CMDLINE_LINUX/value[. = "swapaccount=1"] 
swapaccount=1',
+],
+notify  => Exec['update-grub'],
+}
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Update usage of GeoData classes (which are being put in name... - change (mediawiki...Wikibase)

2016-01-06 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Update usage of GeoData classes (which are being put in 
namespace)
..

Update usage of GeoData classes (which are being put in namespace)

Bug: T122339
Change-Id: Iaf4fd69ab2ad6171003b22f588badb5a970099cc
Depends-On: I2a52a7f44f747cd13c34edd1ef19c96f66d548f0
---
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M repo/includes/ParserOutput/GeoDataDataUpdater.php
M repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
3 files changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php 
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index d86123b..67cca21 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -179,7 +179,7 @@
$updaters[] = new PageImagesDataUpdater( 
$this->preferredPageImagesProperties );
}
 
-   if ( class_exists( 'GeoData' ) ) {
+   if ( class_exists( 'GeoData\GeoData' ) ) {
$updaters[] = new GeoDataDataUpdater(
$propertyDataTypeMatcher,
$this->preferredGeoDataProperties,
diff --git a/repo/includes/ParserOutput/GeoDataDataUpdater.php 
b/repo/includes/ParserOutput/GeoDataDataUpdater.php
index 47a89fb..e4cc9e0 100644
--- a/repo/includes/ParserOutput/GeoDataDataUpdater.php
+++ b/repo/includes/ParserOutput/GeoDataDataUpdater.php
@@ -2,9 +2,9 @@
 
 namespace Wikibase\Repo\ParserOutput;
 
-use Coord;
-use CoordinatesOutput;
 use DataValues\Geo\Values\GlobeCoordinateValue;
+use GeoData\Coord;
+use GeoData\CoordinatesOutput;
 use ParserOutput;
 use RuntimeException;
 use Wikibase\DataModel\Services\Entity\PropertyDataTypeMatcher;
@@ -60,7 +60,7 @@
array $preferredPropertiesIds,
array $globeUris
) {
-   if ( !class_exists( 'GeoData' ) ) {
+   if ( !class_exists( 'GeoData\GeoData' ) ) {
throw new RuntimeException( 'GeoDataDataUpdater 
requires the GeoData extension '
. 'to be enabled' );
}
diff --git 
a/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php 
b/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
index 5abd396..09ec66d 100644
--- a/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
+++ b/repo/tests/phpunit/includes/ParserOutput/GeoDataDataUpdaterTest.php
@@ -2,12 +2,12 @@
 
 namespace Wikibase\Repo\Tests\ParserOutput;
 
-use Coord;
-use CoordinatesOutput;
 use DataValues\DataValue;
 use DataValues\Geo\Values\GlobeCoordinateValue;
 use DataValues\Geo\Values\LatLongValue;
 use DataValues\StringValue;
+use GeoData\Coord;
+use GeoData\CoordinatesOutput;
 use ParserOutput;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -33,7 +33,7 @@
 class GeoDataDataUpdaterTest extends \MediaWikiTestCase {
 
private function willSkipTests() {
-   if ( !class_exists( 'GeoData' ) ) {
+   if ( !class_exists( 'GeoData\GeoData' ) ) {
return true;
}
return false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf4fd69ab2ad6171003b22f588badb5a970099cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use "origin-not-empty" as error code if "fromid" is not empty - change (mediawiki...Wikibase)

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

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

Change subject: Use "origin-not-empty" as error code if "fromid" is not empty
..


Use "origin-not-empty" as error code if "fromid" is not empty

"target-not-empty" is a pretty obvious mistake
here as this is about the item that is going to
hold a redirect, not about the target of that
redirect.

DEPLOY: Consider writing a short note about this
to the wikidata mailing list.

Bug: T112238
Change-Id: I9e75b1d20f2081d45189889c2e906eda577a62a5
---
M repo/includes/Interactors/RedirectCreationInteractor.php
M repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
M repo/tests/phpunit/includes/api/CreateRedirectTest.php
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/repo/includes/Interactors/RedirectCreationInteractor.php 
b/repo/includes/Interactors/RedirectCreationInteractor.php
index e6d0ac4..5c0e4de 100644
--- a/repo/includes/Interactors/RedirectCreationInteractor.php
+++ b/repo/includes/Interactors/RedirectCreationInteractor.php
@@ -176,7 +176,7 @@
if ( !$entity->isEmpty() ) {
throw new RedirectCreationException(
"Entity $entityId is not empty",
-   'target-not-empty'
+   'origin-not-empty'
);
}
} catch ( RevisionedUnresolvedRedirectException $ex ) {
diff --git 
a/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php 
b/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
index fa9ae15..fa886b0 100644
--- a/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
+++ b/repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
@@ -177,7 +177,7 @@
'target is a redirect' => array( new ItemId( 'Q11' ), 
new ItemId( 'Q22' ), 'target-is-redirect' ),
'target is incompatible' => array( new ItemId( 'Q11' ), 
new PropertyId( 'P11' ), 'target-is-incompatible' ),
 
-   'source not empty' => array( new ItemId( 'Q12' ), new 
ItemId( 'Q11' ), 'target-not-empty' ),
+   'source not empty' => array( new ItemId( 'Q12' ), new 
ItemId( 'Q11' ), 'origin-not-empty' ),
'can\'t redirect' => array( new PropertyId( 'P11' ), 
new PropertyId( 'P12' ), 'cant-redirect' ),
'can\'t redirect EditFilter' => array( new ItemId( 
'Q11' ), new ItemId( 'Q12' ), 'cant-redirect', Status::newFatal( 'EF' ) ),
);
diff --git a/repo/tests/phpunit/includes/api/CreateRedirectTest.php 
b/repo/tests/phpunit/includes/api/CreateRedirectTest.php
index b6ecc06..aa6f6c3 100644
--- a/repo/tests/phpunit/includes/api/CreateRedirectTest.php
+++ b/repo/tests/phpunit/includes/api/CreateRedirectTest.php
@@ -191,7 +191,7 @@
'target is a redirect' => array( 'Q11', 'Q22', 
'target-is-redirect' ),
'target is incompatible' => array( 'Q11', 'P11', 
'target-is-incompatible' ),
 
-   'source not empty' => array( 'Q12', 'Q11', 
'target-not-empty' ),
+   'source not empty' => array( 'Q12', 'Q11', 
'origin-not-empty' ),
'can\'t redirect' => array( 'P11', 'P12', 
'cant-redirect' ),
);
}

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

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

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

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

2016-01-06 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Update some packages
..

Update some packages

Update grunt-jscs to 2.6.0

Update grunt-banana-checker to 0.4.0

Change-Id: I867cdc525642a2542db05913c8f7d73318fe10e4
---
M Gruntfile.js
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
index 0f6f573..448b917 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,8 +12,8 @@
jshintrc: true
},
all: [
-   '*.js',
-   'modules/**/*.js'
+   '**/*.js',
+   '!lib/**'
]
},
jscs: {
diff --git a/package.json b/package.json
index 76a1ada..72ac16c 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-contrib-watch": "0.6.1",
-"grunt-jscs": "2.1.0",
-"grunt-banana-checker": "0.3.0",
+"grunt-jscs": "2.6.0",
+"grunt-banana-checker": "0.4.0",
 "grunt-jsonlint": "1.0.7"
   },
   "dependencies": {

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

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

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

[MediaWiki-commits] [Gerrit] Option to associate a rev id to a RC log entry, allowing unp... - change (mediawiki/core)

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

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

Change subject: Option to associate a rev id to a RC log entry, allowing 
unpatrolled status
..


Option to associate a rev id to a RC log entry, allowing unpatrolled status

This provides a mechanism to associate a revision id to an action.
For example in core, it makes sense for moves and uploads, which both
generate null revisions (also protections, but it isn't interesting if one
has patrolling in mind).

Crucially, in that case an unpatrolled status is allowed for the RC item.
So if the performer of the action is not autopatrolled, it will be displayed
as unpatrolled, and if the performer is autopatrolled, it will record an
autopatrol action.

When one associates a rev id to a type of action, one should also implement
a mechanism to patrol said action, since getting the diff for the associated
revision is not user friendly and works only if RC patrol is enabled.
This is done for uploads in If71af58719a4461f12d125455b7bef07164525ca (with
a new file patrol) and for moves in Ie0fa417feaf930c096b69521fc54d57aecd6cd51
(within RC patrol).

Extensions might possess other such actions that could benefit from patrolling.

Bug: T122089
Change-Id: I694424eca32b69e277f89d4c15183870983d0993
---
M includes/changes/OldChangesList.php
M includes/changes/RecentChange.php
M includes/logging/LogEntry.php
3 files changed, 45 insertions(+), 5 deletions(-)

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



diff --git a/includes/changes/OldChangesList.php 
b/includes/changes/OldChangesList.php
index 31b355d..a2ea37c 100644
--- a/includes/changes/OldChangesList.php
+++ b/includes/changes/OldChangesList.php
@@ -74,10 +74,16 @@
 */
private function formatChangeLine( RecentChange $rc, array &$classes, 
$watched ) {
$html = '';
+   $unpatrolled = $this->showAsUnpatrolled( $rc );
 
if ( $rc->mAttribs['rc_log_type'] ) {
$logtitle = SpecialPage::getTitleFor( 'Log', 
$rc->mAttribs['rc_log_type'] );
$this->insertLog( $html, $logtitle, 
$rc->mAttribs['rc_log_type'] );
+   $flags = $this->recentChangesFlags( array( 
'unpatrolled' =>$unpatrolled,
+   'bot' => $rc->mAttribs['rc_bot'] ), '' );
+   if ( $flags !== '' ) {
+   $html .= ' ' . $flags;
+   }
// Log entries (old format) or log targets, and special pages
} elseif ( $rc->mAttribs['rc_namespace'] == NS_SPECIAL ) {
list( $name, $htmlubpage ) = 
SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] );
@@ -86,7 +92,6 @@
}
// Regular entries
} else {
-   $unpatrolled = $this->showAsUnpatrolled( $rc );
$this->insertDiffHist( $html, $rc, $unpatrolled );
# M, N, b and ! (minor, new, bot and unpatrolled)
$html .= $this->recentChangesFlags(
diff --git a/includes/changes/RecentChange.php 
b/includes/changes/RecentChange.php
index 7c6fbb9..b0b88d3 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -700,10 +700,12 @@
 * @param string $params
 * @param int $newId
 * @param string $actionCommentIRC
+* @param int $revId Id of associated revision, if any
 * @return RecentChange
 */
public static function newLogEntry( $timestamp, &$title, &$user, 
$actionComment, $ip,
-   $type, $action, $target, $logComment, $params, $newId = 0, 
$actionCommentIRC = '' ) {
+   $type, $action, $target, $logComment, $params, $newId = 0, 
$actionCommentIRC = '',
+   $revId = 0 ) {
global $wgRequest;
 
# # Get pageStatus for email notification
@@ -727,6 +729,10 @@
break;
}
 
+   // Allow unpatrolled status when an associated rev id is passed
+   // May be used in core by moves and uploads
+   $markPatrolled = ( $revId > 0 ) ? $user->isAllowed( 
'autopatrol' ) : true;
+
$rc = new RecentChange;
$rc->mTitle = $target;
$rc->mPerformer = $user;
@@ -741,11 +747,11 @@
'rc_user' => $user->getId(),
'rc_user_text' => $user->getName(),
'rc_comment' => $logComment,
-   'rc_this_oldid' => 0,
+   'rc_this_oldid' => $revId,
'rc_last_oldid' => 0,
'rc_bot' => $user->isAllowed( 'bot' ) ? 
$wgRequest->getBool( 'bot', true ) : 0,

[MediaWiki-commits] [Gerrit] Fix link to PNG fallback for IE 8 and older - change (mediawiki...Math)

2016-01-06 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Fix link to PNG fallback for IE 8 and older
..

Fix link to PNG fallback for IE 8 and older

Change-Id: Iffb65af756a8fc53fcc9f484c783f69f8d908690
---
M modules/ext.math.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ext.math.js b/modules/ext.math.js
index 085260d..b50b889 100644
--- a/modules/ext.math.js
+++ b/modules/ext.math.js
@@ -16,7 +16,7 @@
// Create a new PNG image to use as the fallback.
img = document.createElement( 'img' );
url = this.style.backgroundImage.match( 
/url\('?([^']*)'?\)/ )[ 1 ];
-   img.setAttribute( 'src', url.replace( 'mode=' + 
'mathml', 'mode=' + 'png' ) );
+   img.setAttribute( 'src', url.replace( 
'media/math/render/svg/', 'media/math/render/png/' ) );
img.setAttribute( 'class', 'tex 
mwe-math-fallback-image-' + ( $( this ).hasClass( 
'mwe-math-fallback-image-inline' ) ? 'inline' : 'display' ) );
img.setAttribute( 'aria-hidden', 'true' );
this.parentNode.insertBefore( img, this );

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

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

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

[MediaWiki-commits] [Gerrit] Stop using $wgTitle, EditPage already provides one - change (mediawiki...MsCatSelect)

2016-01-06 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Stop using $wgTitle, EditPage already provides one
..

Stop using $wgTitle, EditPage already provides one

Also fix weird line endings while we're here

Change-Id: Ib8d59215efc45fd27ef3f314f8bd182c6a517f8d
---
M MsCatSelect.body.php
1 file changed, 79 insertions(+), 79 deletions(-)


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

diff --git a/MsCatSelect.body.php b/MsCatSelect.body.php
index 30a1070..940cf4b 100755
--- a/MsCatSelect.body.php
+++ b/MsCatSelect.body.php
@@ -1,79 +1,79 @@
-addModules( 'ext.MsCatSelect' );
-
-   // Make the configuration variables available to JavaScript
-   $mscsVars = array(
-   'MainCategories' => $wgMSCS_MainCategories,
-   'UseNiceDropdown' => $wgMSCS_UseNiceDropdown,
-   'WarnNoCategories' => $wgMSCS_WarnNoCategories,
-   'WarnNoCategoriesException' => str_replace( ' ', '_', 
$wgMSCS_WarnNoCategoriesException ),
-   );
-   $mscsVars = json_encode( $mscsVars, true );
-   $wgOut->addScript( "var mscsVars = $mscsVars;" 
);
-   return true;
-   }
-
-   // Entry point for the hook and main worker function for editing the 
page:
-   static function showHook( EditPage $editPage, OutputPage $output ) {
-   self::cleanTextbox( $editPage );
-   return true;
-   }
-
-   // Entry point for the hook and main worker function for saving the 
page:
-   static function saveHook( $editPage ) {
-   global $wgContLang, $wgTitle;
-
-   // Get localised namespace string
-   $categoryNamespace = $wgContLang->getNsText( NS_CATEGORY );
-
-   // Default sort key is page name with stripped namespace name, 
otherwise sorting is ugly
-   if ( $wgTitle->getNamespace() == NS_MAIN ) {
-   $default_sortkey = "";
-   } else {
-   $default_sortkey = "|{{PAGENAME}}";
-   }
-
-   // Iterate through all selected category entries:
-   $text = "\n";
-   if ( array_key_exists( 'SelectCategoryList', $_POST ) ) {
-   foreach ( $_POST['SelectCategoryList'] as $category ) {
-   $text .= "\n[[" . $categoryNamespace . ":" . 
$category . "]]";
-   }
-   }
-   $editPage->textbox1 .= $text;
-
-   return true;
-   }
-
-   // Removes the old category tag from the text the user views in the 
editbox.
-   static function cleanTextbox( $editPage ) {
-   global $wgContLang;
-
-   $editText = $editPage->textbox1;
-
-   $categoryNamespace = $wgContLang->getNsText( NS_CATEGORY );
-
-   // The regular expression to find the category links:
-   $pattern = 
"\[\[({$categoryNamespace}):([^\|\]]*)(\|[^\|\]]*)?\]\]";
-
-   // The container to store the processed text:
-   $cleanText = '';
-
-   // Check linewise for category links:
-   foreach ( explode( "\n", $editText ) as $textLine ) {
-   // Filter line through pattern and store the result:
-   $cleanText .= preg_replace( "/{$pattern}/i", "", 
$textLine ) . "\n";
-   }
-   // Place the cleaned text into the text box:
-   $editPage->textbox1 = trim( $cleanText );
-
-   return true;
-   }
-}
\ No newline at end of file
+addModules( 'ext.MsCatSelect' );
+
+   // Make the configuration variables available to JavaScript
+   $mscsVars = array(
+   'MainCategories' => $wgMSCS_MainCategories,
+   'UseNiceDropdown' => $wgMSCS_UseNiceDropdown,
+   'WarnNoCategories' => $wgMSCS_WarnNoCategories,
+   'WarnNoCategoriesException' => str_replace( ' ', '_', 
$wgMSCS_WarnNoCategoriesException ),
+   );
+   $mscsVars = json_encode( $mscsVars, true );
+   $wgOut->addScript( "var mscsVars = $mscsVars;" 
);
+   return true;
+   }
+
+   // Entry point for the hook and main worker function for editing the 
page:
+   static function showHook( EditPage $editPage, OutputPage $output ) {
+   self::cleanTextbox( $editPage );
+   return true;
+   }
+
+   // Entry point for the hook and main worker function for saving the 
page:
+   static function saveHook( $editPage ) {
+   global $wgContLang;
+
+   // Get localised namespace string
+   $categoryNamespace = $wgContLang->getNsText(

[MediaWiki-commits] [Gerrit] added Semantic MediaWiki role - change (mediawiki/vagrant)

2016-01-06 Thread Cicalese (Code Review)

Cicalese has uploaded a new change for review.

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

Change subject: added Semantic MediaWiki role
..

added Semantic MediaWiki role

Bug:T99858
Change-Id: I777c9763991ae06c7d8caced909b443ce68e6330
---
A puppet/modules/role/manifests/semantic_mediawiki.pp
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/33/262833/1

diff --git a/puppet/modules/role/manifests/semantic_mediawiki.pp 
b/puppet/modules/role/manifests/semantic_mediawiki.pp
new file mode 100644
index 000..01b1661
--- /dev/null
+++ b/puppet/modules/role/manifests/semantic_mediawiki.pp
@@ -0,0 +1,14 @@
+# == Class: role::semantic_mediawiki
+# The Semantic MediaWiki extension lets you store and query structured data 
within wiki pages
+class role::semantic_mediawiki {
+
+require ::role::mediawiki
+
+mediawiki::extension { 'SemanticMediaWiki':
+composer => true,
+needs_update => true,
+settings => [
+   'enableSemantics($wgSitename)',
+   ]
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] WebRequest::appendQuery*() functions no longer take $onlyquery - change (mediawiki/core)

2016-01-06 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: WebRequest::appendQuery*() functions no longer take $onlyquery
..

WebRequest::appendQuery*() functions no longer take $onlyquery

Deprecated since 1.25, unused anywhere

Change-Id: I52224635cfeaf4748abeaa07b0c92e7f452fa93f
---
M includes/WebRequest.php
M includes/diff/DifferenceEngine.php
M includes/skins/SkinTemplate.php
3 files changed, 6 insertions(+), 15 deletions(-)


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

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 7e22404..7b76592 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -729,33 +729,24 @@
/**
 * @param string $key
 * @param string $value
-* @param bool $onlyquery [deprecated]
 * @return string
 */
-   public function appendQueryValue( $key, $value, $onlyquery = true ) {
-   return $this->appendQueryArray( array( $key => $value ), 
$onlyquery );
+   public function appendQueryValue( $key, $value ) {
+   return $this->appendQueryArray( array( $key => $value ) );
}
 
/**
 * Appends or replaces value of query variables.
 *
 * @param array $array Array of values to replace/add to query
-* @param bool $onlyquery Whether to only return the query string
-*  and not the complete URL [deprecated]
 * @return string
 */
-   public function appendQueryArray( $array, $onlyquery = true ) {
-   global $wgTitle;
+   public function appendQueryArray( $array ) {
$newquery = $this->getQueryValues();
unset( $newquery['title'] );
$newquery = array_merge( $newquery, $array );
-   $query = wfArrayToCgi( $newquery );
-   if ( !$onlyquery ) {
-   wfDeprecated( __METHOD__, '1.25' );
-   return $wgTitle->getLocalURL( $query );
-   }
 
-   return $query;
+   return wfArrayToCgi( $newquery );
}
 
/**
diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index 5e37663..d588d51 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -433,7 +433,7 @@
array( $msg ) );
} else {
# Give explanation and add a link to view the 
diff...
-   $query = $this->getRequest()->appendQueryValue( 
'unhide', '1', true );
+   $query = $this->getRequest()->appendQueryValue( 
'unhide', '1' );
$link = $this->getTitle()->getFullURL( $query );
$msg = $suppressed ? 
'rev-suppressed-unhide-diff' : 'rev-deleted-unhide-diff';
$out->wrapWikiMsg(
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index c0e5556..2ecbafb 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -1204,7 +1204,7 @@
$nav_urls['print'] = array(
'text' => $this->msg( 'printableversion' 
)->text(),
'href' => $this->getTitle()->getLocalURL(
-   $request->appendQueryValue( 
'printable', 'yes', true ) )
+   $request->appendQueryValue( 
'printable', 'yes' ) )
);
}
 

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

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

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

[MediaWiki-commits] [Gerrit] grant aude access to analytics-privatedata-users - change (operations/puppet)

2016-01-06 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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

Change subject: grant aude access to analytics-privatedata-users
..

grant aude access to analytics-privatedata-users

Katie (aude) will be working with the CirrusSearchRequestSet data along
with the webrequest data currently stored in hive to analyse and improve
the search relevancy on wikidata.

This cannot merge until after the three day wait has passed and no
objections are noted on the task.  (An Opsen should review and merge
this, as there can be hidden blockers.)

Bug:T122977
Change-Id: Ide778e7fdfb4dbd518c62063f49475b47d8b19ae
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index f60a467..4201d26 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -229,7 +229,7 @@
  This will grant shell access on Hadoop client nodes 
(stat1002) and on
  Hadoop NameNodes.  Some files in HDFS have sensitive data in 
them.
  Those files are group readable by the 
analytics-privatedata-users group.
-members: [dartar, milimetric, yurik, dfoy,
+members: [dartar, milimetric, yurik, dfoy, aude,
   halfak, dr0ptp4kt, tnegrin, ironholds, bearloga, cwdent,
   kleduc, nuria, haithams, otto, deskana, zhousquared,
   bsitzmann, dbrant, declerambaul, ellery, nettrom, leila,

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

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

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

[MediaWiki-commits] [Gerrit] jquery.accessKeyLabel: make modifier info public - change (mediawiki/core)

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

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

Change subject: jquery.accessKeyLabel: make modifier info public
..


jquery.accessKeyLabel: make modifier info public

Rewrite of getAccessKeyPrefix into getAccessKeyModifiers. This is my
alternate suggestion for change If953441

Change-Id: I0f77de396b7e79b7c74274df316f62df5220ce27
---
M resources/src/jquery/jquery.accessKeyLabel.js
1 file changed, 43 insertions(+), 23 deletions(-)

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



diff --git a/resources/src/jquery/jquery.accessKeyLabel.js 
b/resources/src/jquery/jquery.accessKeyLabel.js
index afa7201..519e39b 100644
--- a/resources/src/jquery/jquery.accessKeyLabel.js
+++ b/resources/src/jquery/jquery.accessKeyLabel.js
@@ -5,8 +5,8 @@
  */
 ( function ( $, mw ) {
 
-// Cached access key prefix for used browser
-var cachedAccessKeyPrefix,
+// Cached access key modifiers for used browser
+var cachedAccessKeyModifiers,
 
// Whether to use 'test-' instead of correct prefix (used for testing)
useTestPrefix = false,
@@ -16,37 +16,39 @@
labelable = 'button, input, textarea, keygen, meter, output, progress, 
select';
 
 /**
- * Get the prefix for the access key for browsers that don't support 
accessKeyLabel.
+ * Find the modifier keys that need to be pressed together with the accesskey 
to trigger the input.
  *
+ * The result is dependant on the ua paramater or the current platform.
  * For browsers that support accessKeyLabel, #getAccessKeyLabel never calls 
here.
+ * Valid key values that are returned can be: ctrl, alt, option, shift, esc
  *
  * @private
  * @param {Object} [ua] An object with a 'userAgent' and 'platform' property.
- * @return {string} Access key prefix
+ * @return {Array} Array with 0 or more of the string values: ctrl, option, 
alt, shift, esc
  */
-function getAccessKeyPrefix( ua ) {
+function getAccessKeyModifiers( ua ) {
// use cached prefix if possible
-   if ( !ua && cachedAccessKeyPrefix ) {
-   return cachedAccessKeyPrefix;
+   if ( !ua && cachedAccessKeyModifiers ) {
+   return cachedAccessKeyModifiers;
}
 
var profile = $.client.profile( ua ),
-   accessKeyPrefix = 'alt-';
+   accessKeyModifiers = [ 'alt' ];
 
// Classic Opera on any platform
if ( profile.name === 'opera' && profile.versionNumber < 15 ) {
-   accessKeyPrefix = 'shift-esc-';
+   accessKeyModifiers = [ 'shift', 'esc' ];
 
// Chrome and modern Opera on any platform
} else if ( profile.name === 'chrome' || profile.name === 'opera' ) {
-   accessKeyPrefix = (
+   accessKeyModifiers = (
profile.platform === 'mac'
// Chrome on Mac
-   ? 'ctrl-option-'
+   ? [ 'ctrl', 'option' ]
// Chrome on Windows or Linux
// (both alt- and alt-shift work, but alt with 
E, D, F etc does not
// work since they are browser shortcuts)
-   : 'alt-shift-'
+   : [ 'alt', 'shift' ]
);
 
// Non-Windows Safari with webkit_version > 526
@@ -54,7 +56,7 @@
&& profile.name === 'safari'
&& profile.layoutVersion > 526
) {
-   accessKeyPrefix = 'ctrl-alt-';
+   accessKeyModifiers = [ 'ctrl', 'alt' ];
 
// Safari/Konqueror on any platform, or any browser on Mac
// (but not Safari on Windows)
@@ -63,27 +65,27 @@
|| profile.platform === 'mac'
|| profile.name === 'konqueror' )
) {
-   accessKeyPrefix = 'ctrl-';
+   accessKeyModifiers = [ 'ctrl' ];
 
// Firefox/Iceweasel 2.x and later
} else if ( ( profile.name === 'firefox' || profile.name === 
'iceweasel' )
&& profile.versionBase > '1'
) {
-   accessKeyPrefix = 'alt-shift-';
+   accessKeyModifiers = [ 'alt', 'shift' ];
}
 
-   // cache prefix
+   // cache modifiers
if ( !ua ) {
-   cachedAccessKeyPrefix = accessKeyPrefix;
+   cachedAccessKeyModifiers = accessKeyModifiers;
}
-   return accessKeyPrefix;
+   return accessKeyModifiers;
 }
 
 /**
  * Get the access key label for an element.
  *
  * Will use native accessKeyLabel if available (currently only in Firefox 8+),
- * falls back to #getAccessKeyPrefix.
+ * falls back to #getAccessKeyModifiers.
  *
  * @private
  * @param {HTMLElement} element Element to get the label for
@@ -99,7 +101,7 @@
if ( !useTestPrefix && element.accessKeyLabel ) {
return element.accessKeyLabel;
}
-   return (

[MediaWiki-commits] [Gerrit] [elastic] Fix bad method call in diamond collection - change (operations/puppet)

2016-01-06 Thread Rush (Code Review)

Rush has submitted this change and it was merged.

Change subject: [elastic] Fix bad method call in diamond collection
..


[elastic] Fix bad method call in diamond collection

Change-Id: I6715d982491225265a4f8c114e8dff8a60b3e266
---
M modules/elasticsearch/files/monitor/wmfelastic.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/elasticsearch/files/monitor/wmfelastic.py 
b/modules/elasticsearch/files/monitor/wmfelastic.py
index 2001438..2eb8887 100644
--- a/modules/elasticsearch/files/monitor/wmfelastic.py
+++ b/modules/elasticsearch/files/monitor/wmfelastic.py
@@ -260,7 +260,7 @@
 cluster_stats = self.cluster_stats()
 for metric, value in cluster_stats.iteritems():
 self.publish(metric, value)
-health_stats = self.health_stats()
+health_stats = self.cluster_health()
 for metric, value in health_stats.iteritems():
 self.publish(metric, value)
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6715d982491225265a4f8c114e8dff8a60b3e266
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WIP Experimenting with JS object references in browser tests - change (mediawiki...VisualEditor)

2016-01-06 Thread Dduvall (Code Review)

Dduvall has uploaded a new change for review.

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

Change subject: WIP Experimenting with JS object references in browser tests
..

WIP Experimenting with JS object references in browser tests

References to JS objects for VE elements can determined by referencing
the VE and OOUI API documentation[1][2] and interrogating the objects in
a browser console. Errors should be closer to what developers understand
but testers should pair with developers to better understand how to
define new page elements and where to go for documentation/help.

The VE entrypoint for the singleton reference is `ve.init.target` (if
there's only one instance of VE target; there may be multiple in some
cases like Flow).

[1] https://doc.wikimedia.org/VisualEditor/master/
[2] https://doc.wikimedia.org/oojs-ui/master/js/

Change-Id: I1f642807cdd3059d8e7e885a8b239ac01b9b3024
---
M Gemfile.lock
M modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
3 files changed, 17 insertions(+), 7 deletions(-)


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

diff --git a/Gemfile.lock b/Gemfile.lock
index 40f5127..9f9a1da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-ast (2.1.0)
+ast (2.2.0)
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
-childprocess (0.5.8)
+childprocess (0.5.9)
   ffi (~> 1.0, >= 1.0.11)
 chunky_png (1.3.5)
 commons_upload (0.0.4)
@@ -97,7 +97,7 @@
 watir-webdriver (0.9.1)
   selenium-webdriver (>= 2.46.2)
 websocket (1.2.2)
-yml_reader (0.6)
+yml_reader (0.7)
 
 PLATFORMS
   ruby
@@ -108,3 +108,6 @@
   rake (~> 10.4, >= 10.4.2)
   rubocop (~> 0.32.1)
   screenshot (~> 0.0.7)
+
+BUNDLED WITH
+   1.10.6
diff --git 
a/modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb 
b/modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb
index e191ef1..c5117d6 100644
--- 
a/modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb
+++ 
b/modules/ve-mw/tests/browser/features/step_definitions/general_markup_steps.rb
@@ -1,5 +1,5 @@
 When(/^I click the Bold menu option$/) do
-  on(VisualEditorPage).ve_bold_text_element.when_present(15).click
+  on(VisualEditorPage).ve_bold_text_element.when_present.click
 end
 
 When(/^I click the Computer Code menu option$/) do
@@ -7,7 +7,7 @@
 end
 
 When(/^I click the Italics menu option$/) do
-  on(VisualEditorPage).ve_italics_element.when_present(15).click
+  on(VisualEditorPage).ve_italics_element.when_present.click
 end
 
 When(/^I click the More option$/) do
diff --git 
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index d77b87a..4617192 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -177,11 +177,10 @@
   div(:toolbar_actions, class: 'oo-ui-toolbar-actions')
   a(:transclusion, css: 
'span.oo-ui-widget.oo-ui-iconElement.oo-ui-tool.oo-ui-tool-name-transclusion.oo-ui-widget-enabled
 > a')
   text_field(:transclusion_description, css: '.oo-ui-inputWidget > 
input:nth-child(1)')
-  span(:ve_bold_text, class: 'oo-ui-iconElement-icon oo-ui-icon-bold')
   span(:ve_bullets, css: '.oo-ui-clippableElement-clippable 
.oo-ui-iconElement-icon.oo-ui-icon-listBullet')
   span(:ve_computer_code, class: 'oo-ui-iconElement-icon oo-ui-icon-code')
   div(:ve_heading_menu, class: 'oo-ui-iconElement-icon oo-ui-icon-down')
-  span(:ve_italics, class: 'oo-ui-iconElement-icon oo-ui-icon-italic')
+  span(:ve_italics, object: 
've.init.target.getToolbar().items[2].tools.italic.$link[0]')
   span(:ve_link_icon, class: 'oo-ui-iconElement-icon oo-ui-icon-link')
   span(:ve_link_ui, class: 'oo-ui-widget oo-ui-widget-enabled 
oo-ui-labelElement-label oo-ui-labelWidget oo-ui-processDialog-title 
oo-ui-labelElement', text: 'Link')
   span(:ve_media_menu, class: 'oo-ui-iconElement-icon oo-ui-icon-picture')
@@ -203,6 +202,14 @@
   div(:media_alternative_block, class: 'oo-ui-layout oo-ui-iconElement 
oo-ui-labelElement oo-ui-fieldsetLayout', index: 2)
   div(:media_advanced_settings, class: 'oo-ui-outlineOptionWidget-level-0', 
index: 1)
 
+  def ve_bold_text_element
+@browser.execute_script('return 
ve.init.target.getToolbar().items[2].tools.bold.$link[0]')
+  end
+
+  def ve_italics_element
+@browser.execute_script('return 
ve.init.target.getToolbar().items[2].tools.italic.$link[0]')
+  end
+
   def tools_menu_element
 if browser_name == :chrome
   div(class: 'oo-ui-widget oo-ui-widget-enabled oo-ui-toolGroup 
oo-ui-iconElement

[MediaWiki-commits] [Gerrit] Add testreduce module and role - change (operations/puppet)

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

Ori.livneh has uploaded a new change for review.

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

Change subject: Add testreduce module and role
..

Add testreduce module and role

testreduce is Parsoid's round-trip test result aggregator and web UI. It
comprises a test coordination server that hands out test requests to
testing clients, accepts test results from them, and records the results
in a database, as well as a web interface for examining the test
results.

This patch adds a testreduce module and a minimal role. It hews closely
to how testreduce is currently configured on ruthenium.

Bug: T118778
Change-Id: Icd39e880ea4d0fec3e68c45d39521fb07f9dff7e
---
A manifests/role/testreduce.pp
M manifests/site.pp
A modules/testreduce/files/testreduce.upstart.conf
A modules/testreduce/manifests/init.pp
A modules/testreduce/templates/settings.js.erb
5 files changed, 197 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/262846/1

diff --git a/manifests/role/testreduce.pp b/manifests/role/testreduce.pp
new file mode 100644
index 000..12974c6
--- /dev/null
+++ b/manifests/role/testreduce.pp
@@ -0,0 +1,11 @@
+# == Class: role::testreduce
+#
+# Parsoid round-trip test result aggregator.
+#
+class role::testreduce {
+class { 'testreduce':
+db_name => 'testreduce_0715',
+db_user => 'testreduce',
+db_pass => '',  # FIXME
+}
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index b90dc46..ef4cc32 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2317,7 +2317,7 @@
 # ruthenium is a parsoid regression test server
 # https://www.mediawiki.org/wiki/Parsoid/Round-trip_testing
 node 'ruthenium.eqiad.wmnet' {
-role testsystem
+role testsystem, testreduce
 }
 
 # T95046 install/deploy scandium as zuul merger (ci) server
diff --git a/modules/testreduce/files/testreduce.upstart.conf 
b/modules/testreduce/files/testreduce.upstart.conf
new file mode 100644
index 000..543788b
--- /dev/null
+++ b/modules/testreduce/files/testreduce.upstart.conf
@@ -0,0 +1,34 @@
+# vim: set ft=upstart:
+
+description "testreduce HTTP service"
+
+start on (local-filesystem and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+
+# up ulimit -n a bit
+limit nofile 1 1
+
+setuid "testreduce"
+setgid "testreduce"
+
+env DEFAULTFILE=/etc/default/testreduce
+
+# Basic built-in defaults. Overridden by whatever
+# is defined in the DEFAULTFILE defined above.
+env NODE_PATH="/srv/testreduce/node_modules"
+env BASE_PATH="/srv/testreduce/server"
+env LOG_FILE="/dev/null"
+env SETTINGS_FILE="/etc/testreduce/settings.js"
+env DAEMON_ARGS="--config $SETTINGS_FILE"
+env PORT="8001"
+
+respawn
+
+script
+if [ -f "$DEFAULTFILE" ] ; then
+. "$DEFAULTFILE"
+fi
+chdir "$BASE_PATH"
+   echo "Starting testreduce on port $PORT"
+exec /usr/bin/nodejs server.js $DAEMON_ARGS < /dev/null >> "$LOG_FILE" 2>&1
+end script
diff --git a/modules/testreduce/manifests/init.pp 
b/modules/testreduce/manifests/init.pp
new file mode 100644
index 000..a645d2d
--- /dev/null
+++ b/modules/testreduce/manifests/init.pp
@@ -0,0 +1,84 @@
+# == Class: testreduce
+#
+# Parsoid round-trip test result aggregator.
+#
+# === Parameters
+#
+# [*db_name*]
+#   Database name for storing results.
+#
+# [*db_user*]
+#   Database user.
+#
+# [*db_host*]
+#   MySQL host. Default: 'localhost'.
+#
+# [*db_port*]
+#   MySQL port. Default: 3306.
+#
+# [*coord_port*]
+#   The result aggregator will listen on this port. Default: 8002.
+#
+# [*webapp_port*]
+#   The user-facing webapp that displays test results will listen on
+#   this port. Default: 8003.
+#
+class testreduce(
+$db_name,
+$db_user,
+$db_pass,
+$db_host = 'localhost',
+$db_port = 3306,
+$coord_port  = 8002,
+$webapp_port = 8003,
+) {
+require_package('nodejs')
+require_package('npm')
+
+group { 'testreduce':
+ensure => present,
+system => true,
+}
+
+user { 'testreduce':
+gid=> 'testreduce',
+home   => '/srv/testreduce',
+managehome => false,
+system => true,
+}
+
+file { '/etc/testreduce':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
+file { '/etc/testreduce/settings.js':
+content => template('testreduce/settings.js.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+notify  => Service['testreduce'],
+}
+
+file { '/etc/init/testreduce.conf':
+source => 'puppet:///modules/testreduce/testreduce.upstart.conf',
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+notify => Service['testreduce'],
+}
+
+service { 'testreduce':
+ensure   => running,
+provider => upstart,
+}
+
+git::clone {

[MediaWiki-commits] [Gerrit] DSR unit tests for heading wikitext - change (mediawiki...parsoid)

2016-01-06 Thread Sn1per (Code Review)

Sn1per has uploaded a new change for review.

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

Change subject: DSR unit tests for heading wikitext
..

DSR unit tests for heading wikitext

Change-Id: If8a2e8a767865a1958bc60b75dbf52c3625d7e3c
---
M tests/mocha/dsr.js
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/tests/mocha/dsr.js b/tests/mocha/dsr.js
index 325ca47..05ee420 100644
--- a/tests/mocha/dsr.js
+++ b/tests/mocha/dsr.js
@@ -94,6 +94,21 @@
 runTests('Lists', listTests);
 
 var headingTests = [
+   {
+   wt: '=A=\n==B==\n===C===\nD',
+   specs: [
+   { selector: 'body > h1', dsrContent: ['=A=', '=', '='] 
},
+   { selector: 'body > h2', dsrContent: ['==B==', '==', 
'=='] },
+   { selector: 'body > h3', dsrContent: ['===C===', '===', 
'==='] },
+   { selector: 'body > h4', dsrContent: ['D', 
'', ''] },
+   ],
+   },
+   {
+   wt: '==A New Use for the = Sign==',
+   specs: [
+   { selector: 'body > h2', dsrContent: ['==A New Use for 
the = Sign==', '==', '=='] },
+   ],
+   },
 ];
 runTests('Headings', headingTests);
 

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

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

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

[MediaWiki-commits] [Gerrit] Add optional $name-summary message for Special:GlobalRenameQ... - change (mediawiki...CentralAuth)

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

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

Change subject: Add optional $name-summary message for Special:GlobalRenameQueue
..


Add optional $name-summary message for Special:GlobalRenameQueue

So people can add customizations to it via system messages instead of JS
user scripts.

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

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



diff --git a/includes/specials/SpecialGlobalRenameQueue.php 
b/includes/specials/SpecialGlobalRenameQueue.php
index dcc35eb..e6fe146 100644
--- a/includes/specials/SpecialGlobalRenameQueue.php
+++ b/includes/specials/SpecialGlobalRenameQueue.php
@@ -53,6 +53,8 @@
$navigation = explode( '/', $par );
$action = array_shift( $navigation );
 
+   $this->outputHeader();
+
switch ( $action ) {
case self::PAGE_OPEN_QUEUE:
$this->handleOpenQueue();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d1e9aed711986069cd29b2ce1224adfd54b1cb8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Steinsplitter 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 >

1 - 100 of 227 matches

Mail list logo