date:20150915

[MediaWiki-commits] [Gerrit] Restore dependency on mediawiki.Uri - change (mediawiki...WikimediaEvents)

2015-09-15 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Restore dependency on mediawiki.Uri
..

Restore dependency on mediawiki.Uri

> Exception in module-execute in module ext.wikimediaEvents:
> TypeError: mw.Uri is not a function TypeError: mw.Uri is not a function

Accidentally removed in 7decf38.

Change-Id: I01509f9c2d5b73305dbf1f5c1a33c64d5d15f9f5
---
M WikimediaEvents.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/WikimediaEvents.php b/WikimediaEvents.php
index f159f14..19857ab 100644
--- a/WikimediaEvents.php
+++ b/WikimediaEvents.php
@@ -105,7 +105,8 @@
'ext.wikimediaEvents.search.js',
),
'dependencies' => array(
-   'mediawiki.user', // needed by searchSuggest
+   'mediawiki.user', // needed by searchSuggest.js
+   'mediawiki.Uri', // needed by search.js
),
'localBasePath' => __DIR__ . '/modules',
'remoteExtPath' => 'WikimediaEvents/modules',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01509f9c2d5b73305dbf1f5c1a33c64d5d15f9f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] new wmflabs cert - change (operations/puppet)

2015-09-15 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: new wmflabs cert
..

new wmflabs cert

Change-Id: Iafc8d70ae420d08752a7d790cf2a2fe4ac50b680
---
M files/ssl/star.wmflabs.org.crt
1 file changed, 29 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/238467/1

diff --git a/files/ssl/star.wmflabs.org.crt b/files/ssl/star.wmflabs.org.crt
index 58777c7..c7ffdba 100644
--- a/files/ssl/star.wmflabs.org.crt
+++ b/files/ssl/star.wmflabs.org.crt
@@ -1,27 +1,31 @@
 -BEGIN CERTIFICATE-
-MIIEqjCCA5KgAwIBAgIDBVLaMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
-NTYgQ0EgLSBHMzAeFw0xNTA2MjUwMDI1NDJaFw0xNTA5MTUwMDQzNTJaMIGRMRMw
-EQYDVQQLEwpHVDE3MTM0ODQxMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-bS9yZXNvdXJjZXMvY3BzIChjKTEzMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEWMBQGA1UEAwwNKi53bWZsYWJzLm9yZzCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKVC/ic7jJe9rh26mZ47T/5
-REx3a/RhXllY1Dk16pKs1qq0fXVjYQO0l7YV87CEwKBIVmIgZrlOAZ5QskW01vqV
-8w7m8gAGGuUCRvf0wm2Ai6rHygsBRmvEvpAKEO6wBKX9udew4J6xsqz2vvhvMi09
-9z/TKUVE56/SsXrHElTWS2s6pndj52Z72z9p77j9aAYn9yS4ewbac9Vjl4q9zAM1
-cwCnayWky6GdgQoib0AQOW0CyvOsY3q5UfeOcPMUhL38YO6k4EldctNfeMysp/iv
-N+eai+HmuZ8FGlBxUf7Frnd/FrFql8UC7nDJ/h1eZ3SAoRhCzELU35uXbxs7nOsC
-AwEAAaOCAVIwggFOMB8GA1UdIwQYMBaAFMOc8/zTRgg0u85Gf6B8W/PiCMtZMFcG
-CCsGAQUFBwEBBEswSTAfBggrBgEFBQcwAYYTaHR0cDovL2d2LnN5bWNkLmNvbTAm
-BggrBgEFBQcwAoYaaHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcnQwDgYDVR0PAQH/
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAlBgNVHREEHjAc
-gg0qLndtZmxhYnMub3Jnggt3bWZsYWJzLm9yZzArBgNVHR8EJDAiMCCgHqAchhpo
-dHRwOi8vZ3Yuc3ltY2IuY29tL2d2LmNybDAMBgNVHRMBAf8EAjAAMEEGA1UdIAQ6
-MDgwNgYGZ4EMAQIBMCwwKgYIKwYBBQUHAgEWHmh0dHBzOi8vd3d3LnJhcGlkc3Ns
-LmNvbS9sZWdhbDANBgkqhkiG9w0BAQsFAAOCAQEAeyoEinLvQGomtXEXACUhbJ+S
-Cdk/rPTteVRok96DpkgJx7zr8r2GlI0PnKTLQSnrcpKe8qFXxve0N6Sj5ZAPpPo7
-AEk1X1Q/w2YjiWvT9CDhcFBCOsE6VPtuPth2BOT2rvHpVw9jSMKbG18jTUFhWNVh
-kBMlTQJXu2URwbtwloZ60X/M6W+xUV8uI1xubACLwA9LzJ3Cr6QC4Bj9IALy/IKw
-GN1goiLwKcEqErv07Qzb4rTmQ6B0gPsQJNTYGS6LQhpHcruADTDnOxvIc6kPw86G
-jJjSB/w1tPBVaCONd+AFcPfc6ilSWsBCvP57j1vXndyYvOAsiV3At6DKDfpIDg==
+MIIFSTCCBDGgAwIBAgISESGo3QP2voLan5IeWGObpDmQMA0GCSqGSIb3DQEBCwUA
+MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
+VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
+MjU2IC0gRzIwHhcNMTUwOTE1MTU0MTA1WhcNMTYwOTE1MTU0MTA1WjB3MQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
+aXNjbzEjMCEGA1UECgwaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xFjAUBgNV
+BAMMDSoud21mbGFicy5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDRTmEpCOkALIeNlVZRDdnj20mGOLFuGSEh9o9S0aUHWhy9v5H2UkzxMbk7VWX4
+K36CF2YEhIRv8Ry6WEg8tc41A0aDIbHqc2F0gV43A3lYWeNsSWFmZ3E33A6KgGc/
+yQGcZBr8HCRaoCgL1NwXjzLchqxw6NpmtJpn3pf9c4P11ArlaSO6y/shL0XAPeY8
+kReprRmAuXzr+7ME3RiLt90ccrx/uIPq7vGuzeZ4H59BVq7cHmOM6dFy2/q50OP4
+asoTJB6w8IaFVDfCGKRx8qpqdxUCkFaIEk+bbVnkgMxLQesOyPee//E3JuaXTcOT
+ATQy3RGBaxOAE7D3cZ/z++6ZAgMBAAGjggHeMIIB2jAOBgNVHQ8BAf8EBAMCBaAw
+SQYDVR0gBEIwQDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cu
+Z2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53bWZsYWJz
+Lm9yZ4ILd21mbGFicy5vcmcwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5nbG9iYWxz
+aWduLmNvbS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwgaAGCCsGAQUF
+BwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24u
+Y29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/BggrBgEF
+BQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0aW9u
+dmFsc2hhMmcyMB0GA1UdDgQWBBTC5W9+tRJ8MZVU96UaG7ZhqS4WFjAfBgNVHSME
+GDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDANBgkqhkiG9w0BAQsFAAOCAQEAmrS+
+p3bU0VxhnNubkNFTbC9ZtjOH4NsSHPfxYBlYXAleG4XnVIVarhxGBt7wYZ4jTGp/
+rn1okblwI8b/C4xOecw/MzYP6JByNU2vgHT1wFHI30YtWa/j8snY1rJohkeEHsEu
+AQNvbxKdhDt22Q2PZTVD+YM6fxTQ40yk84TanZQhxj99UovBBRS6kJctWL4HkPYq
+H7mFCyUJuwZ+QggWCkQE/baCgSZFi46J7DPWcSLttE0ruHVTAQYNlIy0dL24DT61
+X65hZds1CDeGkPJdb0tYM/4YwCSA4uKdB2hfSVNXEQIqsQ2MhLImxYZZfvt+Thrh
+ukBbSOgpQdcuI/KZKA==
 -END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] new wmflabs cert - change (operations/puppet)

2015-09-15 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: new wmflabs cert
..


new wmflabs cert

Change-Id: Iafc8d70ae420d08752a7d790cf2a2fe4ac50b680
---
M files/ssl/star.wmflabs.org.crt
1 file changed, 29 insertions(+), 25 deletions(-)

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



diff --git a/files/ssl/star.wmflabs.org.crt b/files/ssl/star.wmflabs.org.crt
index 58777c7..c7ffdba 100644
--- a/files/ssl/star.wmflabs.org.crt
+++ b/files/ssl/star.wmflabs.org.crt
@@ -1,27 +1,31 @@
 -BEGIN CERTIFICATE-
-MIIEqjCCA5KgAwIBAgIDBVLaMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
-NTYgQ0EgLSBHMzAeFw0xNTA2MjUwMDI1NDJaFw0xNTA5MTUwMDQzNTJaMIGRMRMw
-EQYDVQQLEwpHVDE3MTM0ODQxMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-bS9yZXNvdXJjZXMvY3BzIChjKTEzMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEWMBQGA1UEAwwNKi53bWZsYWJzLm9yZzCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKVC/ic7jJe9rh26mZ47T/5
-REx3a/RhXllY1Dk16pKs1qq0fXVjYQO0l7YV87CEwKBIVmIgZrlOAZ5QskW01vqV
-8w7m8gAGGuUCRvf0wm2Ai6rHygsBRmvEvpAKEO6wBKX9udew4J6xsqz2vvhvMi09
-9z/TKUVE56/SsXrHElTWS2s6pndj52Z72z9p77j9aAYn9yS4ewbac9Vjl4q9zAM1
-cwCnayWky6GdgQoib0AQOW0CyvOsY3q5UfeOcPMUhL38YO6k4EldctNfeMysp/iv
-N+eai+HmuZ8FGlBxUf7Frnd/FrFql8UC7nDJ/h1eZ3SAoRhCzELU35uXbxs7nOsC
-AwEAAaOCAVIwggFOMB8GA1UdIwQYMBaAFMOc8/zTRgg0u85Gf6B8W/PiCMtZMFcG
-CCsGAQUFBwEBBEswSTAfBggrBgEFBQcwAYYTaHR0cDovL2d2LnN5bWNkLmNvbTAm
-BggrBgEFBQcwAoYaaHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcnQwDgYDVR0PAQH/
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAlBgNVHREEHjAc
-gg0qLndtZmxhYnMub3Jnggt3bWZsYWJzLm9yZzArBgNVHR8EJDAiMCCgHqAchhpo
-dHRwOi8vZ3Yuc3ltY2IuY29tL2d2LmNybDAMBgNVHRMBAf8EAjAAMEEGA1UdIAQ6
-MDgwNgYGZ4EMAQIBMCwwKgYIKwYBBQUHAgEWHmh0dHBzOi8vd3d3LnJhcGlkc3Ns
-LmNvbS9sZWdhbDANBgkqhkiG9w0BAQsFAAOCAQEAeyoEinLvQGomtXEXACUhbJ+S
-Cdk/rPTteVRok96DpkgJx7zr8r2GlI0PnKTLQSnrcpKe8qFXxve0N6Sj5ZAPpPo7
-AEk1X1Q/w2YjiWvT9CDhcFBCOsE6VPtuPth2BOT2rvHpVw9jSMKbG18jTUFhWNVh
-kBMlTQJXu2URwbtwloZ60X/M6W+xUV8uI1xubACLwA9LzJ3Cr6QC4Bj9IALy/IKw
-GN1goiLwKcEqErv07Qzb4rTmQ6B0gPsQJNTYGS6LQhpHcruADTDnOxvIc6kPw86G
-jJjSB/w1tPBVaCONd+AFcPfc6ilSWsBCvP57j1vXndyYvOAsiV3At6DKDfpIDg==
+MIIFSTCCBDGgAwIBAgISESGo3QP2voLan5IeWGObpDmQMA0GCSqGSIb3DQEBCwUA
+MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
+VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
+MjU2IC0gRzIwHhcNMTUwOTE1MTU0MTA1WhcNMTYwOTE1MTU0MTA1WjB3MQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
+aXNjbzEjMCEGA1UECgwaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xFjAUBgNV
+BAMMDSoud21mbGFicy5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDRTmEpCOkALIeNlVZRDdnj20mGOLFuGSEh9o9S0aUHWhy9v5H2UkzxMbk7VWX4
+K36CF2YEhIRv8Ry6WEg8tc41A0aDIbHqc2F0gV43A3lYWeNsSWFmZ3E33A6KgGc/
+yQGcZBr8HCRaoCgL1NwXjzLchqxw6NpmtJpn3pf9c4P11ArlaSO6y/shL0XAPeY8
+kReprRmAuXzr+7ME3RiLt90ccrx/uIPq7vGuzeZ4H59BVq7cHmOM6dFy2/q50OP4
+asoTJB6w8IaFVDfCGKRx8qpqdxUCkFaIEk+bbVnkgMxLQesOyPee//E3JuaXTcOT
+ATQy3RGBaxOAE7D3cZ/z++6ZAgMBAAGjggHeMIIB2jAOBgNVHQ8BAf8EBAMCBaAw
+SQYDVR0gBEIwQDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cu
+Z2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53bWZsYWJz
+Lm9yZ4ILd21mbGFicy5vcmcwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL2NybC5nbG9iYWxz
+aWduLmNvbS9ncy9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMi5jcmwwgaAGCCsGAQUF
+BwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24u
+Y29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZhbHNoYTJnMnIxLmNydDA/BggrBgEF
+BQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzb3JnYW5pemF0aW9u
+dmFsc2hhMmcyMB0GA1UdDgQWBBTC5W9+tRJ8MZVU96UaG7ZhqS4WFjAfBgNVHSME
+GDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDANBgkqhkiG9w0BAQsFAAOCAQEAmrS+
+p3bU0VxhnNubkNFTbC9ZtjOH4NsSHPfxYBlYXAleG4XnVIVarhxGBt7wYZ4jTGp/
+rn1okblwI8b/C4xOecw/MzYP6JByNU2vgHT1wFHI30YtWa/j8snY1rJohkeEHsEu
+AQNvbxKdhDt22Q2PZTVD+YM6fxTQ40yk84TanZQhxj99UovBBRS6kJctWL4HkPYq
+H7mFCyUJuwZ+QggWCkQE/baCgSZFi46J7DPWcSLttE0ruHVTAQYNlIy0dL24DT61
+X65hZds1CDeGkPJdb0tYM/4YwCSA4uKdB2hfSVNXEQIqsQ2MhLImxYZZfvt+Thrh
+ukBbSOgpQdcuI/KZKA==
 -END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] Add some more tests to WikibaseRepoTest - change (mediawiki...Wikibase)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Add some more tests to WikibaseRepoTest
..


Add some more tests to WikibaseRepoTest

Still a lot not tested. Worth our time? I poked this because I wanted
to create a completely different test but failed because I could not
mock the relevant parts. I gave up. This is whats left.

Change-Id: Ib7b3a7936188ed1693ee55e5a766e9906153c97c
---
M repo/tests/phpunit/includes/WikibaseRepoTest.php
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php 
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index 5e79011..42775db 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -269,6 +269,26 @@
$this->assertInstanceOf( 'Wikibase\PropertyInfoBuilder', 
$builder );
}
 
+   public function testGetEntityNamespaceLookup() {
+   $service = $this->getWikibaseRepo()->getEntityNamespaceLookup();
+   $this->assertInstanceOf( 'Wikibase\Repo\EntityNamespaceLookup', 
$service );
+   }
+
+   public function testGetEntityIdHtmlLinkFormatterFactory() {
+   $service = 
$this->getWikibaseRepo()->getEntityIdHtmlLinkFormatterFactory();
+   $this->assertInstanceOf( 
'Wikibase\Repo\EntityIdHtmlLinkFormatterFactory', $service );
+   }
+
+   public function testGetEntityParserOutputGeneratorFactory() {
+   $service = 
$this->getWikibaseRepo()->getEntityParserOutputGeneratorFactory();
+   $this->assertInstanceOf( 
'Wikibase\EntityParserOutputGeneratorFactory', $service );
+   }
+
+   public function testGetDataTypeValidatorFactory() {
+   $service = 
$this->getWikibaseRepo()->getDataTypeValidatorFactory();
+   $this->assertInstanceOf( 
'Wikibase\Repo\BuilderBasedDataTypeValidatorFactory', $service );
+   }
+
public function testGetDataTypeDefinitions() {
$dataTypeDefinitions = 
$this->getWikibaseRepo()->getDataTypeDefinitions();
$this->assertInstanceOf( 'Wikibase\Lib\DataTypeDefinitions', 
$dataTypeDefinitions );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7b3a7936188ed1693ee55e5a766e9906153c97c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Allow uploading files with the same name but different exten... - change (mediawiki...UploadWizard)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Allow uploading files with the same name but different 
extension at once
..


Allow uploading files with the same name but different extension at once

The check for duplicates in the form did not take file extension into
account. That made it impossible to upload, say, an SVG and PNG version
of the same diagram at the same time.

Bug: T48741
Change-Id: Ie00aade31c618db82d90c8569cb8d3fd04810946
---
M resources/controller/uw.controller.Details.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index 480dfa8..5f3a3bc 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -124,7 +124,7 @@
total += 1;
 
if ( upload.details.clearDuplicateTitleError().valid() 
) {
-   title = upload.title.getName();
+   title = upload.title.getName() + '.' + 
mw.Title.normalizeExtension( upload.title.getExtension() );
 
// Seen this title before?
if ( titles[title] ) {

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

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

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

[MediaWiki-commits] [Gerrit] Fix file name for WikibaseStringValueNormalizer - change (mediawiki...Wikibase)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Fix file name for WikibaseStringValueNormalizer
..


Fix file name for WikibaseStringValueNormalizer

Change-Id: Ic16a23ac6459da9ecfb43062e6f49eb176d34c6d
---
R repo/includes/Parsers/WikibaseStringValueNormalizer.php
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/repo/includes/Parsers/WikibaseStringValueLocalizer.php 
b/repo/includes/Parsers/WikibaseStringValueNormalizer.php
similarity index 100%
rename from repo/includes/Parsers/WikibaseStringValueLocalizer.php
rename to repo/includes/Parsers/WikibaseStringValueNormalizer.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic16a23ac6459da9ecfb43062e6f49eb176d34c6d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang 
Gerrit-Reviewer: Adrian Lang 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] CX: Enable suggestion for testwiki - change (operations/mediawiki-config)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: CX: Enable suggestion for testwiki
..


CX: Enable suggestion for testwiki

Bug: T112498
Change-Id: I9e1f7a1fe87c1ef526a3001331e771fa4a55af90
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 7c9b947..7739efd 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -111,7 +111,6 @@
// $wmgParsoidURL from production is not accessible from Beta, so use 
public URL
$wgContentTranslationParsoid['url'] = 
'http://parsoid-lb.eqiad.wikimedia.org';
$wgContentTranslationTranslateInTarget = false;
-   $wgContentTranslationEnableSuggestions = 
$wmgContentTranslationEnableSuggestions;
 }
 
 if ( $wmgUseCentralNotice ) {
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7a21407..278389c 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2721,6 +2721,8 @@
$wgContentTranslationCampaigns = $wmgContentTranslationCampaigns;
 
$wgContentTranslationDefaultSourceLanguage = 
$wmgContentTranslationDefaultSourceLanguage;
+
+   $wgContentTranslationEnableSuggestions = 
$wmgContentTranslationEnableSuggestions;
 }
 
 // @note getRealmSpecificFilename only works with filenames with .suffix
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b1f2fd8..5b87f0f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14844,6 +14844,12 @@
'default' => 'Main',
 ),
 
+// Suggestions
+'wmgContentTranslationEnableSuggestions' => array(
+   'default' => false,
+   'testwiki' => true,
+),
+
 'wmgUseMapSources' => array(
'default' => false,
'wikivoyage' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e1f7a1fe87c1ef526a3001331e771fa4a55af90
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make 'wikibase.special' a proper style-only module - change (mediawiki...Wikibase)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Make 'wikibase.special' a proper style-only module
..


Make 'wikibase.special' a proper style-only module

* wikibase.special.itemByTitle no longer needs it

* does not depend on script-only module 'wikibase'

Change-Id: I0562afef0f283da553ef4267b1680d60f222668b
---
M repo/resources/Resources.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 9f07e40..ad7e20c 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -144,9 +144,6 @@
'styles' => array(
'wikibase.special/wikibase.special.css'
),
-   'dependencies' => array(
-   'wikibase'
-   )
),
 
'wikibase.special.itemByTitle' => $moduleTemplate + array(
@@ -155,7 +152,6 @@
),
'dependencies' => array(
'wikibase.sites',
-   'wikibase.special',
'jquery.ui.suggester',
'oojs-ui'
)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0562afef0f283da553ef4267b1680d60f222668b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (ce39ef0) - change (mediawiki...VisualEditor)

2015-09-15 Thread jenkins-bot (Code Review)

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

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


Update VE core submodule to master (ce39ef0)

New changes:
63f6b71 build: Upgrade grunt-banana-checker to v0.3.0
a88b6d6 ve.resolveAttributes: Use addBack to build a single selection
ce39ef0 FindAndReplace: Only use caseSensitive for text matches

Change-Id: Ibddf90531709aa8951b3ac8ffcf225ca6410eb51
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index 7847bf5..ce39ef0 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 7847bf5c15348bc0ce6e9d9807e1debadd699255
+Subproject commit ce39ef0f68aeb9d165dae4fba6532d801ad4fb7c

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 90961a2..42a8c46 - change (mediawiki/extensions)

2015-09-15 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 90961a2..42a8c46
..


Syncronize VisualEditor: 90961a2..42a8c46

Change-Id: I48c9acdf13e92f77e3acd4d590695fd8cf15a74d
---
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 90961a2..42a8c46 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 90961a22d2e913f86b6743c79b49367144fb0576
+Subproject commit 42a8c4671e51d660c3155bce01410025a0e00e80

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48c9acdf13e92f77e3acd4d590695fd8cf15a74d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 90961a2..42a8c46 - change (mediawiki/extensions)

2015-09-15 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 90961a2..42a8c46
..

Syncronize VisualEditor: 90961a2..42a8c46

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


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

diff --git a/VisualEditor b/VisualEditor
index 90961a2..42a8c46 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 90961a22d2e913f86b6743c79b49367144fb0576
+Subproject commit 42a8c4671e51d660c3155bce01410025a0e00e80

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48c9acdf13e92f77e3acd4d590695fd8cf15a74d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Implement getSubpagesForPrefixSearch() in SpecialListProperties - change (mediawiki...Wikibase)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Implement getSubpagesForPrefixSearch() in SpecialListProperties
..


Implement getSubpagesForPrefixSearch() in SpecialListProperties

Returning an array of data type ids for search suggestions, etc.

Change-Id: I076e05a6333861a453b32943cd4b949339061029
---
M repo/includes/specials/SpecialListProperties.php
M repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
2 files changed, 24 insertions(+), 0 deletions(-)

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



diff --git a/repo/includes/specials/SpecialListProperties.php 
b/repo/includes/specials/SpecialListProperties.php
index f8213f3..1144f3e 100644
--- a/repo/includes/specials/SpecialListProperties.php
+++ b/repo/includes/specials/SpecialListProperties.php
@@ -275,4 +275,13 @@
return $this->getPageTitle( $this->dataType );
}
 
+   /**
+* @see SpecialPage::getSubpagesForPrefixSearch
+*/
+   protected function getSubpagesForPrefixSearch() {
+   return array_map( function ( $dataType ) {
+   return $dataType->getId();
+   }, $this->dataTypeFactory->getTypes() );
+   }
+
 }
diff --git a/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php 
b/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
index 0e9a6cc..9990a6a 100644
--- a/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
@@ -168,4 +168,19 @@
$this->assertContains( 'Property with label P789', $output );
}
 
+   public function testSearchSubpages() {
+   $specialPage = $this->newSpecialPage();
+   $this->assertEmpty(
+   $specialPage->prefixSearchSubpages( 'g', 10, 0 )
+   );
+   $this->assertEquals(
+   array( 'string' ),
+   $specialPage->prefixSearchSubpages( 'st', 10, 0 )
+   );
+   $this->assertEquals(
+   array( 'wikibase-item' ),
+   $specialPage->prefixSearchSubpages( 'wik', 10, 0 )
+   );
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I076e05a6333861a453b32943cd4b949339061029
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] SpecialItemByTitle: also remove 'site' and 'page' from the q... - change (mediawiki...Wikibase)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: SpecialItemByTitle: also remove 'site' and 'page' from the 
querystring
..


SpecialItemByTitle: also remove 'site' and 'page' from the querystring

When using the form, one gets redirected to URLs like:
https://www.wikidata.org/w/index.php?title=Q42&site=enwiki&page=Douglas+Adams

Missed when reviewing commit 129abce80c5fde03aad580619e9c6f0007cefede

Change-Id: I82f925ef8e9ef1bcf233207522aac5ff59e6156e
---
M repo/includes/specials/SpecialItemByTitle.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/repo/includes/specials/SpecialItemByTitle.php 
b/repo/includes/specials/SpecialItemByTitle.php
index bae340a..5267cad 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -149,6 +149,8 @@
$title = $this->titleLookup->getTitleForId( 
$itemId );
$query = $request->getValues();
unset( $query['title'] );
+   unset( $query['site'] );
+   unset( $query['page'] );
$itemUrl = $title->getFullUrl( $query );
$this->getOutput()->redirect( $itemUrl );
return;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82f925ef8e9ef1bcf233207522aac5ff59e6156e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Bene 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ricordisamoa 
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 (ce39ef0) - change (mediawiki...VisualEditor)

2015-09-15 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

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

Update VE core submodule to master (ce39ef0)

New changes:
63f6b71 build: Upgrade grunt-banana-checker to v0.3.0
a88b6d6 ve.resolveAttributes: Use addBack to build a single selection
ce39ef0 FindAndReplace: Only use caseSensitive for text matches

Change-Id: Ibddf90531709aa8951b3ac8ffcf225ca6410eb51
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index 7847bf5..ce39ef0 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 7847bf5c15348bc0ce6e9d9807e1debadd699255
+Subproject commit ce39ef0f68aeb9d165dae4fba6532d801ad4fb7c

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

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

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

[MediaWiki-commits] [Gerrit] FindAndReplace: Only use caseSensitive for text matches - change (VisualEditor/VisualEditor)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: FindAndReplace: Only use caseSensitive for text matches
..


FindAndReplace: Only use caseSensitive for text matches

Make it the responsibility of the caller to set the appropriate
RegExp flags for case-sensitivity. This means the regex the caller
generates can later be used for replacement without modification.

Bug: T112659
Change-Id: I599a2e3c23d949afef17ed522446f376391cde78
---
M src/dm/ve.dm.Document.js
M src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
2 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/src/dm/ve.dm.Document.js b/src/dm/ve.dm.Document.js
index e3f6213..344af6f 100644
--- a/src/dm/ve.dm.Document.js
+++ b/src/dm/ve.dm.Document.js
@@ -1259,11 +1259,11 @@
  * Find a text string within the document
  *
  * @param {string|RegExp} query Text to find, string or regex with no flags
- * @param {boolean} [caseSensitive] Case sensitive search
+ * @param {boolean} [caseSensitiveString] Case sensitive search for a string 
query. Ignored by regexes (use 'i' flag).
  * @param {boolean} [noOverlaps] Avoid overlapping matches
  * @return {ve.Range[]} List of ranges where the string was found
  */
-ve.dm.Document.prototype.findText = function ( query, caseSensitive, 
noOverlaps ) {
+ve.dm.Document.prototype.findText = function ( query, caseSensitiveString, 
noOverlaps ) {
var i, l, len, match, offset, lines,
ranges = [],
text = this.data.getText(
@@ -1272,7 +1272,6 @@
);
 
if ( query instanceof RegExp ) {
-   query = new RegExp( query.source, caseSensitive ? 'g' : 'gi' );
offset = 0;
// Avoid multi-line matching by only matching within newlines
lines = text.split( '\n' );
@@ -1299,7 +1298,7 @@
query.lastIndex = 0;
}
} else {
-   if ( !caseSensitive ) {
+   if ( !caseSensitiveString ) {
text = text.toLowerCase();
query = query.toLowerCase();
}
diff --git a/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js 
b/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
index d26b312..def429c 100644
--- a/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
+++ b/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
@@ -296,7 +296,7 @@
 
if ( isRegex && find ) {
try {
-   this.query = new RegExp( find );
+   this.query = new RegExp( find, matchCase ? 'g' : 'gi' );
} catch ( e ) {
this.invalidRegex = true;
this.query = '';

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

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

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

[MediaWiki-commits] [Gerrit] Don't fail horribly when invalid categories are passed - change (mediawiki...UploadWizard)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Don't fail horribly when invalid categories are passed
..


Don't fail horribly when invalid categories are passed

If a category name which is not a valid page title is given in the
'categories' URL parameter, it will now be silently ignored instead of
breaking the whole wizard.

Bug: T112417
Change-Id: I6354297bcd6f1ef4c7a530a33346c8d7c68f6555
(cherry picked from commit 0cce0f7801453f5721458889d07b6508429e0d5d)
---
M resources/jquery/jquery.mwCoolCats.js
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/resources/jquery/jquery.mwCoolCats.js 
b/resources/jquery/jquery.mwCoolCats.js
index 82177b3..11f3b9e 100644
--- a/resources/jquery/jquery.mwCoolCats.js
+++ b/resources/jquery/jquery.mwCoolCats.js
@@ -67,12 +67,15 @@
 
/**
 * Add a new category to the page
-* @param {mw.Title} title of category -- should already be in category 
namespace
+* @param {mw.Title|null} title of category -- should already be in 
category namespace
 * @param {boolean} whether this category is visible to the user
 */
function insertCat( title, isHidden ) {
var $li, $anchor;
 
+   if ( !title ) {
+   return;
+   }
if ( containsCat( title ) ) {
return;
}
@@ -276,8 +279,8 @@
this.getWikiText = getWikiText;
 
// initialize with some categories, if so configured
-   $.each( settings.cats, function ( i, cat ) { insertCat( new 
mw.Title( cat, catNsId ) ); } );
-   $.each( settings.hiddenCats, function ( i, cat ) { insertCat( 
new mw.Title( cat, catNsId ), true ); } );
+   $.each( settings.cats, function ( i, cat ) { insertCat( 
mw.Title.newFromText( cat, catNsId ) ); } );
+   $.each( settings.hiddenCats, function ( i, cat ) { insertCat( 
mw.Title.newFromText( cat, catNsId ), true ); } );
 
processInput();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6354297bcd6f1ef4c7a530a33346c8d7c68f6555
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.26wmf22
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Prevent 'filename-toolong' errors during 'Upload' step - change (mediawiki...UploadWizard)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Prevent 'filename-toolong' errors during 'Upload' step
..


Prevent 'filename-toolong' errors during 'Upload' step

The filename used there is discarded later anyway. If the actual file name
is also too long, the user will get an error and be allowed to correct it
later.

Change-Id: Ifbfe728200e7a0eddc28596efecbeb72d0f5a8fa
---
M resources/transports/mw.FormDataTransport.js
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/resources/transports/mw.FormDataTransport.js 
b/resources/transports/mw.FormDataTransport.js
index 5c57e4a..983d387 100644
--- a/resources/transports/mw.FormDataTransport.js
+++ b/resources/transports/mw.FormDataTransport.js
@@ -126,7 +126,7 @@
 * @return {jQuery.Promise}
 */
mw.FormDataTransport.prototype.upload = function ( file ) {
-   var formData, deferred,
+   var formData, deferred, ext,
transport = this;
 
// use timestamp + filename to avoid conflicts on server
@@ -135,6 +135,11 @@
this.tempname = this.tempname.split('').map(function (c) {
return c.charCodeAt(0) > 128 ? '_' : c;
}).join('');
+   // Also limit length to 240 bytes (limit hardcoded in 
UploadBase.php).
+   if ( this.tempname.length > 240 ) {
+   ext = this.tempname.split( '.' ).pop();
+   this.tempname = this.tempname.substr( 0, 240 - 
ext.length - 1 ) + '.' + ext;
+   }
 
if ( this.config.enableChunked && file.size > this.chunkSize ) {
return this.uploadChunk( file, 0 );

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

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

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

[MediaWiki-commits] [Gerrit] toolschecker: fixed the labsdb1005 test. - change (operations/puppet)

2015-09-15 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: toolschecker:  fixed the labsdb1005 test.
..

toolschecker:  fixed the labsdb1005 test.

Change-Id: Iefa5acfbcc593665f15e4dccc4871dda9e2a32e2
---
M modules/toollabs/files/toolschecker.py
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/238464/1

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 3ba9564..3d6d787 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -135,7 +135,13 @@
 
 @check('/labsdb/labsdb1005')
 def labsdb_check_labsdb1005():
-return db_query_check('labsdb1005.eqiad.wmnet')
+connection = pymysql.connect('labsdb1005.eqiad.wmnet', 
read_default_file=os.path.expanduser('~/replica.my.cnf'))
+cur = connection.cursor()
+cur.execute('select * from toolserverdb_p.wiki limit 1')
+result = cur.fetchone()
+if result:
+return True
+return False
 
 
 def job_running(name):

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

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

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

[MediaWiki-commits] [Gerrit] Allow long file names on 'Upload' step to be wrapped - change (mediawiki...UploadWizard)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Allow long file names on 'Upload' step to be wrapped
..


Allow long file names on 'Upload' step to be wrapped

I see no good reason to prevent this.

Bug: T58331
Change-Id: Icaa4885b26faf19f26526686ab53496bce007645
---
M resources/uploadWizard.css
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/resources/uploadWizard.css b/resources/uploadWizard.css
index 502397e..4fbb2a8 100644
--- a/resources/uploadWizard.css
+++ b/resources/uploadWizard.css
@@ -162,10 +162,6 @@
border: 1px solid #d8d8d8;
 }
 
-.mwe-upwiz-visible-file-filename-text {
-   white-space: nowrap;
-}
-
 .mwe-upwiz-file-status {
display: none;
color: #797979;

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-09-15T14:49:08+0000 - change (mediawiki...Wikidata)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: New Wikidata Build - 2015-09-15T14:49:08+
..


New Wikidata Build - 2015-09-15T14:49:08+

Change-Id: I735e758b501f1ad0abde9d9b1e5dd167e6527094
---
M Wikidata.php
M build/tasks/updatecomposer.js
M composer.json
M composer.lock
A extensions/ExternalValidation/.coveralls.yml
A extensions/ExternalValidation/.gitignore
A extensions/ExternalValidation/.gitreview
A extensions/ExternalValidation/.jscsrc
A extensions/ExternalValidation/.jshintignore
A extensions/ExternalValidation/.jshintrc
A extensions/ExternalValidation/.travis.yml
A extensions/ExternalValidation/COPYING
A extensions/ExternalValidation/README.md
A extensions/ExternalValidation/WikibaseQualityExternalValidation.alias.php
A extensions/ExternalValidation/WikibaseQualityExternalValidation.php
A extensions/ExternalValidation/WikibaseQualityExternalValidationHooks.php
A extensions/ExternalValidation/api/RunCrossCheck.php
A extensions/ExternalValidation/build/travis/after_script.sh
A extensions/ExternalValidation/build/travis/before_script.sh
A extensions/ExternalValidation/build/travis/script.sh
A extensions/ExternalValidation/composer.json
A extensions/ExternalValidation/i18n/ady-cyrl.json
A extensions/ExternalValidation/i18n/af.json
A extensions/ExternalValidation/i18n/arq.json
A extensions/ExternalValidation/i18n/bcl.json
A extensions/ExternalValidation/i18n/bn.json
A extensions/ExternalValidation/i18n/ca.json
A extensions/ExternalValidation/i18n/ce.json
A extensions/ExternalValidation/i18n/ckb.json
A extensions/ExternalValidation/i18n/cs.json
A extensions/ExternalValidation/i18n/cu.json
A extensions/ExternalValidation/i18n/de.json
A extensions/ExternalValidation/i18n/el.json
A extensions/ExternalValidation/i18n/en-gb.json
A extensions/ExternalValidation/i18n/en.json
A extensions/ExternalValidation/i18n/es.json
A extensions/ExternalValidation/i18n/eu.json
A extensions/ExternalValidation/i18n/fa.json
A extensions/ExternalValidation/i18n/fr.json
A extensions/ExternalValidation/i18n/fy.json
A extensions/ExternalValidation/i18n/gl.json
A extensions/ExternalValidation/i18n/gu.json
A extensions/ExternalValidation/i18n/he.json
A extensions/ExternalValidation/i18n/ht.json
A extensions/ExternalValidation/i18n/it.json
A extensions/ExternalValidation/i18n/ja.json
A extensions/ExternalValidation/i18n/kn.json
A extensions/ExternalValidation/i18n/ko.json
A extensions/ExternalValidation/i18n/ksh.json
A extensions/ExternalValidation/i18n/ku-latn.json
A extensions/ExternalValidation/i18n/lb.json
A extensions/ExternalValidation/i18n/lv.json
A extensions/ExternalValidation/i18n/mg.json
A extensions/ExternalValidation/i18n/mk.json
A extensions/ExternalValidation/i18n/mr.json
A extensions/ExternalValidation/i18n/nb.json
A extensions/ExternalValidation/i18n/ne.json
A extensions/ExternalValidation/i18n/nl.json
A extensions/ExternalValidation/i18n/olo.json
A extensions/ExternalValidation/i18n/or.json
A extensions/ExternalValidation/i18n/pam.json
A extensions/ExternalValidation/i18n/pl.json
A extensions/ExternalValidation/i18n/ps.json
A extensions/ExternalValidation/i18n/pt-br.json
A extensions/ExternalValidation/i18n/pt.json
A extensions/ExternalValidation/i18n/qqq.json
A extensions/ExternalValidation/i18n/ro.json
A extensions/ExternalValidation/i18n/ru.json
A extensions/ExternalValidation/i18n/sd.json
A extensions/ExternalValidation/i18n/si.json
A extensions/ExternalValidation/i18n/sv.json
A extensions/ExternalValidation/i18n/ta.json
A extensions/ExternalValidation/i18n/te.json
A extensions/ExternalValidation/i18n/tr.json
A extensions/ExternalValidation/i18n/uk.json
A extensions/ExternalValidation/i18n/vi.json
A extensions/ExternalValidation/i18n/zh-hans.json
A extensions/ExternalValidation/i18n/zh-hant.json
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparerFactory.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/EntityIdValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/QuantityValueComparer.php
A extensions/ExternalValidation/includes/CrossCheck/Comparer/StringComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/StringValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/TimeValueComparer.php
A extensions/ExternalValidation/includes/CrossCheck/CrossCheckInteractor.php
A extensions/ExternalValidation/includes/CrossCheck/CrossChecker.php
A extensio

[MediaWiki-commits] [Gerrit] toolschecker: fixed the labsdb1005 test. - change (operations/puppet)

2015-09-15 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: toolschecker:  fixed the labsdb1005 test.
..


toolschecker:  fixed the labsdb1005 test.

Change-Id: Iefa5acfbcc593665f15e4dccc4871dda9e2a32e2
---
M modules/toollabs/files/toolschecker.py
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 3ba9564..3d6d787 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -135,7 +135,13 @@
 
 @check('/labsdb/labsdb1005')
 def labsdb_check_labsdb1005():
-return db_query_check('labsdb1005.eqiad.wmnet')
+connection = pymysql.connect('labsdb1005.eqiad.wmnet', 
read_default_file=os.path.expanduser('~/replica.my.cnf'))
+cur = connection.cursor()
+cur.execute('select * from toolserverdb_p.wiki limit 1')
+result = cur.fetchone()
+if result:
+return True
+return False
 
 
 def job_running(name):

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

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

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

[MediaWiki-commits] [Gerrit] FindAndReplace: Only use caseSensitive for text matches - change (VisualEditor/VisualEditor)

2015-09-15 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: FindAndReplace: Only use caseSensitive for text matches
..

FindAndReplace: Only use caseSensitive for text matches

Make it the responsibility of the caller to set the appropriate
RegExp flags for case-sensitivity. This means the regex the caller
generates can later be used for replacement without modification.

Bug: T112659
Change-Id: I599a2e3c23d949afef17ed522446f376391cde78
---
M src/dm/ve.dm.Document.js
M src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
2 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/63/238463/1

diff --git a/src/dm/ve.dm.Document.js b/src/dm/ve.dm.Document.js
index e3f6213..344af6f 100644
--- a/src/dm/ve.dm.Document.js
+++ b/src/dm/ve.dm.Document.js
@@ -1259,11 +1259,11 @@
  * Find a text string within the document
  *
  * @param {string|RegExp} query Text to find, string or regex with no flags
- * @param {boolean} [caseSensitive] Case sensitive search
+ * @param {boolean} [caseSensitiveString] Case sensitive search for a string 
query. Ignored by regexes (use 'i' flag).
  * @param {boolean} [noOverlaps] Avoid overlapping matches
  * @return {ve.Range[]} List of ranges where the string was found
  */
-ve.dm.Document.prototype.findText = function ( query, caseSensitive, 
noOverlaps ) {
+ve.dm.Document.prototype.findText = function ( query, caseSensitiveString, 
noOverlaps ) {
var i, l, len, match, offset, lines,
ranges = [],
text = this.data.getText(
@@ -1272,7 +1272,6 @@
);
 
if ( query instanceof RegExp ) {
-   query = new RegExp( query.source, caseSensitive ? 'g' : 'gi' );
offset = 0;
// Avoid multi-line matching by only matching within newlines
lines = text.split( '\n' );
@@ -1299,7 +1298,7 @@
query.lastIndex = 0;
}
} else {
-   if ( !caseSensitive ) {
+   if ( !caseSensitiveString ) {
text = text.toLowerCase();
query = query.toLowerCase();
}
diff --git a/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js 
b/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
index d26b312..def429c 100644
--- a/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
+++ b/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
@@ -296,7 +296,7 @@
 
if ( isRegex && find ) {
try {
-   this.query = new RegExp( find );
+   this.query = new RegExp( find, matchCase ? 'g' : 'gi' );
} catch ( e ) {
this.invalidRegex = true;
this.query = '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I599a2e3c23d949afef17ed522446f376391cde78
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] poolcounter: enable connect_timeout for testwiki - change (operations/mediawiki-config)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: poolcounter: enable connect_timeout for testwiki
..


poolcounter: enable connect_timeout for testwiki

Bug: T105378
Change-Id: I86992fa9d55c2c4c5ffb3446799dae937f6a0c65
---
M wmf-config/PoolCounterSettings-eqiad.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/PoolCounterSettings-eqiad.php 
b/wmf-config/PoolCounterSettings-eqiad.php
index 8aaebe5..2d698f2 100644
--- a/wmf-config/PoolCounterSettings-eqiad.php
+++ b/wmf-config/PoolCounterSettings-eqiad.php
@@ -7,3 +7,8 @@
),
'timeout' => 0.5
 );
+
+# Enable connect_timeout for testwiki
+if ($wgDBname == 'testwiki' ) {
+   $wgPoolCountClientConf['connect_timeout'] = 0.01;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86992fa9d55c2c4c5ffb3446799dae937f6a0c65
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "cassandra: updated gc settings" - change (operations/puppet)

2015-09-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Revert "cassandra: updated gc settings"
..


Revert "cassandra: updated gc settings"

We are hitting command-line limits with this change and thus nagios process
checks show up as failed, see T106619

This reverts commit 161791ad82d3fa6f2d8ff33ff08a4f725a9cef80.

Bug: T106619
Change-Id: I9da8d43acc66229fd2ad36c368c1cc40763709e7
---
M hieradata/role/common/cassandra.yaml
M modules/cassandra/templates/cassandra-env.sh.erb
2 files changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 89f9d38..070c3ed 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -14,7 +14,7 @@
 - restbase1007.eqiad.wmnet
 - restbase1008.eqiad.wmnet
 - restbase1009.eqiad.wmnet
-cassandra::max_heap_size: 12g
+cassandra::max_heap_size: 16g
 # 1/4 heap size, no more than 100m/thread
 cassandra::heap_newsize: 2048m
 cassandra::compaction_throughput_mb_per_sec: 60
diff --git a/modules/cassandra/templates/cassandra-env.sh.erb 
b/modules/cassandra/templates/cassandra-env.sh.erb
index 13e521a..b182f3c 100644
--- a/modules/cassandra/templates/cassandra-env.sh.erb
+++ b/modules/cassandra/templates/cassandra-env.sh.erb
@@ -230,8 +230,6 @@
 JVM_OPTS="$JVM_OPTS -XX:+UseG1GC"
 JVM_OPTS="$JVM_OPTS -XX:G1RSetUpdatingPauseTimePercent=5"
 JVM_OPTS="$JVM_OPTS -XX:MaxGCPauseMillis=300"
-JVM_OPTS="$JVM_OPTS -XX:G1HeapRegionSize=8M"
-JVM_OPTS="$JVM_OPTS -XX:InitiatingHeapOccupancyPercent=35"
 
 # note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
 if [ "$JVM_ARCH" = "64-Bit" ] ; then

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9da8d43acc66229fd2ad36c368c1cc40763709e7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
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 'mw' as allowed global variable from .jshintrc - change (mediawiki...UploadWizard)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Remove 'mw' as allowed global variable from .jshintrc
..


Remove 'mw' as allowed global variable from .jshintrc

'mediaWiki' is the one we allow.

Change-Id: Id60d5c94da49a467b6df399a0788550a17dbec78
---
M .jshintrc
M resources/controller/uw.controller.Details.js
M resources/controller/uw.controller.Step.js
M resources/controller/uw.controller.Upload.js
M resources/jquery/jquery.mwCoolCats.js
M resources/jquery/jquery.removeCtrl.js
M resources/jquery/jquery.showThumbCtrl.js
M tests/qunit/controller/uw.controller.Deed.test.js
M tests/qunit/controller/uw.controller.Thanks.test.js
M tests/qunit/controller/uw.controller.Tutorial.test.js
10 files changed, 20 insertions(+), 19 deletions(-)

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



diff --git a/.jshintrc b/.jshintrc
index 5747107..8bd8d58 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -36,7 +36,6 @@
 
"predef": [
"mediaWiki",
-   "mw",
"jQuery",
"OO",
"QUnit",
diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index d9b4df8..4740120 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -15,7 +15,7 @@
  * along with UploadWizard.  If not, see .
  */
 
-( function ( uw, $, OO ) {
+( function ( mw, uw, $, OO ) {
/**
 * Represents the details step in the wizard.
 * @class mw.uw.controller.Details
@@ -229,4 +229,4 @@
this.ui.showErrors();
};
 
-}( mediaWiki.uploadWizard, jQuery, OO ) );
+}( mediaWiki, mediaWiki.uploadWizard, jQuery, OO ) );
diff --git a/resources/controller/uw.controller.Step.js 
b/resources/controller/uw.controller.Step.js
index 016b591..a1c7d65 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -15,7 +15,7 @@
  * along with UploadWizard.  If not, see .
  */
 
-( function ( uw, OO, $ ) {
+( function ( mw, uw, OO, $ ) {
/**
 * Represents a step in the wizard.
 * @class mw.uw.controller.Step
@@ -303,4 +303,4 @@
return this.uploads === undefined || this.uploads.length === 0 
|| this.movedFrom;
};
 
-}( mediaWiki.uploadWizard, OO, jQuery ) );
+}( mediaWiki, mediaWiki.uploadWizard, OO, jQuery ) );
diff --git a/resources/controller/uw.controller.Upload.js 
b/resources/controller/uw.controller.Upload.js
index d8b1277..c7d9354 100644
--- a/resources/controller/uw.controller.Upload.js
+++ b/resources/controller/uw.controller.Upload.js
@@ -15,7 +15,7 @@
  * along with UploadWizard.  If not, see .
  */
 
-( function ( uw, $, OO ) {
+( function ( mw, uw, $, OO ) {
 
/**
 * Upload step controller.
@@ -182,4 +182,4 @@
this.startUploads();
};
 
-}( mediaWiki.uploadWizard, jQuery, OO ) );
+}( mediaWiki, mediaWiki.uploadWizard, jQuery, OO ) );
diff --git a/resources/jquery/jquery.mwCoolCats.js 
b/resources/jquery/jquery.mwCoolCats.js
index 74a8579..e549c66 100644
--- a/resources/jquery/jquery.mwCoolCats.js
+++ b/resources/jquery/jquery.mwCoolCats.js
@@ -10,7 +10,8 @@
  * when the user hasn't entered any categories (not counting hidden 
categories!).
  * This should probably not be going through the DOM, could be more MVC.
  */
-( function ( $ ) { $.fn.mwCoolCats = function ( options ) {
+( function ( mw, $ ) {
+$.fn.mwCoolCats = function ( options ) {
 
var defaults, settings, cx, seenCat, $container, $template,
catNsId = mw.config.get( 'wgNamespaceIds' ).category;
@@ -277,4 +278,5 @@
$template = input.clone();
} );
 
-}; } )( jQuery );
+};
+} )( mediaWiki, jQuery );
diff --git a/resources/jquery/jquery.removeCtrl.js 
b/resources/jquery/jquery.removeCtrl.js
index 4bb07c7..869fa64 100644
--- a/resources/jquery/jquery.removeCtrl.js
+++ b/resources/jquery/jquery.removeCtrl.js
@@ -1,7 +1,7 @@
 /**
  * Create 'remove' control, an X which highlights in some standardized way, 
with optional tooltips
  */
-( function ( $ ) {
+( function ( mw, $ ) {
$.fn.removeCtrl = function ( msgKey, tooltipMsgKey, callback ) {
var msg = (msgKey === null) ? '' : mw.message( msgKey 
).escaped();
return $( '' 
)
@@ -11,4 +11,4 @@
function () { $( this ).removeClass( 'hover' ); 
} )
.append( $( '' + msg + '' ) );
};
-} )( jQuery );
+} )( mediaWiki, jQuery );
diff --git a/resources/jquery/jquery.showThumbCtrl.js 
b/resources/jquery/jquery.showThumbCtrl.js
index 52d7089..de23b2f 100644
--- a/resources/jquery/jquery.showThumbCtrl.js
+++ b/resources/jquery/jquery.showThumbCtrl.js
@@ -1,7 +1,7 @@
 /**

[MediaWiki-commits] [Gerrit] Revert "cassandra: updated gc settings" - change (operations/puppet)

2015-09-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: Revert "cassandra: updated gc settings"
..

Revert "cassandra: updated gc settings"

We are hitting command-line limits with this change and thus nagios process 
checks show up as failed, see T106619

This reverts commit 161791ad82d3fa6f2d8ff33ff08a4f725a9cef80.

Bug: T106619
Change-Id: I9da8d43acc66229fd2ad36c368c1cc40763709e7
---
M hieradata/role/common/cassandra.yaml
M modules/cassandra/templates/cassandra-env.sh.erb
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/238462/1

diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 89f9d38..070c3ed 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -14,7 +14,7 @@
 - restbase1007.eqiad.wmnet
 - restbase1008.eqiad.wmnet
 - restbase1009.eqiad.wmnet
-cassandra::max_heap_size: 12g
+cassandra::max_heap_size: 16g
 # 1/4 heap size, no more than 100m/thread
 cassandra::heap_newsize: 2048m
 cassandra::compaction_throughput_mb_per_sec: 60
diff --git a/modules/cassandra/templates/cassandra-env.sh.erb 
b/modules/cassandra/templates/cassandra-env.sh.erb
index 13e521a..b182f3c 100644
--- a/modules/cassandra/templates/cassandra-env.sh.erb
+++ b/modules/cassandra/templates/cassandra-env.sh.erb
@@ -230,8 +230,6 @@
 JVM_OPTS="$JVM_OPTS -XX:+UseG1GC"
 JVM_OPTS="$JVM_OPTS -XX:G1RSetUpdatingPauseTimePercent=5"
 JVM_OPTS="$JVM_OPTS -XX:MaxGCPauseMillis=300"
-JVM_OPTS="$JVM_OPTS -XX:G1HeapRegionSize=8M"
-JVM_OPTS="$JVM_OPTS -XX:InitiatingHeapOccupancyPercent=35"
 
 # note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
 if [ "$JVM_ARCH" = "64-Bit" ] ; then

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9da8d43acc66229fd2ad36c368c1cc40763709e7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] poolcounter: add connect_timeout in codfw - change (operations/mediawiki-config)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: poolcounter: add connect_timeout in codfw
..


poolcounter: add connect_timeout in codfw

Bug: T105378
Change-Id: Ie115cfa6d37bf33a34f155331f02cc53339ad720
---
M wmf-config/PoolCounterSettings-codfw.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/PoolCounterSettings-codfw.php 
b/wmf-config/PoolCounterSettings-codfw.php
index 09ee0c8..0ba60d2 100644
--- a/wmf-config/PoolCounterSettings-codfw.php
+++ b/wmf-config/PoolCounterSettings-codfw.php
@@ -6,5 +6,6 @@
'10.64.0.179',
'10.64.16.152'
),
-   'timeout' => 0.5
+   'timeout' => 0.5,
+   'connect_timeout' => 0.01,
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie115cfa6d37bf33a34f155331f02cc53339ad720
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Hygiene: upgrade Gradle to v2.7 - change (apps...wikipedia)

2015-09-15 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

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

Change subject: Hygiene: upgrade Gradle to v2.7
..

Hygiene: upgrade Gradle to v2.7

Upgrade Gradle to 2.7 and regenerate the wrapper and wrapper jar[0]:

> If you generated your Gradle wrapper with Gradle 2.6, we strongly
  recommend you regenerate your gradle-wrapper.jar with Gradle 2.7. The
  new checksum validation feature added in 2.6 introduced a serious
  performance degradation in the Gradle wrapper. This issue affects the
  startup time for any gradle execution via this wrapper. This issue has
  been fixed in 2.7.

[0] https://docs.gradle.org/current/release-notes

Change-Id: Ic11bd962abd0ee944cce5b70f18887137f4bff17
---
M gradle/wrapper/gradle-wrapper.jar
M gradle/wrapper/gradle-wrapper.properties
M gradlew
3 files changed, 3 insertions(+), 7 deletions(-)


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

diff --git a/gradle/wrapper/gradle-wrapper.jar 
b/gradle/wrapper/gradle-wrapper.jar
index c97a8bd..e8c6bf7 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 074a2ba..62349d9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 18 14:50:29 MDT 2015
+#Tue Sep 15 08:55:45 MDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..97fac78 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@
 ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -114,6 +109,7 @@
 if $cygwin ; then
 APP_HOME=`cygpath --path --mixed "$APP_HOME"`
 CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+JAVACMD=`cygpath --unix "$JAVACMD"`
 
 # We build the pattern for arguments to be converted via cygpath
 ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic11bd962abd0ee944cce5b70f18887137f4bff17
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

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

[MediaWiki-commits] [Gerrit] Exclude Flow topic boards and Draft NS from Special:Unconnec... - change (operations/mediawiki-config)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Exclude Flow topic boards and Draft NS from 
Special:UnconnectedPages
..


Exclude Flow topic boards and Draft NS from Special:UnconnectedPages

and in general, having them connected to Wikidata items.

Bug: T107927
Change-Id: I3ca46feb52f2fe50e7d13683e031f4845d90f6f2
---
M wmf-config/Wikibase.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Hoo man: Looks good to me, but someone else must approve
  Thcipriani: Looks good to me, approved
  Mattflaschen: Looks good to me, but someone else must approve
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index dee9b9c..1008861 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -144,8 +144,10 @@
$wgWBClientSettings['excludeNamespaces'] = function() {
return array_merge(
MWNamespace::getTalkNamespaces(),
+   // 118 => Draft
// 1198 => NS_TRANSLATE
-   array( NS_USER, NS_FILE, NS_MEDIAWIKI, 1198 )
+   // 2600 => Flow topic
+   array( NS_USER, NS_FILE, NS_MEDIAWIKI, 118, 1198, 2600 )
);
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ca46feb52f2fe50e7d13683e031f4845d90f6f2
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Bugreporter 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Lydia Pintscher 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Collect asset size per type. - change (performance/WebPageTest)

2015-09-15 Thread Phedenskog (Code Review)

Phedenskog has uploaded a new change for review.

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

Change subject: Collect asset size per type.
..

Collect asset size per type.

Collect the asset size per type (html, js,
css and images) and the number of requests.

Also send X amount of metrics per request
to statsv.

Change-Id: I55a4e325128625807f8629377cae6d5dc18a2d9b
---
M lib/index.js
M lib/util.js
M test/utilTest.js
3 files changed, 62 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest 
refs/changes/60/238460/1

diff --git a/lib/index.js b/lib/index.js
index a0b99d7..996f700 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -87,7 +87,7 @@
 if (argv.sendMetrics) {
 util.sendMetrics(collectedMetrics, endpoint);
 } else {
-console.log('Dry run:' + collectedMetrics);
+console.log('Dry run:' + JSON.stringify(collectedMetrics));
 }
 callback();
 }
diff --git a/lib/util.js b/lib/util.js
index fa10c61..bba6974 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -42,22 +42,32 @@
 // Note: It can differs depending on what agent that runs the tests.
 // Note 2: Make sure we don't hit the statsv limit of maximum chars in one 
request
 METRICS: ['SpeedIndex', 'render', 'TTFB', 'fullyLoaded'],
+ASSET_TYPES: ['html','js','css','image'],
 sendMetrics: function(metrics, endpoint) {
+
+// Lets do something smarter in the future, now
+// cut after 5 keys and send a new request
+var MAX_KEYS_PER_REQUEST = 5;
 var url = endpoint + '?';
 
-metrics.forEach(function(metric) {
-url += metric + '&';
-});
+var keys = Object.keys(metrics);
+for (var i = 0; i < keys.length; i++) {
 
-url = url.slice(0, -1);
-
-request(url, function(error, response, body) { // jshint unused:false
-if (!error) {
-console.log('Succesfully sent metrics to ' + url);
-} else {
-console.error(error);
+url += keys[i] + '=' + metrics[keys[i]] + '&';
+// don't send first, and then for each MAX_KEYS_PER_REQUEST
+// and the last time
+if (i !== 0 && i % MAX_KEYS_PER_REQUEST === 0 || (i - 1 === 
keys.length)) {
+url = url.slice(0, -1);
+request(url, function(error, response, body) { // jshint 
unused:false
+url = endpoint + '?';
+if (!error) {
+console.log('Succesfully sent metrics to ' + url);
+} else {
+console.error(error);
+}
+});
 }
-});
+}
 },
 setupWPTOptions: function(argv) {
 // some default options here
@@ -86,7 +96,7 @@
 collectMetrics: function(wptJson, userStatus, namespace) {
 
 var self = this;
-var metricsToSend = [];
+var metricsToSend = {};
 
 VIEWS.forEach(function(view) {
 // if we are missing browser info from WPT (happens when using 
MotoG at least)
@@ -97,17 +107,26 @@
  wptJson.data.location.replace(/[^A-Za-z_]/g, '_');
 
 self.METRICS.forEach(function(metric) {
-metricsToSend.push(namespace + '.' + userStatus + '.' + 
browser + '.' + view +
-'.' + metric + '=' + wptJson.data.median[view][metric] + 'ms');
+metricsToSend[namespace + '.' + userStatus + '.' + browser + 
'.' + view +
+'.' + metric] =  wptJson.data.median[view][metric] + 'ms';
 });
 
 if (wptJson.data.median.firstView.userTimes) {
 
Object.keys(wptJson.data.median.firstView.userTimes).forEach(function(userTiming)
 {
-metricsToSend.push(namespace + '.' + userStatus + '.' + 
browser + '.' + view +
- '.' + userTiming + '=' + 
wptJson.data.median[view].userTimes[userTiming] +
-  'ms');
+metricsToSend[namespace + '.' + userStatus + '.' + browser 
+ '.' + view +
+   '.' + userTiming ] =  
wptJson.data.median[view].userTimes[userTiming] +
+'ms';
 });
 }
+
+// collect sizes & assets
+self.ASSET_TYPES.forEach(function(assetType) {
+metricsToSend[namespace + '.' + userStatus + '.' + browser + 
'.' + view + '.' +
+assetType + '.requests' ] = 
wptJson.data.median[view].breakdown[assetType].requests;
+metricsToSend[namespace + '.' + userStatus + '.' + browser + 
'.' + view + '.' +
+assetType + '.bytes' ] = 
wptJson.data.median[view].breakdown[assetType].bytes;
+});
+
 });
 
 return metricsToSend;
d

[MediaWiki-commits] [Gerrit] Do not obfuscate class names when adding prototype methods - change (mediawiki...UploadWizard)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Do not obfuscate class names when adding prototype methods
..


Do not obfuscate class names when adding prototype methods

This common pattern:

var FP;
function Foo() {}
FP = Foo.prototype;
FP.bar = function () {};

Guarantees that a programmer debugging the code and looking at the
call stack will have no idea what class the 'bar' method belongs to.
Works especially well when the short prefix is common to a number of
classes that all call each other.

function Foo() {}
Foo.prototype.bar = function () {};
global.ns.Foo = Foo;

When your coworkers are suspicious of the previous one, this pattern
achieves almost the same effect, while being explainable by
"performance reasons". Works especially well when classes by the same
name appear in a number of namespaces, e.g. when using something akin
to MVC structure.

Change-Id: I37c22eb043e0f288a26c69898ace80478cf01d58
---
M resources/controller/uw.controller.Deed.js
M resources/controller/uw.controller.Details.js
M resources/controller/uw.controller.Step.js
M resources/controller/uw.controller.Thanks.js
M resources/controller/uw.controller.Tutorial.js
M resources/controller/uw.controller.Upload.js
M resources/mw.UploadWizardUpload.js
M resources/mw.UploadWizardUploadInterface.js
M resources/transports/mw.FirefoggTransport.js
M resources/transports/mw.FormDataTransport.js
M resources/transports/mw.IframeTransport.js
M resources/ui/uw.ui.Deed.js
M resources/ui/uw.ui.DeedPreview.js
M resources/ui/uw.ui.Details.js
M resources/ui/uw.ui.Step.js
M resources/ui/uw.ui.Thanks.js
M resources/ui/uw.ui.Tutorial.js
M resources/ui/uw.ui.Upload.js
M resources/ui/uw.ui.Wizard.js
M resources/uw.EventFlowLogger.js
M resources/uw/model/uw.model.Description.js
21 files changed, 263 insertions(+), 365 deletions(-)

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



diff --git a/resources/controller/uw.controller.Deed.js 
b/resources/controller/uw.controller.Deed.js
index c40abf1..a7641d8 100644
--- a/resources/controller/uw.controller.Deed.js
+++ b/resources/controller/uw.controller.Deed.js
@@ -16,14 +16,12 @@
  */
 
 ( function ( mw, uw, $, OO ) {
-   var DP;
-
/**
 * Deed step controller.
 * @param {mw.Api} api
 * @param {Object} config Only the licensing section of the 
UploadWizard config.
 */
-   function Deed( api, config ) {
+   uw.controller.Deed = function UWControllerDeed( api, config ) {
this.api = api;
 
uw.controller.Step.call(
@@ -33,13 +31,11 @@
);
 
this.stepName = 'deeds';
-   }
+   };
 
-   OO.inheritClass( Deed, uw.controller.Step );
+   OO.inheritClass( uw.controller.Deed, uw.controller.Step );
 
-   DP = Deed.prototype;
-
-   DP.moveFrom = function () {
+   uw.controller.Deed.prototype.moveFrom = function () {
var valid = true;
 
if ( this.deedChooser ) {
@@ -56,7 +52,7 @@
/**
 * Move to this step.
 */
-   DP.moveTo = function ( uploads ) {
+   uw.controller.Deed.prototype.moveTo = function ( uploads ) {
var customDeed, deeds,
showDeed = false,
step = this;
@@ -115,7 +111,7 @@
 * individual files on the details step.
 * @private
 */
-   DP.shouldShowIndividualDeed = function ( config ) {
+   uw.controller.Deed.prototype.shouldShowIndividualDeed = function ( 
config ) {
var ownWork;
 
if ( config.licensing.ownWorkDefault === 'choice' ) {
@@ -131,11 +127,10 @@
/**
 * Empty out all upload information.
 */
-   DP.empty = function () {
+   uw.controller.Deed.prototype.empty = function () {
if ( this.deedChooser !== undefined ) {
this.deedChooser.remove();
}
};
 
-   uw.controller.Deed = Deed;
 }( mediaWiki, mediaWiki.uploadWizard, jQuery, OO ) );
diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index b5f1ced..d9b4df8 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -16,15 +16,13 @@
  */
 
 ( function ( uw, $, OO ) {
-   var DP;
-
/**
 * Represents the details step in the wizard.
 * @class mw.uw.controller.Details
 * @extends mw.uw.controller.Step
 * @constructor
 */
-   function Details( config ) {
+   uw.controller.Details = function UWControllerDetails( config ) {
uw.controller.Step.call(
this,
new uw.ui.Details()
@@ -37,17 +35,15 @@
 
this.stepName = 'details';
this.f

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-09-15T14:49:08+0000 - change (mediawiki...Wikidata)

2015-09-15 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2015-09-15T14:49:08+
..

New Wikidata Build - 2015-09-15T14:49:08+

Change-Id: I735e758b501f1ad0abde9d9b1e5dd167e6527094
---
M Wikidata.php
M build/tasks/updatecomposer.js
M composer.json
M composer.lock
A extensions/ExternalValidation/.coveralls.yml
A extensions/ExternalValidation/.gitignore
A extensions/ExternalValidation/.gitreview
A extensions/ExternalValidation/.jscsrc
A extensions/ExternalValidation/.jshintignore
A extensions/ExternalValidation/.jshintrc
A extensions/ExternalValidation/.travis.yml
A extensions/ExternalValidation/COPYING
A extensions/ExternalValidation/README.md
A extensions/ExternalValidation/WikibaseQualityExternalValidation.alias.php
A extensions/ExternalValidation/WikibaseQualityExternalValidation.php
A extensions/ExternalValidation/WikibaseQualityExternalValidationHooks.php
A extensions/ExternalValidation/api/RunCrossCheck.php
A extensions/ExternalValidation/build/travis/after_script.sh
A extensions/ExternalValidation/build/travis/before_script.sh
A extensions/ExternalValidation/build/travis/script.sh
A extensions/ExternalValidation/composer.json
A extensions/ExternalValidation/i18n/ady-cyrl.json
A extensions/ExternalValidation/i18n/af.json
A extensions/ExternalValidation/i18n/arq.json
A extensions/ExternalValidation/i18n/bcl.json
A extensions/ExternalValidation/i18n/bn.json
A extensions/ExternalValidation/i18n/ca.json
A extensions/ExternalValidation/i18n/ce.json
A extensions/ExternalValidation/i18n/ckb.json
A extensions/ExternalValidation/i18n/cs.json
A extensions/ExternalValidation/i18n/cu.json
A extensions/ExternalValidation/i18n/de.json
A extensions/ExternalValidation/i18n/el.json
A extensions/ExternalValidation/i18n/en-gb.json
A extensions/ExternalValidation/i18n/en.json
A extensions/ExternalValidation/i18n/es.json
A extensions/ExternalValidation/i18n/eu.json
A extensions/ExternalValidation/i18n/fa.json
A extensions/ExternalValidation/i18n/fr.json
A extensions/ExternalValidation/i18n/fy.json
A extensions/ExternalValidation/i18n/gl.json
A extensions/ExternalValidation/i18n/gu.json
A extensions/ExternalValidation/i18n/he.json
A extensions/ExternalValidation/i18n/ht.json
A extensions/ExternalValidation/i18n/it.json
A extensions/ExternalValidation/i18n/ja.json
A extensions/ExternalValidation/i18n/kn.json
A extensions/ExternalValidation/i18n/ko.json
A extensions/ExternalValidation/i18n/ksh.json
A extensions/ExternalValidation/i18n/ku-latn.json
A extensions/ExternalValidation/i18n/lb.json
A extensions/ExternalValidation/i18n/lv.json
A extensions/ExternalValidation/i18n/mg.json
A extensions/ExternalValidation/i18n/mk.json
A extensions/ExternalValidation/i18n/mr.json
A extensions/ExternalValidation/i18n/nb.json
A extensions/ExternalValidation/i18n/ne.json
A extensions/ExternalValidation/i18n/nl.json
A extensions/ExternalValidation/i18n/olo.json
A extensions/ExternalValidation/i18n/or.json
A extensions/ExternalValidation/i18n/pam.json
A extensions/ExternalValidation/i18n/pl.json
A extensions/ExternalValidation/i18n/ps.json
A extensions/ExternalValidation/i18n/pt-br.json
A extensions/ExternalValidation/i18n/pt.json
A extensions/ExternalValidation/i18n/qqq.json
A extensions/ExternalValidation/i18n/ro.json
A extensions/ExternalValidation/i18n/ru.json
A extensions/ExternalValidation/i18n/sd.json
A extensions/ExternalValidation/i18n/si.json
A extensions/ExternalValidation/i18n/sv.json
A extensions/ExternalValidation/i18n/ta.json
A extensions/ExternalValidation/i18n/te.json
A extensions/ExternalValidation/i18n/tr.json
A extensions/ExternalValidation/i18n/uk.json
A extensions/ExternalValidation/i18n/vi.json
A extensions/ExternalValidation/i18n/zh-hans.json
A extensions/ExternalValidation/i18n/zh-hant.json
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparerFactory.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/EntityIdValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/QuantityValueComparer.php
A extensions/ExternalValidation/includes/CrossCheck/Comparer/StringComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/StringValueComparer.php
A 
extensions/ExternalValidation/includes/CrossCheck/Comparer/TimeValueComparer.php
A extensions/ExternalValidation/includes/CrossCheck/CrossCheckInteractor.php
A extensions/ExternalValidation/includes/C

[MediaWiki-commits] [Gerrit] Convert SpecialItemByTitle to HTMLForm in 'ooui' mode - change (mediawiki...Wikibase)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Convert SpecialItemByTitle to HTMLForm in 'ooui' mode
..


Convert SpecialItemByTitle to HTMLForm in 'ooui' mode

Bug: T48248
Change-Id: Ic6e10a007ffb68a8ba9dc150360293e426090a65
---
M repo/includes/specials/SpecialItemByTitle.php
M repo/resources/Resources.php
M repo/resources/wikibase.special/wikibase.special.itemByTitle.js
M repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php
4 files changed, 60 insertions(+), 76 deletions(-)

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



diff --git a/repo/includes/specials/SpecialItemByTitle.php 
b/repo/includes/specials/SpecialItemByTitle.php
index 1f18bab..bae340a 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Repo\Specials;
 
+use HTMLForm;
 use Html;
 use Site;
 use SiteStore;
@@ -176,70 +177,36 @@
 
$this->getOutput()->addModules( 'wikibase.special.itemByTitle' 
);
 
-   $this->getOutput()->addHTML(
-   Html::openElement(
-   'form',
-   array(
-   'method' => 'get',
-   'action' => 
$this->getPageTitle()->getFullUrl(),
-   'name' => 'itembytitle',
-   'id' => 'wb-itembytitle-form1'
-   )
+   $formDescriptor = array(
+   'site' => array(
+   'name' => 'site',
+   'default' => $siteId,
+   'type' => 'text',
+   'cssclass' => 'wb-input',
+   'id' => 'wb-itembytitle-sitename',
+   'size' => 12,
+   'label-message' => 
'wikibase-itembytitle-lookup-site'
+   ),
+   'page' => array(
+   'name' => 'page',
+   'default' => $page ?: '',
+   'type' => 'text',
+   'cssclass' => 'wb-input',
+   'id' => 'pagename',
+   'size' => 36,
+   'label-message' => 
'wikibase-itembytitle-lookup-page'
)
-   . Html::openElement( 'fieldset' )
-   . Html::element(
-   'legend',
-   array(),
-   $this->msg( 
'wikibase-itembytitle-lookup-fieldset' )->text()
-   )
-   . Html::label(
-   $this->msg( 'wikibase-itembytitle-lookup-site' 
)->text(),
-   'wb-itembytitle-sitename',
-   array(
-   'class' => 'wb-label'
-   )
-   )
-   . Html::input(
-   'site',
-   htmlspecialchars( $siteId ),
-   'text',
-   array(
-   'class' => 'wb-input',
-   'id' => 'wb-itembytitle-sitename',
-   'size' => 12
-   )
-   )
-   . ' '
-   . Html::label(
-   $this->msg( 'wikibase-itembytitle-lookup-page' 
)->text(),
-   'pagename',
-   array(
-   'class' => 'wb-label'
-   )
-   )
-   . Html::input(
-   'page',
-   $page ? htmlspecialchars( $page ) : '',
-   'text',
-   array(
-   'class' => 'wb-input',
-   'id' => 'pagename',
-   'size' => 36
-   )
-   )
-   . Html::input(
-   '',
-   $this->msg( 'wikibase-itembytitle-submit' 
)->text(),
-   'submit',
-   array(
-   'id' => 'wb-itembytitle-submit',
-   'class' => 'wb-button'
-   )
-   )
-

[MediaWiki-commits] [Gerrit] [FIX] ModuleDeprecationWrapper: Expose dict - change (pywikibot/core)

2015-09-15 Thread XZise (Code Review)

XZise has uploaded a new change for review.

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

Change subject: [FIX] ModuleDeprecationWrapper: Expose __dict__
..

[FIX] ModuleDeprecationWrapper: Expose __dict__

As the documentation is using the `__dict__` attribute to determine what to
document the `ModuleDeprecationWrapper` is copying the module's dictionary.

Bug: T74424
Change-Id: I14260be9daca09c32e6755777dd03250fed7dd81
---
M pywikibot/tools/__init__.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/49/238449/1

diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index 2f77338..1abf204 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -1452,7 +1452,7 @@
 module = sys.modules[module]
 super(ModuleDeprecationWrapper, self).__setattr__('_deprecated', {})
 super(ModuleDeprecationWrapper, self).__setattr__('_module', module)
-super(ModuleDeprecationWrapper, self).__setattr__('__doc__', 
module.__doc__)
+self.__dict__.update(module.__dict__)
 
 if __debug__:
 sys.modules[module.__name__] = self

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

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

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

[MediaWiki-commits] [Gerrit] cassandra: updated gc settings - change (operations/puppet)

2015-09-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: updated gc settings
..


cassandra: updated gc settings

Updates GC settings for a 12G heap size, 8M region sizes, and an
initiating occupancy threshold of 35%.

See: https://phabricator.wikimedia.org/T106619#1604486

Bug: T106619
Change-Id: Ie5b4442d26910a6e70a11c9a756c23afbe68efd5
---
M hieradata/role/common/cassandra.yaml
M modules/cassandra/templates/cassandra-env.sh.erb
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  Mobrovac: Looks good to me, but someone else must approve
  GWicke: Looks good to me, but someone else must approve



diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 070c3ed..89f9d38 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -14,7 +14,7 @@
 - restbase1007.eqiad.wmnet
 - restbase1008.eqiad.wmnet
 - restbase1009.eqiad.wmnet
-cassandra::max_heap_size: 16g
+cassandra::max_heap_size: 12g
 # 1/4 heap size, no more than 100m/thread
 cassandra::heap_newsize: 2048m
 cassandra::compaction_throughput_mb_per_sec: 60
diff --git a/modules/cassandra/templates/cassandra-env.sh.erb 
b/modules/cassandra/templates/cassandra-env.sh.erb
index b182f3c..13e521a 100644
--- a/modules/cassandra/templates/cassandra-env.sh.erb
+++ b/modules/cassandra/templates/cassandra-env.sh.erb
@@ -230,6 +230,8 @@
 JVM_OPTS="$JVM_OPTS -XX:+UseG1GC"
 JVM_OPTS="$JVM_OPTS -XX:G1RSetUpdatingPauseTimePercent=5"
 JVM_OPTS="$JVM_OPTS -XX:MaxGCPauseMillis=300"
+JVM_OPTS="$JVM_OPTS -XX:G1HeapRegionSize=8M"
+JVM_OPTS="$JVM_OPTS -XX:InitiatingHeapOccupancyPercent=35"
 
 # note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
 if [ "$JVM_ARCH" = "64-Bit" ] ; then

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5b4442d26910a6e70a11c9a756c23afbe68efd5
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Eevans 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Allow long file names on 'Upload' step to be wrapped - change (mediawiki...UploadWizard)

2015-09-15 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Allow long file names on 'Upload' step to be wrapped
..

Allow long file names on 'Upload' step to be wrapped

I see no good reason to prevent this.

Bug: T58331
Change-Id: Icaa4885b26faf19f26526686ab53496bce007645
---
M resources/uploadWizard.css
1 file changed, 0 insertions(+), 4 deletions(-)


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

diff --git a/resources/uploadWizard.css b/resources/uploadWizard.css
index 502397e..4fbb2a8 100644
--- a/resources/uploadWizard.css
+++ b/resources/uploadWizard.css
@@ -162,10 +162,6 @@
border: 1px solid #d8d8d8;
 }
 
-.mwe-upwiz-visible-file-filename-text {
-   white-space: nowrap;
-}
-
 .mwe-upwiz-file-status {
display: none;
color: #797979;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaa4885b26faf19f26526686ab53496bce007645
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] qqx i18n file removed unnecessary column numbers - change (mediawiki...Newsletter)

2015-09-15 Thread Tarrow (Code Review)

Tarrow has uploaded a new change for review.

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

Change subject: qqx i18n file removed unnecessary column numbers
..

qqx i18n file removed unnecessary column numbers

Change-Id: Ia7d40f07133da5b3fe657f7682e6e3e0534a03ba
---
M i18n/qqq.json
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 59e421c..a1d7fbe 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -48,15 +48,15 @@
"echo-category-title-newsletter": "Title of the notification category 
used by Newsletter 
extension.\n{{Related|Echo-category-title}}\n{{Identical|Newsletter}}",
"echo-pref-tooltip-newsletter": "Short description of the newsletter 
notification category.\n{{Related|Echo-pref-tooltip}}",
"newsletter-notification-link-text-new-issue": "Label of the primary 
link of the notification-newsletter-flyout, which on clicking navigates the 
user to the newly announced issue of a newsletter.",
-   "newsletter-header-name": "Label of the first column of table in 
[[Special:Newsletters]] which lists the names of newsletters",
-   "newsletter-header-description": "Label of the second column of table 
in [[Special:Newsletters]] which displays a description about the 
newsletter\n{{Identical|Description}}",
-   "newsletter-header-action": "Label of the fourth column of table in 
[[Special:Newsletters]] which provides radio buttons to subscribe/unsubscribe 
newsletters\n{{Identical|Subscribed}}",
+   "newsletter-header-name": "Label of the newsletter name column of table 
in [[Special:Newsletters]] which lists the names of newsletters",
+   "newsletter-header-description": "Label of the description column of 
table in [[Special:Newsletters]] which displays a description about the 
newsletter\n{{Identical|Description}}",
+   "newsletter-header-action": "Label of the subscribe column of table in 
[[Special:Newsletters]] which provides radio buttons to subscribe/unsubscribe 
newsletters\n{{Identical|Subscribed}}",
"newsletter-header-frequency": "Label of the frequency column of table 
in [[Special:Newsletters]] which shows newsletter frequency",
-   "newsletter-header-subscriber_count": "Label of the third column of 
table in [[Special:Newsletters]] which gives the subscriber count of 
corresponding newsletter",
+   "newsletter-header-subscriber_count": "Label of the subscriber count 
column of table in [[Special:Newsletters]] which gives the subscriber count of 
corresponding newsletter",
"newsletter-new-publisher-confirmation": "Confirmation message 
displayed after a new publisher is added for a newsletter through the 
[[Special:NewsletterManage]] page",
-   "newsletter-manage-header-name": "Label of the first column of table in 
[[Special:NewsletterManage]] which lists the names of 
newsletters\n{{Identical|Newsletter}}",
-   "newsletter-manage-header-publisher": "Label of the second column of 
table in [[Special:NewsletterManage]] which lists the names of all publishers 
of a newsletter\n{{Identical|Contributor}}",
-   "newsletter-manage-header-permissions": "Label of the third column of 
table in [[Special:NewsletterManage]] which lists the roles of a 
user\n{{Identical|Permission}}",
+   "newsletter-manage-header-name": "Label of the name column of table in 
[[Special:NewsletterManage]] which lists the names of 
newsletters\n{{Identical|Newsletter}}",
+   "newsletter-manage-header-publisher": "Label of the publisher names 
column of table in [[Special:NewsletterManage]] which lists the names of all 
publishers of a newsletter\n{{Identical|Contributor}}",
+   "newsletter-manage-header-permissions": "Label of the user roles column 
of table in [[Special:NewsletterManage]] which lists the roles of a 
user\n{{Identical|Permission}}",
"newsletter-manage-header-action": "{{Identical|Action}}",
"newsletter-owner-radiobutton-label": "Label of radio button in 
'Permissions' column in [[Special:NewsletterManage]] which is checked if the 
user is the owner of the newsletter\n{{Identical|Owner}}",
"newsletter-publisher-radiobutton-label": "Label of radio button in 
'Permissions' column in [[Special:NewsletterManage]] which is checked if the 
user is a publisher of the newsletter\n{{Identical|Publisher}}",

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

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

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

[MediaWiki-commits] [Gerrit] Remove the heart icon per design review - change (mediawiki...QuickSurveys)

2015-09-15 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Remove the heart icon per design review
..

Remove the heart icon per design review

Bug: T112344
Change-Id: I775bf446e0cb8fd02e144f35dfd5b33a27ee8197
---
M resources/ext.quicksurveys.views/finalPanel.muhogan
D resources/ext.quicksurveys.views/heart.svg
M resources/ext.quicksurveys.views/styles.less
3 files changed, 0 insertions(+), 17 deletions(-)


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

diff --git a/resources/ext.quicksurveys.views/finalPanel.muhogan 
b/resources/ext.quicksurveys.views/finalPanel.muhogan
index 299615f..b4c2757 100644
--- a/resources/ext.quicksurveys.views/finalPanel.muhogan
+++ b/resources/ext.quicksurveys.views/finalPanel.muhogan
@@ -1,4 +1,3 @@
 {{finalHeading}}
-
 {{{footer}}}
 
diff --git a/resources/ext.quicksurveys.views/heart.svg 
b/resources/ext.quicksurveys.views/heart.svg
deleted file mode 100644
index e74000a..000
--- a/resources/ext.quicksurveys.views/heart.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
-viewBox="0 0 158.8 143.3" enable-background="new 0 0 158.8 143.3" 
xml:space="preserve">
-
-   
-
-
diff --git a/resources/ext.quicksurveys.views/styles.less 
b/resources/ext.quicksurveys.views/styles.less
index de908f5..2ef6c4e 100644
--- a/resources/ext.quicksurveys.views/styles.less
+++ b/resources/ext.quicksurveys.views/styles.less
@@ -15,10 +15,5 @@
background-repeat: no-repeat;
.background-size( auto, 5em );
background-position: center 80%;
-   &.completed {
-   height: 6em;
-   // FIXME: No png
-   .background-image-svg( 'heart.svg', 'heart.svg' );
-   }
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I775bf446e0cb8fd02e144f35dfd5b33a27ee8197
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: dev
Gerrit-Owner: Phuedx 

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

[MediaWiki-commits] [Gerrit] Workaround bug in commander with --domain option. - change (mediawiki...bundler)

2015-09-15 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Workaround bug in commander with --domain option.
..

Workaround bug in commander with --domain option.

Change-Id: I48a899f32c557507b8f300c96931aa9e43b73eda
---
M bin/mw-ocg-bundler
1 file changed, 10 insertions(+), 8 deletions(-)


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

diff --git a/bin/mw-ocg-bundler b/bin/mw-ocg-bundler
index 436c110..79ca000 100755
--- a/bin/mw-ocg-bundler
+++ b/bin/mw-ocg-bundler
@@ -21,7 +21,9 @@
'Save zip to the given ', null)
.option('-p, --prefix ',
'Which wiki prefix to use to resolve the title (Parsoid 
v1 API) [enwiki]', null)
-   .option('-h, --domain ',
+   // this option can't be named 'domain' due to
+   // https://github.com/tj/commander.js/issues/370
+   .option('-h, --domainname ',
'Wiki hostname to use to resolve the title (Parsoid 
v2/v3 API, RESTbase API) [en.wikipedia.org]', null)
.option('-a, --parsoid-api ',
'Parsoid API root', 
'http://parsoid-lb.eqiad.wikimedia.org/')
@@ -158,8 +160,8 @@
return JSON.parse(data);
});
 } else if (program.collection) {
-   if (!(program.prefix || program.domain)) {
-   program.domain = 'en.wikipedia.org';
+   if (!(program.prefix || program.domainname)) {
+   program.domainname = 'en.wikipedia.org';
}
p = p.then(function() {
return bundler.metabook.fromCollection(
@@ -170,12 +172,12 @@
});
 } else {
// Create a metabook.json from the given prefix and page titles
-   if (!(program.prefix || program.domain)) {
-   program.domain = 'en.wikipedia.org';
+   if (!(program.prefix || program.domainname)) {
+   program.domainname = 'en.wikipedia.org';
}
p = p.then(function() {
return 
bundler.metabook.fromArticles(program.args.map(function(t) {
-   return { prefix: program.prefix, domain: 
program.domain, title: t };
+   return { prefix: program.prefix, domain: 
program.domainname, title: t };
}), program);
});
 }
@@ -232,8 +234,8 @@
restbaseApi: program.restbaseApi ?
// Be user-friendly: strip trailing /page/html/ if 
present.
program.restbaseApi.replace(/\/page\/html\/?$/, '/') :
-   program.domain ?
-   'http://rest.wikimedia.org/' + program.domain + '/v1/' :
+   program.domainname ?
+   'http://rest.wikimedia.org/' + program.domainname + 
'/v1/' :
undefined,
parsoidApi: program.parsoidApi,
apiVersion: program.apiVersion,

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

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

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

[MediaWiki-commits] [Gerrit] qqx i18n file removed unnecessary column numbers - change (mediawiki...Newsletter)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: qqx i18n file removed unnecessary column numbers
..


qqx i18n file removed unnecessary column numbers

Change-Id: Ia7d40f07133da5b3fe657f7682e6e3e0534a03ba
---
M i18n/qqq.json
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/i18n/qqq.json b/i18n/qqq.json
index 59e421c..a1d7fbe 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -48,15 +48,15 @@
"echo-category-title-newsletter": "Title of the notification category 
used by Newsletter 
extension.\n{{Related|Echo-category-title}}\n{{Identical|Newsletter}}",
"echo-pref-tooltip-newsletter": "Short description of the newsletter 
notification category.\n{{Related|Echo-pref-tooltip}}",
"newsletter-notification-link-text-new-issue": "Label of the primary 
link of the notification-newsletter-flyout, which on clicking navigates the 
user to the newly announced issue of a newsletter.",
-   "newsletter-header-name": "Label of the first column of table in 
[[Special:Newsletters]] which lists the names of newsletters",
-   "newsletter-header-description": "Label of the second column of table 
in [[Special:Newsletters]] which displays a description about the 
newsletter\n{{Identical|Description}}",
-   "newsletter-header-action": "Label of the fourth column of table in 
[[Special:Newsletters]] which provides radio buttons to subscribe/unsubscribe 
newsletters\n{{Identical|Subscribed}}",
+   "newsletter-header-name": "Label of the newsletter name column of table 
in [[Special:Newsletters]] which lists the names of newsletters",
+   "newsletter-header-description": "Label of the description column of 
table in [[Special:Newsletters]] which displays a description about the 
newsletter\n{{Identical|Description}}",
+   "newsletter-header-action": "Label of the subscribe column of table in 
[[Special:Newsletters]] which provides radio buttons to subscribe/unsubscribe 
newsletters\n{{Identical|Subscribed}}",
"newsletter-header-frequency": "Label of the frequency column of table 
in [[Special:Newsletters]] which shows newsletter frequency",
-   "newsletter-header-subscriber_count": "Label of the third column of 
table in [[Special:Newsletters]] which gives the subscriber count of 
corresponding newsletter",
+   "newsletter-header-subscriber_count": "Label of the subscriber count 
column of table in [[Special:Newsletters]] which gives the subscriber count of 
corresponding newsletter",
"newsletter-new-publisher-confirmation": "Confirmation message 
displayed after a new publisher is added for a newsletter through the 
[[Special:NewsletterManage]] page",
-   "newsletter-manage-header-name": "Label of the first column of table in 
[[Special:NewsletterManage]] which lists the names of 
newsletters\n{{Identical|Newsletter}}",
-   "newsletter-manage-header-publisher": "Label of the second column of 
table in [[Special:NewsletterManage]] which lists the names of all publishers 
of a newsletter\n{{Identical|Contributor}}",
-   "newsletter-manage-header-permissions": "Label of the third column of 
table in [[Special:NewsletterManage]] which lists the roles of a 
user\n{{Identical|Permission}}",
+   "newsletter-manage-header-name": "Label of the name column of table in 
[[Special:NewsletterManage]] which lists the names of 
newsletters\n{{Identical|Newsletter}}",
+   "newsletter-manage-header-publisher": "Label of the publisher names 
column of table in [[Special:NewsletterManage]] which lists the names of all 
publishers of a newsletter\n{{Identical|Contributor}}",
+   "newsletter-manage-header-permissions": "Label of the user roles column 
of table in [[Special:NewsletterManage]] which lists the roles of a 
user\n{{Identical|Permission}}",
"newsletter-manage-header-action": "{{Identical|Action}}",
"newsletter-owner-radiobutton-label": "Label of radio button in 
'Permissions' column in [[Special:NewsletterManage]] which is checked if the 
user is the owner of the newsletter\n{{Identical|Owner}}",
"newsletter-publisher-radiobutton-label": "Label of radio button in 
'Permissions' column in [[Special:NewsletterManage]] which is checked if the 
user is a publisher of the newsletter\n{{Identical|Publisher}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7d40f07133da5b3fe657f7682e6e3e0534a03ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Tarrow 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Include frequency on Newsletters - change (mediawiki...Newsletter)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Include frequency on Newsletters
..


Include frequency on Newsletters

Change-Id: I209dab087bbb01704b968cfe4f654dc1564b286e
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/pagers/NewsletterTablePager.php
3 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 2a52aa5..75f17ab 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,7 +1,8 @@
 {
"@metadata": {
"authors": [
-   "Tina Johnson"
+   "Tina Johnson",
+   "Thomas Arrow"
]
},
"newsletter-extension-desc": "Enables users to publish and subscribe to 
newsletters",
@@ -50,6 +51,7 @@
"newsletter-header-name": "Name of newsletter",
"newsletter-header-description": "Description",
"newsletter-header-action": "Subscribed?",
+   "newsletter-header-frequency": "Frequency",
"newsletter-header-subscriber_count": "Subscriber count",
"newsletter-new-publisher-confirmation": "A new publisher has just been 
added to your newsletter!",
"newsletter-manage-header-name": "Newsletter",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d05c9c0..59e421c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -51,6 +51,7 @@
"newsletter-header-name": "Label of the first column of table in 
[[Special:Newsletters]] which lists the names of newsletters",
"newsletter-header-description": "Label of the second column of table 
in [[Special:Newsletters]] which displays a description about the 
newsletter\n{{Identical|Description}}",
"newsletter-header-action": "Label of the fourth column of table in 
[[Special:Newsletters]] which provides radio buttons to subscribe/unsubscribe 
newsletters\n{{Identical|Subscribed}}",
+   "newsletter-header-frequency": "Label of the frequency column of table 
in [[Special:Newsletters]] which shows newsletter frequency",
"newsletter-header-subscriber_count": "Label of the third column of 
table in [[Special:Newsletters]] which gives the subscriber count of 
corresponding newsletter",
"newsletter-new-publisher-confirmation": "Confirmation message 
displayed after a new publisher is added for a newsletter through the 
[[Special:NewsletterManage]] page",
"newsletter-manage-header-name": "Label of the first column of table in 
[[Special:NewsletterManage]] which lists the names of 
newsletters\n{{Identical|Newsletter}}",
diff --git a/includes/specials/pagers/NewsletterTablePager.php 
b/includes/specials/pagers/NewsletterTablePager.php
index 47e4440..729c217 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -24,6 +24,7 @@
$this->fieldNames = array(
'nl_name' => $this->msg( 
'newsletter-header-name' )->text(),
'nl_desc' => $this->msg( 
'newsletter-header-description' )->text(),
+   'nl_frequency' => $this->msg ( 
'newsletter-header-frequency' )->text(),
'subscriber_count' => $this->msg( 
'newsletter-header-subscriber_count' )->text(),
'action' => $this->msg( 
'newsletter-header-action' )->text(),
);
@@ -40,6 +41,7 @@
'nl_name',
'nl_desc',
'nl_id',
+   'nl_frequency',
'subscribers' => ( '( SELECT COUNT(*) FROM 
nl_subscriptions WHERE nls_newsletter_id = nl_id )' ),
'current_user_subscribed' => "$userId IN 
(SELECT nls_subscriber_id FROM nl_subscriptions WHERE nls_newsletter_id = nl_id 
)" ,
),
@@ -71,6 +73,8 @@
return '' . $value . 
'';
case 'nl_desc':
return $value;
+   case 'nl_frequency':
+   return $value;
case 'subscriber_count':
return HTML::element(
'input',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I209dab087bbb01704b968cfe4f654dc1564b286e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Tarrow 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] toollabs: add python-psycopg2 - change (operations/puppet)

2015-09-15 Thread Merlijn van Deen (Code Review)

Merlijn van Deen has uploaded a new change for review.

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

Change subject: toollabs: add python-psycopg2
..

toollabs: add python-psycopg2

Change-Id: I55496139e4bd87b5d73e8b138618da9166f2799c
---
M modules/toollabs/manifests/genpp/python.py
M modules/toollabs/manifests/genpp/python_exec_jessie.pp
M modules/toollabs/manifests/genpp/python_exec_precise.pp
M modules/toollabs/manifests/genpp/python_exec_trusty.pp
M modules/toollabs/manifests/genpp/report-python.html
5 files changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/238450/1

diff --git a/modules/toollabs/manifests/genpp/python.py 
b/modules/toollabs/manifests/genpp/python.py
index a48b6e3..a93e2c1 100755
--- a/modules/toollabs/manifests/genpp/python.py
+++ b/modules/toollabs/manifests/genpp/python.py
@@ -43,6 +43,7 @@
 'opencv',
 'pil',  # T108210
 'problem-report',
+'psycopg2',
 'pycountry',# T86015
 'pydot',# T86015
 'pyexiv2',  # T61122.
diff --git a/modules/toollabs/manifests/genpp/python_exec_jessie.pp 
b/modules/toollabs/manifests/genpp/python_exec_jessie.pp
index 8993757..cae9ec1 100644
--- a/modules/toollabs/manifests/genpp/python_exec_jessie.pp
+++ b/modules/toollabs/manifests/genpp/python_exec_jessie.pp
@@ -79,6 +79,8 @@
 'python3-pil',  # 2.6.1
 # python-problem-report is not available
 # python3-problem-report is not available
+'python-psycopg2',  # 2.5.4
+'python3-psycopg2', # 2.5.4
 'python-pycountry', # 1.8
 'python3-pycountry',# 1.8
 'python-pydot', # 1.0.28
diff --git a/modules/toollabs/manifests/genpp/python_exec_precise.pp 
b/modules/toollabs/manifests/genpp/python_exec_precise.pp
index 2da4818..6c9cf9d 100644
--- a/modules/toollabs/manifests/genpp/python_exec_precise.pp
+++ b/modules/toollabs/manifests/genpp/python_exec_precise.pp
@@ -79,6 +79,8 @@
 # python3-pil is not available
 'python-problem-report', # 2.0.1
 # python3-problem-report is not available
+'python-psycopg2',  # 2.4.5
+'python3-psycopg2', # 2.4.5
 'python-pycountry', # 0.14.1
 # python3-pycountry is not available
 'python-pydot', # 1.0.2
diff --git a/modules/toollabs/manifests/genpp/python_exec_trusty.pp 
b/modules/toollabs/manifests/genpp/python_exec_trusty.pp
index e43370b..c496211 100644
--- a/modules/toollabs/manifests/genpp/python_exec_trusty.pp
+++ b/modules/toollabs/manifests/genpp/python_exec_trusty.pp
@@ -79,6 +79,8 @@
 'python3-pil',  # 2.3.0
 'python-problem-report', # 2.14.1
 'python3-problem-report', # 2.14.1
+'python-psycopg2',  # 2.4.5
+'python3-psycopg2', # 2.4.5
 'python-pycountry', # 0.14.1
 # python3-pycountry is not available
 'python-pydot', # 1.0.28
diff --git a/modules/toollabs/manifests/genpp/report-python.html 
b/modules/toollabs/manifests/genpp/report-python.html
index 7c32c57..20a56da 100644
--- a/modules/toollabs/manifests/genpp/report-python.html
+++ b/modules/toollabs/manifests/genpp/report-python.html
@@ -88,6 +88,8 @@
 python3-pil2.3.02.6.1
 python-problem-report2.0.12.14.1
 python3-problem-report2.14.1
+python-psycopg22.4.52.4.52.5.4
+python3-psycopg22.4.52.4.52.5.4
 python-pycountry0.14.10.14.11.8
 python3-pycountry1.8
 python-pydot1.0.21.0.281.0.28

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55496139e4bd87b5d73e8b138618da9166f2799c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen 

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

[MediaWiki-commits] [Gerrit] Prevent 'filename-toolong' errors during 'Upload' step - change (mediawiki...UploadWizard)

2015-09-15 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Prevent 'filename-toolong' errors during 'Upload' step
..

Prevent 'filename-toolong' errors during 'Upload' step

The filename used there is discarded later anyway. If the actual file name
is also too long, the user will get an error and be allowed to correct it
later.

Change-Id: Ifbfe728200e7a0eddc28596efecbeb72d0f5a8fa
---
M resources/transports/mw.FormDataTransport.js
1 file changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/resources/transports/mw.FormDataTransport.js 
b/resources/transports/mw.FormDataTransport.js
index 7abe3e3..0e8eb9f 100644
--- a/resources/transports/mw.FormDataTransport.js
+++ b/resources/transports/mw.FormDataTransport.js
@@ -130,7 +130,7 @@
 * @return {jQuery.Promise}
 */
FDTP.upload = function ( file ) {
-   var formData, deferred,
+   var formData, deferred, ext,
transport = this;
 
// use timestamp + filename to avoid conflicts on server
@@ -139,6 +139,11 @@
this.tempname = this.tempname.split('').map(function (c) {
return c.charCodeAt(0) > 128 ? '_' : c;
}).join('');
+   // Also limit length to 240 bytes (limit hardcoded in 
UploadBase.php).
+   if ( this.tempname.length > 240 ) {
+   ext = this.tempname.split( '.' ).pop();
+   this.tempname = this.tempname.substr( 0, 240 - 
ext.length - 1 ) + '.' + ext;
+   }
 
if ( this.config.enableChunked && file.size > this.chunkSize ) {
return this.uploadChunk( file, 0 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbfe728200e7a0eddc28596efecbeb72d0f5a8fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Always use 'OO' rather than 'oo' for OOjs and OOjs UI - change (mediawiki...UploadWizard)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Always use 'OO' rather than 'oo' for OOjs and OOjs UI
..


Always use 'OO' rather than 'oo' for OOjs and OOjs UI

For consistency and greppability.

Change-Id: I04d685f50472ad2d1ca1c4f68e5753a56b0f9620
---
M resources/controller/uw.controller.Deed.js
M resources/controller/uw.controller.Details.js
M resources/controller/uw.controller.Step.js
M resources/controller/uw.controller.Thanks.js
M resources/controller/uw.controller.Tutorial.js
M resources/controller/uw.controller.Upload.js
M resources/mw.FlickrChecker.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardDetails.js
M resources/mw.UploadWizardLicenseInput.js
M resources/mw.UploadWizardUpload.js
M resources/mw.UploadWizardUploadInterface.js
M resources/transports/mw.FormDataTransport.js
M resources/ui/uw.ui.Deed.js
M resources/ui/uw.ui.Details.js
M resources/ui/uw.ui.Step.js
M resources/ui/uw.ui.Thanks.js
M resources/ui/uw.ui.Tutorial.js
M resources/ui/uw.ui.Upload.js
M resources/ui/uw.ui.Wizard.js
20 files changed, 62 insertions(+), 62 deletions(-)

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



diff --git a/resources/controller/uw.controller.Deed.js 
b/resources/controller/uw.controller.Deed.js
index 38915b1..c40abf1 100644
--- a/resources/controller/uw.controller.Deed.js
+++ b/resources/controller/uw.controller.Deed.js
@@ -15,7 +15,7 @@
  * along with UploadWizard.  If not, see .
  */
 
-( function ( mw, uw, $, oo ) {
+( function ( mw, uw, $, OO ) {
var DP;
 
/**
@@ -35,7 +35,7 @@
this.stepName = 'deeds';
}
 
-   oo.inheritClass( Deed, uw.controller.Step );
+   OO.inheritClass( Deed, uw.controller.Step );
 
DP = Deed.prototype;
 
diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index 480dfa8..b5f1ced 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -15,7 +15,7 @@
  * along with UploadWizard.  If not, see .
  */
 
-( function ( uw, $, oo ) {
+( function ( uw, $, OO ) {
var DP;
 
/**
@@ -39,7 +39,7 @@
this.finishState = 'complete';
}
 
-   oo.inheritClass( Details, uw.controller.Step );
+   OO.inheritClass( Details, uw.controller.Step );
 
DP = Details.prototype;
 
diff --git a/resources/controller/uw.controller.Step.js 
b/resources/controller/uw.controller.Step.js
index 4b718cd..e50831f 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -15,13 +15,13 @@
  * along with UploadWizard.  If not, see .
  */
 
-( function ( uw, oo, $ ) {
+( function ( uw, OO, $ ) {
var SP;
 
/**
 * Represents a step in the wizard.
 * @class mw.uw.controller.Step
-* @mixins oo.EventEmitter
+* @mixins OO.EventEmitter
 * @abstract
 * @constructor
 * @param {mw.uw.ui.Step} ui The UI object that controls this step.
@@ -30,7 +30,7 @@
function Step( ui, config ) {
var step = this;
 
-   oo.EventEmitter.call( this );
+   OO.EventEmitter.call( this );
 
/**
 * @property {Object} config
@@ -55,7 +55,7 @@
this.nextStep = null;
}
 
-   oo.mixinClass( Step, oo.EventEmitter );
+   OO.mixinClass( Step, OO.EventEmitter );
 
SP = Step.prototype;
 
diff --git a/resources/controller/uw.controller.Thanks.js 
b/resources/controller/uw.controller.Thanks.js
index cf32192..b2d81a6 100644
--- a/resources/controller/uw.controller.Thanks.js
+++ b/resources/controller/uw.controller.Thanks.js
@@ -15,7 +15,7 @@
  * along with UploadWizard.  If not, see .
  */
 
-( function ( uw, $, oo ) {
+( function ( uw, $, OO ) {
var TP;
 
/**
@@ -35,7 +35,7 @@
this.stepName = 'thanks';
}
 
-   oo.inheritClass( Thanks, uw.controller.Step );
+   OO.inheritClass( Thanks, uw.controller.Step );
 
TP = Thanks.prototype;
 
diff --git a/resources/controller/uw.controller.Tutorial.js 
b/resources/controller/uw.controller.Tutorial.js
index 913ebb4..69b642c 100644
--- a/resources/controller/uw.controller.Tutorial.js
+++ b/resources/controller/uw.controller.Tutorial.js
@@ -15,7 +15,7 @@
  * along with UploadWizard.  If not, see .
  */
 
-( function ( mw, uw, $, oo ) {
+( function ( mw, uw, $, OO ) {
var TP;
 
function Tutorial( api ) {
@@ -43,7 +43,7 @@
this.stepName = 'tutorial';
}
 
-   oo.inheritClass( Tutorial, uw.controller.Step );
+   OO.inheritClass( Tut

[MediaWiki-commits] [Gerrit] [FIX] tests: Check the HTTPS connection - change (pywikibot/core)

2015-09-15 Thread XZise (Code Review)

XZise has uploaded a new change for review.

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

Change subject: [FIX] tests: Check the HTTPS connection
..

[FIX] tests: Check the HTTPS connection

The certificates for `wdq.wmflabs.org` and `wikistats.wmflabs.org` have expired
and although the hostname is checked before the test, it only checks the HTTP
connection which is still fine and thus it won't skip it. This changes the
tested hostnames to the actual hostnames tested.

Change-Id: I96b9af0d8428145e084249cb6f0d6c4756b94a93
---
M tests/wikidataquery_tests.py
M tests/wikistats_tests.py
2 files changed, 2 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/57/238457/1

diff --git a/tests/wikidataquery_tests.py b/tests/wikidataquery_tests.py
index 81ed4f9..0eba38d 100644
--- a/tests/wikidataquery_tests.py
+++ b/tests/wikidataquery_tests.py
@@ -231,11 +231,7 @@
 
 """Test slow WikiDataQuery API functions."""
 
-sites = {
-'wdq': {
-'hostname': 'wdq.wmflabs.org',
-},
-}
+hostname = 'https://wdq.wmflabs.org'
 
 def testQueryApiGetter(self):
 """Test that we can actually retreive data and that caching works."""
diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py
index 6f2dff3..1a6f222 100644
--- a/tests/wikistats_tests.py
+++ b/tests/wikistats_tests.py
@@ -24,11 +24,7 @@
 
 """Test WikiStats dump."""
 
-sites = {
-'wikistats': {
-'hostname': 'wikistats.wmflabs.org',
-},
-}
+hostname = 'https://wikistats.wmflabs.org'
 
 def test_sort(self):
 """Test sorted results."""

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

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

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

[MediaWiki-commits] [Gerrit] Depool db1055 for maintenance - change (operations/mediawiki-config)

2015-09-15 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review.

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

Change subject: Depool db1055 for maintenance
..

Depool db1055 for maintenance

Bug: T112478
Change-Id: I222e6263e5e87b9d5b6f6feeefbc83f5be1d05bb
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index bd03d13..6138053 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -92,8 +92,8 @@
 'sectionLoads' => array(
's1' => array(
'db1052' => 0,   # 2.8TB  96GB
-   'db1051' => 0,   # 2.8TB  96GB, vslow, dump
-   'db1055' => 0,   # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   'db1051' => 0,   # 2.8TB  96GB, vslow, dump (temp. wl, rc, 
cont, log)
+#  'db1055' => 0,   # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1053' => 200, # 2.8TB  96GB
'db1057' => 200, # 2.8TB  96GB
'db1065' => 100, # 2.8TB 160GB, api
@@ -171,19 +171,19 @@
 'groupLoadsBySection' => array(
's1' => array(
'watchlist' => array(
-   'db1055' => 1,
+   'db1051' => 1,
),
'recentchanges' => array(
-   'db1055' => 1,
+   'db1051' => 1,
),
'recentchangeslinked' => array(
-   'db1055' => 1,
+   'db1051' => 1,
),
'contributions' => array(
-   'db1055' => 1,
+   'db1051' => 1,
),
'logpager' => array(
-   'db1055' => 1,
+   'db1051' => 1,
),
'dump' => array(
'db1051' => 1,

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

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

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

[MediaWiki-commits] [Gerrit] SpecialItemByTitle: also remove 'site' and 'page' from the q... - change (mediawiki...Wikibase)

2015-09-15 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: SpecialItemByTitle: also remove 'site' and 'page' from the 
querystring
..

SpecialItemByTitle: also remove 'site' and 'page' from the querystring

When using the form, one gets redirected to URLs like:
https://www.wikidata.org/w/index.php?title=Q42&site=enwiki&page=Douglas+Adams

Missed when reviewing commit 5fbe4079a2f5634de543c239c958c2b9b709ab09

Change-Id: I82f925ef8e9ef1bcf233207522aac5ff59e6156e
---
M repo/includes/specials/SpecialItemByTitle.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/specials/SpecialItemByTitle.php 
b/repo/includes/specials/SpecialItemByTitle.php
index bae340a..5267cad 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -149,6 +149,8 @@
$title = $this->titleLookup->getTitleForId( 
$itemId );
$query = $request->getValues();
unset( $query['title'] );
+   unset( $query['site'] );
+   unset( $query['page'] );
$itemUrl = $title->getFullUrl( $query );
$this->getOutput()->redirect( $itemUrl );
return;

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

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

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

[MediaWiki-commits] [Gerrit] Include frequency on Newsletters - change (mediawiki...Newsletter)

2015-09-15 Thread Tarrow (Code Review)

Tarrow has uploaded a new change for review.

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

Change subject: Include frequency on Newsletters
..

Include frequency on Newsletters

Change-Id: I209dab087bbb01704b968cfe4f654dc1564b286e
---
M i18n/en.json
M includes/specials/pagers/NewsletterTablePager.php
2 files changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 2a52aa5..75f17ab 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,7 +1,8 @@
 {
"@metadata": {
"authors": [
-   "Tina Johnson"
+   "Tina Johnson",
+   "Thomas Arrow"
]
},
"newsletter-extension-desc": "Enables users to publish and subscribe to 
newsletters",
@@ -50,6 +51,7 @@
"newsletter-header-name": "Name of newsletter",
"newsletter-header-description": "Description",
"newsletter-header-action": "Subscribed?",
+   "newsletter-header-frequency": "Frequency",
"newsletter-header-subscriber_count": "Subscriber count",
"newsletter-new-publisher-confirmation": "A new publisher has just been 
added to your newsletter!",
"newsletter-manage-header-name": "Newsletter",
diff --git a/includes/specials/pagers/NewsletterTablePager.php 
b/includes/specials/pagers/NewsletterTablePager.php
index 47e4440..729c217 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -24,6 +24,7 @@
$this->fieldNames = array(
'nl_name' => $this->msg( 
'newsletter-header-name' )->text(),
'nl_desc' => $this->msg( 
'newsletter-header-description' )->text(),
+   'nl_frequency' => $this->msg ( 
'newsletter-header-frequency' )->text(),
'subscriber_count' => $this->msg( 
'newsletter-header-subscriber_count' )->text(),
'action' => $this->msg( 
'newsletter-header-action' )->text(),
);
@@ -40,6 +41,7 @@
'nl_name',
'nl_desc',
'nl_id',
+   'nl_frequency',
'subscribers' => ( '( SELECT COUNT(*) FROM 
nl_subscriptions WHERE nls_newsletter_id = nl_id )' ),
'current_user_subscribed' => "$userId IN 
(SELECT nls_subscriber_id FROM nl_subscriptions WHERE nls_newsletter_id = nl_id 
)" ,
),
@@ -71,6 +73,8 @@
return '' . $value . 
'';
case 'nl_desc':
return $value;
+   case 'nl_frequency':
+   return $value;
case 'subscriber_count':
return HTML::element(
'input',

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

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

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

[MediaWiki-commits] [Gerrit] Remove all unused use clauses - change (mediawiki...Wikibase)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Remove all unused use clauses
..


Remove all unused use clauses

I used a regex to find these. Here it is for reference:
(?s)\buse\s+(?:\w+\\)*(\b\w+\b)\s*;(?!.*\b\1\b)
Run this in case-sensitive mode and you will also find
cases where a class name is written in different
capitalization.

Change-Id: I8501188771a9bac8ab0b35391848923fb8a5a381
---
M lib/tests/phpunit/formatters/VocabularyUriFormatterTest.php
M repo/includes/Diff/EntityContentDiffView.php
2 files changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/lib/tests/phpunit/formatters/VocabularyUriFormatterTest.php 
b/lib/tests/phpunit/formatters/VocabularyUriFormatterTest.php
index 96a8bba..900c5b2 100644
--- a/lib/tests/phpunit/formatters/VocabularyUriFormatterTest.php
+++ b/lib/tests/phpunit/formatters/VocabularyUriFormatterTest.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Lib\Test;
 
-use OutOfBoundsException;
 use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\EntityId;
diff --git a/repo/includes/Diff/EntityContentDiffView.php 
b/repo/includes/Diff/EntityContentDiffView.php
index a42bffb..de96ad3 100644
--- a/repo/includes/Diff/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -19,7 +19,6 @@
 use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
 use Wikibase\DataModel\Services\Lookup\EntityRetrievingTermLookup;
 use Wikibase\EntityContent;
-use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
 use Wikibase\Repo\WikibaseRepo;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8501188771a9bac8ab0b35391848923fb8a5a381
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Hoo man 
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 released version of mw-ocg-bundler. - change (mediawiki...text_renderer)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Use released version of mw-ocg-bundler.
..


Use released version of mw-ocg-bundler.

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

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



diff --git a/package.json b/package.json
index 9115d57..11dcea8 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
 "tmp": "~0.0.24"
   },
   "optionalDependencies": {
-  "mw-ocg-bundler": 
"wikimedia/mediawiki-extensions-Collection-OfflineContentGenerator-bundler#master"
+  "mw-ocg-bundler": "~0.3.0"
   },
   "devDependencies": {
 "jshint": "~2.6.3",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4e9d4737d6ebe8f74c71d9f99e53c546349e655
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/text_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] resourceloader: Jobs created in request() should wait for ex... - change (mediawiki/core)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: resourceloader: Jobs created in request() should wait for 
executing modules
..


resourceloader: Jobs created in request() should wait for executing modules

Fix a regression from 6e903b94f2. It failed to update this code to account for
the new "executing" state.

This code was sometimes causing the job dependencies to be an empty array
when the module in question is currently being executed. As such the job
wasn't blocked by anything and happily run the next time a random module
invoked handlePending to run any jobs that have been satisfied.

Scenario:

* in-page RLQ: Page loads a module X that contains scripts and styles.
  - state=loading
* Module X is found in storage and implemented.
  - state=executing
* execute() adds styles to css buffer (which is asynchronous).
  It provides a callback from which it would run the module's script, set
  to "ready", and trigger handlePending().
* in-page RLQ: The edit page uses 'mw.loader.using' to require module X
  and has a callback that uses the module.
* using() sees X is not already "ready", so it calls request() for X.
* request() creates a job for "X". It then wrongly filters out X from the list
  of modules to wait for. The filter is intended to remove modules that are
  complete (e.g. "ready", "error", or "missing"). After 6e903b94f2, it also
  removed anything with state "executing". This resulted in a job with
  an empty dependency list (nothing to wait for).
* The callstack is finished. At some point the css buffer will call back.
  Some other module requested before X enters state "ready" and triggers
  handlePending(). It finds an left-over empty job with no dependencies
  and runs it. "It" being the callback of X – eventhough X isn't ready.

The added test fails without the change in mediawiki.js.

Bug: T112232
Change-Id: I3cc0c282e68a37b9b3256b213508362734161655
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.test.js
2 files changed, 27 insertions(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index c6e41c4..eb21c57 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1390,9 +1390,10 @@
// Add ready and error callbacks if they were 
given
if ( ready !== undefined || error !== undefined 
) {
jobs.push( {
+   // Narrow down the list to 
modules that are worth waiting for
dependencies: $.grep( 
dependencies, function ( module ) {
var state = 
mw.loader.getState( module );
-   return state === 
'registered' || state === 'loaded' || state === 'loading';
+   return state === 
'registered' || state === 'loaded' || state === 'loading' || state === 
'executing';
} ),
ready: ready,
error: error
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 86c2eb8..b55b1e7 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -925,6 +925,31 @@
mw.loader.load( target );
} );
 
+   QUnit.asyncTest( 'mw.loader() executing race (T112232)', 2, function ( 
assert ) {
+   var done = false;
+
+   // The red herring schedules its CSS buffer first. In T112232, 
a bug in the
+   // state machine would cause the job for testRaceLoadMe to run 
with an earlier job.
+   mw.loader.implement(
+   'testRaceRedHerring',
+   function () {},
+   { css: [ '.mw-testRaceRedHerring {}' ] }
+   );
+   mw.loader.implement(
+   'testRaceLoadMe',
+   function () {
+   done = true;
+   },
+   { css: [ '.mw-testRaceLoadMe { float: left; }' ] }
+   );
+
+   mw.loader.load( [ 'testRaceRedHerring', 'testRaceLoadMe' ] );
+   mw.loader.using( 'testRaceLoadMe', function () {
+   assert.strictEqual( done, true, 'script ran' );
+   assert.strictEqual( mw.loader.getState( 
'testRaceLoadMe' ), 'ready', 'state' );
+   } ).always( QUnit.start );
+

[MediaWiki-commits] [Gerrit] Remove non-existent files/directories from .jshintignore - change (mediawiki...UploadWizard)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Remove non-existent files/directories from .jshintignore
..


Remove non-existent files/directories from .jshintignore

Change-Id: I756984e088d63a286f1c660032521e0d5af67e80
---
M .jshintignore
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/.jshintignore b/.jshintignore
index fa83a6c..2db0793 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,3 +1 @@
 resources/jquery
-resources/mw.Log.js
-test/jasmine

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

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

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

[MediaWiki-commits] [Gerrit] Use XmlSelect in SpecialEditTags - change (mediawiki/core)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Use XmlSelect in SpecialEditTags
..


Use XmlSelect in SpecialEditTags

Bug: T93234
Change-Id: I758691f230cff04540b358e9881fe2bfac2d1b9e
---
M includes/specials/SpecialEditTags.php
1 file changed, 8 insertions(+), 10 deletions(-)

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



diff --git a/includes/specials/SpecialEditTags.php 
b/includes/specials/SpecialEditTags.php
index f41a1f1..54f50d9 100644
--- a/includes/specials/SpecialEditTags.php
+++ b/includes/specials/SpecialEditTags.php
@@ -349,20 +349,18 @@
protected function getTagSelect( $selectedTags, $label ) {
$result = array();
$result[0] = Xml::label( $label, 'mw-edittags-tag-list' );
-   $result[1] = Xml::openElement( 'select', array(
-   'name' => 'wpTagList[]',
-   'id' => 'mw-edittags-tag-list',
-   'multiple' => 'multiple',
-   'size' => '8',
-   ) );
+
+   $select = new XmlSelect( 'wpTagList[]', 'mw-edittags-tag-list', 
$selectedTags );
+   $select->setAttribute( 'multiple', 'multiple' );
+   $select->setAttribute( 'size', '8' );
 
$tags = ChangeTags::listExplicitlyDefinedTags();
$tags = array_unique( array_merge( $tags, $selectedTags ) );
-   foreach ( $tags as $tag ) {
-   $result[1] .= Xml::option( $tag, $tag, in_array( $tag, 
$selectedTags ) );
-   }
 
-   $result[1] .= Xml::closeElement( 'select' );
+   // Values of $tags are also used as  labels
+   $select->addOptions( array_combine( $tags, $tags ) );
+
+   $result[1] = $select->getHTML();
return $result;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Exclude DNS requests from connection tracking - change (operations/puppet)

2015-09-15 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Exclude DNS requests from connection tracking
..

Exclude DNS requests from connection tracking

On the two mediawiki servers which have ferm enabled in eqiad, DNS requests
make up a significant part of the tracked connections: In my sample taken,
10k out of 47k connections on the API server and 8k out of 15k on the
application server.

Bug: T104968
Change-Id: I12e01490255a639a4668a631cb317cbd55c65751
---
M manifests/role/mediawiki.pp
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 65ad59a..d2ff846 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -39,6 +39,13 @@
 desc   => 'Allow incoming SSH for pybal health checks',
 }
 
+ferm::rule { 'skip_dns_conntrack_out':
+desc  => 'Skip outgoing connection tracking for DNS requests',
+table => 'raw',
+chain => 'OUTPUT',
+rule  => 'proto udp sport 53 NOTRACK;',
+}
+
 if $::site == 'eqiad' {
 monitoring::service { 'mediawiki-installation DSH group':
 description   => 'mediawiki-installation DSH group',

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

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

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

[MediaWiki-commits] [Gerrit] TTMServer: enable wikimedia extra plugin - change (operations/mediawiki-config)

2015-09-15 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: TTMServer: enable wikimedia extra plugin
..

TTMServer: enable wikimedia extra plugin

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 972172b..f281b99 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2201,6 +2201,7 @@
'cutoff' => 0.65,
'config' => array(
'servers' => $servers,
+   'use_wikimedia_extra' => true
),
);
}

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

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

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

[MediaWiki-commits] [Gerrit] Import of legoktm/tools-ci - change (integration/config)

2015-09-15 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Import of legoktm/tools-ci
..

Import of legoktm/tools-ci

Done with:

git remote add legoktm  https://github.com/legoktm/tools-ci
git fetch legoktm
git merge -s -ours --no-commit legoktm/master
git read-tree --prefix=dashboard/ -u legoktm/master
git commit

Bug: T111758
Change-Id: I780fc3f4316337e089636b8536517d2c9bef7418
---
M .gitignore
M LICENSE
A dashboard/.gitignore
A dashboard/LICENSE
R dashboard/add_banana_checker.py
R dashboard/build_table.py
R dashboard/lib.py
R dashboard/requirements.txt
A dashboard/tox.ini
R dashboard/update_composer_deps.py
R dashboard/update_npm_deps.py
R dashboard/zuul_output_reader.py
M tox.ini
13 files changed, 27 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/45/238445/1

diff --git a/.gitignore b/.gitignore
index 77119ff..ef6f216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<< HEAD   (5e0e2d python3 tests passes in pywikibot/wikibase, mark them 
voting)
 *.pyc
 /.tox
 # Ignore any dotfile ...
@@ -11,8 +10,3 @@
 *~
 *.kate-swp
 .*.swp
-===
-.*.swp
-/.tox
-*.pyc
->>> BRANCH (44fccf Merge pull request #4 from hashar/avoid-os_chdir)
diff --git a/LICENSE b/LICENSE
index 6788296..d7f1051 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-<<< HEAD   (5e0e2d python3 tests passes in pywikibot/wikibase, mark them 
voting)
 GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
 
@@ -338,8 +337,3 @@
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
-===
-All scripts are released under the CC0 license.
-
-See  for more details.
->>> BRANCH (44fccf Merge pull request #4 from hashar/avoid-os_chdir)
diff --git a/dashboard/.gitignore b/dashboard/.gitignore
new file mode 100644
index 000..df4f791
--- /dev/null
+++ b/dashboard/.gitignore
@@ -0,0 +1,3 @@
+.*.swp
+/.tox
+*.pyc
diff --git a/dashboard/LICENSE b/dashboard/LICENSE
new file mode 100644
index 000..828afca
--- /dev/null
+++ b/dashboard/LICENSE
@@ -0,0 +1,3 @@
+All scripts are released under the CC0 license.
+
+See  for more details.
diff --git a/add_banana_checker.py b/dashboard/add_banana_checker.py
similarity index 100%
rename from add_banana_checker.py
rename to dashboard/add_banana_checker.py
diff --git a/build_table.py b/dashboard/build_table.py
similarity index 100%
rename from build_table.py
rename to dashboard/build_table.py
diff --git a/lib.py b/dashboard/lib.py
similarity index 100%
rename from lib.py
rename to dashboard/lib.py
diff --git a/requirements.txt b/dashboard/requirements.txt
similarity index 100%
rename from requirements.txt
rename to dashboard/requirements.txt
diff --git a/dashboard/tox.ini b/dashboard/tox.ini
new file mode 100644
index 000..9587f01
--- /dev/null
+++ b/dashboard/tox.ini
@@ -0,0 +1,21 @@
+[tox]
+# Ensure 1.6+ is used to support 'skipsdist'
+minversion = 1.6
+skipsdist = True
+envlist = flake8
+
+[testenv]
+deps = -r{toxinidir}/requirements.txt
+
+[testenv:venv]
+commands = {posargs}
+basepython = python3.4
+
+[testenv:flake8]
+commands = flake8
+basepython = python3.4
+deps = flake8
+
+[flake8]
+; E265 block comment should start with '# '
+ignore = E265
diff --git a/update_composer_deps.py b/dashboard/update_composer_deps.py
similarity index 100%
rename from update_composer_deps.py
rename to dashboard/update_composer_deps.py
diff --git a/update_npm_deps.py b/dashboard/update_npm_deps.py
similarity index 100%
rename from update_npm_deps.py
rename to dashboard/update_npm_deps.py
diff --git a/zuul_output_reader.py b/dashboard/zuul_output_reader.py
similarity index 100%
rename from zuul_output_reader.py
rename to dashboard/zuul_output_reader.py
diff --git a/tox.ini b/tox.ini
index 9a4b33f..7e70798 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,6 @@
 # Ensure 1.6+ is used to support 'skipsdist'
 minversion = 1.6
 skipsdist = True
-<<< HEAD   (5e0e2d python3 tests passes in pywikibot/wikibase, mark them 
voting)
 envlist = flake8,py27
 
 [testenv]
@@ -16,22 +15,3 @@
 [testenv:dib]
 commands = {toxinidir}/dib/tests.sh
 deps = -rdib/requirements.txt
-===
-envlist = flake8
-
-[testenv]
-deps = -r{toxinidir}/requirements.txt
-
-[testenv:venv]
-commands = {posargs}
-basepython = python3.4
-
-[testenv:flake8]
-commands = flake8
-basepython = python3.4
-deps = flake8
-
-[flake8]
-; E265 block comment should start with '# '
-ignore = E265
->>> BRANCH (44fccf Merge pull request #4 from hashar/avoid-os_chdir)

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

Gerrit-MessageType: newchange
Gerrit-

[MediaWiki-commits] [Gerrit] Enable multiple default values for XmlSelect - change (mediawiki/core)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Enable multiple default values for XmlSelect
..


Enable multiple default values for XmlSelect

Useful for when a  tag with the 'multiple' attribute is
needed.

Bug: T93234
Change-Id: Ib83aed3392cf15cce4637fac56979a0f6b3d6b2f
---
M includes/XmlSelect.php
1 file changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/includes/XmlSelect.php b/includes/XmlSelect.php
index e765eed..78f4764 100644
--- a/includes/XmlSelect.php
+++ b/includes/XmlSelect.php
@@ -43,7 +43,7 @@
}
 
/**
-* @param string $default
+* @param string|array $default
 */
public function setDefault( $default ) {
$this->default = $default;
@@ -95,7 +95,7 @@
 * label => ( label => value, label => value )
 *
 * @param array $options
-* @param string $default
+* @param string|array $default
 * @return string
 */
static function formatOptions( $options, $default = false ) {
@@ -106,7 +106,11 @@
$contents = self::formatOptions( $value, 
$default );
$data .= Html::rawElement( 'optgroup', array( 
'label' => $label ), $contents ) . "\n";
} else {
-   $data .= Xml::option( $label, $value, $value 
=== $default ) . "\n";
+   // If $default is an array, then the  
probably has the multiple attribute,
+   // so we should check if each $value is in 
$default, rather than checking if
+   // $value is equal to $default.
+   $selected = is_array( $default ) ? in_array( 
$value, $default ) : $value === $default;
+   $data .= Xml::option( $label, $value, $selected 
) . "\n";
}
}
 

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

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

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

[MediaWiki-commits] [Gerrit] modified the parser test - change (mediawiki/core)

2015-09-15 Thread D3r1ck01 (Code Review)

D3r1ck01 has uploaded a new change for review.

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

Change subject: modified the parser test
..

modified the parser test

Change-Id: I8160d877ac7a02221e0b25b6e8f3252f878a0495
---
M includes/parser/ParserDiffTest.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/parser/ParserDiffTest.php 
b/includes/parser/ParserDiffTest.php
index 1a63a0b..1539d45 100644
--- a/includes/parser/ParserDiffTest.php
+++ b/includes/parser/ParserDiffTest.php
@@ -87,9 +87,9 @@
foreach ( $this->parsers as $i => $parser ) {
$resultsList[] = var_export( 
$results[$i], true );
}
-   $diff = new Diff( explode( "\n", 
$resultsList[0] ), explode( "\n", $resultsList[1] ) );
+   $diffs = new Diff( explode( "\n", 
$resultsList[0] ), explode( "\n", $resultsList[1] ) );
$format = new UnifiedDiffFormatter();
-   $format->format( $format );
+   $format->format( $diffs );
} else {
$diff = '[too many parsers]';
}

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

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

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

[MediaWiki-commits] [Gerrit] toolschecker: Fix up db tests a bit. - change (operations/puppet)

2015-09-15 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: toolschecker: Fix up db tests a bit.
..


toolschecker: Fix up db tests a bit.

Change-Id: I337a9a7ed4a61233126f4a74301f1d1f6680c874
---
M modules/toollabs/files/toolschecker.py
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 27ef679..3ba9564 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -119,22 +119,22 @@
 
 
 @check('/labsdb/labsdb1002')
-def labsdb_check_labsdb1001():
+def labsdb_check_labsdb1002():
 return db_query_check('labsdb1002.eqiad.wmnet')
 
 
 @check('/labsdb/labsdb1003')
-def labsdb_check_labsdb1001():
+def labsdb_check_labsdb1003():
 return db_query_check('labsdb1003.eqiad.wmnet')
 
 
 @check('/labsdb/labsdb1004')
-def labsdb_check_labsdb1001():
+def labsdb_check_labsdb1004():
 return db_query_check('labsdb1004.eqiad.wmnet')
 
 
 @check('/labsdb/labsdb1005')
-def labsdb_check_labsdb1001():
+def labsdb_check_labsdb1005():
 return db_query_check('labsdb1005.eqiad.wmnet')
 
 

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

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

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

[MediaWiki-commits] [Gerrit] toolschecker: Fix up db tests a bit. - change (operations/puppet)

2015-09-15 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: toolschecker: Fix up db tests a bit.
..

toolschecker: Fix up db tests a bit.

Change-Id: I337a9a7ed4a61233126f4a74301f1d1f6680c874
---
M modules/toollabs/files/toolschecker.py
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 27ef679..3ba9564 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -119,22 +119,22 @@
 
 
 @check('/labsdb/labsdb1002')
-def labsdb_check_labsdb1001():
+def labsdb_check_labsdb1002():
 return db_query_check('labsdb1002.eqiad.wmnet')
 
 
 @check('/labsdb/labsdb1003')
-def labsdb_check_labsdb1001():
+def labsdb_check_labsdb1003():
 return db_query_check('labsdb1003.eqiad.wmnet')
 
 
 @check('/labsdb/labsdb1004')
-def labsdb_check_labsdb1001():
+def labsdb_check_labsdb1004():
 return db_query_check('labsdb1004.eqiad.wmnet')
 
 
 @check('/labsdb/labsdb1005')
-def labsdb_check_labsdb1001():
+def labsdb_check_labsdb1005():
 return db_query_check('labsdb1005.eqiad.wmnet')
 
 

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

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

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

[MediaWiki-commits] [Gerrit] contint: remove subversion::client - change (operations/puppet)

2015-09-15 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: remove subversion::client
..

contint: remove subversion::client

There is no more any Jenkins job relying on subversion. We have moved
everything to git a long time ago.

Remove the include.
Will do the cleanup manually on labs slaves and gallium.

Change-Id: Ieb1373807dc8bc3b3ac3b31fb275543d7a118e8a
---
M modules/contint/manifests/packages.pp
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/238442/1

diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index c866278..85f2a92 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -25,8 +25,6 @@
 ensure => present,
 }
 
-include subversion::client
-
 # PHP related packages
 package { [
 'php5-dev',  # phpize

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

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

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

[MediaWiki-commits] [Gerrit] Made attemptAddUser() better handle central DB downtime - change (mediawiki...CentralAuth)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Made attemptAddUser() better handle central DB downtime
..


Made attemptAddUser() better handle central DB downtime

* Check that the DB can be connected to first. Once 
  slaves are used more, this check will make a difference.
* If connections work but writes fail, then backoff so the
  error does not keep happening on the next page views.

Change-Id: I05c93ffdd417a1e7ec10040252c9a7742fa25e18
---
M includes/CentralAuthHooks.php
1 file changed, 32 insertions(+), 17 deletions(-)

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



diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index 18d256b..fbb1078 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -1121,7 +1121,7 @@
 * @return bool Success
 */
static function attemptAddUser( $user ) {
-   global $wgAuth, $wgCentralAuthCreateOnView;
+   global $wgAuth, $wgCentralAuthCreateOnView, $wgMemc;
 
$userName = $user->getName();
// Denied by configuration?
@@ -1181,6 +1181,7 @@
CentralAuthUser::setSession( $session );
return false;
}
+
// Make sure the name has not been changed
if ( $user->getName() !== $userName ) {
throw new Exception( "AbortAutoAccount hook tried to 
change the user name" );
@@ -1189,25 +1190,39 @@
// Ignore warnings about master connections/writes...hard to 
avoid here

Profiler::instance()->getTransactionProfiler()->resetExpectations();
 
-   // Checks passed, create the user
-   $from = isset( $_SERVER['REQUEST_URI'] ) ? 
$_SERVER['REQUEST_URI'] : 'CLI';
-   wfDebugLog( 'CentralAuth-Bug39996', __METHOD__ . ": creating 
new user ($userName) - from: $from\n" );
-   try {
-   $status = $user->addToDatabase();
-   } catch ( Exception $e ) {
-   wfDebugLog( 'CentralAuth-Bug39996', __METHOD__ . " 
User::addToDatabase for \"$userName\" threw an exception:"
-   . " {$e->getMessage()}" );
-   throw $e;
-   }
-
-   if ( $status === null ) {
-   // MW before 1.21 -- ok, continue
-   } elseif ( !$status->isOK() ) {
-   wfDebugLog( 'CentralAuth-Bug39996', __METHOD__.": 
failed with message " . $status->getWikiText() . "\n" );
+   $backoffKey = wfMemcKey( 'CentralAuth', 'autocreate-failed', 
md5( $userName ) );
+   if ( $wgMemc->get( $backoffKey ) ) {
+   wfDebug( __METHOD__ . ": denied by prior creation 
attempt failures" );
return false;
}
 
-   $wgAuth->initUser( $user, true );
+   // Checks passed, create the user...
+   $from = isset( $_SERVER['REQUEST_URI'] ) ? 
$_SERVER['REQUEST_URI'] : 'CLI';
+   wfDebugLog( 'CentralAuth-Bug39996', __METHOD__ .
+   ": creating new user ($userName) - from: $from\n" );
+   try {
+   // Make sure the central DB master is availabe
+   CentralAuthUser::getCentralDB();
+   // Insert the user into the local DB master
+   $status = $user->addToDatabase();
+   if ( $status === null ) {
+   // MW before 1.21 -- ok, continue
+   } elseif ( !$status->isOK() ) {
+   wfDebugLog( 'CentralAuth-Bug39996', __METHOD__ .
+   ": failed with message " . 
$status->getWikiText() . "\n" );
+   return false;
+   }
+   // Attach the user to the central user and update prefs
+   $wgAuth->initUser( $user, true );
+   } catch ( Exception $e ) {
+   wfDebugLog( 'CentralAuth-Bug39996', __METHOD__ .
+   " User::addToDatabase for \"$userName\" threw 
an exception:"
+   . " {$e->getMessage()}" );
+   // Do not keep throwing errors for a while
+   $wgMemc->set( $backoffKey, 1, 60 * 10 );
+   // Bubble up error; which should normally trigger DB 
rollbacks
+   throw $e;
+   }
 
# Notify hooks (e.g. Newuserlog)
Hooks::run( 'AuthPluginAutoCreate', array( $user ) );

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

Gerrit-MessageType: merged
Gerrit-Chang

[MediaWiki-commits] [Gerrit] WelcomeDialog: Fix vertical spacing - change (mediawiki...VisualEditor)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: WelcomeDialog: Fix vertical spacing
..


WelcomeDialog: Fix vertical spacing

Change-Id: I10667512dff829195af43ea47d51d662836512bf
---
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWWelcomeDialog.css
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWWelcomeDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWWelcomeDialog.css
index 373b132..65bde5f 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWWelcomeDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWWelcomeDialog.css
@@ -5,6 +5,8 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 .visualeditor-welcomedialog-content {
-   background: url(images/welcomeSplash.png) 50%/35% no-repeat;
+   margin-top: 1em;
+   background: url(images/welcomeSplash.png) 50% 100% no-repeat;
+   background-size: 35%;
height: 200px;
 }

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 830718c..90961a2 - change (mediawiki/extensions)

2015-09-15 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 830718c..90961a2
..


Syncronize VisualEditor: 830718c..90961a2

Change-Id: I6c9885e892204c7e0b2e9824fc24fb22ead3708d
---
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 830718c..90961a2 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 830718ce22440263db1c069ad9c54c444de615ad
+Subproject commit 90961a22d2e913f86b6743c79b49367144fb0576

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c9885e892204c7e0b2e9824fc24fb22ead3708d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 830718c..90961a2 - change (mediawiki/extensions)

2015-09-15 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 830718c..90961a2
..

Syncronize VisualEditor: 830718c..90961a2

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


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

diff --git a/VisualEditor b/VisualEditor
index 830718c..90961a2 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 830718ce22440263db1c069ad9c54c444de615ad
+Subproject commit 90961a22d2e913f86b6743c79b49367144fb0576

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c9885e892204c7e0b2e9824fc24fb22ead3708d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] contint: remove postgresql - change (operations/puppet)

2015-09-15 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: remove postgresql
..

contint: remove postgresql

None of our jobs are using postgresql so stop installing the package.
I will clean up the slaves and gallium.wikimedia.org.

Change-Id: I610d0f63aaf3b5767a6d3a2bee3d5cdc3176df93
---
M modules/contint/manifests/packages.pp
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index c866278..54d7491 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -48,7 +48,6 @@
 package { [
 'mysql-server',
 'sqlite3',
-'postgresql',
 ]:
 ensure => present,
 }

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

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

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

[MediaWiki-commits] [Gerrit] [PULL THROUGH] Converter static methods - change (mediawiki...VisualEditor)

2015-09-15 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: [PULL THROUGH] Converter static methods
..

[PULL THROUGH] Converter static methods

Depends on Ia8042b8a in core.

Change-Id: If30f7b2a0de92c4c7f4d5ca57663251c132eeed2
---
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index 7f07ab3..f71c6b0 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -105,7 +105,7 @@
}
if ( converter.isForClipboard() ) {
// Resolve attributes
-   ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.computedAttributes );
+   ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.static.computedAttributes );
}
return els;
 };
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index effc602..b7ea3b9 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -185,7 +185,7 @@
}
 
// Resolve attributes
-   ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.computedAttributes );
+   ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.static.computedAttributes );
}
return els;
 };

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

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

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

[MediaWiki-commits] [Gerrit] Ignore exceptions from document.querySelector() - change (mediawiki/core)

2015-09-15 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Ignore exceptions from document.querySelector()
..

Ignore exceptions from document.querySelector()

In Firefox and Safari, passing selectors with pseudo-elements
into querySelector() can cause it to throw an exception.
Ignore these exceptions rather than aborting the selector audit.

Bug: T112650
Change-Id: I9a1bd5eb6ff5ea11eb70ff5bda994b4e51d2431e
---
M resources/src/mediawiki/mediawiki.inspect.js
1 file changed, 9 insertions(+), 3 deletions(-)


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

diff --git a/resources/src/mediawiki/mediawiki.inspect.js 
b/resources/src/mediawiki/mediawiki.inspect.js
index 6bebf4d..4859953 100644
--- a/resources/src/mediawiki/mediawiki.inspect.js
+++ b/resources/src/mediawiki/mediawiki.inspect.js
@@ -117,9 +117,15 @@
rules = sheet.cssRules || sheet.rules;
$.each( rules, function ( index, rule ) {
selectors.total++;
-   if ( document.querySelector( rule.selectorText 
) !== null ) {
-   selectors.matched++;
-   }
+   // document.querySelector() on prefixed 
pseudo-elements can throw exceptions
+   // in Firefox and Safari. Ignore these 
exceptions.
+   // 
https://bugs.webkit.org/show_bug.cgi?id=149160
+   // 
https://bugzilla.mozilla.org/show_bug.cgi?id=1204880
+   try {
+   if ( document.querySelector( 
rule.selectorText ) !== null ) {
+   selectors.matched++;
+   }
+   } catch ( e ) {}
} );
document.body.removeChild( style );
return selectors;

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

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

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

[MediaWiki-commits] [Gerrit] Make internal surveys accept arbitrary answers - change (mediawiki...QuickSurveys)

2015-09-15 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Make internal surveys accept arbitrary answers
..

Make internal surveys accept arbitrary answers

QuickSurvey#renderButtons has always constructed buttons from the
buttons property, the default value of which is set in
QuickSurvey#defaults.

Make QuickSurvey#renderButtons simply map the answers property to a set
of buttons and render them.

Additionally, make ExternalSurvey#renderButtons mirror the layout of
QuickSurvey#renderButtons.

Bug: T112207
Change-Id: Ic919233b65e5ea1e2819cb6e8361eaa225eb0a3c
---
M resources/ext.quicksurveys.views/ExternalSurvey.js
M resources/ext.quicksurveys.views/QuickSurvey.js
2 files changed, 25 insertions(+), 43 deletions(-)


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

diff --git a/resources/ext.quicksurveys.views/ExternalSurvey.js 
b/resources/ext.quicksurveys.views/ExternalSurvey.js
index 62cb90f..82ab5db 100644
--- a/resources/ext.quicksurveys.views/ExternalSurvey.js
+++ b/resources/ext.quicksurveys.views/ExternalSurvey.js
@@ -15,17 +15,6 @@
 * @inheritdoc
 */
initialize: function ( config ) {
-   this.defaults.buttons = [
-   {
-   href: mw.msg( config.survey.link ),
-   target: '_blank',
-   label: mw.msg( 
'ext-quicksurveys-external-survey-yes-button' ),
-   flags: 'constructive'
-   },
-   {
-   label: mw.msg( 
'ext-quicksurveys-external-survey-no-button' )
-   }
-   ];
this.defaults.templateData.footer = mw.msg( 
config.survey.privacyPolicy );
QuickSurvey.prototype.initialize.call( this, config );
},
@@ -33,10 +22,21 @@
 * @inheritdoc
 */
renderButtons: function () {
-   var self = this,
-   $btnContainer = 
this.initialPanel.$element.find( '.survey-button-container' );
+   var $btnContainer = this.initialPanel.$element.find( 
'.survey-button-container' ),
+   buttons = [
+   {
+   href: mw.msg( 
this.config.survey.link ),
+   target: '_blank',
+   label: mw.msg( 
'ext-quicksurveys-external-survey-yes-button' ),
+   flags: 'constructive'
+   },
+   {
+   label: mw.msg( 
'ext-quicksurveys-external-survey-no-button' )
+   }
+   ],
+   self = this;
 
-   $.each( this.config.buttons, function () {
+   $.each( buttons, function () {
var button = new OO.ui.ButtonWidget( this );
 
button.$element.on( 'click', $.proxy( 
self.onChoose, self ) );
diff --git a/resources/ext.quicksurveys.views/QuickSurvey.js 
b/resources/ext.quicksurveys.views/QuickSurvey.js
index 72c2336..af61d91 100644
--- a/resources/ext.quicksurveys.views/QuickSurvey.js
+++ b/resources/ext.quicksurveys.views/QuickSurvey.js
@@ -23,26 +23,6 @@
 * @cfg {Object} defaults Default options hash.
 */
defaults: {
-   buttons: [
-   {
-   label: mw.msg( 
'ext-quicksurveys-survey-positive' ),
-   data: {
-   answer: 
'ext-quicksurveys-survey-positive'
-   }
-   },
-   {
-   label: mw.msg( 
'ext-quicksurveys-survey-neutral' ),
-   data: {
-   answer: 
'ext-quicksurveys-survey-neutral'
-   }
-   },
-   {
-   label: mw.msg( 
'ext-quicksurveys-survey-negative' ),
-   data: {
-   answer: 
'ext-quicksurveys-survey-negative'
-   }
-

[MediaWiki-commits] [Gerrit] toolschecker: Added db tests - change (operations/puppet)

2015-09-15 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: toolschecker:  Added db tests
..


toolschecker:  Added db tests

Bug: T107449
Change-Id: Icd413f163a396c22083646f57c7f2ef86139af3b
---
M modules/toollabs/files/toolschecker.py
M modules/toollabs/manifests/checker.pp
2 files changed, 40 insertions(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 0948cdd..27ef679 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -2,6 +2,7 @@
 import ldap
 import ldapsupportlib
 import os
+import pymysql
 import redis
 import requests
 import socket
@@ -101,6 +102,42 @@
 red.delete(content)
 
 
+def db_query_check(host):
+# Run a simple known query, verify the db returns.
+connection = pymysql.connect(host, 
read_default_file=os.path.expanduser('~/replica.my.cnf'))
+cur = connection.cursor()
+cur.execute('select * from meta_p.wiki limit 1')
+result = cur.fetchone()
+if result:
+return True
+return False
+
+
+@check('/labsdb/labsdb1001')
+def labsdb_check_labsdb1001():
+return db_query_check('labsdb1001.eqiad.wmnet')
+
+
+@check('/labsdb/labsdb1002')
+def labsdb_check_labsdb1001():
+return db_query_check('labsdb1002.eqiad.wmnet')
+
+
+@check('/labsdb/labsdb1003')
+def labsdb_check_labsdb1001():
+return db_query_check('labsdb1003.eqiad.wmnet')
+
+
+@check('/labsdb/labsdb1004')
+def labsdb_check_labsdb1001():
+return db_query_check('labsdb1004.eqiad.wmnet')
+
+
+@check('/labsdb/labsdb1005')
+def labsdb_check_labsdb1001():
+return db_query_check('labsdb1005.eqiad.wmnet')
+
+
 def job_running(name):
 """Check if a job with given name is running"""
 try:
diff --git a/modules/toollabs/manifests/checker.pp 
b/modules/toollabs/manifests/checker.pp
index 229b9c2..9141261 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -10,7 +10,9 @@
 include toollabs::infrastructure
 include gridengine::submit_host
 
-require_package('python-flask', 'python-redis', 'uwsgi', 
'uwsgi-plugin-python')
+require_package('python-flask', 'python-redis',
+'uwsgi', 'uwsgi-plugin-python',
+'python-pymysql')
 
 file { '/usr/local/lib/python2.7/dist-packages/toolschecker.py':
 ensure => file,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd413f163a396c22083646f57c7f2ef86139af3b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] contint: remove obsolete ruby related packages - change (operations/puppet)

2015-09-15 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: remove obsolete ruby related packages
..

contint: remove obsolete ruby related packages

During summer 2013 we experimented running rspec for puppet manifests
and added a few ruby gems to the slaves.  The job has been removed a
while ago and there is no need to install the related ruby gems from
packages.

If we were to add a CI job again for rspec, we would go with Gemfile and
Bundler as is done for other jobs such as rubocop.

Change-Id: Ib3e8d55d6c5eb9355992fbabd2b9f0b717d6e822
---
M modules/contint/manifests/packages.pp
1 file changed, 0 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/238436/1

diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index 91cdf32..6eb9aaa 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -152,22 +152,8 @@
 }
 }
 
-# Packages to support use of rspec on puppet modules:
 package { [
-# Packages imported from Debian Sid:
-# Most of these would be pulled in via dependencies
-# from ruby-rspec but I'm enumerating them here as a note
-# that the standard ubuntu versions are insufficient.
 'rubygems-integration',
-'ruby-metaclass',
-'ruby-rspec-mocks',
-'ruby-rspec-expectations',
-'ruby-mocha',
-'ruby-rspec',
-'ruby-rspec-core',
-# Packages built using gem2deb:
-'ruby-rspec-puppet',
-'ruby-puppetlabs-spec-helper',
 ]:
 ensure => present;
 }

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

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

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

[MediaWiki-commits] [Gerrit] ve.resolveAttributes: Use addBack to build a single selection - change (VisualEditor/VisualEditor)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: ve.resolveAttributes: Use addBack to build a single selection
..


ve.resolveAttributes: Use addBack to build a single selection

Bonus: add tests

Change-Id: I38002bd6121629b94e1a1e6f60c7dc6b78215ba6
---
M src/ve.utils.js
M tests/ve.test.js
2 files changed, 29 insertions(+), 2 deletions(-)

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



diff --git a/src/ve.utils.js b/src/ve.utils.js
index 86338e3..a879a90 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -915,8 +915,7 @@
 
for ( i = 0, len = attrs.length; i < len; i++ ) {
attr = attrs[ i ];
-   $elements.find( '[' + attr + ']' ).each( resolveAttribute );
-   $elements.filter( '[' + attr + ']' ).each( resolveAttribute );
+   $elements.find( '[' + attr + ']' ).addBack( '[' + attr + ']' 
).each( resolveAttribute );
}
 };
 
diff --git a/tests/ve.test.js b/tests/ve.test.js
index 5acb198..bfdb552 100644
--- a/tests/ve.test.js
+++ b/tests/ve.test.js
@@ -502,7 +502,9 @@
msg: 'href with protocol'
}
];
+
QUnit.expect( cases.length );
+
for ( i = 0; i < cases.length; i++ ) {
doc = ve.createDocumentFromHtml( '' );
doc.head.appendChild( $( '', doc ).attr( 'href', cases[ i 
].base )[ 0 ] );
@@ -510,6 +512,32 @@
}
 } );
 
+QUnit.test( 'resolveAttributes', function ( assert ) {
+   var i, doc, $html,
+   cases = [
+   {
+   base: 'http://example.com',
+   html: 'foobar',
+   resolved: 'http://example.com/foo";>foohttp://example.com/bar";>barhttp://example.com/baz";>',
+   msg: 'href and src resolved'
+   }
+   ];
+
+   QUnit.expect( cases.length );
+
+   for ( i = 0; i < cases.length; i++ ) {
+   doc = ve.createDocumentFromHtml( '' );
+   doc.head.appendChild( $( '', doc ).attr( 'href', cases[ i 
].base )[ 0 ] );
+   $html = $( '' ).append( cases[ i ].html );
+   ve.resolveAttributes( $html, doc, 
ve.dm.Converter.computedAttributes );
+   assert.strictEqual(
+   $html.html(),
+   cases[ i ].resolved,
+   cases[ i ].msg
+   );
+   }
+} );
+
 QUnit.test( 'fixBase', function ( assert ) {
var i, targetDoc, sourceDoc,
cases = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38002bd6121629b94e1a1e6f60c7dc6b78215ba6
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [FIX] Skip auto translations for -wiktionary mode - change (pywikibot/core)

2015-09-15 Thread Malafaya (Code Review)

Malafaya has uploaded a new change for review.

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

Change subject: [FIX] Skip auto translations for -wiktionary mode
..

[FIX] Skip auto translations for -wiktionary mode

In -wiktionary mode, pages are only linked if they have the exact same title.
Currently, auto translation occurs for -autonomous mode even with -wiktionary.
This is wrong as it causes a link to a likely different title in another wiki.
In this patch, auto translation is disabled if -wiktionary is specified.

Bug: T108904
Change-Id: I62b1dc7981b257cf4e7162db9bc32bc01d1f44c0
---
M scripts/interwiki.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/35/238435/1

diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 5e51723..2ced49a 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -938,7 +938,7 @@
 links = titletranslate.translate(
 self.originPage,
 hints=hints,
-auto=globalvar.auto,
+auto=globalvar.auto and globalvar.same != 'wiktionary',
 removebrackets=globalvar.hintnobracket,
 site=site)
 
@@ -1254,7 +1254,7 @@
 links = titletranslate.translate(
 self.originPage,
 hints=[newhint],
-auto=globalvar.auto,
+auto=globalvar.auto and globalvar.same != 
'wiktionary',
 removebrackets=globalvar.hintnobracket)
 for link in links:
 page = pywikibot.Page(link)

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

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

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

[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] ve.dm.Converter: Put static things in .static - change (VisualEditor/VisualEditor)

2015-09-15 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: [BREAKING CHANGE] ve.dm.Converter: Put static things in .static
..

[BREAKING CHANGE] ve.dm.Converter: Put static things in .static

Change-Id: Ia8042b8add8c128b6b2ae0edf3fc8bd856529c35
---
M src/ce/nodes/ve.ce.GeneratedContentNode.js
M src/ce/ve.ce.ContentBranchNode.js
M src/ce/ve.ce.View.js
M src/dm/ve.dm.Converter.js
M src/ui/widgets/ve.ui.PreviewWidget.js
M tests/ve.test.js
6 files changed, 25 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/33/238433/1

diff --git a/src/ce/nodes/ve.ce.GeneratedContentNode.js 
b/src/ce/nodes/ve.ce.GeneratedContentNode.js
index 0916bbf..a3ec06c 100644
--- a/src/ce/nodes/ve.ce.GeneratedContentNode.js
+++ b/src/ce/nodes/ve.ce.GeneratedContentNode.js
@@ -124,7 +124,7 @@
ve.resolveAttributes(
$rendering,
domElements[ 0 ].ownerDocument,
-   ve.dm.Converter.computedAttributes
+   ve.dm.Converter.static.computedAttributes
);
 
return $rendering.toArray();
diff --git a/src/ce/ve.ce.ContentBranchNode.js 
b/src/ce/ve.ce.ContentBranchNode.js
index ce7c52f..e7e26c9 100644
--- a/src/ce/ve.ce.ContentBranchNode.js
+++ b/src/ce/ve.ce.ContentBranchNode.js
@@ -271,7 +271,7 @@
 
// annotationsChanged gets set to true by openAnnotation and 
closeAnnotation
annotationsChanged = false;
-   ve.dm.Converter.openAndCloseAnnotations( annotationStack, 
itemAnnotations,
+   ve.dm.Converter.static.openAndCloseAnnotations( 
annotationStack, itemAnnotations,
openAnnotation, closeAnnotation
);
 
diff --git a/src/ce/ve.ce.View.js b/src/ce/ve.ce.View.js
index 7e2e0bf..911abd3 100644
--- a/src/ce/ve.ce.View.js
+++ b/src/ce/ve.ce.View.js
@@ -37,7 +37,7 @@
} );
 
// Render attributes from original DOM elements
-   ve.dm.Converter.renderHtmlAttributeList(
+   ve.dm.Converter.static.renderHtmlAttributeList(
this.model.getOriginalDomElements(),
this.$element,
this.constructor.static.renderHtmlAttributes,
diff --git a/src/dm/ve.dm.Converter.js b/src/dm/ve.dm.Converter.js
index 9bf6c45..1df8438 100644
--- a/src/dm/ve.dm.Converter.js
+++ b/src/dm/ve.dm.Converter.js
@@ -30,13 +30,17 @@
this.contextStack = null;
 };
 
+/* Inheritance */
+
+OO.initClass( ve.dm.Converter );
+
 /* Static Properties */
 
 /**
  * List of HTML attribute names that {#renderHtmlAttributeList} should use 
computed values for.
  * @type {string[]}
  */
-ve.dm.Converter.computedAttributes = [ 'href', 'src' ];
+ve.dm.Converter.static.computedAttributes = [ 'href', 'src' ];
 
 /* Static Methods */
 
@@ -48,7 +52,7 @@
  * @param {ve.dm.AnnotationSet} [annotations] Annotations to apply
  * @return {Array} Linear model data, one element per character
  */
-ve.dm.Converter.getDataContentFromText = function ( text, annotations ) {
+ve.dm.Converter.static.getDataContentFromText = function ( text, annotations ) 
{
var i, len,
characters = text.split( '' );
 
@@ -76,7 +80,7 @@
  * @param {Function} open Callback called when an annotation is opened. Passed 
a ve.dm.Annotation.
  * @param {Function} close Callback called when an annotation is closed. 
Passed a ve.dm.Annotation.
  */
-ve.dm.Converter.openAndCloseAnnotations = function ( currentSet, targetSet, 
open, close ) {
+ve.dm.Converter.static.openAndCloseAnnotations = function ( currentSet, 
targetSet, open, close ) {
var i, len, index, startClosingAt, currentSetOpen, targetSetOpen;
 
// Close annotations as needed
@@ -139,7 +143,7 @@
  * @param {boolean} [computed=false] If true, use the computed values of 
attributes where available
  * @param {boolean} [deep=false] Recurse into child nodes
  */
-ve.dm.Converter.renderHtmlAttributeList = function ( originalDomElements, 
targetDomElements, filter, computed, deep ) {
+ve.dm.Converter.static.renderHtmlAttributeList = function ( 
originalDomElements, targetDomElements, filter, computed, deep ) {
var i, ilen, j, jlen, attrs, value;
if ( filter === undefined ) {
filter = true;
@@ -161,7 +165,7 @@
!targetDomElements[ i ].hasAttribute( attrs[ j 
].name ) &&
( filter === true || filter( attrs[ j ].name ) )
) {
-   if ( computed && 
ve.dm.Converter.computedAttributes.indexOf( attrs[ j ].name ) !== -1 ) {
+   if ( computed && 
ve.dm.Converter.static.computedAttributes.indexOf( attrs[ j ].name ) !== -1 ) {
value = originalDomElements[ i ][ 
attrs[ j ].name ];
} else {

[MediaWiki-commits] [Gerrit] Turn puppet autosign back on beta/integration - change (operations/puppet)

2015-09-15 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Turn puppet autosign back on beta/integration
..


Turn puppet autosign back on beta/integration

The crontab brute forcing puppet signature is gone. It is now using the
puppet master autosign feature.  Default to false, turn it to true with
hiera key 'puppetmaster::autosigner' for both beta cluster and
integration projects.

Bug: T112537
Change-Id: I0fafdc5df2ff3fe85b7ae85aa2e08df6a79262cd
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/integration/common.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index b8d3fb9..425f8c4 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -8,6 +8,7 @@
 "ocg::redis_password": '%{::passwords::redis::main_password}'
 has_lvs: false
 "puppetmaster::scripts::keep_reports_minutes": 360
+puppetmaster::autosigner: true
 #service::configuration::http_proxy:
 service::configuration::statsd_host: labmon1001.eqiad.wmnet
 service::configuration::logstash_host: 
deployment-logstash2.deployment-prep.eqiad.wmflabs
diff --git a/hieradata/labs/integration/common.yaml 
b/hieradata/labs/integration/common.yaml
index 2d68cfe..f34d999 100644
--- a/hieradata/labs/integration/common.yaml
+++ b/hieradata/labs/integration/common.yaml
@@ -8,3 +8,4 @@
 contint::zuul_merger_hosts:
 - '::1'  # uses quotes for hiera
 - 127.0.0.1
+puppetmaster::autosigner: true

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

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

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

[MediaWiki-commits] [Gerrit] PreviewWidget: De-duplicate code with a private function - change (VisualEditor/VisualEditor)

2015-09-15 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: PreviewWidget: De-duplicate code with a private function
..

PreviewWidget: De-duplicate code with a private function

Also rename node variables to model/view.

Change-Id: Iab2b10a75bc5746326ea39642af94ec6b124a120
---
M src/ui/widgets/ve.ui.PreviewWidget.js
1 file changed, 28 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/34/238434/1

diff --git a/src/ui/widgets/ve.ui.PreviewWidget.js 
b/src/ui/widgets/ve.ui.PreviewWidget.js
index 8b0a4dc..13dbfb3 100644
--- a/src/ui/widgets/ve.ui.PreviewWidget.js
+++ b/src/ui/widgets/ve.ui.PreviewWidget.js
@@ -12,45 +12,44 @@
  * @extends OO.ui.Widget
  *
  * @constructor
- * @param {ve.dm.Node} nodeModel Model from which to create a preview
+ * @param {ve.dm.Node} model Model from which to create a preview
  * @param {Object} [config] Configuration options
  */
-ve.ui.PreviewWidget = function VeUiPreviewWidget( nodeModel, config ) {
-   var promise, promises = [],
+ve.ui.PreviewWidget = function VeUiPreviewWidget( model, config ) {
+   var promises = [],
widget = this;
 
// Parent constructor
OO.ui.Widget.call( this, config );
 
-   this.model = nodeModel;
+   this.model = model;
 
// Initial CE node
-   this.rendering = ve.ce.nodeFactory.create( this.model.getType(), 
this.model );
+   this.view = ve.ce.nodeFactory.create( this.model.getType(), this.model 
);
+
+   function queueNode( node ) {
+   var promise;
+   if ( typeof node.generateContents === 'function' ) {
+   if ( node.isGenerating() ) {
+   promise = $.Deferred();
+   node.once( 'rerender', promise.resolve );
+   promises.push( promise );
+   }
+   }
+   }
 
// Traverse children to see when they are all rerendered
-   if ( this.rendering instanceof ve.ce.BranchNode ) {
-   ve.BranchNode.static.traverse( this.rendering, function ( node 
) {
-   if ( typeof node.generateContents === 'function' ) {
-   if ( node.isGenerating() ) {
-   promise = $.Deferred();
-   node.once( 'rerender', promise.resolve 
);
-   promises.push( promise );
-   }
-   }
-   } );
-   } else if ( typeof this.rendering.generateContents === 'function' ) {
-   if ( this.rendering.isGenerating() ) {
-   promise = $.Deferred();
-   this.rendering.once( 'rerender', promise.resolve );
-   promises.push( promise );
-   }
+   if ( this.view instanceof ve.ce.BranchNode ) {
+   ve.BranchNode.static.traverse( this.view, queueNode );
+   } else {
+   queueNode( this.view );
}
 
// When all children are rerendered, replace with dm DOM
$.when.apply( $, promises )
.then( function () {
// Verify that the widget and/or the ce node weren't 
destroyed
-   if ( widget.rendering ) {
+   if ( widget.view ) {
widget.replaceWithModelDom();
}
} );
@@ -67,9 +66,9 @@
  * Destroy the preview node.
  */
 ve.ui.PreviewWidget.prototype.destroy = function () {
-   if ( this.rendering ) {
-   this.rendering.destroy();
-   this.rendering = null;
+   if ( this.view ) {
+   this.view.destroy();
+   this.view = null;
}
 };
 
@@ -89,7 +88,7 @@
ve.dm.Converter.static.computedAttributes
);
 
-   // Make all links open in a new window (sync rendering)
+   // Make all links open in a new window (sync view)
$preview.find( 'a' ).attr( 'target', '_blank' );
 
// Replace content
@@ -99,8 +98,8 @@
this.emit( 'render' );
 
// Cleanup
-   this.rendering.destroy();
-   this.rendering = null;
+   this.view.destroy();
+   this.view = null;
 };
 
 /**
@@ -109,5 +108,5 @@
  * @return {boolean} Still generating
  */
 ve.ui.PreviewWidget.prototype.isGenerating = function () {
-   return this.rendering && this.rendering.isGenerating();
+   return this.view && this.view.isGenerating();
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab2b10a75bc5746326ea39642af94ec6b124a120
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEdit

[MediaWiki-commits] [Gerrit] restbase: override statsd metric prefix for restbase test cl... - change (operations/puppet)

2015-09-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: restbase: override statsd metric prefix for restbase test 
cluster
..

restbase: override statsd metric prefix for restbase test cluster

Bug: T112644
Change-Id: Ia9b692a6f4f96e26e28d0b218a8cf65a5118c590
---
M hieradata/regex.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/238432/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 368850b..745ebe1 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -42,6 +42,7 @@
   - restbase-test2001.codfw.wmnet
   - restbase-test2002.codfw.wmnet
   - restbase-test2003.codfw.wmnet
+  restbase::statsd_prefix: restbase-test
   cassandra::max_heap_size: 4g
   cassandra::heap_newsize: 1g
   cassandra::cluster_name: services-test
@@ -64,6 +65,7 @@
   - restbase-test2001.codfw.wmnet
   - restbase-test2002.codfw.wmnet
   - restbase-test2003.codfw.wmnet
+  restbase::statsd_prefix: restbase-test
   cassandra::max_heap_size: 4g
   cassandra::heap_newsize: 1g
   cassandra::cluster_name: services-test

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9b692a6f4f96e26e28d0b218a8cf65a5118c590
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] restbase: make statsd metric prefix configurable - change (operations/puppet)

2015-09-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: restbase: make statsd metric prefix configurable
..

restbase: make statsd metric prefix configurable

Bug: T112644
Change-Id: I1a4ace18d2b1a3f1227691ae054da1d588646302
---
M modules/restbase/manifests/init.pp
M modules/restbase/templates/config.labs.yaml.erb
M modules/restbase/templates/config.yaml.erb
3 files changed, 5 insertions(+), 2 deletions(-)


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

diff --git a/modules/restbase/manifests/init.pp 
b/modules/restbase/manifests/init.pp
index 3bb3955..e6ead40 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -32,6 +32,8 @@
 #   Default: 'warn'
 # [*statsd_host*]
 #   statsd host name. Default: localhost
+# [*statsd_prefix*]
+#   statsd metric prefix. Default: restbase
 # [*statsd_port*]
 #   statsd port. Default: 8125
 # [*graphoid_uri*]
@@ -53,6 +55,7 @@
 $logstash_host  = 'localhost',
 $logstash_port  = 12201,
 $logging_level  = 'warn',
+$statsd_prefix  = 'restbase',
 $statsd_host= 'localhost',
 $statsd_port= '8125',
 $graphoid_uri   = 'http://graphoid.svc.eqiad.wmnet:19000',
diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 8168f20..a038079 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -239,7 +239,7 @@
 
 # StatsD metrics collection
 metrics:
-  name: restbase
+  name: <%= @statsd_prefix %>
   type: statsd # default, but lets be explicit
   host: <%= @statsd_host %>
   port: <%= @statsd_port %>
diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 9a1ace6..ff1c14f 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -975,7 +975,7 @@
 
 # StatsD metrics collection
 metrics:
-  name: restbase
+  name: <%= @statsd_prefix %>
   type: statsd # default, but lets be explicit
   host: <%= @statsd_host %>
   port: <%= @statsd_port %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a4ace18d2b1a3f1227691ae054da1d588646302
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Enable ferm on mw1114 (API server) - change (operations/puppet)

2015-09-15 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Enable ferm on mw1114 (API server)
..


Enable ferm on mw1114 (API server)

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 831fcb2..cd16606 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1889,6 +1889,10 @@
 # mw1114-mw1119 are canary api appservers
 node /^mw111[4-9]\.eqiad\.wmnet$/ {
 role mediawiki::appserver::canary_api
+
+if $::hostname == 'mw1114' {
+include base::firewall
+}
 }
 
 # mw1120-1148 are api apaches

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

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

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

[MediaWiki-commits] [Gerrit] ve.resolveAttributes: Use addBack to build a single selection - change (VisualEditor/VisualEditor)

2015-09-15 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: ve.resolveAttributes: Use addBack to build a single selection
..

ve.resolveAttributes: Use addBack to build a single selection

Bonus: add tests

Change-Id: I38002bd6121629b94e1a1e6f60c7dc6b78215ba6
---
M src/ve.utils.js
M tests/ve.test.js
2 files changed, 27 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/30/238430/1

diff --git a/src/ve.utils.js b/src/ve.utils.js
index 86338e3..a879a90 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -915,8 +915,7 @@
 
for ( i = 0, len = attrs.length; i < len; i++ ) {
attr = attrs[ i ];
-   $elements.find( '[' + attr + ']' ).each( resolveAttribute );
-   $elements.filter( '[' + attr + ']' ).each( resolveAttribute );
+   $elements.find( '[' + attr + ']' ).addBack( '[' + attr + ']' 
).each( resolveAttribute );
}
 };
 
diff --git a/tests/ve.test.js b/tests/ve.test.js
index 5acb198..3515619 100644
--- a/tests/ve.test.js
+++ b/tests/ve.test.js
@@ -510,6 +510,32 @@
}
 } );
 
+QUnit.test( 'resolveAttributes', function ( assert ) {
+   var i, doc, $html,
+   cases = [
+   {
+   base: 'http://example.com',
+   html: 'foobar',
+   resolved: 'http://example.com/foo";>foohttp://example.com/bar";>barhttp://example.com/baz";>',
+   msg: 'href and src resolved'
+   }
+   ];
+
+   QUnit.expect( cases.length );
+
+   for ( i = 0; i < cases.length; i++ ) {
+   doc = ve.createDocumentFromHtml( '' );
+   doc.head.appendChild( $( '', doc ).attr( 'href', cases[ i 
].base )[ 0 ] );
+   $html = $( '' ).append( cases[ i ].html );
+   ve.resolveAttributes( $html, doc, 
ve.dm.Converter.computedAttributes );
+   assert.strictEqual(
+   $html.html(),
+   cases[ i ].resolved,
+   cases[ i ].msg
+   );
+   }
+} );
+
 QUnit.test( 'fixBase', function ( assert ) {
var i, targetDoc, sourceDoc,
cases = [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38002bd6121629b94e1a1e6f60c7dc6b78215ba6
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] Add some coverage to scap.cdlib - change (mediawiki...scap)

2015-09-15 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Add some coverage to scap.cdlib
..

Add some coverage to scap.cdlib

Basic tests for py_djb_hash, namely it recognizes unicode.
Reader expects at least 2048 bytes.
Example usage for Writer()

Change-Id: I4f4dbc5e43c7c236dd0a25a3cf9da9f85009877f
---
M scap/cdblib.py
1 file changed, 25 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/29/238429/1

diff --git a/scap/cdblib.py b/scap/cdblib.py
index bc64058..1aa3eb7 100644
--- a/scap/cdblib.py
+++ b/scap/cdblib.py
@@ -22,7 +22,15 @@
 
 
 def py_djb_hash(s):
-'''Return the value of DJB's hash function for the given 8-bit string.'''
+'''Return the value of DJB's hash function for the given 8-bit string.
+
+>>> py_djb_hash('')
+5381
+>>> py_djb_hash('\x01')
+177572
+>>> py_djb_hash('€')
+193278953
+'''
 h = 5381
 for c in s:
 h = (((h << 5) + h) ^ ord(c)) & 0x
@@ -41,7 +49,15 @@
 
 def __init__(self, data, hashfn=djb_hash):
 '''Create an instance reading from a sequence and using hashfn to hash
-keys.'''
+keys.
+
+>>> Reader(data='')
+Traceback (most recent call last):
+...
+IOError: CDB too small
+>>> Reader(data='a' * 2048) #doctest: +ELLIPSIS
+
+'''
 if len(data) < 2048:
 raise IOError('CDB too small')
 
@@ -166,7 +182,13 @@
 
 def __init__(self, fp, hashfn=djb_hash):
 '''Create an instance writing to a file-like object, using hashfn to
-hash keys.'''
+hash keys.
+
+>>> import tempfile
+>>> temp_fp = tempfile.TemporaryFile()
+>>> Writer(fp=temp_fp, hashfn=py_djb_hash) #doctest: +ELLIPSIS
+
+'''
 self.fp = fp
 self.hashfn = hashfn
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f4dbc5e43c7c236dd0a25a3cf9da9f85009877f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Generate HTML coverage report - change (mediawiki...scap)

2015-09-15 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Generate HTML coverage report
..

Generate HTML coverage report

nosetests comes with HTML report coverage which is quite handy. Enable
that option as well as code branches coverage. The resulting output is
found in /cover/.

Change-Id: Ibae6a72f150871b7ab55b2a0a9b3310f11043dfa
---
M .gitignore
M setup.cfg
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/28/238428/1

diff --git a/.gitignore b/.gitignore
index 0357f5c..d36dd17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@
 /.tox
 /.venv
 /build
+/cover
 /dist
 /docs/_build
diff --git a/setup.cfg b/setup.cfg
index 4f818b8..2e43c08 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,8 @@
 with-doctest=1
 with-coverage=1
 cover-package=scap
+cover-html=1
+cover-branches=1
 
 [pep8]
 ignore=E128

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae6a72f150871b7ab55b2a0a9b3310f11043dfa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e5e1810..830718c - change (mediawiki/extensions)

2015-09-15 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: e5e1810..830718c
..

Syncronize VisualEditor: e5e1810..830718c

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


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

diff --git a/VisualEditor b/VisualEditor
index e5e1810..830718c 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e5e1810f0298692ca1f976f82708d8ed3d76572e
+Subproject commit 830718ce22440263db1c069ad9c54c444de615ad

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f87257b7d0a79e62ba65440c16ae03c3840f555
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e5e1810..830718c - change (mediawiki/extensions)

2015-09-15 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: e5e1810..830718c
..


Syncronize VisualEditor: e5e1810..830718c

Change-Id: I6f87257b7d0a79e62ba65440c16ae03c3840f555
---
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 e5e1810..830718c 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e5e1810f0298692ca1f976f82708d8ed3d76572e
+Subproject commit 830718ce22440263db1c069ad9c54c444de615ad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f87257b7d0a79e62ba65440c16ae03c3840f555
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Fix query rewrite when interwiki is enabled - change (mediawiki...CirrusSearch)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Fix query rewrite when interwiki is enabled
..


Fix query rewrite when interwiki is enabled

When the old interwiki search is enabled query rewriting will never
occur, because the empty result set is considered a result. This
adjusts to iterate through and actually find a result before rejecting
query rewrites.

This problem blocks search rewrites from being generated on the
beta cluster.

Change-Id: I1672a82d5fda072f659425d0991c4b3e39a4617d
---
M includes/Search/ResultSet.php
1 file changed, 11 insertions(+), 3 deletions(-)

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

Objections:
  Cindy-the-browser-test-bot: There's a problem with this change, please improve



diff --git a/includes/Search/ResultSet.php b/includes/Search/ResultSet.php
index 9d98430..401aaa5 100644
--- a/includes/Search/ResultSet.php
+++ b/includes/Search/ResultSet.php
@@ -59,9 +59,17 @@
 * @return bool True when rewriting this query is allowed
 */
public function isQueryRewriteAllowed() {
-   return $this->numRows() === 0 &&
-   count( $this->interwikiResults ) === 0 &&
-   !$this->searchContainedSyntax();
+   if ( $this->numRows() > 0 || $this->searchContainedSyntax() ) {
+   return false;
+   }
+   if ( $this->interwikiResults !== null ) {
+   foreach ( $this->interwikiResults as $resultSet ) {
+   if ( $resultSet->numRows() > 0 ) {
+   return false;
+   }
+   }
+   }
+   return true;
}
 
private function findSuggestion() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1672a82d5fda072f659425d0991c4b3e39a4617d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
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 ve.resolveAttributes instead of resolveUrl in clipboard ... - change (mediawiki...VisualEditor)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Use ve.resolveAttributes instead of resolveUrl in clipboard 
conversion
..


Use ve.resolveAttributes instead of resolveUrl in clipboard conversion

This method does the tree traversal for us, and resolves src as well
as href.

Change-Id: Ic3ea47fb9acde9a1dad5caac3ee9c9b63c86d900
---
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
2 files changed, 4 insertions(+), 10 deletions(-)

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



diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index 8c63f7a..7f07ab3 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -104,11 +104,8 @@
}
}
if ( converter.isForClipboard() ) {
-   // Resolve image sources
-   $( els ).find( 'img' ).addBack( 'img' ).each( function () {
-   var $this = $( this );
-   $this.attr( 'src', ve.resolveUrl( $this.attr( 'src' ), 
doc ) );
-   } );
+   // Resolve attributes
+   ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.computedAttributes );
}
return els;
 };
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 4d5f075..effc602 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -184,11 +184,8 @@
els[ i ].setAttribute( 'data-ve-ignore', 'true' );
}
 
-   // Resolve image sources
-   $( els ).find( 'img' ).addBack( 'img' ).each( function () {
-   var $this = $( this );
-   $this.attr( 'src', ve.resolveUrl( $this.attr( 'src' ), 
doc ) );
-   } );
+   // Resolve attributes
+   ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.computedAttributes );
}
return els;
 };

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

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

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

[MediaWiki-commits] [Gerrit] Clear title caches after moving old talk page - change (mediawiki...Flow)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Clear title caches after moving old talk page
..


Clear title caches after moving old talk page

Bug: T111830
Change-Id: I8c7ba824de6517aa5177bf02e3f4c3b5d01f6939
---
M includes/Import/OptInController.php
M includes/Model/Workflow.php
2 files changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/includes/Import/OptInController.php 
b/includes/Import/OptInController.php
index 66eeb45..ec4d29f 100644
--- a/includes/Import/OptInController.php
+++ b/includes/Import/OptInController.php
@@ -249,7 +249,9 @@
// existing article ID.
// Otherwise, we run the risk of the Workflow we're creating 
being
// associated with the page we just moved.
-   $title->getArticleID( Title::GAID_FOR_UPDATE );
+   $title->resetArticleID( 0 );
+   $linkCache = \LinkCache::singleton();
+   $linkCache->clearLink( $title );
 
$loader = $loaderFactory->createWorkflowLoader( $title );
$blocks = $loader->getBlocks();
diff --git a/includes/Model/Workflow.php b/includes/Model/Workflow.php
index e123fdd..39c1632 100644
--- a/includes/Model/Workflow.php
+++ b/includes/Model/Workflow.php
@@ -156,12 +156,19 @@
$obj->type = $type;
$obj->wiki = $wiki;
 
-   // for new pages, article id will be 0; it'll be created in 
toStorageRow
+   // for new pages, article id will be 0; it'll be fetched again 
in toStorageRow
$obj->pageId = $title->getArticleID();
$obj->namespace = $title->getNamespace();
$obj->titleText = $title->getDBkey();
$obj->updateLastUpdated( $obj->id );
 
+   // we just created a new workflow; wipe out any cached data for 
the
+   // associated title
+   if ( self::$titleCache !== null ) {
+   $key = implode( '|', array( $obj->wiki, 
$obj->namespace, $obj->titleText ) );
+   self::$titleCache->clear( array( $key ) );
+   }
+
return $obj;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c7ba824de6517aa5177bf02e3f4c3b5d01f6939
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: Catrope 
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 GENDER support - change (mediawiki...Thanks)

2015-09-15 Thread Haritha28 (Code Review)

Haritha28 has uploaded a new change for review.

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

Change subject: Add GENDER support
..

Add GENDER support

The "notification-link-text-respond-to-user"
did not support gender. The code has been
modified so that it supports GENDER with
with parameters $1 and $2 .

Bug:T56979
Change-Id: I628b3a02ba32ebeeefddce23f51d7ac2990b6479
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks 
refs/changes/26/238426/1

diff --git a/i18n/en.json b/i18n/en.json
index 53e7733..98aef9b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -28,7 +28,7 @@
"notification-thanks-flyout2": "[[User:$1|$1]] {{GENDER:$1|thanked}} 
you for your edit on $2.",
"notification-thanks-email-subject": "$1 {{GENDER:$1|thanked}} you for 
your edit on {{SITENAME}}",
"notification-thanks-email-batch-body": "$1 {{GENDER:$1|thanked}} you 
for your edit on $2.",
-   "notification-link-text-respond-to-user": "Respond to user",
+   "notification-link-text-respond-to-user": "{{GENDER:$1|$2}}Respond to 
user",
"log-name-thanks": "Thanks log",
"log-description-thanks": "Below is a list of users thanked by other 
users.",
"logentry-thanks-thank": "$1 {{GENDER:$2|thanked}} {{GENDER:$4|$3}}",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I628b3a02ba32ebeeefddce23f51d7ac2990b6479
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Haritha28 

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

[MediaWiki-commits] [Gerrit] Enable ferm on mw1114 (API server) - change (operations/puppet)

2015-09-15 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Enable ferm on mw1114 (API server)
..

Enable ferm on mw1114 (API server)

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/238425/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 831fcb2..cd16606 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1889,6 +1889,10 @@
 # mw1114-mw1119 are canary api appservers
 node /^mw111[4-9]\.eqiad\.wmnet$/ {
 role mediawiki::appserver::canary_api
+
+if $::hostname == 'mw1114' {
+include base::firewall
+}
 }
 
 # mw1120-1148 are api apaches

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

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

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

[MediaWiki-commits] [Gerrit] Center align the last modified bar on the Main page - change (mediawiki...MobileFrontend)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Center align the last modified bar on the Main page
..


Center align the last modified bar on the Main page

Standardize .pre-content, .content, .post-content paddings and margins too.

Follow up to Id072bb9ad391a7bdc9fa52f09427ee5cc78954fd

Bug: T112341
Change-Id: I70c9b5495142ebde401ed4def53ec1584caac2a0
---
M includes/skins/history.mustache
M resources/skins.minerva.base.styles/pageactions.less
M resources/skins.minerva.content.styles/main.less
M resources/skins.minerva.tablet.styles/common.less
4 files changed, 17 insertions(+), 11 deletions(-)

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



diff --git a/includes/skins/history.mustache b/includes/skins/history.mustache
index 244fe98..d388427 100644
--- a/includes/skins/history.mustache
+++ b/includes/skins/history.mustache
@@ -1,4 +1,4 @@
-{{^isMainPage}}{{/isMainPage}}
+



-{{^isMainPage}}{{/isMainPage}}
\ No newline at end of file
+
\ No newline at end of file
diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index edb8c13..b9f967a 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -16,7 +16,7 @@
 // FIXME: remove the .stable .pre-content selector when cache clears
 .stable .pre-content,
 .heading-holder {
-   padding: @titleSectionSpacingTop 0 @titleSectionSpacingBottom 
@contentMargin;
+   padding: @titleSectionSpacingTop 0 @titleSectionSpacingBottom;
 
h1 {
padding-right: @contentMargin;
diff --git a/resources/skins.minerva.content.styles/main.less 
b/resources/skins.minerva.content.styles/main.less
index d4ec81a..aa5fb17 100644
--- a/resources/skins.minerva.content.styles/main.less
+++ b/resources/skins.minerva.content.styles/main.less
@@ -22,9 +22,14 @@
background: #fff;
 }
 
+.pre-content,
+.content,
+.post-content {
+   margin: 0 @contentMargin;
+}
+
 .content {
line-height: @contentLineHeight;
-   margin: 0 @contentMargin 0;
// Deal with long links (bug 60387)
word-wrap: break-word;
 }
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 921276d..c9ec5be 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -15,7 +15,7 @@
// FIXME: remove the .stable .pre-content selector when cache clears
.stable .pre-content,
.heading-holder {
-   padding: 20px @contentPaddingTablet 0 @contentPaddingTablet;
+   padding: 20px 0;
}
 
// FIXME: remove the .stable .pre-content selector when cache clears
@@ -53,14 +53,17 @@
 
// FIXME: Have a class that identifies all 4 of these
.drawer,
-   .pre-content,
-   .content,
.content-overlay {
margin: 0 auto;
}
 
+   .pre-content,
+   .content,
+   .post-content {
+   margin: 0 @contentPaddingTablet;
+   }
+
.content {
-   padding: @contentTopPadding @contentPaddingTablet 0;
// Classes added by thumbnails
// e.g. [[File:Scholars mate 
animation.gif|frame|left|"[[Scholar's mate]]"]]
// We use @noflip because we still want .tleft to be on the 
left and
@@ -163,6 +166,7 @@
.pre-content,
.post-content,
.content-overlay,
+   // FIXME: remove .last-modified-bar when cache clears. The template has 
the .post-content class now.
.last-modified-bar,
// FIXME: remove need for id selector
#mw-mf-page-center .pointer-overlay {
@@ -171,9 +175,6 @@
max-width: @contentMaxWidthTablet;
}
 
-   .content {
-   padding: @contentTopPadding 0;
-   }
.header {
margin-top: -1px;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70c9b5495142ebde401ed4def53ec1584caac2a0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Phuedx 
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 ve.resolveAttributes instead of resolveUrl in clipboard ... - change (mediawiki...VisualEditor)

2015-09-15 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Use ve.resolveAttributes instead of resolveUrl in clipboard 
conversion
..

Use ve.resolveAttributes instead of resolveUrl in clipboard conversion

This method does the tree traversal for us, and resolves src as well
as href.

Change-Id: Ic3ea47fb9acde9a1dad5caac3ee9c9b63c86d900
---
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
2 files changed, 4 insertions(+), 10 deletions(-)


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

diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index 8c63f7a..7f07ab3 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -104,11 +104,8 @@
}
}
if ( converter.isForClipboard() ) {
-   // Resolve image sources
-   $( els ).find( 'img' ).addBack( 'img' ).each( function () {
-   var $this = $( this );
-   $this.attr( 'src', ve.resolveUrl( $this.attr( 'src' ), 
doc ) );
-   } );
+   // Resolve attributes
+   ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.computedAttributes );
}
return els;
 };
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 4d5f075..effc602 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -184,11 +184,8 @@
els[ i ].setAttribute( 'data-ve-ignore', 'true' );
}
 
-   // Resolve image sources
-   $( els ).find( 'img' ).addBack( 'img' ).each( function () {
-   var $this = $( this );
-   $this.attr( 'src', ve.resolveUrl( $this.attr( 'src' ), 
doc ) );
-   } );
+   // Resolve attributes
+   ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.computedAttributes );
}
return els;
 };

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

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

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

[MediaWiki-commits] [Gerrit] Remove 'mw' as allowed global variable from .jshintrc - change (mediawiki...UploadWizard)

2015-09-15 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Remove 'mw' as allowed global variable from .jshintrc
..

Remove 'mw' as allowed global variable from .jshintrc

'mediaWiki' is the one we allow.

Change-Id: Id60d5c94da49a467b6df399a0788550a17dbec78
---
M .jshintrc
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/.jshintrc b/.jshintrc
index 5747107..8bd8d58 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -36,7 +36,6 @@
 
"predef": [
"mediaWiki",
-   "mw",
"jQuery",
"OO",
"QUnit",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id60d5c94da49a467b6df399a0788550a17dbec78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Remove non-existent files/directories from .jshintignore - change (mediawiki...UploadWizard)

2015-09-15 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Remove non-existent files/directories from .jshintignore
..

Remove non-existent files/directories from .jshintignore

Change-Id: I756984e088d63a286f1c660032521e0d5af67e80
---
M .jshintignore
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/.jshintignore b/.jshintignore
index fa83a6c..2db0793 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,3 +1 @@
 resources/jquery
-resources/mw.Log.js
-test/jasmine

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I756984e088d63a286f1c660032521e0d5af67e80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Don't fail horribly when invalid categories are passed - change (mediawiki...UploadWizard)

2015-09-15 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Don't fail horribly when invalid categories are passed
..

Don't fail horribly when invalid categories are passed

If a category name which is not a valid page title is given in the
'categories' URL parameter, it will now be silently ignored instead of
breaking the whole wizard.

Bug: T112417
Change-Id: I6354297bcd6f1ef4c7a530a33346c8d7c68f6555
(cherry picked from commit 0cce0f7801453f5721458889d07b6508429e0d5d)
---
M resources/jquery/jquery.mwCoolCats.js
1 file changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/resources/jquery/jquery.mwCoolCats.js 
b/resources/jquery/jquery.mwCoolCats.js
index 82177b3..11f3b9e 100644
--- a/resources/jquery/jquery.mwCoolCats.js
+++ b/resources/jquery/jquery.mwCoolCats.js
@@ -67,12 +67,15 @@
 
/**
 * Add a new category to the page
-* @param {mw.Title} title of category -- should already be in category 
namespace
+* @param {mw.Title|null} title of category -- should already be in 
category namespace
 * @param {boolean} whether this category is visible to the user
 */
function insertCat( title, isHidden ) {
var $li, $anchor;
 
+   if ( !title ) {
+   return;
+   }
if ( containsCat( title ) ) {
return;
}
@@ -276,8 +279,8 @@
this.getWikiText = getWikiText;
 
// initialize with some categories, if so configured
-   $.each( settings.cats, function ( i, cat ) { insertCat( new 
mw.Title( cat, catNsId ) ); } );
-   $.each( settings.hiddenCats, function ( i, cat ) { insertCat( 
new mw.Title( cat, catNsId ), true ); } );
+   $.each( settings.cats, function ( i, cat ) { insertCat( 
mw.Title.newFromText( cat, catNsId ) ); } );
+   $.each( settings.hiddenCats, function ( i, cat ) { insertCat( 
mw.Title.newFromText( cat, catNsId ), true ); } );
 
processInput();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6354297bcd6f1ef4c7a530a33346c8d7c68f6555
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.26wmf22
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Fail on docutils errors inside Sphinx - change (pywikibot/core)

2015-09-15 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Fail on docutils errors inside Sphinx
..

Fail on docutils errors inside Sphinx

Change-Id: I2bc0e1ced8387013ac6df274197637deb799df37
---
A docs/docutils.conf
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/20/238420/1

diff --git a/docs/docutils.conf b/docs/docutils.conf
new file mode 100644
index 000..cbd81fe
--- /dev/null
+++ b/docs/docutils.conf
@@ -0,0 +1,2 @@
+[general]
+halt_level: error

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc0e1ced8387013ac6df274197637deb799df37
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] dm.Annotation: Remove unused convenience wrapper - change (VisualEditor/VisualEditor)

2015-09-15 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: dm.Annotation: Remove unused convenience wrapper
..

dm.Annotation: Remove unused convenience wrapper

Change-Id: I1b89923134553c796dcd7606143e0498074aeaf9
---
M src/dm/ve.dm.Annotation.js
1 file changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/19/238419/1

diff --git a/src/dm/ve.dm.Annotation.js b/src/dm/ve.dm.Annotation.js
index 3ca9ffd..f016653 100644
--- a/src/dm/ve.dm.Annotation.js
+++ b/src/dm/ve.dm.Annotation.js
@@ -85,17 +85,6 @@
 /* Methods */
 
 /**
- * Convenience wrapper for .toDomElements() on the current annotation
- *
- * @method
- * @param {HTMLDocument} [doc] HTML document to use to create elements
- * @see ve.dm.Model#toDomElements
- */
-ve.dm.Annotation.prototype.getDomElements = function ( doc ) {
-   return this.constructor.static.toDomElements( this.element, doc || 
document );
-};
-
-/**
  * Get an object containing comparable annotation properties.
  *
  * This is used by the converter to merge adjacent annotations.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b89923134553c796dcd7606143e0498074aeaf9
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] Remove wikidata CA cookie hacks - change (operations/puppet)

2015-09-15 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Remove wikidata CA cookie hacks
..

Remove wikidata CA cookie hacks

Bug: T109072
Bug: T109038
Change-Id: Ib378d3bf66d59b61daf09026ff3f10728ec65323
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 0 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/238418/1

diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index e311212..66e9e43 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -187,24 +187,4 @@
}
 
call analytics_last_access_deliver;
-
-   // This is a temporary hack to work around issues from T109038
-   // We should be able to remove this sometime after Sept 16, 2015, as
-   // the old CA cookies should have 30d expiry.
-   // For any request Host ending in "wikidata.org", if we see a
-   // double-value for the CA token, user, or session, try to delete the
-   // one at .wikidata.org.
-   // The exact format of the cookie-delete strings is copied from
-   // examples of normal CA cookie deletes seen in traffic logs
-   if (req.http.Host ~ "(?i)(^|\.)wikidata\.org$") {
-   if (req.http.Cookie ~ "centralauth_Token.*centralauth_Token") {
-   header.append(resp.http.Set-Cookie, 
"centralauth_Token=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; 
path=/; domain=.wikidata.org; secure; httponly");
-   }
-   if(req.http.Cookie ~ "centralauth_User.*centralauth_User") {
-   header.append(resp.http.Set-Cookie, 
"centralauth_User=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; 
path=/; domain=.wikidata.org; secure; httponly");
-   }
-   if(req.http.Cookie ~ 
"centralauth_Session.*centralauth_Session") {
-   header.append(resp.http.Set-Cookie, 
"centralauth_Session=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; 
path=/; domain=.wikidata.org; secure; httponly");
-   }
-   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Removed clearSharedCache() hack in User.php - change (mediawiki/core)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: Removed clearSharedCache() hack in User.php
..


Removed clearSharedCache() hack in User.php

* WAN cache key salting/tombstones makes this overkill now

Change-Id: I078daacc5d2987858d720677f11e9828d71021e2
---
M includes/User.php
1 file changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/includes/User.php b/includes/User.php
index 605dab6..dbcbe31 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3709,14 +3709,6 @@
Hooks::run( 'UserSaveSettings', array( $this ) );
$this->clearSharedCache();
$this->getUserPage()->invalidateCache();
-
-   // T95839: clear the cache again post-commit to reduce race 
conditions
-   // where stale values are written back to the cache by other 
threads.
-   // Note: this *still* doesn't deal with REPEATABLE-READ 
snapshot lag...
-   $that = $this;
-   $dbw->onTransactionIdle( function() use ( $that ) {
-   $that->clearSharedCache();
-   } );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I078daacc5d2987858d720677f11e9828d71021e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Deprecated function wfDiff() in GlobalFunctions.php - change (mediawiki/core)

2015-09-15 Thread D3r1ck01 (Code Review)

D3r1ck01 has uploaded a new change for review.

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

Change subject: Deprecated function wfDiff() in GlobalFunctions.php
..

Deprecated function wfDiff() in GlobalFunctions.php

Trying to fix the bugs about deprecated functions in GlobalFunctions.php. I 
have just fixed this one and wfDiff()
is still called in different files. I will have to modify them too.

Signed-off-by: Alangi Derick 

Change-Id: I305fee1cb6ea7c68046a4d17bab22160f041cea4
---
M includes/GlobalFunctions.php
M includes/parser/ParserDiffTest.php
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/238417/1

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 2852561..9e99f8a 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3104,6 +3104,7 @@
  * @return string Unified diff of $before and $after
  */
 function wfDiff( $before, $after, $params = '-u' ) {
+   wfDeprecated( __METHOD__, '1.25');
if ( $before == $after ) {
return '';
}
diff --git a/includes/parser/ParserDiffTest.php 
b/includes/parser/ParserDiffTest.php
index 32f5d06..9fdd6eb 100644
--- a/includes/parser/ParserDiffTest.php
+++ b/includes/parser/ParserDiffTest.php
@@ -87,7 +87,10 @@
foreach ( $this->parsers as $i => $parser ) {
$resultsList[] = var_export( 
$results[$i], true );
}
-   $diff = wfDiff( $resultsList[0], 
$resultsList[1] );
+   //$diff = wfDiff( $resultsList[0], 
$resultsList[1] );
+   $diffs = new Diff( explode( "\n", 
$resultsList[0] ), explode( "\n", $resultsList[1] ) );
+   $diff = new UnifiedDiffFormatter();
+   $format->format( $diff );
} else {
$diff = '[too many parsers]';
}

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

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

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

[MediaWiki-commits] [Gerrit] [tox] shorten lines beneath 100 chars. - change (pywikibot/core)

2015-09-15 Thread jenkins-bot (Code Review)

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

Change subject: [tox] shorten lines beneath 100 chars.
..


[tox] shorten lines beneath 100 chars.

Change-Id: Idf2e45db2f83e9ea1a473b25430bc49b8a829e1d
---
M pywikibot/comms/rcstream.py
M scripts/harvest_template.py
M scripts/interwiki.py
3 files changed, 33 insertions(+), 16 deletions(-)

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



diff --git a/pywikibot/comms/rcstream.py b/pywikibot/comms/rcstream.py
index 68ebded..2cce8ae 100644
--- a/pywikibot/comms/rcstream.py
+++ b/pywikibot/comms/rcstream.py
@@ -163,7 +163,7 @@
 
 @raises ImportError
 
-[1] 
https://github.com/wikimedia/mediawiki/blob/master/includes/rcfeed/MachineReadableRCFeedFormatter.php
+[1]: See mediawiki/includes/rcfeed/MachineReadableRCFeedFormatter.php
 
 """
 try:
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index ec5fc3b..c1ea88c 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -85,7 +85,8 @@
 pywikibot.error(u'Template %s does not exist.' % temp.title())
 exit()
 
-pywikibot.output('Finding redirects...')  # Put some output here since 
it can take a while
+# Put some output here since it can take a while
+pywikibot.output('Finding redirects...')
 if temp.isRedirectPage():
 temp = temp.getRedirectTarget()
 titles = [page.title(withNamespace=False)
@@ -143,7 +144,9 @@
 template = pywikibot.Page(page.site, template,
   ns=10).title(withNamespace=False)
 except pywikibot.exceptions.InvalidTitle:
-pywikibot.error(u"Failed parsing template; '%s' should be the 
template name." % template)
+pywikibot.error(
+"Failed parsing template; '%s' should be the template 
name."
+% template)
 continue
 # We found the template we were looking for
 if template in self.templateTitles:
@@ -191,11 +194,15 @@
 if image.isRedirectPage():
 image = 
pywikibot.FilePage(image.getRedirectTarget())
 if not image.exists():
-pywikibot.output('[[%s]] doesn\'t exist so 
I can\'t link to it' % (image.title(),))
+pywikibot.output(
+'[[%s]] doesn\'t exist so I can\'t 
link to it'
+% (image.title(),))
 continue
 claim.setTarget(image)
 else:
-pywikibot.output("%s is not a supported 
datatype." % claim.type)
+pywikibot.output(
+'%s is not a supported datatype.'
+% claim.type)
 continue
 
 pywikibot.output('Adding %s --> %s'
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 58c46b1..5e51723 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -358,7 +358,8 @@
 
 import pywikibot
 
-from pywikibot import config, i18n, pagegenerators, textlib, interwiki_graph, 
titletranslate
+from pywikibot import config, i18n, pagegenerators, textlib, interwiki_graph
+from pywikibot import titletranslate
 from pywikibot.bot import ListOption, StandardOption
 from pywikibot.tools import first_upper
 
@@ -584,7 +585,8 @@
 elif arg.startswith('-neverlink:'):
 self.neverlink += arg[11:].split(",")
 elif arg.startswith('-ignore:'):
-self.ignore += [pywikibot.Page(pywikibot.Site(), p) for p in 
arg[8:].split(",")]
+self.ignore += [pywikibot.Page(pywikibot.Site(), p)
+for p in arg[8:].split(',')]
 elif arg.startswith('-ignorefile:'):
 ignorefile = arg[12:]
 ignorePageGen = pagegenerators.TextfilePageGenerator(ignorefile)
@@ -1055,7 +1057,8 @@
 return False
 if globalvar.autonomous:
 pywikibot.output(
-u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i."
+'NOTE: Ignoring link from page %s in namespace %i to page '
+'%s in namespace %i.'
 % (linkingPage, linkingPage.namespace(), linkedPage,
linkedPage.namespace()))
 # Fill up foundIn, so that we will not write this notice
@@ -1065,14 +1068,16 @@
 preferredPage = 
self.getFoundInCorrectNamespace(linkedPage.site)
 if preferredPage:
 pywikibot.output(
-u"NOTE: Ignoring link from page %s in na

< 1 2 3 4 5 >

301 - 400 of 458 matches

Mail list logo