date:20161226

[MediaWiki-commits] [Gerrit] operations/puppet[production]: media title dumps: use explicit path to list of wikis with g...

2016-12-26 Thread ArielGlenn (Code Review)

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

Change subject: media title dumps: use explicit path to list of wikis with 
globaluseagelist
..


media title dumps: use explicit path to list of wikis with globaluseagelist

Change-Id: I1e29d075cd62b8400af3f69858446c50c10ca638
---
M modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git 
a/modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb 
b/modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb
index f7e3c0c..0976cda 100755
--- a/modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb
+++ b/modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb
@@ -24,7 +24,7 @@
 fi
 
 # determine which wiki has the global image links table and set as base wiki 
for the run
-globalusagelist=$(egrep "^globalusagelist=" "$configfile" | mawk 
-Fglobalusagelist= '{ print $2 }')
+globalusagelist="<%= scope.lookupvar('snapshot::dumps::dirs::dblistsdir') 
-%>/globalusage.dblist"
 basewiki=`cat "$globalusagelist"`
 
 python "${repodir}/onallwikis.py" --outdir "$outputdir" \

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: media title dumps: use explicit path to list of wikis with g...

2016-12-26 Thread ArielGlenn (Code Review)

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

Change subject: media title dumps: use explicit path to list of wikis with 
globaluseagelist
..

media title dumps: use explicit path to list of wikis with globaluseagelist

Change-Id: I1e29d075cd62b8400af3f69858446c50c10ca638
---
M modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/329323/1

diff --git 
a/modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb 
b/modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb
index f7e3c0c..0976cda 100755
--- a/modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb
+++ b/modules/snapshot/templates/cron/create-media-per-project-lists.sh.erb
@@ -24,7 +24,7 @@
 fi
 
 # determine which wiki has the global image links table and set as base wiki 
for the run
-globalusagelist=$(egrep "^globalusagelist=" "$configfile" | mawk 
-Fglobalusagelist= '{ print $2 }')
+globalusagelist="<%= scope.lookupvar('snapshot::dumps::dirs::dblistsdir') 
-%>/globalusage.dblist"
 basewiki=`cat "$globalusagelist"`
 
 python "${repodir}/onallwikis.py" --outdir "$outputdir" \

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Removed deprecatd function WikiRevision::getText()

2016-12-26 Thread Subins2000 (Code Review)

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

Change subject: Removed deprecatd function WikiRevision::getText()
..

Removed deprecatd function WikiRevision::getText()

WikiRevision::getText() was deprecated in 1.21. This has been removed.

Bug: T61113
Change-Id: I3f0e0f7fe38bd4e2001efbe17cdba6bcc90b036f
---
M RELEASE-NOTES-1.29
M includes/import/WikiRevision.php
2 files changed, 1 insertion(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/329322/1

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 43f21ef..dac0d55 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -137,6 +137,7 @@
 * User::getTemporaryPassword() (deprecated in 1.27) was removed.
 * User::isPasswordReminderThrottled() (deprecated in 1.27) was removed.
 * FSRepo (deprecated in 1.19) was removed.
+* WikiRevision::getText() (deprecated in 1.21) was removed
 
 == Compatibility ==
 
diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 1e866f3..0384c2f 100644
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -314,17 +314,6 @@
}
 
/**
-* @return string
-*
-* @deprecated Since 1.21, use getContent() instead.
-*/
-   function getText() {
-   wfDeprecated( __METHOD__, '1.21' );
-
-   return $this->text;
-   }
-
-   /**
 * @return ContentHandler
 */
function getContentHandler() {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Parser: Trim leading whitespace from links before checking f...

2016-12-26 Thread TTO (Code Review)

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

Change subject: Parser: Trim leading whitespace from links before checking for 
leading :
..

Parser: Trim leading whitespace from links before checking for leading :

The leading spaces on the link only cause us problems, such as for the
$noforce check 20 lines later.

Bug: T129218
Change-Id: I93a8da1f73b38fa3da362f8f27479b3039ed3f13
---
M includes/parser/Parser.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 1ca9dac..346d5ea 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2199,7 +2199,7 @@
continue;
}
 
-   $origLink = $m[1];
+   $origLink = ltrim( $m[1], ' ' );
 
# Don't allow internal links to pages containing
# PROTO: where PROTO is a valid URL protocol; these

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

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

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Revert "Revert "Bumps revscoring to 1.3.1""

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Revert "Revert "Bumps revscoring to 1.3.1""
..


Revert "Revert "Bumps revscoring to 1.3.1""

This reverts commit 25157a3f5dd7a62ab365758d60333bf5357497cf.

Change-Id: Iec2d4ee707cd257ac57aa76b35db3523acae4a74
---
R revscoring-1.3.1-py2.py3-none-any.whl
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/revscoring-1.2.8-py2.py3-none-any.whl 
b/revscoring-1.3.1-py2.py3-none-any.whl
similarity index 66%
rename from revscoring-1.2.8-py2.py3-none-any.whl
rename to revscoring-1.3.1-py2.py3-none-any.whl
index 6ef196b..0382c6d 100644
--- a/revscoring-1.2.8-py2.py3-none-any.whl
+++ b/revscoring-1.3.1-py2.py3-none-any.whl
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec2d4ee707cd257ac57aa76b35db3523acae4a74
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Revert "Revert "Bumps pyenchant to 1.6.8""

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Revert "Revert "Bumps pyenchant to 1.6.8""
..


Revert "Revert "Bumps pyenchant to 1.6.8""

This reverts commit 3e7b9239359841b6163b218e39333fee7307cb49.

Change-Id: Ib0699773877527a98d3140eb1dc8d005e518fbaf
---
D pyenchant-1.6.6-py2.py3-none-any.whl
A pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/pyenchant-1.6.6-py2.py3-none-any.whl 
b/pyenchant-1.6.6-py2.py3-none-any.whl
deleted file mode 100644
index de27cad..000
--- a/pyenchant-1.6.6-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git 
a/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl 
b/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
new file mode 100644
index 000..5cd2f7e
--- /dev/null
+++ b/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0699773877527a98d3140eb1dc8d005e518fbaf
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Revert "Revert "Bumps pyenchant to 1.6.8""

2016-12-26 Thread Ladsgroup (Code Review)

Hello Halfak,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Revert "Bumps pyenchant to 1.6.8""
..

Revert "Revert "Bumps pyenchant to 1.6.8""

This reverts commit 3e7b9239359841b6163b218e39333fee7307cb49.

Change-Id: Ib0699773877527a98d3140eb1dc8d005e518fbaf
---
D pyenchant-1.6.6-py2.py3-none-any.whl
A pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/19/329319/1

diff --git a/pyenchant-1.6.6-py2.py3-none-any.whl 
b/pyenchant-1.6.6-py2.py3-none-any.whl
deleted file mode 100644
index de27cad..000
--- a/pyenchant-1.6.6-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git 
a/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl 
b/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
new file mode 100644
index 000..5cd2f7e
--- /dev/null
+++ b/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0699773877527a98d3140eb1dc8d005e518fbaf
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Revert "Revert "Bumps revscoring to 1.3.1""

2016-12-26 Thread Ladsgroup (Code Review)

Hello Halfak,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Revert "Bumps revscoring to 1.3.1""
..

Revert "Revert "Bumps revscoring to 1.3.1""

This reverts commit 25157a3f5dd7a62ab365758d60333bf5357497cf.

Change-Id: Iec2d4ee707cd257ac57aa76b35db3523acae4a74
---
R revscoring-1.3.1-py2.py3-none-any.whl
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/20/329320/1

diff --git a/revscoring-1.2.8-py2.py3-none-any.whl 
b/revscoring-1.3.1-py2.py3-none-any.whl
similarity index 66%
rename from revscoring-1.2.8-py2.py3-none-any.whl
rename to revscoring-1.3.1-py2.py3-none-any.whl
index 6ef196b..0382c6d 100644
--- a/revscoring-1.2.8-py2.py3-none-any.whl
+++ b/revscoring-1.3.1-py2.py3-none-any.whl
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec2d4ee707cd257ac57aa76b35db3523acae4a74
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Fix the height of the upload container & child element

2016-12-26 Thread SamanthaNguyen (Code Review)

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

Change subject: Fix the height of the upload container & child element
..

Fix the height of the upload container & child element

Bug: T154173
Change-Id: Icce18c8e3588b4045eb9eefbd667171da7a35ad0
---
M Poll.css
M create-poll.tmpl.php
2 files changed, 13 insertions(+), 7 deletions(-)


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

diff --git a/Poll.css b/Poll.css
index 4479f7a..dacd77c 100644
--- a/Poll.css
+++ b/Poll.css
@@ -71,10 +71,16 @@
width: 250px;
 }
 
-/* Width of the image upload frame on Special:CreatePoll. If you alter this,
- * remember to change the height of #real-form in create-poll.tmpl.php, too! */
+/* Width of the image upload frame on Special:CreatePoll */
+#real-form {
+   display: block;
+   height: auto;
+}
+
 .imageUpload-frame {
-   height: 90px;
+   border: 0;
+   width: 610px;
+   overflow: hidden;
 }
 
 /* Poll Window */
@@ -587,4 +593,4 @@
 /* No borders around the various images we use */
 .poll, .poll-right img {
border: 0;
-}
\ No newline at end of file
+}
diff --git a/create-poll.tmpl.php b/create-poll.tmpl.php
index 2cd481d..7fa268d 100644
--- a/create-poll.tmpl.php
+++ b/create-poll.tmpl.php
@@ -55,8 +55,8 @@
msg( 'poll-image-label' )->text() 
?>

 
-   
-   
+   
+   


 
@@ -66,4 +66,4 @@

 https://gerrit.wikimedia.org/r/329318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Fix typo in message form-rights2

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix typo in message form-rights2
..


Fix typo in message form-rights2

Another typo spotted by Wargo during translations.

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

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



diff --git a/data/i18n/en.json b/data/i18n/en.json
index a7f429a..6c84992 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -155,7 +155,7 @@
 
"form-rights-heading": "Applicant Rights & Consent to Data Processing 
and Transfer",
"form-rights1": "I as an applicant for a Wikimedia Foundation ('WMF') 
scholarship relating to my participation in the 2017 Wikimania conference 
hosted in Montréal, Quebec (Canada), hereby acknowledge and affirmatively 
consent to the following as a prerequisite to the consideration of my 2017 
Wikimania scholarship application ('Application'):",
-   "form-rights2":"(a) Any personal data or sensitive personal data that I 
submit as part of or in relation to my Application (collectively 'my Data') may 
be accessed and reviewed by: (i) WMF; (ii) members of a scholarship committee 
made up of Wikimedia movement members, a representative list of which can be 
found at: https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\;>https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee
 ('Scholarship Committee'); and if you indicated that you want to be considered 
for a WM Chapter or WM Thematic Org scholarship, (iii) official Wikimedia 
Chapters, a representative list of which can be found at: https://meta.wikimedia.org/wiki/Special::MyLanguage/Wikimedia_chapters\;>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters
 ('WM Chapters'), and official thematic organizations, a representative list of 
which can be found at: https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations\;>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations
 ('WM Thematic Orgs'); for the purposes of evaluating my Application.",
+   "form-rights2":"(a) Any personal data or sensitive personal data that I 
submit as part of or in relation to my Application (collectively 'my Data') may 
be accessed and reviewed by: (i) WMF; (ii) members of a scholarship committee 
made up of Wikimedia movement members, a representative list of which can be 
found at: https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\;>https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee
 ('Scholarship Committee'); and if you indicated that you want to be considered 
for a WM Chapter or WM Thematic Org scholarship, (iii) official Wikimedia 
Chapters, a representative list of which can be found at: https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters\;>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters
 ('WM Chapters'), and official thematic organizations, a representative list of 
which can be found at: https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations\;>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations
 ('WM Thematic Orgs'); for the purposes of evaluating my Application.",
"form-rights3":"(b) Any Data that I submit as a part of or in relation 
to my Application may be collected, stored, used, modified, communicated, 
archived, destroyed, or otherwise processed (collectively 'Processed' or 
'Processing') by: (i) WMF; (ii) members of the Scholarship Committee; and if 
you indicated that you want to be considered for a WM Chapter or WM Thematic 
Org scholarship, (iii) WM Chapters and WM Thematic Orgs. My Data may be 
retained by WMF until I request in writing to WMF that my Data be destroyed or 
for as long as required by applicable law.",
"form-rights4":"(c) My Data may be transmitted to or from: (i) WMF in 
the United States; (ii) members of the Scholarship Committee in the country 
which they reside; and if you indicated that you want to be considered for a WM 
Chapter or WM Thematic Org scholarship, (iii) WM Chapters and/or WM Thematic 
Orgs in the country which the organizations are based.",
"form-wmfagree": "I agree to the statement of 'Applicant Rights & 
Consent to Data Processing and Transfer'.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e44261ce0f667352648b68594a285461a553f74
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Fix typo in message form-rights2

2016-12-26 Thread BryanDavis (Code Review)

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

Change subject: Fix typo in message form-rights2
..

Fix typo in message form-rights2

Another typo spotted by Wargo during translations.

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


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

diff --git a/data/i18n/en.json b/data/i18n/en.json
index a7f429a..6c84992 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -155,7 +155,7 @@
 
"form-rights-heading": "Applicant Rights & Consent to Data Processing 
and Transfer",
"form-rights1": "I as an applicant for a Wikimedia Foundation ('WMF') 
scholarship relating to my participation in the 2017 Wikimania conference 
hosted in Montréal, Quebec (Canada), hereby acknowledge and affirmatively 
consent to the following as a prerequisite to the consideration of my 2017 
Wikimania scholarship application ('Application'):",
-   "form-rights2":"(a) Any personal data or sensitive personal data that I 
submit as part of or in relation to my Application (collectively 'my Data') may 
be accessed and reviewed by: (i) WMF; (ii) members of a scholarship committee 
made up of Wikimedia movement members, a representative list of which can be 
found at: https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\;>https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee
 ('Scholarship Committee'); and if you indicated that you want to be considered 
for a WM Chapter or WM Thematic Org scholarship, (iii) official Wikimedia 
Chapters, a representative list of which can be found at: https://meta.wikimedia.org/wiki/Special::MyLanguage/Wikimedia_chapters\;>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters
 ('WM Chapters'), and official thematic organizations, a representative list of 
which can be found at: https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations\;>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations
 ('WM Thematic Orgs'); for the purposes of evaluating my Application.",
+   "form-rights2":"(a) Any personal data or sensitive personal data that I 
submit as part of or in relation to my Application (collectively 'my Data') may 
be accessed and reviewed by: (i) WMF; (ii) members of a scholarship committee 
made up of Wikimedia movement members, a representative list of which can be 
found at: https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\;>https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee
 ('Scholarship Committee'); and if you indicated that you want to be considered 
for a WM Chapter or WM Thematic Org scholarship, (iii) official Wikimedia 
Chapters, a representative list of which can be found at: https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters\;>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters
 ('WM Chapters'), and official thematic organizations, a representative list of 
which can be found at: https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations\;>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations
 ('WM Thematic Orgs'); for the purposes of evaluating my Application.",
"form-rights3":"(b) Any Data that I submit as a part of or in relation 
to my Application may be collected, stored, used, modified, communicated, 
archived, destroyed, or otherwise processed (collectively 'Processed' or 
'Processing') by: (i) WMF; (ii) members of the Scholarship Committee; and if 
you indicated that you want to be considered for a WM Chapter or WM Thematic 
Org scholarship, (iii) WM Chapters and WM Thematic Orgs. My Data may be 
retained by WMF until I request in writing to WMF that my Data be destroyed or 
for as long as required by applicable law.",
"form-rights4":"(c) My Data may be transmitted to or from: (i) WMF in 
the United States; (ii) members of the Scholarship Committee in the country 
which they reside; and if you indicated that you want to be considered for a WM 
Chapter or WM Thematic Org scholarship, (iii) WM Chapters and/or WM Thematic 
Orgs in the country which the organizations are based.",
"form-wmfagree": "I agree to the statement of 'Applicant Rights & 
Consent to Data Processing and Transfer'.",

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

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

___

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikilabels: install nodejs package

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: wikilabels: install nodejs package
..

wikilabels: install nodejs package

Bug: T154122
Change-Id: Id6aa7cdd499a79d2c20f59659d40c4b7c8d6cfb7
---
M modules/wikilabels/manifests/web.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/329316/1

diff --git a/modules/wikilabels/manifests/web.pp 
b/modules/wikilabels/manifests/web.pp
index 34adbad..6abc4f7 100644
--- a/modules/wikilabels/manifests/web.pp
+++ b/modules/wikilabels/manifests/web.pp
@@ -12,7 +12,7 @@
 # this to deb packages in the future if needed.
 # FIXME: Use debian packages for all the packages needing compilation
 ensure_packages(['virtualenv', 'python3-dev', 'libffi-dev',
-'libpq-dev', 'g++', 'libmemcached-dev'])
+'libpq-dev', 'g++', 'libmemcached-dev', 'nodejs'])
 
 file { '/srv':
 ensure => directory,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update wheels

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Update wheels
..


Update wheels

Bug: T154168
Change-Id: Iafc266b55b29783d23e15a568e10059d7edf61b6
---
M submodules/wheels
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/submodules/wheels b/submodules/wheels
index 624d777..5230e7d 16
--- a/submodules/wheels
+++ b/submodules/wheels
@@ -1 +1 @@
-Subproject commit 624d777664fcb51d9f06baa193978d54e3df8a10
+Subproject commit 5230e7dcba60aeda8962f423c0db9003446a57fa

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafc266b55b29783d23e15a568e10059d7edf61b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update wheels

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Update wheels
..

Update wheels

Bug: T154168
Change-Id: Iafc266b55b29783d23e15a568e10059d7edf61b6
---
M submodules/wheels
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy 
refs/changes/15/329315/1

diff --git a/submodules/wheels b/submodules/wheels
index 624d777..5230e7d 16
--- a/submodules/wheels
+++ b/submodules/wheels
@@ -1 +1 @@
-Subproject commit 624d777664fcb51d9f06baa193978d54e3df8a10
+Subproject commit 5230e7dcba60aeda8962f423c0db9003446a57fa

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafc266b55b29783d23e15a568e10059d7edf61b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Revert "Bumps revscoring to 1.3.1"

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Revert "Bumps revscoring to 1.3.1"
..


Revert "Bumps revscoring to 1.3.1"

This reverts commit a493c49f03158b5fd3d2c08631de9f016a13cd5f.

Change-Id: Ib1a6e72a01086d61da6f6b009a1c2025bbfdb426
---
R revscoring-1.2.8-py2.py3-none-any.whl
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/revscoring-1.3.1-py2.py3-none-any.whl 
b/revscoring-1.2.8-py2.py3-none-any.whl
similarity index 66%
rename from revscoring-1.3.1-py2.py3-none-any.whl
rename to revscoring-1.2.8-py2.py3-none-any.whl
index 0382c6d..6ef196b 100644
--- a/revscoring-1.3.1-py2.py3-none-any.whl
+++ b/revscoring-1.2.8-py2.py3-none-any.whl
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1a6e72a01086d61da6f6b009a1c2025bbfdb426
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Revert "Bumps pyenchant to 1.6.8"

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Revert "Bumps pyenchant to 1.6.8"
..


Revert "Bumps pyenchant to 1.6.8"

This reverts commit eee9de3bc246988175a38efe118a6887a9e94051.

Change-Id: I51ec6064dd2ef5172b3d96f32ff51023d2c7d73a
---
A pyenchant-1.6.6-py2.py3-none-any.whl
D pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/pyenchant-1.6.6-py2.py3-none-any.whl 
b/pyenchant-1.6.6-py2.py3-none-any.whl
new file mode 100644
index 000..de27cad
--- /dev/null
+++ b/pyenchant-1.6.6-py2.py3-none-any.whl
Binary files differ
diff --git 
a/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl 
b/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
deleted file mode 100644
index 5cd2f7e..000
--- a/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51ec6064dd2ef5172b3d96f32ff51023d2c7d73a
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Revert "Bumps revscoring to 1.3.1"

2016-12-26 Thread Ladsgroup (Code Review)

Hello Halfak,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Bumps revscoring to 1.3.1"
..

Revert "Bumps revscoring to 1.3.1"

This reverts commit a493c49f03158b5fd3d2c08631de9f016a13cd5f.

Change-Id: Ib1a6e72a01086d61da6f6b009a1c2025bbfdb426
---
R revscoring-1.2.8-py2.py3-none-any.whl
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/14/329314/1

diff --git a/revscoring-1.3.1-py2.py3-none-any.whl 
b/revscoring-1.2.8-py2.py3-none-any.whl
similarity index 66%
rename from revscoring-1.3.1-py2.py3-none-any.whl
rename to revscoring-1.2.8-py2.py3-none-any.whl
index 0382c6d..6ef196b 100644
--- a/revscoring-1.3.1-py2.py3-none-any.whl
+++ b/revscoring-1.2.8-py2.py3-none-any.whl
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1a6e72a01086d61da6f6b009a1c2025bbfdb426
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Revert "Bumps pyenchant to 1.6.8"

2016-12-26 Thread Ladsgroup (Code Review)

Hello Halfak,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Bumps pyenchant to 1.6.8"
..

Revert "Bumps pyenchant to 1.6.8"

This reverts commit eee9de3bc246988175a38efe118a6887a9e94051.

Change-Id: I51ec6064dd2ef5172b3d96f32ff51023d2c7d73a
---
A pyenchant-1.6.6-py2.py3-none-any.whl
D pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/13/329313/1

diff --git a/pyenchant-1.6.6-py2.py3-none-any.whl 
b/pyenchant-1.6.6-py2.py3-none-any.whl
new file mode 100644
index 000..de27cad
--- /dev/null
+++ b/pyenchant-1.6.6-py2.py3-none-any.whl
Binary files differ
diff --git 
a/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl 
b/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
deleted file mode 100644
index 5cd2f7e..000
--- a/pyenchant-1.6.8-py2.py3.cp27.cp32.cp33.cp34.cp35.pp27.pp33-none-any.whl
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51ec6064dd2ef5172b3d96f32ff51023d2c7d73a
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Halfak 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Change pywikibase wheel to 0.0.3 and use a newer version

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Change pywikibase wheel to 0.0.3 and use a newer version
..


Change pywikibase wheel to 0.0.3 and use a newer version

Bug: T154168
Change-Id: I4d896ed0c033e7a3d2e88d6afddecdf92fac2f65
---
A pywikibase-0.0.3-py3-none-any.whl
D pywikibase-0.0.4-py3-none-any.whl
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/pywikibase-0.0.3-py3-none-any.whl 
b/pywikibase-0.0.3-py3-none-any.whl
new file mode 100644
index 000..5e6e4e6
--- /dev/null
+++ b/pywikibase-0.0.3-py3-none-any.whl
Binary files differ
diff --git a/pywikibase-0.0.4-py3-none-any.whl 
b/pywikibase-0.0.4-py3-none-any.whl
deleted file mode 100644
index 17a4508..000
--- a/pywikibase-0.0.4-py3-none-any.whl
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d896ed0c033e7a3d2e88d6afddecdf92fac2f65
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] research...wheels[master]: Change pywikibase wheel to 0.0.3 and use a newer version

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Change pywikibase wheel to 0.0.3 and use a newer version
..

Change pywikibase wheel to 0.0.3 and use a newer version

Bug: T154168
Change-Id: I4d896ed0c033e7a3d2e88d6afddecdf92fac2f65
---
A pywikibase-0.0.3-py3-none-any.whl
D pywikibase-0.0.4-py3-none-any.whl
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/12/329312/1

diff --git a/pywikibase-0.0.3-py3-none-any.whl 
b/pywikibase-0.0.3-py3-none-any.whl
new file mode 100644
index 000..5e6e4e6
--- /dev/null
+++ b/pywikibase-0.0.3-py3-none-any.whl
Binary files differ
diff --git a/pywikibase-0.0.4-py3-none-any.whl 
b/pywikibase-0.0.4-py3-none-any.whl
deleted file mode 100644
index 17a4508..000
--- a/pywikibase-0.0.4-py3-none-any.whl
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d896ed0c033e7a3d2e88d6afddecdf92fac2f65
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] pywikibot/wikibase[master]: Update quantity with the recent changes in Wikibase

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Update quantity with the recent changes in Wikibase
..


Update quantity with the recent changes in Wikibase

Bug: T154168
Change-Id: Ib86fc1a641bdf8d21a8a44d6daebe76e6ddf117f
---
M pywikibase/wbquantity.py
1 file changed, 83 insertions(+), 32 deletions(-)

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



diff --git a/pywikibase/wbquantity.py b/pywikibase/wbquantity.py
index cad89b0..2a40a24 100644
--- a/pywikibase/wbquantity.py
+++ b/pywikibase/wbquantity.py
@@ -9,6 +9,7 @@
 # Distributed under the terms of the MIT license.
 #
 from __future__ import unicode_literals
+from decimal import Decimal
 
 import json
 
@@ -17,39 +18,88 @@
 
 """A Wikibase quantity representation."""
 
+_items = ('amount', 'upperBound', 'lowerBound', 'unit')
+
+@staticmethod
+def _todecimal(value):
+"""
+Convert a string to a Decimal for use in WbQuantity.
+
+None value is returned as is.
+
+@param value: decimal number to convert
+@type value: str
+@rtype: Decimal
+"""
+if isinstance(value, Decimal):
+return value
+elif value is None:
+return None
+return Decimal(str(value))
+
+@staticmethod
+def _fromdecimal(value):
+"""
+Convert a Decimal to a string representation suitable for WikiBase.
+
+None value is returned as is.
+
+@param value: decimal number to convert
+@type value: Decimal
+@rtype: str
+"""
+if value is None:
+return None
+return format(value, "+g")
+
 def __init__(self, amount, unit=None, error=None):
 u"""
 Create a new WbQuantity object.
 
 @param amount: number representing this quantity
-@type amount: float
+@type amount: string or Decimal. Other types are accepted, and 
converted
+  via str to Decimal.
 @param unit: not used (only unit-less quantities are supported)
 @param error: the uncertainty of the amount (e.g. ±1)
-@type error: float, or tuple of two floats, where the first value is
- the upper error and the second is the lower error value.
+@type error: same as amount, or tuple of two values, where the
+ first value is the upper error and the second
+ is the lower error value.
 """
 if amount is None:
-raise ValueError('No amount given')
+raise ValueError('no amount given')
 if unit is None:
 unit = '1'
-self.amount = amount
+
+self.amount = self._todecimal(amount)
 self.unit = unit
-upperError = lowerError = 0
-if isinstance(error, tuple):
-upperError, lowerError = error
-elif error is not None:
-upperError = lowerError = error
-self.upperBound = self.amount + upperError
-self.lowerBound = self.amount - lowerError
+
+if error is None:
+self.upperBound = self.lowerBound = None
+else:
+if error is None:
+self.upperBound = self.lowerBound = Decimal(0)
+elif isinstance(error, tuple):
+upperError = self._todecimal(error[0])
+lowerError = self._todecimal(error[1])
+else:
+upperError = lowerError = self._todecimal(error)
+
+self.upperBound = self.amount + upperError
+self.lowerBound = self.amount - lowerError
 
 def toWikibase(self):
-"""Convert the data to a JSON object for the Wikibase API."""
-data = {'amount': self._normalize_value(self.amount),
-'upperBound': self._normalize_value(self.upperBound),
-'lowerBound': self._normalize_value(self.lowerBound),
-'unit': str(self.unit)
+"""
+Convert the data to a JSON object for the Wikibase API.
+
+@return: Wikibase JSON
+@rtype: dict
+"""
+json = {'amount': self._fromdecimal(self.amount),
+'upperBound': self._fromdecimal(self.upperBound),
+'lowerBound': self._fromdecimal(self.lowerBound),
+'unit': self.unit
 }
-return data
+return json
 
 @classmethod
 def fromWikibase(cls, wb):
@@ -57,26 +107,27 @@
 Create a WbQuanity from the JSON data given by the Wikibase API.
 
 @param wb: Wikibase JSON
+@type wb: dict
+@rtype: pywikibot.WbQuanity
 """
-amount = eval(wb['amount'])
-upperBound = eval(wb['upperBound'])
-lowerBound = eval(wb['lowerBound'])
-error = (upperBound - amount, amount - lowerBound)
+amount =

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Fix the height of the upload container and it's child element

2016-12-26 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329309 )

Change subject: Fix the height of the upload container and it's child element
..


Fix the height of the upload container and it's child element

The problem was that the #real-form had a fixed height, along with it's
direct descendant, .image-uploadFrame. Instead, we want to say that the
height will be auto-calculated by the browser, which looks like 
height: auto;.

Bug: T153721
Change-Id: I1bfe1ad7148023c80541777034ca664fa25303a4
---
M SpecialFanBoxes.css
1 file changed, 2 insertions(+), 6 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/SpecialFanBoxes.css b/SpecialFanBoxes.css
index b152fe7..d1c321c 100644
--- a/SpecialFanBoxes.css
+++ b/SpecialFanBoxes.css
@@ -66,7 +66,7 @@
 
 #real-form {
display: block;
-   height: 70px;
+   height: auto;
 }
 
 #countdownbox {
@@ -108,10 +108,6 @@
float: left;
 }
 
-.imageUpload-frame {
-   height: 90px;
-}
-
 .categorytext {
width: 700px;
 }
@@ -125,4 +121,4 @@
 #create-tagcloud span a {
cursor: pointer;
text-decoration: underline;
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bfe1ad7148023c80541777034ca664fa25303a4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] pywikibot/wikibase[master]: Make jenkins happy

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Make jenkins happy
..


Make jenkins happy

Change-Id: I0379c9f414f96be155d48ddadf095f5df8112384
---
M tests/test_claim.py
M tests/test_coordinate.py
M tests/test_itempage.py
M tests/test_propertypage.py
M tests/test_wbtime.py
5 files changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/tests/test_claim.py b/tests/test_claim.py
index c953ae6..5a64517 100644
--- a/tests/test_claim.py
+++ b/tests/test_claim.py
@@ -99,5 +99,6 @@
 self.assertEqual(claim.getRank(), 'preferred')
 self.assertEqual(claim.rank, 'preferred')
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/tests/test_coordinate.py b/tests/test_coordinate.py
index 70aef8a..45fff4b 100644
--- a/tests/test_coordinate.py
+++ b/tests/test_coordinate.py
@@ -39,5 +39,6 @@
 self.assertEqual(
 self.coordinate.entity, 'http://www.wikidata.org/entity/Q2')
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/tests/test_itempage.py b/tests/test_itempage.py
index 7f5a261..bc44b0e 100644
--- a/tests/test_itempage.py
+++ b/tests/test_itempage.py
@@ -51,5 +51,6 @@
 self.assertIn('enwiki', self.item_page.badges)
 self.assertNotIn('fawiki', self.item_page.badges)
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/tests/test_propertypage.py b/tests/test_propertypage.py
index 4a10420..c93d499 100644
--- a/tests/test_propertypage.py
+++ b/tests/test_propertypage.py
@@ -22,5 +22,6 @@
 self.assertIsInstance(claim, Claim)
 self.assertEqual(claim.id, self.property_page.getID())
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/tests/test_wbtime.py b/tests/test_wbtime.py
index dd6d5b2..ab126fa 100644
--- a/tests/test_wbtime.py
+++ b/tests/test_wbtime.py
@@ -49,5 +49,6 @@
 # Consistency
 self.assertEqual(WbTime.fromTimestr(t.toTimestr()), t)
 
+
 if __name__ == '__main__':
 unittest.main()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0379c9f414f96be155d48ddadf095f5df8112384
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/wikibase[master]: Make jenkins happy

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Make jenkins happy
..

Make jenkins happy

Change-Id: I0379c9f414f96be155d48ddadf095f5df8112384
---
M tests/test_claim.py
M tests/test_coordinate.py
M tests/test_itempage.py
M tests/test_propertypage.py
M tests/test_wbtime.py
5 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/11/329311/1

diff --git a/tests/test_claim.py b/tests/test_claim.py
index c953ae6..5a64517 100644
--- a/tests/test_claim.py
+++ b/tests/test_claim.py
@@ -99,5 +99,6 @@
 self.assertEqual(claim.getRank(), 'preferred')
 self.assertEqual(claim.rank, 'preferred')
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/tests/test_coordinate.py b/tests/test_coordinate.py
index 70aef8a..45fff4b 100644
--- a/tests/test_coordinate.py
+++ b/tests/test_coordinate.py
@@ -39,5 +39,6 @@
 self.assertEqual(
 self.coordinate.entity, 'http://www.wikidata.org/entity/Q2')
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/tests/test_itempage.py b/tests/test_itempage.py
index 7f5a261..bc44b0e 100644
--- a/tests/test_itempage.py
+++ b/tests/test_itempage.py
@@ -51,5 +51,6 @@
 self.assertIn('enwiki', self.item_page.badges)
 self.assertNotIn('fawiki', self.item_page.badges)
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/tests/test_propertypage.py b/tests/test_propertypage.py
index 4a10420..c93d499 100644
--- a/tests/test_propertypage.py
+++ b/tests/test_propertypage.py
@@ -22,5 +22,6 @@
 self.assertIsInstance(claim, Claim)
 self.assertEqual(claim.id, self.property_page.getID())
 
+
 if __name__ == '__main__':
 unittest.main()
diff --git a/tests/test_wbtime.py b/tests/test_wbtime.py
index dd6d5b2..ab126fa 100644
--- a/tests/test_wbtime.py
+++ b/tests/test_wbtime.py
@@ -49,5 +49,6 @@
 # Consistency
 self.assertEqual(WbTime.fromTimestr(t.toTimestr()), t)
 
+
 if __name__ == '__main__':
 unittest.main()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0379c9f414f96be155d48ddadf095f5df8112384
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] pywikibot/wikibase[master]: Update quantity with the recent changes in Wikibase

2016-12-26 Thread Ladsgroup (Code Review)

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

Change subject: Update quantity with the recent changes in Wikibase
..

Update quantity with the recent changes in Wikibase

Bug: T154168
Change-Id: Ib86fc1a641bdf8d21a8a44d6daebe76e6ddf117f
---
M pywikibase/wbquantity.py
1 file changed, 83 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/10/329310/1

diff --git a/pywikibase/wbquantity.py b/pywikibase/wbquantity.py
index cad89b0..2a40a24 100644
--- a/pywikibase/wbquantity.py
+++ b/pywikibase/wbquantity.py
@@ -9,6 +9,7 @@
 # Distributed under the terms of the MIT license.
 #
 from __future__ import unicode_literals
+from decimal import Decimal
 
 import json
 
@@ -17,39 +18,88 @@
 
 """A Wikibase quantity representation."""
 
+_items = ('amount', 'upperBound', 'lowerBound', 'unit')
+
+@staticmethod
+def _todecimal(value):
+"""
+Convert a string to a Decimal for use in WbQuantity.
+
+None value is returned as is.
+
+@param value: decimal number to convert
+@type value: str
+@rtype: Decimal
+"""
+if isinstance(value, Decimal):
+return value
+elif value is None:
+return None
+return Decimal(str(value))
+
+@staticmethod
+def _fromdecimal(value):
+"""
+Convert a Decimal to a string representation suitable for WikiBase.
+
+None value is returned as is.
+
+@param value: decimal number to convert
+@type value: Decimal
+@rtype: str
+"""
+if value is None:
+return None
+return format(value, "+g")
+
 def __init__(self, amount, unit=None, error=None):
 u"""
 Create a new WbQuantity object.
 
 @param amount: number representing this quantity
-@type amount: float
+@type amount: string or Decimal. Other types are accepted, and 
converted
+  via str to Decimal.
 @param unit: not used (only unit-less quantities are supported)
 @param error: the uncertainty of the amount (e.g. ±1)
-@type error: float, or tuple of two floats, where the first value is
- the upper error and the second is the lower error value.
+@type error: same as amount, or tuple of two values, where the
+ first value is the upper error and the second
+ is the lower error value.
 """
 if amount is None:
-raise ValueError('No amount given')
+raise ValueError('no amount given')
 if unit is None:
 unit = '1'
-self.amount = amount
+
+self.amount = self._todecimal(amount)
 self.unit = unit
-upperError = lowerError = 0
-if isinstance(error, tuple):
-upperError, lowerError = error
-elif error is not None:
-upperError = lowerError = error
-self.upperBound = self.amount + upperError
-self.lowerBound = self.amount - lowerError
+
+if error is None:
+self.upperBound = self.lowerBound = None
+else:
+if error is None:
+self.upperBound = self.lowerBound = Decimal(0)
+elif isinstance(error, tuple):
+upperError = self._todecimal(error[0])
+lowerError = self._todecimal(error[1])
+else:
+upperError = lowerError = self._todecimal(error)
+
+self.upperBound = self.amount + upperError
+self.lowerBound = self.amount - lowerError
 
 def toWikibase(self):
-"""Convert the data to a JSON object for the Wikibase API."""
-data = {'amount': self._normalize_value(self.amount),
-'upperBound': self._normalize_value(self.upperBound),
-'lowerBound': self._normalize_value(self.lowerBound),
-'unit': str(self.unit)
+"""
+Convert the data to a JSON object for the Wikibase API.
+
+@return: Wikibase JSON
+@rtype: dict
+"""
+json = {'amount': self._fromdecimal(self.amount),
+'upperBound': self._fromdecimal(self.upperBound),
+'lowerBound': self._fromdecimal(self.lowerBound),
+'unit': self.unit
 }
-return data
+return json
 
 @classmethod
 def fromWikibase(cls, wb):
@@ -57,26 +107,27 @@
 Create a WbQuanity from the JSON data given by the Wikibase API.
 
 @param wb: Wikibase JSON
+@type wb: dict
+@rtype: pywikibot.WbQuanity
 """
-amount = eval(wb['amount'])
-upperBound = eval(wb['upperBound'])
-lowerBound = eval(wb['lowerBound'])
-error = (upperBound - amount, amount - lowerBound)
+amount =

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Fix the height of the upload container and it's child element

2016-12-26 Thread SamanthaNguyen (Code Review)

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

Change subject: Fix the height of the upload container and it's child element
..

Fix the height of the upload container and it's child element

Bug: T153721
Change-Id: I1bfe1ad7148023c80541777034ca664fa25303a4
---
M SpecialFanBoxes.css
1 file changed, 2 insertions(+), 6 deletions(-)


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

diff --git a/SpecialFanBoxes.css b/SpecialFanBoxes.css
index b152fe7..d1c321c 100644
--- a/SpecialFanBoxes.css
+++ b/SpecialFanBoxes.css
@@ -66,7 +66,7 @@
 
 #real-form {
display: block;
-   height: 70px;
+   height: auto;
 }
 
 #countdownbox {
@@ -108,10 +108,6 @@
float: left;
 }
 
-.imageUpload-frame {
-   height: 90px;
-}
-
 .categorytext {
width: 700px;
 }
@@ -125,4 +121,4 @@
 #create-tagcloud span a {
cursor: pointer;
text-decoration: underline;
-}
\ No newline at end of file
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Fix an E_NOTICE and an E_WARNING that were showing up on a b...

2016-12-26 Thread Jack Phoenix (Code Review)

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

Change subject: Fix an E_NOTICE and an E_WARNING that were showing up on a 
brand new wiki w/o any categories
..

Fix an E_NOTICE and an E_WARNING that were showing up on a brand new wiki w/o 
any categories

Change-Id: I20129912c4c40ff1c18b6df87cd29705b2e2d31b
---
M SpecialFanBoxes.php
M TagCloudClass.php
2 files changed, 13 insertions(+), 10 deletions(-)


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

diff --git a/SpecialFanBoxes.php b/SpecialFanBoxes.php
index 4b329ef..8f3c9fc 100644
--- a/SpecialFanBoxes.php
+++ b/SpecialFanBoxes.php
@@ -404,18 +404,20 @@
$tagcloud = '';
$tagnumber = 0;
$tabcounter = 1;
-   foreach ( $cloud->tags as $tag => $att ) {
-   $tag = str_replace( 'Fans', '', $tag );
-   $tag = trim( $tag );
-   $slashedTag = $tag; // define variable
-   // Fix for categories that contain an apostrophe
-   if ( strpos( $tag, "'" ) ) {
-   $slashedTag = str_replace( "'", "\'", $tag );
-   }
-   $tagcloud .= " tags[$tag]['size']}{$cloud->tags_size_type}\">
+   if ( isset( $cloud->tags ) && $cloud->tags ) {
+   foreach ( $cloud->tags as $tag => $att ) {
+   $tag = str_replace( 'Fans', '', $tag );
+   $tag = trim( $tag );
+   $slashedTag = $tag; // define variable
+   // Fix for categories that contain an apostrophe
+   if ( strpos( $tag, "'" ) ) {
+   $slashedTag = str_replace( "'", "\'", 
$tag );
+   }
+   $tagcloud .= " tags[$tag]['size']}{$cloud->tags_size_type}\">
{$tag}
\n";
-   $tagnumber++;
+   $tagnumber++;
+   }
}
 
$tagcloud .= '';
diff --git a/TagCloudClass.php b/TagCloudClass.php
index e9a3cb2..dd7b8ee 100644
--- a/TagCloudClass.php
+++ b/TagCloudClass.php
@@ -8,6 +8,7 @@
public $tags_max_pts = 32;
public $tags_highest_count = 0;
public $tags_size_type = 'pt';
+   public $tags = array();
 
public function __construct( $limit = 10 ) {
$this->limit = $limit;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Newsletter.hook.php cleanup

2016-12-26 Thread Filip (Code Review)

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

Change subject: Newsletter.hook.php cleanup
..

Newsletter.hook.php cleanup

Bug: T154136
Change-Id: Iede3a2ea76869f65a43ef2ba3b23fd79010a587a
---
M Newsletter.hooks.php
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 3c74ba5..c31f81a 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -237,8 +237,9 @@
return true;
}
}
-   // Show error message and allow resubmitting in case of failure
-   return Status::newFatal( 'newsletter-restore-failure', 
$newsletterName );
+   // Throw error message
+   throw new ErrorPageError( 
'newsletter-restore-failure','newsletter-restore-failure' );
+   return true;
}
 
/**
@@ -253,7 +254,7 @@
if ( $newsletter ) {

NewsletterStore::getDefaultInstance()->updateName( $newsletter->getId(), 
$newtitle->getText() );
} else {
-   throw new MWException( 'Cannot find 
newsletter with name \"' + $title->getText() + '\"' );
+   throw new MWException( 'Cannot find 
newsletter with name \"' . $title->getText() . '\"' );
}
}
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iede3a2ea76869f65a43ef2ba3b23fd79010a587a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Filip 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Remove stat1001 from site.pp"

2016-12-26 Thread Ottomata (Code Review)

Hello jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Remove stat1001 from site.pp"
..

Revert "Remove stat1001 from site.pp"

Hm, I read the server lifecycle instructions incorrectly.  This should remain 
as is for DC ops.

This reverts commit f46a83b1876cd0a9fb0472ddbf62279476aa95c6.

Change-Id: I91c0f00dac8e35d5c0f97ece5f6b93f05648ad0d
---
M manifests/site.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/329248/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 26ba3ed..a99a4cc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2639,6 +2639,12 @@
 }
 }
 
+
+# stat1001 is being replaced by thorium: T149438
+node 'stat1001.eqiad.wmnet' {
+role(spare::system)
+}
+
 node 'thorium.eqiad.wmnet' {
 # thorium is mainly used to host Analytics websites like:
 # - https://stats.wikimedia.org (Wikistats)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91c0f00dac8e35d5c0f97ece5f6b93f05648ad0d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Remove stat1001 from site.pp"

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Revert "Remove stat1001 from site.pp"
..


Revert "Remove stat1001 from site.pp"

Hm, I read the server lifecycle instructions incorrectly.  This should remain 
as is for DC ops.

This reverts commit f46a83b1876cd0a9fb0472ddbf62279476aa95c6.

Change-Id: I91c0f00dac8e35d5c0f97ece5f6b93f05648ad0d
---
M manifests/site.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 26ba3ed..a99a4cc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2639,6 +2639,12 @@
 }
 }
 
+
+# stat1001 is being replaced by thorium: T149438
+node 'stat1001.eqiad.wmnet' {
+role(spare::system)
+}
+
 node 'thorium.eqiad.wmnet' {
 # thorium is mainly used to host Analytics websites like:
 # - https://stats.wikimedia.org (Wikistats)

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove stat1001 from site.pp

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Remove stat1001 from site.pp
..


Remove stat1001 from site.pp

Bug: T149438
Change-Id: I907e3befbdf411f8a23874c774e5b7db2ea51fa2
---
M manifests/site.pp
1 file changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a99a4cc..26ba3ed 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2639,12 +2639,6 @@
 }
 }
 
-
-# stat1001 is being replaced by thorium: T149438
-node 'stat1001.eqiad.wmnet' {
-role(spare::system)
-}
-
 node 'thorium.eqiad.wmnet' {
 # thorium is mainly used to host Analytics websites like:
 # - https://stats.wikimedia.org (Wikistats)

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove stat1001 from site.pp

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Remove stat1001 from site.pp
..

Remove stat1001 from site.pp

Bug: T149438
Change-Id: I907e3befbdf411f8a23874c774e5b7db2ea51fa2
---
M manifests/site.pp
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/329247/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a99a4cc..26ba3ed 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2639,12 +2639,6 @@
 }
 }
 
-
-# stat1001 is being replaced by thorium: T149438
-node 'stat1001.eqiad.wmnet' {
-role(spare::system)
-}
-
 node 'thorium.eqiad.wmnet' {
 # thorium is mainly used to host Analytics websites like:
 # - https://stats.wikimedia.org (Wikistats)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I907e3befbdf411f8a23874c774e5b7db2ea51fa2
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] operations/puppet[production]: stat1001 is now a spare and can be reclaimed

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: stat1001 is now a spare and can be reclaimed
..


stat1001 is now a spare and can be reclaimed

Bug: T149438
Change-Id: I0bab2996e32f80dfd637bfc9a96e1c55b052c344
---
M manifests/site.pp
1 file changed, 1 insertion(+), 16 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index cdfddde..a99a4cc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2642,22 +2642,7 @@
 
 # stat1001 is being replaced by thorium: T149438
 node 'stat1001.eqiad.wmnet' {
-# stat1001 is mainly used to host Analytics websites like:
-# - https://stats.wikimedia.org (Wikistats)
-# - https://datasets.wikimedia.org
-# - https://metrics.wikimedia.org
-#   or https://metrics.wmflabs.org/ (Wikimetrics)
-# - https://pivot.wikimedia.org (Imply's Pivot UI for Druid data)
-#
-# For a complete and up to date list please check the
-# related role/module.
-#
-# This node is not intended for data processing.
-role(statistics::web,
-analytics_cluster::druid::pivot)
-
-include standard
-include base::firewall
+role(spare::system)
 }
 
 node 'thorium.eqiad.wmnet' {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: stat1001 is now a spare and can be reclaimed

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: stat1001 is now a spare and can be reclaimed
..

stat1001 is now a spare and can be reclaimed

Bug: T149438
Change-Id: I0bab2996e32f80dfd637bfc9a96e1c55b052c344
---
M manifests/site.pp
1 file changed, 1 insertion(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/329243/1

diff --git a/manifests/site.pp b/manifests/site.pp
index cdfddde..a99a4cc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2642,22 +2642,7 @@
 
 # stat1001 is being replaced by thorium: T149438
 node 'stat1001.eqiad.wmnet' {
-# stat1001 is mainly used to host Analytics websites like:
-# - https://stats.wikimedia.org (Wikistats)
-# - https://datasets.wikimedia.org
-# - https://metrics.wikimedia.org
-#   or https://metrics.wmflabs.org/ (Wikimetrics)
-# - https://pivot.wikimedia.org (Imply's Pivot UI for Druid data)
-#
-# For a complete and up to date list please check the
-# related role/module.
-#
-# This node is not intended for data processing.
-role(statistics::web,
-analytics_cluster::druid::pivot)
-
-include standard
-include base::firewall
+role(spare::system)
 }
 
 node 'thorium.eqiad.wmnet' {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bab2996e32f80dfd637bfc9a96e1c55b052c344
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] mediawiki...AkismetKlik[master]: Converted AkismetKlik extension to new registration system

2016-12-26 Thread Georggi199 (Code Review)

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

Change subject: Converted AkismetKlik extension to new registration system
..

Converted AkismetKlik extension to new registration system

Bug: T154107
Change-Id: If41f6f1a4d72253d33fa05e94825421df5c8
---
M AkismetKlik.php
A extension.json
2 files changed, 34 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AkismetKlik 
refs/changes/42/329242/1

diff --git a/AkismetKlik.php b/AkismetKlik.php
index e0fa3bd..c1fffb4 100644
--- a/AkismetKlik.php
+++ b/AkismetKlik.php
@@ -28,32 +28,12 @@
 $wgHooks['EditFilterMergedContent'][] = 'wfAkismetFilterMergedContent';
 
 /**
- * Get an instance of AkismetKlik and do some first-call initialisation.
- * All actual functionality is implemented in that object
- * @return AkismetKlik
- */
-function wfAkismetKlikObject() {
-   global $wgSpamBlacklistSettings, $wgPreSpamFilterCallback;
-   static $spamObj;
-   if ( !$spamObj ) {
-   $spamObj = new AkismetKlik( $wgSpamBlacklistSettings );
-   $spamObj->previousFilter = $wgPreSpamFilterCallback;
-   }
-
-   return $spamObj;
-}
-
-/**
  * Hook function for EditFilterMergedContent, replaces wfAkismetFilter
  * @param $context IContextSource
  * @param $content Content
- * @param $status Status
- * @param $summary string
- * @param $user User
- * @param $minoredit bool
  * @return bool
  */
-function wfAkismetFilterMergedContent( $context, $content, $status, $summary, 
$user, $minoredit ) {
+function wfAkismetFilterMergedContent( $context, $content ) {
$spamObj = new AkismetKlik();
$ret = $spamObj->filter( $context->getTitle(), $content, '', 
$context->getWikiPage() );
 
@@ -79,7 +59,7 @@
 * @param Title $title
 * @param Content $content Content of section
 * @param string $section Section number or name
-* @param WikiPage $editPage WikiPage passed from 
EditFilterMergedContent
+* @param WikiPage $wikiPage WikiPage passed from 
EditFilterMergedContent
 * @throws MWException
 * @return bool True if the edit should not be allowed, false otherwise
 * If the return value is true, an error will have been sent to $wgOut
@@ -100,7 +80,6 @@
$text = ContentHandler::getContentText( $content );
$editInfo = $wikiPage->prepareContentForEdit( $content );
$out = $editInfo->output;
-   $pgtitle = $title;
$links = implode( "\n", array_keys( $out->getExternalLinks() ) 
);
 
# Do the match
@@ -115,10 +94,10 @@
$akismet->setCommentAuthorURL( $links );
$akismet->setCommentContent( $text );
$akismet->setCommentType( 'wiki' );
-   $akismet->setPermalink( $wgAKSiteUrl . '/wiki/' . $pgtitle );
+   $akismet->setPermalink( $wgAKSiteUrl . '/wiki/' . $title );
if ( $akismet->isCommentSpam() && !$wgUser->isAllowed( 
'bypassakismet' ) ) {
wfDebugLog( 'AkismetKlik', "Match!\n" );
-   $editPage->spamPageWithContent( 'http://akismet.com 
blacklist error' );
+   $editInfo->spamPageWithContent( 'http://akismet.com 
blacklist error' );
wfProfileOut( __METHOD__ );
 
return true;
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..5e787fc
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,30 @@
+{
+   "name": "Akismet",
+   "version": "0.5",
+   "author": "Alex Potsides",
+   "license-name": "BSD",
+   "url": "https://www.mediawiki.org/wiki/Extension:AkismetKlik;,
+   "descriptionmsg": "akismetklik-desc",
+   "type": "other",
+   "MessagesDirs": {
+   "AkismetKlik": [
+   "i18n"
+   ]
+   },
+   "config": {
+   "AKkey": "",
+   "AKSiteUrl": ""
+   },
+   "AutoloadClasses": {
+   "Akismet": [
+   "AkismetKlik.php",
+   "Akismet.class.php"
+   ]
+   },
+   "Hooks": {
+   "EditFilterMergedContent": [
+   "Akismet::wfAkismetFilterMergedContent"
+   ]
+   },
+   "manifest_version": 1
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If41f6f1a4d72253d33fa05e94825421df5c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AkismetKlik
Gerrit-Branch: master
Gerrit-Owner: Georggi199 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Update Maintenance scripts to use requireExtension()

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Update Maintenance scripts to use requireExtension()
..


Update Maintenance scripts to use requireExtension()

Maintenance scripts has been updated to use $this->requireExtension()

Bug: T152139
Change-Id: I5e5ff23b83e163cb9d8b7a0a50c267d35e14e5b5
---
M maintenance/attachAccount.php
M maintenance/checkLocalNames.php
M maintenance/checkLocalUser.php
M maintenance/createLocalAccount.php
M maintenance/deleteEmptyAccounts.php
M maintenance/fixStuckGlobalRename.php
M maintenance/forceRenameUsers.php
M maintenance/getCentralAuthDBInfo.php
M maintenance/migrateAccount.php
M maintenance/migratePass1.php
M maintenance/populateGlobalRenameLogSearch.php
M maintenance/populateHomeDB.php
M maintenance/populateListOfUsersToRename.php
M maintenance/populateLocalAndGlobalIds.php
M maintenance/resetGlobalUserTokens.php
M maintenance/sendConfirmAndMigrateEmail.php
M maintenance/sendForceRenameNotification.php
M maintenance/updateUsersToRename.php
18 files changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/attachAccount.php b/maintenance/attachAccount.php
index 7ed6055..fc3fb2d 100644
--- a/maintenance/attachAccount.php
+++ b/maintenance/attachAccount.php
@@ -31,6 +31,7 @@
 class AttachAccount extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription =
"Attaches the specified usernames to a global account";
$this->start = microtime( true );
diff --git a/maintenance/checkLocalNames.php b/maintenance/checkLocalNames.php
index ffa8881..843de58 100644
--- a/maintenance/checkLocalNames.php
+++ b/maintenance/checkLocalNames.php
@@ -9,6 +9,7 @@
 class CheckLocalNames extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription = "Checks the contents of the localnames 
table and deletes invalid entries";
$this->start = microtime( true );
$this->deleted = 0;
diff --git a/maintenance/checkLocalUser.php b/maintenance/checkLocalUser.php
index f583e4d..a8f4159 100644
--- a/maintenance/checkLocalUser.php
+++ b/maintenance/checkLocalUser.php
@@ -9,6 +9,7 @@
 class CheckLocalUser extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription = "Checks the contents of the localuser 
table and deletes invalid entries";
$this->start = microtime( true );
$this->deleted = 0;
diff --git a/maintenance/createLocalAccount.php 
b/maintenance/createLocalAccount.php
index 733b741..9541abf 100644
--- a/maintenance/createLocalAccount.php
+++ b/maintenance/createLocalAccount.php
@@ -9,6 +9,7 @@
 class CreateLocalAccount extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription = 'Creates a local account on this wiki for 
a global user';
$this->addArg( 'username', 'User name', true );
}
diff --git a/maintenance/deleteEmptyAccounts.php 
b/maintenance/deleteEmptyAccounts.php
index 995a93d..23d96d4 100644
--- a/maintenance/deleteEmptyAccounts.php
+++ b/maintenance/deleteEmptyAccounts.php
@@ -9,6 +9,7 @@
 class DeleteEmptyAccounts extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription = "Delete all global accounts with no 
attached local accounts, then attempt to migrate a local account";
$this->setBatchSize( 500 );
$this->fix = false;
diff --git a/maintenance/fixStuckGlobalRename.php 
b/maintenance/fixStuckGlobalRename.php
index ccd34d3..71e4608 100644
--- a/maintenance/fixStuckGlobalRename.php
+++ b/maintenance/fixStuckGlobalRename.php
@@ -13,6 +13,7 @@
 class FixStuckGlobalRename extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->addArg( 'oldname', 'Old name' );
$this->addArg( 'newname', 'New name' );
$this->addOption( 'logwiki', 'Wiki where the log entry exists', 
true, true );
diff --git a/maintenance/forceRenameUsers.php b/maintenance/forceRenameUsers.php
index fc0cdbf..12ccfa2 100644
--- a/maintenance/forceRenameUsers.php
+++ b/maintenance/forceRenameUsers.php
@@ -18,6 +18,7 @@
 class

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update eventstreams to 0ca7329

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Update eventstreams to 0ca7329
..


Update eventstreams to 0ca7329

List of changes:
0ca7329 Increment request metrics streams

Change-Id: I6a0ccae698fe319ddf6ef76e0dadd927c1eb9433
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src b/src
index 0c3e493..0ca7329 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 0c3e4930c997df90b5955e6096ca517fd3c24bed
+Subproject commit 0ca73294f3ad77c596c349e36545b426b081c20c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a0ccae698fe319ddf6ef76e0dadd927c1eb9433
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
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] mediawiki...deploy[master]: Update eventstreams to 0ca7329

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Update eventstreams to 0ca7329
..

Update eventstreams to 0ca7329

List of changes:
0ca7329 Increment request metrics streams

Change-Id: I6a0ccae698fe319ddf6ef76e0dadd927c1eb9433
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams/deploy 
refs/changes/41/329241/1

diff --git a/src b/src
index 0c3e493..0ca7329 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 0c3e4930c997df90b5955e6096ca517fd3c24bed
+Subproject commit 0ca73294f3ad77c596c349e36545b426b081c20c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a0ccae698fe319ddf6ef76e0dadd927c1eb9433
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...eventstreams[master]: Increment request metrics streams

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Increment request metrics streams
..


Increment request metrics streams

Bug: T143925
Change-Id: I2c14336dfbf04d3d5f02aa10a8907611b7c3f434
---
M routes/v2.js
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/routes/v2.js b/routes/v2.js
index e66b2d8..a0037b5 100644
--- a/routes/v2.js
+++ b/routes/v2.js
@@ -60,6 +60,10 @@
 // Create a new /stream/${stream} route for each stream name.
 stream_names.forEach(stream => {
 router.get(`/stream/${stream}`, (req, res) => {
+// This request is assumed to never end.  Increment
+// a metric now that this stream has been requested.
+app.metrics.increment(`req.stream.${stream}`);
+
 return eventStream(req, res, app.conf.streams[stream].topics);
 });
 });

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c14336dfbf04d3d5f02aa10a8907611b7c3f434
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/eventstreams
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomUsersWithAvatars[master]: Hopefully final fixes for the new size parameter

2016-12-26 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329240 )

Change subject: Hopefully final fixes for the new size parameter
..


Hopefully final fixes for the new size parameter

* Vary cache also by the size
* Swap hardcoded height/width to max-height and max-width and set 'em to the 
value of the largest avatar value (l or large, 75px currently)

Change-Id: Ie78a586988da0639ee214d48c98d83de7a32f899
---
M RandomUsersWithAvatars.class.php
M ext.randomuserswithavatars.css
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/RandomUsersWithAvatars.class.php b/RandomUsersWithAvatars.class.php
index 054cd6a..c81bf3f 100644
--- a/RandomUsersWithAvatars.class.php
+++ b/RandomUsersWithAvatars.class.php
@@ -35,7 +35,7 @@
}
 
// Try cache
-   $key = wfMemcKey( 'users', 'random', 'avatars', $count, 
$per_row );
+   $key = wfMemcKey( 'users', 'random', 'avatars', $count, 
$per_row, $size );
$data = $wgMemc->get( $key );
if ( !$data ) {
$files = glob( $wgUploadDirectory . 
"/avatars/{$wgDBname}_*_{$size}.*" );
diff --git a/ext.randomuserswithavatars.css b/ext.randomuserswithavatars.css
index 4c2ad57..94e290c 100644
--- a/ext.randomuserswithavatars.css
+++ b/ext.randomuserswithavatars.css
@@ -12,7 +12,7 @@
border: 1px solid #DCDCDC;
display: block;
float: left;
-   height: 50px;
+   max-height: 75px;
margin: 0px 8px 8px 0px;
-   width: 50px;
+   max-width: 75px;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie78a586988da0639ee214d48c98d83de7a32f899
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomUsersWithAvatars[master]: Hopefully final fixes for the new size parameter

2016-12-26 Thread Jack Phoenix (Code Review)

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

Change subject: Hopefully final fixes for the new size parameter
..

Hopefully final fixes for the new size parameter

* Vary cache also by the size
* Swap hardcoded height/width to max-height and max-width and set 'em to the 
value of the largest avatar value (l or large, 75px currently)

Change-Id: Ie78a586988da0639ee214d48c98d83de7a32f899
---
M RandomUsersWithAvatars.class.php
M ext.randomuserswithavatars.css
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/RandomUsersWithAvatars.class.php b/RandomUsersWithAvatars.class.php
index 054cd6a..c81bf3f 100644
--- a/RandomUsersWithAvatars.class.php
+++ b/RandomUsersWithAvatars.class.php
@@ -35,7 +35,7 @@
}
 
// Try cache
-   $key = wfMemcKey( 'users', 'random', 'avatars', $count, 
$per_row );
+   $key = wfMemcKey( 'users', 'random', 'avatars', $count, 
$per_row, $size );
$data = $wgMemc->get( $key );
if ( !$data ) {
$files = glob( $wgUploadDirectory . 
"/avatars/{$wgDBname}_*_{$size}.*" );
diff --git a/ext.randomuserswithavatars.css b/ext.randomuserswithavatars.css
index 4c2ad57..94e290c 100644
--- a/ext.randomuserswithavatars.css
+++ b/ext.randomuserswithavatars.css
@@ -12,7 +12,7 @@
border: 1px solid #DCDCDC;
display: block;
float: left;
-   height: 50px;
+   max-height: 75px;
margin: 0px 8px 8px 0px;
-   width: 50px;
+   max-width: 75px;
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Change a duplicate message key wikibase-newentity-language

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Change a duplicate message key wikibase-newentity-language
..


Change a duplicate message key wikibase-newentity-language

This key was the same as a key in Wikibase, and this caused
issues in translatewiki.

Eventually all messages should have a wikibase-lexeme- prefix,
but this one is the most urgent.

Bug: T153964
Change-Id: I03507f87786cbad3ac21ea6d537fac6a0d0fce2b
---
M i18n/en.json
M i18n/qqq.json
M src/Specials/SpecialNewLexeme.php
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index c425590..a30793f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,6 +9,6 @@
"wikibase-lemma-edit-placeholder": "Enter the lemma",
"wikibase-newentity-lexicalcategory": "Lexical category",
"wikibase-lexicalcategory-edit-placeholder": "Enter the lexical 
category item ID e.g. Q10",
-   "wikibase-newentity-language": "Language of lexeme",
+   "wikibase-lexeme-newentity-language": "Language of lexeme",
"wikibase-language-edit-placeholder": "Enter the language item ID e.g. 
Q20"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a35a8a9..8743f47 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -12,6 +12,6 @@
"wikibase-lemma-edit-placeholder": "Placeholder content for lemma",
"wikibase-newentity-lexicalcategory": "Name for \"lexical category\"",
"wikibase-lexicalcategory-edit-placeholder": "Placeholder content for 
lexical category",
-   "wikibase-newentity-language": "Name for 
\"language\"\n{{Identical|Language}}",
+   "wikibase-lexeme-newentity-language": "Name for \"language\"",
"wikibase-language-edit-placeholder": "Placeholder content for language"
 }
diff --git a/src/Specials/SpecialNewLexeme.php 
b/src/Specials/SpecialNewLexeme.php
index 0142108..a3f14d1 100644
--- a/src/Specials/SpecialNewLexeme.php
+++ b/src/Specials/SpecialNewLexeme.php
@@ -270,7 +270,7 @@
'default' => $langCode,
'type' => 'combobox',
'id' => 'wb-newentity-language',
-   'label-message' => 'wikibase-newentity-language'
+   'label-message' => 
'wikibase-lexeme-newentity-language'
],
'lemma' => [
'name' => 'lemma',
@@ -306,7 +306,7 @@
'placeholder' => $this->msg(
'wikibase-language-edit-placeholder'
)->text(),
-   'label-message' => 'wikibase-newentity-language'
+   'label-message' => 
'wikibase-lexeme-newentity-language'
]
];
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I03507f87786cbad3ac21ea6d537fac6a0d0fce2b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Lydia Pintscher 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...eventstreams[master]: Increment request metrics for particular streams

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Increment request metrics for particular streams
..

Increment request metrics for particular streams

Bug: T143925
Change-Id: I2c14336dfbf04d3d5f02aa10a8907611b7c3f434
---
M routes/v2.js
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams 
refs/changes/39/329239/1

diff --git a/routes/v2.js b/routes/v2.js
index e66b2d8..2fd5efc 100644
--- a/routes/v2.js
+++ b/routes/v2.js
@@ -60,6 +60,10 @@
 // Create a new /stream/${stream} route for each stream name.
 stream_names.forEach(stream => {
 router.get(`/stream/${stream}`, (req, res) => {
+// This request is assumed to never end, so send
+// a metric to statsd now that someone requested it.
+app.metrics.increment(`req.stream.${stream}`)
+
 return eventStream(req, res, app.conf.streams[stream].topics);
 });
 });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c14336dfbf04d3d5f02aa10a8907611b7c3f434
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomUsersWithAvatars[master]: Follow-up to the previous commit: use the new variable to fe...

2016-12-26 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329238 )

Change subject: Follow-up to the previous commit: use the new variable to fetch 
the correct images
..


Follow-up to the previous commit: use the new variable to fetch the correct 
images

Change-Id: I289371c2b31785e55b6fa912d852317cc23a1e9e
---
M RandomUsersWithAvatars.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RandomUsersWithAvatars.class.php b/RandomUsersWithAvatars.class.php
index 55a1b9f..054cd6a 100644
--- a/RandomUsersWithAvatars.class.php
+++ b/RandomUsersWithAvatars.class.php
@@ -38,7 +38,7 @@
$key = wfMemcKey( 'users', 'random', 'avatars', $count, 
$per_row );
$data = $wgMemc->get( $key );
if ( !$data ) {
-   $files = glob( $wgUploadDirectory . 
"/avatars/{$wgDBname}_*_ml.*" );
+   $files = glob( $wgUploadDirectory . 
"/avatars/{$wgDBname}_*_{$size}.*" );
$wgMemc->set( $key, $files, 60 * 60 );
} else {
wfDebug( "Got random users with avatars from cache\n" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I289371c2b31785e55b6fa912d852317cc23a1e9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomUsersWithAvatars[master]: Follow-up to the previous commit: use the new variable to fe...

2016-12-26 Thread Jack Phoenix (Code Review)

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

Change subject: Follow-up to the previous commit: use the new variable to fetch 
the correct images
..

Follow-up to the previous commit: use the new variable to fetch the correct 
images

Change-Id: I289371c2b31785e55b6fa912d852317cc23a1e9e
---
M RandomUsersWithAvatars.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/RandomUsersWithAvatars.class.php b/RandomUsersWithAvatars.class.php
index 55a1b9f..054cd6a 100644
--- a/RandomUsersWithAvatars.class.php
+++ b/RandomUsersWithAvatars.class.php
@@ -38,7 +38,7 @@
$key = wfMemcKey( 'users', 'random', 'avatars', $count, 
$per_row );
$data = $wgMemc->get( $key );
if ( !$data ) {
-   $files = glob( $wgUploadDirectory . 
"/avatars/{$wgDBname}_*_ml.*" );
+   $files = glob( $wgUploadDirectory . 
"/avatars/{$wgDBname}_*_{$size}.*" );
$wgMemc->set( $key, $files, 60 * 60 );
} else {
wfDebug( "Got random users with avatars from cache\n" );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomUsersWithAvatars[master]: Allow users to specify avatar image size

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Allow users to specify avatar image size
..


Allow users to specify avatar image size

Bug: T154124
Change-Id: Ie9b790c29173c117d9ff2dd0ecebb41ba36b1221
---
M RandomUsersWithAvatars.class.php
1 file changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/RandomUsersWithAvatars.class.php b/RandomUsersWithAvatars.class.php
index 47d8feb..55a1b9f 100644
--- a/RandomUsersWithAvatars.class.php
+++ b/RandomUsersWithAvatars.class.php
@@ -22,12 +22,17 @@
public static function getRandomUsersWithAvatars( $input, $args, 
$parser ) {
global $wgUploadDirectory, $wgDBname, $wgMemc;
 
-
$parser->getOutput()->addModuleStyles( 
'ext.randomuserswithavatars' );
$parser->disableCache();
 
$count = ( isset( $args['count'] ) && is_numeric( 
$args['count'] ) ) ? intval( $args['count'] ) : 10;
$per_row = ( isset( $args['row'] ) && is_numeric( $args['row'] 
) ) ? intval( $args['row'] ) : 4;
+   $allowed_sizes = array( 's', 'm', 'ml', 'l' );
+   if ( isset( $args['size'] ) && in_array( strtolower( 
$args['size'] ), $allowed_sizes ) ) {
+   $size = strtolower( $args['size'] );
+   } else {
+   $size = 'ml';
+   }
 
// Try cache
$key = wfMemcKey( 'users', 'random', 'avatars', $count, 
$per_row );
@@ -68,8 +73,7 @@
$user = User::newFromId( $user_id );
$user->loadFromDatabase();
$user_name = $user->getName();
-
-   $avatar = new wAvatar( $user_id, 'ml' );
+   $avatar = new wAvatar( $user_id, $size );
$user_link = Title::makeTitle( NS_USER, 
$user_name );
 
$output .= '
';
 
-
return $output;
}
 
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9b790c29173c117d9ff2dd0ecebb41ba36b1221
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Try to fix config indentation

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Try to fix config indentation
..


Try to fix config indentation

Change-Id: I88171db08605a9d37f27137219c479d7e0d58836
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 73aa98c..e4321f4 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -45,7 +45,7 @@
   kafka:
 metadata.broker.list: <%= broker_list %>
 <% if rdkafka_config -%>
-<% for key, val in rdkafka_config.iteritems() -%>
+<% for key, val in rdkafka_config.iteritems() %>
 <%= key %>: <%= val %>
 <% endfor -%>
 <% endif -%>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I88171db08605a9d37f27137219c479d7e0d58836
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
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] mediawiki...deploy[master]: Try to fix config indentation

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Try to fix config indentation
..

Try to fix config indentation

Change-Id: I88171db08605a9d37f27137219c479d7e0d58836
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams/deploy 
refs/changes/37/329237/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 73aa98c..e4321f4 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -45,7 +45,7 @@
   kafka:
 metadata.broker.list: <%= broker_list %>
 <% if rdkafka_config -%>
-<% for key, val in rdkafka_config.iteritems() -%>
+<% for key, val in rdkafka_config.iteritems() %>
 <%= key %>: <%= val %>
 <% endfor -%>
 <% endif -%>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88171db08605a9d37f27137219c479d7e0d58836
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...LifeWeb[master]: Added a composer.json file in order to lint the PHP

2016-12-26 Thread MtDu (Code Review)

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

Change subject: Added a composer.json file in order to lint the PHP
..

Added a composer.json file in order to lint the PHP

Bug: T154147
Change-Id: I5a787952de804978709cde5ae159f19410e72297
---
A composer.json
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/composer.json b/composer.json
new file mode 100644
index 000..90ed98b
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,15 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p"
+   ],
+   "fix": [
+   "phpcbf"
+   ]
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Fix indentation of rdkafka_config key: val

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Fix indentation of rdkafka_config key: val
..


Fix indentation of rdkafka_config key: val

Change-Id: I0e769f71afd8724a0704e7c7ac7d6a643704f641
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index dbee0c8..73aa98c 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -46,7 +46,7 @@
 metadata.broker.list: <%= broker_list %>
 <% if rdkafka_config -%>
 <% for key, val in rdkafka_config.iteritems() -%>
-  <%= key %>: <%= val %>
+<%= key %>: <%= val %>
 <% endfor -%>
 <% endif -%>
   # Stream routes configuration.  Each key in this object is a route path,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e769f71afd8724a0704e7c7ac7d6a643704f641
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
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] mediawiki...deploy[master]: Fix indentation of rdkafka_config key: val

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Fix indentation of rdkafka_config key: val
..

Fix indentation of rdkafka_config key: val

Change-Id: I0e769f71afd8724a0704e7c7ac7d6a643704f641
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams/deploy 
refs/changes/35/329235/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index dbee0c8..73aa98c 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -46,7 +46,7 @@
 metadata.broker.list: <%= broker_list %>
 <% if rdkafka_config -%>
 <% for key, val in rdkafka_config.iteritems() -%>
-  <%= key %>: <%= val %>
+<%= key %>: <%= val %>
 <% endfor -%>
 <% endif -%>
   # Stream routes configuration.  Each key in this object is a route path,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e769f71afd8724a0704e7c7ac7d6a643704f641
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Send EventStreams rdkafka config to statsd every minute

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Send EventStreams rdkafka config to statsd every minute
..


Send EventStreams rdkafka config to statsd every minute

Change-Id: I2acf0615f8b01dd8ba920baa5ed592ddade6af29
---
M hieradata/role/common/scb.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index 573a89c..ba9a191 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -62,4 +62,10 @@
 topics:
   - eqiad.mediawiki.revision-create
   - codfw.mediawiki.revision-create
+
+# rdkafka config for Public EventStreams service.
+role::eventstreams::rdkafka_config:
+  # Send rdkafka stats to statsd once per minute.
+  statistics.interval.ms: 6
+
 changeprop::restbase_uri: http://restbase.svc.codfw.wmnet:7231

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.ui: Explicitly define input text color

2016-12-26 Thread Jo12bar (Code Review)

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

Change subject: mediawiki.ui: Explicitly define input text color
..

mediawiki.ui: Explicitly define input text color

This fixes an issue where certain system themes (i.e. custom Gnome
themes) would set a default & often unreadable text color for any
.mw-ui-input's. The text color is now explicity set to `@colorText`,
fixing this issue.

Bug: T148457
Change-Id: I5b31fab317948d231bce5c242af65d6cc7d3f4aa
---
M resources/src/mediawiki.ui/components/inputs.less
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/resources/src/mediawiki.ui/components/inputs.less 
b/resources/src/mediawiki.ui/components/inputs.less
index 8bddb3a..da1e3dc 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -23,6 +23,7 @@
 // Styleguide 1.1.
 .mw-ui-input {
background-color: #fff;
+   color: @colorText;
.box-sizing( border-box );
display: block;
width: 100%;

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Send EventStreams rdkafka config to statsd every minute

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Send EventStreams rdkafka config to statsd every minute
..

Send EventStreams rdkafka config to statsd every minute

Change-Id: I2acf0615f8b01dd8ba920baa5ed592ddade6af29
---
M hieradata/role/common/scb.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/329233/1

diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index 573a89c..ba9a191 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -62,4 +62,10 @@
 topics:
   - eqiad.mediawiki.revision-create
   - codfw.mediawiki.revision-create
+
+# rdkafka config for Public EventStreams service.
+role::eventstreams::rdkafka_config:
+  # Send rdkafka stats to statsd once per minute.
+  statistics.interval.ms: 6
+
 changeprop::restbase_uri: http://restbase.svc.codfw.wmnet:7231

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2acf0615f8b01dd8ba920baa5ed592ddade6af29
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] operations/puppet[production]: Add rdkafka_config deployment var to eventstreams service mo...

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Add rdkafka_config deployment var to eventstreams service 
module and role
..


Add rdkafka_config deployment var to eventstreams service module and role

This will allow us to configure statistics.interval.ms to send rdkafka stats to 
statsd

Bug: T143925
Change-Id: I4da8d2307b64f38dca96972beb8e381fdd663b64
---
M modules/eventstreams/manifests/init.pp
M modules/role/manifests/eventstreams.pp
2 files changed, 22 insertions(+), 10 deletions(-)

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



diff --git a/modules/eventstreams/manifests/init.pp 
b/modules/eventstreams/manifests/init.pp
index 6cdc815..01f974b 100644
--- a/modules/eventstreams/manifests/init.pp
+++ b/modules/eventstreams/manifests/init.pp
@@ -19,11 +19,15 @@
 # [*log_level*]
 #   Log level for service logger. Default: info
 #
+# [*rdkafka_config*]
+#   Extra librdkafka configuration to provide to node-rdkafka.  Default: {}
+#
 class eventstreams(
 $broker_list,
 $streams,
-$port  = 8092,
-$log_level = 'info'
+$port   = 8092,
+$log_level  = 'info',
+$rdkafka_config = {},
 ) {
 service::packages { 'eventstreams':
 pkgs => ['librdkafka++1', 'librdkafka1'],
@@ -36,10 +40,11 @@
 deployment=> 'scap3',
 deployment_config => true,
 deployment_vars   => {
-log_level   => $log_level,
-site=> $::site,
-broker_list => $broker_list,
-streams => $streams,
+log_level  => $log_level,
+site   => $::site,
+broker_list=> $broker_list,
+rdkafka_config => $rdkafka_config,
+streams=> $streams,
 },
 auto_refresh  => false,
 init_restart  => false,
diff --git a/modules/role/manifests/eventstreams.pp 
b/modules/role/manifests/eventstreams.pp
index 1a8a43b..d9dcb2a 100644
--- a/modules/role/manifests/eventstreams.pp
+++ b/modules/role/manifests/eventstreams.pp
@@ -34,6 +34,9 @@
 # [*role::eventstreams::streams*]
 #   Default: test and revision-create.
 #
+# [*role::eventstreams::rdkafka_config*]
+#   Default: {}
+#
 class role::eventstreams {
 system::role { 'role::eventstreams':
 description => 'Exposes configured event streams from Kafka to public 
internet via HTTP SSE',
@@ -60,10 +63,14 @@
 }
 })
 
+# Any extra librdkafka configuration
+$rdkafka_config = hiera('role::eventstreams::rdkafka_config', {})
+
 class { '::eventstreams':
-port=> $port,
-log_level   => $log_level,
-broker_list => $kafka_config['brokers']['string'],
-streams => $streams,
+port   => $port,
+log_level  => $log_level,
+broker_list=> $kafka_config['brokers']['string'],
+streams=> $streams,
+rdkafka_config => $rdkafka_config,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4da8d2307b64f38dca96972beb8e381fdd663b64
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Use endif in config template

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Use endif in config template
..


Use endif in config template

Change-Id: Idf769a6ed57e96323d6354bb878cf7b63abaf1a8
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 30a3a85..dbee0c8 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -48,7 +48,7 @@
 <% for key, val in rdkafka_config.iteritems() -%>
   <%= key %>: <%= val %>
 <% endfor -%>
-<% end -%>
+<% endif -%>
   # Stream routes configuration.  Each key in this object is a route path,
   # and each route path should configure a list of topics to be included 
in that stream.
   streams:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf769a6ed57e96323d6354bb878cf7b63abaf1a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
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] mediawiki...deploy[master]: Use endif in config template

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Use endif in config template
..

Use endif in config template

Change-Id: Idf769a6ed57e96323d6354bb878cf7b63abaf1a8
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams/deploy 
refs/changes/32/329232/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 30a3a85..dbee0c8 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -48,7 +48,7 @@
 <% for key, val in rdkafka_config.iteritems() -%>
   <%= key %>: <%= val %>
 <% endfor -%>
-<% end -%>
+<% endif -%>
   # Stream routes configuration.  Each key in this object is a route path,
   # and each route path should configure a list of topics to be included 
in that stream.
   streams:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf769a6ed57e96323d6354bb878cf7b63abaf1a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Wrap rdkafka_config block in conditional in config template

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Wrap rdkafka_config block in conditional in config template
..


Wrap rdkafka_config block in conditional in config template

Change-Id: Ib7c81dc77db39cd6a9991158c3f4b3608c71962f
---
M scap/templates/config.yaml.j2
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index d3fdafa..30a3a85 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -44,9 +44,11 @@
   # rdkafka configuration
   kafka:
 metadata.broker.list: <%= broker_list %>
+<% if rdkafka_config -%>
 <% for key, val in rdkafka_config.iteritems() -%>
   <%= key %>: <%= val %>
 <% endfor -%>
+<% end -%>
   # Stream routes configuration.  Each key in this object is a route path,
   # and each route path should configure a list of topics to be included 
in that stream.
   streams:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7c81dc77db39cd6a9991158c3f4b3608c71962f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
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] mediawiki...deploy[master]: Wrap rdkafka_config block in conditional in config template

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Wrap rdkafka_config block in conditional in config template
..

Wrap rdkafka_config block in conditional in config template

Change-Id: Ib7c81dc77db39cd6a9991158c3f4b3608c71962f
---
M scap/templates/config.yaml.j2
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams/deploy 
refs/changes/31/329231/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index d3fdafa..30a3a85 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -44,9 +44,11 @@
   # rdkafka configuration
   kafka:
 metadata.broker.list: <%= broker_list %>
+<% if rdkafka_config -%>
 <% for key, val in rdkafka_config.iteritems() -%>
   <%= key %>: <%= val %>
 <% endfor -%>
+<% end -%>
   # Stream routes configuration.  Each key in this object is a route path,
   # and each route path should configure a list of topics to be included 
in that stream.
   streams:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c81dc77db39cd6a9991158c3f4b3608c71962f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Use endfor instead of end in config template

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Use endfor instead of end in config template
..


Use endfor instead of end in config template

Change-Id: I29f50258cc397b2ccf97a75a619d847ce2acf916
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index c22e96f..d3fdafa 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -46,7 +46,7 @@
 metadata.broker.list: <%= broker_list %>
 <% for key, val in rdkafka_config.iteritems() -%>
   <%= key %>: <%= val %>
-<% end -%>
+<% endfor -%>
   # Stream routes configuration.  Each key in this object is a route path,
   # and each route path should configure a list of topics to be included 
in that stream.
   streams:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29f50258cc397b2ccf97a75a619d847ce2acf916
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
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] mediawiki...deploy[master]: Use endfor instead of end in config template

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Use endfor instead of end in config template
..

Use endfor instead of end in config template

Change-Id: I29f50258cc397b2ccf97a75a619d847ce2acf916
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams/deploy 
refs/changes/30/329230/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index c22e96f..d3fdafa 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -46,7 +46,7 @@
 metadata.broker.list: <%= broker_list %>
 <% for key, val in rdkafka_config.iteritems() -%>
   <%= key %>: <%= val %>
-<% end -%>
+<% endfor -%>
   # Stream routes configuration.  Each key in this object is a route path,
   # and each route path should configure a list of topics to be included 
in that stream.
   streams:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29f50258cc397b2ccf97a75a619d847ce2acf916
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add rdkafka_config deployment variable to config.yaml.j2 tem...

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Add rdkafka_config deployment variable to config.yaml.j2 
template
..


Add rdkafka_config deployment variable to config.yaml.j2 template

Bug: T143925
Change-Id: I0afe64b6f80dba51fd29644edbe4783d761476f1
---
M scap/templates/config.yaml.j2
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index ce0947a..c22e96f 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -44,6 +44,9 @@
   # rdkafka configuration
   kafka:
 metadata.broker.list: <%= broker_list %>
+<% for key, val in rdkafka_config.iteritems() -%>
+  <%= key %>: <%= val %>
+<% end -%>
   # Stream routes configuration.  Each key in this object is a route path,
   # and each route path should configure a list of topics to be included 
in that stream.
   streams:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0afe64b6f80dba51fd29644edbe4783d761476f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams/deploy
Gerrit-Branch: master
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] mediawiki...CentralAuth[master]: Update Maintenance scripts to use requireExtension()

2016-12-26 Thread Subins2000 (Code Review)

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

Change subject: Update Maintenance scripts to use requireExtension()
..

Update Maintenance scripts to use requireExtension()

Maintenance scripts has been updated to use $this->requireExtension()

Bug: T152139
Change-Id: I5e5ff23b83e163cb9d8b7a0a50c267d35e14e5b5
---
M maintenance/attachAccount.php
M maintenance/checkLocalNames.php
M maintenance/checkLocalUser.php
M maintenance/createLocalAccount.php
M maintenance/deleteEmptyAccounts.php
M maintenance/fixStuckGlobalRename.php
M maintenance/forceRenameUsers.php
M maintenance/getCentralAuthDBInfo.php
M maintenance/migrateAccount.php
M maintenance/migratePass1.php
M maintenance/populateGlobalRenameLogSearch.php
M maintenance/populateHomeDB.php
M maintenance/populateListOfUsersToRename.php
M maintenance/populateLocalAndGlobalIds.php
M maintenance/resetGlobalUserTokens.php
M maintenance/sendConfirmAndMigrateEmail.php
M maintenance/sendForceRenameNotification.php
M maintenance/updateUsersToRename.php
18 files changed, 18 insertions(+), 0 deletions(-)


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

diff --git a/maintenance/attachAccount.php b/maintenance/attachAccount.php
index 7ed6055..fc3fb2d 100644
--- a/maintenance/attachAccount.php
+++ b/maintenance/attachAccount.php
@@ -31,6 +31,7 @@
 class AttachAccount extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription =
"Attaches the specified usernames to a global account";
$this->start = microtime( true );
diff --git a/maintenance/checkLocalNames.php b/maintenance/checkLocalNames.php
index ffa8881..843de58 100644
--- a/maintenance/checkLocalNames.php
+++ b/maintenance/checkLocalNames.php
@@ -9,6 +9,7 @@
 class CheckLocalNames extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription = "Checks the contents of the localnames 
table and deletes invalid entries";
$this->start = microtime( true );
$this->deleted = 0;
diff --git a/maintenance/checkLocalUser.php b/maintenance/checkLocalUser.php
index f583e4d..a8f4159 100644
--- a/maintenance/checkLocalUser.php
+++ b/maintenance/checkLocalUser.php
@@ -9,6 +9,7 @@
 class CheckLocalUser extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription = "Checks the contents of the localuser 
table and deletes invalid entries";
$this->start = microtime( true );
$this->deleted = 0;
diff --git a/maintenance/createLocalAccount.php 
b/maintenance/createLocalAccount.php
index 733b741..9541abf 100644
--- a/maintenance/createLocalAccount.php
+++ b/maintenance/createLocalAccount.php
@@ -9,6 +9,7 @@
 class CreateLocalAccount extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription = 'Creates a local account on this wiki for 
a global user';
$this->addArg( 'username', 'User name', true );
}
diff --git a/maintenance/deleteEmptyAccounts.php 
b/maintenance/deleteEmptyAccounts.php
index 995a93d..23d96d4 100644
--- a/maintenance/deleteEmptyAccounts.php
+++ b/maintenance/deleteEmptyAccounts.php
@@ -9,6 +9,7 @@
 class DeleteEmptyAccounts extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->mDescription = "Delete all global accounts with no 
attached local accounts, then attempt to migrate a local account";
$this->setBatchSize( 500 );
$this->fix = false;
diff --git a/maintenance/fixStuckGlobalRename.php 
b/maintenance/fixStuckGlobalRename.php
index ccd34d3..71e4608 100644
--- a/maintenance/fixStuckGlobalRename.php
+++ b/maintenance/fixStuckGlobalRename.php
@@ -13,6 +13,7 @@
 class FixStuckGlobalRename extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'CentralAuth' );
$this->addArg( 'oldname', 'Old name' );
$this->addArg( 'newname', 'New name' );
$this->addOption( 'logwiki', 'Wiki where the log entry exists', 
true, true );
diff --git a/maintenance/forceRenameUsers.php b/maintenance/forceRenameUsers.php
index fc0cdbf..12ccfa2 100644
--- a/maintenance/forceRenameUsers.php
+++ b/maintenance/forceRenameUsers.php
@@ -18,6 +18,7

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Slight i18n cleanup for Finnish (fi)

2016-12-26 Thread Jack Phoenix (Code Review)

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

Change subject: Slight i18n cleanup for Finnish (fi)
..

Slight i18n cleanup for Finnish (fi)

The blog-category message had been removed from PHP code a long time ago.

Change-Id: Ib1bb25415e5e1284f79862ec794a3aff4885f23c
---
M i18n/fi.json
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/i18n/fi.json b/i18n/fi.json
index 95a5386..039a7af 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -11,8 +11,7 @@
"blog-author-title": "Tietoa {{PLURAL:$1|tekijästä|tekijöistä}}",
"blog-author-votes": "$1 {{PLURAL:$1|ääni|ääntä}}",
"blog-by": "kirjoittanut",
-   "blog-by-user-category": "$1, jotka on kirjoittanut",
-   "blog-category": "Artikkelit",
+   "blog-by-user-category": "Artikkelit, jotka on kirjoittanut $1",
"blog-comments-of-day": "Päivän kommentit",
"blog-created": "luotu $1",
"blog-created-ago": "luotu $1 sitten",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Slight i18n cleanup for Finnish (fi)

2016-12-26 Thread Jack Phoenix (Code Review)

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329228 )

Change subject: Slight i18n cleanup for Finnish (fi)
..


Slight i18n cleanup for Finnish (fi)

The blog-category message had been removed from PHP code a long time ago.

Change-Id: Ib1bb25415e5e1284f79862ec794a3aff4885f23c
---
M i18n/fi.json
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/i18n/fi.json b/i18n/fi.json
index 95a5386..039a7af 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -11,8 +11,7 @@
"blog-author-title": "Tietoa {{PLURAL:$1|tekijästä|tekijöistä}}",
"blog-author-votes": "$1 {{PLURAL:$1|ääni|ääntä}}",
"blog-by": "kirjoittanut",
-   "blog-by-user-category": "$1, jotka on kirjoittanut",
-   "blog-category": "Artikkelit",
+   "blog-by-user-category": "Artikkelit, jotka on kirjoittanut $1",
"blog-comments-of-day": "Päivän kommentit",
"blog-created": "luotu $1",
"blog-created-ago": "luotu $1 sitten",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1bb25415e5e1284f79862ec794a3aff4885f23c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update NavTabLayout to use BottomNavigationView

2016-12-26 Thread Mhutti1 (Code Review)

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

Change subject: Update NavTabLayout to use BottomNavigationView
..

Update NavTabLayout to use BottomNavigationView

The bottom bar on the main screen is now a BottomNavigationView.
This is inline with the Material Design guidelines. As there are 4
tabs they now animate and text is only displayed for the current
tab.

Bug: T148791
Change-Id: I50c2b14f9920c5a38b0a20bc171ffdbf16512877
---
D app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/navtab/NavTabLayout.java
D app/src/main/java/org/wikipedia/navtab/NavTabView.java
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/styles.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
8 files changed, 19 insertions(+), 157 deletions(-)


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

diff --git a/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java 
b/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
deleted file mode 100644
index 2f676ca..000
--- a/app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.wikipedia.navtab;
-
-import android.support.annotation.NonNull;
-import android.support.test.filters.SmallTest;
-
-import org.junit.Test;
-import org.junit.experimental.theories.Theory;
-import org.junit.experimental.theories.suppliers.TestedOn;
-import org.wikipedia.test.view.FontScale;
-import org.wikipedia.test.view.LayoutDirection;
-import org.wikipedia.test.view.ViewTest;
-import org.wikipedia.theme.Theme;
-
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-@SmallTest public class NavTabViewTest extends ViewTest {
-private NavTabView subject;
-
-@Theory public void testWidth(@TestedOn(ints = {WIDTH_DP_XL, WIDTH_DP_XS}) 
int widthDp,
-  @NonNull FontScale fontScale) {
-setUp(widthDp, LayoutDirection.LOCALE, fontScale, Theme.LIGHT);
-snap(subject);
-}
-
-@Theory public void testLayoutDirection(@NonNull LayoutDirection 
direction) {
-setUp(WIDTH_DP_XS, direction, FontScale.DEFAULT, Theme.LIGHT);
-snap(subject);
-}
-
-@Theory public void testTheme(@NonNull Theme theme) {
-setUp(WIDTH_DP_XS, LayoutDirection.LOCALE, FontScale.DEFAULT, theme);
-snap(subject);
-}
-
-@Theory public void testSelect(@NonNull Theme theme) {
-setUp(WIDTH_DP_XS, LayoutDirection.LOCALE, FontScale.DEFAULT, theme);
-subject.setSelected(true);
-snap(subject);
-}
-
-@Test public void testText() {
-setUp(WIDTH_DP_XS, LayoutDirection.LOCALE, FontScale.DEFAULT, 
Theme.LIGHT);
-assertThat(subject.getText().toString(), 
is(str(NavTab.EXPLORE.text(;
-}
-
-@Test public void testIcon() {
-setUp(WIDTH_DP_XS, LayoutDirection.LOCALE, FontScale.DEFAULT, 
Theme.LIGHT);
-assertThat(subject.getCompoundDrawables(), 
hasItemInArray(notNullValue()));
-}
-
-@Override protected void setUp(int widthDp, @NonNull LayoutDirection 
layoutDirection,
-   @NonNull FontScale fontScale, @NonNull 
Theme theme) {
-super.setUp(widthDp, layoutDirection, fontScale, theme);
-
-subject = new NavTabView(ctx())
-.text(NavTab.EXPLORE.text())
-.icon(NavTab.EXPLORE.icon());
-}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java 
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index b77aac2..8623751 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -15,11 +15,12 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.BottomNavigationView;
 import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -42,6 +43,7 @@
 import org.wikipedia.login.LoginActivity;
 import org.wikipedia.navtab.NavTab;
 import org.wikipedia.navtab.NavTabFragmentPagerAdapter;
+import org.wikipedia.navtab.NavTabLayout;
 import org.wikipedia.nearby.NearbyFragment;
 import org.wikipedia.page.ExclusiveBottomSheetPresenter;
 import org.wikipedia.page.PageActivity;
@@ -76,7 +78,7 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: Enable expand_path for Hiera in Labs as well

2016-12-26 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329226 )

Change subject: puppetmaster: Enable expand_path for Hiera in Labs as well
..

puppetmaster: Enable expand_path for Hiera in Labs as well

With the current settings when Hiera looks up a key, it searches the
labs/private repository only for the files:

- /etc/puppet/private/hieradata/labs/%{::labsproject}/common.yaml
- /etc/puppet/private/hieradata/%{::labsproject}.yaml
- /etc/puppet/private/hieradata/labs.yaml
- /etc/puppet/private/hieradata/common.yaml

However for example the key puppetdb::password::rw is defined in the
file /etc/puppet/private/hieradata/common/puppetdb/password.yaml, thus
it cannot be found.

This change enables expand_path for Hiera in Labs as well, causing it
to additionally search
/etc/puppet/private/hieradata/common/puppetdb/password.yaml for the
key puppetdb::password::rw.

Change-Id: Iaf73d6f52ec402cb7c1b7eebd0bc462b55343825
---
M modules/puppetmaster/files/labs.hiera.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/puppetmaster/files/labs.hiera.yaml 
b/modules/puppetmaster/files/labs.hiera.yaml
index 5a1fa0d..232ebbf 100644
--- a/modules/puppetmaster/files/labs.hiera.yaml
+++ b/modules/puppetmaster/files/labs.hiera.yaml
@@ -4,6 +4,8 @@
   - nuyaml
 :nuyaml:
   :datadir: /etc/puppet/hieradata
+  :expand_path:
+- common
 :mwyaml:
   :host: https://wikitech.wikimedia.org
   :cache_ttl: 120

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf73d6f52ec402cb7c1b7eebd0bc462b55343825
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug in the previous commit in multiversion mode

2016-12-26 Thread Seb35 (Code Review)

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

Change subject: Bug in the previous commit in multiversion mode
..

Bug in the previous commit in multiversion mode

Bugs:
* When running farm in multiversion mode, the wfLoadExtension
  for MediaWikiFarm (only) was not pointing to the right
  directory path (standard instead of dedicated).

Change-Id: I2df646dd0fa7d2ad75ccc5ee008af2a9506a86bd
---
M src/MediaWikiFarm.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 7c544b5..c243c78 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -1297,7 +1297,7 @@
foreach( $configuration['extensions'] as $extension ) {
if( $extension[2] == 'require_once' ) {
$extensions[$extension[1]]['require_once'] .= 
"require_once \"\$IP/{$extension[1]}s/{$extension[0]}/{$extension[0]}.php\";\n";
-   } elseif( $extension == array( 'MediaWikiFarm', 
'extension', 'wfLoadExtension' ) && $this->codeDir ) {
+   } elseif( $extension[0] == 'MediaWikiFarm' && 
$extension[1] == 'extension' && $extension[2] == 'wfLoadExtension' && 
$this->codeDir ) {
$extensions['extension']['wfLoadExtension'] .= 
"wfLoadExtension( 'MediaWikiFarm', " . var_export( $this->farmDir . 
'/extension.json', true ) . " );\n";
} elseif( $extension[2] == 'wfLoad' . ucfirst( 
$extension[1] ) ) {
$extensions[$extension[1]]['wfLoad' . ucfirst( 
$extension[1] )] .= 'wfLoad' . ucfirst( $extension[1] ) . '( ' . var_export( 
$extension[0], true ) . " );\n";

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add libgomp1 to hadoop worker nodes

2016-12-26 Thread Ottomata (Code Review)

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

Change subject: Add libgomp1 to hadoop worker nodes
..


Add libgomp1 to hadoop worker nodes

libgomp1 is the GCC OpenMP support library. This is usefull for custom
hadoop/yarn applications that want to utilize multiple cores.
Specifically I'm trying to get https://github.com/dmlc/xgboost running
on yarn, and it requires libgomp1 which is available on stat1002 but
not on the worker nodes.

Change-Id: I9bc0cacfa9586005dfd8819230054f3ba3dcb7fd
---
M modules/role/manifests/analytics_cluster/hadoop/worker.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/analytics_cluster/hadoop/worker.pp 
b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
index f763c60..402df25 100644
--- a/modules/role/manifests/analytics_cluster/hadoop/worker.pp
+++ b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
@@ -93,6 +93,7 @@
 'python-sympy',
 'python-docopt',
 'python3-docopt',
+'libgomp1',
 )
 
 # This allows Hadoop daemons to talk to each other.
@@ -101,4 +102,4 @@
 port   => '1024:65535',
 srange => '$ANALYTICS_NETWORKS',
 }
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bc0cacfa9586005dfd8819230054f3ba3dcb7fd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Update Maintenance scripts to use requireExtension()

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Update Maintenance scripts to use requireExtension()
..


Update Maintenance scripts to use requireExtension()

Maintenance scripts has been updated to use $this->requireExtension()

Bug: T152139
Change-Id: I93a0483dbacec4fd3de0c19505703f5f942d40ef
---
M ban.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/ban.php b/ban.php
index ad5e419..f14389f 100644
--- a/ban.php
+++ b/ban.php
@@ -5,6 +5,7 @@
 class BanHammer extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( "BlockAndNuke" );
$this->addOption( "hammer", "Actually ban and nuke the entries, 
will dry run otherwise" );
$this->addOption( "brief",  "Skip all the nitty-gritty details" 
);
$this->mDescription = "Block and Nuke recent users not found in 
the whitelist.";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93a0483dbacec4fd3de0c19505703f5f942d40ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: Subins2000 
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] mediawiki...LifeWeb[master]: Add missing API i18n messages

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Add missing API i18n messages
..


Add missing API i18n messages

* Migrate from old API message formats

Bug: T154092
Change-Id: I66006e707d40c63f91877ab6e47c846ec35f615a
---
M ApiLifeWeb.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 20 insertions(+), 19 deletions(-)

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



diff --git a/ApiLifeWeb.php b/ApiLifeWeb.php
index bbab415..7b2dc13 100644
--- a/ApiLifeWeb.php
+++ b/ApiLifeWeb.php
@@ -79,10 +79,6 @@
 return $result;
 }
 
-public function getDescription() {
-return 'Data downlink for the LifeBase.';
-}
-
 public function getAllowedParams() {
 return array(
 'what' => array (
@@ -111,19 +107,12 @@
 );
 }
 
-public function getParamDescription() {
-return array(
-'what' => 'Which data list to retrieve.'
-);
-}
-
 public function getExamples() {
 return array(
 'api.php?action=query=LifeWeb=taxonData=json'
-=> 'Taxon list',
+=> 'apihelp-query+LifeWeb-example-1',
 'api.php?action=query=LifeWeb=jsonfm=question'
-=> 'Question list, pretty-printed'
+=> 'apihelp-query+LifeWeb-example-2'
 );
 }
-
-}
\ No newline at end of file
+}
diff --git a/i18n/en.json b/i18n/en.json
index 0188997..a24efd5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,9 +1,15 @@
 {
"@metadata": {
"authors": [
-   "Simon A. Eugster"
+   "Simon A. Eugster",
+   "Justin Du"
]
},
"lifeweb": "LifeWeb",
-   "lifeweb-desc": "Identification key generator and editor"
-}
\ No newline at end of file
+   "lifeweb-desc": "Identification key generator and editor",
+   "apihelp-query+LifeWeb-description": "Data downlink for the LifeBase.",
+   "apihelp-query+LifeWeb-param-what": "Which data list to retrieve.",
+   "apihelp-query+LifeWeb-param-clearCache": "Whether or not the cache 
will be cleared during data retrieval",
+   "apihelp-query+LifeWeb-example-1": "Taxon list",
+   "apihelp-query+LifeWeb-example-2": "Question list, pretty-printed"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7d6eb26..0c056d3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,9 +2,15 @@
"@metadata": {
"authors": [
"Shirayuki",
-   "Umherirrender"
+   "Umherirrender",
+   "Justin Du"
]
},
"lifeweb": "{{doc-special|LifeWeb}}",
-   "lifeweb-desc": "{{desc|name=Life 
Web|url=https://www.mediawiki.org/wiki/Extension:LifeWeb}};
+   "lifeweb-desc": "{{desc|name=Life 
Web|url=https://www.mediawiki.org/wiki/Extension:LifeWeb}};,
+   "apihelp-query+LifeWeb-description": 
"{{doc-apihelp-description|query+Lifeweb}}",
+   "apihelp-query+LifeWeb-param-what": 
"{{doc-apihelp-param|query+Lifeweb|what}}",
+   "apihelp-query+LifeWeb-param-clearCache": 
"{{doc-apihelp-param|query+Lifeweb|clearCache}}",
+   "apihelp-query+LifeWeb-example-1": 
"{{doc-apihelp-example|query+Lifeweb}}",
+   "apihelp-query+LifeWeb-example-2": 
"{{doc-apihelp-example|query+Lifeweb}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66006e707d40c63f91877ab6e47c846ec35f615a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LifeWeb
Gerrit-Branch: master
Gerrit-Owner: MtDu 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MtDu 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-12-26T10:00:01+0000

2016-12-26 Thread jenkins-bot (Code Review)

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

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


New Wikidata Build - 2016-12-26T10:00:01+

Change-Id: I2b9dc847b48c29b3f8e5ab7dba5ebdfccc1b9f5d
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/es.json
M extensions/MediaInfo/i18n/es.json
M extensions/Wikibase/client/i18n/diq.json
A extensions/Wikibase/client/i18n/hif-latn.json
M extensions/Wikibase/client/i18n/lez.json
M extensions/Wikibase/repo/i18n/ar.json
M extensions/Wikibase/repo/i18n/eo.json
M extensions/Wikibase/repo/i18n/fr.json
A extensions/Wikibase/repo/i18n/hif-latn.json
M vendor/composer/installed.json
11 files changed, 69 insertions(+), 27 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index e4b880d..46e214b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -797,12 +797,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "75a2540c6f19488a630a4f871c01912dd26f1c21"
+"reference": "8f6aad4613af7e8cf359a88decfdb6d3b32c7162"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/75a2540c6f19488a630a4f871c01912dd26f1c21;,
-"reference": "75a2540c6f19488a630a4f871c01912dd26f1c21",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/8f6aad4613af7e8cf359a88decfdb6d3b32c7162;,
+"reference": "8f6aad4613af7e8cf359a88decfdb6d3b32c7162",
 "shasum": ""
 },
 "require-dev": {
@@ -827,7 +827,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2016-12-23 21:28:55"
+"time": "2016-12-25 21:14:56"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -1436,7 +1436,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo;,
-"reference": "3cf7999fb43ca1d0ea8d8c8edcf019869efa1cc4"
+"reference": "45084f3b4c4ab92c1a2fce1521669ed6deb2183e"
 },
 "require": {
 "php": ">=5.5.0",
@@ -1482,7 +1482,7 @@
 "issues": "https://phabricator.wikimedia.org/;,
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2016-12-22 16:19:17"
+"time": "2016-12-25 21:21:05"
 },
 {
 "name": "wikibase/quality",
@@ -1585,12 +1585,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "a124205bfeb66e062cbb336b178526ea58a0753e"
+"reference": "b9466b234af2698627c5595a3ec979c3ed7c9bc8"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a124205bfeb66e062cbb336b178526ea58a0753e;,
-"reference": "a124205bfeb66e062cbb336b178526ea58a0753e",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b9466b234af2698627c5595a3ec979c3ed7c9bc8;,
+"reference": "b9466b234af2698627c5595a3ec979c3ed7c9bc8",
 "shasum": ""
 },
 "require": {
@@ -1663,7 +1663,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-12-24 21:41:18"
+"time": "2016-12-25 21:20:56"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/i18n/es.json 
b/extensions/ArticlePlaceholder/i18n/es.json
index d51be4f..709f407 100644
--- a/extensions/ArticlePlaceholder/i18n/es.json
+++ b/extensions/ArticlePlaceholder/i18n/es.json
@@ -2,7 +2,8 @@
"@metadata": {
"authors": [
"Macofe",
-   "SinNovedades"
+   "SinNovedades",
+   "Dgstranz"
]
},
"createtopicpage": "Crear página",
@@ -16,6 +17,7 @@
"articleplaceholder-abouttopic-create-article-label": "Título del 
artículo",
"articleplaceholder-abouttopic-create-article-mandatory": "El título 
del artículo es obligatorio.",

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Change internal data structure for extensions

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Change internal data structure for extensions
..


Change internal data structure for extensions

Architecture:
* Previously there were two associative arrays for extensions
  and skins, with $name => $loadingMechanism. Now there is only
  one (list) array with values array( $name, $type,
  $loadingMechanism, $initialOrder ), with $type == 'extension'
  or 'skin'. The order of this list is used to create
  the LocalSettings.php. This change is in preparation of
  Composer-managed extensions, to allow activation of some
  extensions before other (typically PageForms 4.0+ and
  SemanticFormsSelect).
* The extensions+skins list can be sorted. Currently it is sorted
  with the following order: require_once(skins), require_once(exts),
  wfLoadSkin, wfLoadExtension. The sorting is stable, so that
  it is possible to impose some order inside each category.

Code:
* The previous associative array is transformed in a list of tuples
  because standard PHP functions do not allow to sort by key *and*
  value (it’s key *xor* value). The new information $initialOrder
  is added to allow a stable sort (standard PHP sorting is not
  stable).

Change-Id: Idb60c537da3c99a9cdec7a80f31acaf597bcd1fa
---
M src/MediaWikiFarm.php
M src/main.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/InstallationIndependantTest.php
M tests/phpunit/LoadingTest.php
5 files changed, 121 insertions(+), 115 deletions(-)

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



diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 5f5c309..7c544b5 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -73,7 +73,6 @@
protected $configuration = array(
'settings' => array(),
'arrays' => array(),
-   'skins' => array(),
'extensions' => array(),
'execFiles' => array(),
);
@@ -174,8 +173,7 @@
 * This associative array contains four sections:
 *   - 'settings': associative array of MediaWiki configuration (e.g. 
'wgServer' => '//example.org');
 *   - 'arrays': associative array of MediaWiki configuration of type 
array (e.g. 'wgGroupPermissions' => array( 'edit' => false ));
-*   - 'skins': associative array of skins configuration (e.g. 'Vector' 
=> 'wfLoadSkin' );
-*   - 'extensions': associative array of extensions configuration 
(e.g. 'ParserFunctions' => 'wfLoadExtension' );
+*   - 'extensions': list of extensions and skins (e.g. 0 => array( 
'ParserFunctions', 'extension', 'wfLoadExtension' ));
 *   - 'execFiles': list of PHP files to execute at the end.
 *
 * @mediawikifarm-const
@@ -360,30 +358,31 @@
$GLOBALS[$setting] = self::arrayMerge( 
$GLOBALS[$setting], $value );
}
 
-   # Load skins with the wfLoadSkin mechanism
-   foreach( $this->configuration['skins'] as $skin => $value ) {
+   # Load extensions and skins with the wfLoadExtension/wfLoadSkin 
mechanism
+   $loadMediaWikiFarm = false;
+   foreach( $this->configuration['extensions'] as $extension ) {
 
-   if( $value == 'wfLoadSkin' ) {
+   if( $extension[2] == 'wfLoadExtension' ) {
 
-   wfLoadSkin( $skin );
+   if( $extension[0] != 'MediaWikiFarm' || 
!$this->codeDir ) {
+   wfLoadExtension( $extension[0] );
+   } else {
+   wfLoadExtension( 'MediaWikiFarm', 
$this->farmDir . '/extension.json' );
+   $loadedMediaWikiFarm = true;
+   }
}
-   }
+   elseif( $extension[2] == 'wfLoadSkin' ) {
 
-   # Load extensions with the wfLoadExtension mechanism
-   foreach( $this->configuration['extensions'] as $extension => 
$value ) {
+   wfLoadSkin( $extension[0] );
+   }
+   elseif( $extension[0] == 'MediaWikiFarm' && 
$extension[1] == 'extension' && $extension[2] == 'require_once' ) {
 
-   if( $value == 'wfLoadExtension' && ( $extension != 
'MediaWikiFarm' || !$this->codeDir ) ) {
-
-   wfLoadExtension( $extension );
+   $loadMediaWikiFarm = true;
}
}
 
# Register this extension MediaWikiFarm to appear in 
Special:Version
-   if( $this->configuration['extensions']['MediaWikiFarm'] == 
'wfLoadExtension' && $this->codeDir ) {
-
-   wfLoadExtension(

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Change internal data structure for extensions

2016-12-26 Thread Seb35 (Code Review)

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

Change subject: Change internal data structure for extensions
..

Change internal data structure for extensions

Architecture:
* Previously there were two associative arrays for extensions
  and skins, with $name => $loadingMechanism. Now there is only
  one (list) array with values array( $name, $type,
  $loadingMechanism, $initialOrder ), with $type == 'extension'
  or 'skin'. The order of this list is used to create
  the LocalSettings.php. This change is in preparation of
  Composer-managed extensions, to allow activation of some
  extensions before other (typically PageForms 4.0+ and
  SemanticFormsSelect).
* The extensions+skins list can be sorted. Currently it is sorted
  with the following order: require_once(skins), require_once(exts),
  wfLoadSkin, wfLoadExtension. The sorting is stable, so that
  it is possible to impose some order inside each category.

Code:
* The previous associative array is transformed in a list of tuples
  because standard PHP functions do not allow to sort by key *and*
  value (it’s key *xor* value). The new information $initialOrder
  is added to allow a stable sort (standard PHP sorting is not
  stable).

Change-Id: Idb60c537da3c99a9cdec7a80f31acaf597bcd1fa
---
M src/MediaWikiFarm.php
M src/main.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/InstallationIndependantTest.php
M tests/phpunit/LoadingTest.php
5 files changed, 121 insertions(+), 115 deletions(-)


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

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 5f5c309..7c544b5 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -73,7 +73,6 @@
protected $configuration = array(
'settings' => array(),
'arrays' => array(),
-   'skins' => array(),
'extensions' => array(),
'execFiles' => array(),
);
@@ -174,8 +173,7 @@
 * This associative array contains four sections:
 *   - 'settings': associative array of MediaWiki configuration (e.g. 
'wgServer' => '//example.org');
 *   - 'arrays': associative array of MediaWiki configuration of type 
array (e.g. 'wgGroupPermissions' => array( 'edit' => false ));
-*   - 'skins': associative array of skins configuration (e.g. 'Vector' 
=> 'wfLoadSkin' );
-*   - 'extensions': associative array of extensions configuration 
(e.g. 'ParserFunctions' => 'wfLoadExtension' );
+*   - 'extensions': list of extensions and skins (e.g. 0 => array( 
'ParserFunctions', 'extension', 'wfLoadExtension' ));
 *   - 'execFiles': list of PHP files to execute at the end.
 *
 * @mediawikifarm-const
@@ -360,30 +358,31 @@
$GLOBALS[$setting] = self::arrayMerge( 
$GLOBALS[$setting], $value );
}
 
-   # Load skins with the wfLoadSkin mechanism
-   foreach( $this->configuration['skins'] as $skin => $value ) {
+   # Load extensions and skins with the wfLoadExtension/wfLoadSkin 
mechanism
+   $loadMediaWikiFarm = false;
+   foreach( $this->configuration['extensions'] as $extension ) {
 
-   if( $value == 'wfLoadSkin' ) {
+   if( $extension[2] == 'wfLoadExtension' ) {
 
-   wfLoadSkin( $skin );
+   if( $extension[0] != 'MediaWikiFarm' || 
!$this->codeDir ) {
+   wfLoadExtension( $extension[0] );
+   } else {
+   wfLoadExtension( 'MediaWikiFarm', 
$this->farmDir . '/extension.json' );
+   $loadedMediaWikiFarm = true;
+   }
}
-   }
+   elseif( $extension[2] == 'wfLoadSkin' ) {
 
-   # Load extensions with the wfLoadExtension mechanism
-   foreach( $this->configuration['extensions'] as $extension => 
$value ) {
+   wfLoadSkin( $extension[0] );
+   }
+   elseif( $extension[0] == 'MediaWikiFarm' && 
$extension[1] == 'extension' && $extension[2] == 'require_once' ) {
 
-   if( $value == 'wfLoadExtension' && ( $extension != 
'MediaWikiFarm' || !$this->codeDir ) ) {
-
-   wfLoadExtension( $extension );
+   $loadMediaWikiFarm = true;
}
}
 
# Register this extension MediaWikiFarm to appear in 
Special:Version
-   if( $this->configuration['extensions']['MediaWikiFarm'] == 
'wfLoadExtension' && $this->codeDir ) {
-
-

[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: Update Maintenance scripts to use requireExtension()

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Update Maintenance scripts to use requireExtension()
..


Update Maintenance scripts to use requireExtension()

Maintenance scripts has been updated to use $this->requireExtension()

Bug: T152139
Change-Id: I8da804ec23dbaa97a2eeb9a7d50f3d3271522b5a
---
M maintenance/archiveFeedback.php
M maintenance/legacyToShard.php
M maintenance/loggingUpdate.php
M maintenance/purgeCache.php
M maintenance/rebuildCheckUser.php
M maintenance/setArchiveDate.php
6 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/archiveFeedback.php b/maintenance/archiveFeedback.php
index 2c5f36a..d920f5e 100644
--- a/maintenance/archiveFeedback.php
+++ b/maintenance/archiveFeedback.php
@@ -36,6 +36,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Mark old feedback that is not 
particularly interesting as archived.';
}
 
diff --git a/maintenance/legacyToShard.php b/maintenance/legacyToShard.php
index 5034a18..557d366 100644
--- a/maintenance/legacyToShard.php
+++ b/maintenance/legacyToShard.php
@@ -37,6 +37,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Move all relevant legacy data stored in 
aft_article_* tables to the aft_feedback table that will be sharded.';
}
 
diff --git a/maintenance/loggingUpdate.php b/maintenance/loggingUpdate.php
index 04934fc..b614326 100644
--- a/maintenance/loggingUpdate.php
+++ b/maintenance/loggingUpdate.php
@@ -37,6 +37,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Rebuild existing logging.log_params data 
to form a serialized array with feedback id & page id';
}
 
diff --git a/maintenance/purgeCache.php b/maintenance/purgeCache.php
index f4cb6bc..760b479 100644
--- a/maintenance/purgeCache.php
+++ b/maintenance/purgeCache.php
@@ -18,6 +18,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
 
$this->deleteOption( 'model' );
$this->mDescription = 'Purge all ArticleFeedbackv5 caches.';
diff --git a/maintenance/rebuildCheckUser.php b/maintenance/rebuildCheckUser.php
index c0c0a61..4d3937f 100644
--- a/maintenance/rebuildCheckUser.php
+++ b/maintenance/rebuildCheckUser.php
@@ -37,6 +37,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Rebuild checkuser actiontext & logging 
usernames (based on checkuser data)';
}
 
diff --git a/maintenance/setArchiveDate.php b/maintenance/setArchiveDate.php
index 0a9333c..7419c41 100644
--- a/maintenance/setArchiveDate.php
+++ b/maintenance/setArchiveDate.php
@@ -36,6 +36,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Fix archive dates of pre-auto-archive 
feedback.';
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8da804ec23dbaa97a2eeb9a7d50f3d3271522b5a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Subins2000 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LifeWeb[master]: Add missing API i18n messages

2016-12-26 Thread MtDu (Code Review)

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

Change subject: Add missing API i18n messages
..

Add missing API i18n messages

* Migrate from old API message formats

Bug: T154092
Change-Id: I66006e707d40c63f91877ab6e47c846ec35f615a
---
M ApiLifeWeb.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 17 insertions(+), 18 deletions(-)


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

diff --git a/ApiLifeWeb.php b/ApiLifeWeb.php
index bbab415..7b2dc13 100644
--- a/ApiLifeWeb.php
+++ b/ApiLifeWeb.php
@@ -79,10 +79,6 @@
 return $result;
 }
 
-public function getDescription() {
-return 'Data downlink for the LifeBase.';
-}
-
 public function getAllowedParams() {
 return array(
 'what' => array (
@@ -111,19 +107,12 @@
 );
 }
 
-public function getParamDescription() {
-return array(
-'what' => 'Which data list to retrieve.'
-);
-}
-
 public function getExamples() {
 return array(
 'api.php?action=query=LifeWeb=taxonData=json'
-=> 'Taxon list',
+=> 'apihelp-query+LifeWeb-example-1',
 'api.php?action=query=LifeWeb=jsonfm=question'
-=> 'Question list, pretty-printed'
+=> 'apihelp-query+LifeWeb-example-2'
 );
 }
-
-}
\ No newline at end of file
+}
diff --git a/i18n/en.json b/i18n/en.json
index 0188997..7ca4b11 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,9 +1,14 @@
 {
"@metadata": {
"authors": [
-   "Simon A. Eugster"
+   "Simon A. Eugster",
+   "Justin Du"
]
},
"lifeweb": "LifeWeb",
-   "lifeweb-desc": "Identification key generator and editor"
+   "lifeweb-desc": "Identification key generator and editor",
+   "apihelp-query+LifeWeb-description": "Data downlink for the LifeBase.",
+   "apihelp-query+LifeWeb-param-what": "Which data list to retrieve.",
+   "apihelp-query+LifeWeb-example-1": "Taxon list",
+   "apihelp-query+LifeWeb-example-2": "Question list, pretty-printed"
 }
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7d6eb26..dec8a7a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,9 +2,14 @@
"@metadata": {
"authors": [
"Shirayuki",
-   "Umherirrender"
+   "Umherirrender",
+   "Justin Du"
]
},
"lifeweb": "{{doc-special|LifeWeb}}",
-   "lifeweb-desc": "{{desc|name=Life 
Web|url=https://www.mediawiki.org/wiki/Extension:LifeWeb}};
+   "lifeweb-desc": "{{desc|name=Life 
Web|url=https://www.mediawiki.org/wiki/Extension:LifeWeb}};,
+   "apihelp-query+LifeWeb-description": 
"{{doc-apihelp-description|query+Lifeweb}}",
+   "apihelp-query+LifeWeb-param-what": 
"{{doc-apihelp-param|query+Lifeweb|what}}",
+   "apihelp-query+LifeWeb-example-1": 
"{{doc-apihelp-example|query+Lifeweb}}",
+   "apihelp-query+LifeWeb-example-2": 
"{{doc-apihelp-example|query+Lifeweb}}"
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Athena[master]: Update Maintenance scripts to use requireExtension()

2016-12-26 Thread Subins2000 (Code Review)

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

Change subject: Update Maintenance scripts to use requireExtension()
..

Update Maintenance scripts to use requireExtension()

Maintenance scripts has been updated to use $this->requireExtension()

Bug: T152139
Change-Id: If9709e6df7356e58c67af5cb616967cd0ee9f3d8
---
M data/Erichthonius.php
M data/Polymatheia.php
M data/PolymatheiaDeleted.php
M data/Reinforce.php
M data/ReinforceData.php
M data/fixLanguage.php
M data/fixUserAge.php
M data/generateLanguages.php
M data/generateSyntaxes.php
M data/getSpamData.php
10 files changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/data/Erichthonius.php b/data/Erichthonius.php
index 2959e83..ab01975 100644
--- a/data/Erichthonius.php
+++ b/data/Erichthonius.php
@@ -25,6 +25,7 @@
 
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'Athena' );
$this->mDescription = 'Adds the new pages in the given json 
file to the site, with the given user and language contexts';
}
 
diff --git a/data/Polymatheia.php b/data/Polymatheia.php
index 588b532..1ae9b37 100644
--- a/data/Polymatheia.php
+++ b/data/Polymatheia.php
@@ -24,6 +24,7 @@
 class Polymatheia extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'Athena' );
$this->mDescription = 'Gets all the new page info for a given 
site';
}
 
diff --git a/data/PolymatheiaDeleted.php b/data/PolymatheiaDeleted.php
index bf18e0e..b71c709 100644
--- a/data/PolymatheiaDeleted.php
+++ b/data/PolymatheiaDeleted.php
@@ -24,6 +24,7 @@
 class Polymatheia extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'Athena' );
$this->mDescription = 'Gets all the new page info for a given 
site that has been deleted';
}
 
diff --git a/data/Reinforce.php b/data/Reinforce.php
index 46a8685..cfdb65f 100644
--- a/data/Reinforce.php
+++ b/data/Reinforce.php
@@ -7,6 +7,7 @@
 
 public function __construct() {
 parent::__construct();
+$this->requireExtension( 'Athena' );
 $this->mDescription = 'Adds the new pages in the given json file to 
the site, with the given user and language contexts';
 }
 
diff --git a/data/ReinforceData.php b/data/ReinforceData.php
index 30838fe..8b64804 100644
--- a/data/ReinforceData.php
+++ b/data/ReinforceData.php
@@ -6,6 +6,7 @@
 class ReinforceData extends Maintenance {
 public function __construct() {
 parent::__construct();
+$this->requireExtension( 'Athena' );
 $this->mDescription = 'Reinforces based on existing data';
 }
 
diff --git a/data/fixLanguage.php b/data/fixLanguage.php
index ba7cd66..9f77ef3 100644
--- a/data/fixLanguage.php
+++ b/data/fixLanguage.php
@@ -15,6 +15,7 @@
 class fixLanguage extends Maintenance {
 public function __construct() {
 parent::__construct();
+$this->requireExtension( 'Athena' );
 $this->mDescription = 'Fixes a bug that caused al_language to be the 
wrong value';
 }
 
diff --git a/data/fixUserAge.php b/data/fixUserAge.php
index a805094..2161329 100644
--- a/data/fixUserAge.php
+++ b/data/fixUserAge.php
@@ -15,6 +15,7 @@
 class fixUserAge extends Maintenance {
public function __construct() {
parent::__construct();
+$this->requireExtension( 'Athena' );
$this->mDescription = 'Fixes a bug that caused user and 
spamanduser stats to classify the same thing differently';
}
 
diff --git a/data/generateLanguages.php b/data/generateLanguages.php
index 9ffd5d1..60339d5 100644
--- a/data/generateLanguages.php
+++ b/data/generateLanguages.php
@@ -16,6 +16,7 @@
 class generateLanguages extends Maintenance {
 public function __construct() {
 parent::__construct();
+$this->requireExtension( 'Athena' );
 $this->mDescription = 'Fixes a bug that caused al_language to be the 
wrong value';
 }
 
diff --git a/data/generateSyntaxes.php b/data/generateSyntaxes.php
index 7c505f6..e894046 100644
--- a/data/generateSyntaxes.php
+++ b/data/generateSyntaxes.php
@@ -16,6 +16,7 @@
 class generateSyntaxes extends Maintenance {
 public function __construct() {
 parent::__construct();
+$this->requireExtension( 'Athena' );
 $this->mDescription = 'Generate syntax field for variables';
 }
 
diff --git a/data/getSpamData.php b/data/getSpamData.php
index 363f83f..b95e581 100644
--- a/data/getSpamData.php
+++ b/data/getSpamData.php
@@ -6,6 +6,7 @@
 class getSpamData extends Maintenance {
 public function __construct() {

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: moved Exception classes from ContentHandler.php

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: moved Exception classes from ContentHandler.php
..


moved Exception classes from ContentHandler.php

Bug: T153243
Change-Id: Ieb37b34e76441c5f68ec565c43421c50ac9be7e7
---
M autoload.php
M includes/content/ContentHandler.php
A includes/exception/MWContentSerializationException.php
A includes/exception/MWUnknownContentModelException.php
4 files changed, 37 insertions(+), 37 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 38bf7cd..43e4037 100644
--- a/autoload.php
+++ b/autoload.php
@@ -778,7 +778,7 @@
'LongPagesPage' => __DIR__ . '/includes/specials/SpecialLongpages.php',
'MIMEsearchPage' => __DIR__ . 
'/includes/specials/SpecialMIMEsearch.php',
'MWCallableUpdate' => __DIR__ . 
'/includes/deferred/MWCallableUpdate.php',
-   'MWContentSerializationException' => __DIR__ . 
'/includes/content/ContentHandler.php',
+   'MWContentSerializationException' => __DIR__ . 
'/includes/exception/MWContentSerializationException.php',
'MWCryptHKDF' => __DIR__ . '/includes/utils/MWCryptHKDF.php',
'MWCryptHash' => __DIR__ . '/includes/libs/MWCryptHash.php',
'MWCryptRand' => __DIR__ . '/includes/utils/MWCryptRand.php',
@@ -799,7 +799,7 @@
'MWSaltedPassword' => __DIR__ . 
'/includes/password/MWSaltedPassword.php',
'MWTidy' => __DIR__ . '/includes/parser/MWTidy.php',
'MWTimestamp' => __DIR__ . '/includes/MWTimestamp.php',
-   'MWUnknownContentModelException' => __DIR__ . 
'/includes/content/ContentHandler.php',
+   'MWUnknownContentModelException' => __DIR__ . 
'/includes/exception/MWUnknownContentModelException.php',
'MachineReadableRCFeedFormatter' => __DIR__ . 
'/includes/rcfeed/MachineReadableRCFeedFormatter.php',
'MagicWord' => __DIR__ . '/includes/MagicWord.php',
'MagicWordArray' => __DIR__ . '/includes/MagicWordArray.php',
diff --git a/includes/content/ContentHandler.php 
b/includes/content/ContentHandler.php
index 3389a00..db20f51 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -27,41 +27,6 @@
  *
  * @author Daniel Kinzler
  */
-
-/**
- * Exception representing a failure to serialize or unserialize a content 
object.
- *
- * @ingroup Content
- */
-class MWContentSerializationException extends MWException {
-}
-
-/**
- * Exception thrown when an unregistered content model is requested. This error
- * can be triggered by user input, so a separate exception class is provided so
- * callers can substitute a context-specific, internationalised error message.
- *
- * @ingroup Content
- * @since 1.27
- */
-class MWUnknownContentModelException extends MWException {
-   /** @var string The name of the unknown content model */
-   private $modelId;
-
-   /** @param string $modelId */
-   function __construct( $modelId ) {
-   parent::__construct( "The content model '$modelId' is not 
registered on this wiki.\n" .
-   'See https://www.mediawiki.org/wiki/Content_handlers to 
find out which extensions ' .
-   'handle this content model.' );
-   $this->modelId = $modelId;
-   }
-
-   /** @return string */
-   public function getModelId() {
-   return $this->modelId;
-   }
-}
-
 /**
  * A content handler knows how do deal with a specific type of content on a 
wiki
  * page. Content is stored in the database in a serialized form (using a
diff --git a/includes/exception/MWContentSerializationException.php 
b/includes/exception/MWContentSerializationException.php
new file mode 100644
index 000..ed3bd27
--- /dev/null
+++ b/includes/exception/MWContentSerializationException.php
@@ -0,0 +1,9 @@
+https://www.mediawiki.org/wiki/Content_handlers to 
find out which extensions ' .
+   'handle this content model.' );
+   $this->modelId = $modelId;
+   }
+   /** @return string */
+   public function getModelId() {
+   return $this->modelId;
+   }
+}
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb37b34e76441c5f68ec565c43421c50ac9be7e7
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mynk-96 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Divadsn 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedSearch[master]: Update Maintenance scripts to use requireExtension()

2016-12-26 Thread Subins2000 (Code Review)

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

Change subject: Update Maintenance scripts to use requireExtension()
..

Update Maintenance scripts to use requireExtension()

Maintenance scripts has been updated to use $this->requireExtension()

Bug: T152139
Change-Id: Ic8a456a0bdfef06d1cf8ed33ca49f574160f3ad1
---
M maintenance/initBackends.php
M maintenance/rebuildIndex.php
2 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/maintenance/initBackends.php b/maintenance/initBackends.php
index ce3b603..a2afb86 100644
--- a/maintenance/initBackends.php
+++ b/maintenance/initBackends.php
@@ -6,6 +6,11 @@
 
 class initBackends extends Maintenance {
 
+   public function __construct() {
+   parent::__construct();
+   $this->requireExtension( "BlueSpiceExtendedSearch" );
+   }
+
public function execute() {
$this->output( 'This will delete and recreate all registered 
indices! Starting in ... ' );
wfCountDown( 5 );
diff --git a/maintenance/rebuildIndex.php b/maintenance/rebuildIndex.php
index 1fad096..152a258 100644
--- a/maintenance/rebuildIndex.php
+++ b/maintenance/rebuildIndex.php
@@ -10,6 +10,7 @@
 
public function __construct() {
parent::__construct();
+   $this->requireExtension( "BlueSpiceExtendedSearch" );
$this->addOption( 'sources', "Only these sources will be 
re-indexed. Need to be specified in form of '/'", false, true );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8a456a0bdfef06d1cf8ed33ca49f574160f3ad1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Subins2000 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Update Maintenance scripts to use requireExtension()

2016-12-26 Thread Subins2000 (Code Review)

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

Change subject: Update Maintenance scripts to use requireExtension()
..

Update Maintenance scripts to use requireExtension()

Maintenance scripts has been updated to use $this->requireExtension()

Bug: T152139
Change-Id: I93a0483dbacec4fd3de0c19505703f5f942d40ef
---
M ban.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/ban.php b/ban.php
index ad5e419..f14389f 100644
--- a/ban.php
+++ b/ban.php
@@ -5,6 +5,7 @@
 class BanHammer extends Maintenance {
public function __construct() {
parent::__construct();
+   $this->requireExtension( "BlockAndNuke" );
$this->addOption( "hammer", "Actually ban and nuke the entries, 
will dry run otherwise" );
$this->addOption( "brief",  "Skip all the nitty-gritty details" 
);
$this->mDescription = "Block and Nuke recent users not found in 
the whitelist.";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93a0483dbacec4fd3de0c19505703f5f942d40ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: Subins2000 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace &$this with $this in MediaWiki/core hook system

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Replace &$this with $this in MediaWiki/core hook system
..


Replace &$this with $this in MediaWiki/core hook system

Bug: T153505
Change-Id: Ie287adf8b1d384aa651c659a9d385877379a0f11
---
M includes/page/Article.php
M includes/page/CategoryPage.php
M includes/page/ImagePage.php
M includes/page/WikiPage.php
4 files changed, 66 insertions(+), 18 deletions(-)

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



diff --git a/includes/page/Article.php b/includes/page/Article.php
index 6e3bace..4bcb655 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -388,9 +388,12 @@
$this->mContentObject = $content;
$this->mRevIdFetched = $this->mRevision->getId();
 
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $articlePage = $this;
+
ContentHandler::runLegacyHooks(
'ArticleAfterFetchContentObject',
-   [ &$this, &$this->mContentObject ],
+   [ &$articlePage, &$this->mContentObject ],
'1.21'
);
 
@@ -525,7 +528,9 @@
while ( !$outputDone && ++$pass ) {
switch ( $pass ) {
case 1:
-   Hooks::run( 'ArticleViewHeader', [ 
&$this, &$outputDone, &$useParserCache ] );
+   // Avoid PHP 7.1 warning of passing 
$this by reference
+   $articlePage = $this;
+   Hooks::run( 'ArticleViewHeader', [ 
&$articlePage, &$outputDone, &$useParserCache ] );
break;
case 2:
# Early abort if the page doesn't exist
@@ -863,9 +868,12 @@
$redirectTargetUrl = $this->getTitle()->getLinkURL( $query );
 
if ( isset( $this->mRedirectedFrom ) ) {
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $articlePage = $this;
+
// This is an internally redirected page view.
// We'll need a backlink to the source page for 
navigation.
-   if ( Hooks::run( 'ArticleViewRedirect', [ &$this ] ) ) {
+   if ( Hooks::run( 'ArticleViewRedirect', [ &$articlePage 
] ) ) {
$redir = Linker::linkKnown(
$this->mRedirectedFrom,
null,
@@ -1295,7 +1303,10 @@
 * @param int $oldid Revision ID of this article revision
 */
public function setOldSubtitle( $oldid = 0 ) {
-   if ( !Hooks::run( 'DisplayOldSubtitle', [ &$this, &$oldid ] ) ) 
{
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $articlePage = $this;
+
+   if ( !Hooks::run( 'DisplayOldSubtitle', [ &$articlePage, 
&$oldid ] ) ) {
return;
}
 
@@ -1858,7 +1869,9 @@
&& !$this->mRedirectedFrom && 
!$this->getTitle()->isRedirect();
// Extension may have reason to disable file caching on 
some pages.
if ( $cacheable ) {
-   $cacheable = Hooks::run( 'IsFileCacheable', [ 
&$this ] );
+   // Avoid PHP 7.1 warning of passing $this by 
reference
+   $articlePage = $this;
+   $cacheable = Hooks::run( 'IsFileCacheable', [ 
&$articlePage ] );
}
}
 
diff --git a/includes/page/CategoryPage.php b/includes/page/CategoryPage.php
index 6d2be51..ccc50f7 100644
--- a/includes/page/CategoryPage.php
+++ b/includes/page/CategoryPage.php
@@ -54,7 +54,10 @@
return;
}
 
-   if ( !Hooks::run( 'CategoryPageView', [ &$this ] ) ) {
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $categoryPage = $this;
+
+   if ( !Hooks::run( 'CategoryPageView', [ &$categoryPage ] ) ) {
return;
}
 
diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index db3ec14..b60b010 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -69,6 +69,7 @@
$this->fileLoaded = true;
 
$this->displayImg = $img = false;
+
Hooks::run( 'ImagePageFindFile', [ $this, &$img, 
&$this->displayImg ] );
if ( !$img ) { // not set by hook?
$img = wfFindFile(

[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: Update Maintenance scripts to use requireExtension()

2016-12-26 Thread Subins2000 (Code Review)

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

Change subject: Update Maintenance scripts to use requireExtension()
..

Update Maintenance scripts to use requireExtension()

Maintenance scripts has been updated to use $this->requireExtension()

Change-Id: I8da804ec23dbaa97a2eeb9a7d50f3d3271522b5a
---
M maintenance/archiveFeedback.php
M maintenance/legacyToShard.php
M maintenance/loggingUpdate.php
M maintenance/purgeCache.php
M maintenance/rebuildCheckUser.php
M maintenance/setArchiveDate.php
6 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/maintenance/archiveFeedback.php b/maintenance/archiveFeedback.php
index 2c5f36a..d920f5e 100644
--- a/maintenance/archiveFeedback.php
+++ b/maintenance/archiveFeedback.php
@@ -36,6 +36,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Mark old feedback that is not 
particularly interesting as archived.';
}
 
diff --git a/maintenance/legacyToShard.php b/maintenance/legacyToShard.php
index 5034a18..557d366 100644
--- a/maintenance/legacyToShard.php
+++ b/maintenance/legacyToShard.php
@@ -37,6 +37,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Move all relevant legacy data stored in 
aft_article_* tables to the aft_feedback table that will be sharded.';
}
 
diff --git a/maintenance/loggingUpdate.php b/maintenance/loggingUpdate.php
index 04934fc..b614326 100644
--- a/maintenance/loggingUpdate.php
+++ b/maintenance/loggingUpdate.php
@@ -37,6 +37,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Rebuild existing logging.log_params data 
to form a serialized array with feedback id & page id';
}
 
diff --git a/maintenance/purgeCache.php b/maintenance/purgeCache.php
index f4cb6bc..760b479 100644
--- a/maintenance/purgeCache.php
+++ b/maintenance/purgeCache.php
@@ -18,6 +18,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
 
$this->deleteOption( 'model' );
$this->mDescription = 'Purge all ArticleFeedbackv5 caches.';
diff --git a/maintenance/rebuildCheckUser.php b/maintenance/rebuildCheckUser.php
index c0c0a61..4d3937f 100644
--- a/maintenance/rebuildCheckUser.php
+++ b/maintenance/rebuildCheckUser.php
@@ -37,6 +37,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Rebuild checkuser actiontext & logging 
usernames (based on checkuser data)';
}
 
diff --git a/maintenance/setArchiveDate.php b/maintenance/setArchiveDate.php
index 0a9333c..7419c41 100644
--- a/maintenance/setArchiveDate.php
+++ b/maintenance/setArchiveDate.php
@@ -36,6 +36,7 @@
 */
public function __construct() {
parent::__construct();
+   $this->requireExtension( 'ArticleFeedbackv5' );
$this->mDescription = 'Fix archive dates of pre-auto-archive 
feedback.';
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8da804ec23dbaa97a2eeb9a7d50f3d3271522b5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Subins2000 

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

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Removed unused SpecialNewsletter:getNewsletterActionButtons()

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Removed unused SpecialNewsletter:getNewsletterActionButtons()
..


Removed unused SpecialNewsletter:getNewsletterActionButtons()

Bug: T154120
Change-Id: I7b49641eaab564b9ce45f007cc188c18bb1a1742
---
M includes/specials/SpecialNewsletter.php
1 file changed, 0 insertions(+), 54 deletions(-)

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



diff --git a/includes/specials/SpecialNewsletter.php 
b/includes/specials/SpecialNewsletter.php
index 811ddc5..42fd2d2 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -186,60 +186,6 @@
}
 
/**
-* Build a group of buttons: Manage, Subscribe|Unsubscribe
-* Buttons will be showed to the user only if they are relevant to the 
current user.
-*
-* @return string HTML for the button group
-*/
-   protected function getNewsletterActionButtons() {
-   $user = $this->getUser();
-   $id = $this->newsletter->getId();
-   $buttons = array();
-   $this->getOutput()->enableOOUI();
-
-   if ( $this->newsletter->canManage( $user ) ) {
-   $buttons[] = new OOUI\ButtonWidget(
-   array(
-   'label' => $this->msg( 
'newsletter-manage-button' )->escaped(),
-   'icon' => 'settings',
-   'href' => Title::makeTitleSafe( 
NS_NEWSLETTER, $this->newsletter->getName() )->getEditURL(),
-   )
-   );
-   }
-
-   if ( $this->newsletter->isPublisher( $user ) ) {
-   $buttons[] = new OOUI\ButtonWidget(
-   array(
-   'label' => $this->msg( 
'newsletter-announce-button' )->escaped(),
-   'icon' => 'comment',
-   'href' => $this->getPageTitle( $id . 
'/' . self::NEWSLETTER_ANNOUNCE )->getFullURL()
-   )
-   );
-   }
-
-   if ( $this->newsletter->isSubscribed( $user ) ) {
-   $buttons[] = new OOUI\ButtonWidget(
-   array(
-   'label' => $this->msg( 
'newsletter-unsubscribe-button' )->escaped(),
-   'flags' => array( 'destructive' ),
-   'href' => $this->getPageTitle( $id . 
'/' . self::NEWSLETTER_UNSUBSCRIBE )->getFullURL()
-   )
-   );
-   } else {
-   $buttons[] = new OOUI\ButtonWidget(
-   array(
-   'label' => $this->msg( 
'newsletter-subscribe-button' )->escaped(),
-   'flags' => array( 'constructive' ),
-   'href' => $this->getPageTitle( $id . 
'/' . self::NEWSLETTER_SUBSCRIBE )->getFullURL()
-   )
-   );
-   }
-
-   $widget = new OOUI\ButtonGroupWidget( array( 'items' =>  
$buttons ) );
-   return $widget->toString();
-   }
-
-   /**
 * Build the (un)subscribe form for Special:Newsletter/$id/(un)subscribe
 * The actual form showed will be switched depending on whether the 
current
 * user is subscribed or not.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b49641eaab564b9ce45f007cc188c18bb1a1742
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Filip 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "tools: store verbose logrotate logs"

2016-12-26 Thread Tim Landscheidt (Code Review)

Hello Yuvipanda, Merlijn van Deen, jenkins-bot, Coren,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "tools: store verbose logrotate logs"
..

Revert "tools: store verbose logrotate logs"

The changes to the cron file apparently did not produce debugging
output, and the underlying issue has mostly gone away, if not
completely.  Restoring /etc/cron.daily/logrotate will be done by
manually running:

| sudo rm -f /etc/cron.daily/logrotate &&
| sudo apt-get --reinstall -o Dpkg::Options::=--force-confmiss install logrotate

on all Tools instances with clush after this change has been merged.

Bug: T96007
Change-Id: Ia1a045952b34ed16d774c3e26a8b24dfd503724d
---
D modules/toollabs/files/logrotate.crondaily
M modules/toollabs/manifests/init.pp
2 files changed, 0 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/329217/1

diff --git a/modules/toollabs/files/logrotate.crondaily 
b/modules/toollabs/files/logrotate.crondaily
deleted file mode 100644
index 964b2b2..000
--- a/modules/toollabs/files/logrotate.crondaily
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# This file is managed by Puppet.
-# Based on logrotate-bundled cron file, Version: 3.8.7-1ubuntu1
-# Clean non existent log file entries from status file
-cd /var/lib/logrotate
-test -e status || touch status
-head -1 status > status.clean
-sed 's/"//g' status | while read logfile date
-do
-[ -e "$logfile" ] && echo "\"$logfile\" $date"
-done >> status.clean
-mv status.clean status
-
-test -x /usr/sbin/logrotate || exit 0
-# > instead of >> to clear logrotate.log daily
-# copy output to stderr on non-zero exit code to trigger a cron email
-/usr/sbin/logrotate -v /etc/logrotate.conf > /var/log/logrotate.log 2>&1 || 
cat /var/log/logrotate.log >&2
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 27ec24a..19979fe 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -207,14 +207,5 @@
 source => 'puppet:///modules/toollabs/40-tools-sudoers-no-warning',
 }
 
-file { '/etc/cron.daily/logrotate':
-ensure  => file,
-mode=> '0664',
-owner   => 'root',
-group   => 'root',
-source  => 'puppet:///modules/toollabs/logrotate.crondaily',
-require => Package['logrotate']
-}
-
 diamond::collector::localcrontab { 'localcrontabcollector': }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1a045952b34ed16d774c3e26a8b24dfd503724d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Merlijn van Deen 
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] mediawiki...BiblioPlus[master]: Fix mixed whitespace in indentation

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Fix mixed whitespace in indentation
..


Fix mixed whitespace in indentation

Made code indentation all tabs instead of spaces.

Bug: T153581
Change-Id: Ie5e7d81810c401650d2c2a6116b1c7240500869f
---
M BiblioPlus.body.php
M BiblioPlus.php
M resources/ext.biblioPlus.min.css
3 files changed, 495 insertions(+), 495 deletions(-)

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



diff --git a/BiblioPlus.body.php b/BiblioPlus.body.php
index 2ec5c3a..db2fb25 100644
--- a/BiblioPlus.body.php
+++ b/BiblioPlus.body.php
@@ -10,9 +10,9 @@
/**
* @var array $citations: Management of the citation indices (order in 
which they appear in the text).
*/
-public $citations = array();
+   public $citations = array();
 
-/**
+   /**
* Returns an array element with index $key, or null if it does not 
exist.
*
* @param array $array: The array to search.
@@ -20,12 +20,12 @@
* @return array element|null: The array element, or null if the key 
does not exist.
*/
function get( $array, $key ) {
-if ( is_array( $array ) && array_key_exists( $key, $array ) ) {
-return $array[$key];
+   if ( is_array( $array ) && array_key_exists( $key, $array ) ) {
+   return $array[$key];
} else {
-return NULL;
+   return NULL;
}
-}
+   }
 
/**
* Removes the brackets from around a link.
@@ -33,11 +33,11 @@
* @param string $link: The link to remove the brackets from.
* @return string: The link with any brackets removed.
*/
-function unbracket( $link ) {
-$matches = array();
-preg_match( '/ \[ ( [^\]]* ) \] /sx', $link, $matches );
-return $matches[1];
-}
+   function unbracket( $link ) {
+   $matches = array();
+   preg_match( '/ \[ ( [^\]]* ) \] /sx', $link, $matches );
+   return $matches[1];
+   }
 
/**
* Converts a link (http://a.b.c or [internal] or [inter:wiki]) to a URL.
@@ -46,16 +46,16 @@
* @param string $query: An additional CGI parameter, such as 
"action=raw".
* @return string: The link, converted to a URL.
*/
-function makeUrl( $link, $query = '' ) {
-$m = $this->unbracket( $link );
-if ( isset( $m ) ) {
-$title = Title::newFromText( $m );
-$url = $title->getFullURL( $query );
-return $url;
-} else {
-return $link;
+   function makeUrl( $link, $query = '' ) {
+   $m = $this->unbracket( $link );
+   if ( isset( $m ) ) {
+   $title = Title::newFromText( $m );
+   $url = $title->getFullURL( $query );
+   return $url;
+   } else {
+   return $link;
}
-}
+   }
 
/**
* Reads text from a URL and returns it as a string.
@@ -63,14 +63,14 @@
* @param string $url: The URL to call.
* @return string: The contents of the URL as a string.
*/
-function fetchUrl( $url ) {
+   function fetchUrl( $url ) {
wfSuppressWarnings();
-$oldUrlFopen = ini_set( 'allow_url_fopen', true );
-$result = implode( '', file( $url ) );
-ini_set( 'allow_url_fopen', $oldUrlFopen );
+   $oldUrlFopen = ini_set( 'allow_url_fopen', true );
+   $result = implode( '', file( $url ) );
+   ini_set( 'allow_url_fopen', $oldUrlFopen );
wfRestoreWarnings();
-return $result;
-}
+   return $result;
+   }
 
/**
* Returns the source code of a local wiki page.
@@ -78,10 +78,10 @@
* @param Title $title: The title of the wiki page.
* @return string: The source code of the input page.
*/
-function fetchPage( $title ) {
-$rev = Revision::newFromTitle( $title );
-return ContentHandler::getContentText( $rev->getContent() );
-}
+   function fetchPage( $title ) {
+   $rev = Revision::newFromTitle( $title );
+   return ContentHandler::getContentText( $rev->getContent() );
+   }
 
/**
* Returns the number of the reference if already cited, or
@@ -91,19 +91,19 @@
* @param boolean $create: Indicates whether or not a new reference 
number should be created.
* @return integer: The reference number, or -1 if one was not created.
*/
-function citationIndex( $key, $create = true ) {
-if ( array_key_exists( $key, $this->citations ) ) {
-// ref was already cited
-return $this->citations[$key];
-

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Removed unused SpecialNewsletter:getNewsletterActionButtons()

2016-12-26 Thread Filip (Code Review)

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

Change subject: Removed unused SpecialNewsletter:getNewsletterActionButtons()
..

Removed unused SpecialNewsletter:getNewsletterActionButtons()

Bug: T154120
Change-Id: I7b49641eaab564b9ce45f007cc188c18bb1a1742
---
M includes/specials/SpecialNewsletter.php
1 file changed, 0 insertions(+), 66 deletions(-)


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

diff --git a/includes/specials/SpecialNewsletter.php 
b/includes/specials/SpecialNewsletter.php
index 811ddc5..c94d22c 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -91,72 +91,6 @@
}
 
/**
-* Get the navigation links shown in the subtitle
-*
-* @param string|null $current subpage currently being shown, null if 
default "view" page
-*/
-   protected function getNavigationLinks( $current ) {
-   $linkRenderer = $this->getLinkRenderer();
-   $listLink = $linkRenderer->makeKnownLink(
-   SpecialPage::getTitleFor( 'Newsletters' ),
-   $this->msg( 'backlinksubtitle',
-   $this->msg( 'newsletter-subtitlelinks-list' 
)->text()
-   )->text()
-   );
-   if ( $current === null ) {
-   // We've the fancy buttons on the default "view" page 
so don't
-   // add redundant navigation links and fast return here
-   return $listLink;
-   }
-
-   // Build the links taking the current user's access levels into 
account
-   $user = $this->getUser();
-   $actions = array();
-   if ( $user->isLoggedIn() ) {
-   $actions[] = $this->newsletter->isSubscribed( $user )
-   ? self::NEWSLETTER_UNSUBSCRIBE
-   : self::NEWSLETTER_SUBSCRIBE;
-   }
-   if ( $this->newsletter->isPublisher( $user ) ) {
-   $actions[] = self::NEWSLETTER_ANNOUNCE;
-   }
-   if ( $this->newsletter->canManage( $user ) ) {
-   $actions[] = self::NEWSLETTER_MANAGE;
-   $actions[] = self::NEWSLETTER_SUBSCRIBERS;
-   }
-
-   $links = array();
-   foreach ( $actions as $action ) {
-   $title = $this->getPageTitle( 
$this->newsletter->getId() . '/' . $action );
-   // Messages used here: 
'newsletter-subtitlelinks-announce',
-   // 'newsletter-subtitlelinks-subscribe', 
'newsletter-subtitlelinks-unsubscribe'
-   // 'newsletter-subtitlelinks-manage'
-   $msg = $this->msg( 'newsletter-subtitlelinks-' . 
$action )->text();
-   $link = $linkRenderer->makeKnownLink( $title, $msg );
-   if ( $action == self::NEWSLETTER_MANAGE ) {
-   $title = Title::makeTitleSafe( NS_NEWSLETTER, 
$this->newsletter->getName() );
-   $msg = $this->msg( 'newsletter-subtitlelinks-' 
. $action )->text();
-   $link = $linkRenderer->makeKnownLink( $title, 
$msg, [], ['action'=>'edit'] );
-   }
-   if ( $current === $action ) {
-   $links[] = Linker::makeSelfLinkObj( $title, 
$msg );
-   } else {
-
-   $links[] = $link;
-   }
-   }
-
-   $newsletterLinks = $linkRenderer->makeKnownLink(
-   Title::makeTitleSafe( NS_NEWSLETTER, 
$this->newsletter->getName() ),
-   $this->getName()
-   ) . ' ' . $this->msg( 'parentheses' )
-   ->rawParams( $this->getLanguage()->pipeList( $links ) )
-   ->text();
-
-   return $this->getLanguage()->pipeList( array( $listLink, 
$newsletterLinks ) );
-   }
-
-   /**
 * Create a common HTMLForm which can be used by specific page actions
 *
 * @param array $fields array of form fields

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b49641eaab564b9ce45f007cc188c18bb1a1742
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Filip 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 296da9a

2016-12-26 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 296da9a
..


Update restbase to 296da9a

List of changes:
1f5d920 it.wp: Blacklist Utente:Effems/Sandbox7
296da9a commons: Blacklist User:Stunteltje/gallery

Change-Id: I57f278aa686946bf2b7e5c15d238980c490c836f
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/restbase b/restbase
index 21b3282..296da9a 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 21b328235d972b4b43d6967d8ccd5564c81642a7
+Subproject commit 296da9a0d3b20d92fef51125b1e3196a9fd136ee

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57f278aa686946bf2b7e5c15d238980c490c836f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 296da9a

2016-12-26 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 296da9a
..

Update restbase to 296da9a

List of changes:
1f5d920 it.wp: Blacklist Utente:Effems/Sandbox7
296da9a commons: Blacklist User:Stunteltje/gallery

Change-Id: I57f278aa686946bf2b7e5c15d238980c490c836f
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/restbase b/restbase
index 21b3282..296da9a 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 21b328235d972b4b43d6967d8ccd5564c81642a7
+Subproject commit 296da9a0d3b20d92fef51125b1e3196a9fd136ee

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57f278aa686946bf2b7e5c15d238980c490c836f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-12-26T10:00:01+0000

2016-12-26 Thread WikidataBuilder (Code Review)

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

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

New Wikidata Build - 2016-12-26T10:00:01+

Change-Id: I2b9dc847b48c29b3f8e5ab7dba5ebdfccc1b9f5d
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/es.json
M extensions/MediaInfo/i18n/es.json
M extensions/Wikibase/client/i18n/diq.json
A extensions/Wikibase/client/i18n/hif-latn.json
M extensions/Wikibase/client/i18n/lez.json
M extensions/Wikibase/repo/i18n/ar.json
M extensions/Wikibase/repo/i18n/eo.json
M extensions/Wikibase/repo/i18n/fr.json
A extensions/Wikibase/repo/i18n/hif-latn.json
M vendor/composer/installed.json
11 files changed, 69 insertions(+), 27 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index e4b880d..46e214b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -797,12 +797,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "75a2540c6f19488a630a4f871c01912dd26f1c21"
+"reference": "8f6aad4613af7e8cf359a88decfdb6d3b32c7162"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/75a2540c6f19488a630a4f871c01912dd26f1c21;,
-"reference": "75a2540c6f19488a630a4f871c01912dd26f1c21",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/8f6aad4613af7e8cf359a88decfdb6d3b32c7162;,
+"reference": "8f6aad4613af7e8cf359a88decfdb6d3b32c7162",
 "shasum": ""
 },
 "require-dev": {
@@ -827,7 +827,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2016-12-23 21:28:55"
+"time": "2016-12-25 21:14:56"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -1436,7 +1436,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo;,
-"reference": "3cf7999fb43ca1d0ea8d8c8edcf019869efa1cc4"
+"reference": "45084f3b4c4ab92c1a2fce1521669ed6deb2183e"
 },
 "require": {
 "php": ">=5.5.0",
@@ -1482,7 +1482,7 @@
 "issues": "https://phabricator.wikimedia.org/;,
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2016-12-22 16:19:17"
+"time": "2016-12-25 21:21:05"
 },
 {
 "name": "wikibase/quality",
@@ -1585,12 +1585,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "a124205bfeb66e062cbb336b178526ea58a0753e"
+"reference": "b9466b234af2698627c5595a3ec979c3ed7c9bc8"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a124205bfeb66e062cbb336b178526ea58a0753e;,
-"reference": "a124205bfeb66e062cbb336b178526ea58a0753e",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/b9466b234af2698627c5595a3ec979c3ed7c9bc8;,
+"reference": "b9466b234af2698627c5595a3ec979c3ed7c9bc8",
 "shasum": ""
 },
 "require": {
@@ -1663,7 +1663,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-12-24 21:41:18"
+"time": "2016-12-25 21:20:56"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/i18n/es.json 
b/extensions/ArticlePlaceholder/i18n/es.json
index d51be4f..709f407 100644
--- a/extensions/ArticlePlaceholder/i18n/es.json
+++ b/extensions/ArticlePlaceholder/i18n/es.json
@@ -2,7 +2,8 @@
"@metadata": {
"authors": [
"Macofe",
-   "SinNovedades"
+   "SinNovedades",
+   "Dgstranz"
]
},
"createtopicpage": "Crear página",
@@ -16,6 +17,7 @@
"articleplaceholder-abouttopic-create-article-label": "Título del 
artículo",
"articleplaceholder-abouttopic-create-article-mandatory": "El título 
del

[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Add button to select and copy share/embed text to clipboard

2016-12-26 Thread jenkins-bot (Code Review)

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

Change subject: Add button to select and copy share/embed text to clipboard
..


Add button to select and copy share/embed text to clipboard

Clipboard icon adapted from modules/tools/images/pasting.svg from the
ContentTranslation extension.

Also adjusts some margins to better separate embed code box from embed
options

Bug: T77295
Change-Id: Ic7a11eab6ecc767ad4d80b94a7b62578d535d047
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A resources/mmv/ui/img/pasting-hover.svg
A resources/mmv/ui/img/pasting.svg
M resources/mmv/ui/mmv.ui.reuse.dialog.less
M resources/mmv/ui/mmv.ui.reuse.embed.js
M resources/mmv/ui/mmv.ui.reuse.embed.less
M resources/mmv/ui/mmv.ui.reuse.share.js
M resources/mmv/ui/mmv.ui.reuse.share.less
10 files changed, 224 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 0beefd2..cc0f826 100644
--- a/extension.json
+++ b/extension.json
@@ -278,6 +278,7 @@
"mmv/ui/mmv.ui.reuse.shareembed.less"
],
"dependencies": [
+   "jquery.tipsy",
"oojs",
"oojs-ui",
"mediawiki.user",
@@ -290,6 +291,8 @@
"multimediaviewer-link-to-file",
"multimediaviewer-link-to-page",
"multimediaviewer-reuse-loading-placeholder",
+   "multimediaviewer-reuse-copy-share",
+   "multimediaviewer-reuse-copy-embed",
"multimediaviewer-embed-tab",
"multimediaviewer-embed-html",
"multimediaviewer-embed-wt",
diff --git a/i18n/en.json b/i18n/en.json
index e7d7ac5..f6c6f03 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -76,6 +76,8 @@
"multimediaviewer-geolocation": "Location: $1",
"multimediaviewer-reuse-link": "Share or embed this file",
"multimediaviewer-reuse-loading-placeholder": "Loading…",
+   "multimediaviewer-reuse-copy-share": "Select and copy (if supported) 
the link for sharing this file",
+   "multimediaviewer-reuse-copy-embed": "Select and copy (if supported) 
the code for embedding this file",
"multimediaviewer-share-tab": "Share",
"multimediaviewer-embed-tab": "Embed",
"multimediaviewer-download-link": "Download this file",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 20a3b4c..7c9f3a9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -85,6 +85,8 @@
"multimediaviewer-geolocation": "Message for displaying a location. 
Parameters:\n* $1 - a location which is formatted by 
{{msg-mw|Multimediaviewer-geoloc-coords}}\n{{Identical|Location}}",
"multimediaviewer-reuse-link": "Text of the link on the metadata panel 
which opens the reuse panel",
"multimediaviewer-reuse-loading-placeholder": "Text that appears in all 
reuse text boxes as a placeholder while the data loads.\n{{Identical|Loading}}",
+   "multimediaviewer-reuse-copy-share": "Text of the tooltip for the 
button to select and copy the sharing link (if supported by the browser) in the 
reuse panel, that is displayed when hovered over.",
+   "multimediaviewer-reuse-copy-embed": "Text of the tooltip for the 
button to select and copy the embedding code (if supported by the browser) in 
the reuse panel, that is displayed when hovered over.",
"multimediaviewer-share-tab": "Tab title text for the file reuse panel 
- used for the section with shareable URLs.\n{{Identical|Share}}",
"multimediaviewer-embed-tab": "Tab title text for the file reuse panel 
- used for the section with embeddable HTML and wikitext.",
"multimediaviewer-download-link": "Tooltip text for file download 
dialog open button.\n{{Identical|Download}}",
diff --git a/resources/mmv/ui/img/pasting-hover.svg 
b/resources/mmv/ui/img/pasting-hover.svg
new file mode 100644
index 000..059d3cd
--- /dev/null
+++ b/resources/mmv/ui/img/pasting-hover.svg
@@ -0,0 +1,65 @@
+
+
+
+http://purl.org/dc/elements/1.1/;
+   xmlns:cc="http://creativecommons.org/ns#;
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+   xmlns:svg="http://www.w3.org/2000/svg;
+   xmlns="http://www.w3.org/2000/svg;
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape;
+   version="1.1"
+   width="18.244141"
+   height="22.457031"
+   viewBox="0 0 18.244141 22.457031"
+   id="Layer_1"
+   xml:space="preserve"
+   sodipodi:docname="pasting-hover.svg"
+   inkscape:version="0.92pre3

90 matches

Mail list logo