[MediaWiki-commits] [Gerrit] QA: Test branch to be abandoned:wq - change (mediawiki...MobileFrontend)

2014-05-22 Thread Cmcmahon (Code Review)
Cmcmahon has uploaded a new change for review.

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

Change subject: QA: Test branch to be abandoned:wq
..

QA: Test branch to be abandoned:wq

Change-Id: I224b64484009f451e189a1ad13b4413c83cbf004
---
M tests/browser/features/diff.feature
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/tests/browser/features/diff.feature 
b/tests/browser/features/diff.feature
index 0ba5997..97c1776 100644
--- a/tests/browser/features/diff.feature
+++ b/tests/browser/features/diff.feature
@@ -1,3 +1,4 @@
+This is only a test
 @chrome @en.m.wikipedia.beta.wmflabs.org @firefox @login @test2.m.wikipedia.org
 Feature: Page diff
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I224b64484009f451e189a1ad13b4413c83cbf004
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Update the class names per update jquery.uls lib - change (mediawiki...UniversalLanguageSelector)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Update the class names per update jquery.uls lib
..


Update the class names per update jquery.uls lib

jquery.uls renamed settings-block class to uls-settings-block.
Similarly icon-close to uls-icon-close

Change-Id: I39005ef2425c01b8623bf9df6d75c1e27f1c5bda
---
M resources/css/ext.uls.languagesettings.css
M resources/css/ext.uls.pt.css
M resources/js/ext.uls.interface.js
3 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/resources/css/ext.uls.languagesettings.css 
b/resources/css/ext.uls.languagesettings.css
index 270c887..223d1a1 100644
--- a/resources/css/ext.uls.languagesettings.css
+++ b/resources/css/ext.uls.languagesettings.css
@@ -1,4 +1,4 @@
-#settings-block {
+#uls-settings-block {
border-top: 1px solid #C9C9C9;
background: #f8f8f8;
background: -webkit-gradient(linear, left top, left bottom, 
from(#FBFBFB), to(#F0F0F0));
diff --git a/resources/css/ext.uls.pt.css b/resources/css/ext.uls.pt.css
index acd4197..40cabee 100644
--- a/resources/css/ext.uls.pt.css
+++ b/resources/css/ext.uls.pt.css
@@ -31,7 +31,7 @@
direction: ltr;
 }
 
-#settings-block {
+#uls-settings-block {
border-top: 1px solid #C9C9C9;
background: #f8f8f8;
background: -webkit-gradient(linear, left top, left bottom, 
from(#FBFBFB), to(#F0F0F0));
@@ -44,14 +44,14 @@
border-radius: 0 0 5px 5px;
 }
 
-#settings-block div.display-settings-block,
-#settings-block div.input-settings-block {
+#uls-settings-block div.display-settings-block,
+#uls-settings-block div.input-settings-block {
display: inline-block;
margin: 8px 15px;
color: #565656;
 }
 
-#settings-block div.display-settings-block:hover,
-#settings-block div.input-settings-block:hover {
+#uls-settings-block div.display-settings-block:hover,
+#uls-settings-block div.input-settings-block:hover {
color: #252525;
 }
diff --git a/resources/js/ext.uls.interface.js 
b/resources/js/ext.uls.interface.js
index c127547..aee6534 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -64,7 +64,7 @@
function addDisplaySettings( uls ) {
var $displaySettings = displaySettings();
 
-   uls.$menu.find( '#settings-block' ).append( $displaySettings );
+   uls.$menu.find( '#uls-settings-block' ).append( 
$displaySettings );
$displaySettings.on( 'click', function () {
var languagesettings = $displaySettings.data( 
'languagesettings' ),
displaySettingsOptions = {
@@ -102,7 +102,7 @@
function addInputSettings( uls ) {
var $inputSettings = inputSettings();
 
-   uls.$menu.find( '#settings-block' ).append( $inputSettings );
+   uls.$menu.find( '#uls-settings-block' ).append( $inputSettings 
);
$inputSettings.on( 'click', function () {
var position = uls.position(),
languagesettings = $inputSettings.data( 
'languagesettings' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39005ef2425c01b8623bf9df6d75c1e27f1c5bda
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Add symlinks - change (operations/mediawiki-config)

2014-05-22 Thread Reedy (Code Review)
Reedy has uploaded a new change for review.

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

Change subject: Add symlinks
..

Add symlinks

Change-Id: Ice4e813e4c1c939f28239bc74868567982c536e4
---
A docroot/bits/static-1.24wmf6/extensions
A docroot/bits/static-1.24wmf6/resources
A docroot/bits/static-1.24wmf6/skins
A w/static-1.24wmf6/extensions
A w/static-1.24wmf6/resources
A w/static-1.24wmf6/skins
6 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/docroot/bits/static-1.24wmf6/extensions 
b/docroot/bits/static-1.24wmf6/extensions
new file mode 12
index 000..0cc4824
--- /dev/null
+++ b/docroot/bits/static-1.24wmf6/extensions
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/extensions
\ No newline at end of file
diff --git a/docroot/bits/static-1.24wmf6/resources 
b/docroot/bits/static-1.24wmf6/resources
new file mode 12
index 000..366fbf1
--- /dev/null
+++ b/docroot/bits/static-1.24wmf6/resources
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/resources
\ No newline at end of file
diff --git a/docroot/bits/static-1.24wmf6/skins 
b/docroot/bits/static-1.24wmf6/skins
new file mode 12
index 000..f8f2523
--- /dev/null
+++ b/docroot/bits/static-1.24wmf6/skins
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/skins/
\ No newline at end of file
diff --git a/w/static-1.24wmf6/extensions b/w/static-1.24wmf6/extensions
new file mode 12
index 000..0cc4824
--- /dev/null
+++ b/w/static-1.24wmf6/extensions
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/extensions
\ No newline at end of file
diff --git a/w/static-1.24wmf6/resources b/w/static-1.24wmf6/resources
new file mode 12
index 000..366fbf1
--- /dev/null
+++ b/w/static-1.24wmf6/resources
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/resources
\ No newline at end of file
diff --git a/w/static-1.24wmf6/skins b/w/static-1.24wmf6/skins
new file mode 12
index 000..1910951
--- /dev/null
+++ b/w/static-1.24wmf6/skins
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/skins
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice4e813e4c1c939f28239bc74868567982c536e4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] testwiki to 1.24wmf6 - change (operations/mediawiki-config)

2014-05-22 Thread Reedy (Code Review)
Reedy has uploaded a new change for review.

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

Change subject: testwiki to 1.24wmf6
..

testwiki to 1.24wmf6

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


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

diff --git a/wikiversions.json b/wikiversions.json
index 58d718a..941f48d 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -734,7 +734,7 @@
 tawiktionary: php-1.24wmf5,
 tenwiki: php-1.24wmf5,
 test2wiki: php-1.24wmf5,
-testwiki: php-1.24wmf5,
+testwiki: php-1.24wmf6,
 testwikidatawiki: php-1.24wmf5,
 tetwiki: php-1.24wmf4,
 tewiki: php-1.24wmf4,
@@ -881,4 +881,4 @@
 zuwiki: php-1.24wmf4,
 zuwikibooks: php-1.24wmf5,
 zuwiktionary: php-1.24wmf5
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2a437737ad720305593d37886d16ac9b423a4ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Wikipedias to 1.24wmf5 - change (operations/mediawiki-config)

2014-05-22 Thread Reedy (Code Review)
Reedy has uploaded a new change for review.

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

Change subject: Wikipedias to 1.24wmf5
..

Wikipedias to 1.24wmf5

Change-Id: I7d37d159f6d133065672bc377ae8a815365c2825
---
M php
M wikiversions.json
2 files changed, 289 insertions(+), 289 deletions(-)


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

diff --git a/php b/php
index 54bb40d..ad6f1d0 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.24wmf4
\ No newline at end of file
+php-1.24wmf5
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 941f48d..ccc5db6 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
 {
-aawiki: php-1.24wmf4,
+aawiki: php-1.24wmf5,
 aawikibooks: php-1.24wmf5,
 aawiktionary: php-1.24wmf5,
-abwiki: php-1.24wmf4,
+abwiki: php-1.24wmf5,
 abwiktionary: php-1.24wmf5,
-acewiki: php-1.24wmf4,
+acewiki: php-1.24wmf5,
 advisorywiki: php-1.24wmf5,
-afwiki: php-1.24wmf4,
+afwiki: php-1.24wmf5,
 afwikibooks: php-1.24wmf5,
 afwikiquote: php-1.24wmf5,
 afwiktionary: php-1.24wmf5,
-akwiki: php-1.24wmf4,
+akwiki: php-1.24wmf5,
 akwikibooks: php-1.24wmf5,
 akwiktionary: php-1.24wmf5,
-alswiki: php-1.24wmf4,
+alswiki: php-1.24wmf5,
 alswikibooks: php-1.24wmf5,
 alswikiquote: php-1.24wmf5,
 alswiktionary: php-1.24wmf5,
-amwiki: php-1.24wmf4,
+amwiki: php-1.24wmf5,
 amwikiquote: php-1.24wmf5,
 amwiktionary: php-1.24wmf5,
-angwiki: php-1.24wmf4,
+angwiki: php-1.24wmf5,
 angwikibooks: php-1.24wmf5,
 angwikiquote: php-1.24wmf5,
 angwikisource: php-1.24wmf5,
 angwiktionary: php-1.24wmf5,
-anwiki: php-1.24wmf4,
+anwiki: php-1.24wmf5,
 anwiktionary: php-1.24wmf5,
 arbcom_dewiki: php-1.24wmf5,
 arbcom_enwiki: php-1.24wmf5,
 arbcom_fiwiki: php-1.24wmf5,
 arbcom_nlwiki: php-1.24wmf5,
-arcwiki: php-1.24wmf4,
-arwiki: php-1.24wmf4,
+arcwiki: php-1.24wmf5,
+arwiki: php-1.24wmf5,
 arwikibooks: php-1.24wmf5,
 arwikimedia: php-1.24wmf5,
 arwikinews: php-1.24wmf5,
@@ -40,134 +40,134 @@
 arwikisource: php-1.24wmf5,
 arwikiversity: php-1.24wmf5,
 arwiktionary: php-1.24wmf5,
-arzwiki: php-1.24wmf4,
-astwiki: php-1.24wmf4,
+arzwiki: php-1.24wmf5,
+astwiki: php-1.24wmf5,
 astwikibooks: php-1.24wmf5,
 astwikiquote: php-1.24wmf5,
 astwiktionary: php-1.24wmf5,
-aswiki: php-1.24wmf4,
+aswiki: php-1.24wmf5,
 aswikibooks: php-1.24wmf5,
 aswikisource: php-1.24wmf5,
 aswiktionary: php-1.24wmf5,
 auditcomwiki: php-1.24wmf5,
-avwiki: php-1.24wmf4,
+avwiki: php-1.24wmf5,
 avwiktionary: php-1.24wmf5,
-aywiki: php-1.24wmf4,
+aywiki: php-1.24wmf5,
 aywikibooks: php-1.24wmf5,
 aywiktionary: php-1.24wmf5,
-azwiki: php-1.24wmf4,
+azwiki: php-1.24wmf5,
 azwikibooks: php-1.24wmf5,
 azwikiquote: php-1.24wmf5,
 azwikisource: php-1.24wmf5,
 azwiktionary: php-1.24wmf5,
-barwiki: php-1.24wmf4,
-bat_smgwiki: php-1.24wmf4,
-bawiki: php-1.24wmf4,
+barwiki: php-1.24wmf5,
+bat_smgwiki: php-1.24wmf5,
+bawiki: php-1.24wmf5,
 bawikibooks: php-1.24wmf5,
-bclwiki: php-1.24wmf4,
+bclwiki: php-1.24wmf5,
 bdwikimedia: php-1.24wmf5,
-be_x_oldwiki: php-1.24wmf4,
+be_x_oldwiki: php-1.24wmf5,
 betawikiversity: php-1.24wmf5,
-bewiki: php-1.24wmf4,
+bewiki: php-1.24wmf5,
 bewikibooks: php-1.24wmf5,
 bewikimedia: php-1.24wmf5,
 bewikiquote: php-1.24wmf5,
 bewikisource: php-1.24wmf5,
 bewiktionary: php-1.24wmf5,
-bgwiki: php-1.24wmf4,
+bgwiki: php-1.24wmf5,
 bgwikibooks: php-1.24wmf5,
 bgwikinews: php-1.24wmf5,
 bgwikiquote: php-1.24wmf5,
 bgwikisource: php-1.24wmf5,
 bgwiktionary: php-1.24wmf5,
-bhwiki: php-1.24wmf4,
+bhwiki: php-1.24wmf5,
 bhwiktionary: php-1.24wmf5,
-biwiki: php-1.24wmf4,
+biwiki: php-1.24wmf5,
 biwikibooks: php-1.24wmf5,
 biwiktionary: php-1.24wmf5,
-bjnwiki: php-1.24wmf4,
-bmwiki: php-1.24wmf4,
+bjnwiki: php-1.24wmf5,
+bmwiki: php-1.24wmf5,
 bmwikibooks: php-1.24wmf5,
 bmwikiquote: php-1.24wmf5,
 bmwiktionary: php-1.24wmf5,
-bnwiki: php-1.24wmf4,
+bnwiki: php-1.24wmf5,
 bnwikibooks: php-1.24wmf5,
 bnwikisource: php-1.24wmf5,
 bnwiktionary: php-1.24wmf5,
 boardgovcomwiki: php-1.24wmf5,
 boardwiki: php-1.24wmf5,
-bowiki: php-1.24wmf4,
+bowiki: php-1.24wmf5,
 bowikibooks: php-1.24wmf5,
 bowiktionary: php-1.24wmf5,
-bpywiki: php-1.24wmf4,
-brwiki: php-1.24wmf4,
+bpywiki: php-1.24wmf5,
+brwiki: php-1.24wmf5,
 brwikimedia: php-1.24wmf5,
 brwikiquote: php-1.24wmf5,
 brwikisource: php-1.24wmf5,
 brwiktionary: php-1.24wmf5,
-bswiki: php-1.24wmf4,
+

[MediaWiki-commits] [Gerrit] group0 to 1.24wmf6 - change (operations/mediawiki-config)

2014-05-22 Thread Reedy (Code Review)
Reedy has uploaded a new change for review.

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

Change subject: group0 to 1.24wmf6
..

group0 to 1.24wmf6

Change-Id: I52b9e868ce2f62efcca2efce1745cf8d58ae4293
---
M wikiversions.json
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index ccc5db6..395dd41 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -467,7 +467,7 @@
 lvwiktionary: php-1.24wmf5,
 map_bmswiki: php-1.24wmf5,
 mdfwiki: php-1.24wmf5,
-mediawikiwiki: php-1.24wmf5,
+mediawikiwiki: php-1.24wmf6,
 metawiki: php-1.24wmf5,
 mgwiki: php-1.24wmf5,
 mgwikibooks: php-1.24wmf5,
@@ -733,9 +733,9 @@
 tawikisource: php-1.24wmf5,
 tawiktionary: php-1.24wmf5,
 tenwiki: php-1.24wmf5,
-test2wiki: php-1.24wmf5,
+test2wiki: php-1.24wmf6,
 testwiki: php-1.24wmf6,
-testwikidatawiki: php-1.24wmf5,
+testwikidatawiki: php-1.24wmf6,
 tetwiki: php-1.24wmf5,
 tewiki: php-1.24wmf5,
 tewikibooks: php-1.24wmf5,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52b9e868ce2f62efcca2efce1745cf8d58ae4293
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Add symlinks - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Add symlinks
..


Add symlinks

Change-Id: Ice4e813e4c1c939f28239bc74868567982c536e4
---
A docroot/bits/static-1.24wmf6/extensions
A docroot/bits/static-1.24wmf6/resources
A docroot/bits/static-1.24wmf6/skins
A w/static-1.24wmf6/extensions
A w/static-1.24wmf6/resources
A w/static-1.24wmf6/skins
6 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/docroot/bits/static-1.24wmf6/extensions 
b/docroot/bits/static-1.24wmf6/extensions
new file mode 12
index 000..0cc4824
--- /dev/null
+++ b/docroot/bits/static-1.24wmf6/extensions
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/extensions
\ No newline at end of file
diff --git a/docroot/bits/static-1.24wmf6/resources 
b/docroot/bits/static-1.24wmf6/resources
new file mode 12
index 000..366fbf1
--- /dev/null
+++ b/docroot/bits/static-1.24wmf6/resources
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/resources
\ No newline at end of file
diff --git a/docroot/bits/static-1.24wmf6/skins 
b/docroot/bits/static-1.24wmf6/skins
new file mode 12
index 000..f8f2523
--- /dev/null
+++ b/docroot/bits/static-1.24wmf6/skins
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/skins/
\ No newline at end of file
diff --git a/w/static-1.24wmf6/extensions b/w/static-1.24wmf6/extensions
new file mode 12
index 000..0cc4824
--- /dev/null
+++ b/w/static-1.24wmf6/extensions
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/extensions
\ No newline at end of file
diff --git a/w/static-1.24wmf6/resources b/w/static-1.24wmf6/resources
new file mode 12
index 000..366fbf1
--- /dev/null
+++ b/w/static-1.24wmf6/resources
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/resources
\ No newline at end of file
diff --git a/w/static-1.24wmf6/skins b/w/static-1.24wmf6/skins
new file mode 12
index 000..1910951
--- /dev/null
+++ b/w/static-1.24wmf6/skins
@@ -0,0 +1 @@
+/usr/local/apache/common-local/php-1.24wmf6/skins
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice4e813e4c1c939f28239bc74868567982c536e4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] testwiki to 1.24wmf6 - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: testwiki to 1.24wmf6
..


testwiki to 1.24wmf6

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

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



diff --git a/wikiversions.json b/wikiversions.json
index 58d718a..941f48d 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -734,7 +734,7 @@
 tawiktionary: php-1.24wmf5,
 tenwiki: php-1.24wmf5,
 test2wiki: php-1.24wmf5,
-testwiki: php-1.24wmf5,
+testwiki: php-1.24wmf6,
 testwikidatawiki: php-1.24wmf5,
 tetwiki: php-1.24wmf4,
 tewiki: php-1.24wmf4,
@@ -881,4 +881,4 @@
 zuwiki: php-1.24wmf4,
 zuwikibooks: php-1.24wmf5,
 zuwiktionary: php-1.24wmf5
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2a437737ad720305593d37886d16ac9b423a4ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Detect that a category is hidden when following a redirect - change (mediawiki...VisualEditor)

2014-05-22 Thread Alex Monk (Code Review)
Alex Monk has uploaded a new change for review.

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

Change subject: Detect that a category is hidden when following a redirect
..

Detect that a category is hidden when following a redirect

At the moment, if you have a category on a page, and the category redirects
to another category which is hidden, VE does not mark it as hidden when
loading the page.

Change-Id: I9303838d36fbc1e2c0ed16b8bb0020bf52a6c211
---
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js 
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index 6e47809..e2d0dcd 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -267,6 +267,7 @@

categoryWidget.categoryRedirects[itemTitle],
mw.config.get( 'wgNamespaceIds' 
).category
).getMainText();
+   config.hidden = 
categoryWidget.categoryHiddenStatus[categoryWidget.categoryRedirects[itemTitle]];
}
categoryItem = new ve.ui.MWCategoryItemWidget( config );
categoryItem.connect( categoryWidget, {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9303838d36fbc1e2c0ed16b8bb0020bf52a6c211
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Add outreachwiki to list of private wikis - change (mediawiki...deploy)

2014-05-22 Thread Jforrester (Code Review)
Jforrester has uploaded a new change for review.

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

Change subject: Add outreachwiki to list of private wikis
..

Add outreachwiki to list of private wikis

Change-Id: I3548befdf858b33fc859fa6d8f5c70f5f42d572f
---
M conf/wmf/localsettings.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js
index 257d2cf..e435655 100644
--- a/conf/wmf/localsettings.js
+++ b/conf/wmf/localsettings.js
@@ -14,6 +14,7 @@
 'collabwiki': 'https://collab.wikimedia.org/w/api.php',
 'legalteamwiki': 
'https://legalteam.wikimedia.org/w/api.php',
 'officewiki': 'https://office.wikimedia.org/w/api.php',
+'outreachwiki': 
'https://office.wikimedia.org/w/api.php',
 'wikimaniateamwiki': 
'https://wikimaniateam.wikimedia.org/w/api.php',
 
 'labswiki': 'https://wikitech.wikimedia.org/w/api.php' 
// Not private but can't use proxy

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3548befdf858b33fc859fa6d8f5c70f5f42d572f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Enable VisualEditor by default on outreachwiki - change (operations/mediawiki-config)

2014-05-22 Thread Jforrester (Code Review)
Jforrester has uploaded a new change for review.

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

Change subject: Enable VisualEditor by default on outreachwiki
..

Enable VisualEditor by default on outreachwiki

Per request; requires I3548befdf858b to be deployed in Parsoid first.

Change-Id: Id94e1c072cbfaff4aad0ce3a6b3195eb859a59e7
---
M visualeditor-default.dblist
M visualeditor.dblist
2 files changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/visualeditor-default.dblist b/visualeditor-default.dblist
index 375900d..cfe030a 100644
--- a/visualeditor-default.dblist
+++ b/visualeditor-default.dblist
@@ -168,4 +168,5 @@
 collabwiki
 legalteamwiki
 officewiki
+outreachwiki
 wikimaniateamwiki
diff --git a/visualeditor.dblist b/visualeditor.dblist
index ff69790..c8edb15 100644
--- a/visualeditor.dblist
+++ b/visualeditor.dblist
@@ -302,4 +302,5 @@
 collabwiki
 legalteamwiki
 officewiki
+outreachwiki
 wikimaniateamwiki

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id94e1c072cbfaff4aad0ce3a6b3195eb859a59e7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Fix line-height for page titles - change (mediawiki...MobileApp)

2014-05-22 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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

Change subject: Fix line-height for page titles
..

Fix line-height for page titles

Change-Id: I477fbf58758f8cddfc56e8ddcf72d267e892cb15
---
M less/pagestyles.less
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/less/pagestyles.less b/less/pagestyles.less
index 7dbc23e..af99f89 100644
--- a/less/pagestyles.less
+++ b/less/pagestyles.less
@@ -27,7 +27,7 @@
 font-family: serif;
 color: #333;
 font-size: 1.6em;
-line-height: 2.25em;
+line-height: 1.8em;
 margin-bottom: 24px;
 font-weight: bold;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I477fbf58758f8cddfc56e8ddcf72d267e892cb15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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


[MediaWiki-commits] [Gerrit] Kill Solr support - change (mediawiki...GeoData)

2014-05-22 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review.

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

Change subject: Kill Solr support
..

Kill Solr support

Change-Id: I29fc406ba085795db68911487ee074b3eae6e8a2
---
M GeoData.body.php
M GeoData.php
M GeoDataHooks.php
D api/ApiQueryGeoSearchSolr.php
D solr/SolrGeoData.php
D solr/SolrUpdateJob.php
D solr/SolrUpdateWork.php
D solr/schema.xml
D solrupdate.php
A sql/drop-updates-killlist.sql
M sql/externally-backed.sql
D sql/wmfFixTables.sql
12 files changed, 5 insertions(+), 854 deletions(-)


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

diff --git a/GeoData.body.php b/GeoData.body.php
index 5c088c7..71f3856 100644
--- a/GeoData.body.php
+++ b/GeoData.body.php
@@ -180,15 +180,4 @@
public static function pickRandom( $weights ) {
return ArrayUtils::pickRandom( $weights );
}
-
-   /**
-* Adds an update job if needed
-*/
-   public static function maybeUpdate() {
-   global $wgGeoDataBackend, $wgGeoDataUpdatesViaJob;
-
-   if ( $wgGeoDataBackend == 'solr'  $wgGeoDataUpdatesViaJob ) {
-   JobQueueGroup::singleton()-push( new SolrUpdateJob( 
null ) );
-   }
-   }
 }
diff --git a/GeoData.php b/GeoData.php
index 919c11f..913f7b7 100644
--- a/GeoData.php
+++ b/GeoData.php
@@ -17,7 +17,6 @@
 $wgAutoloadClasses['ApiQueryGeoSearch'] = $dir/api/ApiQueryGeoSearch.php;
 $wgAutoloadClasses['ApiQueryGeoSearchDb'] = $dir/api/ApiQueryGeoSearchDb.php;
 $wgAutoloadClasses['ApiQueryGeoSearchElastic'] = 
$dir/api/ApiQueryGeoSearchElastic.php;
-$wgAutoloadClasses['ApiQueryGeoSearchSolr'] = 
$dir/api/ApiQueryGeoSearchSolr.php;
 $wgAutoloadClasses['ApiQueryAllPages_GeoData'] = 
$dir/api/ApiQueryAllPages_GeoData.php;
 $wgAutoloadClasses['ApiQueryCategoryMembers_GeoData'] = 
$dir/api/ApiQueryCategoryMembers_GeoData.php;
 $wgAutoloadClasses['GeoDataQueryExtender'] = 
$dir/api/GeoDataQueryExtender.php;
@@ -28,11 +27,6 @@
 $wgAutoloadClasses['GeoData'] = $dir/GeoData.body.php;
 $wgAutoloadClasses['GeoDataHooks'] = $dir/GeoDataHooks.php;
 $wgAutoloadClasses['GeoDataMath'] = $dir/GeoDataMath.php;
-$wgAutoloadClasses['SolrUpdate'] = $dir/solrupdate.php;
-$wgAutoloadClasses['SolrUpdateJob'] = $dir/solr/SolrUpdateJob.php;
-$wgAutoloadClasses['SolrUpdateWork'] = $dir/solr/SolrUpdateWork.php;
-
-$wgAutoloadClasses['SolrGeoData'] = $dir/solr/SolrGeoData.php;
 
 $wgMessagesDirs['GeoData'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['GeoData'] = $dir/GeoData.i18n.php;
@@ -62,8 +56,6 @@
$wgAPIListModules['geosearch'] = 'ApiQueryGeoSearch' . ucfirst( 
$wgGeoDataBackend );
}
 }
-
-$wgJobClasses['solrUpdate'] = 'SolrUpdateJob';
 
 // Tracking categories for Special:TrackingCategories
 $wgTrackingCategories[] = 'geodata-broken-tags-category';
@@ -190,48 +182,9 @@
 $wgGeoDataIndexGranularity = 10;
 
 /**
- * Which backend should be used by spatial searhces: 'db', 'solr' or 'elastic'
+ * Which backend should be used by spatial searhces: 'db' or 'elastic'
  */
 $wgGeoDataBackend = 'db';
-
-
-// Solr-specific settings
-
-/**
- * Generic Solr connection options, see Solarium docs.
- * Note: host must be set in $wgGeoDataSolrHosts for load-balancicng.
- */
-$wgGeoDataSolrOptions = array(
-   'adapteroptions' = array(
-   //'host' = '127.0.0.1',
-   'port' = 8983,
-   'path' = '/solr/',
-   ),
-);
-
-/**
- * @var string|array: Solr host, string hostname or array( 'host1' = 
weight1, 'host2' = weight2 ... )
- */
-$wgGeoDataSolrHosts = 'localhost';
-
-/**
- * @var string: Solr master used for updates
- */
-$wgGeoDataSolrMaster = 'localhost';
-
-/**
- * @var int|string: Commit policy
- * Possible values:
- * - 'never': Never commit explicitly, let Solr decide on its own.
- * - 'immediate': Commit after every change.
- * - (some number): Commit within this number of milliseconds.
- */
-$wgGeoDataSolrCommitPolicy = 'immediate';
-
-/**
- * Whether search index should be updated via jobs. Supported only for Solr.
- */
-$wgGeoDataUpdatesViaJob = false;
 
 /**
  * Specifies which information about page's primary coordinate is added to 
global JS variable wgCoordinates.
diff --git a/GeoDataHooks.php b/GeoDataHooks.php
index 3f3181f..a98902e 100644
--- a/GeoDataHooks.php
+++ b/GeoDataHooks.php
@@ -20,6 +20,7 @@
case 'mysql':
if ( $wgGeoDataBackend != 'db' ) {
$updater-addExtensionTable( 
'geo_tags', dirname( __FILE__ ) . '/sql/externally-backed.sql' );
+   $updater-dropExtensionTable( 
'geo_killlist', dirname( __FILE__ ) . '/sql/drop-updates-killlist.sql' );
} else {
$updater-addExtensionTable( 
'geo_tags', dirname( __FILE__ ) . 

[MediaWiki-commits] [Gerrit] Remove DesktopContext.css/js from core, leave in desktop - change (mediawiki...VisualEditor)

2014-05-22 Thread Esanders (Code Review)
Esanders has uploaded a new change for review.

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

Change subject: Remove DesktopContext.css/js from core, leave in desktop
..

Remove DesktopContext.css/js from core, leave in desktop

Change-Id: I6f5e5a01a9feba593567288f5237a773fa02453e
---
M .docs/eg-iframe.html
M VisualEditor.php
2 files changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index d67a171..fc4650f 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -24,7 +24,6 @@
link rel=stylesheet 
href=lib/ve/modules/ve/ce/styles/ve.ce.Surface.css
link rel=stylesheet 
href=lib/ve/modules/ve/ui/styles/dialogs/ve.ui.ActionDialog.css
link rel=stylesheet 
href=lib/ve/modules/ve/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
-   link rel=stylesheet 
href=lib/ve/modules/ve/ui/styles/ve.ui.DesktopContext.css
link rel=stylesheet 
href=lib/ve/modules/ve/ui/styles/tools/ve.ui.FormatTool.css
link rel=stylesheet 
href=lib/ve/modules/ve/ui/styles/ve.ui.Inspector.css
link rel=stylesheet 
href=lib/ve/modules/ve/ui/styles/widgets/ve.ui.LanguageInputWidget.css
@@ -38,6 +37,7 @@
link rel=stylesheet 
href=lib/ve/modules/ve/ui/styles/ve.ui.Icons-vector.css
 
!-- visualEditor.desktop --
+   link rel=stylesheet 
href=lib/ve/modules/ve/ui/styles/ve.ui.DesktopContext.css
link rel=stylesheet 
href=lib/ve/modules/ve/ui/themes/apex/ve.ui.Inspector.css
 
!-- example styles --
diff --git a/VisualEditor.php b/VisualEditor.php
index ab37eb8..38452f9 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -413,7 +413,6 @@
'lib/ve/modules/ve/ui/ve.ui.js',
 
'lib/ve/modules/ve/ui/ve.ui.Surface.js',
-   'lib/ve/modules/ve/ui/ve.ui.DesktopSurface.js',
'lib/ve/modules/ve/ui/ve.ui.Context.js',
'lib/ve/modules/ve/ui/ve.ui.Dialog.js',
'lib/ve/modules/ve/ui/ve.ui.Inspector.js',
@@ -480,7 +479,6 @@
// ui

'lib/ve/modules/ve/ui/styles/dialogs/ve.ui.ActionDialog.css',

'lib/ve/modules/ve/ui/styles/dialogs/ve.ui.CommandHelpDialog.css',
-   'lib/ve/modules/ve/ui/styles/ve.ui.DesktopContext.css',

'lib/ve/modules/ve/ui/styles/tools/ve.ui.FormatTool.css',
'lib/ve/modules/ve/ui/styles/ve.ui.Inspector.css',

'lib/ve/modules/ve/ui/styles/widgets/ve.ui.DimensionsWidget.css',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f5e5a01a9feba593567288f5237a773fa02453e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Fix 'JSON_PRETTY_PRINT is not defined' warning - change (mediawiki/core)

2014-05-22 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review.

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

Change subject: Fix 'JSON_PRETTY_PRINT is not defined' warning
..

Fix 'JSON_PRETTY_PRINT is not defined' warning

This is really weird - PHP 5.3.10 appears to have JSON_UNESCAPED_UNICODE
but not JSON_PRETTY_PRINT which causes warnings in production also reproduceable
in Vagrant.

Change-Id: I0fd8a666c28aa58947c037c23506d3ce41d427ff
---
M includes/json/FormatJson.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/134853/1

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index e45dd3a..8493456 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -106,7 +106,7 @@
$pretty = $pretty ? '' : false;
}
 
-   if ( defined( 'JSON_UNESCAPED_UNICODE' ) ) {
+   if ( defined( 'JSON_UNESCAPED_UNICODE' )  defined( 
'JSON_PRETTY_PRINT' ) ) {
return self::encode54( $value, $pretty, $escaping );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fd8a666c28aa58947c037c23506d3ce41d427ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com

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


[MediaWiki-commits] [Gerrit] Fix line-height for page titles - change (mediawiki...MobileApp)

2014-05-22 Thread Yuvipanda (Code Review)
Yuvipanda has submitted this change and it was merged.

Change subject: Fix line-height for page titles
..


Fix line-height for page titles

Change-Id: I477fbf58758f8cddfc56e8ddcf72d267e892cb15
---
M less/pagestyles.less
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Verified
  JGonera: Looks good to me, approved



diff --git a/less/pagestyles.less b/less/pagestyles.less
index 7dbc23e..af99f89 100644
--- a/less/pagestyles.less
+++ b/less/pagestyles.less
@@ -27,7 +27,7 @@
 font-family: serif;
 color: #333;
 font-size: 1.6em;
-line-height: 2.25em;
+line-height: 1.8em;
 margin-bottom: 24px;
 font-weight: bold;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I477fbf58758f8cddfc56e8ddcf72d267e892cb15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com

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


[MediaWiki-commits] [Gerrit] Add labs ssl key for unified.wikimedia.org - change (labs/private)

2014-05-22 Thread JanZerebecki (Code Review)
JanZerebecki has uploaded a new change for review.

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

Change subject: Add labs ssl key for unified.wikimedia.org
..

Add labs ssl key for unified.wikimedia.org

Change-Id: I8fb1611ae54ee1649d377859fa8989d9cceed13d
---
A files/ssl/unified.wikimedia.org.key
1 file changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/52/134852/1

diff --git a/files/ssl/unified.wikimedia.org.key 
b/files/ssl/unified.wikimedia.org.key
new file mode 100644
index 000..531756a
--- /dev/null
+++ b/files/ssl/unified.wikimedia.org.key
@@ -0,0 +1,30 @@
+# used only as a place holder for labs internal testing
+# with operations/puppet.git/files/ssl/unified.wikimedia.org.pem
+-BEGIN PRIVATE KEY-
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDiUgoVRQ9Hx3+6
+DjYbXNJDd+TbUUIaHTBrdqZJ0idCuoZ9fHBggbDbmd6TsKRgK/wWdxJHj5SDd3tD
+3OkmWKaKtDhqVzVK5tTQ6glG09J3DnbJfuitJN05vklg4dRwm5zgGoeYygXj8zrd
+RWiA4qt6zp+jGC/9xphsS8IpYIZMmaCLwDWcVlOX+JhchkV7cTjcl/WyxcoP2g4n
+7oHCIcptyquS6WdrkC6ea+lEnT8x5zutfY9KOXlW3Xuf4IVwnSlIFk0B1Z6SBwPW
+yfB2UIGw+F60nSlOw+UNYPxx4RbUo3103u6ax+/oeGfLfm/JcSLQMxWMFvb8C2iy
+IzGXjf6rAgMBAAECggEBANf89ZSA+OlG8pXM1ERe3Gf5Nxc7wHsNmlUkweQ3xLJB
+MvL1XIYtn2ykty956BXERGvoLTDQTSr+T0xfur6W4jIDdse9/KVEEJxkjn/izbxD
+uIfqLwJ26Q4flQX53/Wr/RY/G2Nsghye13GuuOIv8Pld0iojfkGSU4se7ejxLppQ
+Q4yRXQCjidu7snSyXZhMR+8GQPoXBq1bSd3cBzPgF7CROlNGgLSiUTAet11pbzCd
+Fi/XLxntMugasKgT1+oBDPEqBs16GVicsCzls5MRqN2JjFJmU1Kjpmtw83zaAvZ8
+TqCo0ilc8NitCCoPR8GtWjfpE66op2yJgk9HCLI93akCgYEA+gMEBebnU2Eysos5
+aSeD4PioqfC8boLUJj5+koVhJJf8sskqXW+s/TEej95k+CgdWOR+83mQxTZMnV+v
+aWbZIEvzV7eJBS7JI7GrjL8wipWro+LaQcriliPjTG7ABpHM51SWWe6TPyS/lQL9
+fEakEBvfxj2Gh5HYb2Gw7zYF7GcCgYEA573Bwj59yXjsNTq4vXSPwTUci2yKdSKO
+Adc7VZ4DuPFkYCbno1iSCnSI80TXgMMqe5VMO8/jZhAyASQRAO9ASLZ+TptVeUAM
+q3TyLr+BqJSi94UChhi3RbkJL/D/vRehf8MFfxCQHsiE/28X3vr5AAjvkV6uZ3pF
+1uJlHua5sR0CgYEA0FPG/GwGAnKR3jkpI7hrqgFJ+iHBwox930hgDBPceLO1O/1o
+secmzOwrPVLh6+7xVWtBZfy8Z7jxaombD0dGUiU3prYnFQyBSp74BhYiirhhB/U2
+TXCUEuvgsYXvuQmxJmpTxqiIRiuHANI3C2GJwGqZswT9nuYm5dkPqKTplq0CgYEA
+wB+cjGp8pFSBF9w4HrGNILPkl16EJ3pfWv1SbrfTBDf0bJa0gcLDSLG2fGB9fX3Q
+MabkDc5bC1mv6yw4gJrZo67QZmD3as+D8X3B7qnMV7Pqq+R05DGHd+Fg0YMuslju
+Blrrqp1TroG1aYNzueQ+HR5LZyyk0JsZXX5SMV09Y60CgYAfspB4vzHaF02YwHD7
+2Kaoqtv+o1G6GLA3x4XeICAja0TW887GhptG8yXCHiBkiwlJPMwf9PFUP3Zpmrf2
+AMw9xtEX9y/Ghw62KfOYdWXhOf0XIMtYe9BnEYiyTr9VYRLWlJxKuculxzFwVTpP
+jjCBcvb2hAwqEU4Hu+P41nHnNA==
+-END PRIVATE KEY-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fb1611ae54ee1649d377859fa8989d9cceed13d
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de

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


[MediaWiki-commits] [Gerrit] Make SVG files show In other resolutions at all sizes - change (mediawiki/core)

2014-05-22 Thread Brian Wolff (Code Review)
Brian Wolff has uploaded a new change for review.

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

Change subject: Make SVG files show In other resolutions at all sizes
..

Make SVG files show In other resolutions at all sizes

Previously it only showed the sizes smaller than the nominal
size of the svg, which is silly for an infinitely scalabe
vector image.

This also changes the link below SVGs to always be
Show original file (show-big-image), which I think makes
more sense anyhow.

Bug: 6834
Change-Id: Ic18e555f16940c658842148c155771ef31ac5db9
---
M includes/ImagePage.php
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/134855/1

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index a38b195..b0f9212 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -346,11 +346,13 @@
# $msgsize = wfMessage( 'file-info-size', 
$width_orig, $height_orig,
#   Linker::formatSize( 
$this-displayImg-getSize() ), $mime )-escaped();
# We'll show a thumbnail of this image
-   if ( $width  $maxWidth || $height  $maxHeight 
) {
+   if ( $width  $maxWidth || $height  $maxHeight 
|| $this-displayImg-isVectorized() ) {
# Calculate the thumbnail size.
-   # First case, the limiting factor is 
the width, not the height.
/** @todo // FIXME: Possible division 
by 0. bug 36911 */
-   if ( $width / $height = $maxWidth / 
$maxHeight ) {
+   if ( $width = $maxWidth  $height = 
$maxHeight ) {
+   // Vectorized image, do nothing.
+   } elseif ( $width / $height = 
$maxWidth / $maxHeight ) {
+   # The limiting factor is the 
width, not the height.
/** @todo // FIXME: Possible 
division by 0. bug 36911 */
$height = round( $height * 
$maxWidth / $width );
$width = $maxWidth;
@@ -393,7 +395,8 @@
// the current thumbnail's size 
($width/$height)
// since that is added to the 
message separately, so
// it can be denoted as the 
current size being shown.
-   if ( $size[0] = $width_orig  
$size[1] = $height_orig
+   if ( ( ($size[0] = $width_orig 
 $size[1] = $height_orig)
+   || 
$this-displayImg-isVectorized() )
 $size[0] != $width 
 $size[1] != $height
) {
$sizeLink = 
$this-makeSizeLink( $params, $size[0], $size[1] );
@@ -420,9 +423,6 @@
} elseif ( $width == 0  $height == 0 ) {
# Some sort of audio file that doesn't 
have dimensions
# Don't output a no hi res message for 
such a file
-   $msgsmall = '';
-   } elseif ( $this-displayImg-isVectorized() ) {
-   # For vectorized images, full size is 
just the frame size
$msgsmall = '';
} else {
# Image is small enough to show full 
size on image page

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic18e555f16940c658842148c155771ef31ac5db9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff bawolff...@gmail.com

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


[MediaWiki-commits] [Gerrit] Make MWGalleryInspector wider - change (mediawiki...VisualEditor)

2014-05-22 Thread Esanders (Code Review)
Esanders has uploaded a new change for review.

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

Change subject: Make MWGalleryInspector wider
..

Make MWGalleryInspector wider

Galleries usually have very long lines of text so make the
inspector big.

Change-Id: I69f294af9603a271b73ac1d39166fe4b492290f0
---
M VisualEditor.php
M modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js
A modules/ve-mw/ui/styles/inspectors/ve.ui.MWGalleryInspector.css
3 files changed, 27 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor.php b/VisualEditor.php
index ab37eb8..0bda854 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -1158,6 +1158,9 @@

'modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js',

'modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js',
),
+   'styles' = array(
+   
'modules/ve-mw/ui/styles/inspectors/ve.ui.MWGalleryInspector.css',
+   ),
'dependencies' = array(
'ext.visualEditor.mwcore',
),
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js
index 4ee9d12..c9df6bf 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js
@@ -19,6 +19,8 @@
 ve.ui.MWGalleryInspector = function VeUiMWGalleryInspector( config ) {
// Parent constructor
ve.ui.MWExtensionInspector.call( this, config );
+
+   this.$element.addClass( 've-ui-mwGalleryInpsector' );
 };
 
 /* Inheritance */
@@ -39,6 +41,14 @@
 /* Methods */
 
 /** */
+ve.ui.MWGalleryInspector.prototype.initialize = function () {
+   // Parent method
+   ve.ui.MWExtensionInspector.prototype.initialize.call( this );
+
+   this.input.$element.addClass( 've-ui-mwGalleryInpsector-input' );
+};
+
+/** */
 ve.ui.MWGalleryInspector.prototype.getInputPlaceholder = function () {
// 'File:' is always in content language
return mw.config.get( 'wgFormattedNamespaces' )['6'] + ':' +
diff --git a/modules/ve-mw/ui/styles/inspectors/ve.ui.MWGalleryInspector.css 
b/modules/ve-mw/ui/styles/inspectors/ve.ui.MWGalleryInspector.css
new file mode 100644
index 000..79f962c
--- /dev/null
+++ b/modules/ve-mw/ui/styles/inspectors/ve.ui.MWGalleryInspector.css
@@ -0,0 +1,14 @@
+/*!
+ * VisualEditor MediaWiki UserInterface alien extension inspector styles.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.ve-ui-mwGalleryInpsector .oo-ui-frame {
+   width: 40em;
+}
+
+.ve-ui-mwGalleryInpsector-input {
+   width: 100%;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69f294af9603a271b73ac1d39166fe4b492290f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Add sort by last activity to the API - change (mediawiki...Flow)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Add sort by last activity to the API
..


Add sort by last activity to the API

Change-Id: I822462027165eb26c254eb5b457c161fc6c5076d
---
M handlebars/flow_block_topiclist.html.handlebars.php
M handlebars/flow_topic_navigation.html.handlebars
M includes/Block/TopicList.php
M includes/Data/TopicListLastUpdatedStorage.php
M includes/Data/TopicListStorage.php
M includes/Data/WorkflowTopicListListener.php
M includes/Model/TopicListEntry.php
7 files changed, 52 insertions(+), 10 deletions(-)

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



diff --git a/handlebars/flow_block_topiclist.html.handlebars.php 
b/handlebars/flow_block_topiclist.html.handlebars.php
index ea26eaa..4be5ee2 100644
--- a/handlebars/flow_block_topiclist.html.handlebars.php
+++ b/handlebars/flow_block_topiclist.html.handlebars.php
@@ -55,8 +55,11 @@
';}).'
li class=flow-topic-navigation-footer
'.LCRun2::ch('l10n', Array('topic_count_sidebar',$in), 'enc', 
$cx).'
-   '.((LCRun2::ifvar(((is_array($in['links'])  
isset($in['links']['pagination'])) ? $in['links']['pagination'] : null))) ? '
+   '.((LCRun2::ifvar(((is_array($in)  isset($in['('])) ? 
$in['('] : null))) ? '
a 
href='.htmlentities(((is_array($in['links']['pagination']['fwd'])  
isset($in['links']['pagination']['fwd']['url'])) ? 
$in['links']['pagination']['fwd']['url'] : null), ENT_QUOTES, 'UTF-8').' 
title='.htmlentities(((is_array($in['links']['pagination']['fwd'])  
isset($in['links']['pagination']['fwd']['title'])) ? 
$in['links']['pagination']['fwd']['title'] : null), ENT_QUOTES, 'UTF-8').' 
class=flow-ui-button flow-ui-progressive flow-ui-quiet flow-ui-thinspan 
class=wikicon wikicon-article/span '.LCRun2::ch('l10n', 
Array('Load_More'), 'enc', $cx).'/a
+   '.htmlentities(((is_array($in)  isset($in['elseif'])) ? 
$in['elseif'] : null), ENT_QUOTES, 'UTF-8').'
+   a 
href='.htmlentities(((is_array($in['links']['pagination']['rev'])  
isset($in['links']['pagination']['rev']['url'])) ? 
$in['links']['pagination']['rev']['url'] : null), ENT_QUOTES, 'UTF-8').' 
title='.htmlentities(((is_array($in['links']['pagination']['rev'])  
isset($in['links']['pagination']['rev']['title'])) ? 
$in['links']['pagination']['rev']['title'] : null), ENT_QUOTES, 'UTF-8').' 
class=flow-ui-button flow-ui-progressive flow-ui-quiet flow-ui-thinspan 
class=wikicon wikicon-article/span '.LCRun2::ch('l10n', 
Array('Load_More'), 'enc', $cx).'/a
+   
' : '
!-- @todo make disabled class do something? --
a class=flow-ui-button flow-ui-progressive 
flow-ui-quiet flow-ui-thin disabledspan class=wikicon 
wikicon-article/span '.LCRun2::ch('l10n', Array('Load_More'), 'enc', 
$cx).'/a
diff --git a/handlebars/flow_topic_navigation.html.handlebars 
b/handlebars/flow_topic_navigation.html.handlebars
index a18fd68..e6572bd 100644
--- a/handlebars/flow_topic_navigation.html.handlebars
+++ b/handlebars/flow_topic_navigation.html.handlebars
@@ -16,8 +16,10 @@
{{/eachPost}}
li class=flow-topic-navigation-footer
{{l10n topic_count_sidebar this}}
-   {{#if links.pagination  links.pagination.fwd}}
+   {{#if ( links.pagination  links.pagination.fwd ) }}
a href={{links.pagination.fwd.url}} 
title={{links.pagination.fwd.title}} class=flow-ui-button 
flow-ui-progressive flow-ui-quiet flow-ui-thinspan class=wikicon 
wikicon-article/span {{l10n Load_More}}/a
+   {{elseif ( links.pagination  links.pagination.rev ) }}
+   a href={{links.pagination.rev.url}} 
title={{links.pagination.rev.title}} class=flow-ui-button 
flow-ui-progressive flow-ui-quiet flow-ui-thinspan class=wikicon 
wikicon-article/span {{l10n Load_More}}/a
{{else}}
!-- @todo make disabled class do something? --
a class=flow-ui-button flow-ui-progressive 
flow-ui-quiet flow-ui-thin disabledspan class=wikicon 
wikicon-article/span {{l10n Load_More}}/a
diff --git a/includes/Block/TopicList.php b/includes/Block/TopicList.php
index 2cfa3b2..de4a99d 100644
--- a/includes/Block/TopicList.php
+++ b/includes/Block/TopicList.php
@@ -250,6 +250,13 @@
 
$findOptions['pager-limit'] = $limit;
 
+   if ( isset( $requestOptions['sortby'] )  
$requestOptions['sortby'] === 'updated' ) {
+   $findOptions['sort'] = 'workflow_last_update_timestamp';
+   $findOptions['pager-dir'] = 'rev';
+   $findOptions['order'] = 'desc';
+   $findOptions['limit'] = 500;
+   }
+
return $findOptions;
}
 
diff --git 

[MediaWiki-commits] [Gerrit] Wikipedias to 1.24wmf5 - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Wikipedias to 1.24wmf5
..


Wikipedias to 1.24wmf5

Change-Id: I7d37d159f6d133065672bc377ae8a815365c2825
---
M php
M wikiversions.json
2 files changed, 289 insertions(+), 289 deletions(-)

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



diff --git a/php b/php
index 54bb40d..ad6f1d0 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.24wmf4
\ No newline at end of file
+php-1.24wmf5
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 941f48d..ccc5db6 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
 {
-aawiki: php-1.24wmf4,
+aawiki: php-1.24wmf5,
 aawikibooks: php-1.24wmf5,
 aawiktionary: php-1.24wmf5,
-abwiki: php-1.24wmf4,
+abwiki: php-1.24wmf5,
 abwiktionary: php-1.24wmf5,
-acewiki: php-1.24wmf4,
+acewiki: php-1.24wmf5,
 advisorywiki: php-1.24wmf5,
-afwiki: php-1.24wmf4,
+afwiki: php-1.24wmf5,
 afwikibooks: php-1.24wmf5,
 afwikiquote: php-1.24wmf5,
 afwiktionary: php-1.24wmf5,
-akwiki: php-1.24wmf4,
+akwiki: php-1.24wmf5,
 akwikibooks: php-1.24wmf5,
 akwiktionary: php-1.24wmf5,
-alswiki: php-1.24wmf4,
+alswiki: php-1.24wmf5,
 alswikibooks: php-1.24wmf5,
 alswikiquote: php-1.24wmf5,
 alswiktionary: php-1.24wmf5,
-amwiki: php-1.24wmf4,
+amwiki: php-1.24wmf5,
 amwikiquote: php-1.24wmf5,
 amwiktionary: php-1.24wmf5,
-angwiki: php-1.24wmf4,
+angwiki: php-1.24wmf5,
 angwikibooks: php-1.24wmf5,
 angwikiquote: php-1.24wmf5,
 angwikisource: php-1.24wmf5,
 angwiktionary: php-1.24wmf5,
-anwiki: php-1.24wmf4,
+anwiki: php-1.24wmf5,
 anwiktionary: php-1.24wmf5,
 arbcom_dewiki: php-1.24wmf5,
 arbcom_enwiki: php-1.24wmf5,
 arbcom_fiwiki: php-1.24wmf5,
 arbcom_nlwiki: php-1.24wmf5,
-arcwiki: php-1.24wmf4,
-arwiki: php-1.24wmf4,
+arcwiki: php-1.24wmf5,
+arwiki: php-1.24wmf5,
 arwikibooks: php-1.24wmf5,
 arwikimedia: php-1.24wmf5,
 arwikinews: php-1.24wmf5,
@@ -40,134 +40,134 @@
 arwikisource: php-1.24wmf5,
 arwikiversity: php-1.24wmf5,
 arwiktionary: php-1.24wmf5,
-arzwiki: php-1.24wmf4,
-astwiki: php-1.24wmf4,
+arzwiki: php-1.24wmf5,
+astwiki: php-1.24wmf5,
 astwikibooks: php-1.24wmf5,
 astwikiquote: php-1.24wmf5,
 astwiktionary: php-1.24wmf5,
-aswiki: php-1.24wmf4,
+aswiki: php-1.24wmf5,
 aswikibooks: php-1.24wmf5,
 aswikisource: php-1.24wmf5,
 aswiktionary: php-1.24wmf5,
 auditcomwiki: php-1.24wmf5,
-avwiki: php-1.24wmf4,
+avwiki: php-1.24wmf5,
 avwiktionary: php-1.24wmf5,
-aywiki: php-1.24wmf4,
+aywiki: php-1.24wmf5,
 aywikibooks: php-1.24wmf5,
 aywiktionary: php-1.24wmf5,
-azwiki: php-1.24wmf4,
+azwiki: php-1.24wmf5,
 azwikibooks: php-1.24wmf5,
 azwikiquote: php-1.24wmf5,
 azwikisource: php-1.24wmf5,
 azwiktionary: php-1.24wmf5,
-barwiki: php-1.24wmf4,
-bat_smgwiki: php-1.24wmf4,
-bawiki: php-1.24wmf4,
+barwiki: php-1.24wmf5,
+bat_smgwiki: php-1.24wmf5,
+bawiki: php-1.24wmf5,
 bawikibooks: php-1.24wmf5,
-bclwiki: php-1.24wmf4,
+bclwiki: php-1.24wmf5,
 bdwikimedia: php-1.24wmf5,
-be_x_oldwiki: php-1.24wmf4,
+be_x_oldwiki: php-1.24wmf5,
 betawikiversity: php-1.24wmf5,
-bewiki: php-1.24wmf4,
+bewiki: php-1.24wmf5,
 bewikibooks: php-1.24wmf5,
 bewikimedia: php-1.24wmf5,
 bewikiquote: php-1.24wmf5,
 bewikisource: php-1.24wmf5,
 bewiktionary: php-1.24wmf5,
-bgwiki: php-1.24wmf4,
+bgwiki: php-1.24wmf5,
 bgwikibooks: php-1.24wmf5,
 bgwikinews: php-1.24wmf5,
 bgwikiquote: php-1.24wmf5,
 bgwikisource: php-1.24wmf5,
 bgwiktionary: php-1.24wmf5,
-bhwiki: php-1.24wmf4,
+bhwiki: php-1.24wmf5,
 bhwiktionary: php-1.24wmf5,
-biwiki: php-1.24wmf4,
+biwiki: php-1.24wmf5,
 biwikibooks: php-1.24wmf5,
 biwiktionary: php-1.24wmf5,
-bjnwiki: php-1.24wmf4,
-bmwiki: php-1.24wmf4,
+bjnwiki: php-1.24wmf5,
+bmwiki: php-1.24wmf5,
 bmwikibooks: php-1.24wmf5,
 bmwikiquote: php-1.24wmf5,
 bmwiktionary: php-1.24wmf5,
-bnwiki: php-1.24wmf4,
+bnwiki: php-1.24wmf5,
 bnwikibooks: php-1.24wmf5,
 bnwikisource: php-1.24wmf5,
 bnwiktionary: php-1.24wmf5,
 boardgovcomwiki: php-1.24wmf5,
 boardwiki: php-1.24wmf5,
-bowiki: php-1.24wmf4,
+bowiki: php-1.24wmf5,
 bowikibooks: php-1.24wmf5,
 bowiktionary: php-1.24wmf5,
-bpywiki: php-1.24wmf4,
-brwiki: php-1.24wmf4,
+bpywiki: php-1.24wmf5,
+brwiki: php-1.24wmf5,
 brwikimedia: php-1.24wmf5,
 brwikiquote: php-1.24wmf5,
 brwikisource: php-1.24wmf5,
 brwiktionary: php-1.24wmf5,
-bswiki: php-1.24wmf4,
+bswiki: php-1.24wmf5,
 bswikibooks: php-1.24wmf5,
 

[MediaWiki-commits] [Gerrit] Trim linebreaks from block level extensions and preserve - change (mediawiki...VisualEditor)

2014-05-22 Thread Esanders (Code Review)
Esanders has uploaded a new change for review.

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

Change subject: Trim linebreaks from block level extensions and preserve
..

Trim linebreaks from block level extensions and preserve

Showing the linebreaks in the textbox just encourages the user
to 'clean' them up. We should preserve their absence to prevent
dirty-diffs, and use them on new nodes.

Change-Id: Ic2827f7f56db15aa5836c6ca978350549ab0123d
---
M modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
1 file changed, 29 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
index 8325e8e..eb62342 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js
@@ -69,6 +69,8 @@
} );
this.input.$element.addClass( 've-ui-mwExtensionInspector-input' );
 
+   this.isBlock = this.constructor.static.nodeModel.prototype instanceof 
ve.dm.BranchNode;
+
// Initialization
this.$form.append( this.input.$element );
 };
@@ -89,17 +91,41 @@
// Parent method
ve.ui.Inspector.prototype.setup.call( this, data );
 
+   var value, dir;
+
// Initialization
this.node = this.getFragment().getSelectedNode();
+   this.whitespace = [ '', '' ];
+
// Make sure we're inspecting the right type of node
if ( !( this.node instanceof this.constructor.static.nodeModel ) ) {
this.node = null;
}
-   this.input.setValue( this.node ? this.node.getAttribute( 'mw' 
).body.extsrc : '' );
+   if ( this.node ) {
+   value = this.node.getAttribute( 'mw' ).body.extsrc;
+   if ( this.isBlock ) {
+   // Trim leading/trailing linebreaks but remember them
+   if ( value.substr( 0, 1 ) === '\n' ) {
+   this.whitespace[0] = '\n';
+   value = value.slice( 1 );
+   }
+   if ( value.substr( -1 ) === '\n' ) {
+   this.whitespace[1] = '\n';
+   value = value.slice( 0, -1 );
+   }
+   }
+   this.input.setValue( value );
+   } else {
+   if ( this.isBlock ) {
+   // New nodes should use linebreaks for blocks
+   this.whitespace = [ '\n', '\n' ];
+   }
+   this.input.setValue( '' );
+   }
 
this.input.$input.attr( 'placeholder', this.getInputPlaceholder() );
 
-   var dir = this.constructor.static.dir || data.dir;
+   dir = this.constructor.static.dir || data.dir;
this.input.setRTL( dir === 'rtl' );
 };
 
@@ -164,5 +190,5 @@
  * @param {Object} mwData MediaWiki data object
  */
 ve.ui.MWExtensionInspector.prototype.updateMwData = function ( mwData ) {
-   mwData.body.extsrc = this.input.getValue();
+   mwData.body.extsrc = this.whitespace[0] + this.input.getValue() + 
this.whitespace[1];
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2827f7f56db15aa5836c6ca978350549ab0123d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Reduce page_props usage - change (mediawiki...MobileFrontend)

2014-05-22 Thread MaxSem (Code Review)
MaxSem has uploaded a new change for review.

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

Change subject: Reduce page_props usage
..

Reduce page_props usage

Don't save page_top_level_section_count=0, treat the lack of property as zero 
instead.
That would reduce page_props usage by 23% on enwiki, or 6.5M rows.

Change-Id: Ia378290703dc4266d9b61a6aab7d2b002c3e740d
---
M includes/MobileFrontend.hooks.php
M includes/skins/SkinMinervaAlpha.php
2 files changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index e4adb76..4fdd45a 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -26,7 +26,9 @@
$numTopics += 1;
}
}
-   $lu-mProperties['page_top_level_section_count'] = 
$numTopics;
+   if ( $numTopics ) {
+   
$lu-mProperties['page_top_level_section_count'] = $numTopics;
+   }
}
 
return true;
diff --git a/includes/skins/SkinMinervaAlpha.php 
b/includes/skins/SkinMinervaAlpha.php
index 874dc3c..effb2fc 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -29,7 +29,7 @@
$talkTitle = $title-getTalkPage();
if ( $talkTitle-getArticleID() ) {
$dbr = wfGetDB( DB_SLAVE );
-   $numTopics = $dbr-selectField( 'page_props', 
'pp_value',
+   $numTopics = (int)$dbr-selectField( 
'page_props', 'pp_value',
array(
'pp_page' = 
$talkTitle-getArticleID(),
'pp_propname' = 
'page_top_level_section_count'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia378290703dc4266d9b61a6aab7d2b002c3e740d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com

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


[MediaWiki-commits] [Gerrit] group0 to 1.24wmf6 - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: group0 to 1.24wmf6
..


group0 to 1.24wmf6

Change-Id: I52b9e868ce2f62efcca2efce1745cf8d58ae4293
---
M wikiversions.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index ccc5db6..395dd41 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -467,7 +467,7 @@
 lvwiktionary: php-1.24wmf5,
 map_bmswiki: php-1.24wmf5,
 mdfwiki: php-1.24wmf5,
-mediawikiwiki: php-1.24wmf5,
+mediawikiwiki: php-1.24wmf6,
 metawiki: php-1.24wmf5,
 mgwiki: php-1.24wmf5,
 mgwikibooks: php-1.24wmf5,
@@ -733,9 +733,9 @@
 tawikisource: php-1.24wmf5,
 tawiktionary: php-1.24wmf5,
 tenwiki: php-1.24wmf5,
-test2wiki: php-1.24wmf5,
+test2wiki: php-1.24wmf6,
 testwiki: php-1.24wmf6,
-testwikidatawiki: php-1.24wmf5,
+testwikidatawiki: php-1.24wmf6,
 tetwiki: php-1.24wmf5,
 tewiki: php-1.24wmf5,
 tewikibooks: php-1.24wmf5,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52b9e868ce2f62efcca2efce1745cf8d58ae4293
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Don't stretch the image in the media viewer - change (mediawiki...MobileFrontend)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Don't stretch the image in the media viewer
..


Don't stretch the image in the media viewer

Bug: 63553
Change-Id: I06339b5559e6c8aef446de51edb82e5647369d72
---
M javascripts/modules/mediaViewer/ImageOverlay.js
1 file changed, 16 insertions(+), 9 deletions(-)

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



diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js 
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 1d9a042..b743fb6 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -31,6 +31,8 @@
self.$( '.container' ).removeClass( 
'loading' );
}
 
+   self.thumbWidth = data.thumbwidth;
+   self.thumbHeight = data.thumbheight;
self.imgRatio = data.thumbwidth / 
data.thumbheight;
$img = $( 'img' ).attr( 'src', data.thumburl 
).attr( 'alt', options.caption );
self.$( '.container div' ).append( $img );
@@ -61,20 +63,25 @@
_positionImage: function() {
var windowWidth = $( window ).width(),
windowHeight = $( window ).height(),
-   windowRatio = windowWidth / windowHeight;
+   windowRatio = windowWidth / windowHeight,
+   $img = this.$( 'img' );
 
// display: table (which we use for vertical centering) 
makes the overlay
// expand so simply setting width/height to 100% 
doesn't work
if ( this.imgRatio  windowRatio ) {
-   this.$( 'img' ).css( {
-   width: windowWidth,
-   height: 'auto'
-   } );
+   if ( windowWidth  this.thumbWidth ) {
+   $img.css( {
+   width: windowWidth,
+   height: 'auto'
+   } );
+   }
} else {
-   this.$( 'img' ).css( {
-   width: 'auto',
-   height: windowHeight
-   } );
+   if ( windowHeight  this.thumbHeight ) {
+   $img.css( {
+   width: 'auto',
+   height: windowHeight
+   } );
+   }
}
}
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I06339b5559e6c8aef446de51edb82e5647369d72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Prime - change (wikimedia...dash)

2014-05-22 Thread Ssmith (Code Review)
Ssmith has uploaded a new change for review.

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

Change subject: Prime
..

Prime

Change-Id: I983e4d9ab3148b89096c53efa86e50c3e3417c3e
---
M public/css/style.css
A public/javascripts/vendor/chartjs/.bower.json
A public/javascripts/vendor/chartjs/.gitignore
A public/javascripts/vendor/chartjs/Chart.js
A public/javascripts/vendor/chartjs/Chart.min.js
A public/javascripts/vendor/chartjs/LICENSE.md
A public/javascripts/vendor/chartjs/component.json
A public/javascripts/vendor/chartjs/docs/Chart.js
A public/javascripts/vendor/chartjs/docs/index.html
A public/javascripts/vendor/chartjs/docs/prettify.css
A public/javascripts/vendor/chartjs/docs/prettify.js
A public/javascripts/vendor/chartjs/docs/prettify.less
A public/javascripts/vendor/chartjs/docs/styles.css
A public/javascripts/vendor/chartjs/docs/styles.less
A public/javascripts/vendor/chartjs/readme.md
A public/javascripts/vendor/chartjs/samples/bar.html
A public/javascripts/vendor/chartjs/samples/doughnut.html
A public/javascripts/vendor/chartjs/samples/line.html
A public/javascripts/vendor/chartjs/samples/pie.html
A public/javascripts/vendor/chartjs/samples/polarArea.html
A public/javascripts/vendor/chartjs/samples/radar.html
A public/javascripts/vendor/chartjs/samples/sixup.html
A public/javascripts/vendor/chartjs/site/assets/Chart.js
A public/javascripts/vendor/chartjs/site/assets/effects.js
A public/javascripts/vendor/chartjs/site/assets/excanvas.js
A public/javascripts/vendor/chartjs/site/index.html
A public/javascripts/vendor/chartjs/site/styles.css
M public/main.js
A public/routers/approuter.js
A public/routers/index.js
D public/routers/routes.js
D public/templates/main.html
A public/utils/colors.js
M public/views/app.js
A public/views/appContent.js
D public/views/config.jade
D public/views/index.jade
D public/views/layout.jade
D public/views/library.jade
A public/views/library.js
A public/views/nav.js
A public/views/pieChartWidget.js
A public/views/templates/appContent.html
A public/views/templates/index.jade
A public/views/templates/library.html
A public/views/templates/mainNav.html
A public/views/templates/tests.html
A public/views/templates/widgets/donationsByBracketWidget.html
D public/views/tests.jade
D public/views/view.js
A public/views/widgetViews/DonationsByBracket.js
M server.js
52 files changed, 8,829 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/59/134859/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I983e4d9ab3148b89096c53efa86e50c3e3417c3e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] wgRCFeedschanges/updates via udp to second destination - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: wgRCFeedschanges/updates via udp to second destination
..


wgRCFeedschanges/updates via udp to second destination

refs: https://gerrit.wikimedia.org/r/#/c/132495/

we are trying to migrate this functionality out
of tampa but need to have simultaneous feeds
for testing / migration.

Change-Id: I7a02f2615d98428b6f27514e75d935d36e44fcb1
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 90a936f..ab40ca8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2681,6 +2681,13 @@
'add_interwiki_prefix' = false,
'omit_bots' = false,
);
+
+   $wgRCFeeds['ircd'] = array(
+   'formatter' = 'IRCColourfulRCFeedFormatter',
+   'uri' = 
udp://$wmgRC2UDPAddressMIGRATION:$wmgRC2UDPPort/$wmgRC2UDPPrefix,
+   'add_interwiki_prefix' = false,
+   'omit_bots' = false,
+   );
 }
 
 // Confirmed can do anything autoconfirmed can.
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1a61b28..839dc2c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -6233,6 +6233,11 @@
'default' = '208.80.152.178', // pmtpa: ekrem
 ),
 
+//this replaces wmgRC2UDPAddress outright post testing
+'wmgRC2UDPAddressMIGRATION' = array(
+   'default' = '208.80.154.160', // eqiad: argon
+),
+
 'wmgRC2UDPPort' = array(
'default' = 9390,
 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a02f2615d98428b6f27514e75d935d36e44fcb1
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Rush r...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Still sussing out how I want to manage things. May change ag... - change (wikimedia...dash)

2014-05-22 Thread Ssmith (Code Review)
Ssmith has uploaded a new change for review.

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

Change subject: Still sussing out how I want to manage things. May change again.
..

Still sussing out how I want to manage things. May change again.

Change-Id: Idcaf15fcfe36881d3c0ed35a6a3b91a5f116e393
---
D npm-debug.log
A public/javascripts/config.js
M public/main.js
D public/routers/home.js
A public/routers/routes.js
M public/templates/main.html
A public/views/app.js
D public/views/index.js
A public/views/templates/config.jade
R public/views/templates/index.jade
R public/views/templates/layout.jade
R public/views/templates/library.jade
R public/views/templates/tests.jade
M public/views/view.js
D routes/index.js
M server.js
D views/other.jade
17 files changed, 84 insertions(+), 122 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/60/134860/1

diff --git a/npm-debug.log b/npm-debug.log
deleted file mode 100644
index 321a7c8..000
--- a/npm-debug.log
+++ /dev/null
@@ -1,27 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'node', '/usr/local/bin/npm', 'start' ]
-2 info using npm@1.4.7
-3 info using node@v0.10.26
-4 verbose node symlink /usr/local/bin/node
-5 verbose run-script [ 'prestart', 'start', 'poststart' ]
-6 info prestart dash@0.0.1
-7 info start dash@0.0.1
-8 verbose unsafe-perm in lifecycle true
-9 info dash@0.0.1 Failed to exec start script
-10 error dash@0.0.1 start: `node server.js`
-10 error Exit status 8
-11 error Failed at the dash@0.0.1 start script.
-11 error This is most likely a problem with the dash package,
-11 error not with npm itself.
-11 error Tell the author that this fails on your system:
-11 error node server.js
-11 error You can get their info via:
-11 error npm owner ls dash
-11 error There is likely additional logging output above.
-12 error System Darwin 13.1.0
-13 error command node /usr/local/bin/npm start
-14 error cwd /Users/sherahsmith/workspace/dash
-15 error node -v v0.10.26
-16 error npm -v 1.4.7
-17 error code ELIFECYCLE
-18 verbose exit [ 1, true ]
diff --git a/public/javascripts/config.js b/public/javascripts/config.js
new file mode 100644
index 000..d075b41
--- /dev/null
+++ b/public/javascripts/config.js
@@ -0,0 +1 @@
+console.log('config.js!');
\ No newline at end of file
diff --git a/public/main.js b/public/main.js
index f1101a3..f3b58a1 100644
--- a/public/main.js
+++ b/public/main.js
@@ -1,12 +1,12 @@
 require.config({
 'paths': {
-'bootstrap': 'javascripts/vendor/bootstrap/dist/css/bootstrap.css',
-style: css/style.css,
-'QUnit': 'javascripts/vendor/qunit/qunit/qunit',
-'jquery': 'javascripts/vendor/jquery/dist/jquery',
+'bootstrap':  'javascripts/vendor/bootstrap/dist/css/bootstrap.css',
+'style':  'css/style.css',
+'QUnit':  'javascripts/vendor/qunit/qunit/qunit',
+'jquery': 'javascripts/vendor/jquery/dist/jquery',
 'underscore': 'javascripts/vendor/underscore/underscore',
-'backbone': 'javascripts/vendor/backbone/backbone',
-'text': 'javascripts/vendor/requirejs-text/text'
+'backbone':   'javascripts/vendor/backbone/backbone',
+'text':   'javascripts/vendor/requirejs-text/text'
 },
 shim: {
'QUnit': {
@@ -35,20 +35,14 @@
 });
 
 require([
-'underscore',
 'backbone',
-'text',
-'text!bootstrap',
-'text!css/style.css',
-'views/index.js',
-'routers/home'
+'views/app',
+'routers/routes'
 ],
-function( _, Backbone, bootstrap, text, style, App ){
-App.init();
-// run the tests.
-base_test.run();
-maps_test.run();
-// start QUnit.
-QUnit.load();
-QUnit.start();
+function( Backbone, AppView, MainRouter ){
+
+new MainRouter();
+Backbone.history.start();
+new AppView();
+
 });
\ No newline at end of file
diff --git a/public/routers/home.js b/public/routers/home.js
deleted file mode 100644
index dc2ea00..000
--- a/public/routers/home.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define([
-  'jquery',
-  'underscore',
-  'backbone',
-  'views/view'],
-function($, _, Backbone, mainView){
-  var Router = Backbone.Router.extend({
-initialize: function(){
-  this.mainView = mainView;
-  Backbone.history.start();
-},
-routes: {
-  '': 'home'
-},
-'home': function(){
-  this.mainView.render();
-}
-  });
-
-  return Router;
-});
diff --git a/public/routers/routes.js b/public/routers/routes.js
new file mode 100644
index 000..0fdbc86
--- /dev/null
+++ b/public/routers/routes.js
@@ -0,0 +1,34 @@
+define([
+'jquery',
+'underscore',
+'backbone',
+'models/model',
+'text!templates/main.html'],
+function($, _, Backbone, model, template){
+
+var MainRouter = Backbone.Router.extend({
+
+  routes: {
+: 

[MediaWiki-commits] [Gerrit] Disable query pages for closed wikis - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Disable query pages for closed wikis
..


Disable query pages for closed wikis

This change disables all special pages that are considered
'query' types of special pages, for wikis on closed.dblist

Bug: 42436
Change-Id: I40abb47b1cb34c38d42dc7637d16e78567039c30
---
M wmf-config/InitialiseSettings.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 839dc2c..1c2f3b5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9545,6 +9545,13 @@
 ),
 # @} end of wgVariantArticlePath
 
+# Disable all query pages for closed wikis, allow normal functioning for others
+'wgDisableQueryPages' = array(
+   'default' = false,
+
+   'closed' = true, // bug 42436
+),
+
 # Disable all the query pages that take more than about 15 minutes to update
 # wgDisableQueryPageUpdate @{
 'wgDisableQueryPageUpdate' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40abb47b1cb34c38d42dc7637d16e78567039c30
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Withoutaname drevit...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: TTO at.li...@live.com.au
Gerrit-Reviewer: Withoutaname drevit...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] jQuery 1.9 compatibility fixes - change (mediawiki...UploadWizard)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: jQuery 1.9 compatibility fixes
..


jQuery 1.9 compatibility fixes

Also takes care of a few core deprecations

Change-Id: Ia7f4376cd2ca5064ab486d5213cb842c35804eae
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/591
---
M resources/mw.ApiUploadFormDataHandler.js
M resources/mw.ApiUploadHandler.js
M resources/mw.Firefogg.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardDeed.js
M resources/mw.UploadWizardDetails.js
M resources/mw.UploadWizardLicenseInput.js
M resources/mw.UploadWizardUpload.js
M resources/mw.UploadWizardUploadInterface.js
M resources/mw.fileApi.js
M resources/uploadWizard.css
D test/jasmine/SpecRunner.html
D test/jasmine/spec/mediawiki.parser2.spec.js
D test/jasmine/spec/mw.Api.edit.spec.js
D test/jasmine/spec/mw.Api.spec.js
D test/jasmine/spec/mw.pubsub.spec.js
D test/jasmine/spec/mw.units.spec.js
17 files changed, 27 insertions(+), 904 deletions(-)

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



diff --git a/resources/mw.ApiUploadFormDataHandler.js 
b/resources/mw.ApiUploadFormDataHandler.js
index f0d2c4d..8de046e 100644
--- a/resources/mw.ApiUploadFormDataHandler.js
+++ b/resources/mw.ApiUploadFormDataHandler.js
@@ -45,7 +45,7 @@
 callerOk();
 };
 
-this.api.getEditToken( ok, err );
+this.api.getEditToken().done( ok ).fail( err );
 },
 
 /**
diff --git a/resources/mw.ApiUploadHandler.js b/resources/mw.ApiUploadHandler.js
index 5e9224c..0396af3 100644
--- a/resources/mw.ApiUploadHandler.js
+++ b/resources/mw.ApiUploadHandler.js
@@ -75,7 +75,7 @@
 
var handler = this;
 
-   this.api.getEditToken( ok, err );
+   this.api.getEditToken().done( ok ).fail( err );
},
 
/**
diff --git a/resources/mw.Firefogg.js b/resources/mw.Firefogg.js
index 1ad65b9..af1555b 100644
--- a/resources/mw.Firefogg.js
+++ b/resources/mw.Firefogg.js
@@ -13,7 +13,7 @@
 */
getFirefoggInstallUrl: function() {
var osLink = false;
-   if( ! $.browser.mozilla ){
+   if( $.client.profile().name !== 'firefox' ) {
return 'http://firefogg.org/';
}
if ( navigator.oscpu ) {
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index 460b3b3..38334de 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -305,7 +305,7 @@
title: function() {
return mw.message(

'mwe-upwiz-tooltip-skiptutorial',
-   mw.config.get( 'wgServer' ) + 
mw.util.wikiGetlink( 'Special:Preferences' ) + '#mw-prefsection-uploads',
+   mw.config.get( 'wgServer' ) + 
mw.util.getUrl( 'Special:Preferences' ) + '#mw-prefsection-uploads',
mw.message( 'prefs-uploads' 
).escaped(),
mw.message( 
'prefs-upwiz-interface' ).escaped()
).parse();
@@ -366,7 +366,7 @@
 
// Insert input field into the form and set up submit action
$flickrForm.prepend( $flickrInput ).submit( function() {
-   $flickrButton.attr( 'disabled', 'disabled' );
+   $flickrButton.prop( 'disabled', true );
wizard.flickrChecker( checker );
// TODO Any particular reason to stopPropagation ?
return false;
@@ -396,7 +396,7 @@
// first destroy it completely, then reshow the add button
this.flickrInterfaceDestroy();
$( '#mwe-upwiz-upload-add-flickr-container' ).show();
-   $( '#mwe-upwiz-upload-add-flickr' ).removeAttr( 'disabled' );
+   $( '#mwe-upwiz-upload-add-flickr' ).prop( 'disabled', false );
},
 
/**
@@ -409,7 +409,7 @@
$( '#mwe-upwiz-select-flickr' ).unbind();
$( '#mwe-upwiz-flickr-select-list-container' ).hide();
$( '#mwe-upwiz-upload-add-flickr-container' ).hide();
-   $( '#mwe-upwiz-upload-add-flickr' ).attr( 'disabled', 
'disabled' );
+   $( '#mwe-upwiz-upload-add-flickr' ).prop( 'disabled', true );
},
 
/**
@@ -1439,13 +1439,12 @@
 
$.fn.enableNextButton = function() {
return this.find( '.mwe-upwiz-button-next' )
-   .removeAttr( 'disabled' );
-   //  .effect( 'pulsate', { times: 3 }, 1000 );
+   .prop( 'disabled', false );
};
 
$.fn.disableNextButton = function() {

[MediaWiki-commits] [Gerrit] No2 Rearranging routing and other framework stuff - change (wikimedia...dash)

2014-05-22 Thread Ssmith (Code Review)
Ssmith has uploaded a new change for review.

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

Change subject: No2 Rearranging routing and other framework stuff
..

No2 Rearranging routing and other framework stuff

Still sussing out how I want to manage things. May change again.

Change-Id: Ie97db7e8de2ab55d49eb886112725404e51f23bc
---
D npm-debug.log
A public/javascripts/config.js
M public/main.js
D public/routers/home.js
A public/routers/routes.js
M public/templates/main.html
A public/views/app.js
D public/views/index.js
A public/views/templates/config.jade
R public/views/templates/index.jade
R public/views/templates/layout.jade
R public/views/templates/library.jade
R public/views/templates/tests.jade
M public/views/view.js
D routes/index.js
M server.js
D views/other.jade
17 files changed, 84 insertions(+), 122 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/61/134861/1

diff --git a/npm-debug.log b/npm-debug.log
deleted file mode 100644
index 321a7c8..000
--- a/npm-debug.log
+++ /dev/null
@@ -1,27 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'node', '/usr/local/bin/npm', 'start' ]
-2 info using npm@1.4.7
-3 info using node@v0.10.26
-4 verbose node symlink /usr/local/bin/node
-5 verbose run-script [ 'prestart', 'start', 'poststart' ]
-6 info prestart dash@0.0.1
-7 info start dash@0.0.1
-8 verbose unsafe-perm in lifecycle true
-9 info dash@0.0.1 Failed to exec start script
-10 error dash@0.0.1 start: `node server.js`
-10 error Exit status 8
-11 error Failed at the dash@0.0.1 start script.
-11 error This is most likely a problem with the dash package,
-11 error not with npm itself.
-11 error Tell the author that this fails on your system:
-11 error node server.js
-11 error You can get their info via:
-11 error npm owner ls dash
-11 error There is likely additional logging output above.
-12 error System Darwin 13.1.0
-13 error command node /usr/local/bin/npm start
-14 error cwd /Users/sherahsmith/workspace/dash
-15 error node -v v0.10.26
-16 error npm -v 1.4.7
-17 error code ELIFECYCLE
-18 verbose exit [ 1, true ]
diff --git a/public/javascripts/config.js b/public/javascripts/config.js
new file mode 100644
index 000..d075b41
--- /dev/null
+++ b/public/javascripts/config.js
@@ -0,0 +1 @@
+console.log('config.js!');
\ No newline at end of file
diff --git a/public/main.js b/public/main.js
index f1101a3..f3b58a1 100644
--- a/public/main.js
+++ b/public/main.js
@@ -1,12 +1,12 @@
 require.config({
 'paths': {
-'bootstrap': 'javascripts/vendor/bootstrap/dist/css/bootstrap.css',
-style: css/style.css,
-'QUnit': 'javascripts/vendor/qunit/qunit/qunit',
-'jquery': 'javascripts/vendor/jquery/dist/jquery',
+'bootstrap':  'javascripts/vendor/bootstrap/dist/css/bootstrap.css',
+'style':  'css/style.css',
+'QUnit':  'javascripts/vendor/qunit/qunit/qunit',
+'jquery': 'javascripts/vendor/jquery/dist/jquery',
 'underscore': 'javascripts/vendor/underscore/underscore',
-'backbone': 'javascripts/vendor/backbone/backbone',
-'text': 'javascripts/vendor/requirejs-text/text'
+'backbone':   'javascripts/vendor/backbone/backbone',
+'text':   'javascripts/vendor/requirejs-text/text'
 },
 shim: {
'QUnit': {
@@ -35,20 +35,14 @@
 });
 
 require([
-'underscore',
 'backbone',
-'text',
-'text!bootstrap',
-'text!css/style.css',
-'views/index.js',
-'routers/home'
+'views/app',
+'routers/routes'
 ],
-function( _, Backbone, bootstrap, text, style, App ){
-App.init();
-// run the tests.
-base_test.run();
-maps_test.run();
-// start QUnit.
-QUnit.load();
-QUnit.start();
+function( Backbone, AppView, MainRouter ){
+
+new MainRouter();
+Backbone.history.start();
+new AppView();
+
 });
\ No newline at end of file
diff --git a/public/routers/home.js b/public/routers/home.js
deleted file mode 100644
index dc2ea00..000
--- a/public/routers/home.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define([
-  'jquery',
-  'underscore',
-  'backbone',
-  'views/view'],
-function($, _, Backbone, mainView){
-  var Router = Backbone.Router.extend({
-initialize: function(){
-  this.mainView = mainView;
-  Backbone.history.start();
-},
-routes: {
-  '': 'home'
-},
-'home': function(){
-  this.mainView.render();
-}
-  });
-
-  return Router;
-});
diff --git a/public/routers/routes.js b/public/routers/routes.js
new file mode 100644
index 000..0fdbc86
--- /dev/null
+++ b/public/routers/routes.js
@@ -0,0 +1,34 @@
+define([
+'jquery',
+'underscore',
+'backbone',
+'models/model',
+'text!templates/main.html'],
+function($, _, Backbone, model, template){
+
+var MainRouter = Backbone.Router.extend({
+
+  

[MediaWiki-commits] [Gerrit] Add base views and supporting libs - change (wikimedia...dash)

2014-05-22 Thread Ssmith (Code Review)
Ssmith has uploaded a new change for review.

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

Change subject: Add base views and supporting libs
..

Add base views and supporting libs

Still just setting things up.

Change-Id: I685ace72176c771523ebaed47b3bd3a1540fc7df
---
M public/css/style.css
A public/javascripts/vendor/chartjs/.bower.json
A public/javascripts/vendor/chartjs/.gitignore
A public/javascripts/vendor/chartjs/Chart.js
A public/javascripts/vendor/chartjs/Chart.min.js
A public/javascripts/vendor/chartjs/LICENSE.md
A public/javascripts/vendor/chartjs/component.json
A public/javascripts/vendor/chartjs/docs/Chart.js
A public/javascripts/vendor/chartjs/docs/index.html
A public/javascripts/vendor/chartjs/docs/prettify.css
A public/javascripts/vendor/chartjs/docs/prettify.js
A public/javascripts/vendor/chartjs/docs/prettify.less
A public/javascripts/vendor/chartjs/docs/styles.css
A public/javascripts/vendor/chartjs/docs/styles.less
A public/javascripts/vendor/chartjs/readme.md
A public/javascripts/vendor/chartjs/samples/bar.html
A public/javascripts/vendor/chartjs/samples/doughnut.html
A public/javascripts/vendor/chartjs/samples/line.html
A public/javascripts/vendor/chartjs/samples/pie.html
A public/javascripts/vendor/chartjs/samples/polarArea.html
A public/javascripts/vendor/chartjs/samples/radar.html
A public/javascripts/vendor/chartjs/samples/sixup.html
A public/javascripts/vendor/chartjs/site/assets/6charts.png
A public/javascripts/vendor/chartjs/site/assets/Chart.js
A public/javascripts/vendor/chartjs/site/assets/effects.js
A public/javascripts/vendor/chartjs/site/assets/excanvas.js
A public/javascripts/vendor/chartjs/site/assets/html.png
A public/javascripts/vendor/chartjs/site/assets/simple.png
A public/javascripts/vendor/chartjs/site/index.html
A public/javascripts/vendor/chartjs/site/styles.css
M public/main.js
A public/routers/approuter.js
A public/routers/index.js
D public/routers/routes.js
D public/templates/main.html
A public/utils/colors.js
M public/views/app.js
A public/views/appContent.js
A public/views/library.js
A public/views/nav.js
A public/views/pieChartWidget.js
A public/views/templates/appContent.html
D public/views/templates/config.jade
M public/views/templates/index.jade
D public/views/templates/layout.jade
A public/views/templates/library.html
D public/views/templates/library.jade
A public/views/templates/mainNav.html
A public/views/templates/tests.html
D public/views/templates/tests.jade
A public/views/templates/widgets/donationsByBracketWidget.html
D public/views/view.js
A public/views/widgetViews/DonationsByBracket.js
M server.js
54 files changed, 8,825 insertions(+), 116 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/62/134862/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I685ace72176c771523ebaed47b3bd3a1540fc7df
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Add Lato font - change (wikimedia...dash)

2014-05-22 Thread Ssmith (Code Review)
Ssmith has uploaded a new change for review.

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

Change subject: Add Lato font
..

Add Lato font

And clean up surrounding css to accommodate.

Change-Id: Ieeb57c71c52d8ddb3e98032942796f3d8a78ebd8
---
M bower.json
M public/css/style.css
A public/javascripts/vendor/lato/.bower.json
A public/javascripts/vendor/lato/Gruntfile.js
A public/javascripts/vendor/lato/README.md
A public/javascripts/vendor/lato/bower.json
A public/javascripts/vendor/lato/css/lato.css
A public/javascripts/vendor/lato/css/lato.min.css
A public/javascripts/vendor/lato/font/lato-black.eot
A public/javascripts/vendor/lato/font/lato-black.svg
A public/javascripts/vendor/lato/font/lato-black.ttf
A public/javascripts/vendor/lato/font/lato-black.woff
A public/javascripts/vendor/lato/font/lato-blackitalic.eot
A public/javascripts/vendor/lato/font/lato-blackitalic.svg
A public/javascripts/vendor/lato/font/lato-blackitalic.ttf
A public/javascripts/vendor/lato/font/lato-blackitalic.woff
A public/javascripts/vendor/lato/font/lato-bold.eot
A public/javascripts/vendor/lato/font/lato-bold.svg
A public/javascripts/vendor/lato/font/lato-bold.ttf
A public/javascripts/vendor/lato/font/lato-bold.woff
A public/javascripts/vendor/lato/font/lato-bolditalic.eot
A public/javascripts/vendor/lato/font/lato-bolditalic.svg
A public/javascripts/vendor/lato/font/lato-bolditalic.ttf
A public/javascripts/vendor/lato/font/lato-bolditalic.woff
A public/javascripts/vendor/lato/font/lato-hairline.eot
A public/javascripts/vendor/lato/font/lato-hairline.svg
A public/javascripts/vendor/lato/font/lato-hairline.ttf
A public/javascripts/vendor/lato/font/lato-hairline.woff
A public/javascripts/vendor/lato/font/lato-hairlineitalic.eot
A public/javascripts/vendor/lato/font/lato-hairlineitalic.svg
A public/javascripts/vendor/lato/font/lato-hairlineitalic.ttf
A public/javascripts/vendor/lato/font/lato-hairlineitalic.woff
A public/javascripts/vendor/lato/font/lato-italic.eot
A public/javascripts/vendor/lato/font/lato-italic.svg
A public/javascripts/vendor/lato/font/lato-italic.ttf
A public/javascripts/vendor/lato/font/lato-italic.woff
A public/javascripts/vendor/lato/font/lato-light.eot
A public/javascripts/vendor/lato/font/lato-light.svg
A public/javascripts/vendor/lato/font/lato-light.ttf
A public/javascripts/vendor/lato/font/lato-light.woff
A public/javascripts/vendor/lato/font/lato-lightitalic.eot
A public/javascripts/vendor/lato/font/lato-lightitalic.svg
A public/javascripts/vendor/lato/font/lato-lightitalic.ttf
A public/javascripts/vendor/lato/font/lato-lightitalic.woff
A public/javascripts/vendor/lato/font/lato-regular.eot
A public/javascripts/vendor/lato/font/lato-regular.svg
A public/javascripts/vendor/lato/font/lato-regular.ttf
A public/javascripts/vendor/lato/font/lato-regular.woff
A public/javascripts/vendor/lato/less/lato-black.less
A public/javascripts/vendor/lato/less/lato-blackitalic.less
A public/javascripts/vendor/lato/less/lato-bold.less
A public/javascripts/vendor/lato/less/lato-bolditalic.less
A public/javascripts/vendor/lato/less/lato-hairline.less
A public/javascripts/vendor/lato/less/lato-hairlineitalic.less
A public/javascripts/vendor/lato/less/lato-italic.less
A public/javascripts/vendor/lato/less/lato-light.less
A public/javascripts/vendor/lato/less/lato-lightitalic.less
A public/javascripts/vendor/lato/less/lato-regular.less
A public/javascripts/vendor/lato/less/lato.less
A public/javascripts/vendor/lato/less/variables.less
A public/javascripts/vendor/lato/package.json
A public/javascripts/vendor/lato/scss/lato-black.scss
A public/javascripts/vendor/lato/scss/lato-blackitalic.scss
A public/javascripts/vendor/lato/scss/lato-bold.scss
A public/javascripts/vendor/lato/scss/lato-bolditalic.scss
A public/javascripts/vendor/lato/scss/lato-hairline.scss
A public/javascripts/vendor/lato/scss/lato-hairlineitalic.scss
A public/javascripts/vendor/lato/scss/lato-italic.scss
A public/javascripts/vendor/lato/scss/lato-light.scss
A public/javascripts/vendor/lato/scss/lato-lightitalic.scss
A public/javascripts/vendor/lato/scss/lato-regular.scss
A public/javascripts/vendor/lato/scss/lato.scss
A public/javascripts/vendor/lato/scss/variables.scss
M public/views/nav.js
M public/views/templates/mainNav.html
M public/views/templates/widgets/donationsByBracketWidget.html
M public/views/widgetViews/DonationsByBracket.js
77 files changed, 48,109 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/63/134863/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeb57c71c52d8ddb3e98032942796f3d8a78ebd8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org

___
MediaWiki-commits 

[MediaWiki-commits] [Gerrit] Adding header font change to release notes for 1.24 - change (mediawiki/core)

2014-05-22 Thread Kaldari (Code Review)
Kaldari has uploaded a new change for review.

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

Change subject: Adding header font change to release notes for 1.24
..

Adding header font change to release notes for 1.24

Change-Id: I786dafa7064a9fa630f2eabdcaff4976566251dc
---
M RELEASE-NOTES-1.24
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/134864/1

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index fb23b71..17b349c 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -38,6 +38,8 @@
 * WikitextContent will now render redirects with the expected redirect
   header, rather than as an ordered list. Code calling Article::viewRedirect
   can probably be changed to no longer special-case redirects.
+* Header font set to a serif font stack. See
+  https://www.mediawiki.org/wiki/Typography_refresh for further information.
 * (bug 63903) Thumbnails without an explicit size specification are
   now resized to a square bounding box. This gives better results for
   non-landscape thumbnails.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I786dafa7064a9fa630f2eabdcaff4976566251dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] ZeroWiki: Add extra page to whitelist - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: ZeroWiki: Add extra page to whitelist
..


ZeroWiki: Add extra page to whitelist

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1c2f3b5..08150ee 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3821,6 +3821,7 @@
 'wgWhitelistRead' = array(
'private' = array( 'Main Page', 'Special:Userlogin', 
'Special:Userlogout' ),
'grantswiki' = array( 'Main Page', 'Special:Userlogin', 
'Special:Userlogout' ),
+   '+zerowiki' = array( 'Special:ZeroPortal' ),
 ),
 # @} end of wgWhitelistRead
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97884da19aa1769a768841ff2eb579b8e537bd8b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Change Open Directory to DMOZ - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Change Open Directory to DMOZ
..


Change Open Directory to DMOZ

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 08150ee..a562eb4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12770,7 +12770,7 @@
'wikipedia' = 'Wikipedia',
'WikiPedia' = 'Wikipedia',
'citizendium' = 'Citizendium',
-   'dmoz' = 'Open Directory',
+   'dmoz' = 'DMOZ',
'Radreise-Wiki' = 'Radreise-Wiki',
'rezepte' = 'Rezepte-Wiki',
'commons' = 'Wikimedia Commons',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52a66b2a1c05ab2128a55c7e727127a1d2a027c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Use an actually generic address as $wmgNotificationSender de... - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Use an actually generic address as $wmgNotificationSender 
default
..


Use an actually generic address as $wmgNotificationSender default

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a562eb4..a80de04 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12538,7 +12538,7 @@
 ),
 # from and reply to address when Echo sends email notifications
 'wmgNotificationSender' = array(
-   'default' = 'no-reply-notificati...@mediawiki.org',
+   'default' = 'w...@wikimedia.org',
'enwiki' = 'no-reply-notificati...@wikipedia.org',
 ),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I214b0f5fd82d357a32849bee2e072f33577f8ef6
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Enable Echo for en_rtl test wiki and enable flow for a test ... - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Enable Echo for en_rtl test wiki and enable flow for a test page
..


Enable Echo for en_rtl test wiki and enable flow for a test page

Change-Id: I1f68b27453af74b8b0edf6d0b9ad8d6f998bdd6d
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 956fcf0..d566139 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -160,6 +160,7 @@
),
'wmgUseEcho' = array(
'enwiki' = true,
+   'en_rtlwiki' = true,
),
 
'-wmgUsePoolCounter' = array(
@@ -357,6 +358,7 @@
# Extension:Flow's browsertests use Talk:Flow_QA.
'wmgFlowOccupyPages' = array(
'enwiki' = array( 'Talk:Flow QA', 'Talk:Flow' ),
+   'en_rtlwiki' = array( 'Talk:Flow' ),
),
# No separate Flow DB or cluster (yet) for labs.
'-wmgFlowDefaultWikiDb' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f68b27453af74b8b0edf6d0b9ad8d6f998bdd6d
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Enable FlaggedRevs for Persian Wikipedia - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Enable FlaggedRevs for Persian Wikipedia
..


Enable FlaggedRevs for Persian Wikipedia

Bug: 65452
Change-Id: I0f2cbad5959c388e0e49d27eaadb7b5ddf0fc974
---
M flaggedrevs.dblist
M wmf-config/flaggedrevs.php
2 files changed, 42 insertions(+), 0 deletions(-)

Approvals:
  Calak: Looks good to me, but someone else must approve
  Reedy: Looks good to me, approved
  Steinsplitter: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/flaggedrevs.dblist b/flaggedrevs.dblist
index 3fabb72..652c309 100644
--- a/flaggedrevs.dblist
+++ b/flaggedrevs.dblist
@@ -14,6 +14,7 @@
 enwikinews
 eowiki
 eswikinews
+fawiki
 fawikinews
 fiwiki
 frwikinews
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index 604a6cf..3e45f8a 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -301,6 +301,47 @@
$wgFlaggedRevsAutopromote = $wmfStandardAutoPromote;
 }
 
+elseif ( $wgDBname == 'fawiki') {
+   # Namespaces
+   $wgFlaggedRevsNamespaces = array( NS_MAIN, NS_PROJECT, NS_HELP, 
NS_TEMPLATE, NS_CATEGORY, NS_FILE, 100, 102, 828 );
+   # Show only on a per-page basis
+   $wgFlaggedRevsOverride = false;
+   # We have only one tag with one level
+   $wgFlaggedRevTags = array(
+   'status' = array( 'levels' = 1, 'quality' = 2, 'pristine' = 
3 ),
+   );
+   # Restrict autoconfirmed to flagging semi-protected
+   $wgFlagRestrictions = array(
+   'status' = array( 'review' = 1, 'autoreview' = 1 ),
+   );
+   # Restriction levels for auto-review/review rights
+   $wgFlaggedRevsRestrictionLevels = array( '', 'autoconfirmed', 
'autoreview' );
+   # Use flag protection levels
+   $wgFlaggedRevsProtection = true;
+   # Use current templates/files
+   $wgFlaggedRevsHandleIncludes = FR_INCLUDES_CURRENT;
+   # Trial quota
+   $wgFlaggedRevsProtectQuota = 2000;
+
+   # User groups permissions
+   $wgGroupPermissions['autopatrol']['autoreview'] = true;
+   $wgGroupPermissions['patroller']['autoreview'] = true;
+   $wgGroupPermissions['patroller']['review'] = true;
+   $wgGroupPermissions['patroller']['validate'] = true;
+   $wgGroupPermissions['patroller']['unreviewedpages'] = true;
+   $wgGroupPermissions['sysop']['review'] = true;
+   $wgGroupPermissions['sysop']['validate'] = true;
+   $wgGroupPermissions['sysop']['unreviewedpages'] = true;
+   $wgGroupPermissions['sysop']['stablesettings'] = true;
+
+   # Remove all user groups (editor, reviewer, autoreview)
+   unset( $wgGroupPermissions['editor'], $wgGroupPermissions['reviewer'], 
$wgGroupPermissions['autoreview'] );
+   $wgAddGroups['sysop'] = array_diff( $wgAddGroups['sysop'], array( 
'editor', 'autoreview' ) );
+   $wgRemoveGroups['sysop'] = array_diff( $wgRemoveGroups['sysop'], array( 
'editor', 'autoreview' ) );
+   $wgAddGroups['bureaucrat'] = array_diff( $wgAddGroups['bureaucrat'], 
array( 'reviewer' ) );
+   $wgRemoveGroups['bureaucrat'] = array_diff( 
$wgRemoveGroups['bureaucrat'], array( 'reviewer' ) );
+}
+
 elseif ( $wgDBname == 'fawikinews' ) {
$wgFlaggedRevsAutoReviewNew = false;
$wgFlaggedRevsNamespaces = array_merge( $wgFlaggedRevsNamespaces, 
array( NS_CATEGORY, 100 ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f2cbad5959c388e0e49d27eaadb7b5ddf0fc974
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reza reza.ene...@gmail.com
Gerrit-Reviewer: Calak calakw...@yahoo.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Steinsplitter steinsplit...@wikipedia.de
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Remove unused AFT config for AbuseFilter - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Remove unused AFT config for AbuseFilter
..


Remove unused AFT config for AbuseFilter

Change-Id: I974c894a9b303bc1c67266c79930413accd95c96
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a80de04..d9c29a8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10387,17 +10387,14 @@
 'wmgAbuseFilterEmergencyDisableThreshold' = array(
'default' = array(
'default' = 0.05,
-   'feedback' = 0.20,
),
 ),
 'wmgAbuseFilterEmergencyDisableCount' = array(
'default' = array(
'default' = 2,
-   'feedback' = 25,
),
'enwiki' = array(
'default' = 25,
-   'feedback' = 50,
),
 ),
 'wmgAbuseFilterEmergencyDisableAge' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I974c894a9b303bc1c67266c79930413accd95c96
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Take sampling factor into account - change (analytics/multimedia)

2014-05-22 Thread MarkTraceur (Code Review)
MarkTraceur has submitted this change and it was merged.

Change subject: Take sampling factor into account
..


Take sampling factor into account

Change-Id: I3808cc07c44f1f0d4f886bebbc65e213bd0d1315
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/619
---
M actions/template.sql
1 file changed, 23 insertions(+), 20 deletions(-)

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



diff --git a/actions/template.sql b/actions/template.sql
index 49eb727..5e0d918 100644
--- a/actions/template.sql
+++ b/actions/template.sql
@@ -1,30 +1,33 @@
 -- Get statistics, per day, for various actions in Media Viewer.
 
 SELECT CONCAT(SUBSTRING(timestamp, 1, 4), '-', SUBSTRING(timestamp, 5, 2), 
'-', SUBSTRING(timestamp, 7, 2)) AS datestring,
-   SUM(CASE WHEN event_action IN ('thumbnail-link-click', 'thumbnail') 
THEN 1 ELSE 0 END) AS 'thumbnail',
-   SUM(CASE WHEN event_action IN ('enlarge-link-click', 'enlarge') THEN 1 
ELSE 0 END) AS 'enlarge',
-   SUM(CASE WHEN event_action IN ('fullscreen-link-click', 'fullscreen') 
THEN 1 ELSE 0 END) AS 'fullscreen',
-   SUM(CASE WHEN event_action IN ('defullscreen-link-click', 
'defullscreen') THEN 1 ELSE 0 END) AS 'defullscreen',
-   SUM(CASE WHEN event_action IN ('close-link-click', 'close') THEN 1 ELSE 
0 END) AS 'close',
-   SUM(CASE WHEN event_action IN ('site-link-click', 
'file-description-page') THEN 1 ELSE 0 END) AS 'file-description-page',
-   SUM(CASE WHEN event_action IN ('use-this-file-link-click', 
'use-this-file-open') THEN 1 ELSE 0 END) AS 'use-this-file-open',
-   SUM(CASE WHEN event_action = 'image-view' THEN 1 ELSE 0 END) AS 
'image-view',
-   SUM(CASE WHEN event_action = 'metadata-open' THEN 1 ELSE 0 END) AS 
'metadata-open',
-   SUM(CASE WHEN event_action = 'metadata-close' THEN 1 ELSE 0 END) AS 
'metadata-close',
-   SUM(CASE WHEN event_action = 'next-image' THEN 1 ELSE 0 END) AS 
'next-image',
-   SUM(CASE WHEN event_action = 'prev-image' THEN 1 ELSE 0 END) AS 
'prev-image',
-   SUM(CASE WHEN event_action = 'terms-open' THEN 1 ELSE 0 END) AS 
'terms-open',
-   SUM(CASE WHEN event_action = 'license-page' THEN 1 ELSE 0 END) AS 
'license-page',
-   SUM(CASE WHEN event_action = 'author-page' THEN 1 ELSE 0 END) AS 
'author-page',
-   SUM(CASE WHEN event_action = 'source-page' THEN 1 ELSE 0 END) AS 
'source-page',
-   SUM(CASE WHEN event_action = 'hash-load' THEN 1 ELSE 0 END) AS 
'hash-load',
-   SUM(CASE WHEN event_action = 'history-navigation' THEN 1 ELSE 0 END) AS 
'history-navigation'
+   SUM(CASE WHEN event_action IN ('thumbnail-link-click', 'thumbnail') 
THEN event_samplingFactor ELSE 0 END) AS 'thumbnail',
+   SUM(CASE WHEN event_action IN ('enlarge-link-click', 'enlarge') THEN 
event_samplingFactor ELSE 0 END) AS 'enlarge',
+   SUM(CASE WHEN event_action IN ('fullscreen-link-click', 'fullscreen') 
THEN event_samplingFactor ELSE 0 END) AS 'fullscreen',
+   SUM(CASE WHEN event_action IN ('defullscreen-link-click', 
'defullscreen') THEN event_samplingFactor ELSE 0 END) AS 'defullscreen',
+   SUM(CASE WHEN event_action IN ('close-link-click', 'close') THEN 
event_samplingFactor ELSE 0 END) AS 'close',
+   SUM(CASE WHEN event_action IN ('site-link-click', 
'file-description-page') THEN event_samplingFactor ELSE 0 END) AS 
'file-description-page',
+   SUM(CASE WHEN event_action IN ('use-this-file-link-click', 
'use-this-file-open') THEN event_samplingFactor ELSE 0 END) AS 
'use-this-file-open',
+   SUM(CASE WHEN event_action = 'image-view' THEN event_samplingFactor 
ELSE 0 END) AS 'image-view',
+   SUM(CASE WHEN event_action = 'metadata-open' THEN event_samplingFactor 
ELSE 0 END) AS 'metadata-open',
+   SUM(CASE WHEN event_action = 'metadata-close' THEN event_samplingFactor 
ELSE 0 END) AS 'metadata-close',
+   SUM(CASE WHEN event_action = 'next-image' THEN event_samplingFactor 
ELSE 0 END) AS 'next-image',
+   SUM(CASE WHEN event_action = 'prev-image' THEN event_samplingFactor 
ELSE 0 END) AS 'prev-image',
+   SUM(CASE WHEN event_action = 'terms-open' THEN event_samplingFactor 
ELSE 0 END) AS 'terms-open',
+   SUM(CASE WHEN event_action = 'license-page' THEN event_samplingFactor 
ELSE 0 END) AS 'license-page',
+   SUM(CASE WHEN event_action = 'author-page' THEN event_samplingFactor 
ELSE 0 END) AS 'author-page',
+   SUM(CASE WHEN event_action = 'source-page' THEN event_samplingFactor 
ELSE 0 END) AS 'source-page',
+   SUM(CASE WHEN event_action = 'hash-load' THEN event_samplingFactor ELSE 
0 END) AS 'hash-load',
+   SUM(CASE WHEN event_action = 'history-navigation' THEN 
event_samplingFactor ELSE 0 END) AS 'history-navigation'
 
FROM (
-   SELECT timestamp, event_action FROM MediaViewer_7670440
+   

[MediaWiki-commits] [Gerrit] Remove Nearby BF from whitelist - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Remove Nearby BF from whitelist
..


Remove Nearby BF from whitelist

Already disabled cluster-wide with an in-extension feature flag.

Change-Id: I45bddd9303b7c9c4aaf41ad7a1aba6e4f60ca850
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d9c29a8..6699ccd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10765,12 +10765,11 @@
'visualeditor-enable',  // VisualEditor – 
on-going (special permission)
'math-enable-visualeditor', // 2014-05-21 – VE 
formula editor
'multimedia-viewer',// 2014-05-21 – 
MediaViewer
-   'betafeatures-geonotahack', // 2014-05-21 – 
Near this page
'cirrussearch-default', // 2014-06-09 – New 
Seach
'uls-compact-links',// 2014-09-06 – 
Compact language links
'popups',   // 2014-09-18 – 
Hovercards
'betafeatures-vector-compact-personal-bar', // 2014-11-01 – 
Compact personal bar
-   'visualeditor-enable-language', // 2014-10-30 — VE 
language editor
+   'visualeditor-enable-language', // 2014-11-01 — VE 
language editor
),
 ),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45bddd9303b7c9c4aaf41ad7a1aba6e4f60ca850
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Remove VE formula editor from BF whitelist (graduated) - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Remove VE formula editor from BF whitelist (graduated)
..


Remove VE formula editor from BF whitelist (graduated)

Change-Id: I1c658bf653b08b33e8e435f51baecbcdfd438896
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6699ccd..d6662fa 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10763,7 +10763,6 @@
 'wmgBetaFeaturesWhitelist' = array(
'default' = array(
'visualeditor-enable',  // VisualEditor – 
on-going (special permission)
-   'math-enable-visualeditor', // 2014-05-21 – VE 
formula editor
'multimedia-viewer',// 2014-05-21 – 
MediaViewer
'cirrussearch-default', // 2014-06-09 – New 
Seach
'uls-compact-links',// 2014-09-06 – 
Compact language links

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c658bf653b08b33e8e435f51baecbcdfd438896
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Move to new pywikibot channel - change (labs...pywikibugs)

2014-05-22 Thread Merlijn van Deen (Code Review)
Merlijn van Deen has uploaded a new change for review.

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

Change subject: Move to new pywikibot channel
..

Move to new pywikibot channel

Change-Id: Icb5dba734ac2953678d2269320b4862981fce5c9
---
M channels.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/pywikibugs 
refs/changes/66/134866/1

diff --git a/channels.py b/channels.py
index 3f885a8..2c979de 100644
--- a/channels.py
+++ b/channels.py
@@ -1,7 +1,7 @@
 channels = {
 #huggle:
 lambda x: x.get(X-Bugzilla-Product, None) == Huggle,
-#pywikipediabot:
+#pywikibot:
 lambda x: x.get(X-Bugzilla-Product, None) == Pywikibot,
 #wikimedia-corefeatures:
 lambda x: (x.get(X-Bugzilla-Product, None) == MediaWiki 
extensions) and \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb5dba734ac2953678d2269320b4862981fce5c9
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/pywikibugs
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl

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


[MediaWiki-commits] [Gerrit] Move to new pywikibot channel - change (labs...pywikibugs)

2014-05-22 Thread Merlijn van Deen (Code Review)
Merlijn van Deen has submitted this change and it was merged.

Change subject: Move to new pywikibot channel
..


Move to new pywikibot channel

Change-Id: Icb5dba734ac2953678d2269320b4862981fce5c9
---
M channels.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Merlijn van Deen: Verified; Looks good to me, approved



diff --git a/channels.py b/channels.py
index 3f885a8..2c979de 100644
--- a/channels.py
+++ b/channels.py
@@ -1,7 +1,7 @@
 channels = {
 #huggle:
 lambda x: x.get(X-Bugzilla-Product, None) == Huggle,
-#pywikipediabot:
+#pywikibot:
 lambda x: x.get(X-Bugzilla-Product, None) == Pywikibot,
 #wikimedia-corefeatures:
 lambda x: (x.get(X-Bugzilla-Product, None) == MediaWiki 
extensions) and \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb5dba734ac2953678d2269320b4862981fce5c9
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/pywikibugs
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl

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


[MediaWiki-commits] [Gerrit] Clear Network error. Tap to try again. bar - change (apps...wikipedia)

2014-05-22 Thread Dbrant (Code Review)
Dbrant has submitted this change and it was merged.

Change subject: Clear Network error. Tap to try again.  bar
..


Clear Network error. Tap to try again.  bar

Fade out the bar when the search test field loses focus.
Hide it when navigate back or open the nav drawer.

Bug: 64773
Change-Id: Ie56aefc7cb44ee6819f1805e5b534283d9fd030d
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
2 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved

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



diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 10f8ba8..a7636d6 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -172,6 +172,7 @@
 String tag = 
getSupportFragmentManager().getBackStackEntryAt(getSupportFragmentManager().getBackStackEntryCount()
 - 1).getName();
 curPageFragment = (PageViewFragment) 
getSupportFragmentManager().findFragmentByTag(tag);
 curPageFragment.show();
+searchAriclesFragment.clearErrors();
 searchAriclesFragment.ensureVisible();
 }
 }
diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index e21b0b5..535bcd1 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -217,6 +217,16 @@
 }
 });
 
+searchTermText.setOnFocusChangeListener(new 
View.OnFocusChangeListener() {
+@Override
+public void onFocusChange(View v, boolean hasFocus) {
+if (!hasFocus  searchNetworkError.isShown()) {
+ViewAnimations.fadeOut(searchNetworkError);
+}
+
+}
+});
+
 adapter = new SearchResultAdapter(inflater);
 searchResultsList.setAdapter(adapter);
 
@@ -227,6 +237,7 @@
 drawerLayout.closeDrawer(Gravity.START);
 } else {
 hideSearchResults();
+clearErrors();
 drawerLayout.openDrawer(Gravity.START);
 }
 }
@@ -315,6 +326,10 @@
 outState.putBoolean(pausedStateOfZero, pausedStateOfZero);
 }
 
+public void clearErrors() {
+searchNetworkError.setVisibility(View.GONE);
+}
+
 private final class SearchResultAdapter extends BaseAdapter {
 private ListPageTitle results;
 private final LayoutInflater inflater;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie56aefc7cb44ee6819f1805e5b534283d9fd030d
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Cached misses in getMulti should be omitted - change (mediawiki/core)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Cached misses in getMulti should be omitted
..


Cached misses in getMulti should be omitted

SqlBagOStuff::getMulti currently returns an array with false values for missed
cache keys.
Default BagOStuff::getMulti (and other specific implementations like memcached),
however, just omit missed values.

e.g.:

$cache-getMulti( array( 'goodkey' 'badkey' ) );

should return

array( 'goodkey' = 'value' );

instead of

array( 'goodkey' = 'value', 'badkey' = false );

Bug: 65637
Change-Id: Ib2de06a0f76421094707f7ad4218346087f4dc55
---
M includes/objectcache/SqlBagOStuff.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/includes/objectcache/SqlBagOStuff.php 
b/includes/objectcache/SqlBagOStuff.php
index bcd5942..483f8b9 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -270,7 +270,6 @@
array( 'keyname' = 
$key, 'exptime' = $row-exptime ),
__METHOD__ );
$db-commit( __METHOD__, 
'flush' );
-   $values[$key] = false;
} else { // HIT
$values[$key] = 
$this-unserialize( $db-decodeBlob( $row-value ) );
}
@@ -278,7 +277,6 @@
$this-handleWriteError( $e, 
$row-serverIndex );
}
} else { // MISS
-   $values[$key] = false;
$this-debug( 'get: no matching rows' );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2de06a0f76421094707f7ad4218346087f4dc55
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Move to new pywikibot channel - change (labs...grrrit)

2014-05-22 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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

Change subject: Move to new pywikibot channel
..

Move to new pywikibot channel

Change-Id: Ic7c54ec3a03bda1aa70ca58de6a0fa6068972b52
---
M config.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/67/134867/1

diff --git a/config.yaml b/config.yaml
index d06a11a..4a5c783 100644
--- a/config.yaml
+++ b/config.yaml
@@ -28,7 +28,7 @@
 oojs/.*,
 VisualEditor/.*
 }
-#pywikipediabot: {
+#pywikibot: {
 pywikipediabot.*,
 pywikibot.*
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7c54ec3a03bda1aa70ca58de6a0fa6068972b52
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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


[MediaWiki-commits] [Gerrit] Move to new pywikibot channel - change (labs...grrrit)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Move to new pywikibot channel
..


Move to new pywikibot channel

Change-Id: Ic7c54ec3a03bda1aa70ca58de6a0fa6068972b52
---
M config.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  Merlijn van Deen: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/config.yaml b/config.yaml
index d06a11a..4a5c783 100644
--- a/config.yaml
+++ b/config.yaml
@@ -28,7 +28,7 @@
 oojs/.*,
 VisualEditor/.*
 }
-#pywikipediabot: {
+#pywikibot: {
 pywikipediabot.*,
 pywikibot.*
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7c54ec3a03bda1aa70ca58de6a0fa6068972b52
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Fix spelling in wikibase-item-summary-wbmergeitems-to message - change (mediawiki...Wikibase)

2014-05-22 Thread Aude (Code Review)
Aude has uploaded a new change for review.

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

Change subject: Fix spelling in wikibase-item-summary-wbmergeitems-to message
..

Fix spelling in wikibase-item-summary-wbmergeitems-to message

This should be into instead of in to.

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


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

diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 3621218..aedcd39 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -320,7 +320,7 @@
 wikibase-item-summary-wbremovequalifiers-remove: Removed 
{{PLURAL:$1|qualifier|qualifiers}},
 wikibase-item-summary-wbremovereferences-remove: Removed 
{{PLURAL:$3|reference|references}} from claim,
 wikibase-item-summary-wbmergeitems-from: Merged item from \$3\,
-wikibase-item-summary-wbmergeitems-to: Merged item in to \$3\,
+wikibase-item-summary-wbmergeitems-to: Merged item into \$3\,
 wikibase-property-summary-wbcreate-new: Created a new property,
 wikibase-property-summary-wbeditentity-create: Created a new property,
 wikibase-property-summary-wbeditentity-update: Updated a property,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id77313c5a452fed09b067601886c00867f2faa1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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


[MediaWiki-commits] [Gerrit] Fix spelling in wikibase-item-summary-wbmergeitems-to message - change (mediawiki...Wikibase)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Fix spelling in wikibase-item-summary-wbmergeitems-to message
..


Fix spelling in wikibase-item-summary-wbmergeitems-to message

This should be into instead of in to.

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

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



diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 3621218..aedcd39 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -320,7 +320,7 @@
 wikibase-item-summary-wbremovequalifiers-remove: Removed 
{{PLURAL:$1|qualifier|qualifiers}},
 wikibase-item-summary-wbremovereferences-remove: Removed 
{{PLURAL:$3|reference|references}} from claim,
 wikibase-item-summary-wbmergeitems-from: Merged item from \$3\,
-wikibase-item-summary-wbmergeitems-to: Merged item in to \$3\,
+wikibase-item-summary-wbmergeitems-to: Merged item into \$3\,
 wikibase-property-summary-wbcreate-new: Created a new property,
 wikibase-property-summary-wbeditentity-create: Created a new property,
 wikibase-property-summary-wbeditentity-update: Updated a property,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id77313c5a452fed09b067601886c00867f2faa1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] wfDebugMem: Fix binary prefix and improve usability - change (mediawiki/core)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: wfDebugMem: Fix binary prefix and improve usability
..


wfDebugMem: Fix binary prefix and improve usability

* Fix: wfDebugMem no longer reports kibibytes as kilobytes
* Usability: wfDebugMem now uses unit symbols (e.g. KiB)

Change-Id: I1ab8aa3ccdb0fdea307913ada4ed42964d7fe960
---
M includes/GlobalFunctions.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 91724dd..d2c7542 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1007,14 +1007,14 @@
 /**
  * Send a line giving PHP memory usage.
  *
- * @param bool $exact Print exact values instead of kilobytes (default: false)
+ * @param bool $exact Print exact byte values instead of kibibytes (default: 
false)
  */
 function wfDebugMem( $exact = false ) {
$mem = memory_get_usage();
if ( !$exact ) {
-   $mem = floor( $mem / 1024 ) . ' kilobytes';
+   $mem = floor( $mem / 1024 ) . ' KiB';
} else {
-   $mem .= ' bytes';
+   $mem .= ' B';
}
wfDebug( Memory usage: $mem\n );
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ab8aa3ccdb0fdea307913ada4ed42964d7fe960
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Taueres santoro@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Do not include user column on Special:MyUploads - change (mediawiki/core)

2014-05-22 Thread Brian Wolff (Code Review)
Brian Wolff has uploaded a new change for review.

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

Change subject: Do not include user column on Special:MyUploads
..

Do not include user column on Special:MyUploads

If Special:ListFiles is being filtered to show only a specific
user, then there's not much point showing which user uploaded
the image, as they are all uploaded by the same user.

Bug: 30627
Change-Id: Ibe1be82cb8f3354889051ef00f3c0b9f9ea5180e
---
M includes/specials/SpecialListfiles.php
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/134869/1

diff --git a/includes/specials/SpecialListfiles.php 
b/includes/specials/SpecialListfiles.php
index 6b54fe8..3715b8b 100644
--- a/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@ -170,9 +170,14 @@
'img_name' = $this-msg( 'listfiles_name' 
)-text(),
'thumb' = $this-msg( 'listfiles_thumb' 
)-text(),
'img_size' = $this-msg( 'listfiles_size' 
)-text(),
-   'img_user_text' = $this-msg( 'listfiles_user' 
)-text(),
-   'img_description' = $this-msg( 
'listfiles_description' )-text(),
);
+   if ( is_null( $this-mUserName ) ) {
+   // Do not show username if filtering by username
+   $this-mFieldNames['img_user_text'] = 
$this-msg( 'listfiles_user' )-text();
+   }
+   // img_description down here, in order so that its 
still after the username field.
+   $this-mFieldNames['img_description'] = $this-msg( 
'listfiles_description' )-text();
+
if ( !$wgMiserMode  !$this-mShowAll ) {
$this-mFieldNames['count'] = $this-msg( 
'listfiles_count' )-text();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe1be82cb8f3354889051ef00f3c0b9f9ea5180e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff bawolff...@gmail.com

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


[MediaWiki-commits] [Gerrit] [SimpleChanges] Register extension - change (translatewiki)

2014-05-22 Thread Raimond Spekking (Code Review)
Raimond Spekking has uploaded a new change for review.

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

Change subject: [SimpleChanges] Register extension
..

[SimpleChanges] Register extension

Change-Id: I3dca5ba2aa737c7ec35da376e81019e59c0c26d8
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/70/134870/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 3624b5a..6906160 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1470,6 +1470,9 @@
 
 #Simple Anti Spam / Moved into core 2013-10-24
 
+Simple Changes
+aliasfile = SpecialSimple/SpecialSimpleChanges.alias.php
+
 Simple Farm
 
 Simple Security

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dca5ba2aa737c7ec35da376e81019e59c0c26d8
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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


[MediaWiki-commits] [Gerrit] [SimpleChanges] Register extension - change (translatewiki)

2014-05-22 Thread Raimond Spekking (Code Review)
Raimond Spekking has submitted this change and it was merged.

Change subject: [SimpleChanges] Register extension
..


[SimpleChanges] Register extension

Change-Id: I3dca5ba2aa737c7ec35da376e81019e59c0c26d8
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 3624b5a..6906160 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1470,6 +1470,9 @@
 
 #Simple Anti Spam / Moved into core 2013-10-24
 
+Simple Changes
+aliasfile = SpecialSimple/SpecialSimpleChanges.alias.php
+
 Simple Farm
 
 Simple Security

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dca5ba2aa737c7ec35da376e81019e59c0c26d8
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Move content images to content folder - change (mediawiki...MobileFrontend)

2014-05-22 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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

Change subject: Move content images to content folder
..

Move content images to content folder

Fixes broken external link images, since the styles for those
were moved

Change-Id: I387d4c4ac9b180d59bf11a4bdb5cc9e487355a35
---
R less/content/images/external-link-ltr-icon.png
R less/content/images/external-link-ltr-icon.svg
R less/content/images/external-link-rtl-icon.png
R less/content/images/external-link-rtl-icon.svg
4 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/less/common/images/external-link-ltr-icon.png 
b/less/content/images/external-link-ltr-icon.png
similarity index 100%
rename from less/common/images/external-link-ltr-icon.png
rename to less/content/images/external-link-ltr-icon.png
Binary files differ
diff --git a/less/common/images/external-link-ltr-icon.svg 
b/less/content/images/external-link-ltr-icon.svg
similarity index 100%
rename from less/common/images/external-link-ltr-icon.svg
rename to less/content/images/external-link-ltr-icon.svg
diff --git a/less/common/images/external-link-rtl-icon.png 
b/less/content/images/external-link-rtl-icon.png
similarity index 100%
rename from less/common/images/external-link-rtl-icon.png
rename to less/content/images/external-link-rtl-icon.png
Binary files differ
diff --git a/less/common/images/external-link-rtl-icon.svg 
b/less/content/images/external-link-rtl-icon.svg
similarity index 100%
rename from less/common/images/external-link-rtl-icon.svg
rename to less/content/images/external-link-rtl-icon.svg

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I387d4c4ac9b180d59bf11a4bdb5cc9e487355a35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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


[MediaWiki-commits] [Gerrit] (bug 63198) Add rel=discussion to talkpage tabs - change (mediawiki/core)

2014-05-22 Thread Code Review
Matěj Grabovský has uploaded a new change for review.

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

Change subject: (bug 63198) Add rel=discussion to talkpage tabs
..

(bug 63198) Add rel=discussion to talkpage tabs

Also fix rel=archives not appearing for history link

Change-Id: Ifd1a7333c7b657d74860d206ea5b82d29bf97851
---
M RELEASE-NOTES-1.24
M includes/SkinTemplate.php
M skins/Vector.php
3 files changed, 17 insertions(+), 9 deletions(-)


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

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index fb23b71..a40c07c 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -43,6 +43,7 @@
   non-landscape thumbnails.
 
 === Bug fixes in 1.24 ===
+* (bug 63198) Add rel=discussion to talkpage and rel=archives to history tabs
 * (bug 49116) Footer copyright notice is now always displayed in user language
   rather than content language (same as copyright notice for editing 
interface).
 * (bug 62258) A bug was fixed in File::getUnscaledThumb when a height
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index cf8b3fc..99baf2d 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1178,6 +1178,7 @@
$xmlID = 'ca-nstab-' . $xmlID;
} elseif ( isset( $link['context'] )  
$link['context'] == 'talk' ) {
$xmlID = 'ca-talk';
+   $link['rel'] = 'discussion';
} elseif ( $section == 'variants' ) {
$xmlID = 'ca-varlang-' . $xmlID;
} else {
diff --git a/skins/Vector.php b/skins/Vector.php
index 35861c2..d9c9309 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -118,25 +118,25 @@
}
 
$xmlID = '';
-   foreach ( $nav as $section = $links ) {
-   foreach ( $links as $key = $link ) {
+   foreach ( $nav as $section = $links ) {
+   foreach ( $links as $key = $link ) {
if ( $section == 'views'  !( isset( 
$link['primary'] )  $link['primary'] ) ) {
$link['class'] = rtrim( 'collapsible ' 
. $link['class'], ' ' );
}
 
$xmlID = isset( $link['id'] ) ? $link['id'] : 
'ca-' . $xmlID;
-   $nav[$section][$key]['attributes'] =
+   $link['attributes'] =
' id=' . Sanitizer::escapeId( $xmlID ) 
. '';
if ( $link['class'] ) {
-   $nav[$section][$key]['attributes'] .=
+   $link['attributes'] .=
' class=' . htmlspecialchars( 
$link['class'] ) . '';
-   unset( $nav[$section][$key]['class'] );
+   unset( $link['class'] );
}
if ( isset( $link['tooltiponly'] )  
$link['tooltiponly'] ) {
-   $nav[$section][$key]['key'] =
+   $link['key'] =
Linker::tooltip( $xmlID );
} else {
-   $nav[$section][$key]['key'] =
+   $link['key'] =
Xml::expandAttributes( 
Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
}
}
@@ -459,7 +459,10 @@
?spana 
href=?php

echo htmlspecialchars( $link['href'] )

? ?php
-   
echo $link['key']
+   
echo $link['key'];
+   
if ( isset( $link['rel'] ) ) {
+   
echo ' rel=' . $link['rel'] . '';
+   
}

??php

echo htmlspecialchars( $link['text'] )
  

[MediaWiki-commits] [Gerrit] Remove mysql client from bastionhost - change (operations/puppet)

2014-05-22 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged.

Change subject: Remove mysql client from bastionhost
..


Remove mysql client from bastionhost

Don't encourage people to use these from bastions...

- remove from bastion role
- just add it to fenari until that is gone, because
  fenari has a weird historical role

Change-Id: Ibbcfdb6eb7451ebee5598331030c333801e5b114
---
M manifests/site.pp
M modules/bastionhost/manifests/init.pp
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a838ed0..05de20d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1066,7 +1066,7 @@
 include generic::wikidev-umask
 include misc::dsh
 include ssh::hostkeys-collect
-
+include mysql_wmf::client
 install_certificate{ 'noc.wikimedia.org': }
 }
 
diff --git a/modules/bastionhost/manifests/init.pp 
b/modules/bastionhost/manifests/init.pp
index 486b213..f837c00 100644
--- a/modules/bastionhost/manifests/init.pp
+++ b/modules/bastionhost/manifests/init.pp
@@ -2,8 +2,6 @@
 class bastionhost {
 system::role { bastionhost: description = Bastion }
 
-require mysql_wmf::client
-
 package { irssi:
 ensure = absent;
 traceroute-nanog:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbcfdb6eb7451ebee5598331030c333801e5b114
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Explicitly point WMF OIT address space to ulsfo - change (operations/dns)

2014-05-22 Thread Faidon Liambotis (Code Review)
Faidon Liambotis has uploaded a new change for review.

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

Change subject: Explicitly point WMF OIT address space to ulsfo
..

Explicitly point WMF OIT address space to ulsfo

Wikimedia headquarters' new IP space is not yet geolocated by MaxMind
properly, which means that it's currently being served by eqiad.

Make an exception from our general rule and explicitly point it to
ulsfo, similar to what we do for our own datacenters.

Change-Id: I3e2a8467257b59798fa5505cde8e5458c56921ea
---
M config-geo
1 file changed, 10 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/73/134873/1

diff --git a/config-geo b/config-geo
index cdeada0..4cfef11 100644
--- a/config-geo
+++ b/config-geo
@@ -192,14 +192,16 @@
default = eqiad,
},
nets = {
-   208.80.152.0/22 = eqiad, # pmtpa, eqiad
-   91.198.174.0/24 = esams, # esams
-   185.15.56.0/22  = esams, # esams
-   198.35.26.0/23  = eqiad, # ulsfo
-   2620:0:860::/48 = eqiad, # pmtpa
-   2620:0:861::/48 = eqiad, # eqiad
-   2620:0:862::/48 = esams, # esams
-   2620:0:863::/48 = eqiad, # ulsfo
+   208.80.152.0/22   = eqiad, # pmtpa, eqiad
+   91.198.174.0/24   = esams, # esams
+   185.15.56.0/22= esams, # esams
+   198.35.26.0/23= eqiad, # ulsfo
+   2620:0:860::/48   = eqiad, # pmtpa
+   2620:0:861::/48   = eqiad, # eqiad
+   2620:0:862::/48   = esams, # esams
+   2620:0:863::/48   = eqiad, # ulsfo
+   198.73.209.0/24   = ulsfo, # WMF OIT
+   2620:62:c000::/48 = ulsfo, # WMF OIT
},
},
only-primary-map = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e2a8467257b59798fa5505cde8e5458c56921ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Check for non-existing EntityRevision in MergeItems api module - change (mediawiki...Wikibase)

2014-05-22 Thread Aude (Code Review)
Aude has uploaded a new change for review.

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

Change subject: Check for non-existing EntityRevision in MergeItems api module
..

Check for non-existing EntityRevision in MergeItems api module

Bug: 65646
Change-Id: I4583a495ab9c62f42714afe173fa261f19fae93b
---
M repo/includes/api/MergeItems.php
M repo/tests/phpunit/includes/api/MergeItemsTest.php
2 files changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index a7eb427..2714d34 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -70,6 +70,10 @@
$fromEntityRevision = $this-getEntityRevisionFromIdString( 
$params['fromid'] );
$toEntityRevision = $this-getEntityRevisionFromIdString( 
$params['toid'] );
 
+   if ( !$fromEntityRevision || !$toEntityRevision ) {
+   $this-dieUsage( 'Item not found.', 'no-such-entity' );
+   }
+
$fromEntity = $fromEntityRevision-getEntity();
$toEntity = $toEntityRevision-getEntity();
 
diff --git a/repo/tests/phpunit/includes/api/MergeItemsTest.php 
b/repo/tests/phpunit/includes/api/MergeItemsTest.php
index 9794466..9a47c9f 100644
--- a/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -369,6 +369,17 @@
$this-doTestQueryExceptions( $params, $expected['exception'] );
}
 
+   public function testMergeNonExistingItem() {
+   $params = array(
+   'action' = 'wbmergeitems',
+   'fromid' = 'Q60457977',
+   'toid' = 'Q60457978'
+   );
+
+   $expectedException = array( 'type' = 'UsageException', 'code' 
= 'no-such-entity' );
+   $this-doTestQueryExceptions( $params, $expectedException );
+   }
+
/**
 * Applies self::$idMap to all data in the given data structure, 
recursively.
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4583a495ab9c62f42714afe173fa261f19fae93b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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


[MediaWiki-commits] [Gerrit] puppet: remove restart cronjob - change (operations/puppet)

2014-05-22 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged.

Change subject: puppet: remove restart cronjob
..


puppet: remove restart cronjob

No longer around, atleast for 3 months

Change-Id: I463376c6bb2ebfbb3268d6fe2ecde20449d8104f
---
M modules/base/manifests/init.pp
1 file changed, 0 insertions(+), 23 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 323c340..d1353e0 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -199,29 +199,6 @@
 refreshonly = true,
 }
 
-# Keep puppet running -- no longer. now via cron
-cron { 'restartpuppet':
-ensure  = absent,
-require = File['/etc/default/puppet'],
-command = '/etc/init.d/puppet restart  /dev/null',
-user= 'root',
-# Restart every 4 hours to avoid the runs bunching up and causing an
-# overload of the master every 40 mins. This can be reverted back to a
-# daily restart after we switch to puppet 2.7.14+ since that version
-# uses a scheduling algorithm which should be more resistant to
-# bunching.
-hour= [0, 4, 8, 12, 16, 20],
-minute  = '37',
-}
-
-cron { 'remove-old-lockfile':
-ensure  = absent,
-require = Package['puppet'],
-command = [ -f /var/lib/puppet/state/puppetdlock ]  find 
/var/lib/puppet/state/puppetdlock -ctime +1 -delete,
-user= 'root',
-minute  = '43',
-}
-
 ## do not use puppet agent
 service {'puppet':
 ensure = stopped,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I463376c6bb2ebfbb3268d6fe2ecde20449d8104f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Explicitly point WMF OIT address space to ulsfo - change (operations/dns)

2014-05-22 Thread Faidon Liambotis (Code Review)
Faidon Liambotis has submitted this change and it was merged.

Change subject: Explicitly point WMF OIT address space to ulsfo
..


Explicitly point WMF OIT address space to ulsfo

Wikimedia headquarters' new IP space is not yet geolocated by MaxMind
properly, which means that it's currently being served by eqiad.

Make an exception from our general rule and explicitly point it to
ulsfo, similar to what we do for our own datacenters.

Change-Id: I3e2a8467257b59798fa5505cde8e5458c56921ea
---
M config-geo
1 file changed, 10 insertions(+), 8 deletions(-)

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



diff --git a/config-geo b/config-geo
index cdeada0..4cfef11 100644
--- a/config-geo
+++ b/config-geo
@@ -192,14 +192,16 @@
default = eqiad,
},
nets = {
-   208.80.152.0/22 = eqiad, # pmtpa, eqiad
-   91.198.174.0/24 = esams, # esams
-   185.15.56.0/22  = esams, # esams
-   198.35.26.0/23  = eqiad, # ulsfo
-   2620:0:860::/48 = eqiad, # pmtpa
-   2620:0:861::/48 = eqiad, # eqiad
-   2620:0:862::/48 = esams, # esams
-   2620:0:863::/48 = eqiad, # ulsfo
+   208.80.152.0/22   = eqiad, # pmtpa, eqiad
+   91.198.174.0/24   = esams, # esams
+   185.15.56.0/22= esams, # esams
+   198.35.26.0/23= eqiad, # ulsfo
+   2620:0:860::/48   = eqiad, # pmtpa
+   2620:0:861::/48   = eqiad, # eqiad
+   2620:0:862::/48   = esams, # esams
+   2620:0:863::/48   = eqiad, # ulsfo
+   198.73.209.0/24   = ulsfo, # WMF OIT
+   2620:62:c000::/48 = ulsfo, # WMF OIT
},
},
only-primary-map = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e2a8467257b59798fa5505cde8e5458c56921ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] timeout submit_check_result, see rt #5311 - change (operations/puppet)

2014-05-22 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged.

Change subject: timeout submit_check_result, see rt #5311
..


timeout submit_check_result, see rt #5311

Change-Id: I68d1d56e43ace3d446b69d78b12de7311afbf626
---
M files/snmp/snmptt.conf
M files/snmp/snmptt.conf.icinga
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/files/snmp/snmptt.conf b/files/snmp/snmptt.conf
index 2e0f908..5355efe 100644
--- a/files/snmp/snmptt.conf
+++ b/files/snmp/snmptt.conf
@@ -1,7 +1,7 @@
 # wikimedia puppet exec event 
 EVENT enterpriseSpecific .1.3.6.1.4.1.33298.0.1004 Status Events Normal
 FORMAT Exec of puppet event from $r.
-EXEC /usr/local/nagios/libexec/eventhandlers/submit_check_result $r Puppet 
freshness 0 puppet ran at `date`
+EXEC /usr/bin/timeout -s 9 30s 
/usr/local/nagios/libexec/eventhandlers/submit_check_result $r Puppet 
freshness 0 puppet ran at `date`
 SDESC
 snmp trap that's sent whenever puppet runs on a wikimedia host.
 EDESC
diff --git a/files/snmp/snmptt.conf.icinga b/files/snmp/snmptt.conf.icinga
index a32ed89..61762ad 100644
--- a/files/snmp/snmptt.conf.icinga
+++ b/files/snmp/snmptt.conf.icinga
@@ -1,7 +1,7 @@
 # wikimedia puppet exec event 
 EVENT enterpriseSpecific .1.3.6.1.4.1.33298.0.1004 Status Events Normal
 FORMAT Exec of puppet event from $r.
-EXEC /usr/lib/nagios/plugins/eventhandlers/submit_check_result $r Puppet 
freshness 0 puppet ran at `date`
+EXEC /usr/bin/timeout -s 9 30s 
/usr/lib/nagios/plugins/eventhandlers/submit_check_result $r Puppet freshness 
0 puppet ran at `date`
 SDESC
 snmp trap that's sent whenever puppet runs on a wikimedia host.
 EDESC

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68d1d56e43ace3d446b69d78b12de7311afbf626
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Minor fixes to the html structure - change (apps...wikipedia)

2014-05-22 Thread Yuvipanda (Code Review)
Yuvipanda has uploaded a new change for review.

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

Change subject: Minor fixes to the html structure
..

Minor fixes to the html structure

This helps us re-use MobileFrontend styles, which is
coming as a separate patch to MobileApp soon

Change-Id: I4ff2d52f24b766670fa037736e9f2555dd6f7a3f
---
M www/abusefilter.html
M www/index.html
M www/preview.html
3 files changed, 3 insertions(+), 4 deletions(-)


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

diff --git a/www/abusefilter.html b/www/abusefilter.html
index c1cb246..a716d99 100644
--- a/www/abusefilter.html
+++ b/www/abusefilter.html
@@ -8,6 +8,6 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=no /
 /head
 body
-div id=content/div
+div id=content class=content/div
 /body
 /html
\ No newline at end of file
diff --git a/www/index.html b/www/index.html
index 404ca95..79b0309 100644
--- a/www/index.html
+++ b/www/index.html
@@ -8,8 +8,7 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
 /head
 body
-h1 id=title/h1
-div id=content/div
+div id=content class=content/div
 div id=loading_sections/div
 div id=attribution
 a id=lastupdated/a
diff --git a/www/preview.html b/www/preview.html
index 7992783..d389ff7 100644
--- a/www/preview.html
+++ b/www/preview.html
@@ -8,6 +8,6 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
 /head
 body
-div id=content/div
+div id=content class=content/div
 /body
 /html
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ff2d52f24b766670fa037736e9f2555dd6f7a3f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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


[MediaWiki-commits] [Gerrit] Launch Media Viewer for all users on Italian wikipedia - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Launch Media Viewer for all users on Italian wikipedia
..


Launch Media Viewer for all users on Italian wikipedia

https://www.mediawiki.org/wiki/Multimedia/Media_Viewer/Release_Plan#Large_Wikis

Change-Id: Ia0602d25c228af7b7a120d46814be429a879265c
---
M mediaviewer.dblist
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/mediaviewer.dblist b/mediaviewer.dblist
index b0789bc..3c4a79a 100644
--- a/mediaviewer.dblist
+++ b/mediaviewer.dblist
@@ -8,6 +8,7 @@
 frwiki
 hewiki
 huwiki
+itwiki
 jawiki
 knwiki
 kowiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0602d25c228af7b7a120d46814be429a879265c
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Launch Media Viewer for all users on Russian wikipedia - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Launch Media Viewer for all users on Russian wikipedia
..


Launch Media Viewer for all users on Russian wikipedia

https://www.mediawiki.org/wiki/Multimedia/Media_Viewer/Release_Plan#Large_Wikis

Change-Id: I446341bdc2413273387d62a4e9c58f08ec3e87db
---
M mediaviewer.dblist
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/mediaviewer.dblist b/mediaviewer.dblist
index 3c4a79a..ad24819 100644
--- a/mediaviewer.dblist
+++ b/mediaviewer.dblist
@@ -16,6 +16,7 @@
 plwiki
 ptwiki
 rowiki
+ruwiki
 skwiki
 svwiki
 tewiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I446341bdc2413273387d62a4e9c58f08ec3e87db
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] [SimpleChanges] Fix path - change (translatewiki)

2014-05-22 Thread Raimond Spekking (Code Review)
Raimond Spekking has uploaded a new change for review.

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

Change subject: [SimpleChanges] Fix path
..

[SimpleChanges] Fix path

Change-Id: Ic0272c77045af683fe7ce9d7cf36cadefd3bd8e9
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/09/134909/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 6906160..67a8207 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1471,7 +1471,7 @@
 #Simple Anti Spam / Moved into core 2013-10-24
 
 Simple Changes
-aliasfile = SpecialSimple/SpecialSimpleChanges.alias.php
+aliasfile = SimpleChanges/SpecialSimpleChanges.alias.php
 
 Simple Farm
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0272c77045af683fe7ce9d7cf36cadefd3bd8e9
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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


[MediaWiki-commits] [Gerrit] [SimpleChanges] Fix path - change (translatewiki)

2014-05-22 Thread Raimond Spekking (Code Review)
Raimond Spekking has submitted this change and it was merged.

Change subject: [SimpleChanges] Fix path
..


[SimpleChanges] Fix path

Change-Id: Ic0272c77045af683fe7ce9d7cf36cadefd3bd8e9
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 6906160..67a8207 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1471,7 +1471,7 @@
 #Simple Anti Spam / Moved into core 2013-10-24
 
 Simple Changes
-aliasfile = SpecialSimple/SpecialSimpleChanges.alias.php
+aliasfile = SimpleChanges/SpecialSimpleChanges.alias.php
 
 Simple Farm
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0272c77045af683fe7ce9d7cf36cadefd3bd8e9
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] data.yaml sanity testing - change (operations/puppet)

2014-05-22 Thread Rush (Code Review)
Rush has uploaded a new change for review.

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

Change subject: data.yaml sanity testing
..

data.yaml sanity testing

Will be greatly improved and changed but for now:

./data_admin.py lint
./data_admin.py sort

Change-Id: I3370c14047666390c6755dd5ede943253fcff5c8
---
A modules/admin/data/data_admin.py
1 file changed, 53 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/134922/1

diff --git a/modules/admin/data/data_admin.py b/modules/admin/data/data_admin.py
new file mode 100644
index 000..80a3553
--- /dev/null
+++ b/modules/admin/data/data_admin.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+
+#2014 Chase Pettet
+#beginnings of a linter for data.yaml
+
+import sys
+import yaml
+import itertools
+from collections import Counter
+import collections
+
+def flatten(lists):
+flattens nested arrays
+return list(itertools.chain.from_iterable(lists))
+
+def all_assigned_users(admins):
+unique assigned users 
+:param admins: hash from valid data.yaml
+:returns: list
+
+nested_users_list = map(lambda u: u['members'], admins['groups'].values())
+return list(set(flatten(nested_users_list)))
+
+def dict_sort(dictionary):
+#dumping ordered dict to yaml causes issues, return normal dict
+return dict(collections.OrderedDict(sorted(dictionary.items(
+
+def main():
+
+data = open('data.yaml', 'r')
+admins = yaml.load(data)
+
+if 'sort' in sys.argv:
+print yaml.dump({'groups': dict_sort(admins['groups'])})
+print yaml.dump({'users': dict_sort(admins['users'])})
+
+if 'lint' in sys.argv:
+all_users = admins['users'].keys()
+grouped_users = all_assigned_users(admins)
+
+#ensure all assigned users exist
+non_existent_users = [u for u in grouped_users if u not in all_users]
+if non_existent_users:
+print Users assigned that do not exist: %s % 
(non_existent_users,)
+
+#ensure no two groups uses the same gid
+gids = filter(None, [v.get('gid', None) for k, v in 
admins['groups'].iteritems()])
+dupes =  [k for k,v in Counter(gids).items() if v1]
+if dupes:
+print Duplicate group GIDs: %s % (dupes,)
+
+if __name__ == '__main__':
+main()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3370c14047666390c6755dd5ede943253fcff5c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e288385..55fb764 - change (mediawiki/extensions)

2014-05-22 Thread Jenkins-mwext-sync (Code Review)
Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: e288385..55fb764
..

Syncronize VisualEditor: e288385..55fb764

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


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

diff --git a/VisualEditor b/VisualEditor
index e288385..55fb764 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e28838556979f0b81dd6961d6e5ae8d55f71d593
+Subproject commit 55fb76438eef7b24487720c5012b6ab3f7d85920

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icedc1ab54d142ef6f977a76f18c9e44a5ca9d1f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e288385..55fb764 - change (mediawiki/extensions)

2014-05-22 Thread Jenkins-mwext-sync (Code Review)
Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: e288385..55fb764
..


Syncronize VisualEditor: e288385..55fb764

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

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



diff --git a/VisualEditor b/VisualEditor
index e288385..55fb764 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e28838556979f0b81dd6961d6e5ae8d55f71d593
+Subproject commit 55fb76438eef7b24487720c5012b6ab3f7d85920

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icedc1ab54d142ef6f977a76f18c9e44a5ca9d1f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Fix parserTests to serialize-to-html + reparse-to-DOM exactl... - change (mediawiki...parsoid)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Fix parserTests to serialize-to-html + reparse-to-DOM exactly 
once.
..


Fix parserTests to serialize-to-html + reparse-to-DOM exactly once.

* The DOM was being serialized to HTML and parsed back multiple
  times on the wt2wt and selser paths which would change DOM
  semantics for HTML-pre (by stripping one newline each time).

* This patches fixes it to always do it exactly once.

* Fixes the HTML-pre test wt2wt failure.

* Speeds up parser tests run by over 20%.

Change-Id: Ic7e9a4a8fc92603cc96e25ea3ea9915f5abb37d8
---
M tests/parserTests-blacklist.js
M tests/parserTests.js
2 files changed, 20 insertions(+), 13 deletions(-)

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



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 39237d2..4d1d733 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -488,7 +488,6 @@
 add(wt2wt, 4. Indent-Pre and extension tags,  a gallery\n 
File:foobar.jpg\n /gallery\n);
 add(wt2wt, Leading pipes outside of tables 2, a\n| foo\n\nb\n);
 add(wt2wt, Leading pipes outside of tables 3, a\n| class=\foo bar\ | 
baz\n\nb\n);
-add(wt2wt, HTML-pre: 1. embedded newlines, 
prefoo/pre\n\npre\nfoo\n/pre\n\npre\nfoo\n/pre\n\npre\n\nfoo\n/pre);
 add(wt2wt, Definition lists: self-closed tag, ;onebr /two : two-line 
fun);
 add(wt2wt, BUG 289: \\-token in bracketed URL, 
[http://www.example.com/ hello stuff]\n);
 add(wt2wt, BUG 289: literal \\-token in bracketed URL, 
[http://www.example.com/ bhtml/b stuff]\n);
diff --git a/tests/parserTests.js b/tests/parserTests.js
index c83970a..9d32d9f 100755
--- a/tests/parserTests.js
+++ b/tests/parserTests.js
@@ -428,7 +428,7 @@
self = this,
startsAtWikitext = mode === 'wt2wt' || mode === 'wt2html' || 
mode === 'selser';
try {
-   this.env.page.dom = item.cachedHTMLStr ? 
DU.parseHTML(item.cachedHTMLStr).body : null;
+   this.env.page.dom = item.cachedDOM ? item.cachedDOM.body : null;
if ( mode === 'selser' ) {
// console.warn(-- selsering:  + content.outerHTML);
this.env.setPageSrcInfo( item.wikitext );
@@ -937,17 +937,29 @@
 
// First conversion stage
if ( startsAtWikitext ) {
-   if ( item.cachedHTMLStr === null ) {
+   // Always serialize DOM to string and reparse before passing to 
wt2wt
+   if ( item.cachedDOM === null ) {
testTasks.push( this.convertWt2Html.bind( this, mode, 
item.wikitext ) );
-   // Caching stage 1 - save the result of the first two 
stages so we can maybe skip them later
+   // Caching stage 1 - save the result of the first two 
stages
+   // so we can maybe skip them later
testTasks.push( function ( result, cb ) {
// Cache parsed HTML
-   item.cachedHTMLStr = DU.serializeNode(result);
-   cb( null, result );
+   item.cachedDOM = 
DU.parseHTML(DU.serializeNode(result));
+
+   // - In wt2html mode, pass through original DOM
+   //   so that it is serialized just once.
+   // - In wt2wt and selser modes, pass through 
serialized and
+   //   reparsed DOM so that 
fostering/normalization effects
+   //   are reproduced.
+   if (mode === wt2html) {
+   cb(null, result);
+   } else {
+   cb(null, 
item.cachedDOM.body.cloneNode(true));
+   }
} );
} else {
testTasks.push( function ( cb ) {
-   cb( null, DU.parseHTML(item.cachedHTMLStr) );
+   cb(null, item.cachedDOM.body.cloneNode(true));
} );
}
} else if ( startsAtHtml ) {
@@ -978,11 +990,7 @@
} );
}
 
-   // Always serialize DOM to string and reparse before passing to wt2wt
if (mode === 'wt2wt') {
-   testTasks.push( function ( doc, cb ) {
-   cb( null, DU.parseHTML(DU.serializeNode(doc)).body);
-   } );
// handle a 'changes' option if present.
if (item.options.parsoid  item.options.parsoid.changes) {
testTasks.push( function( doc, cb ) {
@@ -1729,7 +1737,7 @@
}
 

[MediaWiki-commits] [Gerrit] format the tests/phpunit/TODO document for readability - change (mediawiki/core)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: format the tests/phpunit/TODO document for readability
..


format the tests/phpunit/TODO document for readability

Change-Id: I54877680158b0b49ed13db9fd2d0441b82cab8b6
---
M tests/phpunit/TODO
1 file changed, 19 insertions(+), 9 deletions(-)

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



diff --git a/tests/phpunit/TODO b/tests/phpunit/TODO
index b2fa7fb..cd9b9e2 100644
--- a/tests/phpunit/TODO
+++ b/tests/phpunit/TODO
@@ -1,10 +1,20 @@
 == Things To Do ==
-* Most of the tests are named poorly; naming should describe a use case in 
story-like language, not simply identify the
-unit under test. An example would be the difference between testCalculate and 
testAddingIntegersTogetherWorks.
-* Many of the tests make multiple assertions, and are thus not unitary tests. 
By using data-providers and more use-case
-oriented test selection nearly all of these cases can be easily resolved.
-* Some of the test files are either incorrectly named or in the wrong folder. 
Tests should be organized in a mirrored
-structure to the source they are testing, and named the same, with the 
exception of the word Test at the end.
-* Shared set-up code or base classes are present, but usually named improperly 
or appear to be poorly factored. Support
-code should share as much of the same naming as the code it's supporting, and 
test and test-case depenencies should be
-considered to resolve other shared needs.
+
+* Most of the tests are named poorly;
+  naming should describe a use case in story-like language,
+  not simply identify the unit under test.
+  An example would be the difference between testCalculate
+  and testAddingIntegersTogetherWorks.
+
+* Many of the tests make multiple assertions, and are thus not unitary tests.
+  By using data-providers and more use-case oriented test selection
+  nearly all of these cases can be easily resolved.
+
+* Some of the test files are either incorrectly named or in the wrong folder.
+  Tests should be organized in a mirrored structure to the source they are 
testing,
+  and named the same, with the exception of the word Test at the end.
+
+* Shared set-up code or base classes are present,
+  but usually named improperly or appear to be poorly factored.
+  Support code should share as much of the same naming  as the code it's 
supporting,
+  and test and test-case depenencies should be considered to resolve other 
shared needs.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I54877680158b0b49ed13db9fd2d0441b82cab8b6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Waldir wal...@email.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] API: Enforce section=new constraint when using 'redirect' mode - change (mediawiki/core)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: API: Enforce section=new constraint when using 'redirect' mode
..


API: Enforce section=new constraint when using 'redirect' mode

Finish implementation of the 'redirect' edit API parameter.  This flag
should only be used as a convenience when adding a new section, appending,
or prepending.  Any other usage must be done using the long-cut (fetch page,
determine if it is a redirect, follow redirects and edit the target page's
content).

This patch takes apart the EditConflict_redirect test, because it no
longer makes sense--unless you dear reader can figure out how to force an
edit conflict when only adding a section?

Bug: 24330
Change-Id: Ie3f7273c18e156da1e50e1a36aac2e5341710982
---
M includes/api/ApiEditPage.php
M tests/phpunit/includes/api/ApiEditPageTest.php
2 files changed, 117 insertions(+), 34 deletions(-)

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



diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 635f6f8..cb0f8c2 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -48,6 +48,9 @@
$apiResult = $this-getResult();
 
if ( $params['redirect'] ) {
+   if ( $params['prependtext'] === null  
$params['appendtext'] === null  $params['section'] !== 'new' ) {
+   $this-dieUsage( 'You have attempted to edit 
using the redirect-following mode, which must be used in conjuction with 
section=new, prependtext, or appendtext.', 'redirect-appendonly' );
+   }
if ( $titleObj-isRedirect() ) {
$oldTitle = $titleObj;
 
@@ -526,7 +529,7 @@
array( 'editconflict' ),
array( 'emptynewsection' ),
array( 'unknownerror', 'retval' ),
-   array( 'code' = 'nosuchsection', 'info' = 
'There is no section section.' ),
+   array( 'code' = 'nosuchsection', 'info' = 
'There is no such section.' ),
array(
'code' = 'invalidsection',
'info' = 'The section parameter must 
be a valid section id or \'new\''
@@ -543,6 +546,10 @@
'code' = 'appendnotsupported',
'info' = 'This type of page can not be 
edited by appending or prepending text.' ),
array(
+   'code' = 'redirect-appendonly',
+   'info' = 'You have attempted to edit 
using the redirect-following mode, which must be used in conjuction with 
section=new, prependtext, or appendtext.',
+   ),
+   array(
'code' = 'badformat',
'info' = 'The requested serialization 
format can not be applied to the page\'s content model'
),
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php 
b/tests/phpunit/includes/api/ApiEditPageTest.php
index 2e1c265..9f8c139 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -274,6 +274,100 @@
$this-assertEquals( == header ==\n\ntest\n\n== header 
==\n\ntest, $text );
}
 
+   /**
+* Ensure we can edit through a redirect, if adding a section
+*/
+   public function testEdit_redirect() {
+   static $count = 0;
+   $count++;
+
+   // assume NS_HELP defaults to wikitext
+   $name = Help:ApiEditPageTest_testEdit_redirect_$count;
+   $title = Title::newFromText( $name );
+   $page = WikiPage::factory( $title );
+
+   $rname = Help:ApiEditPageTest_testEdit_redirect_r$count;
+   $rtitle = Title::newFromText( $rname );
+   $rpage = WikiPage::factory( $rtitle );
+
+   // base edit for content
+   $page-doEditContent( new WikitextContent( Foo ),
+   testing 1, EDIT_NEW, false, 
self::$users['sysop']-user );
+   $this-forceRevisionDate( $page, '2012010100' );
+   $baseTime = $page-getRevision()-getTimestamp();
+
+   // base edit for redirect
+   $rpage-doEditContent( new WikitextContent( #REDIRECT 
[[$name]] ),
+   testing 1, EDIT_NEW, false, 
self::$users['sysop']-user );
+   $this-forceRevisionDate( $rpage, '2012010100' );
+
+   // conflicting edit to redirect
+   $rpage-doEditContent( new WikitextContent( #REDIRECT 

[MediaWiki-commits] [Gerrit] Removed the outputPage() method as it mostly duplicated the ... - change (mediawiki...BlueSky)

2014-05-22 Thread Jack Phoenix (Code Review)
Jack Phoenix has uploaded a new change for review.

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

Change subject: Removed the outputPage() method as it mostly duplicated the 
parent method.
..

Removed the outputPage() method as it mostly duplicated the parent method.

Added prepareQuickTemplate() method instead, with two caveats:
1) prepareQuickTemplate() exists only in 1.23, and
2) ArticleMetaInfo and UserPagePolicy extensions should use the
appropriate hooks instead of these code snippets residing here.

Change-Id: Iaa637472b62bfa3b2ad9789b7f8051208c321bbb
---
M BlueSky.skin.php
1 file changed, 47 insertions(+), 209 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky 
refs/changes/25/134925/1

diff --git a/BlueSky.skin.php b/BlueSky.skin.php
index 4dd9104..99417ae 100644
--- a/BlueSky.skin.php
+++ b/BlueSky.skin.php
@@ -1229,251 +1229,89 @@
return $html;
}
 
-   function outputPage( OutputPage $out = null ) {
-   global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, 
$wgOut;
-   global $wgScript, $wgStylePath, $wgLanguageCode, 
$wgContLanguageCode;
-   global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages;
-   global $wgRequest, $wgUseNewInterlanguage;
-   global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses;
-   global $wgMaxCredits, $wgShowCreditsIfMax, 
$wgHideInterlanguageLinks;
-   global $wgServer;
+   /**
+* This is only available in MediaWiki 1.23+, but...
+*
+* @param OutputPage|null $out
+* @return QuickTemplate
+*/
+   protected function prepareQuickTemplate( OutputPage $out = null ) {
+   global $wgContLang, $wgHideInterlanguageLinks, $wgUser;
+   wfProfileIn( __METHOD__ );
 
-   global $wgSquidMaxage, $IP;
+   $tpl = parent::prepareQuickTemplate( $out );
 
-   $fname = __METHOD__;
-   wfProfileIn( $fname );
-
-   wfRunHooks( 'BeforePageDisplay', array( $wgOut, $this ) );
-   $this-mTitle = $wgTitle;
-
-   extract( $wgRequest-getValues( 'oldid', 'diff' ) );
-
-   wfProfileIn( $fname-init );
-   // $this-initPage( $out );
-   $tpl = $this-setupTemplate( 'WikiHowTemplate', 'skins' );
-
-   $tpl-setTranslator( new MediaWiki_I18N() );
-   wfProfileOut( $fname-init );
-
-   wfProfileIn( $fname-stuff );
-   $this-thispage = $wgTitle-getPrefixedDbKey();
-   $this-thisurl = $wgTitle-getPrefixedURL();
-   $this-loggedin = $wgUser-getID() != 0;
-   $this-iscontent = ( $wgTitle-getNamespace() != NS_SPECIAL );
-   $this-iseditable = ( $this-iscontent and !( $action == 'edit' 
or $action == 'submit' ) );
-   $this-username = $wgUser-getName();
-   $this-userpage = $wgContLang-getNsText( NS_USER ) . : . 
$wgUser-getName();
-   $this-userpageUrlDetails = $this-makeUrlDetails( 
$this-userpage );
-
-   $this-usercss = $this-userjs = $this-userjsprev = false;
-   // $this-setupUserCss();
-   // $this-setupUserJs(false);
-   $this-titletxt = $wgTitle-getPrefixedText();
-   wfProfileOut( $fname-stuff );
-
-   // add utm
-
-   wfProfileIn( $fname-stuff2 );
-   $tpl-set( 'title', $wgOut-getPageTitle() );
-
-   $tpl-setRef( thispage, $this-thispage );
-   $undelete = $this-getUndeleteLink();
-   $tpl-set(
-   undelete, !empty( $undelete ) ?
-   'span class=subpages' . $undelete . 
'/span':
-   ''
-   );
-   $tpl-set( 'headscripts', $out-getHeadScripts() . 
$out-getHeadItems() );
-   $description = 
ArticleMetaInfo::getCurrentTitleMetaDescription();
-   if ( $description ) {
-   $wgOut-addMeta( 'description', $description );
-   }
-   $keywords = ArticleMetaInfo::getCurrentTitleMetaKeywords();
-   if ( $keywords ) {
-   $wgOut-mKeywords = array();
-   $wgOut-addMeta( 'keywords', $keywords );
-   }
-
-   ArticleMetaInfo::addFacebookMetaProperties( $tpl-data['title'] 
);
-   ArticleMetaInfo::addTwitterMetaProperties();
-
-   if ( $wgOut-isSyndicated() ) {
-   $feeds = array();
-   foreach ( $wgFeedClasses as $format = $class ) {
-   $feeds[$format] = array(
-   'text' = $format,
-   'href' = $wgRequest-appendQuery( 
feed=$format ),
-  

[MediaWiki-commits] [Gerrit] New empty ExtLinks shouldn't be converted to interwiki - change (mediawiki...parsoid)

2014-05-22 Thread Arlolra (Code Review)
Arlolra has uploaded a new change for review.

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

Change subject: New empty ExtLinks shouldn't be converted to interwiki
..

New empty ExtLinks shouldn't be converted to interwiki

 * Adds a test, which now seems superfluous seeing that a few selser
   tests are fixed.

Bug: 64113
Change-Id: Ida5a3668fc62f3286917c2feb6a26cd654d52706
---
M lib/wts.LinkHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 17 insertions(+), 3 deletions(-)


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

diff --git a/lib/wts.LinkHandler.js b/lib/wts.LinkHandler.js
index f001794..d355de8 100644
--- a/lib/wts.LinkHandler.js
+++ b/lib/wts.LinkHandler.js
@@ -274,6 +274,9 @@
// 2) does not contain a query string.
// Both are not supported by wikitext 
syntax.
!/^#|\?./.test(interWikiMatch[1]) 
+   // ExtLinks should have content to 
convert.
+   ( linkData.type !== 'mw:ExtLink' ||
+ ( linkData.content.string || 
linkData.contentNode ) ) 
(dp.isIW || target.modified || 
linkData.contentModified)) {
//console.log(interWikiMatch);
// External link that is really an interwiki 
link. Convert it.
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 4d1d733..02c3ba5 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -1975,9 +1975,7 @@
 
 // Blacklist for selser
 add(selser, Extra newlines followed by heading [1,2,1,3,0,4,0,4,1,3,4], 
a\n\n40z1qdji2lfskyb9\n\n\n\n=b=\n9h4x5nzjh28rggb9\n\n[[a]]\n\nkup4bo01iztzkt9\n\n\n\nzlbbwe36wkrcnmi\n);
-add(selser, Parsing an URL [[[3]],3,0], [[:fr:|nowiki/]]!-- EasterEgg 
we love beer, better be able be able to link to it --\n);
 add(selser, Parsing an URL [[[2]],2,0], 
[[:fr:|blv27e9oigmpwrk9http://fr.wikipedia.org/wiki/]]\n\n7vcz2sjoo733ow29\n!--
 EasterEgg we love beer, better be able be able to link to it --);
-add(selser, Parsing an URL [[[3]],2,4], 
[[:fr:|nowiki/]]\n\n5j6cvz3yerd4pldi\n\nihkme7ay6re8kt9\n);
 add(selser, Italics and possessives (1) [1], obtained by ''[[Lunar 
Prospector]]'''s gamma-ray spectrometer);
 add(selser, Italics and possessives (1) [2], mylboba6mj3v7vi\n\nobtained 
by ''[[Lunar Prospector]]'''s gamma-ray spectrometer);
 add(selser, Italics and possessives (1) [[2,2,3]], 
uqrnj4w22jqkhuxrobtained by abdihwdsev7ycik9''[[Lunar Prospector]]'''\n);
@@ -2618,7 +2616,6 @@
 add(selser, Header with special characters (bug 25462) 
[1,2,2,0,3,4,0,4,[2],3,0,0,1,0,[3],0,0,2,4,0,1], The tooltips shall not show 
entities to the user (ie. be double 
escaped)\n\n8z7x1wcux3v26gvi\n\ns1o423l9ajg7gb9\n== text  text 
==\n2whgc18x6v3d6lxr\n== text  text 
==\nt5l87q61pf0z4cxr\n\n92ysy522qy28d7visection 2\n\n== text  text ==\nsection 
3\n\n==nowiki/==\nsection 
4\n\nozk2j78opgajdcxr\n\nw7mpykjqlaowp14i\n\nsection 5);
 add(selser, Single-line or multiline-comments can follow headings 
[2,4,3,1,0,4,[2],3], 
u9j9ywtzcjbawcdi\n==foo==\ndrrd423rrk1vpldi\n==bar==\n!--c1--z66d0aderf9lik9\n==nxo7we9vvk70t3xrbaz==!--\nc2\nc3--);
 add(selser, Bug 1186 news: in the middle of text [[[2]]], 
[[wikinews:Wikinews:Workplace|9el1tkd6tbne9udihttp://en.wikinews.org/wiki/Wikinews:Workplace]];);
-add(selser, Bug 1186 news: in the middle of text [[[3]]], 
[[wikinews:Wikinews:Workplace|nowiki/]]);
 add(selser, Bug 1186 news: in the middle of text [[[4]]], 
[[wikinews:Wikinews:Workplace|qalth4rrg9q6ko6r]]);
 add(selser, div with single-quoted attribute [2], qu686umowmw8kt9\ndiv 
id='rock'HTML rocks/div);
 add(selser, div with unquoted attribute [2], pmr3ap5nlf7833di\ndiv 
id=rockHTML rocks/div);
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 2f657a2..f885d16 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -3859,6 +3859,20 @@
 !! end
 
 !! test
+External links: with no contents
+!! wikitext
+[http://en.wikipedia.org/wiki/Foo]
+
+[[wikipedia:Foo|Bar]]
+
+[[wikipedia:Foo|spanBar/span]]
+!! html/parsoid
+pa rel=mw:ExtLink href=http://en.wikipedia.org/wiki/Foo;/a/p
+pa rel=mw:ExtLink href=http://en.wikipedia.org/wiki/Foo;Bar/a/p
+pa rel=mw:ExtLink 
href=http://en.wikipedia.org/wiki/Foo;spanBar/span/a/p
+!! end
+
+!! test
 External image
 !! wikitext
 External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png

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

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

[MediaWiki-commits] [Gerrit] Removed the outputPage() method as it mostly duplicated the ... - change (mediawiki...BlueSky)

2014-05-22 Thread Jack Phoenix (Code Review)
Jack Phoenix has submitted this change and it was merged.

Change subject: Removed the outputPage() method as it mostly duplicated the 
parent method.
..


Removed the outputPage() method as it mostly duplicated the parent method.

Added prepareQuickTemplate() method instead, with two caveats:
1) prepareQuickTemplate() exists only in 1.23, and
2) ArticleMetaInfo and UserPagePolicy extensions should use the
appropriate hooks instead of these code snippets residing here.

Change-Id: Iaa637472b62bfa3b2ad9789b7f8051208c321bbb
---
M BlueSky.skin.php
1 file changed, 47 insertions(+), 209 deletions(-)

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



diff --git a/BlueSky.skin.php b/BlueSky.skin.php
index 4dd9104..99417ae 100644
--- a/BlueSky.skin.php
+++ b/BlueSky.skin.php
@@ -1229,251 +1229,89 @@
return $html;
}
 
-   function outputPage( OutputPage $out = null ) {
-   global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, 
$wgOut;
-   global $wgScript, $wgStylePath, $wgLanguageCode, 
$wgContLanguageCode;
-   global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages;
-   global $wgRequest, $wgUseNewInterlanguage;
-   global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses;
-   global $wgMaxCredits, $wgShowCreditsIfMax, 
$wgHideInterlanguageLinks;
-   global $wgServer;
+   /**
+* This is only available in MediaWiki 1.23+, but...
+*
+* @param OutputPage|null $out
+* @return QuickTemplate
+*/
+   protected function prepareQuickTemplate( OutputPage $out = null ) {
+   global $wgContLang, $wgHideInterlanguageLinks, $wgUser;
+   wfProfileIn( __METHOD__ );
 
-   global $wgSquidMaxage, $IP;
+   $tpl = parent::prepareQuickTemplate( $out );
 
-   $fname = __METHOD__;
-   wfProfileIn( $fname );
-
-   wfRunHooks( 'BeforePageDisplay', array( $wgOut, $this ) );
-   $this-mTitle = $wgTitle;
-
-   extract( $wgRequest-getValues( 'oldid', 'diff' ) );
-
-   wfProfileIn( $fname-init );
-   // $this-initPage( $out );
-   $tpl = $this-setupTemplate( 'WikiHowTemplate', 'skins' );
-
-   $tpl-setTranslator( new MediaWiki_I18N() );
-   wfProfileOut( $fname-init );
-
-   wfProfileIn( $fname-stuff );
-   $this-thispage = $wgTitle-getPrefixedDbKey();
-   $this-thisurl = $wgTitle-getPrefixedURL();
-   $this-loggedin = $wgUser-getID() != 0;
-   $this-iscontent = ( $wgTitle-getNamespace() != NS_SPECIAL );
-   $this-iseditable = ( $this-iscontent and !( $action == 'edit' 
or $action == 'submit' ) );
-   $this-username = $wgUser-getName();
-   $this-userpage = $wgContLang-getNsText( NS_USER ) . : . 
$wgUser-getName();
-   $this-userpageUrlDetails = $this-makeUrlDetails( 
$this-userpage );
-
-   $this-usercss = $this-userjs = $this-userjsprev = false;
-   // $this-setupUserCss();
-   // $this-setupUserJs(false);
-   $this-titletxt = $wgTitle-getPrefixedText();
-   wfProfileOut( $fname-stuff );
-
-   // add utm
-
-   wfProfileIn( $fname-stuff2 );
-   $tpl-set( 'title', $wgOut-getPageTitle() );
-
-   $tpl-setRef( thispage, $this-thispage );
-   $undelete = $this-getUndeleteLink();
-   $tpl-set(
-   undelete, !empty( $undelete ) ?
-   'span class=subpages' . $undelete . 
'/span':
-   ''
-   );
-   $tpl-set( 'headscripts', $out-getHeadScripts() . 
$out-getHeadItems() );
-   $description = 
ArticleMetaInfo::getCurrentTitleMetaDescription();
-   if ( $description ) {
-   $wgOut-addMeta( 'description', $description );
-   }
-   $keywords = ArticleMetaInfo::getCurrentTitleMetaKeywords();
-   if ( $keywords ) {
-   $wgOut-mKeywords = array();
-   $wgOut-addMeta( 'keywords', $keywords );
-   }
-
-   ArticleMetaInfo::addFacebookMetaProperties( $tpl-data['title'] 
);
-   ArticleMetaInfo::addTwitterMetaProperties();
-
-   if ( $wgOut-isSyndicated() ) {
-   $feeds = array();
-   foreach ( $wgFeedClasses as $format = $class ) {
-   $feeds[$format] = array(
-   'text' = $format,
-   'href' = $wgRequest-appendQuery( 
feed=$format ),
-   'ttip' = wfMessage( 'tooltip-' . 

[MediaWiki-commits] [Gerrit] Fix a fatal error in TopicHistory page - change (mediawiki...Flow)

2014-05-22 Thread Bsitu (Code Review)
Bsitu has uploaded a new change for review.

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

Change subject: Fix a fatal error in TopicHistory page
..

Fix a fatal error in TopicHistory page

The code assumed topic history are all PostRevision, this is
not true because it could be PostSummary as well

Change-Id: I55196562c95c59b2bac609ee1a7f6808fe25a11d
---
M includes/Formatter/TopicHistoryQuery.php
1 file changed, 12 insertions(+), 8 deletions(-)


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

diff --git a/includes/Formatter/TopicHistoryQuery.php 
b/includes/Formatter/TopicHistoryQuery.php
index d8388d4..5640717 100644
--- a/includes/Formatter/TopicHistoryQuery.php
+++ b/includes/Formatter/TopicHistoryQuery.php
@@ -25,16 +25,18 @@
}
 
$this-loadMetadataBatch( $history );
-   $results = array();
+   $results = $replies = array();
foreach ( $history as $revision ) {
try {
$results[] = $row = new TopicRow;
$this-buildResult( $revision, null, $row );
-   $replyToId = $revision-getReplyToId();
-   if ( $replyToId ) {
-   // $revisionId into the key rather than 
value prevents
-   // duplicate insertion
-   
$replies[$replyToId-getAlphadecimal()][$revision-getPostId()-getAlphadecimal()]
 = true;
+   if ( $revision instanceof PostRevision ) {
+   $replyToId = $revision-getReplyToId();
+   if ( $replyToId ) {
+   // $revisionId into the key 
rather than value prevents
+   // duplicate insertion
+   
$replies[$replyToId-getAlphadecimal()][$revision-getPostId()-getAlphadecimal()]
 = true;
+   }
}
} catch ( FlowException $e ) {
\MWExceptionHandler::logException( $e );
@@ -42,8 +44,10 @@
}
 
foreach ( $results as $result ) {
-   $alpha = 
$result-revision-getPostId()-getAlphadecimal();
-   $result-replies = isset( $replies[$alpha] ) ? 
array_keys( $replies[$alpha] ) : array();
+   if ( $result-revision instanceof PostRevision ) {
+   $alpha = 
$result-revision-getPostId()-getAlphadecimal();
+   $result-replies = isset( $replies[$alpha] ) ? 
array_keys( $replies[$alpha] ) : array();
+   }
}
 
return $results;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55196562c95c59b2bac609ee1a7f6808fe25a11d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: frontend-rewrite
Gerrit-Owner: Bsitu bs...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] * Renamed the main classes to remove wikiHow references. * R... - change (mediawiki...BlueSky)

2014-05-22 Thread Jack Phoenix (Code Review)
Jack Phoenix has uploaded a new change for review.

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

Change subject: * Renamed the main classes to remove wikiHow references. * 
Removed some custom wH things * Fixed up some awful code to properly use 
SpecialPage::getTitleFor() and * the appropriate MediaWiki messages instead of 
assuming that everything is always in Englis
..

* Renamed the main classes to remove wikiHow references.
* Removed some custom wH things
* Fixed up some awful code to properly use SpecialPage::getTitleFor() and
* the appropriate MediaWiki messages instead of assuming that everything is 
always in English
* Fixed Special:Notifications URL when Echo is installed
* Added missing $wgStylePath to a few places
* Removed some unused global variables
* Removed some commented-out code

Change-Id: Ie71521f426ff73f3dc805f6e3d4d79e19476646b
---
M BlueSky.skin.php
1 file changed, 58 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky 
refs/changes/29/134929/1

diff --git a/BlueSky.skin.php b/BlueSky.skin.php
index 99417ae..bcddc95 100644
--- a/BlueSky.skin.php
+++ b/BlueSky.skin.php
@@ -14,9 +14,10 @@
  *
  * @ingroup Skins
  */
-class SkinWikihowskin extends SkinTemplate {
+class SkinBlueSky extends SkinTemplate {
 
-   var $skinname = 'wikihowskin';
+   var $skinname = 'bluesky', $stylename = 'bluesky',
+   $template = 'BlueSkyTemplate', $useHeadElement = true;
 
public $mSidebarWidgets = array();
public $mSidebarTopWidgets = array();
@@ -613,7 +614,7 @@
// overloaded from Skin class
function drawCategoryBrowser( $tree, $skin, $count = 0 ) {
$return = '';
-   $viewMode = WikihowCategoryViewer::getViewModeArray( 
$this-getContext() );
+   //$viewMode = WikihowCategoryViewer::getViewModeArray( 
$this-getContext() );
foreach ( $tree as $element = $parent ) {
/*
if ($element == Category:WikiHow ||
@@ -641,10 +642,15 @@
$return .= \n;
} else {
# grab the others elements
-   $return .= $this-drawCategoryBrowser( $parent, 
$skin, $count ) ;
+   $return .= $this-drawCategoryBrowser( $parent, 
$skin, $count );
}
# add our current element to the list
-   $return .= li$start  . Skin::link( $eltitle, 
$eltitle-getText(), array(), $viewMode ) . '/li';
+   $return .= li$start  . Skin::link(
+   $eltitle,
+   $eltitle-getText()/*,
+   array(),
+   $viewMode*/
+   ) . '/li';
}
return $return;
}
@@ -1140,15 +1146,21 @@
if ( $isLoggedIn ) {
$html .= a href='$wgForumLink' . 
wfMessage( 'forums' )-text() . /a;
}
-   $html .= a href='/Special:Randomizer' . 
wfMessage( 'randompage' )-text() . /a;
+   $html .= Linker::link(
+   SpecialPage::getTitleFor( 'Randompage' 
),
+   wfMessage( 'randompage' )-plain()
+   );
if ( !$isLoggedIn ) {
-   $html .= Linker::link( 
Title::makeTitle( NS_PROJECT, 'About-wikiHow' ), wfMessage( 'navmenu_aboutus' 
)-text() );
+   $html .= Linker::link(
+   Title::newFromText( wfMessage( 
'aboutpage' )-text() ),
+   wfMessage( 'navmenu_aboutus' 
)-text()
+   );
}
-   $html .= Linker::link( Title::makeTitle( 
NS_SPECIAL, 'Categorylisting' ), wfMessage( 'navmenu_categories' )-text() ) .
-   Linker::link( Title::makeTitle( 
NS_SPECIAL, 'Recentchanges' ), wfMessage( 'recentchanges' )-text() );
+   $html .= Linker::link( 
SpecialPage::getTitleFor( 'Categories' ), wfMessage( 'navmenu_categories' 
)-text() ) .
+   Linker::link( 
SpecialPage::getTitleFor( 'Recentchanges' ), wfMessage( 'recentchanges' 
)-text() );
if ( $isLoggedIn ) {
-   $html .= Linker::link( 
Title::makeTitle( NS_SPECIAL, 'Specialpages' ), wfMessage( 'specialpages' 
)-text() );
-   $html .= Linker::link( 

[MediaWiki-commits] [Gerrit] * Renamed the main classes to remove wikiHow references. * R... - change (mediawiki...BlueSky)

2014-05-22 Thread Jack Phoenix (Code Review)
Jack Phoenix has submitted this change and it was merged.

Change subject: * Renamed the main classes to remove wikiHow references. * 
Removed some custom wH things * Fixed up some awful code to properly use 
SpecialPage::getTitleFor() and * the appropriate MediaWiki messages instead of 
assuming that everything is always in Englis
..


* Renamed the main classes to remove wikiHow references.
* Removed some custom wH things
* Fixed up some awful code to properly use SpecialPage::getTitleFor() and
* the appropriate MediaWiki messages instead of assuming that everything is 
always in English
* Fixed Special:Notifications URL when Echo is installed
* Added missing $wgStylePath to a few places
* Removed some unused global variables
* Removed some commented-out code

Change-Id: Ie71521f426ff73f3dc805f6e3d4d79e19476646b
---
M BlueSky.skin.php
1 file changed, 58 insertions(+), 37 deletions(-)

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



diff --git a/BlueSky.skin.php b/BlueSky.skin.php
index 99417ae..bcddc95 100644
--- a/BlueSky.skin.php
+++ b/BlueSky.skin.php
@@ -14,9 +14,10 @@
  *
  * @ingroup Skins
  */
-class SkinWikihowskin extends SkinTemplate {
+class SkinBlueSky extends SkinTemplate {
 
-   var $skinname = 'wikihowskin';
+   var $skinname = 'bluesky', $stylename = 'bluesky',
+   $template = 'BlueSkyTemplate', $useHeadElement = true;
 
public $mSidebarWidgets = array();
public $mSidebarTopWidgets = array();
@@ -613,7 +614,7 @@
// overloaded from Skin class
function drawCategoryBrowser( $tree, $skin, $count = 0 ) {
$return = '';
-   $viewMode = WikihowCategoryViewer::getViewModeArray( 
$this-getContext() );
+   //$viewMode = WikihowCategoryViewer::getViewModeArray( 
$this-getContext() );
foreach ( $tree as $element = $parent ) {
/*
if ($element == Category:WikiHow ||
@@ -641,10 +642,15 @@
$return .= \n;
} else {
# grab the others elements
-   $return .= $this-drawCategoryBrowser( $parent, 
$skin, $count ) ;
+   $return .= $this-drawCategoryBrowser( $parent, 
$skin, $count );
}
# add our current element to the list
-   $return .= li$start  . Skin::link( $eltitle, 
$eltitle-getText(), array(), $viewMode ) . '/li';
+   $return .= li$start  . Skin::link(
+   $eltitle,
+   $eltitle-getText()/*,
+   array(),
+   $viewMode*/
+   ) . '/li';
}
return $return;
}
@@ -1140,15 +1146,21 @@
if ( $isLoggedIn ) {
$html .= a href='$wgForumLink' . 
wfMessage( 'forums' )-text() . /a;
}
-   $html .= a href='/Special:Randomizer' . 
wfMessage( 'randompage' )-text() . /a;
+   $html .= Linker::link(
+   SpecialPage::getTitleFor( 'Randompage' 
),
+   wfMessage( 'randompage' )-plain()
+   );
if ( !$isLoggedIn ) {
-   $html .= Linker::link( 
Title::makeTitle( NS_PROJECT, 'About-wikiHow' ), wfMessage( 'navmenu_aboutus' 
)-text() );
+   $html .= Linker::link(
+   Title::newFromText( wfMessage( 
'aboutpage' )-text() ),
+   wfMessage( 'navmenu_aboutus' 
)-text()
+   );
}
-   $html .= Linker::link( Title::makeTitle( 
NS_SPECIAL, 'Categorylisting' ), wfMessage( 'navmenu_categories' )-text() ) .
-   Linker::link( Title::makeTitle( 
NS_SPECIAL, 'Recentchanges' ), wfMessage( 'recentchanges' )-text() );
+   $html .= Linker::link( 
SpecialPage::getTitleFor( 'Categories' ), wfMessage( 'navmenu_categories' 
)-text() ) .
+   Linker::link( 
SpecialPage::getTitleFor( 'Recentchanges' ), wfMessage( 'recentchanges' 
)-text() );
if ( $isLoggedIn ) {
-   $html .= Linker::link( 
Title::makeTitle( NS_SPECIAL, 'Specialpages' ), wfMessage( 'specialpages' 
)-text() );
-   $html .= Linker::link( 
Title::makeTitle( NS_PROJECT_TALK, 'Help-Team' ), wfMessage( 'help' 

[MediaWiki-commits] [Gerrit] Double check its safe before dropping new table during db cl... - change (mediawiki/core)

2014-05-22 Thread Brian Wolff (Code Review)
Brian Wolff has uploaded a new change for review.

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

Change subject: Double check its safe before dropping new table during db 
cloning
..

Double check its safe before dropping new table during db cloning

parserTests.php just killed my user table :(

Bug: 65654
Change-Id: Idcf1c6af6a513c9e6dc650237863db8d61519886
---
M includes/db/CloneDatabase.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/includes/db/CloneDatabase.php b/includes/db/CloneDatabase.php
index 536d721..91dd670 100644
--- a/includes/db/CloneDatabase.php
+++ b/includes/db/CloneDatabase.php
@@ -85,6 +85,11 @@
if ( $this-dropCurrentTables
 !in_array( $this-db-getType(), array( 
'postgres', 'oracle' ) )
) {
+   if ( $oldTableName === $newTableName ) {
+   // Last ditch check to avoid data loss
+   throw new MWException( Not dropping 
new table, as '$newTableName'
+   .  is name of both the old and 
the new table. );
+   }
$this-db-dropTable( $tbl, __METHOD__ );
wfDebug( __METHOD__ .  dropping 
{$newTableName}\n );
//Dropping the oldTable because the prefix was 
changed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcf1c6af6a513c9e6dc650237863db8d61519886
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff bawolff...@gmail.com

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


[MediaWiki-commits] [Gerrit] Made getName() in ArchivedFile work when loaded via sha1 - change (mediawiki/core)

2014-05-22 Thread Aaron Schulz (Code Review)
Aaron Schulz has uploaded a new change for review.

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

Change subject: Made getName() in ArchivedFile work when loaded via sha1
..

Made getName() in ArchivedFile work when loaded via sha1

Change-Id: I44e9c129f6c5841f8cbc9792aa9ff0f353bce6c0
---
M includes/filerepo/file/ArchivedFile.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/includes/filerepo/file/ArchivedFile.php 
b/includes/filerepo/file/ArchivedFile.php
index 845fd71..1eee6a2 100644
--- a/includes/filerepo/file/ArchivedFile.php
+++ b/includes/filerepo/file/ArchivedFile.php
@@ -281,6 +281,10 @@
 * @return string
 */
public function getName() {
+   if ( $this-name === false ) {
+   $this-load();
+   }
+
return $this-name;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44e9c129f6c5841f8cbc9792aa9ff0f353bce6c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Redirect arbcom.*.wikipedia.org - arbcom-*.wikipedia.org - change (operations/apache-config)

2014-05-22 Thread Reedy (Code Review)
Reedy has uploaded a new change for review.

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

Change subject: Redirect arbcom.*.wikipedia.org - arbcom-*.wikipedia.org
..

Redirect arbcom.*.wikipedia.org - arbcom-*.wikipedia.org

Change-Id: I1c269433e68ded329b9b828883efe38c7996e120
---
M redirects.conf
M redirects.dat
2 files changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config 
refs/changes/32/134932/1

diff --git a/redirects.conf b/redirects.conf
index a93d841..730b9e9 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -370,6 +370,10 @@
labs.wikimedia.org \
coffee.wikimedia.org \
mobile.wikipedia.org \
+   arbcom.de.wikipedia.org \
+   arbcom.en.wikipedia.org \
+   arbcom.fi.wikipedia.org \
+   arbcom.nl.wikipedia.org \
 
# allow caching for redirects
IfModule mod_headers.c
@@ -939,6 +943,18 @@
# funnelmobile.wikipedia.org//m.wikipedia.org
RewriteCond %{HTTP_HOST} =mobile.wikipedia.org
RewriteRule . %{ENV:RW_PROTO}://m.wikipedia.org/ [R=301,L,NE]
+   # rewrite arbcom.de.wikipedia.org //arbcom-de.wikipedia.org
+   RewriteCond %{HTTP_HOST} =arbcom.de.wikipedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://arbcom-de.wikipedia.org$0 [R=301,L,NE]
+   # rewrite arbcom.en.wikipedia.org //arbcom-en.wikipedia.org
+   RewriteCond %{HTTP_HOST} =arbcom.en.wikipedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://arbcom-en.wikipedia.org$0 [R=301,L,NE]
+   # rewrite arbcom.fi.wikipedia.org //arbcom-fi.wikipedia.org
+   RewriteCond %{HTTP_HOST} =arbcom.fi.wikipedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://arbcom-fi.wikipedia.org$0 [R=301,L,NE]
+   # rewrite arbcom.nl.wikipedia.org //arbcom-nl.wikipedia.org
+   RewriteCond %{HTTP_HOST} =arbcom.nl.wikipedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://arbcom-nl.wikipedia.org$0 [R=301,L,NE]
 
# Type: wildcard
# funnel*wikijunior.com //en.wikibooks.org/wiki/Wikijunior
diff --git a/redirects.dat b/redirects.dat
index 0de1dee..975f398 100644
--- a/redirects.dat
+++ b/redirects.dat
@@ -496,3 +496,9 @@
 
 # w.wiki - upcoming URL shortener
 funnel *w.wiki //www.wikipedia.org
+
+# arbcom
+rewrite arbcom.de.wikipedia.org //arbcom-de.wikipedia.org
+rewrite arbcom.en.wikipedia.org //arbcom-en.wikipedia.org
+rewrite arbcom.fi.wikipedia.org //arbcom-fi.wikipedia.org
+rewrite arbcom.nl.wikipedia.org //arbcom-nl.wikipedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c269433e68ded329b9b828883efe38c7996e120
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Removed roughly about 100 instances of $wgTitle. - change (mediawiki...BlueSky)

2014-05-22 Thread Jack Phoenix (Code Review)
Jack Phoenix has uploaded a new change for review.

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

Change subject: Removed roughly about 100 instances of $wgTitle.
..

Removed roughly about 100 instances of $wgTitle.

Removed overridden printTrail() method, it's not needed.

Removed some wikiHow-specific ad-related code.

Change-Id: I8b32aded4f03eefd9df86566aaf5cc222557b81c
---
M BlueSky.skin.php
1 file changed, 88 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky 
refs/changes/33/134933/1

diff --git a/BlueSky.skin.php b/BlueSky.skin.php
index bcddc95..4671856 100644
--- a/BlueSky.skin.php
+++ b/BlueSky.skin.php
@@ -1405,7 +1405,7 @@
 * outputs a formatted page.
 */
public function execute() {
-   global $wgUser, $wgLang, $wgTitle, $wgRequest;
+   global $wgUser, $wgLang, $wgRequest;
global $wgOut, $wgScript, $wgStylePath, $wgLanguageCode, 
$wgForumLink;
global $wgContLang, $wgXhtmlDefaultNamespace, 
$wgContLanguageCode;
global $IP, $wgServer, $wgIsDomainTest;
@@ -1427,17 +1427,14 @@
$action = 'diff';
}
 
-   $isMainPage = $wgTitle
-$wgTitle-getNamespace() == NS_MAIN
-$wgTitle-getText() == wfMessage( 'mainpage' 
)-inContentLanguage()-text()
-$action == 'view';
+   $title = $this-getSkin()-getTitle();
+   $isMainPage = ( $title-isMainPage()  $action == 'view' );
 
-   $isArticlePage = $wgTitle
-!$isMainPage
-$wgTitle-getNamespace() == NS_MAIN
-$action == 'view';
+   $isArticlePage = !$isMainPage 
+   $title-getNamespace() == NS_MAIN 
+   $action == 'view';
 
-   $isDocViewer = $wgTitle-getText() == 'DocViewer';
+   $isDocViewer = $title-isSpecial( 'DocViewer' );
 
$isBehindHttpAuth = !empty( $_SERVER['HTTP_AUTHORIZATION'] );
 
@@ -1456,19 +1453,19 @@
 
$showAds = wikihowAds::isEligibleForAds();
 
-   $isIndexed = RobotPolicy::isIndexable( $wgTitle );
+   $isIndexed = RobotPolicy::isIndexable( $title );
 
$pageTitle = SkinBlueSky::getHTMLTitle( $wgOut-getHTMLTitle(), 
$this-data['title'], $isMainPage );
 
// set the title and what not
$avatar = '';
-   $namespace = $wgTitle-getNamespace();
+   $namespace = $title-getNamespace();
if ( $namespace == NS_USER || $namespace == NS_USER_TALK ) {
-   $username = $wgTitle-getText();
-   $usernameKey = $wgTitle-getDBKey();
-   $avatar = ( $wgLanguageCode == 'en' ) ? 
Avatar::getPicture( $usernameKey ) : '';
+   $username = $title-getText();
+   $usernameKey = $title-getDBKey();
+   $avatar = ( class_exists( 'Avatar' ) ) ? 
Avatar::getPicture( $usernameKey ) : '';
$h1 = $username;
-   if ( $wgTitle-getNamespace() == NS_USER_TALK ) {
+   if ( $title-getNamespace() == NS_USER_TALK ) {
$h1 = $wgLang-getNsText( NS_USER_TALK ) . : 
$username;
} elseif ( $username == $wgUser-getName() ) {
// user's own page
@@ -1482,8 +1479,8 @@
}
 
$logoutPage = $wgLang-specialPage( 'Userlogout' );
-   $returnTarget = $wgTitle-getPrefixedURL();
-   $returnto = strcasecmp( urlencode( $logoutPage ), $returnTarget 
) ? returnto={$returnTarget} : ;
+   $returnTarget = $title-getPrefixedURL();
+   $returnto = strcasecmp( urlencode( $logoutPage ), $returnTarget 
) ? returnto={$returnTarget} : '';
 
$login = '';
if ( !$wgUser-isAnon() ) {
@@ -1512,16 +1509,16 @@
 
// XX PROFILE EDIT/CREAT/DEL BOX DATE - need to check for pb 
flag in order to display this.
$pbDate = '';
-   if ( $wgTitle-getNamespace() == NS_USER ) {
-   if ( $u = User::newFromName( $wgTitle-getDBKey() ) ) {
-   if ( UserPagePolicy::isGoodUserPage( 
$wgTitle-getDBKey() ) ) {
+   if ( $title-getNamespace() == NS_USER ) {
+   if ( $u = User::newFromName( $title-getDBKey() ) ) {
+   if ( UserPagePolicy::isGoodUserPage( 
$title-getDBKey() ) ) {
$pbDate = ProfileBox::getPageTop( $u );
}
}
}
 
if ( !$sk-suppressH1Tag() ) {
-

[MediaWiki-commits] [Gerrit] puppet: pin packages to the correct version - change (operations/puppet)

2014-05-22 Thread Andrew Bogott (Code Review)
Andrew Bogott has submitted this change and it was merged.

Change subject: puppet: pin packages to the correct version
..


puppet: pin packages to the correct version

As puppet 3 packages are introduced in the wikimedia repository for
precise, and we begin the transition, we need a reliable way to switch
versions on a class of servers.

This is provided by the $puppet_version top-scope variable, that
defaults to '2.7'; by simply overriding this value at node level will
change the version of puppet we install.

The logic of pinning is as follows: if you want puppet 2.7 on precise,
use Ubuntu packages (as puppet 3 is in the wmf repositories); if you
want puppet 3 on trusty, again use Ubuntu packages (as puppet 2.7 is in
the ubuntu repositories).

Change-Id: I89ecb28b7c09c78b7ee59b88c224b68d8e0e06e2
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/site.pp
M modules/apt/manifests/init.pp
A modules/apt/manifests/puppet.pp
M modules/base/manifests/init.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/manifests/passenger.pp
6 files changed, 53 insertions(+), 7 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 05de20d..5547752 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -51,9 +51,13 @@
 }
 
 
-# Default variables
-$cluster = 'misc'
-
+# Default variables. this way, they work with an ENC (as in labs) as well.
+if $cluster == undef {
+$cluster = 'misc'
+}
+if $puppet_version == undef {
+$puppet_version = '2.7'
+}
 # Node definitions (alphabetic order)
 
 node /^amslvs[1-4]\.esams\.wikimedia\.org$/ {
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 06a6c16..a571f01 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -40,6 +40,9 @@
 priority = 1001,
 }
 
+# Pin puppet base packages.
+apt::puppet{'base':}
+
 $http_proxy = http://webproxy.${::site}.wmnet:8080;
 
 # This will munge /etc/apt/apt.conf that get's created during installation
diff --git a/modules/apt/manifests/puppet.pp b/modules/apt/manifests/puppet.pp
new file mode 100644
index 000..3bcc3a6
--- /dev/null
+++ b/modules/apt/manifests/puppet.pp
@@ -0,0 +1,27 @@
+define apt::puppet (
+$version = $puppet_version,
+$packages  = 'puppet puppet-common facter'
+) {
+
+if ($version == '2.7') {
+# For precise, we just need to tell apt to use ubuntu provided 
packages,
+# with an higher priority than the general rule preferring wikimedia
+# packages
+if $::lsbdistcodename == 'precise' {
+apt::pin {puppet_${title}_${version}:
+package  = $packages,
+pin  = 'release o=Ubuntu',
+priority = 1002
+}
+}
+} else {
+# For trusty, ubuntu packages are puppet 3
+if $::lsbdistcodename == 'trusty' {
+apt::pin {$title:
+package  = $packages,
+pin  = 'release o=Ubuntu',
+priority = 1002
+}
+}
+}
+}
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index d1353e0..e968597 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -76,7 +76,8 @@
 $freshnessinterval = $interval * 60 * 6
 
 package { [ 'puppet', 'facter', 'coreutils' ]:
-ensure = latest,
+ensure  = latest,
+require = Apt::Puppet['base']
 }
 
 if $::lsbdistid == 'Ubuntu' and (versioncmp($::lsbdistrelease, '10.04') == 
0 or versioncmp($::lsbdistrelease, '8.04') == 0) {
diff --git a/modules/puppetmaster/manifests/init.pp 
b/modules/puppetmaster/manifests/init.pp
index 0166a19..8728d90 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -28,8 +28,10 @@
 $deny_from=[],
 $server_type='standalone',
 $workers=undef,
-$config={})
-{
+$config={},
+$puppet_version = $puppet_version
+){
+
 system::role { 'puppetmaster': description = 'Puppetmaster' }
 
 $gitdir = '/var/lib/git'
@@ -38,6 +40,10 @@
 # Require /etc/puppet.conf to be in place,
 # so the postinst scripts do the right things.
 require puppetmaster::config
+
+apt::puppet {'puppetmaster':
+packages = 'puppetmaster puppetmaster-common vim-puppet puppet-el'
+}
 
 package { [
 'puppetmaster',
@@ -48,7 +54,8 @@
 'libmysql-ruby',
 'ruby-json'
 ]:
-ensure = latest;
+ensure  = latest,
+require = Apt::Puppet['puppetmaster']
 }
 
 if $server_type == 'frontend' {
diff --git a/modules/puppetmaster/manifests/passenger.pp 
b/modules/puppetmaster/manifests/passenger.pp
index 

[MediaWiki-commits] [Gerrit] Removed roughly about 100 instances of $wgTitle. - change (mediawiki...BlueSky)

2014-05-22 Thread Jack Phoenix (Code Review)
Jack Phoenix has submitted this change and it was merged.

Change subject: Removed roughly about 100 instances of $wgTitle.
..


Removed roughly about 100 instances of $wgTitle.

Removed overridden printTrail() method, it's not needed.

Removed some wikiHow-specific ad-related code.

Change-Id: I8b32aded4f03eefd9df86566aaf5cc222557b81c
---
M BlueSky.skin.php
1 file changed, 88 insertions(+), 118 deletions(-)

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



diff --git a/BlueSky.skin.php b/BlueSky.skin.php
index bcddc95..4671856 100644
--- a/BlueSky.skin.php
+++ b/BlueSky.skin.php
@@ -1405,7 +1405,7 @@
 * outputs a formatted page.
 */
public function execute() {
-   global $wgUser, $wgLang, $wgTitle, $wgRequest;
+   global $wgUser, $wgLang, $wgRequest;
global $wgOut, $wgScript, $wgStylePath, $wgLanguageCode, 
$wgForumLink;
global $wgContLang, $wgXhtmlDefaultNamespace, 
$wgContLanguageCode;
global $IP, $wgServer, $wgIsDomainTest;
@@ -1427,17 +1427,14 @@
$action = 'diff';
}
 
-   $isMainPage = $wgTitle
-$wgTitle-getNamespace() == NS_MAIN
-$wgTitle-getText() == wfMessage( 'mainpage' 
)-inContentLanguage()-text()
-$action == 'view';
+   $title = $this-getSkin()-getTitle();
+   $isMainPage = ( $title-isMainPage()  $action == 'view' );
 
-   $isArticlePage = $wgTitle
-!$isMainPage
-$wgTitle-getNamespace() == NS_MAIN
-$action == 'view';
+   $isArticlePage = !$isMainPage 
+   $title-getNamespace() == NS_MAIN 
+   $action == 'view';
 
-   $isDocViewer = $wgTitle-getText() == 'DocViewer';
+   $isDocViewer = $title-isSpecial( 'DocViewer' );
 
$isBehindHttpAuth = !empty( $_SERVER['HTTP_AUTHORIZATION'] );
 
@@ -1456,19 +1453,19 @@
 
$showAds = wikihowAds::isEligibleForAds();
 
-   $isIndexed = RobotPolicy::isIndexable( $wgTitle );
+   $isIndexed = RobotPolicy::isIndexable( $title );
 
$pageTitle = SkinBlueSky::getHTMLTitle( $wgOut-getHTMLTitle(), 
$this-data['title'], $isMainPage );
 
// set the title and what not
$avatar = '';
-   $namespace = $wgTitle-getNamespace();
+   $namespace = $title-getNamespace();
if ( $namespace == NS_USER || $namespace == NS_USER_TALK ) {
-   $username = $wgTitle-getText();
-   $usernameKey = $wgTitle-getDBKey();
-   $avatar = ( $wgLanguageCode == 'en' ) ? 
Avatar::getPicture( $usernameKey ) : '';
+   $username = $title-getText();
+   $usernameKey = $title-getDBKey();
+   $avatar = ( class_exists( 'Avatar' ) ) ? 
Avatar::getPicture( $usernameKey ) : '';
$h1 = $username;
-   if ( $wgTitle-getNamespace() == NS_USER_TALK ) {
+   if ( $title-getNamespace() == NS_USER_TALK ) {
$h1 = $wgLang-getNsText( NS_USER_TALK ) . : 
$username;
} elseif ( $username == $wgUser-getName() ) {
// user's own page
@@ -1482,8 +1479,8 @@
}
 
$logoutPage = $wgLang-specialPage( 'Userlogout' );
-   $returnTarget = $wgTitle-getPrefixedURL();
-   $returnto = strcasecmp( urlencode( $logoutPage ), $returnTarget 
) ? returnto={$returnTarget} : ;
+   $returnTarget = $title-getPrefixedURL();
+   $returnto = strcasecmp( urlencode( $logoutPage ), $returnTarget 
) ? returnto={$returnTarget} : '';
 
$login = '';
if ( !$wgUser-isAnon() ) {
@@ -1512,16 +1509,16 @@
 
// XX PROFILE EDIT/CREAT/DEL BOX DATE - need to check for pb 
flag in order to display this.
$pbDate = '';
-   if ( $wgTitle-getNamespace() == NS_USER ) {
-   if ( $u = User::newFromName( $wgTitle-getDBKey() ) ) {
-   if ( UserPagePolicy::isGoodUserPage( 
$wgTitle-getDBKey() ) ) {
+   if ( $title-getNamespace() == NS_USER ) {
+   if ( $u = User::newFromName( $title-getDBKey() ) ) {
+   if ( UserPagePolicy::isGoodUserPage( 
$title-getDBKey() ) ) {
$pbDate = ProfileBox::getPageTop( $u );
}
}
}
 
if ( !$sk-suppressH1Tag() ) {
-   if ( $wgTitle-getNamespace() == NS_MAIN  

[MediaWiki-commits] [Gerrit] Add noboard-chapters to DNS to allow rename from noboard.cha... - change (operations/dns)

2014-05-22 Thread Reedy (Code Review)
Reedy has uploaded a new change for review.

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

Change subject: Add noboard-chapters to DNS to allow rename from 
noboard.chapters
..

Add noboard-chapters to DNS to allow rename from noboard.chapters

Change-Id: I17edc1c7f5510a6cfdc92865f72ee45c0c305f97
---
M templates/wikipedia.org
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/34/134934/1

diff --git a/templates/wikipedia.org b/templates/wikipedia.org
index a5dab88..9a5b52b 100644
--- a/templates/wikipedia.org
+++ b/templates/wikipedia.org
@@ -41,6 +41,7 @@
 commons 1H  IN CNAMEwikipedia-lb.wikimedia.org.
 en2 1H  IN CNAMEwikipedia-lb.wikimedia.org.
 meta   1H  IN CNAMEwikipedia-lb.wikimedia.org.
+noboard-chapters   1H  IN CNAMEwikipedia-lb.wikimedia.org.
 nostalgia  1H  IN CNAMEwikipedia-lb.wikimedia.org.
 quote   1H  IN CNAMEwikipedia-lb.wikimedia.org.
 quality1H  IN CNAME
wikipedia-lb.wikimedia.org.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17edc1c7f5510a6cfdc92865f72ee45c0c305f97
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Remove FlaggedRevs from mediawiki.org - change (operations/mediawiki-config)

2014-05-22 Thread Chad (Code Review)
Chad has uploaded a new change for review.

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

Change subject: Remove FlaggedRevs from mediawiki.org
..

Remove FlaggedRevs from mediawiki.org

It was a mistake to put this there. There was never any consensus,
it was just enabled because I asked Brion and he said ok.

bawolff FR doesn't work to well when nobody reviews things

Change-Id: I6d3a71b0a8589c4829b0cfd8a3d9f827ebc2916d
---
M flaggedrevs.dblist
M wmf-config/flaggedrevs.php
2 files changed, 0 insertions(+), 19 deletions(-)


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

diff --git a/flaggedrevs.dblist b/flaggedrevs.dblist
index 652c309..421cd00 100644
--- a/flaggedrevs.dblist
+++ b/flaggedrevs.dblist
@@ -26,7 +26,6 @@
 iswiktionary
 kawiki
 lawikisource
-mediawikiwiki
 metawiki
 mkwiki
 plwiki
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index 3e45f8a..df4d38f 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -479,24 +479,6 @@
$wgGroupPermissions['trusted']['autoreview'] = true;
 }
 
-elseif ( $wgDBname == 'mediawikiwiki' ) {
-   // Set up 2009-08-07 BV w/ config rec from ^demon
-   $wgFlaggedRevsNamespaces = array(
-   NS_HELP,
-   100 /* NS_MANUAL */,
-   102 /* Extension */,
-   );
-   $wgFlaggedRevsHandleIncludes = FR_INCLUDES_CURRENT;
-   $wgGroupPermissions['coder']['review'] = true;
-   $wgGroupPermissions['coder']['validate'] = true;
-   $wgGroupPermissions['coder']['unreviewedpages'] = true;
-   $wgGroupPermissions['coder']['autoreview'] = true;
-   $wgGroupPermissions['sysop']['review'] = true;
-   $wgGroupPermissions['sysop']['validate'] = true;
-   $wgGroupPermissions['sysop']['unreviewedpages'] = true;
-   $wgGroupPermissions['sysop']['autoreview'] = true;
-}
-
 elseif ( $wgDBname == 'metawiki' ) {
$wgFlaggedRevsNamespaces = array ( 480 /* NS_ZERO */ );
$wgFlaggedRevTags = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d3a71b0a8589c4829b0cfd8a3d9f827ebc2916d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Change URLs for noboard.chapters and wg.en to fix SSL cert i... - change (operations/mediawiki-config)

2014-05-22 Thread Reedy (Code Review)
Reedy has uploaded a new change for review.

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

Change subject: Change URLs for noboard.chapters and wg.en to fix SSL cert 
issues
..

Change URLs for noboard.chapters and wg.en to fix SSL cert issues

Change-Id: Iecdd8c5e60a142363b40e34d4fe2f27f0e5feef5
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d6662fa..cc5b229 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1184,7 +1184,7 @@
'metawiki' = '//meta.wikimedia.org',
'movementroleswiki' = '//movementroles.wikimedia.org',
'mxwikimedia' = '//mx.wikimedia.org',
-   'noboard_chapterswikimedia' = '//noboard.chapters.wikimedia.org',
+   'noboard_chapterswikimedia' = '//noboard-chapters.wikimedia.org',
'nycwikimedia' = '//nyc.wikimedia.org', // bug 29273
'officewiki' = '//office.wikimedia.org',
'ombudsmenwiki' = '//ombudsmen.wikimedia.org',
@@ -1205,7 +1205,7 @@
'usabilitywiki' = '//usability.wikimedia.org',
'votewiki' = '//vote.wikimedia.org',
'vewikimedia' = '//ve.wikimedia.org',
-   'wg_enwiki' = '//wg.en.wikipedia.org',
+   'wg_enwiki' = '//wg-en.wikipedia.org',
'wikidatawiki' = '//www.wikidata.org',
'wikimania2005wiki' = '//wikimania2005.wikimedia.org',
'wikimania2006wiki' = '//wikimania2006.wikimedia.org',
@@ -1266,7 +1266,7 @@
'metawiki' = 'http://meta.wikimedia.org',
'movementroleswiki' = 'https://movementroles.wikimedia.org',
'mxwikimedia' = 'http://mx.wikimedia.org',
-   'noboard_chapterswikimedia' = 'http://noboard.chapters.wikimedia.org',
+   'noboard_chapterswikimedia' = 'http://noboard-chapters.wikimedia.org',
'nycwikimedia' = 'http://nyc.wikimedia.org', // bug 29273
'officewiki' = 'https://office.wikimedia.org',
'ombudsmenwiki' = 'https://ombudsmen.wikimedia.org',
@@ -1288,7 +1288,7 @@
'uzwiki' = 'https://uz.wikipedia.org', // bug 43466
'votewiki' = 'https://vote.wikimedia.org',
'vewikimedia' = 'http://ve.wikimedia.org',
-   'wg_enwiki' = 'http://wg.en.wikipedia.org',
+   'wg_enwiki' = 'http://wg-en.wikipedia.org',
'wikidatawiki' = 'http://www.wikidata.org',
'wikimania2005wiki' = 'http://wikimania2005.wikimedia.org',
'wikimania2006wiki' = 'http://wikimania2006.wikimedia.org',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecdd8c5e60a142363b40e34d4fe2f27f0e5feef5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Followup 682b4d0b88: bring this.isSetup back - change (VisualEditor/VisualEditor)

2014-05-22 Thread Catrope (Code Review)
Catrope has uploaded a new change for review.

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

Change subject: Followup 682b4d0b88: bring this.isSetup back
..

Followup 682b4d0b88: bring this.isSetup back

682b4d0b88 removed the only line of code in ve.ce.ProtectedNode
that set this.isSetup to true. Consequently, it was always false,
and onProtectedTeardown would always short-circuit, so no ProtectedNode
would ever get torn down, which resulted in the expected chaos
of JS errors from event handlers that were never unbound.

Change-Id: Icc1748fd5acab4d97e80c88c3336e9d42b70e7ad
---
M modules/ve/ce/ve.ce.ProtectedNode.js
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/37/134937/1

diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js 
b/modules/ve/ce/ve.ce.ProtectedNode.js
index 9c3ba6e..68babdb 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -83,6 +83,8 @@
'mouseenter.ve-ce-protectedNode': ve.bind( 
this.onProtectedMouseEnter, this ),
'mousedown.ve-ce-protectedNode': ve.bind( 
this.onProtectedMouseDown, this )
} );
+
+   this.isSetup = true;
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc1748fd5acab4d97e80c88c3336e9d42b70e7ad
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com

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


[MediaWiki-commits] [Gerrit] .unbind() - .off() - change (VisualEditor/VisualEditor)

2014-05-22 Thread Catrope (Code Review)
Catrope has uploaded a new change for review.

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

Change subject: .unbind() - .off()
..

.unbind() - .off()

Because .unbind() stopped being cool when jQuery 1.7 came out in 2011.

Change-Id: I55b260087104b680341810cb878c6d5003fdd163
---
M modules/ve/ce/ve.ce.ProtectedNode.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/38/134938/1

diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js 
b/modules/ve/ce/ve.ce.ProtectedNode.js
index 68babdb..2d1194b 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -326,7 +326,7 @@
 ve.ce.ProtectedNode.prototype.clearPhantoms = function () {
var surface = this.root.getSurface();
surface.replacePhantoms( null );
-   surface.$element.unbind( '.ve-ce-protectedNode' );
+   surface.$element.off( '.ve-ce-protectedNode' );
surface.getModel().getDocument().disconnect( this, { 'transact': 
'positionPhantoms' } );
this.$phantoms = this.$( [] );
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55b260087104b680341810cb878c6d5003fdd163
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com

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


[MediaWiki-commits] [Gerrit] Remove FlaggedRevs from mediawiki.org - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Remove FlaggedRevs from mediawiki.org
..


Remove FlaggedRevs from mediawiki.org

It was a mistake to put this there. There was never any consensus,
it was just enabled because I asked Brion and he said ok.

bawolff FR doesn't work to well when nobody reviews things

Change-Id: I6d3a71b0a8589c4829b0cfd8a3d9f827ebc2916d
---
M flaggedrevs.dblist
M wmf-config/flaggedrevs.php
2 files changed, 0 insertions(+), 19 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  Brian Wolff: Looks good to me, but someone else must approve
  Withoutaname: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/flaggedrevs.dblist b/flaggedrevs.dblist
index 652c309..421cd00 100644
--- a/flaggedrevs.dblist
+++ b/flaggedrevs.dblist
@@ -26,7 +26,6 @@
 iswiktionary
 kawiki
 lawikisource
-mediawikiwiki
 metawiki
 mkwiki
 plwiki
diff --git a/wmf-config/flaggedrevs.php b/wmf-config/flaggedrevs.php
index 3e45f8a..df4d38f 100644
--- a/wmf-config/flaggedrevs.php
+++ b/wmf-config/flaggedrevs.php
@@ -479,24 +479,6 @@
$wgGroupPermissions['trusted']['autoreview'] = true;
 }
 
-elseif ( $wgDBname == 'mediawikiwiki' ) {
-   // Set up 2009-08-07 BV w/ config rec from ^demon
-   $wgFlaggedRevsNamespaces = array(
-   NS_HELP,
-   100 /* NS_MANUAL */,
-   102 /* Extension */,
-   );
-   $wgFlaggedRevsHandleIncludes = FR_INCLUDES_CURRENT;
-   $wgGroupPermissions['coder']['review'] = true;
-   $wgGroupPermissions['coder']['validate'] = true;
-   $wgGroupPermissions['coder']['unreviewedpages'] = true;
-   $wgGroupPermissions['coder']['autoreview'] = true;
-   $wgGroupPermissions['sysop']['review'] = true;
-   $wgGroupPermissions['sysop']['validate'] = true;
-   $wgGroupPermissions['sysop']['unreviewedpages'] = true;
-   $wgGroupPermissions['sysop']['autoreview'] = true;
-}
-
 elseif ( $wgDBname == 'metawiki' ) {
$wgFlaggedRevsNamespaces = array ( 480 /* NS_ZERO */ );
$wgFlaggedRevTags = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d3a71b0a8589c4829b0cfd8a3d9f827ebc2916d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Withoutaname drevit...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] wg.en - wg-en and noboard.chapters - noboard-chapters - change (operations/apache-config)

2014-05-22 Thread Reedy (Code Review)
Reedy has uploaded a new change for review.

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

Change subject: wg.en - wg-en and noboard.chapters - noboard-chapters
..

wg.en - wg-en and noboard.chapters - noboard-chapters

Change-Id: Ifc9596cc7b48d8b145aed04ad0631d9b9e4aae8f
---
M redirects.conf
M redirects.dat
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config 
refs/changes/39/134939/1

diff --git a/redirects.conf b/redirects.conf
index a93d841..1158592 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -286,6 +286,8 @@
jp.wikipedia.com \
nb.wikipedia.org \
pa.us.wikimedia.org \
+   noboard.chapters.wikimedia.org \
+   wg.en.wikipedia.org \
tp.wikipedia.org \
zh-cfr.wikipedia.org \
minnan.wikipedia.org \
@@ -681,6 +683,12 @@
# rewrite   pa.us.wikimedia.org //pa-us.wikimedia.org
RewriteCond %{HTTP_HOST} =pa.us.wikimedia.org
RewriteRule .* %{ENV:RW_PROTO}://pa-us.wikimedia.org$0 [R=301,L,NE]
+   # rewrite   noboard.chapters.wikimedia.org  
//noboard-chapters.wikimedia.org
+   RewriteCond %{HTTP_HOST} =noboard.chapters.wikimedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://noboard-chapters.wikimedia.org$0 
[R=301,L,NE]
+   # rewrite   wg.en.wikipedia.org //wg-en.wikipedia.org
+   RewriteCond %{HTTP_HOST} =wg.en.wikipedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://wg-en.wikipedia.org$0 [R=301,L,NE]
# rewrite   tp.wikipedia.org//tokipona.wikipedia.org
RewriteCond %{HTTP_HOST} =tp.wikipedia.org
RewriteRule .* %{ENV:RW_PROTO}://tokipona.wikipedia.org$0 [R=301,L,NE]
diff --git a/redirects.dat b/redirects.dat
index 0de1dee..6cd5fef 100644
--- a/redirects.dat
+++ b/redirects.dat
@@ -118,6 +118,10 @@
 # renamed chapter wiki - bug 38763
 rewritepa.us.wikimedia.org //pa-us.wikimedia.org
 
+rewritenoboard.chapters.wikimedia.org  //noboard-chapters.wikimedia.org
+
+rewritewg.en.wikipedia.org //wg-en.wikipedia.org
+
 rewritetp.wikipedia.org//tokipona.wikipedia.org
 
 rewritezh-cfr.wikipedia.org//zh-min-nan.wikipedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc9596cc7b48d8b145aed04ad0631d9b9e4aae8f
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Change URLs for noboard.chapters and wg.en to fix SSL cert i... - change (operations/mediawiki-config)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Change URLs for noboard.chapters and wg.en to fix SSL cert 
issues
..


Change URLs for noboard.chapters and wg.en to fix SSL cert issues

Change-Id: Iecdd8c5e60a142363b40e34d4fe2f27f0e5feef5
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d6662fa..cc5b229 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1184,7 +1184,7 @@
'metawiki' = '//meta.wikimedia.org',
'movementroleswiki' = '//movementroles.wikimedia.org',
'mxwikimedia' = '//mx.wikimedia.org',
-   'noboard_chapterswikimedia' = '//noboard.chapters.wikimedia.org',
+   'noboard_chapterswikimedia' = '//noboard-chapters.wikimedia.org',
'nycwikimedia' = '//nyc.wikimedia.org', // bug 29273
'officewiki' = '//office.wikimedia.org',
'ombudsmenwiki' = '//ombudsmen.wikimedia.org',
@@ -1205,7 +1205,7 @@
'usabilitywiki' = '//usability.wikimedia.org',
'votewiki' = '//vote.wikimedia.org',
'vewikimedia' = '//ve.wikimedia.org',
-   'wg_enwiki' = '//wg.en.wikipedia.org',
+   'wg_enwiki' = '//wg-en.wikipedia.org',
'wikidatawiki' = '//www.wikidata.org',
'wikimania2005wiki' = '//wikimania2005.wikimedia.org',
'wikimania2006wiki' = '//wikimania2006.wikimedia.org',
@@ -1266,7 +1266,7 @@
'metawiki' = 'http://meta.wikimedia.org',
'movementroleswiki' = 'https://movementroles.wikimedia.org',
'mxwikimedia' = 'http://mx.wikimedia.org',
-   'noboard_chapterswikimedia' = 'http://noboard.chapters.wikimedia.org',
+   'noboard_chapterswikimedia' = 'http://noboard-chapters.wikimedia.org',
'nycwikimedia' = 'http://nyc.wikimedia.org', // bug 29273
'officewiki' = 'https://office.wikimedia.org',
'ombudsmenwiki' = 'https://ombudsmen.wikimedia.org',
@@ -1288,7 +1288,7 @@
'uzwiki' = 'https://uz.wikipedia.org', // bug 43466
'votewiki' = 'https://vote.wikimedia.org',
'vewikimedia' = 'http://ve.wikimedia.org',
-   'wg_enwiki' = 'http://wg.en.wikipedia.org',
+   'wg_enwiki' = 'http://wg-en.wikipedia.org',
'wikidatawiki' = 'http://www.wikidata.org',
'wikimania2005wiki' = 'http://wikimania2005.wikimedia.org',
'wikimania2006wiki' = 'http://wikimania2006.wikimedia.org',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecdd8c5e60a142363b40e34d4fe2f27f0e5feef5
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Followup 682b4d0b88: bring this.isSetup back - change (VisualEditor/VisualEditor)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Followup 682b4d0b88: bring this.isSetup back
..


Followup 682b4d0b88: bring this.isSetup back

682b4d0b88 removed the only line of code in ve.ce.ProtectedNode
that set this.isSetup to true. Consequently, it was always false,
and onProtectedTeardown would always short-circuit, so no ProtectedNode
would ever get torn down, which resulted in the expected chaos
of JS errors from event handlers that were never unbound.

Change-Id: Icc1748fd5acab4d97e80c88c3336e9d42b70e7ad
---
M modules/ve/ce/ve.ce.ProtectedNode.js
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js 
b/modules/ve/ce/ve.ce.ProtectedNode.js
index 9c3ba6e..68babdb 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -83,6 +83,8 @@
'mouseenter.ve-ce-protectedNode': ve.bind( 
this.onProtectedMouseEnter, this ),
'mousedown.ve-ce-protectedNode': ve.bind( 
this.onProtectedMouseDown, this )
} );
+
+   this.isSetup = true;
 };
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc1748fd5acab4d97e80c88c3336e9d42b70e7ad
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Document that SurfaceFragment#getSelectedNode doesn't requir... - change (VisualEditor/VisualEditor)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Document that SurfaceFragment#getSelectedNode doesn't require 
selection
..


Document that SurfaceFragment#getSelectedNode doesn't require selection

Change-Id: Idaf20bb2a556c813154f86d9ca68d1e0e5f6a702
---
M modules/ve/dm/ve.dm.SurfaceFragment.js
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve/dm/ve.dm.SurfaceFragment.js 
b/modules/ve/dm/ve.dm.SurfaceFragment.js
index 334acb6..d600aea 100644
--- a/modules/ve/dm/ve.dm.SurfaceFragment.js
+++ b/modules/ve/dm/ve.dm.SurfaceFragment.js
@@ -474,7 +474,10 @@
 };
 
 /**
- * Get the node selected by a range, i.e. the range matches the node's range 
exactly
+ * Get the node selected by a range, i.e. the range matches the node's range 
exactly.
+ *
+ * Note that this method operates on the fragment's range, not the document's 
current selection.
+ * This fragment does not need to be selected for this method to work.
  *
  * @returns {ve.dm.Node|null} The node selected by the range, or null if a 
node is not selected
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idaf20bb2a556c813154f86d9ca68d1e0e5f6a702
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


[MediaWiki-commits] [Gerrit] Remove flaggedrevs-specific user groups from mediawiki.org - change (operations/mediawiki-config)

2014-05-22 Thread Withoutaname (Code Review)
Withoutaname has uploaded a new change for review.

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

Change subject: Remove flaggedrevs-specific user groups from mediawiki.org
..

Remove flaggedrevs-specific user groups from mediawiki.org

Change-Id: I99a86543d656c240b18c8b324afea05d3ebd5e02
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d6662fa..0dd59f1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7158,10 +7158,7 @@
),
'mediawikiwiki' = array(
'user' = array( 'move' = false ),
-   'autoreview' = array( 'autopatrol' = true ),
'coder' = array( 'autopatrol' = true ),
-   'editor' = array( 'autopatrol' = true ),
-   'reviewer' = array( 'autopatrol' = true ),
),
 
'metawiki' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99a86543d656c240b18c8b324afea05d3ebd5e02
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Withoutaname drevit...@gmail.com

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


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

2014-05-22 Thread Jforrester (Code Review)
Jforrester has uploaded a new change for review.

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

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

Update VE core submodule to master (1c1eb3a)

New changes:
7368ea3 Localisation updates from https://translatewiki.net.
712be31 Followup 682b4d0b88: bring this.isSetup back
78fd10e Document that SurfaceFragment#getSelectedNode doesn't require selection

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


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

diff --git a/lib/ve b/lib/ve
index b0a1e1a..1c1eb3a 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit b0a1e1a227ecc7a3059f4cbc22b963d3fc300f2f
+Subproject commit 1c1eb3aa7054abf071cb7a7fccbaa804340a3aa3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8df73bfc30b5bfeed88d5e96236991ce8bbae72d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org

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


[MediaWiki-commits] [Gerrit] Minor fixes to the html structure - change (apps...wikipedia)

2014-05-22 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Minor fixes to the html structure
..


Minor fixes to the html structure

This helps us re-use MobileFrontend styles, which is
coming as a separate patch to MobileApp soon

Change-Id: I4ff2d52f24b766670fa037736e9f2555dd6f7a3f
---
M wikipedia/assets/abusefilter.html
M wikipedia/assets/index.html
M wikipedia/assets/preview.html
M www/abusefilter.html
M www/index.html
M www/preview.html
6 files changed, 6 insertions(+), 8 deletions(-)

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



diff --git a/wikipedia/assets/abusefilter.html 
b/wikipedia/assets/abusefilter.html
index c1cb246..a716d99 100644
--- a/wikipedia/assets/abusefilter.html
+++ b/wikipedia/assets/abusefilter.html
@@ -8,6 +8,6 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=no /
 /head
 body
-div id=content/div
+div id=content class=content/div
 /body
 /html
\ No newline at end of file
diff --git a/wikipedia/assets/index.html b/wikipedia/assets/index.html
index 404ca95..79b0309 100644
--- a/wikipedia/assets/index.html
+++ b/wikipedia/assets/index.html
@@ -8,8 +8,7 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
 /head
 body
-h1 id=title/h1
-div id=content/div
+div id=content class=content/div
 div id=loading_sections/div
 div id=attribution
 a id=lastupdated/a
diff --git a/wikipedia/assets/preview.html b/wikipedia/assets/preview.html
index 7992783..d389ff7 100644
--- a/wikipedia/assets/preview.html
+++ b/wikipedia/assets/preview.html
@@ -8,6 +8,6 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
 /head
 body
-div id=content/div
+div id=content class=content/div
 /body
 /html
\ No newline at end of file
diff --git a/www/abusefilter.html b/www/abusefilter.html
index c1cb246..a716d99 100644
--- a/www/abusefilter.html
+++ b/www/abusefilter.html
@@ -8,6 +8,6 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=no /
 /head
 body
-div id=content/div
+div id=content class=content/div
 /body
 /html
\ No newline at end of file
diff --git a/www/index.html b/www/index.html
index 404ca95..79b0309 100644
--- a/www/index.html
+++ b/www/index.html
@@ -8,8 +8,7 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
 /head
 body
-h1 id=title/h1
-div id=content/div
+div id=content class=content/div
 div id=loading_sections/div
 div id=attribution
 a id=lastupdated/a
diff --git a/www/preview.html b/www/preview.html
index 7992783..d389ff7 100644
--- a/www/preview.html
+++ b/www/preview.html
@@ -8,6 +8,6 @@
 meta name=viewport content=width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6 /
 /head
 body
-div id=content/div
+div id=content class=content/div
 /body
 /html
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ff2d52f24b766670fa037736e9f2555dd6f7a3f
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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


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

2014-05-22 Thread Jforrester (Code Review)
Jforrester has uploaded a new change for review.

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

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

Update VE core submodule to master (1c1eb3a)

New changes:
7368ea3 Localisation updates from https://translatewiki.net.
712be31 Followup 682b4d0b88: bring this.isSetup back
78fd10e Document that SurfaceFragment#getSelectedNode doesn't require selection

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


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

diff --git a/lib/ve b/lib/ve
index b0a1e1a..1c1eb3a 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit b0a1e1a227ecc7a3059f4cbc22b963d3fc300f2f
+Subproject commit 1c1eb3aa7054abf071cb7a7fccbaa804340a3aa3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8df73bfc30b5bfeed88d5e96236991ce8bbae72d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.24wmf6
Gerrit-Owner: Jforrester jforres...@wikimedia.org

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


<    1   2   3   >