[MediaWiki-commits] [Gerrit] fixup I84cdc5dcb8626d2cc1d18f963a8d6fdf4c99da6a - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: fixup I84cdc5dcb8626d2cc1d18f963a8d6fdf4c99da6a
..
fixup I84cdc5dcb8626d2cc1d18f963a8d6fdf4c99da6a
using self.getOption('always') instead of self.options['always']
Change-Id: Ie27946d546425b048cadea8a6ce0bd07b891bc91
---
M pywikibot/bot.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index d0a20f9..3f97014 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -880,7 +880,7 @@
if not self.user_confirm('Do you want to accept these changes?'):
return
-if 'async' not in kwargs and self.options['always']:
+if 'async' not in kwargs and self.getOption('always'):
kwargs['async'] = True
page.text = newtext
--
To view, visit https://gerrit.wikimedia.org/r/157785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie27946d546425b048cadea8a6ce0bd07b891bc91
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
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] gerrit: Enable StrictTransportSecurity max-age=7days - change (operations/puppet)
Chmarkine has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157789
Change subject: gerrit: Enable StrictTransportSecurity max-age=7days
..
gerrit: Enable StrictTransportSecurity max-age=7days
This enables HTTP Strict Transport Security (HSTS) on
gerrit with max-age=7 days.
Bug: 38516
Change-Id: I379248653df24799f15e53325eec482450ff3d92
---
M manifests/gerrit.pp
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/157789/1
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 079bec2..6dabfce 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -26,7 +26,7 @@
$dbuser = $db_user
$dbpass = $passwords::gerrit::gerrit_db_pass
$bzpass = $passwords::gerrit::gerrit_bz_pass
-$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
+$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat', '7')
# Setup LDAP
include ldap::role::config::labs
@@ -309,6 +309,8 @@
include ::apache::mod::proxy_http
include ::apache::mod::ssl
+
+include ::apache::mod::headers
}
class gerrit::crons {
--
To view, visit https://gerrit.wikimedia.org/r/157789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I379248653df24799f15e53325eec482450ff3d92
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chmarkine
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use TextContentHandler::getContentClass() - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Use TextContentHandler::getContentClass()
..
Use TextContentHandler::getContentClass()
See I70f1a3291 in core
Change-Id: I1006be1827531e195930cc4d8a3ea9e415291879
---
M includes/CampaignContentHandler.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CampaignContentHandler.php
b/includes/CampaignContentHandler.php
index c20de6c..5b8ec70 100644
--- a/includes/CampaignContentHandler.php
+++ b/includes/CampaignContentHandler.php
@@ -16,5 +16,7 @@
parent::__construct( $modelId, array( CONTENT_FORMAT_JSON ) );
}
- protected $contentClass = 'CampaignContent';
+ protected function getContentClass() {
+ return 'CampaignContent';
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/157770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1006be1827531e195930cc4d8a3ea9e415291879
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Gilles
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] article: Fix settings' icon alignment - change (mediawiki...Popups)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157788
Change subject: article: Fix settings' icon alignment
..
article: Fix settings' icon alignment
Bug: 70147
Change-Id: I26c41395557420aea6c995a59aada0079f1a896c
---
M resources/ext.popups.core.less
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/88/157788/1
diff --git a/resources/ext.popups.core.less b/resources/ext.popups.core.less
index 6a08e9b..b4f5471 100644
--- a/resources/ext.popups.core.less
+++ b/resources/ext.popups.core.less
@@ -95,6 +95,7 @@
.mwe-popups-settings-icon {
display: inline-block;
+ vertical-align: text-top;
cursor: pointer;
margin-left: 5px;
height: 16px;
--
To view, visit https://gerrit.wikimedia.org/r/157788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26c41395557420aea6c995a59aada0079f1a896c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Scenario test skipping tutorial preference - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Scenario test skipping tutorial preference
..
Scenario test skipping tutorial preference
Also adds @preferenceSet hook to reset preferences after the
scenario.
Change-Id: I0f4495f75fec04aac1f22f559d3e54c819b0f356
---
M tests/browser/features/step_definitions/upload_wizard_steps.rb
A tests/browser/features/support/hooks.rb
M tests/browser/features/support/pages/learn_page.rb
A tests/browser/features/support/pages/preferences_reset_page.rb
M tests/browser/features/upload_wizard.feature
5 files changed, 62 insertions(+), 3 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb
b/tests/browser/features/step_definitions/upload_wizard_steps.rb
index fc83382..80f0832 100644
--- a/tests/browser/features/step_definitions/upload_wizard_steps.rb
+++ b/tests/browser/features/step_definitions/upload_wizard_steps.rb
@@ -43,10 +43,16 @@
When(/^thumbnail should be visible$/) do
on(ReleaseRightsPage).thumbnail_element.when_present.should be_visible
end
+When(/^I click the Skip checkbox$/) do
+ on(LearnPage).check_skip
+end
Then(/^(.+) checkbox should be there$/) do |_|
on(LearnPage).skip_element.when_present.should be_visible
end
+Then(/^the tutorial should not be visible$/) do
+ on(LearnPage).tutorial_element.should_not be_visible
+end
Then(/^Describe page should open$/) do
@browser.url.should match /Special:UploadWizard/
end
diff --git a/tests/browser/features/support/hooks.rb
b/tests/browser/features/support/hooks.rb
new file mode 100644
index 000..5e60ddc
--- /dev/null
+++ b/tests/browser/features/support/hooks.rb
@@ -0,0 +1,17 @@
+#
+# This file is subject to the license terms in the COPYING file found in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING.
No part of
+# UploadWizard, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the COPYING file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
+#
+
+# After scenarios which set a preferences, reset all preferences to defaults.
+After('@preferenceSet') do
+ visit PreferencesResetPage
+ on(PreferencesResetPage).reset
+end
diff --git a/tests/browser/features/support/pages/learn_page.rb
b/tests/browser/features/support/pages/learn_page.rb
index 53f3c47..85cff9e 100644
--- a/tests/browser/features/support/pages/learn_page.rb
+++ b/tests/browser/features/support/pages/learn_page.rb
@@ -15,9 +15,10 @@
include URL
page_url URL.url("Special:UploadWizard")
- div(:next_parent, id: "mwe-upwiz-stepdiv-tutorial")
+ div(:tutorial, id: "mwe-upwiz-stepdiv-tutorial")
+
span(:next) do |page|
-page.next_parent_element.span_element(text: "Next")
+page.tutorial_element.span_element(text: "Next")
end
checkbox(:skip, id: "mwe-upwiz-skip")
end
diff --git a/tests/browser/features/support/pages/preferences_reset_page.rb
b/tests/browser/features/support/pages/preferences_reset_page.rb
new file mode 100644
index 000..3e5c5b3
--- /dev/null
+++ b/tests/browser/features/support/pages/preferences_reset_page.rb
@@ -0,0 +1,22 @@
+#
+# This file is subject to the license terms in the COPYING file found in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING.
No part of
+# UploadWizard, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the COPYING file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
+#
+class PreferencesResetPage
+ include PageObject
+
+ include URL
+ def self.url
+URL.url('Special:Preferences/reset')
+ end
+ page_url url
+
+ button(:reset, xpath:
"//form[@action='/wiki/Special:Preferences/reset']//input[@type='submit']")
+end
diff --git a/tests/browser/features/upload_wizard.feature
b/tests/browser/features/upload_wizard.feature
index 3670f59..343f132 100644
--- a/tests/browser/features/upload_wizard.feature
+++ b/tests/browser/features/upload_wizard.feature
@@ -9,6 +9,10 @@
# UploadWizard top-level directory and at
#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
#
+
+# IMPORTANT: For scenarios which set a preference, tag as @preferenceSet to
+# reset to defaults after they are finished. (See support/hooks.rb)
+
@chrome @commons.wikimedia.beta.wmflabs.org @firefox @login
@test2.wikipedia.org
Feature:
[MediaWiki-commits] [Gerrit] Test that login required when user logged out - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Test that login required when user logged out
..
Test that login required when user logged out
Change-Id: I4202b78db30da5e8ef32b9dd385e60997e0293dc
---
M tests/browser/features/step_definitions/upload_wizard_steps.rb
A tests/browser/features/support/pages/logout_page.rb
A tests/browser/features/upload_wizard_logged_out.feature
3 files changed, 48 insertions(+), 0 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb
b/tests/browser/features/step_definitions/upload_wizard_steps.rb
index fc83382..f387c10 100644
--- a/tests/browser/features/step_definitions/upload_wizard_steps.rb
+++ b/tests/browser/features/step_definitions/upload_wizard_steps.rb
@@ -9,6 +9,10 @@
# UploadWizard top-level directory and at
#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
#
+Given(/^I am logged out$/) do
+ visit LogoutPage
+end
+
When(/^click button Continue$/) do
on(UploadPage).continue_element.when_present(15).click
end
@@ -44,6 +48,9 @@
on(ReleaseRightsPage).thumbnail_element.when_present.should be_visible
end
+Then(/^link to log in should appear$/) do
+ on(UploadWizardPage).logged_in_element.should be_visible
+end
Then(/^(.+) checkbox should be there$/) do |_|
on(LearnPage).skip_element.when_present.should be_visible
end
diff --git a/tests/browser/features/support/pages/logout_page.rb
b/tests/browser/features/support/pages/logout_page.rb
new file mode 100644
index 000..1c08634
--- /dev/null
+++ b/tests/browser/features/support/pages/logout_page.rb
@@ -0,0 +1,22 @@
+# Encoding: utf-8
+# This file is subject to the license terms in the COPYING file found in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING.
+# No part of UploadWizard, including this file, may be copied, modified,
+# propagated, or distributed except according to the terms contained in the
+# COPYING file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
+
+# Simple page with no elements defined since visiting it does the trick
+class LogoutPage
+ include PageObject
+
+ include URL
+ def self.url
+URL.url('Special:UserLogout')
+ end
+ page_url url
+end
diff --git a/tests/browser/features/upload_wizard_logged_out.feature
b/tests/browser/features/upload_wizard_logged_out.feature
new file mode 100644
index 000..c03dc66
--- /dev/null
+++ b/tests/browser/features/upload_wizard_logged_out.feature
@@ -0,0 +1,19 @@
+#
+# This file is subject to the license terms in the COPYING file found in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING.
No part of
+# UploadWizard, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the COPYING file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
+#
+@chrome @commons.wikimedia.beta.wmflabs.org @firefox @login
@test2.wikipedia.org
+Feature: UploadWizard logged out
+
+ Scenario: Require login
+Given I am logged out
+When I navigate to Upload Wizard
+Then link to log in should appear
+
--
To view, visit https://gerrit.wikimedia.org/r/157321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4202b78db30da5e8ef32b9dd385e60997e0293dc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Neilk
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: Neilk
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Update cxserver (beta) config - change (operations/puppet)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157787
Change subject: WIP: Update cxserver (beta) config
..
WIP: Update cxserver (beta) config
Changes:
1. Added registry in config.erb
2. Added aperitum URL variable
3. apertium-* packages are no longer needed
Change-Id: I94597e7e78e97c4b34e3ad40c32a6ca97afeccfa
---
M manifests/role/cxserver.pp
M modules/cxserver/manifests/init.pp
M modules/cxserver/templates/config.erb
3 files changed, 104 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/157787/1
diff --git a/manifests/role/cxserver.pp b/manifests/role/cxserver.pp
index 88fd5be..ad798cd 100644
--- a/manifests/role/cxserver.pp
+++ b/manifests/role/cxserver.pp
@@ -13,12 +13,13 @@
}
class { '::cxserver':
-base_path => '/srv/deployment/cxserver/cxserver',
-node_path => '/srv/deployment/cxserver/deploy/node_modules',
-conf_path => '/srv/deployment/cxserver/config.js',
-log_dir => '/data/project/cxserver/log',
-parsoid => 'http://parsoid-lb.eqiad.wikimedia.org',
-require => [
+base_path => '/srv/deployment/cxserver/cxserver',
+node_path => '/srv/deployment/cxserver/deploy/node_modules',
+conf_path => '/srv/deployment/cxserver/config.js',
+log_dir=> '/data/project/cxserver/log',
+parsoid=> 'http://parsoid-lb.eqiad.wikimedia.org',
+apertium => 'http://apertium.wmflabs.org',
+require=> [
File['/srv/deployment/cxserver'],
File['/data/project/cxserver']
],
diff --git a/modules/cxserver/manifests/init.pp
b/modules/cxserver/manifests/init.pp
index cdd7264..b1e6853 100644
--- a/modules/cxserver/manifests/init.pp
+++ b/modules/cxserver/manifests/init.pp
@@ -18,6 +18,8 @@
# have write access to cxserver user.
# [*parsoid*]
# Url to parsoid service.
+# [*apertium*]
+# Url to apertium service.
# [*port*]
# Port where to run the cxserver service. Defaults to 8080.
@@ -28,13 +30,12 @@
$conf_path,
$log_dir,
$parsoid,
+$apertium,
$port=8080
) {
# apertium-* packages are for machine translation.
# dictd-* packages for dictionary server.
package { ['nodejs',
- 'apertium',
- 'apertium-es-ca',
'dictd',
'dict-freedict-eng-spa',
'dict-freedict-spa-eng',
diff --git a/modules/cxserver/templates/config.erb
b/modules/cxserver/templates/config.erb
index 2f91f67..89be2ef 100644
--- a/modules/cxserver/templates/config.erb
+++ b/modules/cxserver/templates/config.erb
@@ -7,5 +7,98 @@
module.exports = {
port: <%= @port %>,
logDir: '<%= @log_dir %>',
- 'parsoid.api': '<%= @parsoid %>'
+ 'parsoid.api': '<%= @parsoid %>',
+ 'mt.apertium.api': '<%= @apertium %>',
+ registry: {
+ ca: {
+ es: {
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ },
+ pt: {
+ mt: {
+ providers: [
+ 'Apertium'
+ ]
+ }
+ }
+ },
+ en: {
+ en: {
+ dictionary: {
+ providers: [
+ 'Dictd'
+ ]
+ }
+ },
+ es: {
+ dictionary: {
+ providers: [
+ 'JsonDict'
+ ]
+ }
+ },
+ hi: {
+ dictionary: {
+ providers: [
+ 'Dictd'
+ ]
+ }
+ },
+ ru: {
+ dictionary: {
+ providers: [
+ 'Dictd'
+ ]
+ }
+ },
+ de: {
+ dictionary: {
+ providers: [
+ 'Dictd'
+
[MediaWiki-commits] [Gerrit] iOS 8 fix for slide transitions. - change (apps...wikipedia)
Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157786
Change subject: iOS 8 fix for slide transitions.
..
iOS 8 fix for slide transitions.
Was doing crossfade when articles selected from nearby, recent
or saved pages.
Change-Id: I0e9c9a31618054908b3378d68b8bf4993cfa5ef3
---
M wikipedia/View Controllers/ModalOverlay/ModalMenuAndContentViewController.m
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/86/157786/1
diff --git a/wikipedia/View
Controllers/ModalOverlay/ModalMenuAndContentViewController.m b/wikipedia/View
Controllers/ModalOverlay/ModalMenuAndContentViewController.m
index 220c9f2..b7e9449 100644
--- a/wikipedia/View
Controllers/ModalOverlay/ModalMenuAndContentViewController.m
+++ b/wikipedia/View
Controllers/ModalOverlay/ModalMenuAndContentViewController.m
@@ -56,6 +56,11 @@
[self.view setNeedsUpdateConstraints];
}
+-(UIModalTransitionStyle)modalTransitionStyle
+{
+return self.presentedViewController.modalTransitionStyle;
+}
+
-(void)updateViewConstraints
{
[self constrainTopContainerHeight];
--
To view, visit https://gerrit.wikimedia.org/r/157786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e9c9a31618054908b3378d68b8bf4993cfa5ef3
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move flow-topic-comments message - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Move flow-topic-comments message .. Move flow-topic-comments message Well, I originally wanted to put it here, but that didn't seem to work. Now, however, it looks like it indeed belongs in where I put it with this patch. Damn browser cache or whatever made me mess up earlier :p Change-Id: I21884878dee968dce19f3e968e4e2884fba9e8c6 --- M Resources.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 07dbf77..a3a00b8 100644 --- a/Resources.php +++ b/Resources.php @@ -108,6 +108,7 @@ 'flow-toggle-small-topics', 'flow-toggle-topics', 'flow-toggle-topics-posts', + 'flow-topic-comments', 'flow-topic-action-hide-topic', 'flow-topic-action-close-topic', 'flow-topic-action-delete-topic', @@ -323,7 +324,6 @@ 'flow-error-fetch-after-open-close', 'mw-ui-unsubmitted-confirm', 'flow-reply-link', - 'flow-topic-comments', ) ) + $mobile, 'ext.flow.vendor.storer' => $flowResourceTemplate + array( -- To view, visit https://gerrit.wikimedia.org/r/156535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21884878dee968dce19f3e968e4e2884fba9e8c6 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: SG Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixup I84cdc5dcb8626d2cc1d18f963a8d6fdf4c99da6a - change (pywikibot/core)
Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157785
Change subject: fixup I84cdc5dcb8626d2cc1d18f963a8d6fdf4c99da6a
..
fixup I84cdc5dcb8626d2cc1d18f963a8d6fdf4c99da6a
using self.getOption('always') instead of self.options['always']
Change-Id: Ie27946d546425b048cadea8a6ce0bd07b891bc91
---
M pywikibot/bot.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/85/157785/1
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index d0a20f9..3f97014 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -880,7 +880,7 @@
if not self.user_confirm('Do you want to accept these changes?'):
return
-if 'async' not in kwargs and self.options['always']:
+if 'async' not in kwargs and self.getOption('always'):
kwargs['async'] = True
page.text = newtext
--
To view, visit https://gerrit.wikimedia.org/r/157785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie27946d546425b048cadea8a6ce0bd07b891bc91
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
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] fix highlighting template variable (v 1.9.2) - change (mediawiki...CodeMirror)
jenkins-bot has submitted this change and it was merged.
Change subject: fix highlighting template variable (v 1.9.2)
..
fix highlighting template variable (v 1.9.2)
Change-Id: Iea975300c0ce1a3f80f75bff1be7b013bad4c420
---
M CodeMirror.php
M resources/mode/mediawiki/mediawiki.js
2 files changed, 3 insertions(+), 8 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CodeMirror.php b/CodeMirror.php
index 4093108..ecc2f05 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-const EXT_CODEMIRROR_VERSION = '1.9.1';
+const EXT_CODEMIRROR_VERSION = '1.9.2';
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(
diff --git a/resources/mode/mediawiki/mediawiki.js
b/resources/mode/mediawiki/mediawiki.js
index c51eed3..8fbb6ab 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -143,19 +143,14 @@
style.push( 'string' );
break;
case 'TemplateVariable':
- if ( stream.eatWhile( /[^\}\&]/ ) ) {
+ if ( stream.eatWhile( /[^\}\[\]<\{\|\&]/ ) ) {
return 'variable-2';
}
if ( stream.match( '}}}' ) ) {
state.ImInBlock.pop();
return 'variable-2';
}
- if ( stream.peek() === '&' ) {
- style = ['variable-2'];
- } else {
- stream.next();
- return 'variable-2';
- }
+ style = ['variable-2'];
break;
case 'ParserFunctionName':
if ( stream.match(
/#?[^\s\u00a0\}\[\]<\{\'\|\&\:]+/ ) ) { // FIXME: {{#name}} and and {{uc}} are
wrong, must have ':'
--
To view, visit https://gerrit.wikimedia.org/r/157784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea975300c0ce1a3f80f75bff1be7b013bad4c420
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov
Gerrit-Reviewer: Pastakhov
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] prepare db1067 for upgrade - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: prepare db1067 for upgrade
..
prepare db1067 for upgrade
Change-Id: I0a514f0bfc303997e0e680fac3f2fbde41ee5bec
---
M manifests/site.pp
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 6f8c4c9..ecdfbc2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -780,7 +780,7 @@
}
}
-node /^db10(02|09|18|36|54|60|63|67)\.eqiad\.wmnet/ {
+node /^db10(02|09|18|36|54|60|63)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
@@ -852,6 +852,15 @@
}
}
+node /^db10(67)\.eqiad\.wmnet/ {
+
+include admin
+$cluster = 'mysql'
+class { 'role::mariadb::core':
+shard => 's2',
+}
+}
+
node /^db10(35|44)\.eqiad\.wmnet/ {
include admin
--
To view, visit https://gerrit.wikimedia.org/r/157783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a514f0bfc303997e0e680fac3f2fbde41ee5bec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] prepare db1067 for upgrade - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157783
Change subject: prepare db1067 for upgrade
..
prepare db1067 for upgrade
Change-Id: I0a514f0bfc303997e0e680fac3f2fbde41ee5bec
---
M manifests/site.pp
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/157783/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 6f8c4c9..ecdfbc2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -780,7 +780,7 @@
}
}
-node /^db10(02|09|18|36|54|60|63|67)\.eqiad\.wmnet/ {
+node /^db10(02|09|18|36|54|60|63)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
@@ -852,6 +852,15 @@
}
}
+node /^db10(67)\.eqiad\.wmnet/ {
+
+include admin
+$cluster = 'mysql'
+class { 'role::mariadb::core':
+shard => 's2',
+}
+}
+
node /^db10(35|44)\.eqiad\.wmnet/ {
include admin
--
To view, visit https://gerrit.wikimedia.org/r/157783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a514f0bfc303997e0e680fac3f2fbde41ee5bec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix highlighting template variable (v 1.9.2) - change (mediawiki...CodeMirror)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157784
Change subject: fix highlighting template variable (v 1.9.2)
..
fix highlighting template variable (v 1.9.2)
Change-Id: Iea975300c0ce1a3f80f75bff1be7b013bad4c420
---
M CodeMirror.php
M resources/mode/mediawiki/mediawiki.js
2 files changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/84/157784/1
diff --git a/CodeMirror.php b/CodeMirror.php
index 4093108..ecc2f05 100644
--- a/CodeMirror.php
+++ b/CodeMirror.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-const EXT_CODEMIRROR_VERSION = '1.9.1';
+const EXT_CODEMIRROR_VERSION = '1.9.2';
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(
diff --git a/resources/mode/mediawiki/mediawiki.js
b/resources/mode/mediawiki/mediawiki.js
index c51eed3..8fbb6ab 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -143,19 +143,14 @@
style.push( 'string' );
break;
case 'TemplateVariable':
- if ( stream.eatWhile( /[^\}\&]/ ) ) {
+ if ( stream.eatWhile( /[^\}\[\]<\{\|\&]/ ) ) {
return 'variable-2';
}
if ( stream.match( '}}}' ) ) {
state.ImInBlock.pop();
return 'variable-2';
}
- if ( stream.peek() === '&' ) {
- style = ['variable-2'];
- } else {
- stream.next();
- return 'variable-2';
- }
+ style = ['variable-2'];
break;
case 'ParserFunctionName':
if ( stream.match(
/#?[^\s\u00a0\}\[\]<\{\'\|\&\:]+/ ) ) { // FIXME: {{#name}} and and {{uc}} are
wrong, must have ':'
--
To view, visit https://gerrit.wikimedia.org/r/157784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea975300c0ce1a3f80f75bff1be7b013bad4c420
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Use ContentHandler for the Gadget namespace - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157782
Change subject: [WIP] Use ContentHandler for the Gadget namespace
..
[WIP] Use ContentHandler for the Gadget namespace
Bug: 69318
Change-Id: I0c7a0b36918202f7f17c1304fe7b4976e18b1d49
---
M Gadgets.hooks.php
M Gadgets.php
A content/GadgetCssContent.php
A content/GadgetCssContentHandler.php
A content/GadgetJsContent.php
A content/GadgetJsContentHandler.php
A content/GadgetScriptDeletionUpdate.php
A content/GadgetScriptSecondaryDataUpdate.php
8 files changed, 173 insertions(+), 64 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/82/157782/1
diff --git a/Gadgets.hooks.php b/Gadgets.hooks.php
index 331bdba..d4a59ea 100644
--- a/Gadgets.hooks.php
+++ b/Gadgets.hooks.php
@@ -37,6 +37,26 @@
}
/**
+* @param Title $title
+* @param string $model
+* @return bool
+*/
+ public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
+ if ( $title->inNamespace( NS_GADGET ) ) {
+ switch ( GadgetPageList::determineExtension( $title ) )
{
+ case 'js':
+ $model = 'GadgetJs';
+ return false;
+ case 'css':
+ $model = 'GadgetCss';
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
* Update the database entry for a gadget if the description page is
* newer than the database entry.
* @param $title Title object
@@ -84,51 +104,6 @@
public static function gadgetDefinitionImport( $title, $origTitle,
$revCount, $sRevCount, $pageInfo ) {
self::gadgetDefinitionUpdateIfChanged( $title );
- return true;
- }
-
- /**
-* ArticleDeleteComplete hook handler.
-*
-* @param $article Article
-* @param $user User
-* @param $reason String: Deletion summary
-* @param $id Int: Page ID
-*/
- public static function cssJsPageDelete( $article, $user, $reason, $id )
{
- GadgetPageList::delete( $article->getTitle() );
- return true;
- }
-
- /**
-* ArticleSaveComplete hook handler.
-*
-* @param $article Article
-* @param $user User
-* @param $text String: New page text
-* @param $summary String: Edit summary
-* @param $isMinor Bool: Whether this was a minor edit
-* @param $isWatch unused
-* @param $section unused
-* @param $flags: Int: Bitmap of flags passed to WikiPage::doEdit()
-* @param $revision: Revision object for the new revision
-*/
- public static function cssOrJsPageSaveComplete( $article, $user, $text,
$summary, $isMinor,
- $isWatch, $section, $flags, $revision )
- {
- $title = $article->getTitle();
- GadgetPageList::updatePageStatus( $title );
- return true;
- }
-
- /**
-* ArticleUndelete hook handler
-* @param $title Title object
-* @param $created Bool: Whether this undeletion recreated the page
-* @param $comment String: Undeletion summary
-*/
- public static function cssOrJsPageUndelete( $title, $created, $comment
) {
- GadgetPageList::updatePageStatus( $title );
return true;
}
@@ -418,20 +393,6 @@
/**
* @param Title $title
-* @param bool $result
-* @return bool
-*/
- public static function onTitleIsCssOrJsPage( Title $title, &$result ) {
- if ( $title->inNamespace( NS_GADGET )
- && preg_match( '!\.(css|js)$!u', $title->getText() )
- ) {
- $result = true;
- }
- return true;
- }
-
- /**
-* @param Title $title
* @param $result
* @return bool
*/
@@ -478,9 +439,7 @@
}
/**
-* If E:CodeEditor is installed, use it for Gadget definition pages
-* JavaScript/CSS pages in the Gadget namespace are automatically
-* taken care of
+* If E:CodeEditor is installed, use it
*
* @param Title $title
* @param string $lang
@@ -491,6 +450,14 @@
$lang = 'javascript';
}
+ if ( $title->inNamespace( NS_GADGET ) ) {
+ if ( $title->hasContentModel( 'GadgetJs' ) ) {
+ $lang = 'javascript';
+ } elseif ( $title->hasContentModel( 'GadgetCss' ) )
[MediaWiki-commits] [Gerrit] iOS 8 needs a couple changes to request location info. - change (apps...wikipedia)
Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157781
Change subject: iOS 8 needs a couple changes to request location info.
..
iOS 8 needs a couple changes to request location info.
Change-Id: Icfe9a8a2d8abc410846eb6b0b91f64898c995015
---
M wikipedia/View Controllers/Nearby/NearbyViewController.m
M wikipedia/Wikipedia-Info.plist
2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/81/157781/1
diff --git a/wikipedia/View Controllers/Nearby/NearbyViewController.m
b/wikipedia/View Controllers/Nearby/NearbyViewController.m
index 347adca..c1163eb 100644
--- a/wikipedia/View Controllers/Nearby/NearbyViewController.m
+++ b/wikipedia/View Controllers/Nearby/NearbyViewController.m
@@ -114,6 +114,12 @@
self.nearbyDataArray = @[@[]];
self.locationManager = [[CLLocationManager alloc] init];
self.locationManager.activityType = CLActivityTypeFitness;
+
+// Needed by iOS 8.
+if (NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1) {
+[self.locationManager requestWhenInUseAuthorization];
+}
+
self.imageFetchQ =
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
self.placeholderImage = [UIImage
imageNamed:@"logo-placeholder-nearby.png"];
NSArray *cachePaths =
NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
diff --git a/wikipedia/Wikipedia-Info.plist b/wikipedia/Wikipedia-Info.plist
index 12de9a8..1678573 100644
--- a/wikipedia/Wikipedia-Info.plist
+++ b/wikipedia/Wikipedia-Info.plist
@@ -56,5 +56,7 @@
UIViewControllerBasedStatusBarAppearance
+ NSLocationWhenInUseUsageDescription
+
--
To view, visit https://gerrit.wikimedia.org/r/157781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfe9a8a2d8abc410846eb6b0b91f64898c995015
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use https for www.aclu.org - change (wikimedia/TransparencyReport)
Prtksxna has submitted this change and it was merged. Change subject: Use https for www.aclu.org .. Use https for www.aclu.org In I136d08dd, the link to www.aclu.org was changed to protocol relative. But https://www.aclu.org is https only, so this patch changes the link to https. Change-Id: Idf6655dc6ad5b5d4a741b071cc6a26bfaf00c5a4 --- M build/faq.html M locales/en.yml 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Prtksxna: Verified; Looks good to me, approved diff --git a/build/faq.html b/build/faq.html index e2067b2..1458519 100644 --- a/build/faq.html +++ b/build/faq.html @@ -74,7 +74,7 @@ Help! My personal information is being sought because of something I did on the Wikimedia projects. What should I do? - If you are the subject of a subpoena, it is highly recommended that you consult your own lawyer immediately. There are a number of organizations that will fight on a user's behalf, like the American Civil Liberties Union (ACLU) or the Electronic Frontier Foundation (EFF). If you need help finding an attorney, WMF may be able to put you in touch with some of these organizations or help you secure an attorney at reduced or pro-bono rates. In rare cases, assistance may also be available under our Legal Fees Assistance Program or Defense of Contributors Program.Additionally, in certain situations, WMF may challenge a subpoena on a user’s behalf if it is unnecessarily broad or burdensome, or if we believe the subpoena threatens the free speech of users on our projects. For more information about subpoenas, see our Subpoena FAQ. + If you are the subject of a subpoena, it is highly recommended that you consult your own lawyer immediately. There are a number of organizations that will fight on a user's behalf, like the American Civil Liberties Union (ACLU) or the Electronic Frontier Foundation (EFF). If you need help finding an attorney, WMF may be able to put you in touch with some of these organizations or help you secure an attorney at reduced or pro-bono rates. In rare cases, assistance may also be available under our Legal Fees Assistance Program or Defense of Contributors Program.Additionally, in certain situations, WMF may challenge a subpoena on a user’s behalf if it is unnecessarily broad or burdensome, or if we believe the subpoena threatens the free speech of users on our projects. For more information about subpoenas, see our Subpoena FAQ. diff --git a/locales/en.yml b/locales/en.yml index aae548f..0f7443d 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -99,7 +99,7 @@ q_nonpublic_personal_information: "When would you not tell a user that his or her nonpublic personal information is being disclosed as a result of a legal process, such as a subpoena?" a_nonpublic_personal_information: "We are committed to notifying users if we plan on disclosing nonpublic personal information. However, we cannot notify a user if we are legally restrained from doing so (e.g. by a gag order), if a credible threat to life or limb is present, or if the user has not provided us with an e-mail address or valid contact information." q_my_personal_information: "Help! My personal information is being sought because of something I did on the Wikimedia projects. What should I do?" -a_my_personal_information: "If you are the subject of a subpoena, it is highly recommended that you consult your own lawyer immediately. There are a number of organizations that will fight on a user's behalf, like the American Civil Liberties Union (ACLU) or the Electronic Frontier Foundation (EFF). If you need help finding an attorney, WMF may be able to put you in touch with some of these organizations or help you secure an attorney at reduced or pro-bono rates. In rare cases, assistance may also be available under our Legal Fees Assistance Program or Defense of Contributors Program.Additionally, in certain situations, WMF may challenge a subpoena on a user’s behalf if it is unnecessarily broad or burdensome, or if we believe the subpoena threatens the free speech of users on our projects. For more information about subpoenas, see our Subpoena FAQ. " +a_my_personal_information: "If you are the subject of a subpoena, it is highly recommended that you consult your own lawyer immediately. There are a number of organizations that will fight on a user's behalf, like the American Civil Liberties Union (ACLU) or the Electronic Frontier Foundation (EFF). If you need help finding an attorney, WMF may be able to put you in touch with some of these organizations or help you secure an attorney at reduced or pro-bono rates. In rare cases, assistance may also be available under our Legal Fees Assistance Program or Defense of Contributors Program.Additionally, in certain situations, WMF may challenge a subpoena on a user’s behalf if it is unnece
[MediaWiki-commits] [Gerrit] prepare db1035 for upgrade - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: prepare db1035 for upgrade
..
prepare db1035 for upgrade
Change-Id: I13d2c3a74f4ff3c895e41326ee2a68991b59ef1b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index a3a2a4d..6f8c4c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -790,7 +790,7 @@
}
}
-node /^db10(03|19|35|38)\.eqiad\.wmnet/ {
+node /^db10(03|19|38)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
@@ -852,7 +852,7 @@
}
}
-node /^db10(44)\.eqiad\.wmnet/ {
+node /^db10(35|44)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/157780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13d2c3a74f4ff3c895e41326ee2a68991b59ef1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] prepare db1035 for upgrade - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157780
Change subject: prepare db1035 for upgrade
..
prepare db1035 for upgrade
Change-Id: I13d2c3a74f4ff3c895e41326ee2a68991b59ef1b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/157780/1
diff --git a/manifests/site.pp b/manifests/site.pp
index a3a2a4d..6f8c4c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -790,7 +790,7 @@
}
}
-node /^db10(03|19|35|38)\.eqiad\.wmnet/ {
+node /^db10(03|19|38)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
@@ -852,7 +852,7 @@
}
}
-node /^db10(44)\.eqiad\.wmnet/ {
+node /^db10(35|44)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/157780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13d2c3a74f4ff3c895e41326ee2a68991b59ef1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1035 for upgrade, move s3 vslow/dump to db1019 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: depool db1035 for upgrade, move s3 vslow/dump to db1019 .. depool db1035 for upgrade, move s3 vslow/dump to db1019 Change-Id: Ia1758b21e6d69e9fa786261cbe60ce4c558f4032 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d58ca15..458e363 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -109,9 +109,9 @@ ), /* s3 */ 'DEFAULT' => array( 'db1038' => 0, # 1.4TB 64GB - 'db1035' => 0, # 1.4TB 64GB, snapshot, vslow, dump + # rebuild 'db1035' => 0, # 1.4TB 64GB, snapshot 'db1003' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager - 'db1019' => 400, # 1.4TB 64GB + 'db1019' => 0, # 1.4TB 64GB, vslow, dump 'db1027' => 400, # 1.4TB 64GB 'db1044' => 400, # 1.4TB 64GB ), @@ -187,10 +187,10 @@ ), /* s3 */ 'DEFAULT' => array( 'vslow' => array( - 'db1035' => 1, + 'db1019' => 1, ), 'dump' => array( - 'db1035' => 1, + 'db1019' => 1, ), 'watchlist' => array( 'db1003' => 1, -- To view, visit https://gerrit.wikimedia.org/r/157779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1758b21e6d69e9fa786261cbe60ce4c558f4032 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1035 for upgrade, move s3 vslow/dump to db1019 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/157779 Change subject: depool db1035 for upgrade, move s3 vslow/dump to db1019 .. depool db1035 for upgrade, move s3 vslow/dump to db1019 Change-Id: Ia1758b21e6d69e9fa786261cbe60ce4c558f4032 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/79/157779/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d58ca15..458e363 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -109,9 +109,9 @@ ), /* s3 */ 'DEFAULT' => array( 'db1038' => 0, # 1.4TB 64GB - 'db1035' => 0, # 1.4TB 64GB, snapshot, vslow, dump + # rebuild 'db1035' => 0, # 1.4TB 64GB, snapshot 'db1003' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager - 'db1019' => 400, # 1.4TB 64GB + 'db1019' => 0, # 1.4TB 64GB, vslow, dump 'db1027' => 400, # 1.4TB 64GB 'db1044' => 400, # 1.4TB 64GB ), @@ -187,10 +187,10 @@ ), /* s3 */ 'DEFAULT' => array( 'vslow' => array( - 'db1035' => 1, + 'db1019' => 1, ), 'dump' => array( - 'db1035' => 1, + 'db1019' => 1, ), 'watchlist' => array( 'db1003' => 1, -- To view, visit https://gerrit.wikimedia.org/r/157779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1758b21e6d69e9fa786261cbe60ce4c558f4032 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge commit '433b95a' - change (mediawiki...VisualEditor)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/157778 Change subject: Merge commit '433b95a' .. Merge commit '433b95a' Change-Id: I5df245525413ceb206325910a4db8c12d35af0ab --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/78/157778/1 -- To view, visit https://gerrit.wikimedia.org/r/157778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5df245525413ceb206325910a4db8c12d35af0ab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: MarkAHershberger ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Adding removing options from browsing component - change (analytics/dashiki)
Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/15
Change subject: [WIP] Adding removing options from browsing component
..
[WIP] Adding removing options from browsing component
Adding/removing options from side bar. Only interactions.
No style yet.
Change-Id: I34096c205f2d464efd68d6d962c16ab27dde6af9
---
M src/app/apis/wikimetrics.js
M src/components/project-selector/project-selector.html
M src/components/project-selector/project-selector.js
M src/components/wikimetrics-layout/wikimetrics-layout.html
M src/components/wikimetrics-layout/wikimetrics-layout.js
M src/css/layouts.css
M src/lib/logger.js
M stubs/fake-wikimetrics/projectLanguageChoices.json
8 files changed, 310 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/77/15/1
diff --git a/src/app/apis/wikimetrics.js b/src/app/apis/wikimetrics.js
index dae97af..f32fdc1 100644
--- a/src/app/apis/wikimetrics.js
+++ b/src/app/apis/wikimetrics.js
@@ -9,8 +9,13 @@
this.root = config.wikimetricsDomain;
this.projectOptions = [];
this.languageOptions = [];
+/** project selection present upon bootstrap **/
+this.defaultProjects = [];
this.urlProjectLanguageChoices = config.urlProjectLanguageChoices;
this.categorizedMetricsUrl = config.categorizedMetricsUrl;
+
+/** Given a project returns language and project friendly names*/
+this.reverseLookup = {};
}
@@ -80,6 +85,13 @@
this.languageOptions = map.call(json[0], function (data) {
return new LanguageOption(data);
});
+
+this.defaultProjects = map.call(json[2], function (data) {
+return new ProjectOption(data);
+});
+//super hardcoded and fake
+this.reverseLookup = json[3];
+
callback();
}.bind(this));
@@ -106,7 +118,7 @@
*
* {category: 'some category', name: 'some metric'}
**/
-WikimetricsApi.prototype.getCategorizedMetrics = function(callback) {
+WikimetricsApi.prototype.getCategorizedMetrics = function (callback) {
return $.get(this.categorizedMetricsUrl).done(callback);
};
diff --git a/src/components/project-selector/project-selector.html
b/src/components/project-selector/project-selector.html
index a9d86f3..68fdb1b 100644
--- a/src/components/project-selector/project-selector.html
+++ b/src/components/project-selector/project-selector.html
@@ -4,16 +4,32 @@
projectOptions: projectOptions,
languageOptions: languageOptions,
select: displaySecondLevel
- }" class="typeahead search_box" autocomplete="off" size="20"/>
+ } , event
{blur:function(data,event){setTimeout(hideSecondLevel.bind($data),500)}}"
class="typeahead search_box" autocomplete="off" size="20"/>
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/project-selector/project-selector.js
b/src/components/project-selector/project-selector.js
index 6d7d113..d5b46e8 100644
--- a/src/components/project-selector/project-selector.js
+++ b/src/components/project-selector/project-selector.js
@@ -1,22 +1,146 @@
/* jshint -W098 */
define(['knockout', 'text!./project-selector.html', './bindings'], function
(ko, templateMarkup) {
'use strict';
+/**
+* A selection item is of this form
+{
+ 'name': projectData.name,
+'languages': [{
+'name': language,
+'project': data.project
+}]
+}
+**/
+function SelectionItem(projectName, project, languageName) {
+this.name = projectName;
+this.languages = [];
+if (project && projectName) {
+this.addLanguage(project, languageName);
+}
+
+
+}
+
+function LanguageItem(project, languageName) {
+this.name = languageName;
+this.project = project;
+}
+
+/** Adds a language to the project selection if it is not already there **/
+SelectionItem.prototype.addLanguage = function (project, languageName) {
+var found = false;
+for (var i = 0; i < this.languages.length; i++) {
+if (this.languages[i].project.trim() === project.trim()) {
+found = true;
+break;
+}
+}
+if (!found) {
+this.languages.push(new LanguageItem(project, languageName));
+}
+};
+
+SelectionItem.prototype.addLanguages = function (languages) {
+this.languages = languages;
+};
+
function ProjectSelector(params) {
-
+var self = this;
this.projectOptions = params.projectOp
[MediaWiki-commits] [Gerrit] Add debugging help to VisualEditor - change (mediawiki...VisualEditor)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157775
Change subject: Add debugging help to VisualEditor
..
Add debugging help to VisualEditor
VE doesn't use the debug log at all, it seems. This adds a single
wfDebugLog call so that the person using the debug log can see that it
actually does hit VE.
Also, returns better information for parsoid errors.
For example, without it, a parsoid misconfiguration of setInterwiki()
gives:
Error loading data from server: parsoidserver-http-bad-status:
500. Would you like to retry?
with it, you get something like the following:
Error loading data from server: parsoidserver-http-bad-status:
500: Page Fetch failure for "BADURL": Error: getaddrinfo
ENOTFOUND. Would you like to retry?
or
Error loading data from server: parsoidserver-http-bad-status:
500: Page Fetch failure for "BADURL": 404. Would you like to
retry?
Change-Id: I52db9fac42d7c0228b93ce3caec470fff98254f0
---
M ApiVisualEditor.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/75/157775/1
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 70d3488..155b5f0 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -83,7 +83,7 @@
} else {
$message = 'MWHttpRequest error';
}
- $this->dieUsage( $message, 'parsoidserver-' . $code );
+ $this->dieUsage( "$message: " . $req->getContent(),
'parsoidserver-' . $code );
}
// TODO pass through X-Parsoid-Performance header, merge with
getHTML above
return $req->getContent();
@@ -306,6 +306,7 @@
$html = gzinflate( base64_decode( substr( $html, 11 ) )
);
}
+ wfDebugLog( 'visualeditor', "called on '$page' with paction:
'{$params['paction']}'" );
switch ( $params['paction'] ) {
case 'parse':
$parsed = $this->getHTML( $page, $parserParams
);
--
To view, visit https://gerrit.wikimedia.org/r/157775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52db9fac42d7c0228b93ce3caec470fff98254f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Scenario test skipping tutorial preference - change (mediawiki...UploadWizard)
Neilk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157776
Change subject: Scenario test skipping tutorial preference
..
Scenario test skipping tutorial preference
Also adds @preferenceSet hook to reset preferences after the
scenario.
Change-Id: I0f4495f75fec04aac1f22f559d3e54c819b0f356
---
M tests/browser/features/step_definitions/upload_wizard_steps.rb
A tests/browser/features/support/hooks.rb
M tests/browser/features/support/pages/learn_page.rb
A tests/browser/features/support/pages/preferences_reset_page.rb
M tests/browser/features/upload_wizard.feature
5 files changed, 62 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/76/157776/1
diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb
b/tests/browser/features/step_definitions/upload_wizard_steps.rb
index fc83382..80f0832 100644
--- a/tests/browser/features/step_definitions/upload_wizard_steps.rb
+++ b/tests/browser/features/step_definitions/upload_wizard_steps.rb
@@ -43,10 +43,16 @@
When(/^thumbnail should be visible$/) do
on(ReleaseRightsPage).thumbnail_element.when_present.should be_visible
end
+When(/^I click the Skip checkbox$/) do
+ on(LearnPage).check_skip
+end
Then(/^(.+) checkbox should be there$/) do |_|
on(LearnPage).skip_element.when_present.should be_visible
end
+Then(/^the tutorial should not be visible$/) do
+ on(LearnPage).tutorial_element.should_not be_visible
+end
Then(/^Describe page should open$/) do
@browser.url.should match /Special:UploadWizard/
end
diff --git a/tests/browser/features/support/hooks.rb
b/tests/browser/features/support/hooks.rb
new file mode 100644
index 000..5e60ddc
--- /dev/null
+++ b/tests/browser/features/support/hooks.rb
@@ -0,0 +1,17 @@
+#
+# This file is subject to the license terms in the COPYING file found in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING.
No part of
+# UploadWizard, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the COPYING file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
+#
+
+# After scenarios which set a preferences, reset all preferences to defaults.
+After('@preferenceSet') do
+ visit PreferencesResetPage
+ on(PreferencesResetPage).reset
+end
diff --git a/tests/browser/features/support/pages/learn_page.rb
b/tests/browser/features/support/pages/learn_page.rb
index 53f3c47..85cff9e 100644
--- a/tests/browser/features/support/pages/learn_page.rb
+++ b/tests/browser/features/support/pages/learn_page.rb
@@ -15,9 +15,10 @@
include URL
page_url URL.url("Special:UploadWizard")
- div(:next_parent, id: "mwe-upwiz-stepdiv-tutorial")
+ div(:tutorial, id: "mwe-upwiz-stepdiv-tutorial")
+
span(:next) do |page|
-page.next_parent_element.span_element(text: "Next")
+page.tutorial_element.span_element(text: "Next")
end
checkbox(:skip, id: "mwe-upwiz-skip")
end
diff --git a/tests/browser/features/support/pages/preferences_reset_page.rb
b/tests/browser/features/support/pages/preferences_reset_page.rb
new file mode 100644
index 000..3e5c5b3
--- /dev/null
+++ b/tests/browser/features/support/pages/preferences_reset_page.rb
@@ -0,0 +1,22 @@
+#
+# This file is subject to the license terms in the COPYING file found in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING.
No part of
+# UploadWizard, including this file, may be copied, modified, propagated, or
+# distributed except according to the terms contained in the COPYING file.
+#
+# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
+# UploadWizard top-level directory and at
+#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
+#
+class PreferencesResetPage
+ include PageObject
+
+ include URL
+ def self.url
+URL.url('Special:Preferences/reset')
+ end
+ page_url url
+
+ button(:reset, xpath:
"//form[@action='/wiki/Special:Preferences/reset']//input[@type='submit']")
+end
diff --git a/tests/browser/features/upload_wizard.feature
b/tests/browser/features/upload_wizard.feature
index 3670f59..343f132 100644
--- a/tests/browser/features/upload_wizard.feature
+++ b/tests/browser/features/upload_wizard.feature
@@ -9,6 +9,10 @@
# UploadWizard top-level directory and at
#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
#
+
+# IMPORTANT: For scenarios which set a preference, tag as @preferenceSet to
+# reset to defaults after they are finished. (See support/hooks.rb)
+
@chrome @commons.wikimedia.beta.w
[MediaWiki-commits] [Gerrit] [DO NOT MERGE] Disable JavaScript for MSIE7 users - change (mediawiki/core)
Eloquence has uploaded a new change for review. https://gerrit.wikimedia.org/r/157774 Change subject: [DO NOT MERGE] Disable JavaScript for MSIE7 users .. [DO NOT MERGE] Disable JavaScript for MSIE7 users This should not be merged before Id333e495 is. MSIE7 is outdated and unsupported (on Windows XP). It has several unpatched security vulnerabilities. [1] Supporting its JavaScript engine requires significant testing and development effort which is better spent elsewhere. This effectively demotes MSIE7 to "Grade C" status per the MediaWiki browser compatibility standards. [2] More detailed justification in [3]. [1] http://secunia.com/community/advisories/product/12366 [2] https://www.mediawiki.org/wiki/Compatibility#Grade_C [3] https://lists.wikimedia.org/pipermail/wikitech-l/2014-August/077958.html Change-Id: I2ce43dd94aba1aab947e51857d374fb9ed164228 --- M RELEASE-NOTES-1.24 M resources/src/startup.js M tests/qunit/suites/resources/startup.test.js 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/74/157774/1 diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index c5b6cd4..c7ca88b 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -415,8 +415,8 @@ setPreloadedText() from EditPage.php. (deprecated since 1.21) * Removed global functions wfArrayLookup(), wfArrayMerge(), wfDebugDieBacktrace() and wfTime(). (deprecated since 1.22) -* Browser support for Internet Explorer 6 lowered from Grade A to Grade C, - meaning that JavaScript is no longer executed in this browser. +* Browser support for Internet Explorer 6 and 7 lowered from Grade A to Grade C, + meaning that JavaScript is no longer executed in these browser versions. * Browser support for Opera 11 lowered from Grade A to Grade C. * Removed IEFixes module which existed purely to provide support for MSIE versions below 7 (conditionally loaded only for those browsers). diff --git a/resources/src/startup.js b/resources/src/startup.js index 56bb3d3..a62cc9d 100644 --- a/resources/src/startup.js +++ b/resources/src/startup.js @@ -25,8 +25,8 @@ // Browsers with outdated or limited JavaScript engines get the no-JS experience return !( - // Internet Explorer < 7 - ( ua.indexOf( 'MSIE' ) !== -1 && parseFloat( ua.split( 'MSIE' )[1] ) < 7 ) || + // Internet Explorer < 8 + ( ua.indexOf( 'MSIE' ) !== -1 && parseFloat( ua.split( 'MSIE' )[1] ) < 8 ) || // Firefox < 3 ( ua.indexOf( 'Firefox/' ) !== -1 && parseFloat( ua.split( 'Firefox/' )[1] ) < 3 ) || // Opera < 12 diff --git a/tests/qunit/suites/resources/startup.test.js b/tests/qunit/suites/resources/startup.test.js index 7dec626..ed03418 100644 --- a/tests/qunit/suites/resources/startup.test.js +++ b/tests/qunit/suites/resources/startup.test.js @@ -21,8 +21,7 @@ 'Mozilla/5.0 (Windows NT 6.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36 OPR/15.0.1147.153', 'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36 OPR/16.0.1196.62', 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.125 Safari/537.36 OPR/23.0.1522.75', - // Internet Explorer 7+ - 'Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 6.0; en-US)', + // Internet Explorer 8+ 'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 5.2; Trident/4.0; Media Center PC 4.0; SLCC1; .NET CLR 3.0.04320)', 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)', 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)', @@ -43,12 +42,13 @@ 'Mozilla/5.0 (Linux; U; Android 2.1; en-us; Nexus One Build/ERD62) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17' ], gradeC: [ - // Internet Explorer < 7 + // Internet Explorer < 8 'Mozilla/2.0 (compatible; MSIE 3.03; Windows 3.1)', 'Mozilla/4.0 (compatible; MSIE 4.01; Windows 95)', 'Mozilla/4.0 (compatible; MSIE 5.0; Windows 98;)', 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)', 'Mozilla/5.0 (compatible; MSIE 6.0; Windows NT 5.1)', + 'Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 6.0; en-US)', // Firefox < 3 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.2) Gecko/20060308 Firefox/1.5.0.2', 'Mozilla/5.0 (X11; U; Linux i686; nl; rv:1.8.1.1) Gecko/20
[MediaWiki-commits] [Gerrit] resourceloader: Restore cond-wrap for html-embedded module r... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157773
Change subject: resourceloader: Restore cond-wrap for html-embedded module
responses
..
resourceloader: Restore cond-wrap for html-embedded module responses
Follows-up 9272bc6c47, 03c503da22.
* In 9272bc6c47, the condition wrap was removed from
OutputPage for no reason. This went unnnoticed as I had also
accidentally made the cond wrap in makeModuleResponse apply
to both only=scripts and regular (faux) responses, such as by
OutputPage embedding private modules.
* In 03c503da22, the latter bug was fixed, thus exposing the former.
Change-Id: Id333e4958ed769831fabca02164c1e8505962d57
---
M includes/OutputPage.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/73/157773/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a58a79a..af90ca6 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2797,7 +2797,9 @@
);
} else {
$links['html'] .=
Html::inlineScript(
-
$resourceLoader->makeModuleResponse( $context, $grpModules )
+
ResourceLoader::makeLoaderConditionalScript(
+
$resourceLoader->makeModuleResponse( $context, $grpModules )
+ )
);
}
$links['html'] .= "\n";
--
To view, visit https://gerrit.wikimedia.org/r/157773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id333e4958ed769831fabca02164c1e8505962d57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Remove JSONContentHandler::$contentClass - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157772
Change subject: Remove JSONContentHandler::$contentClass
..
Remove JSONContentHandler::$contentClass
Was deprecated in I70f1a3291.
Change-Id: I92d0fae344e158b9c46f2297c78a2e65fc3516db
---
M includes/content/JSONContentHandler.php
1 file changed, 0 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/72/157772/1
diff --git a/includes/content/JSONContentHandler.php
b/includes/content/JSONContentHandler.php
index 33f2036..bd074ad 100644
--- a/includes/content/JSONContentHandler.php
+++ b/includes/content/JSONContentHandler.php
@@ -27,16 +27,6 @@
}
/**
-* Temporary back-compat until extensions
-* are updated to override this
-*
-* @return string
-*/
- protected function getContentClass() {
- return $this->contentClass;
- }
-
- /**
* Returns the english language, because JSON is english, and should be
handled as such.
*
* @param Title $title
--
To view, visit https://gerrit.wikimedia.org/r/157772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92d0fae344e158b9c46f2297c78a2e65fc3516db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use TextContentHandler::getContentClass() - change (mediawiki...EventLogging)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157771
Change subject: Use TextContentHandler::getContentClass()
..
Use TextContentHandler::getContentClass()
See I70f1a3291 in core
Change-Id: I1006be1827531e195930cc4d8a3ea9e415291879
---
M includes/JsonSchemaContentHandler.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/71/157771/1
diff --git a/includes/JsonSchemaContentHandler.php
b/includes/JsonSchemaContentHandler.php
index daf7299..4ed1d74 100644
--- a/includes/JsonSchemaContentHandler.php
+++ b/includes/JsonSchemaContentHandler.php
@@ -15,5 +15,7 @@
parent::__construct( $modelId, array( CONTENT_FORMAT_JSON ) );
}
- protected $contentClass = 'JsonSchemaContent';
+ protected function getContentClass() {
+ return 'JsonSchemaContent';
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/157771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1006be1827531e195930cc4d8a3ea9e415291879
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use TextContentHandler::getContentClass() - change (mediawiki...UploadWizard)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157770
Change subject: Use TextContentHandler::getContentClass()
..
Use TextContentHandler::getContentClass()
See I70f1a3291 in core
Change-Id: I1006be1827531e195930cc4d8a3ea9e415291879
---
M includes/CampaignContentHandler.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/70/157770/1
diff --git a/includes/CampaignContentHandler.php
b/includes/CampaignContentHandler.php
index c20de6c..5b8ec70 100644
--- a/includes/CampaignContentHandler.php
+++ b/includes/CampaignContentHandler.php
@@ -16,5 +16,7 @@
parent::__construct( $modelId, array( CONTENT_FORMAT_JSON ) );
}
- protected $contentClass = 'CampaignContent';
+ protected function getContentClass() {
+ return 'CampaignContent';
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/157770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1006be1827531e195930cc4d8a3ea9e415291879
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for ssh access to gerrit - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157769
Change subject: Add support for ssh access to gerrit
..
Add support for ssh access to gerrit
Add a new 'forward_agent' setting and ssh known host data for
gerrit.wikimedia.org. This can be used in conjunction with the `vagrant
hiera` command or manual changes to puppet/hieradata/local.yaml to
configure cloning from gerrit.wikimedia.org via ssh:
$ vagrant config forward_agent yes
$ vagrant hiera git::urlformat ssh://u...@gerrit.wikimedia.org:29418/%s.git
$ vagrant up
Change-Id: I745de79f02411c11c7cf232b0f9bccc2c82415c4
---
M Vagrantfile
M lib/mediawiki-vagrant/settings/definitions.rb
M lib/mediawiki-vagrant/version.rb
A puppet/modules/git/manifests/gerrit.pp
M puppet/modules/git/manifests/init.pp
5 files changed, 33 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/69/157769/1
diff --git a/Vagrantfile b/Vagrantfile
index d1dbb07..280e2d4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -56,6 +56,8 @@
config.vm.hostname = 'mediawiki-vagrant.dev'
config.package.name = 'mediawiki.box'
+config.ssh.forward_agent = settings[:forward_agent]
+
# Default VirtualBox provider
config.vm.provider :virtualbox do |vb, override|
override.vm.box = 'trusty-cloud'
diff --git a/lib/mediawiki-vagrant/settings/definitions.rb
b/lib/mediawiki-vagrant/settings/definitions.rb
index 773c041..b2d08fe 100644
--- a/lib/mediawiki-vagrant/settings/definitions.rb
+++ b/lib/mediawiki-vagrant/settings/definitions.rb
@@ -33,6 +33,12 @@
default: !Vagrant::Util::Platform.windows?,
coercion: ->(setting, new) { !!(new.to_s =~ /^(true|t|yes|y|1)$/i) }
+setting :forward_agent,
+description: "Enable agent forwarding over SSH connections by default",
+help: "Enter 'yes' or 'no'. Agent forwarding requires an SSH agent
running on the host computer.",
+default: false,
+coercion: ->(setting, new) { !!(new.to_s =~ /^(true|t|yes|y|1)$/i) }
+
setting :forward_ports,
internal: true,
default: {},
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index 6c62800..ca65348 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
module MediaWikiVagrant
-VERSION = '0.1.3'
+VERSION = '0.1.4'
end
diff --git a/puppet/modules/git/manifests/gerrit.pp
b/puppet/modules/git/manifests/gerrit.pp
new file mode 100644
index 000..19e7fe9
--- /dev/null
+++ b/puppet/modules/git/manifests/gerrit.pp
@@ -0,0 +1,22 @@
+# == Class: git::gerrit
+#
+# Provision ssh configuration for access to gerrit.wikimedia.org
+#
+class git::gerrit {
+
+sshkey { 'gerrit.wikimedia.org':
+ensure => 'present',
+key=>
'B3NzaC1yc2EDAQABgQCF8pwFLehzCXhbF1jfHWtd9d1LFq2NirplEBQYs7AOrGwQ/6ZZI0gvZFYiEiaw1o+F1CMfoHdny1VfWOJF3mJ1y9QMKAacc8/Z3tG39jBKRQCuxmYLO1SWymv7/Uvx9WQlkNRoTdTTa9OJFy6UqvLQEXKYaokfMIUHZ+oVFf1CgQ==',
+type => 'ssh-rsa',
+}
+
+# https://tickets.puppetlabs.com/browse/PUP-2900
+file { '/etc/ssh/ssh_known_hosts':
+ensure => 'present',
+owner => 'root',
+group => 'root',
+mode => '0644',
+}
+
+Sshkey <| |> -> File['/etc/ssh/ssh_known_hosts']
+}
diff --git a/puppet/modules/git/manifests/init.pp
b/puppet/modules/git/manifests/init.pp
index ed6d966..4829023 100644
--- a/puppet/modules/git/manifests/init.pp
+++ b/puppet/modules/git/manifests/init.pp
@@ -21,6 +21,8 @@
class git(
$urlformat = 'https://gerrit.wikimedia.org/r/p/%s.git',
) {
+include ::git::gerrit
+
package { 'git':
ensure => latest,
}
--
To view, visit https://gerrit.wikimedia.org/r/157769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I745de79f02411c11c7cf232b0f9bccc2c82415c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stylize MungTitle.inc - change (mediawiki...DumpHTML)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157768
Change subject: Stylize MungTitle.inc
..
Stylize MungTitle.inc
Change-Id: I87057481c946f3bda35a815bd6899aeed3b2d46c
---
M MungeTitle.inc
1 file changed, 58 insertions(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DumpHTML
refs/changes/68/157768/1
diff --git a/MungeTitle.inc b/MungeTitle.inc
index 1b87692..b624da5 100644
--- a/MungeTitle.inc
+++ b/MungeTitle.inc
@@ -2,88 +2,36 @@
// see https://bugzilla.wikimedia.org/show_bug.cgi?id=8147
-class MungeTitle
-{
- function __construct($type = FALSE)
- {
- if (!$type)
+class MungeTitle {
+ function __construct( $type = false ) {
+ if ( !$type ) {
$type = 'default';
+ }
- $fun = array('MungeTitle', 'munge' . ucfirst($type));
- if (is_callable($fun)) {
+ $fun = array( 'MungeTitle', 'munge' . ucfirst( $type ) );
+ if ( is_callable( $fun ) ) {
$this->method = $fun;
- }
- else
- {
- throw new Exception("no such titlemunger exists:
{$type}");
- }
- }
-
- function munge($path)
- {
- return call_user_func($this->method, $path);
- }
-
- function getMethod()
- {
- return get_class($this) . "::" . $this->method[1];
- }
-
- static function mungeDefault($path)
- {
- $path = self::truncate_unique($path);
- $path = self::getHashedDirectory($path, 3)."/".$path;
- return $path;
- }
-
- static function mungeMd5($path)
- {
-
- $path = urldecode($path);
- $match = array();
- preg_match("!(?:[^./]+)(?[.][^./]+)$!", $path, $match);
- $path = md5($path) . $match['ext'];
- $path = self::getHashedDirectory($path, 3)."/".substr($path, 3);
-
- return $path;
- }
-
- static function mungeWindows( $name ) {
-
- global $wgLang;
- # Replace illegal characters for Windows paths with underscores
- $friendlyName = strtr( $name, '/\\*?"<>|~', '_' );
-
- # Work out lower case form. We assume we're on a system with
case-insensitive
- # filenames, so unless the case is of a special form, we have
to disambiguate
- if ( function_exists( 'mb_strtolower' ) ) {
- $lowerCase = $wgLang->ucfirst( mb_strtolower( $name ) );
} else {
- $lowerCase = ucfirst( strtolower( $name ) );
+ throw new Exception( "no such titlemunger exists:
{$type}" );
}
-
- # Handle colon specially by replacing it with tilde
- # Thus we reduce the number of paths with hashes appended
- $friendlyName = str_replace( ':', '~', $friendlyName );
- $friendlyName = self::truncate_unique($friendlyName);
- $friendlyName = self::getHashedDirectory($friendlyName,
3)."/".$friendlyName;
-
- return $friendlyName;
}
- static function truncate_unique($filename)
- {
+ static function mungeDefault( $path ) {
+ $path = self::truncate_unique( $path );
+ $path = self::getHashedDirectory( $path, 3 ) . "/" . $path;
+ return $path;
+ }
+
+ static function truncate_unique( $filename ) {
$max_length = 255 - 5; // .html
- if (strlen($filename) > $max_length)
- {
+ if ( strlen( $filename ) > $max_length ) {
# Make it mostly unique
- $filename = substr($filename, 0, $max_length) . '_' .
substr(md5( $filename ), 0, 4);
+ $filename = substr( $filename, 0, $max_length ) . '_' .
substr( md5( $filename ), 0, 4);
}
return $filename;
}
- static function getHashedDirectory( &$filename, $depth )
- {
+ static function getHashedDirectory( &$filename, $depth ) {
# Find the first colon if there is one, use characters after it
$p = strpos( $filename, ':' );
if ( $p !== false ) {
@@ -122,4 +70,45 @@
}
return $dir;
}
+
+ static function mungeMd5( $path ) {
+ $path = urldecode($path);
+ $match = array();
+ preg_match( "!(?:[^./]+)(?[.][^./]+)$!", $path, $match );
+ $path = md5($path) . $match['ext'];
+ $path = self::getHashedDirectory( $path, 3 ) . "/" . substr(
$path, 3 );
+
+ return $path;
+
[MediaWiki-commits] [Gerrit] Default skin is offline - change (mediawiki...DumpHTML)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/157767 Change subject: Default skin is offline .. Default skin is offline Per code below: $skin = isset( $options['k'] ) ? $options['k'] : 'offline'; Change-Id: Iea367dfdc69ed0a69a9e1d4614024fe921ad5b08 --- M dumpHTML.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DumpHTML refs/changes/67/157767/1 diff --git a/dumpHTML.php b/dumpHTML.php index 762ebf2..7b9a930 100644 --- a/dumpHTML.php +++ b/dumpHTML.php @@ -14,7 +14,7 @@ -d destination directory -sstart ID -e end ID - -k skin to use (defaults to htmldump) + -k skin to use (defaults to offline) --no-overwrite skip existing HTML files --checkpoint use a checkpoint file to allow restarting of interrupted dumps --slice split the job into m segments and do the n'th one -- To view, visit https://gerrit.wikimedia.org/r/157767 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea367dfdc69ed0a69a9e1d4614024fe921ad5b08 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DumpHTML Gerrit-Branch: master Gerrit-Owner: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add --prefix parameter to importDump.php The --prefix parame... - change (mediawiki/core)
leucosticte has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157766
Change subject: Add --prefix parameter to importDump.php The --prefix parameter
causes imported pages to have a prefix prepended, e.g. --prefix=User:Foo/
..
Add --prefix parameter to importDump.php
The --prefix parameter causes imported pages to have a prefix
prepended, e.g. --prefix=User:Foo/
Bug: 70272
Change-Id: Ife742171b30f1d9a99ac85ae80a84f022ee7f289
---
M maintenance/importDump.php
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/66/157766/1
diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 1f75bcc..5755936 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -39,6 +39,7 @@
public $uploads = false;
public $imageBasePath = false;
public $nsFilter = false;
+ public $prefix = false;
function __construct() {
parent::__construct();
@@ -68,6 +69,7 @@
$this->addOption( 'namespaces',
'Import only the pages from namespaces belonging to the
list of ' .
'pipe-separated namespace names or namespace indexes',
false, true );
+ $this->addOption( 'prefix', 'Prepend a prefix to imported
pages', false, true );
$this->addOption( 'dry-run', 'Parse dump without actually
importing pages' );
$this->addOption( 'debug', 'Output extra verbose debug
information' );
$this->addOption( 'uploads', 'Process file upload data if
included (experimental)' );
@@ -96,6 +98,9 @@
}
if ( $this->hasOption( 'namespaces' ) ) {
$this->setNsfilter( explode( '|', $this->getOption(
'namespaces' ) ) );
+ }
+ if ( $this->hasOption( 'prefix' ) ) {
+ $this->prefix = $this->getOption( 'prefix' );
}
if ( $this->hasArg() ) {
@@ -161,6 +166,10 @@
return;
}
+ if ( $this->prefix ) {
+ $title = Title::newFromText( $this->prefix .
$title->getFullText() );
+ $rev->setTitle( $title );
+ }
if ( $this->skippedNamespace( $title ) ) {
return;
--
To view, visit https://gerrit.wikimedia.org/r/157766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife742171b30f1d9a99ac85ae80a84f022ee7f289
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: leucosticte
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed request() and output() from class "MediaWiki" - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Removed request() and output() from class "MediaWiki"
..
Removed request() and output() from class "MediaWiki"
Also removed the todo, as the folding was done years ago.
Change-Id: I4953ec3ca650bab9154c07a3a73f1f6ca4ee071e
---
M includes/MediaWiki.php
1 file changed, 0 insertions(+), 25 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 0424633..9213c02 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -27,7 +27,6 @@
*/
class MediaWiki {
/**
-* @todo Fold $output, etc, into this
* @var IContextSource
*/
private $context;
@@ -36,30 +35,6 @@
* @var Config
*/
private $config;
-
- /**
-* @param null|WebRequest $x
-* @return WebRequest
-*/
- public function request( WebRequest $x = null ) {
- $old = $this->context->getRequest();
- if ( $x ) {
- $this->context->setRequest( $x );
- }
- return $old;
- }
-
- /**
-* @param null|OutputPage $x
-* @return OutputPage
-*/
- public function output( OutputPage $x = null ) {
- $old = $this->context->getOutput();
- if ( $x ) {
- $this->context->setOutput( $x );
- }
- return $old;
- }
/**
* @param IContextSource|null $context
--
To view, visit https://gerrit.wikimedia.org/r/146830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4953ec3ca650bab9154c07a3a73f1f6ca4ee071e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname
Gerrit-Reviewer: Aaron Schulz
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] [FIX] Improved flake8/flake8-docstring handling - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157765
Change subject: [FIX] Improved flake8/flake8-docstring handling
..
[FIX] Improved flake8/flake8-docstring handling
In 5426720bfe83e37aec032e8afcd9470294293ac4 the textlib redirects
have been dynamically deprecated, but because flake8 is unable to
detect that __all__ gets concatinated a workaround was used which
'fixed' flake8. But pep257 is unable to handle that and throws an
AllError. pep257 also throws an AllError, when the content of the
list doesn't begin in the same line as the __all__.
This also fixes the warning pep257 returned, when __all__ wasn't
a tuple in tests/__init__.
Change-Id: I6dc66f0082ae594c63b99c8c022ab38cdc705dec
---
M pywikibot/__init__.py
M tests/__init__.py
2 files changed, 34 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/65/157765/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 6804291..34ddc42 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -47,40 +47,40 @@
import pywikibot.textlib as textlib
import pywikibot.tools
-textlib_methods = (
-'unescape', 'replaceExcept', 'removeDisabledParts', 'removeHTMLParts',
-'isDisabled', 'interwikiFormat', 'interwikiSort',
-'getLanguageLinks', 'replaceLanguageLinks',
-'removeLanguageLinks', 'removeLanguageLinksAndSeparator',
-'getCategoryLinks', 'categoryFormat', 'replaceCategoryLinks',
-'removeCategoryLinks', 'removeCategoryLinksAndSeparator',
-'replaceCategoryInPlace', 'compileLinkR', 'extract_templates_and_params',
-)
-__all__ = (
-'config', 'ui', 'UnicodeMixin', 'translate',
-'Page', 'FilePage', 'ImagePage', 'Category', 'Link', 'User',
-'ItemPage', 'PropertyPage', 'Claim', 'TimeStripper',
-'html2unicode', 'url2unicode', 'unicode2html',
-'stdout', 'output', 'warning', 'error', 'critical', 'debug', 'exception',
-'input', 'inputChoice', 'handleArgs', 'showHelp', 'ui', 'log',
-'calledModuleName', 'Bot', 'WikidataBot',
-'Error', 'InvalidTitle', 'BadTitle', 'NoPage', 'SectionError',
-'NoSuchSite', 'NoUsername', 'UserBlocked',
-'PageRelatedError', 'IsRedirectPage', 'IsNotRedirectPage',
-'PageNotSaved', 'UploadWarning', 'LockedPage', 'EditConflict',
-'ServerError', 'FatalServerError', 'Server504Error',
-'CaptchaError', 'SpamfilterError', 'CircularRedirect',
-'WikiBaseError', 'CoordinateGlobeUnknownException',
-'QuitKeyboardInterrupt',
-)
-# flake8 is unable to detect concatenation in the same operation
-# like:
-# ) + textlib_methods
-# so instead use this trick
-globals()['__all__'] = __all__ + textlib_methods
+# Because flake8 doesn't understand concatination of multiple tuples and then
+# setting it to __all__, the textlib methods are integrated into the list
+# Because the number of textlib methods shouldn't change, we can use a magic
+# number later when creating the deprecate redirects. But this means that the
+# first 19 elements may not be edited.
+# Also pep257 doesn't understand when the first entry is on the next line
+__all__ = ('unescape', 'replaceExcept', 'removeDisabledParts',
'removeHTMLParts',
+ 'isDisabled', 'interwikiFormat', 'interwikiSort',
+ 'getLanguageLinks', 'replaceLanguageLinks',
+ 'removeLanguageLinks', 'removeLanguageLinksAndSeparator',
+ 'getCategoryLinks', 'categoryFormat', 'replaceCategoryLinks',
+ 'removeCategoryLinks', 'removeCategoryLinksAndSeparator',
+ 'replaceCategoryInPlace', 'compileLinkR',
'extract_templates_and_params',
+ # above are textlib methods (are deprecated)
+ # don't (!) add entries to them
+ 'config', 'ui', 'UnicodeMixin', 'translate',
+ 'Page', 'FilePage', 'ImagePage', 'Category', 'Link', 'User',
+ 'ItemPage', 'PropertyPage', 'Claim', 'TimeStripper',
+ 'html2unicode', 'url2unicode', 'unicode2html',
+ 'stdout', 'output', 'warning', 'error', 'critical', 'debug',
'exception',
+ 'input', 'inputChoice', 'handleArgs', 'showHelp', 'ui', 'log',
+ 'calledModuleName', 'Bot', 'WikidataBot',
+ 'Error', 'InvalidTitle', 'BadTitle', 'NoPage', 'SectionError',
+ 'NoSuchSite', 'NoUsername', 'UserBlocked',
+ 'PageRelatedError', 'IsRedirectPage', 'IsNotRedirectPage',
+ 'PageNotSaved', 'UploadWarning', 'LockedPage', 'EditConflict',
+ 'ServerError', 'FatalServerError', 'Server504Error',
+ 'CaptchaError', 'SpamfilterError', 'CircularRedirect',
+ 'WikiBaseError', 'CoordinateGlobeUnknownException',
+ 'QuitKeyboardInterrupt',
+ )
-for _name in textlib_methods:
+for _name in range(19): # magic number
target = getattr(textlib, _name)
wrapped_func = redirect_func(target)
globals()[_name] = wrapped_func
diff --git a/tests/__init_
[MediaWiki-commits] [Gerrit] Surface all internal errors we don't handle - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Surface all internal errors we don't handle
..
Surface all internal errors we don't handle
Also fix stupid typo.
THIS IS WHY YOU DO NOT SELF MERGE
Change-Id: I6fa7fa6d2672a40fe20a4aa8e61d0600e2440bbe
---
M quarry/web/worker.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/worker.py b/quarry/web/worker.py
index 7313b35..92a6cf6 100644
--- a/quarry/web/worker.py
+++ b/quarry/web/worker.py
@@ -85,7 +85,7 @@
qrun.status = QueryRun.STATUS_KILLED
conn.session.add(qrun)
conn.session.commit()
-elif e[0] == 1054: # Unknwon column in Select, for some reason this
is an InternalError
+else: # Surfacing it to the user is always better than just silently
failing
write_error(qrun, e[1])
except pymysql.DatabaseError as e:
write_error(qrun, e[1])
@@ -100,6 +100,6 @@
def write_error(qrun, error):
qrun.status = QueryRun.STATUS_FAILED
qrun.extra_info = json.dumps({'error': error})
-conn.sesion.add(qrun)
+conn.session.add(qrun)
conn.session.commit()
celery_log.info("Completed run for qrun:%s with failure: %s", qrun.id,
error)
--
To view, visit https://gerrit.wikimedia.org/r/157764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6fa7fa6d2672a40fe20a4aa8e61d0600e2440bbe
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
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] Surface all internal errors we don't handle - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157764
Change subject: Surface all internal errors we don't handle
..
Surface all internal errors we don't handle
Also fix stupid typo.
THIS IS WHY YOU DO NOT SELF MERGE
Change-Id: I6fa7fa6d2672a40fe20a4aa8e61d0600e2440bbe
---
M quarry/web/worker.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/64/157764/1
diff --git a/quarry/web/worker.py b/quarry/web/worker.py
index 7313b35..92a6cf6 100644
--- a/quarry/web/worker.py
+++ b/quarry/web/worker.py
@@ -85,7 +85,7 @@
qrun.status = QueryRun.STATUS_KILLED
conn.session.add(qrun)
conn.session.commit()
-elif e[0] == 1054: # Unknwon column in Select, for some reason this
is an InternalError
+else: # Surfacing it to the user is always better than just silently
failing
write_error(qrun, e[1])
except pymysql.DatabaseError as e:
write_error(qrun, e[1])
@@ -100,6 +100,6 @@
def write_error(qrun, error):
qrun.status = QueryRun.STATUS_FAILED
qrun.extra_info = json.dumps({'error': error})
-conn.sesion.add(qrun)
+conn.session.add(qrun)
conn.session.commit()
celery_log.info("Completed run for qrun:%s with failure: %s", qrun.id,
error)
--
To view, visit https://gerrit.wikimedia.org/r/157764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fa7fa6d2672a40fe20a4aa8e61d0600e2440bbe
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle MySQL error about wrong name in SELECT - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Handle MySQL error about wrong name in SELECT
..
Handle MySQL error about wrong name in SELECT
Stupid Exception hierarchy is stupid
Change-Id: I14cd9ba7e62db1be06b9a80825dcad1900073311
---
M quarry/web/worker.py
1 file changed, 11 insertions(+), 7 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/worker.py b/quarry/web/worker.py
index 1c02864..7313b35 100644
--- a/quarry/web/worker.py
+++ b/quarry/web/worker.py
@@ -85,17 +85,21 @@
qrun.status = QueryRun.STATUS_KILLED
conn.session.add(qrun)
conn.session.commit()
-else:
-raise
+elif e[0] == 1054: # Unknwon column in Select, for some reason this
is an InternalError
+write_error(qrun, e[1])
except pymysql.DatabaseError as e:
-qrun.status = QueryRun.STATUS_FAILED
-qrun.extra_info = json.dumps({'error': e.args[1]})
-conn.session.add(qrun)
-conn.session.commit()
-celery_log.info("Completed run for qrun:%s with failure: %s", qrun.id,
e.args[1])
+write_error(qrun, e[1])
finally:
if cur is not False:
# It is possible the cursor was never created,
# so check before we try to close it
cur.close()
conn.close_session()
+
+
+def write_error(qrun, error):
+qrun.status = QueryRun.STATUS_FAILED
+qrun.extra_info = json.dumps({'error': error})
+conn.sesion.add(qrun)
+conn.session.commit()
+celery_log.info("Completed run for qrun:%s with failure: %s", qrun.id,
error)
--
To view, visit https://gerrit.wikimedia.org/r/157763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14cd9ba7e62db1be06b9a80825dcad1900073311
Gerrit-PatchSet: 3
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
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] Handle MySQL error about wrong name in SELECT - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157763
Change subject: Handle MySQL error about wrong name in SELECT
..
Handle MySQL error about wrong name in SELECT
Stupid Exception hierarchy is stupid
Change-Id: I14cd9ba7e62db1be06b9a80825dcad1900073311
---
M quarry/web/worker.py
1 file changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/63/157763/1
diff --git a/quarry/web/worker.py b/quarry/web/worker.py
index 1c02864..d8ccf10 100644
--- a/quarry/web/worker.py
+++ b/quarry/web/worker.py
@@ -85,17 +85,21 @@
qrun.status = QueryRun.STATUS_KILLED
conn.session.add(qrun)
conn.session.commit()
-else:
-raise
+elif e[0] = 1054: # Unknwon column in Select, for some reason this is
an InternalError
+write_error(qrun, e[1])
except pymysql.DatabaseError as e:
-qrun.status = QueryRun.STATUS_FAILED
-qrun.extra_info = json.dumps({'error': e.args[1]})
-conn.session.add(qrun)
-conn.session.commit()
-celery_log.info("Completed run for qrun:%s with failure: %s", qrun.id,
e.args[1])
+write_error(qrun, e[1])
finally:
if cur is not False:
# It is possible the cursor was never created,
# so check before we try to close it
cur.close()
conn.close_session()
+
+
+def write_error(qrun, error):
+qrun.status = QueryRun.STATUS_FAILED
+qrun.extra_info = json.dumps({'error': error})
+conn.sesion.add(qrun)
+conn.session.commit()
+celery_log.info("Completed run for qrun:%s with failure: %s", qrun.id,
e.args[1])
--
To view, visit https://gerrit.wikimedia.org/r/157763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14cd9ba7e62db1be06b9a80825dcad1900073311
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't re-use sessions across celery runs - change (analytics...web)
jenkins-bot has submitted this change and it was merged. Change subject: Don't re-use sessions across celery runs .. Don't re-use sessions across celery runs Change-Id: I651b96df6cb453dfc6d783044570ea134d4e5e7d --- M quarry/web/connections.py M quarry/web/worker.py 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/quarry/web/connections.py b/quarry/web/connections.py index 3e5a2a1..4bba96d 100644 --- a/quarry/web/connections.py +++ b/quarry/web/connections.py @@ -64,3 +64,8 @@ self._session.close() if hasattr(self, '_db_engine'): self._db_engine.dispose() + +def close_session(self): +if hasattr(self, '_session'): +self._session.close() +del self._session diff --git a/quarry/web/worker.py b/quarry/web/worker.py index 1384715..1c02864 100644 --- a/quarry/web/worker.py +++ b/quarry/web/worker.py @@ -98,3 +98,4 @@ # It is possible the cursor was never created, # so check before we try to close it cur.close() +conn.close_session() -- To view, visit https://gerrit.wikimedia.org/r/157762 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I651b96df6cb453dfc6d783044570ea134d4e5e7d Gerrit-PatchSet: 1 Gerrit-Project: analytics/quarry/web Gerrit-Branch: master Gerrit-Owner: Yuvipanda 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] Don't re-use sessions across celery runs - change (analytics...web)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/157762 Change subject: Don't re-use sessions across celery runs .. Don't re-use sessions across celery runs Change-Id: I651b96df6cb453dfc6d783044570ea134d4e5e7d --- M quarry/web/connections.py M quarry/web/worker.py 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web refs/changes/62/157762/1 diff --git a/quarry/web/connections.py b/quarry/web/connections.py index 3e5a2a1..4bba96d 100644 --- a/quarry/web/connections.py +++ b/quarry/web/connections.py @@ -64,3 +64,8 @@ self._session.close() if hasattr(self, '_db_engine'): self._db_engine.dispose() + +def close_session(self): +if hasattr(self, '_session'): +self._session.close() +del self._session diff --git a/quarry/web/worker.py b/quarry/web/worker.py index 1384715..1c02864 100644 --- a/quarry/web/worker.py +++ b/quarry/web/worker.py @@ -98,3 +98,4 @@ # It is possible the cursor was never created, # so check before we try to close it cur.close() +conn.close_session() -- To view, visit https://gerrit.wikimedia.org/r/157762 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I651b96df6cb453dfc6d783044570ea134d4e5e7d Gerrit-PatchSet: 1 Gerrit-Project: analytics/quarry/web Gerrit-Branch: master Gerrit-Owner: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upload: mandatory description required for upload - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Upload: mandatory description required for upload
..
Upload: mandatory description required for upload
upload.py will continue to require a description until a non-empty
string is provided or the user quits.
Also fixed line length > 80.
Bug 60042 - Problem with uploading files
Change-Id: Ida45314a56e7a7db7eacc99b749c01d7730ef667
---
M scripts/upload.py
1 file changed, 41 insertions(+), 23 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
XZise: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/scripts/upload.py b/scripts/upload.py
index 39f9df5..5ab1607 100755
--- a/scripts/upload.py
+++ b/scripts/upload.py
@@ -45,9 +45,11 @@
import tempfile
import re
import math
+
import pywikibot
import pywikibot.data.api
from pywikibot import config
+from pywikibot.bot import QuitKeyboardInterrupt
class UploadRobot:
@@ -79,9 +81,7 @@
self.uploadByUrl = uploadByUrl
def urlOK(self):
-"""Return true if self.url looks like an URL or an existing local file.
-
-"""
+"""Return True if self.url is an URL or an existing local file."""
return "://" in self.url or os.path.exists(self.url)
def read_file_content(self):
@@ -102,7 +102,8 @@
infile = uo.open(self.url)
if 'text/html' in infile.info().getheader('Content-Type'):
-pywikibot.output(u"Couldn't download the image: the requested
URL was not found on server.")
+pywikibot.output(u"Couldn't download the image: "
+ "the requested URL was not found on server.")
return
content_len = infile.info().getheader('Content-Length')
@@ -134,7 +135,7 @@
dt += 60
else:
pywikibot.log(
-u"WARNING: No check length to retrieved data is possible.")
+u"WARNING: length check of retrieved data not possible.")
handle, tempname = tempfile.mkstemp()
t = os.fdopen(handle, "wb")
t.write(_contents)
@@ -174,7 +175,8 @@
invalid = set(forbidden) & set(newfn)
if invalid:
c = "".join(invalid)
-pywikibot.output("Invalid character(s): %s. Please try
again" % c)
+pywikibot.output(
+'Invalid character(s): %s. Please try again' % c)
continue
if ext not in allowed_formats:
choice = pywikibot.inputChoice(
@@ -187,20 +189,34 @@
if newfn != '':
filename = newfn
# A proper description for the submission.
-pywikibot.output(u"The suggested description is:")
-pywikibot.output(self.description)
-if self.verifyDescription:
-newDescription = u''
-choice = pywikibot.inputChoice(
-u'Do you want to change this description?',
-['Yes', 'No'], ['y', 'N'], 'n')
-if choice == 'y':
-from pywikibot import editor as editarticle
-editor = editarticle.TextEditor()
-newDescription = editor.edit(self.description)
-# if user saved / didn't press Cancel
-if newDescription:
-self.description = newDescription
+# Empty descriptions are not accepted.
+pywikibot.output(u'The suggested description is:\n%s'
+ % self.description)
+
+while not self.description or self.verifyDescription:
+if not self.description:
+pywikibot.output(
+u'\03{lightred}It is not possible to upload a file '
+'without a summary/description.\03{default}')
+
+if not self.description or self.verifyDescription:
+newDescription = u''
+# if no description, default is 'yes'
+default = 'y' if not self.description else 'n'
+choice = pywikibot.inputChoice(
+u'Do you want to change this description?',
+['Yes', 'No', 'Quit'], ['y', 'n', 'q'], default)
+if choice == 'y':
+from pywikibot import editor as editarticle
+editor = editarticle.TextEditor()
+newDescription = editor.edit(self.description)
+elif choice == 'q':
+raise QuitKeyboardInterrupt
+# if user saved / didn't press Cancel
+if newDescription:
+self.description = newDescription
+break
+
return filename
def abort_on_warn(self, warn_code):
@@ -240,7 +256,8 @@
chunk_size=self.ch
[MediaWiki-commits] [Gerrit] [FIX] Always throttle API request by default - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Always throttle API request by default
..
[FIX] Always throttle API request by default
In a354068e710ca961068935238adb04603c100c40 the feature was
introduced to not throttle certain API calls. The default
value is switched in that.
Change-Id: I7e40c467cbdb24ce2bf77458fed9817347aea466
---
M pywikibot/data/api.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 11df17b..b86b803 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -153,7 +153,7 @@
'from it.')
else:
self.mime = kwargs.pop('mime', False)
-self.throttle = kwargs.pop('throttle', False)
+self.throttle = kwargs.pop('throttle', True)
self.max_retries = kwargs.pop("max_retries",
pywikibot.config.max_retries)
self.retry_wait = kwargs.pop("retry_wait", pywikibot.config.retry_wait)
self.params = {}
--
To view, visit https://gerrit.wikimedia.org/r/157676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e40c467cbdb24ce2bf77458fed9817347aea466
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPROV] Partial Python 3 compatibility - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [IMPROV] Partial Python 3 compatibility
..
[IMPROV] Partial Python 3 compatibility
This makes the code partially compatible with Python 3:
- using values(), items() and keys() instead of the iter* counterparts.
- not testing the iter* counterparts in Python 3
- print uses parenthesis
- in api.py it prevents checks of None > int (but there might be other)
- 'raise X(Y)' instead of 'raise(X, Y)'
- 'except X as Y' instead of 'except X, Y'
- uses next(X) instead of X.next()
- if a class adds a next() method it adds an __next__ alias
- filter/map are usually replaced with a list or generator expression.
- remove the usages of 'ur' as a string prefix
Change-Id: I80de55ad5d22abd6c0e89d86e3c892b89253a2a4
---
M generate_user_files.py
M pywikibot/bot.py
M pywikibot/data/api.py
M pywikibot/data/wikidataquery.py
M pywikibot/interwiki_graph.py
M pywikibot/page.py
M pywikibot/site.py
M pywikibot/tools.py
M pywikibot/userinterfaces/gui.py
M pywikibot/userinterfaces/terminal_interface_base.py
M scripts/blockreview.py
M scripts/casechecker.py
M scripts/catall.py
M scripts/category_redirect.py
M scripts/checkimages.py
M scripts/claimit.py
M scripts/commons_link.py
M scripts/data_ingestion.py
M scripts/freebasemappingupload.py
M scripts/imagetransfer.py
M scripts/lonelypages.py
M scripts/maintenance/make_i18n_dict.py
M scripts/maintenance/wikimedia_sites.py
M scripts/redirect.py
M scripts/reflinks.py
M scripts/replace.py
M scripts/replicate_wiki.py
M scripts/revertbot.py
M scripts/selflink.py
M scripts/solve_disambiguation.py
M scripts/weblinkchecker.py
M scripts/welcome.py
M tests/page_tests.py
M tests/site_tests.py
34 files changed, 136 insertions(+), 127 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_user_files.py b/generate_user_files.py
index 9cf7aeb..5366687 100644
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -299,8 +299,8 @@
def create_user_fixes():
_fnf = os.path.join(base_dir, "user-fixes.py")
if not file_exists(_fnf):
-f = codecs.open(_fnf, "w", "utf-8")
-f.write(ur"""# -*- coding: utf-8 -*-
+with codecs.open(_fnf, "w", "utf-8") as f:
+f.write(r"""# -*- coding: utf-8 -*-
#
# This is only an example. Don't use it.
@@ -312,12 +312,11 @@
'_default':u'no summary specified',
},
'replacements': [
-(ur'\bword\b', u'two words'),
+(r'\bword\b', u'two words'),
]
}
""")
-f.close()
print(u"'%s' written." % _fnf)
if __name__ == "__main__":
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 2417922..58dbc06 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -469,7 +469,7 @@
...
or alternatively:
...
- except Exception, e:
+ except Exception as e:
pywikibot.exception(e)
...
"""
@@ -932,7 +932,7 @@
"""
page = pywikibot.Page(self.repo, u'List of wikis/python', ns=4)
self.source_values = json.loads(page.get())
-for family_code, family in self.source_values.iteritems():
+for family_code, family in self.source_values.items():
for source_lang in family:
self.source_values[family_code][source_lang] =
pywikibot.ItemPage(self.repo,
family[source_lang])
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 11df17b..92a619f 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -220,6 +220,10 @@
def iteritems(self):
return iter(self.params.items())
+def items(self):
+"""Return a list of tuples containg the parameters in any order."""
+return list(self.params.items())
+
@property
def mime(self):
"""Return whether mime parameters are defined."""
@@ -596,10 +600,10 @@
max(login_status, pywikibot.site.LoginStatus.NOT_LOGGED_IN))
user_key = repr(user_key)
-return repr(self.site) + user_key + repr(sorted(self.iteritems()))
+return repr(self.site) + user_key + repr(sorted(self.items()))
def _create_file_name(self):
-self.http_params() # normalize self.iteritems()
+self.http_params() # normalize self.params
return hashlib.sha256(
self._uniquedescriptionstr().encode('utf-8')
).hexdigest()
@@ -898,7 +902,7 @@
else:
count += 1
# note: self.limit could be -1
-if self.limit > 0 and count >= self.limit:
+if self.limit and self.limit > 0 and count >= self.limit:
return
if self.module == "random" and self.limit:
# "random" module does not return "que
[MediaWiki-commits] [Gerrit] Set UnitTestsList hook run against files inside tests/phpunit - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Set UnitTestsList hook run against files inside tests/phpunit
..
Set UnitTestsList hook run against files inside tests/phpunit
All php unit tests are inside this directory
Change-Id: Ib5ac7c31bf08e68dbc5f66b9fb06e150569e7104
---
M Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index 3043c07..36c6040 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -787,7 +787,7 @@
*/
static function getUnitTests( &$files ) {
// @codeCoverageIgnoreStart
- $directoryIterator = new RecursiveDirectoryIterator( __DIR__ .
'/tests/' );
+ $directoryIterator = new RecursiveDirectoryIterator( __DIR__ .
'/tests/phpunit/' );
/**
* @var SplFileInfo $fileInfo
--
To view, visit https://gerrit.wikimedia.org/r/155858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5ac7c31bf08e68dbc5f66b9fb06e150569e7104
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add dashiki config generation - change (analytics/wikimetrics)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157761
Change subject: Add dashiki config generation
..
Add dashiki config generation
Change-Id: Iaf57ff4af1fb9452071236f156dd843c5d1cedff
---
M scripts/admin
M wikimetrics/metrics/bytes_added.py
M wikimetrics/metrics/namespace_edits.py
M wikimetrics/metrics/newly_registered.py
M wikimetrics/metrics/pages_created.py
M wikimetrics/metrics/rolling_active_editor.py
M wikimetrics/metrics/survival.py
M wikimetrics/metrics/threshold.py
8 files changed, 142 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/61/157761/1
diff --git a/scripts/admin b/scripts/admin
index 1b4b36e..a28e18c 100755
--- a/scripts/admin
+++ b/scripts/admin
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import argparse
import sys
+import requests
from datetime import datetime
@@ -45,6 +46,138 @@
'zerowiki',
}
return {p for p in all_wikis if p not in private_or_invalid_wikis}
+
+
+def append_language(languages, site_list, name, code):
+sites = {
+site['code']: site['dbname']
+for site in site_list if 'private' not in site
+}
+if sites:
+length = len(sites)
+languages.append({
+'name': name,
+'shortName': code,
+'description': description('project', length),
+'projects': sites
+})
+return sites
+
+
+def description(name, length):
+return '{} {}{}'.format(length, name, 's' * min(length - 1, 1)),
+
+
+def get_wikis_we_care_about():
+from wikimetrics.utils import stringify
+# suggestion from Oliver:
+# * get noc db list
+# * exclude "wikimedia" wikis (eg. dutch wikimedia chapter)
+# * inner join with information from sitematrix
+# * exclude "private" from sitematrix
+# * exclude "closed"? from sitematrix, maybe exclude for future runs?
+all_wikis =
requests.get('http://meta.wikimedia.org/w/api.php?action=sitematrix'
+ '&smsiteprop=url|dbname|code'
+ '&smstate=all'
+ '&format=json').json()
+
+# parse out the data in three different ways
+languages = []
+projects = {}
+reverse = {}
+
+for k, content in all_wikis.get('sitematrix', {}).items():
+if k == 'count':
+continue
+
+name = 'All Languages'
+code = 'all'
+site_list = content
+if k != 'specials':
+name = content.get('localname')
+code = content.get('code')
+site_list = content.get('site')
+
+if not name or not code or not site_list:
+continue
+
+sites = append_language(languages, site_list, name, code)
+
+for project, dbname in sites.items():
+if project not in projects:
+projects[project] = {
+'name': project,
+'languages': {},
+'count': 0
+}
+projects[project]['count'] += 1
+projects[project]['languages'][name] = dbname
+projects[project]['description'] = description(
+'language', projects[project]['count']
+)
+
+reverse[dbname] = {
+'language': name,
+'project': project
+}
+
+return stringify({
+'languages': languages,
+'projects': projects,
+'reverse': reverse,
+})
+
+
+def get_metrics_by_category():
+from wikimetrics.metrics import metric_classes
+from wikimetrics.utils import stringify
+
+categories = {}
+for metric_name, metric_class in metric_classes.items():
+if metric_class.show_in_ui is not True:
+continue
+category = metric_class.category
+if category not in categories:
+categories[category] = {
+'name': category,
+'metrics': []
+}
+categories[category]['metrics'].append(metric_name)
+
+return stringify({
+'defaultMetrics': ['RollingActiveEditor'],
+'categorizedMetrics': [v for k, v in categories.items()]
+})
+
+
+def make_dashiki_configs(args):
+"""
+Writes available-projects.json and available-metrics.json to /static/public
+"""
+import os
+from wikimetrics.configurables import app
+
+public_folder = os.path.join(
+app.absolute_path_to_app_root,
+'static',
+'public',
+)
+projects_file = os.path.join(
+public_folder,
+'available-projects.json'
+)
+metrics_file = os.path.join(
+public_folder,
+'available-metrics.json'
+)
+
+projects = get_wikis_we_care_about()
+with open(projects_file, 'w') as projects_writer:
+projects_writer.write(projects)
+
+metrics = get_metrics_by_cate
[MediaWiki-commits] [Gerrit] Check if file cache exist before accessing it. - change (mediawiki/core)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157760
Change subject: Check if file cache exist before accessing it.
..
Check if file cache exist before accessing it.
Bug: 70270
Change-Id: Id2535d9da45f77744786973583c54075a9c4f9a9
---
M includes/filerepo/RepoGroup.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/157760/1
diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php
index fab4216..3c02d3d 100644
--- a/includes/filerepo/RepoGroup.php
+++ b/includes/filerepo/RepoGroup.php
@@ -134,6 +134,7 @@
if ( empty( $options['ignoreRedirect'] )
&& empty( $options['private'] )
&& empty( $options['bypassCache'] )
+ && $this->cache
) {
$time = isset( $options['time'] ) ? $options['time'] :
'';
$dbkey = $title->getDBkey();
--
To view, visit https://gerrit.wikimedia.org/r/157760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2535d9da45f77744786973583c54075a9c4f9a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove uninitialised variables to top - change (mediawiki...Flow)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157759
Change subject: Hygiene: Remove uninitialised variables to top
..
Hygiene: Remove uninitialised variables to top
Change-Id: I85819a71da9038f449cf07c28d8337fb76678ed9
Bsitu: Let's get this documented somewhere if it isn't already...
---
M modules/new/components/flow-board.js
1 file changed, 24 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/59/157759/1
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index cf19842..37d6cc2 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -579,9 +579,8 @@
* @param {jqXHR} jqxhr
*/
FlowBoardComponent.UI.events.apiHandlers.closeOpenTopic =
function ( info, data ) {
- var revision,
+ var revision, topicId, revisionId,
$target = info.$target, $topicTitleBar,
- topicId, revisionId,
$topic = $target.parents( '.flow-topic' ),
self = this,
flowBoard =
FlowBoardComponent.prototype.getInstanceByElement( $( this ) ),
@@ -709,12 +708,12 @@
*/
FlowBoardComponent.UI.events.apiHandlers.preview = function(
info, data, jqxhr ) {
var revision, creator,
+ $previewContainer,
+ templateParams,
$button = $( this ),
$form = $button.closest( 'form' ),
flowBoard =
FlowBoardComponent.prototype.getInstanceByElement( $form ),
$titleField = $form.find( 'input' ).filter(
'[data-role=title]' ),
- $previewContainer,
- templateParams,
$target = info.$target,
username = mw.user.getName(),
id = Math.random(),
@@ -870,15 +869,14 @@
* @param {jqXHR} jqxhr
*/
FlowBoardComponent.UI.events.apiHandlers.watchItem = function (
info, data, jqxhr ) {
- var $target = $( this ),
+ var watchUrl, unwatchUrl,
+ watchType, watchLinkTemplate, $newLink,
+ $target = $( this ),
$tooltipTarget = $target.closest(
'.flow-watch-link' ),
flowBoard =
FlowBoardComponent.prototype.getInstanceByElement( $tooltipTarget ),
isWatched = false,
url = $( this ).prop( 'href' ),
- watchUrl, unwatchUrl,
- watchType, watchLinkTemplate,
- links = {},
- $newLink;
+ links = {};
if ( info.status !== 'done' ) {
// Error will be displayed by default, nothing
else to wrap up
@@ -999,9 +997,9 @@
* @param {jqXHR} jqxhr
*/
FlowBoardComponent.UI.events.apiHandlers.activateEditPost =
function ( info, data, jqxhr ) {
- var flowBoard =
FlowBoardComponent.prototype.getInstanceByElement( $( this ) ),
- $post = info.$target,
- $rendered;
+ var $rendered,
+ flowBoard =
FlowBoardComponent.prototype.getInstanceByElement( $( this ) ),
+ $post = info.$target;
if ( info.status !== 'done' ) {
// Error will be displayed by default, nothing
else to wrap up
@@ -1275,8 +1273,8 @@
* @param {Event} event
*/
FlowBoardComponent.UI.events.interactiveHandlers.collapserCollapsibleToggle =
function ( event ) {
- var $target = $( event.target ),
- topicId, states,
+ var topicId, states,
+ $target = $( event.target ),
$component = $( this ).closest(
'.flow-component' );
// Make sure we didn't click on any interactive elements
@@ -1329,11 +1327,10 @@
* @param {Event} event
*/
FlowBoardComponent.UI.events.interactiveHandlers.editTopicTitle
= function( event ) {
- var $link = $( this ),
+
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: a26aeca..acb59ea - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: a26aeca..acb59ea .. Syncronize VisualEditor: a26aeca..acb59ea Change-Id: I62c2b496fa7c4be1ff12f3f4d64c66c3d91e59d9 --- 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 a26aeca..acb59ea 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit a26aeca1440b1a3f26879e050198f5c24559de7b +Subproject commit acb59eac9082006b0a927f5dbcc082c247e69487 -- To view, visit https://gerrit.wikimedia.org/r/157758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62c2b496fa7c4be1ff12f3f4d64c66c3d91e59d9 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: a26aeca..acb59ea - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/157758 Change subject: Syncronize VisualEditor: a26aeca..acb59ea .. Syncronize VisualEditor: a26aeca..acb59ea Change-Id: I62c2b496fa7c4be1ff12f3f4d64c66c3d91e59d9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/58/157758/1 diff --git a/VisualEditor b/VisualEditor index a26aeca..acb59ea 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit a26aeca1440b1a3f26879e050198f5c24559de7b +Subproject commit acb59eac9082006b0a927f5dbcc082c247e69487 -- To view, visit https://gerrit.wikimedia.org/r/157758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62c2b496fa7c4be1ff12f3f4d64c66c3d91e59d9 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] Add virt1000.wikimedia.org static mapping for wikitech migra... - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/157757 Change subject: Add virt1000.wikimedia.org static mapping for wikitech migration .. Add virt1000.wikimedia.org static mapping for wikitech migration Change-Id: I60e5e13c736a9098841fb69b0e3fae95b86f9744 --- M multiversion/MWMultiVersion.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/57/157757/1 diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php index 09b2378..c238255 100644 --- a/multiversion/MWMultiVersion.php +++ b/multiversion/MWMultiVersion.php @@ -142,6 +142,7 @@ 'www.wikidata.org' => 'wikidata', 'wikisource.org' => 'sources', 'wikitech.wikimedia.org' => 'labswiki', + 'virt1000.wikimedia.org' => 'labswiki' // Temporary for wikitech migration to multiversion ); $site = "wikipedia"; -- To view, visit https://gerrit.wikimedia.org/r/157757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60e5e13c736a9098841fb69b0e3fae95b86f9744 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use .mw-body in skins - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Use .mw-body in skins
..
Use .mw-body in skins
* This helps Parsoid's output reach parity.
* Merge in conjunction with
Vector: Iae873906abcd8b2a986e5f728f0ce207256de770
MonoBook: I0c889950e618b2afa6332c4c56b5531744526e72
Bug: 38726
Change-Id: Id0228fa839ef80b0b3bfee864e81f2c65963e01b
---
M resources/src/mediawiki.legacy/commonPrint.css
M resources/src/mediawiki.legacy/oldshared.css
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.legacy/commonPrint.css
b/resources/src/mediawiki.legacy/commonPrint.css
index dda17fb..2c477b2 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -101,7 +101,7 @@
min-width: 0 !important;
}
-#content {
+.mw-body {
background: white;
border: none !important;
padding: 0 !important;
@@ -114,7 +114,7 @@
margin: 0 !important;
}
-#column-content #content {
+#column-content .mw-body {
padding: 1em;
margin: 0 !important;
}
@@ -171,14 +171,14 @@
}
/* Expand URLs for printing */
-#content a.external.text:after,
-#content a.external.autonumber:after {
+.mw-body a.external.text:after,
+.mw-body a.external.autonumber:after {
content: " (" attr(href) ")";
}
/* Expand protocol-relative URLs for printing */
-#content a.external.text[href^='//']:after,
-#content a.external.autonumber[href^='//']:after {
+.mw-body a.external.text[href^='//']:after,
+.mw-body a.external.autonumber[href^='//']:after {
content: " (https:" attr(href) ")";
}
diff --git a/resources/src/mediawiki.legacy/oldshared.css
b/resources/src/mediawiki.legacy/oldshared.css
index 17ad0e8..11a857e 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -496,7 +496,7 @@
}
/* @noflip */
-html > body.rtl div#bodyContent ul#filetoc {
+html > body.rtl .mw-body ul#filetoc {
display: block;
}
--
To view, visit https://gerrit.wikimedia.org/r/151395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0228fa839ef80b0b3bfee864e81f2c65963e01b
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Waldir
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace $wgConf->localVHosts by $wgLocalVirtualHosts - change (mediawiki/core)
IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157712
Change subject: Replace $wgConf->localVHosts by $wgLocalVirtualHosts
..
Replace $wgConf->localVHosts by $wgLocalVirtualHosts
The former is independent of the remaining of the SiteConfiguration
class, and as thus makes more sense to be defined as an explicit
configuration setting rather that being hidden in $wgConf.
Change-Id: I25204d37c5cfffb6953fe53e14316dc3df5b5b10
---
M RELEASE-NOTES-1.24
M includes/DefaultSettings.php
M includes/HttpFunctions.php
M includes/SiteConfiguration.php
4 files changed, 21 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/12/157712/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index c5b6cd4..b4ae7f3 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -68,6 +68,7 @@
* $wgCanonicalLanguageLinks has been removed. Per Google recommendations, we
will not send a rel=canonical pointing to a variant-neutral page, however
we will send rel=alternate.
+* $wgLocalVirtualHosts has been added to replace $wgConf->localVHosts.
=== New features in 1.24 ===
* Added a new hook, "WhatLinksHereProps", to allow extensions to annotate
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5fc7377..3327caa 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -7027,6 +7027,17 @@
$wgHTTPProxy = false;
/**
+ * Local virtual hosts.
+ *
+ * This lists domains that are configured as virtual hosts on the same machibe.
+ * If a request is to be made to a domain listed here, or any subdomain
thereof,
+ * then no proxy will be used.
+ * Command-line scripts are not affected by this setting and will always use
+ * proxy if it is configured.
+ */
+$wgLocalVirtualHosts = array();
+
+/**
* Timeout for connections done internally (in seconds)
* Only works for curl
*/
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 1eb8ca5..50e20b8 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -114,7 +114,7 @@
* @return bool
*/
public static function isLocalURL( $url ) {
- global $wgCommandLineMode, $wgConf;
+ global $wgCommandLineMode, $wgLocalVirtualHosts, $wgConf;
if ( $wgCommandLineMode ) {
return false;
@@ -126,7 +126,7 @@
$host = $matches[1];
// Split up dotwise
$domainParts = explode( '.', $host );
- // Check if this domain or any superdomain is listed in
$wgConf as a local virtual host
+ // Check if this domain or any superdomain is listed as
a local virtual host
$domainParts = array_reverse( $domainParts );
$domain = '';
@@ -139,7 +139,9 @@
$domain = $domainPart . '.' . $domain;
}
- if ( $wgConf->isLocalVHost( $domain ) ) {
+ if ( in_array( $domain, $wgLocalVirtualHosts )
+ || $wgConf->isLocalVHost( $domain )
+ ) {
return true;
}
}
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index b877544..177c560 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -133,6 +133,8 @@
/**
* Array of domains that are local and can be handled by the same server
+*
+* @deprecated since 1.24; use $wgLocalVirtualHosts instead.
*/
public $localVHosts = array();
@@ -565,6 +567,8 @@
/**
* Returns true if the given vhost is handled locally.
+*
+* @deprecated since 1.24; check if the host is in $wgLocalVirtualHosts
instead.
* @param string $vhost
* @return bool
*/
--
To view, visit https://gerrit.wikimedia.org/r/157712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25204d37c5cfffb6953fe53e14316dc3df5b5b10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use .mw-body instead of div#content - change (mediawiki...MonoBook)
jenkins-bot has submitted this change and it was merged.
Change subject: Use .mw-body instead of div#content
..
Use .mw-body instead of div#content
* Renames the classes being applied to div#content and div#bodyContent
to match that of Vector.
* See also Id0228fa839ef80b0b3bfee in mediawiki-core.
Change-Id: I0c889950e618b2afa6332c4c56b5531744526e72
---
M IE60Fixes.css
M IE70Fixes.css
M MonoBookTemplate.php
M main.css
4 files changed, 12 insertions(+), 15 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/IE60Fixes.css b/IE60Fixes.css
index cd9399f..a5beed5 100644
--- a/IE60Fixes.css
+++ b/IE60Fixes.css
@@ -7,13 +7,13 @@
height: 1%;
}
-div#column-content div#content {
+div#column-content .mw-body {
margin-left: 12.2em;
margin-top: 3em;
height: 1%;
}
-.rtl div#column-content div#content {
+.rtl div#column-content .mw-body {
margin-right: 12.2em;
margin-left: 0;
}
diff --git a/IE70Fixes.css b/IE70Fixes.css
index 42f9ce6..e82d57a 100644
--- a/IE70Fixes.css
+++ b/IE70Fixes.css
@@ -3,13 +3,13 @@
/* workaround for various ie float bugs */
/* This bit is needed to make links clickable... WTF */
-div#column-content div#content {
+div#column-content .mw-body {
margin-left: 12.2em;
margin-top: 3em;
height: 1%;
}
-.rtl div#column-content div#content {
+.rtl div#column-content .mw-body {
margin-right: 12.2em;
margin-left: 0;
}
diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index 5eae44d..c432625 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -44,7 +44,7 @@
$this->html( 'headelement' );
?>
-
+
data['sitenotice'] ) {
@@ -61,7 +61,7 @@
$this->text( 'pageLanguage' );
?>">html( 'title'
) ?>
-
+
msg(
'tagline' ) ?>
html( 'userlangattributes' )
?>>html( 'subtitle' )
diff --git a/main.css b/main.css
index ded4b64..e0e0dc7 100644
--- a/main.css
+++ b/main.css
@@ -16,11 +16,16 @@
padding: 0;
}
-div#content {
+.mw-body {
margin: 2.8em 0 0 12.2em;
padding: 1em;
position: relative;
z-index: 2;
+ background: white;
+ color: black;
+ border: 1px solid #aaa;
+ border-right: none;
+ line-height: 1.5em;
}
div#column-one {
@@ -31,14 +36,6 @@
#column-one h2 {
position: absolute;
top: -px;
-}
-
-div#content {
- background: white;
- color: black;
- border: 1px solid #aaa;
- border-right: none;
- line-height: 1.5em;
}
/* the left column width is specified in class .portlet */
--
To view, visit https://gerrit.wikimedia.org/r/153777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c889950e618b2afa6332c4c56b5531744526e72
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: Isarra
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] mediawiki.language: Fix infinite loop in commafy() when patt... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.language: Fix infinite loop in commafy() when pattern
has no grouping
..
mediawiki.language: Fix infinite loop in commafy() when pattern has no grouping
When the decimal part of the pattern has no grouping, commafy was entering
into an infinite loop. Corrected the logic to handle this case.
Also added qunit tests.
Bug: 69835
Change-Id: I0f9e274411aead6a4e95402fd38c54ac6b76df53
---
M resources/src/mediawiki.language/mediawiki.language.numbers.js
M tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
2 files changed, 17 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.language/mediawiki.language.numbers.js
b/resources/src/mediawiki.language/mediawiki.language.numbers.js
index 56fa0da..8bd2de9 100644
--- a/resources/src/mediawiki.language/mediawiki.language.numbers.js
+++ b/resources/src/mediawiki.language/mediawiki.language.numbers.js
@@ -34,7 +34,7 @@
}
/**
-* Efficiently replicate a string `n` times.
+* Replicate a string 'n' times.
*
* @private
* @param {string} str The string to replicate
@@ -47,9 +47,8 @@
}
var buf = [];
- while (num) {
+ while ( num-- ) {
buf.push( str );
- str += str;
}
return buf.join( '' );
}
@@ -142,13 +141,13 @@
}
for ( whole = valueParts[0]; whole; ) {
- off = whole.length - groupSize;
-
+ off = groupSize ? whole.length - groupSize : 0;
pieces.push( ( off > 0 ) ? whole.substr( off ) : whole
);
whole = ( off > 0 ) ? whole.slice( 0, off ) : '';
if ( groupSize2 ) {
groupSize = groupSize2;
+ groupSize2 = null;
}
}
valueParts[0] = pieces.reverse().join( options.group );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 3bfabe4..d43baee 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -17,6 +17,19 @@
assert.equal( mw.language.getData( 'en', 'invalidkey' ),
undefined, 'Getter setter test for mw.language with invalid key' );
} );
+ QUnit.test( 'mw.language.commafy test', 9, function ( assert ) {
+ // Number grouping patterns are as per
http://cldr.unicode.org/translation/number-patterns
+ assert.equal( mw.language.commafy( 1234.567, '###0.#' ),
'1234.567', 'Pattern with no digit grouping separator defined' );
+ assert.equal( mw.language.commafy( 123456789.567, '###0.#'
), '123456789.567', 'Pattern with no digit grouping seperator defined, bigger
decimal part' );
+ assert.equal( mw.language.commafy( 0.567, '###0.#' ),
'0.567', 'Decimal part 0' );
+ assert.equal( mw.language.commafy( '.567', '###0.#' ),
'0.567', 'Decimal part missing. replace with zero' );
+ assert.equal( mw.language.commafy( 1234, '##,#0.#' ),
'12,34', 'Pattern with no fractional part' );
+ assert.equal( mw.language.commafy( -1234.567, '###0.#' ),
'-1234.567', 'Negative number' );
+ assert.equal( mw.language.commafy( -1234.567, '#,###.00' ),
'-1,234.56', 'Fractional part bigger than pattern.' );
+ assert.equal( mw.language.commafy( 123456789.567, '###,##0.00'
), '123,456,789.56', 'Decimal part as group of 3' );
+ assert.equal( mw.language.commafy( 123456789.567,
'###,###,#0.00' ), '1,234,567,89.56', 'Decimal part as group of 3 and last one
2' );
+ } );
+
function grammarTest( langCode, test ) {
// The test works only if the content language is opt.language
// because it requires [lang].js to be loaded.
--
To view, visit https://gerrit.wikimedia.org/r/155890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f9e274411aead6a4e95402fd38c54ac6b76df53
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
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 some broken URLs caused by the mass-conversion of Title:... - change (mediawiki...SocialProfile)
Jack Phoenix has submitted this change and it was merged.
Change subject: Fix some broken URLs caused by the mass-conversion of
Title::escape(Full|Local)URL() methods
..
Fix some broken URLs caused by the mass-conversion of
Title::escape(Full|Local)URL() methods
Change-Id: I8825323539faf93da1a42937b4a744dcf522661d
---
M UserBoard/SpecialUserBoard.php
M UserRelationship/SpecialViewRelationships.php
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Jack Phoenix: Verified; Looks good to me, approved
diff --git a/UserBoard/SpecialUserBoard.php b/UserBoard/SpecialUserBoard.php
index 5ef7899..06bbfd4 100644
--- a/UserBoard/SpecialUserBoard.php
+++ b/UserBoard/SpecialUserBoard.php
@@ -302,16 +302,17 @@
// $ub_message_text = preg_replace_callback(
"/(]*>)(.*?)(<\/a>)/i", 'cut_link_text', $ub_message['message_text'] );
$ub_message_text = $ub_message['message_text'];
+ $userPageURL = htmlspecialchars(
$user->getFullURL() );
$output .= "
- getFullURL() )}\"
title=\"{$ub_message['user_name_from']}}\">{$ub_message['user_name_from']}
{$ub_message_type_label}
+ {$ub_message['user_name_from']}
{$ub_message_type_label}
"
. $this->msg(
'userboard_posted_ago', $b->getTimeAgo( $ub_message['timestamp'] ) )->parse() .
"
- getFullURL() )}\"
title=\"{$ub_message['user_name_from']}\">{$avatar->getAvatarURL()}
+ {$avatar->getAvatarURL()}
{$ub_message_text}
diff --git a/UserRelationship/SpecialViewRelationships.php
b/UserRelationship/SpecialViewRelationships.php
index 02b5039..472eee1 100644
--- a/UserRelationship/SpecialViewRelationships.php
+++ b/UserRelationship/SpecialViewRelationships.php
@@ -161,6 +161,7 @@
$removeRelationshipLink =
SpecialPage::getTitleFor( 'RemoveRelationship' );
$giveGiftLink = SpecialPage::getTitleFor(
'GiveGift' );
+ $userPageURL = htmlspecialchars(
$userPage->getFullURL() );
$avatar = new wAvatar(
$relationship['user_id'], 'ml' );
$avatar_img = $avatar->getAvatarURL();
@@ -176,10 +177,10 @@
}
$output .= "
- getFullURL() )}\">{$avatar_img}
+ {$avatar_img}
- getFullURL() )}\">{$user_name_display}
+ {$user_name_display}
";
--
To view, visit https://gerrit.wikimedia.org/r/157711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8825323539faf93da1a42937b4a744dcf522661d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix some broken URLs caused by the mass-conversion of Title:... - change (mediawiki...SocialProfile)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157711
Change subject: Fix some broken URLs caused by the mass-conversion of
Title::escape(Full|Local)URL() methods
..
Fix some broken URLs caused by the mass-conversion of
Title::escape(Full|Local)URL() methods
Change-Id: I8825323539faf93da1a42937b4a744dcf522661d
---
M UserBoard/SpecialUserBoard.php
M UserRelationship/SpecialViewRelationships.php
2 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile
refs/changes/11/157711/1
diff --git a/UserBoard/SpecialUserBoard.php b/UserBoard/SpecialUserBoard.php
index 5ef7899..06bbfd4 100644
--- a/UserBoard/SpecialUserBoard.php
+++ b/UserBoard/SpecialUserBoard.php
@@ -302,16 +302,17 @@
// $ub_message_text = preg_replace_callback(
"/(]*>)(.*?)(<\/a>)/i", 'cut_link_text', $ub_message['message_text'] );
$ub_message_text = $ub_message['message_text'];
+ $userPageURL = htmlspecialchars(
$user->getFullURL() );
$output .= "
- getFullURL() )}\"
title=\"{$ub_message['user_name_from']}}\">{$ub_message['user_name_from']}
{$ub_message_type_label}
+ {$ub_message['user_name_from']}
{$ub_message_type_label}
"
. $this->msg(
'userboard_posted_ago', $b->getTimeAgo( $ub_message['timestamp'] ) )->parse() .
"
- getFullURL() )}\"
title=\"{$ub_message['user_name_from']}\">{$avatar->getAvatarURL()}
+ {$avatar->getAvatarURL()}
{$ub_message_text}
diff --git a/UserRelationship/SpecialViewRelationships.php
b/UserRelationship/SpecialViewRelationships.php
index 02b5039..472eee1 100644
--- a/UserRelationship/SpecialViewRelationships.php
+++ b/UserRelationship/SpecialViewRelationships.php
@@ -161,6 +161,7 @@
$removeRelationshipLink =
SpecialPage::getTitleFor( 'RemoveRelationship' );
$giveGiftLink = SpecialPage::getTitleFor(
'GiveGift' );
+ $userPageURL = htmlspecialchars(
$userPage->getFullURL() );
$avatar = new wAvatar(
$relationship['user_id'], 'ml' );
$avatar_img = $avatar->getAvatarURL();
@@ -176,10 +177,10 @@
}
$output .= "
- getFullURL() )}\">{$avatar_img}
+ {$avatar_img}
- getFullURL() )}\">{$user_name_display}
+ {$user_name_display}
";
--
To view, visit https://gerrit.wikimedia.org/r/157711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8825323539faf93da1a42937b4a744dcf522661d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct button colours of preference page when $wgUseMediaWi... - change (mediawiki/core)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157709
Change subject: Correct button colours of preference page when
$wgUseMediaWikiUIEverywhere is enabled
..
Correct button colours of preference page when $wgUseMediaWikiUIEverywhere is
enabled
* Apply mw-ui-destructive to Special:Preferences/Reset
when $wgUseMediaWikiUIEverywhere is enabled
Bug: 65317
Change-Id: I1d6691dce3e7dab662bda9a718e16c5caee6c041
---
M includes/Preferences.php
M includes/htmlform/HTMLForm.php
M includes/specials/SpecialPreferences.php
3 files changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/09/157709/1
diff --git a/includes/Preferences.php b/includes/Preferences.php
index eb29e41..7dc8173 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1551,7 +1551,8 @@
if ( $this->getModifiedUser()->isAllowed( 'editmyoptions' ) ) {
$t = SpecialPage::getTitleFor( 'Preferences', 'reset' );
- $html .= "\n" . Linker::link( $t, $this->msg(
'restoreprefs' )->escaped() );
+ $html .= "\n" . Linker::link( $t, $this->msg(
'restoreprefs' )->escaped(),
+array( 'class' => 'mw-ui-button mw-ui-quiet' )
);
$html = Xml::tags( 'div', array( 'class' =>
'mw-prefs-buttons' ), $html );
}
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index fca..0bef668 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -139,6 +139,7 @@
protected $mFieldTree;
protected $mShowReset = false;
protected $mShowSubmit = true;
+ protected $mSubmitModifierClass = 'mw-ui-constructive';
protected $mSubmitCallback;
protected $mValidationErrorMessage;
@@ -894,7 +895,7 @@
$attribs['class'] = array( 'mw-htmlform-submit' );
if ( $this->isVForm() || $useMediaWikiUIEverywhere ) {
- array_push( $attribs['class'], 'mw-ui-button',
'mw-ui-constructive' );
+ array_push( $attribs['class'], 'mw-ui-button',
$this->mSubmitModifierClass );
}
if ( $this->isVForm() ) {
@@ -1037,6 +1038,17 @@
}
/**
+* Identify that the submit button in the form has a destructive action
+*
+* @param string $t Plaintext
+*
+* @return HTMLForm $this for chaining calls (since 1.20)
+*/
+ public function setSubmitDestructive() {
+ $this->mSubmitModifierClass = 'mw-ui-destructive';
+ }
+
+ /**
* Set the text for the submit button to a message
* @since 1.19
*
diff --git a/includes/specials/SpecialPreferences.php
b/includes/specials/SpecialPreferences.php
index 4cfd445..cea00fa 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -73,6 +73,7 @@
$htmlForm = new HTMLForm( array(), $context, 'prefs-restore' );
$htmlForm->setSubmitTextMsg( 'restoreprefs' );
+ $htmlForm->setSubmitDestructive();
$htmlForm->setSubmitCallback( array( $this, 'submitReset' ) );
$htmlForm->suppressReset();
--
To view, visit https://gerrit.wikimedia.org/r/157709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d6691dce3e7dab662bda9a718e16c5caee6c041
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mailman: Fix a few encoding issues for languages - change (operations/puppet)
John F. Lewis has uploaded a new change for review. https://gerrit.wikimedia.org/r/157708 Change subject: Mailman: Fix a few encoding issues for languages .. Mailman: Fix a few encoding issues for languages A few fixes to how files are encoded. Not sure how this will play out once merged. Change-Id: I2c1f6b56f6da1c0d5f1b2ab27bfef2adff930c71 --- M files/mailman/templates/ca/listinfo.html M files/mailman/templates/de/listinfo.html M files/mailman/templates/en/listinfo.html M files/mailman/templates/es/listinfo.html M files/mailman/templates/fi/listinfo.html M files/mailman/templates/fr/listinfo.html M files/mailman/templates/id/listinfo.html 7 files changed, 47 insertions(+), 54 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/08/157708/1 diff --git a/files/mailman/templates/ca/listinfo.html b/files/mailman/templates/ca/listinfo.html index 0abd6b2..7a7645c 100644 --- a/files/mailman/templates/ca/listinfo.html +++ b/files/mailman/templates/ca/listinfo.html @@ -1,7 +1,6 @@ - + - Llista de correu: Wikimedia
[MediaWiki-commits] [Gerrit] Deleted 1.24wmf[6-8] symlinks - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Deleted 1.24wmf[6-8] symlinks .. Deleted 1.24wmf[6-8] symlinks Change-Id: Ic14105dd9a0cc12119e332342e9501f09f1b72a1 --- D docroot/bits/static-1.24wmf6/extensions D docroot/bits/static-1.24wmf6/resources D docroot/bits/static-1.24wmf6/skins D docroot/bits/static-1.24wmf7/extensions D docroot/bits/static-1.24wmf7/resources D docroot/bits/static-1.24wmf7/skins D docroot/bits/static-1.24wmf8/extensions D docroot/bits/static-1.24wmf8/resources D docroot/bits/static-1.24wmf8/skins M docroot/bits/static-current/extensions M docroot/bits/static-current/resources M docroot/bits/static-current/skins M php D w/static-1.24wmf6/extensions D w/static-1.24wmf6/resources D w/static-1.24wmf6/skins D w/static-1.24wmf7/extensions D w/static-1.24wmf7/resources D w/static-1.24wmf7/skins D w/static-1.24wmf8/extensions D w/static-1.24wmf8/resources D w/static-1.24wmf8/skins 22 files changed, 4 insertions(+), 22 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static-1.24wmf6/extensions b/docroot/bits/static-1.24wmf6/extensions deleted file mode 12 index 0cc4824..000 --- a/docroot/bits/static-1.24wmf6/extensions +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf6/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf6/resources b/docroot/bits/static-1.24wmf6/resources deleted file mode 12 index 366fbf1..000 --- a/docroot/bits/static-1.24wmf6/resources +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf6/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf6/skins b/docroot/bits/static-1.24wmf6/skins deleted file mode 12 index f8f2523..000 --- a/docroot/bits/static-1.24wmf6/skins +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf6/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf7/extensions b/docroot/bits/static-1.24wmf7/extensions deleted file mode 12 index 0d843b0..000 --- a/docroot/bits/static-1.24wmf7/extensions +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf7/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf7/resources b/docroot/bits/static-1.24wmf7/resources deleted file mode 12 index 1852d13..000 --- a/docroot/bits/static-1.24wmf7/resources +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf7/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf7/skins b/docroot/bits/static-1.24wmf7/skins deleted file mode 12 index 6073dad..000 --- a/docroot/bits/static-1.24wmf7/skins +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf7/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf8/extensions b/docroot/bits/static-1.24wmf8/extensions deleted file mode 12 index fc21da0..000 --- a/docroot/bits/static-1.24wmf8/extensions +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf8/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf8/resources b/docroot/bits/static-1.24wmf8/resources deleted file mode 12 index 930e278..000 --- a/docroot/bits/static-1.24wmf8/resources +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf8/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf8/skins b/docroot/bits/static-1.24wmf8/skins deleted file mode 12 index eeed78e..000 --- a/docroot/bits/static-1.24wmf8/skins +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf8/skins/ \ No newline at end of file diff --git a/docroot/bits/static-current/extensions b/docroot/bits/static-current/extensions index f4610a5..8e68541 12 --- a/docroot/bits/static-current/extensions +++ b/docroot/bits/static-current/extensions @@ -1 +1 @@ -/usr/local/apache/common-local/php-1.24wmf18/extensions \ No newline at end of file +/usr/local/apache/common-local/php-1.24wmf19/extensions \ No newline at end of file diff --git a/docroot/bits/static-current/resources b/docroot/bits/static-current/resources index c5c56cc..4bf1dbe 12 --- a/docroot/bits/static-current/resources +++ b/docroot/bits/static-current/resources @@ -1 +1 @@ -/usr/local/apache/common-local/php-1.24wmf18/resources \ No newline at end of file +/usr/local/apache/common-local/php-1.24wmf19/resources \ No newline at end of file diff --git a/docroot/bits/static-current/skins b/docroot/bits/static-current/skins index 6be983d..f07b204 12 --- a/docroot/bits/static-current/skins +++ b/docroot/bits/static-current/skins @@ -1 +1 @@ -/usr/local/apache/common-local/php-1.24wmf18/skins \ No newline at end of file +/usr/local/apache/common-local/php-1.24wmf19/skins \ No newline at end of file diff --git a/php b/php index e7a1588..71b768c 12 --- a/php
[MediaWiki-commits] [Gerrit] Deleted 1.24wmf[6-8] symlinks - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/157706 Change subject: Deleted 1.24wmf[6-8] symlinks .. Deleted 1.24wmf[6-8] symlinks Change-Id: Ic14105dd9a0cc12119e332342e9501f09f1b72a1 --- D docroot/bits/static-1.24wmf6/extensions D docroot/bits/static-1.24wmf6/resources D docroot/bits/static-1.24wmf6/skins D docroot/bits/static-1.24wmf7/extensions D docroot/bits/static-1.24wmf7/resources D docroot/bits/static-1.24wmf7/skins D docroot/bits/static-1.24wmf8/extensions D docroot/bits/static-1.24wmf8/resources D docroot/bits/static-1.24wmf8/skins M docroot/bits/static-current/extensions M docroot/bits/static-current/resources M docroot/bits/static-current/skins M php D w/static-1.24wmf6/extensions D w/static-1.24wmf6/resources D w/static-1.24wmf6/skins D w/static-1.24wmf7/extensions D w/static-1.24wmf7/resources D w/static-1.24wmf7/skins D w/static-1.24wmf8/extensions D w/static-1.24wmf8/resources D w/static-1.24wmf8/skins 22 files changed, 4 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/06/157706/1 diff --git a/docroot/bits/static-1.24wmf6/extensions b/docroot/bits/static-1.24wmf6/extensions deleted file mode 12 index 0cc4824..000 --- a/docroot/bits/static-1.24wmf6/extensions +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf6/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf6/resources b/docroot/bits/static-1.24wmf6/resources deleted file mode 12 index 366fbf1..000 --- a/docroot/bits/static-1.24wmf6/resources +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf6/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf6/skins b/docroot/bits/static-1.24wmf6/skins deleted file mode 12 index f8f2523..000 --- a/docroot/bits/static-1.24wmf6/skins +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf6/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf7/extensions b/docroot/bits/static-1.24wmf7/extensions deleted file mode 12 index 0d843b0..000 --- a/docroot/bits/static-1.24wmf7/extensions +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf7/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf7/resources b/docroot/bits/static-1.24wmf7/resources deleted file mode 12 index 1852d13..000 --- a/docroot/bits/static-1.24wmf7/resources +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf7/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf7/skins b/docroot/bits/static-1.24wmf7/skins deleted file mode 12 index 6073dad..000 --- a/docroot/bits/static-1.24wmf7/skins +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf7/skins/ \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf8/extensions b/docroot/bits/static-1.24wmf8/extensions deleted file mode 12 index fc21da0..000 --- a/docroot/bits/static-1.24wmf8/extensions +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf8/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf8/resources b/docroot/bits/static-1.24wmf8/resources deleted file mode 12 index 930e278..000 --- a/docroot/bits/static-1.24wmf8/resources +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf8/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf8/skins b/docroot/bits/static-1.24wmf8/skins deleted file mode 12 index eeed78e..000 --- a/docroot/bits/static-1.24wmf8/skins +++ /dev/null @@ -1 +0,0 @@ -/usr/local/apache/common-local/php-1.24wmf8/skins/ \ No newline at end of file diff --git a/docroot/bits/static-current/extensions b/docroot/bits/static-current/extensions index f4610a5..8e68541 12 --- a/docroot/bits/static-current/extensions +++ b/docroot/bits/static-current/extensions @@ -1 +1 @@ -/usr/local/apache/common-local/php-1.24wmf18/extensions \ No newline at end of file +/usr/local/apache/common-local/php-1.24wmf19/extensions \ No newline at end of file diff --git a/docroot/bits/static-current/resources b/docroot/bits/static-current/resources index c5c56cc..4bf1dbe 12 --- a/docroot/bits/static-current/resources +++ b/docroot/bits/static-current/resources @@ -1 +1 @@ -/usr/local/apache/common-local/php-1.24wmf18/resources \ No newline at end of file +/usr/local/apache/common-local/php-1.24wmf19/resources \ No newline at end of file diff --git a/docroot/bits/static-current/skins b/docroot/bits/static-current/skins index 6be983d..f07b204 12 --- a/docroot/bits/static-current/skins +++ b/docroot/bits/static-current/skins @@ -1 +1 @@ -/usr/local/apache/common-local/php-1.24wmf18/skins \ No newline at end of file +/usr/local/apache/common-local/php-1.24wmf19/skins \ No newline at end of file diff --git
[MediaWiki-commits] [Gerrit] Shrink height of summary box in save dialog from 80px to 4em - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/157707 Change subject: Shrink height of summary box in save dialog from 80px to 4em .. Shrink height of summary box in save dialog from 80px to 4em Change-Id: Ifd40bb19c7b57bab15c127d2de16940f9a239235 --- M modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/07/157707/1 diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css index 526f7cf..5dd87af 100644 --- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css +++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css @@ -29,7 +29,7 @@ margin: 0; padding: 0.5em; resize: none; - height: 80px; + height: 4em; background-color: transparent; } -- To view, visit https://gerrit.wikimedia.org/r/157707 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd40bb19c7b57bab15c127d2de16940f9a239235 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] Add command line tool to manage hiera settings - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157705
Change subject: Add command line tool to manage hiera settings
..
Add command line tool to manage hiera settings
Make managing hiera settings easier by providing a vagrant command to
add and delete settings in the vagrant-managed.yaml hiera file.
Change-Id: I2cf01b68897dbc9780fb92c8c8b13e4e32262920
---
M lib/mediawiki-vagrant.rb
M lib/mediawiki-vagrant/environment.rb
A lib/mediawiki-vagrant/hiera.rb
M lib/mediawiki-vagrant/version.rb
M puppet/hiera.yaml
5 files changed, 101 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/05/157705/1
diff --git a/lib/mediawiki-vagrant.rb b/lib/mediawiki-vagrant.rb
index a0c7da2..3e06ce1 100644
--- a/lib/mediawiki-vagrant.rb
+++ b/lib/mediawiki-vagrant.rb
@@ -52,6 +52,11 @@
ImportDump
end
+command 'hiera' do
+require 'mediawiki-vagrant/hiera'
+Hiera
+end
+
action_hook(self::ALL_ACTIONS) do |hook|
require 'mediawiki-vagrant/middleware'
hook.before(Vagrant::Action::Builtin::Provision, Middleware)
diff --git a/lib/mediawiki-vagrant/environment.rb
b/lib/mediawiki-vagrant/environment.rb
index 051ffa9..ac96fa8 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -55,9 +55,10 @@
#
def roles_enabled
migrate_roles
-return [] unless hiera_data.exist?
-hiera = hiera_data.open('r') { |io| YAML.load(io) }
+hiera = hiera_load
+return [] unless hiera.key?('classes')
+
roles = hiera['classes'].map do |r|
r.match(/^role::(\S+)/) { |m| m[1] }
end
@@ -67,17 +68,10 @@
# Updates the enabled Puppet roles to the given set.
#
def update_roles(roles)
-if hiera_data.exist?
-hiera = hiera_data.open('r') { |io| YAML.load(io) }
-else
-hiera = {'classes' => []}
-end
-hiera['classes'] = roles.sort.uniq.map do |r|
+classes = roles.sort.uniq.map do |r|
"role::#{r.sub(/^role::/, '')}"
end
-
-yaml = YAML.dump(hiera)
-hiera_data.open('w') { |f| f.write(yaml) }
+hiera_set('classes', classes)
end
# If it has been a week or more since remote commits have been fetched,
@@ -104,6 +98,26 @@
FileUtils.rm_r Dir[path('settings.d/wikis')]
end
+def hiera_get(key)
+ hiera_load.key(key)
+end
+
+def hiera_set(key, value)
+hiera = hiera_load
+hiera[key] = value
+hiera_save(hiera)
+end
+
+def hiera_delete(key)
+if hiera_data.exist?
+hiera = hiera_load
+if hiera.key?(key)
+hiera.delete(key)
+hiera_save(hiera)
+end
+end
+end
+
private
def module_path(*subpaths)
@@ -114,6 +128,15 @@
path('puppet/hieradata/vagrant-managed.yaml')
end
+def hiera_load
+return {} unless hiera_data.exist?
+hiera_data.open('r') { |io| YAML.load(io) }
+end
+
+def hiera_save(data)
+hiera_data.open('w') { |f| f.write(YAML.dump(data)) }
+end
+
def stale_head?
head = path('.git/FETCH_HEAD')
head.exist? && (Time.now - head.mtime) > STALENESS
diff --git a/lib/mediawiki-vagrant/hiera.rb b/lib/mediawiki-vagrant/hiera.rb
new file mode 100644
index 000..e37f040
--- /dev/null
+++ b/lib/mediawiki-vagrant/hiera.rb
@@ -0,0 +1,60 @@
+require "mediawiki-vagrant/plugin_environment"
+require "optparse"
+
+module MediaWikiVagrant
+# Provides a command-line interface for configuration of hiera settings.
+#
+class Hiera < Vagrant.plugin(2, :command)
+include PluginEnvironment
+
+def self.synopsis
+"configures hiera settings"
+end
+
+def execute
+options = {
+unset: [],
+}
+
+opts = OptionParser.new do |o|
+o.banner = "Usage: vagrant hiera [options] [key] [value]"
+o.separator ""
+o.separator "Options:"
+o.separator ""
+
+o.on("--unset NAME", "Remove a configured key") do |name|
+options[:unset] << name
+end
+end
+
+argv = parse_options(opts)
+return if !argv
+
+if options[:unset].any?
+unset_key(options[:unset])
+elsif argv.length == 2
+set_key(*argv)
+else
+@env.ui.error opts
+
[MediaWiki-commits] [Gerrit] Purge settings.d/wikis when destroying vm - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Purge settings.d/wikis when destroying vm
..
Purge settings.d/wikis when destroying vm
Change-Id: I7307317aef1d64fd642ebbc64b1d47b2ba483cf8
---
M lib/mediawiki-vagrant/environment.rb
M lib/mediawiki-vagrant/version.rb
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki-vagrant/environment.rb
b/lib/mediawiki-vagrant/environment.rb
index 7acde66..051ffa9 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -101,6 +101,7 @@
def purge_puppet_created_files
FileUtils.rm Dir[path('settings.d/puppet-managed/*.php')]
FileUtils.rm_r Dir[path('settings.d/multiwiki')]
+FileUtils.rm_r Dir[path('settings.d/wikis')]
end
private
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index 427c140..7975f6e 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
module MediaWikiVagrant
-VERSION = '0.1.1'
+VERSION = '0.1.2'
end
--
To view, visit https://gerrit.wikimedia.org/r/157687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7307317aef1d64fd642ebbc64b1d47b2ba483cf8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: Ori.livneh
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 temporary virt1000.wikimedia.org.erb for wikitech migrat... - change (operations/puppet)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157704
Change subject: Add temporary virt1000.wikimedia.org.erb for wikitech migration
to multiversion
..
Add temporary virt1000.wikimedia.org.erb for wikitech migration to multiversion
Not actually used anywhere yet...
Change-Id: Idbac6bf7802e0dcd69c8602fd9e350791a3722d7
---
A templates/apache/sites/virt1000.wikimedia.org.erb
1 file changed, 90 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/157704/1
diff --git a/templates/apache/sites/virt1000.wikimedia.org.erb
b/templates/apache/sites/virt1000.wikimedia.org.erb
new file mode 100644
index 000..d54ef32
--- /dev/null
+++ b/templates/apache/sites/virt1000.wikimedia.org.erb
@@ -0,0 +1,90 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+### puppet:///templates/apache/sites/virt1000.wikimedia.org
+#
+# vim: filetype=apache
+
+
+ServerAdmin n...@wikimedia.org
+ServerName virt1000.wikimedia.org
+
+DocumentRoot /usr/local/apache/common/docroot/wikimedia.org
+
+Options FollowSymLinks
+AllowOverride None
+
+
+Options Indexes FollowSymLinks MultiViews
+AllowOverride None
+Order allow,deny
+allow from all
+
+
+RewriteEngine on
+RewriteCond %{SERVER_PORT} !^443$
+RewriteRule ^/(.*)$ https://virt1000.wikimedia.org/$1 [L,R]
+
+ErrorLog /var/log/apache2/error.log
+
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+LogLevel warn
+
+CustomLog /var/log/apache2/access.log combined
+ServerSignature Off
+
+
+
+ServerAdmin n...@wikimedia.org
+ServerName virt1000.wikimedia.org
+
+SSLEngine on
+SSLCertificateFile /etc/ssl/certs/<%= @certificate %>.pem
+SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
+SSLCACertificatePath /etc/ssl/certs/
+<%= @ssl_settings.join("\n") %>
+
+RedirectMatch ^/$ https://virt1000.wikimedia.org/wiki/
+
+RewriteEngine on
+RewriteRule ^/view/(.*)$ https://virt1000.wikimedia.org/wiki/$1 [L,R]
+RewriteCond %{HTTP_HOST} !^virt1001\.wikimedia\.org [NC]
+RewriteRule ^/(.*) https://virt1000.wikimedia.org/$1 [L,R]
+
+DocumentRoot /usr/local/apache/common/docroot/wikimedia.org
+
+Options FollowSymLinks
+AllowOverride None
+
+
+Options Indexes FollowSymLinks MultiViews
+AllowOverride None
+Order allow,deny
+allow from all
+
+
+php_flag engine off
+
+
+SetHandler server-status
+Order deny,allow
+Deny from all
+Allow from 208.80.154.18
+Allow from 208.80.152.32
+
+
+Alias /w/images /usr/local/apache/common/docroot/wikimedia.org/images
+Alias /w /usr/local/apache/common/docroot/wikimedia.org/w
+Alias /wiki /usr/local/apache/common/docroot/wikimedia.org/w/index.php
+Alias /dumps /a/backup/public
+
+ErrorLog /var/log/apache2/error.log
+
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+LogLevel warn
+
+CustomLog /var/log/apache2/access.log combined
+ServerSignature Off
+
+
--
To view, visit https://gerrit.wikimedia.org/r/157704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbac6bf7802e0dcd69c8602fd9e350791a3722d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Annotate inserted special characters - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Annotate inserted special characters
..
Annotate inserted special characters
Don't know why this was set to false.
Bug: 60476
Change-Id: I05cbbe0a83e633ea4ace6b6be5dbb716c44e3236
---
M src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
b/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
index 087d2c6..ec29cc7 100644
--- a/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
+++ b/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
@@ -147,7 +147,7 @@
var character = $( e.target ).data( 'character' );
if ( character !== undefined ) {
- this.getFragment().insertContent( character, false
).collapseRangeToEnd().select();
+ this.getFragment().insertContent( character, true
).collapseRangeToEnd().select();
}
};
--
To view, visit https://gerrit.wikimedia.org/r/157703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05cbbe0a83e633ea4ace6b6be5dbb716c44e3236
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Mooeypoo
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Annotate inserted special characters - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157703
Change subject: Annotate inserted special characters
..
Annotate inserted special characters
Don't know why this was set to false.
Bug: 70265
Change-Id: I05cbbe0a83e633ea4ace6b6be5dbb716c44e3236
---
M src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/03/157703/1
diff --git a/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
b/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
index 087d2c6..ec29cc7 100644
--- a/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
+++ b/src/ui/inspectors/ve.ui.SpecialCharacterInspector.js
@@ -147,7 +147,7 @@
var character = $( e.target ).data( 'character' );
if ( character !== undefined ) {
- this.getFragment().insertContent( character, false
).collapseRangeToEnd().select();
+ this.getFragment().insertContent( character, true
).collapseRangeToEnd().select();
}
};
--
To view, visit https://gerrit.wikimedia.org/r/157703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05cbbe0a83e633ea4ace6b6be5dbb716c44e3236
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 localization capability to quotation marks - change (mediawiki...WikimediaIncubator)
Ebe123 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157702
Change subject: Add localization capability to quotation marks
..
Add localization capability to quotation marks
This commit adds the message wminc-languagecode so that the quotation
marks can be localized. They shouldn't always be straight as in English.
Change-Id: Ibcf1ddc920e3ca6a9219de816860c3ffc1fa2e57
---
M InfoPage.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 4 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator
refs/changes/02/157702/1
diff --git a/InfoPage.php b/InfoPage.php
index 8b6108b..41a59c8 100644
--- a/InfoPage.php
+++ b/InfoPage.php
@@ -41,7 +41,7 @@
$name = Language::fetchLanguageName( $this->mLangCode,
$wgLang->getCode(), 'all' );
$this->mLangName = $name ? $name :
Language::fetchLanguageName( $this->mLangCode, 'en',
'all' );
- $titleParam = $this->mLangName ? $this->mLangName : '"' .
$this->mLangCode . '"'; # Name, else code
+ $titleParam = $this->mLangName ? $this->mLangName : wfMessage(
'wminc-languagecode', $this->mLangCode )->text(); # Name, else code
# Give grep a chance to find the usages:
# wminc-infopage-title-p, wminc-infopage-title-b,
wminc-infopage-title-t, wminc-infopage-title-q,
# wminc-infopage-title-n, wminc-infopage-title-s,
wminc-infopage-title-v, wminc-infopage-title-y
diff --git a/i18n/en.json b/i18n/en.json
index 79c2537..90108ba 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -74,6 +74,7 @@
"wminc-fs-startwiki-exists-text": "The prefix of your wiki is $1. The
Main Page is at $2. You can now collaborate with other speakers of this
language to build a community!\nIf you want to create a page, just type in the
name in the search box above, and follow the link you will see.",
"wminc-infopage-enter": "go to the Main Page",
"wminc-unknownlang": "(unknown language code)",
+ "wminc-languagecode": "\"$1\"",
"wminc-manual-url": "Help:Manual",
"wminc-infopage-title-p": "Wikipedia $1",
"wminc-infopage-title-b": "Wikibooks $1",
@@ -103,4 +104,4 @@
"wminc-infopage-status-beforeincubator-sister": "This project is
available at $1.",
"wminc-infopage-error": "Error: {{#infopage}} can only be used on
prefixed pages.",
"wminc-infopage-links": ""
-}
\ No newline at end of file
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index bbd03a6..7ae12e3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -85,6 +85,7 @@
"wminc-fs-startwiki-exists-text": "Parameters:\n* $1 - the prefix
(Wx/xyz)\n* $2 - a link to its main page (Wx/xyz/Main_Page)",
"wminc-infopage-enter": "Text of a link to the Main Page of a test wiki
at Incubator.",
"wminc-unknownlang": "Added after the title ''Wiki[project] \"code\"''
when no language name is found for the language code.",
+ "wminc-languagecode": "Used when a language code is provided but the
language name is unknown on {{msg-wm|wminc-infopage-title-p}} and sister
messages.\n* $1 - language code",
"wminc-manual-url": "{{notranslate}}\nUsed in:\n*
{{msg-mw|Wminc-infopage-option-startwiki}}\n*
{{msg-mw|Wminc-fs-settings-text}}",
"wminc-infopage-title-p": "This is the main title of the info page.
Parameters:\n* $1 - the language name from CLDR, i.e. it takes the name in your
language if available. Otherwise, it's in English.\n{{Identical|Wikipedia}}",
"wminc-infopage-title-b": "This is the main title of the info page. $1
is the language name from CLDR, i.e. it takes the name in your language if
available. Otherwise, it's in English.",
--
To view, visit https://gerrit.wikimedia.org/r/157702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcf1ddc920e3ca6a9219de816860c3ffc1fa2e57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
Gerrit-Branch: master
Gerrit-Owner: Ebe123
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Error handling for HTTP 4xx and 5xx responses - change (mediawiki...api)
jenkins-bot has submitted this change and it was merged.
Change subject: Error handling for HTTP 4xx and 5xx responses
..
Error handling for HTTP 4xx and 5xx responses
Client now throws an HttpError when handling HTTP responses with a
status in the 400 and 500 ranges.
Change-Id: Ifb3aa6025f135ea9138a9ffe9eba07da4091796e
Bug: 70193
---
M lib/mediawiki_api/client.rb
M lib/mediawiki_api/exceptions.rb
M spec/client_spec.rb
3 files changed, 32 insertions(+), 1 deletion(-)
Approvals:
Cmcmahon: Looks good to me, but someone else must approve
Hashar: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb
index fb63885..146e5c6 100644
--- a/lib/mediawiki_api/client.rb
+++ b/lib/mediawiki_api/client.rb
@@ -37,6 +37,8 @@
response = @conn.send(method, "", params.merge(action: name, format:
FORMAT))
+ raise HttpError, response.status if response.status >= 400
+
if response.headers.include?("mediawiki-api-error")
raise ApiError.new(Response.new(response, ["error"]))
end
diff --git a/lib/mediawiki_api/exceptions.rb b/lib/mediawiki_api/exceptions.rb
index 7174fe7..aec622c 100644
--- a/lib/mediawiki_api/exceptions.rb
+++ b/lib/mediawiki_api/exceptions.rb
@@ -28,6 +28,18 @@
class CreateAccountError < StandardError
end
+ class HttpError < StandardError
+attr_reader :status
+
+def initialize(status)
+ @status = status
+end
+
+def to_s
+ "unexpected HTTP response (#{status})"
+end
+ end
+
class LoginError < StandardError
end
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 1d7c9db..3e7dc8b 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -18,7 +18,8 @@
let(:token_type) { action }
let(:params) { {} }
-let(:response) { { headers: response_headers, body: response_body.to_json
} }
+let(:response) { { status: response_status, headers: response_headers,
body: response_body.to_json } }
+let(:response_status) { 200 }
let(:response_headers) { nil }
let(:response_body) { { "something" => {} } }
@@ -100,6 +101,22 @@
end
end
+context "when the response status is in the 400 range" do
+ let(:response_status) { 403 }
+
+ it "raises an HttpError" do
+expect { subject }.to raise_error(MediawikiApi::HttpError, "unexpected
HTTP response (403)")
+ end
+end
+
+context "when the response status is in the 500 range" do
+ let(:response_status) { 502 }
+
+ it "raises an HttpError" do
+expect { subject }.to raise_error(MediawikiApi::HttpError, "unexpected
HTTP response (502)")
+ end
+end
+
context "when the response is an error" do
let(:response_headers) { { "MediaWiki-API-Error" => "code" } }
let(:response_body) { { error: { info: "detailed message", code: "code"
} } }
--
To view, visit https://gerrit.wikimedia.org/r/157300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb3aa6025f135ea9138a9ffe9eba07da4091796e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
Gerrit-Branch: master
Gerrit-Owner: Dduvall
Gerrit-Reviewer: Cmcmahon
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Zfilipin
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set expanded=false on command help dialog layout - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Set expanded=false on command help dialog layout
..
Set expanded=false on command help dialog layout
Fixes height calculation issue.
Change-Id: I8033924cb2905c13cf2408caf770f70e3ddcc3d8
---
M src/ui/dialogs/ve.ui.CommandHelpDialog.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/dialogs/ve.ui.CommandHelpDialog.js
b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
index 070d77d..2fe8298 100644
--- a/src/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -64,7 +64,8 @@
this.contentLayout = new OO.ui.PanelLayout( {
$: this.$,
scrollable: true,
- padded: true
+ padded: true,
+ expanded: false
} );
this.$container = this.$( '' ).addClass(
've-ui-commandHelpDialog-container' );
--
To view, visit https://gerrit.wikimedia.org/r/157665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8033924cb2905c13cf2408caf770f70e3ddcc3d8
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Trevor Parscal
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: 1f136f9..a26aeca - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 1f136f9..a26aeca .. Syncronize VisualEditor: 1f136f9..a26aeca Change-Id: I71f966dbddb33ec9522901203c1e04bde7febc1a --- 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 1f136f9..a26aeca 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1f136f9d1d67fcb7006e68727450f1280d45e068 +Subproject commit a26aeca1440b1a3f26879e050198f5c24559de7b -- To view, visit https://gerrit.wikimedia.org/r/157701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I71f966dbddb33ec9522901203c1e04bde7febc1a 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: 1f136f9..a26aeca - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/157701 Change subject: Syncronize VisualEditor: 1f136f9..a26aeca .. Syncronize VisualEditor: 1f136f9..a26aeca Change-Id: I71f966dbddb33ec9522901203c1e04bde7febc1a --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/01/157701/1 diff --git a/VisualEditor b/VisualEditor index 1f136f9..a26aeca 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1f136f9d1d67fcb7006e68727450f1280d45e068 +Subproject commit a26aeca1440b1a3f26879e050198f5c24559de7b -- To view, visit https://gerrit.wikimedia.org/r/157701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71f966dbddb33ec9522901203c1e04bde7febc1a 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] Update VE core submodule to master (dd2398c) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (dd2398c) .. Update VE core submodule to master (dd2398c) New changes: d635974 Use staging instead of undo in annotation inspector 29233b8 Localisation updates from https://translatewiki.net. efb3296 Localisation updates from https://translatewiki.net. cfc5ad1 Localisation updates from https://translatewiki.net. c609e02 Update OOjs to v1.1.0 dd2398c Update OOjs UI to v0.1.0-pre (adfcf92c6a) Change-Id: Id122cd8a266554fdbe9f10dcdf53d87c7dd21b17 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index d6d6db4..dd2398c 16 --- a/lib/ve +++ b/lib/ve -Subproject commit d6d6db4137285775f5089ab2cdfbc402fc0ead29 +Subproject commit dd2398c066e9a41b8d8651b54946be753de3d83d -- To view, visit https://gerrit.wikimedia.org/r/157697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id122cd8a266554fdbe9f10dcdf53d87c7dd21b17 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Alex Monk 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 data-parsoid from transcluded template content - change (mediawiki...parsoid)
Marcoil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157700
Change subject: Remove data-parsoid from transcluded template content
..
Remove data-parsoid from transcluded template content
This reduces document size and also fixes the crash when round-trip
testing ruwiki Валия.
Elements with stx information don't get their data-parsoid removed as the
information is necessary in some cases, for now.
Change-Id: Ibb8272648bf93a24b16d0871e24633bf35f1ccbc
---
M lib/dom.cleanup.js
M lib/dom.markFosteredContent.js
M lib/dom.wrapTemplates.js
M lib/mediawiki.DOMUtils.js
M lib/mediawiki.HTML5TreeBuilder.node.js
5 files changed, 24 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/00/157700/1
diff --git a/lib/dom.cleanup.js b/lib/dom.cleanup.js
index 66c02e9..25f8127 100644
--- a/lib/dom.cleanup.js
+++ b/lib/dom.cleanup.js
@@ -39,7 +39,12 @@
function cleanupAndSaveDataParsoid( env, node ) {
if ( DU.isElt(node) ) {
var dp = DU.getDataParsoid( node );
- if (dp) {
+ if (dp && dp.inTransclusion && !dp.stx) {
+ // We don't keep data-parsoid for nodes resulting from
template
+ // expansion.
+ // TODO: Elements with stx information need to keep it?
+ DU.removeDataParsoid(node);
+ } else if (dp) {
// Delete empty auto-inserted elements
var next = node.nextSibling;
if (dp.autoInsertedStart && dp.autoInsertedEnd &&
diff --git a/lib/dom.markFosteredContent.js b/lib/dom.markFosteredContent.js
index 903df5c..bcc7598 100644
--- a/lib/dom.markFosteredContent.js
+++ b/lib/dom.markFosteredContent.js
@@ -137,7 +137,6 @@
DU.deleteNode( c );
} else if ( DU.isElt( c ) ) {
dp = DU.getDataParsoid( c );
- dp.inTransclusion = undefined;
if ( c.childNodes.length > 0 ) {
markFosteredContent( c, env );
}
diff --git a/lib/dom.wrapTemplates.js b/lib/dom.wrapTemplates.js
index a3980ef..33ffebb 100644
--- a/lib/dom.wrapTemplates.js
+++ b/lib/dom.wrapTemplates.js
@@ -762,6 +762,13 @@
encapInfo.dp.src = env.page.src.substring(
encapInfo.dp.dsr[0], encapInfo.dp.dsr[1] );
}
+ if (encapInfo.dp.inTransclusion) {
+ // The first element of the transclusion should never
have its
+ // data-parsoid removed, we make sure by marking it not
in the
+ // transclusion content.
+ encapInfo.dp.inTransclusion = undefined;
+ }
+
// Remove startElem (=range.startElem) if a meta. If a meta,
// it is guaranteed to be a marker meta added to mark the start
// of the template.
diff --git a/lib/mediawiki.DOMUtils.js b/lib/mediawiki.DOMUtils.js
index e4b1325..226ac1d 100644
--- a/lib/mediawiki.DOMUtils.js
+++ b/lib/mediawiki.DOMUtils.js
@@ -304,6 +304,16 @@
return this.setJSONAttribute( node, "data-parsoid", dpObj );
},
+ /**
+* Remove the data-parsoid attribute on a node.
+*
+* @returns {Node} `node`, without data-parsoid
+*/
+ removeDataParsoid: function(node) {
+ delete this.getNodeData(node).parsoid;
+ return node;
+ },
+
getNodeData: function ( node ) {
if ( !node.dataobject ) {
node.dataobject = {};
diff --git a/lib/mediawiki.HTML5TreeBuilder.node.js
b/lib/mediawiki.HTML5TreeBuilder.node.js
index 86e01ac..46d9e22 100644
--- a/lib/mediawiki.HTML5TreeBuilder.node.js
+++ b/lib/mediawiki.HTML5TreeBuilder.node.js
@@ -58,7 +58,7 @@
this.parser = new HTML5.DOMParser( domino );
this.parser._tokenizer = this;
this.addListener('token',
-
this.parser._treeBuilder.processToken.bind(this.parser._treeBuilder));
+
this.parser._treeBuilder.processToken.bind(this.parser._treeBuilder));
}
// Reset the parser
--
To view, visit https://gerrit.wikimedia.org/r/157700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb8272648bf93a24b16d0871e24633bf35f1ccbc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Moved the first Wikidata job from WMDE Jenkins - change (integration/jenkins-job-builder-config)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/157699 Change subject: WIP Moved the first Wikidata job from WMDE Jenkins .. WIP Moved the first Wikidata job from WMDE Jenkins Will be triggered once a day at 12:00 pm. TODO The job should be using our project structure. Created job: browsertests-Wikidata-wikidata.beta.wmflabs.org-linux-firefox-sauce The job was moved from https://github.com/wmde/jenkins-job-builder-config Paired with: Tobi Gritschacher Change-Id: Ic5a096753e27a53c90e17e64128e4af6cb2cf7f4 --- M jobs.yaml 1 file changed, 52 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/99/157699/1 diff --git a/jobs.yaml b/jobs.yaml index 6b44650..af35a32 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -371,6 +371,58 @@ mediawiki_password_variable: MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG mediawiki_user: LanguageScreenshotBot +# Wikidata +- job: +name: browsertests-Wikidata-wikidata.beta.wmflabs.org-linux-firefox-sauce +node: contintLabsSlave + +scm: +- git: +url: 'https://github.com/wmde/WikidataBrowserTests.git' +branches: + - 'master' +skip-tag: true + +wrappers: + - ansicolor + - timestamps + +triggers: + - timed: 'H 0 12 * * *' + +builders: + - shell: | + # Shared cache of gems to avoid hitting rubygems all the time + # See https://github.com/bundler/bundler/issues/2856 + export GEM_HOME="$WORKSPACE/../gems" + + # install ruby dependencies + mkdir -p vendor + gem1.9.3 install --env-shebang -i vendor bundler --no-ri --no-rdoc + # Prepare some paths lookup + export GEM_PATH="`pwd`/vendor" + + cd tests/browser + "$WORKSPACE"/vendor/bin/bundle install --verbose + + cp config/config_ci.yml config/config.yml + + export WB_REPO_USERNAME=WikidataTester + + export BROWSER=firefox + export VERSION=25 + export PLATFORM=Linux + export BROWSER_TIMEOUT=30 + "$WORKSPACE"/vendor/bin/bundle exec cucumber \ +--backtrace \ +--color \ +--verbose \ +--format pretty \ +--format Cucumber::Formatter::Sauce \ +--out "$WORKSPACE/log/junit" \ +--tags @wikidata.beta.wmflabs.org \ +--tags ~@skip + # WikiLove - project: name: WikiLove -- To view, visit https://gerrit.wikimedia.org/r/157699 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5a096753e27a53c90e17e64128e4af6cb2cf7f4 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ 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 (dd2398c) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/157697 Change subject: Update VE core submodule to master (dd2398c) .. Update VE core submodule to master (dd2398c) New changes: d635974 Use staging instead of undo in annotation inspector 29233b8 Localisation updates from https://translatewiki.net. efb3296 Localisation updates from https://translatewiki.net. cfc5ad1 Localisation updates from https://translatewiki.net. c609e02 Update OOjs to v1.1.0 dd2398c Update OOjs UI to v0.1.0-pre (adfcf92c6a) Change-Id: Id122cd8a266554fdbe9f10dcdf53d87c7dd21b17 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/97/157697/1 diff --git a/lib/ve b/lib/ve index d6d6db4..dd2398c 16 --- a/lib/ve +++ b/lib/ve -Subproject commit d6d6db4137285775f5089ab2cdfbc402fc0ead29 +Subproject commit dd2398c066e9a41b8d8651b54946be753de3d83d -- To view, visit https://gerrit.wikimedia.org/r/157697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id122cd8a266554fdbe9f10dcdf53d87c7dd21b17 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] Remove bogus jquery dependencies - change (mediawiki...SemanticForms)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/157698 Change subject: Remove bogus jquery dependencies .. Remove bogus jquery dependencies They throw errors in recent MediaWikis Change-Id: I257ccf30a916a3c22d60d7a23861a114687cbc14 --- M SemanticForms.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms refs/changes/98/157698/1 diff --git a/SemanticForms.php b/SemanticForms.php index 476bc42..ff90783 100644 --- a/SemanticForms.php +++ b/SemanticForms.php @@ -275,7 +275,6 @@ 'ext.semanticforms.autoedit' => $sfgResourceTemplate + array( 'scripts' => 'libs/SF_autoedit.js', 'styles' => 'skins/SF_autoedit.css', - 'dependencies' => array( 'jquery' ), 'messages' => array( 'sf-autoedit-wait', 'sf_autoedit_anoneditwarning', @@ -284,7 +283,6 @@ 'ext.semanticforms.submit' => $sfgResourceTemplate + array( 'scripts' => 'libs/SF_submit.js', 'styles' => 'skins/SF_submit.css', - 'dependencies' => array( 'jquery' ), 'messages' => array( 'sf_formedit_saveandcontinue_summary', 'sf_formedit_saveandcontinueediting', @@ -293,7 +291,6 @@ 'ext.semanticforms.collapsible' => $sfgResourceTemplate + array( 'scripts' => 'libs/SF_collapsible.js', 'styles' => 'skins/SF_collapsible.css', - 'dependencies' => array( 'jquery' ), ), 'ext.semanticforms.wikieditor' => $sfgResourceTemplate + array( 'scripts' => 'libs/SF_wikieditor.js', -- To view, visit https://gerrit.wikimedia.org/r/157698 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I257ccf30a916a3c22d60d7a23861a114687cbc14 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticForms Gerrit-Branch: master Gerrit-Owner: Nikerabbit ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] The first PdfHandler job - change (integration/jenkins-job-builder-config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157696
Change subject: The first PdfHandler job
..
The first PdfHandler job
See also commits in PdfHandler[1], mediawiki/selenium[2] and zuul-config[3].
Created job:
browsertests-PdfHandler-test2.wikipedia.org-linux-firefox-sauce[4]
The job will fail with "cd: tests/browser/: No such file or directory" until
the commit in PdfHandler[1] is in wmf/1.24wmf16 branch.
1: https://gerrit.wikimedia.org/r/#/c/143175/
2: https://gerrit.wikimedia.org/r/#/c/144984/
3: https://gerrit.wikimedia.org/r/#/c/152788/
4:
https://integration.wikimedia.org/ci/view/BrowserTests/job/browsertests-PdfHandler-test2.wikipedia.org-linux-firefox-sauce/
Change-Id: Iba027897d2f4ffaadc74efea41188db9d2815f53
---
M jobs.yaml
1 file changed, 16 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/96/157696/1
diff --git a/jobs.yaml b/jobs.yaml
index 6b44650..802a982 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -235,6 +235,22 @@
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
browser: firefox
+# PdfHandler
+- project:
+name: PdfHandler
+browser: firefox
+folder: tests
+headless: 'false'
+mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
+mediawiki_url: test2.wikipedia.org
+mediawiki_user: Selenium_user
+platform: linux
+recipients: *emails-qa
+repository: mediawiki/extensions/PdfHandler
+
+jobs:
+ - 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
+
# TwnMainPage
## sandbox.translatewiki.net
--
To view, visit https://gerrit.wikimedia.org/r/157696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba027897d2f4ffaadc74efea41188db9d2815f53
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] browsertests: bump phantomjs to 1.9.7 - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: browsertests: bump phantomjs to 1.9.7
..
browsertests: bump phantomjs to 1.9.7
The Ubuntu package is 1.9.0 and there is no effort in Debian to have it
bumped to a more recent version.
Adjust the macro to fetch 1.9.7 (but <1.9.8) using npm AFTER the git
cleanup.
That fix the ZeroBanner job which I have already updated.
Change-Id: I2a5263093b9764a8aecdf63cc797628de8ad8c90
---
M macro.yaml
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index e49396b..fe3961b 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -695,6 +695,12 @@
CUCUMBER_PARAMETER="@{mediawiki_url}"
fi
+ if [ $BROWSER == 'phantomjs' ]; then
+ npm install 'phantomjs@>=1.9.7-0 <1.9.8'
+ export PATH="`pwd`/node_modules/.bin:$PATH"
+ phantomjs --version
+ fi
+
# run tests
"$WORKSPACE"/vendor/bin/bundle exec cucumber \
--backtrace \
--
To view, visit https://gerrit.wikimedia.org/r/157051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a5263093b9764a8aecdf63cc797628de8ad8c90
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Cmcmahon
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Zfilipin
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow hiera to configure git clone depth - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157694
Change subject: Allow hiera to configure git clone depth
..
Allow hiera to configure git clone depth
Expose default git clone depth as a heira manageable variable named
"git::default_depth".
Change-Id: I5c9557669db0361e4e4bdfefd8591bc4b370f4b6
---
M puppet/modules/git/manifests/clone.pp
M puppet/modules/git/manifests/init.pp
2 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/94/157694/1
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index 13d4745..95c7a97 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -51,7 +51,7 @@
$owner = 'vagrant',
$group = 'vagrant',
$ensure = 'present',
-$depth = undef,
+$depth = $::git::default_depth,
$recurse_submodules = true,
) {
require ::git
@@ -91,7 +91,7 @@
if $ensure == 'latest' {
exec { "git_pull_${title}":
command => "git pull ${arg_recurse} ${arg_depth}",
-unless => 'git fetch && git diff --quiet @{upstream}',
+unless => "git fetch ${arg_depth} && git diff --quiet
@{upstream}",
cwd => $directory,
user => $owner,
group=> $group,
diff --git a/puppet/modules/git/manifests/init.pp
b/puppet/modules/git/manifests/init.pp
index ed6d966..1dc38eb 100644
--- a/puppet/modules/git/manifests/init.pp
+++ b/puppet/modules/git/manifests/init.pp
@@ -11,6 +11,10 @@
# convenient syntactic sugar for cloning Gerrit repositories.
# Default: 'https://gerrit.wikimedia.org/r/p/%s.git'.
#
+# [*default_depth*]
+# Default depth for git clones. If specified, creates a shallow clone with
+# history truncated to the specified number of revisions. Default undef.
+#
# === Examples
#
# # Use GitHub as the default remote for repositories.
@@ -20,6 +24,7 @@
#
class git(
$urlformat = 'https://gerrit.wikimedia.org/r/p/%s.git',
+$default_depth = undef,
) {
package { 'git':
ensure => latest,
--
To view, visit https://gerrit.wikimedia.org/r/157694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c9557669db0361e4e4bdfefd8591bc4b370f4b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support Github URLs - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157695
Change subject: Support Github URLs
..
Support Github URLs
Github URLs for MediaWiki projects have a predictable variation from the
Gerrit originals. Add support in git::clone for transforming the
repository name from Gerrit format to Github format when the default
$git::urlformat references Github.
Using this change it is possible to clone MediaWiki and extensions from
Github by setting:
git::urlformat: 'https://github.com/wikimedia/%s.git'
in puppet/hieradata/local.yaml prior to the first `vagrant up` for a new
MediaWiki-Vagrant deployment. Changing the hiera value for
git::urlformat will not effect any existing git clones.
Bug: 56046
Change-Id: Ie90cef95552e9a5444ee7dcef953371848840852
---
M puppet/hieradata/common.yaml
M puppet/modules/git/manifests/clone.pp
M puppet/modules/git/manifests/init.pp
3 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/95/157695/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 84251b9..201955d 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -14,6 +14,8 @@
crm::db_user: root
crm::db_pass: "%{hiera('mysql::root_password')}"
+git::urlformat: 'https://gerrit.wikimedia.org/r/%s'
+
hhvm::logroot: /vagrant/logs
mediawiki::wiki_name: devwiki
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index 95c7a97..68685f9 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -60,8 +60,13 @@
fail('ensure parameter must be present or latest.')
}
+$repo_path = $::git::urlformat ? {
+/github\.com/ => regsubst($title, '/', '-', 'G'),
+default => $title,
+}
+
$repository = $remote ? {
-undef => sprintf($git::urlformat, $title),
+undef => sprintf($::git::urlformat, $repo_path),
default => $remote,
}
diff --git a/puppet/modules/git/manifests/init.pp
b/puppet/modules/git/manifests/init.pp
index 1dc38eb..71c875d 100644
--- a/puppet/modules/git/manifests/init.pp
+++ b/puppet/modules/git/manifests/init.pp
@@ -9,7 +9,7 @@
# the remote repository URL is constructed by interpolating the title
# of the resource into the format string below. This provides a
# convenient syntactic sugar for cloning Gerrit repositories.
-# Default: 'https://gerrit.wikimedia.org/r/p/%s.git'.
+# Example: 'https://gerrit.wikimedia.org/r/p/%s.git'.
#
# [*default_depth*]
# Default depth for git clones. If specified, creates a shallow clone with
@@ -23,7 +23,7 @@
# }
#
class git(
-$urlformat = 'https://gerrit.wikimedia.org/r/p/%s.git',
+$urlformat,
$default_depth = undef,
) {
package { 'git':
--
To view, visit https://gerrit.wikimedia.org/r/157695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie90cef95552e9a5444ee7dcef953371848840852
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove bogus test from DataModelSerializationRoundtripTest - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/157693 Change subject: Remove bogus test from DataModelSerializationRoundtripTest .. Remove bogus test from DataModelSerializationRoundtripTest This bit of the test was wrong. I worked because of a bug in DataModel 0.x (Item::equals returns true if the serializations are equal, even if the object structure is not). Change-Id: I9d8620f17787ce907ae47d19f5eb649a52cd11c9 --- M lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/93/157693/1 diff --git a/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php b/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php index 06807e1..ded0fee 100644 --- a/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php +++ b/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php @@ -221,10 +221,6 @@ new StringValue( 'string-value' ) ), new PropertyValueSnak( - new PropertyId( $baseId . '5' ), - new UnDeserializableValue( 'undeserializable-data', 'string', 'error' ) - ), - new PropertyValueSnak( new PropertyId( $baseId . '6' ), new UnknownValue( 'unknown-value' ) ), -- To view, visit https://gerrit.wikimedia.org/r/157693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d8620f17787ce907ae47d19f5eb649a52cd11c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Remove logic for inexistant "wpvector-collapsiblenav" op... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: QA: Remove logic for inexistant "wpvector-collapsiblenav" option
..
QA: Remove logic for inexistant "wpvector-collapsiblenav" option
This option was never part of MediaWiki core and shouldn't have
been here in the first place.
It was removed from the Vector extension in October 2013 with I33dc0033c.
Not sure what this code is for or why it's not failing.
Change-Id: Ie552d9de3aa1f123a8f1c9414b81461b4ec6
---
M tests/browser/features/support/pages/preferences_appearance_page.rb
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/tests/browser/features/support/pages/preferences_appearance_page.rb
b/tests/browser/features/support/pages/preferences_appearance_page.rb
index e7b64cd..c24e386 100644
--- a/tests/browser/features/support/pages/preferences_appearance_page.rb
+++ b/tests/browser/features/support/pages/preferences_appearance_page.rb
@@ -16,7 +16,6 @@
page_url URL.url("Special:Preferences#mw-prefsection-rendering")
checkbox(:auto_number_check, id: "mw-input-wpnumberheadings")
- checkbox(:collapse_sidebar_vector_check, id:
"mw-input-wpvector-collapsiblenav")
radio_button(:cologne_blue, id: "mw-input-wpskin-cologneblue")
radio_button(:day_mo_year_radio, id: "mw-input-wpdate-dmy")
checkbox(:dont_show_aft_check, id: "mw-input-wparticlefeedback-disable")
--
To view, visit https://gerrit.wikimedia.org/r/157690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie552d9de3aa1f123a8f1c9414b81461b4ec6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Cmcmahon
Gerrit-Reviewer: Zfilipin
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow override of window manager in language input widget - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157692
Change subject: Allow override of window manager in language input widget
..
Allow override of window manager in language input widget
Use a non-isolated window manager in the demo.
Change-Id: I841606047a0316b0b45e199ea9569626456c48fa
---
M demos/ve/demo.css
M demos/ve/demo.js
M src/ui/widgets/ve.ui.LanguageInputWidget.js
3 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/92/157692/1
diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index c03f7ce..16775da 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -63,6 +63,10 @@
margin-right: 1em;
}
+.ve-demo-languageSearchDialogManager {
+ font-size: 0.8em;
+}
+
.ve-demo-menu .oo-ui-textInputWidget {
width: 4em;
}
diff --git a/demos/ve/demo.js b/demos/ve/demo.js
index 87744ab..7796252 100644
--- a/demos/ve/demo.js
+++ b/demos/ve/demo.js
@@ -47,7 +47,10 @@
new OO.ui.ButtonOptionWidget( 'edit', { label:
'Edit HTML' } ),
new OO.ui.ButtonOptionWidget( 'read', { label:
'Read' } )
] ),
- languageInput = new ve.ui.LanguageInputWidget( {
requireDir: true } ),
+ languageInput = new ve.ui.LanguageInputWidget( {
+ requireDir: true,
+ dialogManager: new OO.ui.WindowManager( {
factory: ve.ui.windowFactory, classes: ['ve-demo-languageSearchDialogManager']
} )
+ } ),
sourceTextInput = new OO.ui.TextInputWidget( {
$: this.$,
multiline: true,
diff --git a/src/ui/widgets/ve.ui.LanguageInputWidget.js
b/src/ui/widgets/ve.ui.LanguageInputWidget.js
index a4a6ca5..0720a4c 100644
--- a/src/ui/widgets/ve.ui.LanguageInputWidget.js
+++ b/src/ui/widgets/ve.ui.LanguageInputWidget.js
@@ -14,6 +14,7 @@
* @constructor
* @param {Object} [config] Configuration options
* @cfg {boolean} [requireDir] Require directionality to be set (no 'auto'
value)
+ * @cfg {OO.ui.WindowManager} [dialogManager] Window manager to launch the
language search dialog in
*/
ve.ui.LanguageInputWidget = function VeUiLanguageInputWidget( config ) {
// Configuration initialization
@@ -26,7 +27,7 @@
this.lang = null;
this.dir = null;
this.overlay = new ve.ui.Overlay( { classes: ['ve-ui-overlay-global'] }
);
- this.dialogs = new OO.ui.WindowManager( { factory: ve.ui.windowFactory,
isolate: true } );
+ this.dialogs = config.dialogManager || new OO.ui.WindowManager( {
factory: ve.ui.windowFactory, isolate: true } );
this.findLanguageButton = new OO.ui.ButtonWidget( {
$: this.$,
classes: [ 've-ui-languageInputWidget-findLanguageButton' ],
--
To view, visit https://gerrit.wikimedia.org/r/157692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I841606047a0316b0b45e199ea9569626456c48fa
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] Use new versions of DataValuesJavascript and ValueView - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/157689 Change subject: Use new versions of DataValuesJavascript and ValueView .. Use new versions of DataValuesJavascript and ValueView Bug:65847 Bug:70258 Change-Id: I90d0ca4cedae8a105496dde4fab6a17c471477ec --- M composer.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/89/157689/1 diff --git a/composer.json b/composer.json index 93a2d19..8c49c16 100644 --- a/composer.json +++ b/composer.json @@ -32,8 +32,8 @@ "data-values/validators": "~0.1.0", "data-values/data-types": "~0.4.0", "data-values/serialization": "~1.0", - "data-values/javascript": "~0.5.1", - "data-values/value-view": "~0.6.5", + "data-values/javascript": "~0.6.0", + "data-values/value-view": "~0.7.0", "wikibase/data-model": "~0.9.0", "wikibase/data-model-javascript": "~0.3.0", -- To view, visit https://gerrit.wikimedia.org/r/157689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90d0ca4cedae8a105496dde4fab6a17c471477ec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Remove logic for inexistant "wpvector-collapsiblenav" op... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157690
Change subject: QA: Remove logic for inexistant "wpvector-collapsiblenav" option
..
QA: Remove logic for inexistant "wpvector-collapsiblenav" option
This option was never part of MediaWiki core and shouldn't have
been here in the first place.
It was removed from the Vector extension in October 2013 with I33dc0033c.
Not sure what this code is for or why it's not failing.
Change-Id: Ie552d9de3aa1f123a8f1c9414b81461b4ec6
---
M tests/browser/features/support/pages/preferences_appearance_page.rb
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/157690/1
diff --git
a/tests/browser/features/support/pages/preferences_appearance_page.rb
b/tests/browser/features/support/pages/preferences_appearance_page.rb
index e7b64cd..c24e386 100644
--- a/tests/browser/features/support/pages/preferences_appearance_page.rb
+++ b/tests/browser/features/support/pages/preferences_appearance_page.rb
@@ -16,7 +16,6 @@
page_url URL.url("Special:Preferences#mw-prefsection-rendering")
checkbox(:auto_number_check, id: "mw-input-wpnumberheadings")
- checkbox(:collapse_sidebar_vector_check, id:
"mw-input-wpvector-collapsiblenav")
radio_button(:cologne_blue, id: "mw-input-wpskin-cologneblue")
radio_button(:day_mo_year_radio, id: "mw-input-wpdate-dmy")
checkbox(:dont_show_aft_check, id: "mw-input-wparticlefeedback-disable")
--
To view, visit https://gerrit.wikimedia.org/r/157690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie552d9de3aa1f123a8f1c9414b81461b4ec6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Add metric selector - change (analytics/dashiki)
Milimetric has submitted this change and it was merged.
Change subject: Add metric selector
..
Add metric selector
Change-Id: I5b7b0dff6d350fc3f01b8b291215b164df0d1b16
---
M bower.json
M src/app/apis/wikimetrics.js
M src/app/config.js
M src/app/require.config.js
A src/components/metric-selector/bindings.js
M src/components/metric-selector/metric-selector.html
M src/components/metric-selector/metric-selector.js
M src/components/time-selector/time-selector.html
M src/components/wikimetrics-layout/wikimetrics-layout.html
M src/components/wikimetrics-layout/wikimetrics-layout.js
M src/css/styles.css
M src/index.html
A stubs/categorizedMetrics.json
M test/app/apis.js
A test/components/metric-selector.js
M test/components/wikimetrics-layout.js
16 files changed, 328 insertions(+), 37 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/bower.json b/bower.json
index fc53407..ea0d674 100644
--- a/bower.json
+++ b/bower.json
@@ -12,6 +12,7 @@
"moment": "^2.7.0",
"knockout-projections": "~1.1.0-pre",
"URIjs": "~1.13.2",
-"typeahead.js":"~0.10.5"
+"typeahead.js":"~0.10.5",
+"semantic": "~0.19.0"
}
}
diff --git a/src/app/apis/wikimetrics.js b/src/app/apis/wikimetrics.js
index e6021a1..dae97af 100644
--- a/src/app/apis/wikimetrics.js
+++ b/src/app/apis/wikimetrics.js
@@ -3,7 +3,6 @@
* reports run by WikimetricsBot on wikimetrics. Methods commented inline
*/
define(['config', 'uri/URI', 'uri/URITemplate'], function (siteConfig, uri) {
-
'use strict';
function WikimetricsApi(config) {
@@ -11,7 +10,7 @@
this.projectOptions = [];
this.languageOptions = [];
this.urlProjectLanguageChoices = config.urlProjectLanguageChoices;
-
+this.categorizedMetricsUrl = config.categorizedMetricsUrl;
}
@@ -85,7 +84,7 @@
}.bind(this));
}
-}
+};
WikimetricsApi.prototype._getJSONConfig = function (url, callback) {
// callback should execute callback(json)
@@ -94,8 +93,21 @@
url: url,
success: callback
});
+};
+/**
+ * Parameters
+ * callback : a function to pass returned data to
+ * (note you can just pass an observable here)
+ *
+ * Returns
+ * a jquery promise to an array of available metrics, formatted like
this:
+ *
+ * {category: 'some category', name: 'some metric'}
+ **/
+WikimetricsApi.prototype.getCategorizedMetrics = function(callback) {
+return $.get(this.categorizedMetricsUrl).done(callback);
};
return new WikimetricsApi(siteConfig);
diff --git a/src/app/config.js b/src/app/config.js
index f77ce0e..736746d 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -12,8 +12,7 @@
PagesCreated: 'pages_created',
NamespaceEdits: 'edits'
},
-//totally fake for now
-urlProjectLanguageChoices:
'../../stubs/fake-wikimetrics/projectLanguageChoices.json'
-
+urlProjectLanguageChoices:
'/stubs/fake-wikimetrics/projectLanguageChoices.json',
+categorizedMetricsUrl: '/stubs/categorizedMetrics.json',
};
});
diff --git a/src/app/require.config.js b/src/app/require.config.js
index ccd12bd..73aaa57 100644
--- a/src/app/require.config.js
+++ b/src/app/require.config.js
@@ -5,23 +5,24 @@
var require = {
baseUrl: '.',
paths: {
-'jquery': 'bower_modules/jquery/dist/jquery',
-'knockout': 'bower_modules/knockout/dist/knockout',
-'knockout-projections':
'bower_modules/knockout-projections/dist/knockout-projections',
-'text': 'bower_modules/requirejs-text/text',
-'d3': 'bower_modules/d3/d3',
-'vega': 'bower_modules/vega/vega',
-'topojson': 'bower_modules/topojson/topojson',
-'moment': 'bower_modules/moment/moment',
+'jquery': 'bower_modules/jquery/dist/jquery',
+'knockout' : 'bower_modules/knockout/dist/knockout',
+'knockout-projections' :
'bower_modules/knockout-projections/dist/knockout-projections',
+'text' : 'bower_modules/requirejs-text/text',
+'d3': 'bower_modules/d3/d3',
+'vega' : 'bower_modules/vega/vega',
+'topojson' : 'bower_modules/topojson/topojson',
+'moment': 'bower_modules/moment/moment',
+'semantic-dropdown' :
'bower_modules/semantic/build/uncompressed/modules/dropdown',
// NOTE: if you want functions like uri.expand, you must include both
// URI and URITemplate like define(['uri/URI', 'uri/URITemplate'] ...
// because URITemplate modifies URI when it's parsed
-'uri': 'bower_modules/URIjs/src',
-'config': 'app/config',
-'logger': 'lib/logger',
-'wikimetricsApi': 'app/apis/wi
[MediaWiki-commits] [Gerrit] Project and language choices component - change (analytics/dashiki)
Milimetric has submitted this change and it was merged. Change subject: Project and language choices component .. Project and language choices component Retrieval of project and languages is done via wikimetrics api. Styling of the bootstrap component is done manually (needs to be styled with semantic ui). Change-Id: I0e8e2455b3ae7cbe155e14f6fc97b56d88598edc --- M README.md M bower.json A dist/project-selector.js M dist/scripts.js M dist/style.css M gulpfile.js M src/app/apis/wikimetrics.js M src/app/config.js M src/app/require.config.js A src/components/project-selector/bindings.js M src/components/project-selector/project-selector.html M src/components/project-selector/project-selector.js M src/components/wikimetrics-layout/wikimetrics-layout.html M src/components/wikimetrics-layout/wikimetrics-layout.js M src/components/wikimetrics-visualizer/wikimetrics-visualizer.js M src/css/styles.css A stubs/fake-wikimetrics/projectLanguageChoices.json M test/SpecRunner.browser.js M test/app/apis.js A test/components/project-selector.js M test/components/wikimetrics-visualizer.js 21 files changed, 9,468 insertions(+), 62 deletions(-) Approvals: Milimetric: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/156741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e8e2455b3ae7cbe155e14f6fc97b56d88598edc Gerrit-PatchSet: 15 Gerrit-Project: analytics/dashiki Gerrit-Branch: master Gerrit-Owner: Nuria Gerrit-Reviewer: Milimetric Gerrit-Reviewer: Nuria ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add visualizer to coordinate selectors and graphs - change (analytics/dashiki)
Milimetric has submitted this change and it was merged. Change subject: Add visualizer to coordinate selectors and graphs .. Add visualizer to coordinate selectors and graphs Change-Id: I730fc02cece2d56ce165590d4cde777b2cb248be --- M bower.json M dist/scripts.js M gulpfile.js M src/app/config.js M src/app/data-converters/wikimetrics-timeseries.js M src/app/require.config.js M src/app/startup.js D src/components/selection-visualizer/selection-visualizer.html D src/components/selection-visualizer/selection-visualizer.js M src/components/wikimetrics-layout/wikimetrics-layout.html M src/components/wikimetrics-layout/wikimetrics-layout.js A src/components/wikimetrics-visualizer/wikimetrics-visualizer.html A src/components/wikimetrics-visualizer/wikimetrics-visualizer.js M test/SpecRunner.browser.js M test/app/apis.js M test/components/wikimetrics-layout.js A test/components/wikimetrics-visualizer.js 17 files changed, 312 insertions(+), 50 deletions(-) Approvals: Nuria: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/156722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I730fc02cece2d56ce165590d4cde777b2cb248be Gerrit-PatchSet: 4 Gerrit-Project: analytics/dashiki Gerrit-Branch: master Gerrit-Owner: Milimetric Gerrit-Reviewer: Milimetric Gerrit-Reviewer: Nuria ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.action.view.redirect: Update version check for fix... - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157688
Change subject: mediawiki.action.view.redirect: Update version check for fixed
Firefox bug
..
mediawiki.action.view.redirect: Update version check for fixed Firefox bug
Mozilla bug 516293 [1] is fixed in Firefox 34, only took five years ;)
I'm not sure how many LTS Firefox releases are floating around, so
let's keep the hack for older versions for now.
[1] https://bugzilla.mozilla.org/show_bug.cgi?id=516293
Change-Id: Id65474e52564fcf33189cd2f7a5d4dcd6508abdb
---
M resources/src/mediawiki.action/mediawiki.action.view.redirect.js
1 file changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/88/157688/1
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.redirect.js
b/resources/src/mediawiki.action/mediawiki.action.view.redirect.js
index b9aa137..6ba5f3f 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.redirect.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.redirect.js
@@ -53,13 +53,11 @@
location.hash = fragment;
}
- if ( shouldChangeFragment && profile.layout === 'gecko' ) {
- // Mozilla needs to wait until after load, otherwise the window
doesn't
- // scroll. See
.
- // There's no obvious way to detect this programmatically, so
we use
- // version-testing. If Firefox fixes the bug, they'll jump
twice, but
- // better twice than not at all, so make the fix hit future
versions as
- // well.
+ if ( shouldChangeFragment && profile.layout === 'gecko' &&
profile.versionNumber < 34 ) {
+ // Firefox < 34 needs to wait until after load, otherwise the
window doesn't scroll
+ // (https://bugzilla.mozilla.org/show_bug.cgi?id=516293).
There's no way to detect this
+ // programmatically, so we use version-testing. If the ugly
version check hits other
+ // Gecko-based browsers, they'll jump twice, but better twice
than not at all.
$( function () {
if ( location.hash === fragment ) {
location.hash = fragment;
--
To view, visit https://gerrit.wikimedia.org/r/157688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id65474e52564fcf33189cd2f7a5d4dcd6508abdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Make ItemSerializerTest compatible to DataModel 1.0 - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Make ItemSerializerTest compatible to DataModel 1.0
..
Make ItemSerializerTest compatible to DataModel 1.0
Change-Id: I17a6cdd8d267487cb2642dfff976c2f96667ea9c
---
M lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
M lib/tests/phpunit/serializers/ItemSerializerTest.php
2 files changed, 150 insertions(+), 151 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
b/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
index f5eae6b..9b23122 100644
--- a/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
+++ b/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
@@ -3,12 +3,7 @@
namespace Wikibase\Test;
use DataValues\StringValue;
-use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\Lib\ClaimGuidGenerator;
-use Wikibase\Lib\Serializers\EntitySerializer;
use Wikibase\Lib\Serializers\SerializationOptions;
/**
@@ -35,150 +30,6 @@
protected function getInstance() {
$class = $this->getClass();
return new $class( new SerializationOptions() );
- }
-
- /**
-* Returns arguments for entity agnostic arguments that can be returned
-* by validProvider after making sure the provided serialization
contains
-* anything the entity implementing class requires.
-*
-* @since 0.2
-*
-* @return array
-*/
- protected function semiValidProvider() {
- $entity = $this->getEntityInstance();
-
- $validArgs = array();
-
- $options = new SerializationOptions();
- $options->setOption( EntitySerializer::OPT_PARTS, array(
'aliases' ) );
-
- $entity0 = $entity->copy();
- $entity0->setAliases( 'en', array( 'foo', 'bar' ) );
- $entity0->setAliases( 'de', array( 'baz', 'bah' ) );
-
- $validArgs[] = array(
- $entity0,
- array(
- 'id' => $entity0->getId()->getSerialization(),
- 'type' => $entity0->getType(),
- 'aliases' => array(
- 'en' => array(
- array(
- 'value' => 'foo',
- 'language' => 'en',
- ),
- array(
- 'value' => 'bar',
- 'language' => 'en',
- ),
- ),
- 'de' => array(
- array(
- 'value' => 'baz',
- 'language' => 'de',
- ),
- array(
- 'value' => 'bah',
- 'language' => 'de',
- ),
- ),
- )
- ),
- $options
- );
-
- $options = new SerializationOptions();
- $options->setOption( EntitySerializer::OPT_PARTS, array(
'descriptions', 'labels' ) );
-
- $entity1 = $entity->copy();
- $entity1->setLabel( 'en', 'foo' );
- $entity1->setLabel( 'de', 'bar' );
- $entity1->setDescription( 'en', 'baz' );
- $entity1->setDescription( 'de', 'bah' );
-
- $validArgs[] = array(
- $entity1,
- array(
- 'id' => $entity1->getId()->getSerialization(),
- 'type' => $entity1->getType(),
- 'labels' => array(
- 'en' => array(
- 'value' => 'foo',
- 'language' => 'en',
- ),
- 'de' => array(
- 'value' => 'bar',
- 'language' => 'de',
-
[MediaWiki-commits] [Gerrit] Purge settings.d/wikis when destroying vm - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157687
Change subject: Purge settings.d/wikis when destroying vm
..
Purge settings.d/wikis when destroying vm
Change-Id: I7307317aef1d64fd642ebbc64b1d47b2ba483cf8
---
M lib/mediawiki-vagrant/environment.rb
M lib/mediawiki-vagrant/version.rb
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/87/157687/1
diff --git a/lib/mediawiki-vagrant/environment.rb
b/lib/mediawiki-vagrant/environment.rb
index 7acde66..051ffa9 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -101,6 +101,7 @@
def purge_puppet_created_files
FileUtils.rm Dir[path('settings.d/puppet-managed/*.php')]
FileUtils.rm_r Dir[path('settings.d/multiwiki')]
+FileUtils.rm_r Dir[path('settings.d/wikis')]
end
private
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index 427c140..7975f6e 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
module MediaWikiVagrant
-VERSION = '0.1.1'
+VERSION = '0.1.2'
end
--
To view, visit https://gerrit.wikimedia.org/r/157687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7307317aef1d64fd642ebbc64b1d47b2ba483cf8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix "" " in title on infopages - change (mediawiki...WikimediaIncubator)
Ebe123 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157686
Change subject: Fix """ in title on infopages
..
Fix """ in title on infopages
This commit replaces the "quot;" tags with proper quotation marks
in the title of infopages with an unknown language code. It was
caused by the message being escaped twice.
Bug: 70240
Change-Id: I3f39d9eaa0fe23f076bc0d0f5337ede3e15020d2
---
M InfoPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator
refs/changes/86/157686/1
diff --git a/InfoPage.php b/InfoPage.php
index 8b6108b..9433adc 100644
--- a/InfoPage.php
+++ b/InfoPage.php
@@ -48,7 +48,7 @@
$this->mFormatTitle = wfMessage( 'wminc-infopage-title-' .
$this->mProjectCode, $titleParam )->escaped();
if ( !$this->mLangName ) {
# Unknown language, add short note to title
- $this->mFormatTitle .= ' ' . wfMessage(
'wminc-unknownlang', $this->mLangCode )->escaped();
+ $this->mFormatTitle .= ' ' . wfMessage(
'wminc-unknownlang', $this->mLangCode )->text();
}
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/157686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f39d9eaa0fe23f076bc0d0f5337ede3e15020d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
Gerrit-Branch: master
Gerrit-Owner: Ebe123
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment: qualify vars - change (operations/puppet)
Matanya has uploaded a new change for review. https://gerrit.wikimedia.org/r/157685 Change subject: deployment: qualify vars .. deployment: qualify vars Change-Id: I6ed9e0c8edaa75ccf6705ced93ccebd0a9e59935 --- M templates/misc/passwordScripts/wikiuser2_pass.erb M templates/misc/passwordScripts/wikiuser_pass.erb M templates/misc/passwordScripts/wikiuser_pass_nagios.erb M templates/misc/passwordScripts/wikiuser_pass_real.erb 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/85/157685/1 diff --git a/templates/misc/passwordScripts/wikiuser2_pass.erb b/templates/misc/passwordScripts/wikiuser2_pass.erb index 82de1ad..5d5af5f 100644 --- a/templates/misc/passwordScripts/wikiuser2_pass.erb +++ b/templates/misc/passwordScripts/wikiuser2_pass.erb @@ -1,2 +1,2 @@ #! /bin/bash -echo -n "<%= wikiuser2_pass %>" +echo -n "<%= @wikiuser2_pass %>" diff --git a/templates/misc/passwordScripts/wikiuser_pass.erb b/templates/misc/passwordScripts/wikiuser_pass.erb index 7432310..3559563 100644 --- a/templates/misc/passwordScripts/wikiuser_pass.erb +++ b/templates/misc/passwordScripts/wikiuser_pass.erb @@ -1,2 +1,2 @@ #! /bin/bash -echo -n "<%= wikiuser_pass %>" +echo -n "<%= @wikiuser_pass %>" diff --git a/templates/misc/passwordScripts/wikiuser_pass_nagios.erb b/templates/misc/passwordScripts/wikiuser_pass_nagios.erb index fb86675..7772aed 100644 --- a/templates/misc/passwordScripts/wikiuser_pass_nagios.erb +++ b/templates/misc/passwordScripts/wikiuser_pass_nagios.erb @@ -1,2 +1,2 @@ #! /bin/bash -echo -n "<%= wikiuser_pass_nagios %>" +echo -n "<%= @wikiuser_pass_nagios %>" diff --git a/templates/misc/passwordScripts/wikiuser_pass_real.erb b/templates/misc/passwordScripts/wikiuser_pass_real.erb index a742410..90628d1 100644 --- a/templates/misc/passwordScripts/wikiuser_pass_real.erb +++ b/templates/misc/passwordScripts/wikiuser_pass_real.erb @@ -1,2 +1,2 @@ #! /bin/bash -echo -n "<%= wikiuser_pass_real %>" +echo -n "<%= @wikiuser_pass_real %>" -- To view, visit https://gerrit.wikimedia.org/r/157685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ed9e0c8edaa75ccf6705ced93ccebd0a9e59935 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 69850) Gender support for flow-board-notification-subsc... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157684
Change subject: (bug 69850) Gender support for
flow-board-notification-subscribe-description e.a.
..
(bug 69850) Gender support for flow-board-notification-subscribe-description
e.a.
Bug: 69850
Change-Id: I1d39a4ef8036c7f5fc99771ecb03481de7cfa15b
---
M handlebars/flow_tooltip_subscribed.handlebars
M i18n/qqq.json
M modules/new/components/flow-board.js
3 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/84/157684/1
diff --git a/handlebars/flow_tooltip_subscribed.handlebars
b/handlebars/flow_tooltip_subscribed.handlebars
index 32a4abc..09bb52d 100644
--- a/handlebars/flow_tooltip_subscribed.handlebars
+++ b/handlebars/flow_tooltip_subscribed.handlebars
@@ -4,9 +4,9 @@
}}
- {{l10n (concat "flow-" type "-notification-subscribe-title")}}
+ {{l10n (concat "flow-" type "-notification-subscribe-title")
username}}
- {{l10n (concat "flow-" type
"-notification-subscribe-description")}}
+ {{l10n (concat "flow-" type
"-notification-subscribe-description") username}}
{{/tooltip}}
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 754bfe7..007ed04 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -95,10 +95,10 @@
"flow-topic-action-undelete-topic": "Used as a link in a dropdown menu
to undelete a topic.\n{{Related|Flow-action}}",
"flow-topic-action-unsuppress-topic": "Used as a link in a dropdown
menu to unsuppress a topic.\n{{Related|Flow-action}}",
"flow-topic-action-restore-topic": "Used as a link in a dropdown menu
to clear the moderation state of a
topic.\n{{Related|Flow-action}}\n{{Identical|Restore}}",
- "flow-topic-notification-subscribe-title": "Title text for the overlay
when a topic is added to watchlist.",
- "flow-topic-notification-subscribe-description": "Description text for
the overlay when a topic is added to watchlist.",
- "flow-board-notification-subscribe-title": "Title text for the overlay
when a board is added to watchlist.",
- "flow-board-notification-subscribe-description": "Description text for
the overlay when a board is added to watchlist.",
+ "flow-topic-notification-subscribe-title": "Title text for the overlay
when a topic is added to watchlist.\n\nParameters:\n* $1 - Username of the user
adding the topic to the watchlist, can be used for GENDER support.",
+ "flow-topic-notification-subscribe-description": "Description text for
the overlay when a topic is added to watchlist.\n\nParameters:\n* $1 - Username
of the user adding the topic to the watchlist, can be used for GENDER support.",
+ "flow-board-notification-subscribe-title": "Title text for the overlay
when a board is added to watchlist.\n\nParameters:\n* $1 - Username of the user
adding the board to the watchlist, can be used for GENDER support.",
+ "flow-board-notification-subscribe-description": "Description text for
the overlay when a board is added to watchlist.\n\nParameters:\n* $1 - Username
of the user adding the board to the watchlist, can be used for GENDER support.",
"flow-error-http": "Used as error message on HTTP error.",
"flow-error-other": "Used as generic error message.",
"flow-error-external": "Uses as error message. Parameters:\n* $1 -
error message\nSee also:\n* {{msg-mw|Flow-error-external-multi}}",
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index 3f416e0..5e83ac6 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -2271,7 +2271,8 @@
{
unsubscribe: false,
type: type,
- direction: dir
+ direction: dir,
+ username:
mw.user.getName()
}
)
).children(),
--
To view, visit https://gerrit.wikimedia.org/r/157684
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d39a4ef8036c7f5fc99771ecb03481de7cfa15b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make ItemSerializerTest compatible to DataModel 1.0 - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157683
Change subject: Make ItemSerializerTest compatible to DataModel 1.0
..
Make ItemSerializerTest compatible to DataModel 1.0
Change-Id: I17a6cdd8d267487cb2642dfff976c2f96667ea9c
---
M lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
M lib/tests/phpunit/serializers/ItemSerializerTest.php
2 files changed, 150 insertions(+), 151 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/157683/1
diff --git a/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
b/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
index f5eae6b..9b23122 100644
--- a/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
+++ b/lib/tests/phpunit/serializers/EntitySerializerBaseTest.php
@@ -3,12 +3,7 @@
namespace Wikibase\Test;
use DataValues\StringValue;
-use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\Lib\ClaimGuidGenerator;
-use Wikibase\Lib\Serializers\EntitySerializer;
use Wikibase\Lib\Serializers\SerializationOptions;
/**
@@ -35,150 +30,6 @@
protected function getInstance() {
$class = $this->getClass();
return new $class( new SerializationOptions() );
- }
-
- /**
-* Returns arguments for entity agnostic arguments that can be returned
-* by validProvider after making sure the provided serialization
contains
-* anything the entity implementing class requires.
-*
-* @since 0.2
-*
-* @return array
-*/
- protected function semiValidProvider() {
- $entity = $this->getEntityInstance();
-
- $validArgs = array();
-
- $options = new SerializationOptions();
- $options->setOption( EntitySerializer::OPT_PARTS, array(
'aliases' ) );
-
- $entity0 = $entity->copy();
- $entity0->setAliases( 'en', array( 'foo', 'bar' ) );
- $entity0->setAliases( 'de', array( 'baz', 'bah' ) );
-
- $validArgs[] = array(
- $entity0,
- array(
- 'id' => $entity0->getId()->getSerialization(),
- 'type' => $entity0->getType(),
- 'aliases' => array(
- 'en' => array(
- array(
- 'value' => 'foo',
- 'language' => 'en',
- ),
- array(
- 'value' => 'bar',
- 'language' => 'en',
- ),
- ),
- 'de' => array(
- array(
- 'value' => 'baz',
- 'language' => 'de',
- ),
- array(
- 'value' => 'bah',
- 'language' => 'de',
- ),
- ),
- )
- ),
- $options
- );
-
- $options = new SerializationOptions();
- $options->setOption( EntitySerializer::OPT_PARTS, array(
'descriptions', 'labels' ) );
-
- $entity1 = $entity->copy();
- $entity1->setLabel( 'en', 'foo' );
- $entity1->setLabel( 'de', 'bar' );
- $entity1->setDescription( 'en', 'baz' );
- $entity1->setDescription( 'de', 'bah' );
-
- $validArgs[] = array(
- $entity1,
- array(
- 'id' => $entity1->getId()->getSerialization(),
- 'type' => $entity1->getType(),
- 'labels' => array(
- 'en' => array(
- 'value' => 'foo',
- 'language' => 'en',
- ),
- 'de' => array(
- 'value' => 'bar',
-
[MediaWiki-commits] [Gerrit] pdns: qualify vars - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157681
Change subject: pdns: qualify vars
..
pdns: qualify vars
Change-Id: Id77db8b766a40e29ad4bab80f6b12762c38cf671
---
M templates/powerdns/pdns-ldap.conf.erb
M templates/powerdns/recursor.conf.erb
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/157681/1
diff --git a/templates/powerdns/pdns-ldap.conf.erb
b/templates/powerdns/pdns-ldap.conf.erb
index 7db86e5..5811677 100644
--- a/templates/powerdns/pdns-ldap.conf.erb
+++ b/templates/powerdns/pdns-ldap.conf.erb
@@ -5,11 +5,11 @@
# Always bind to specific addresses - pdns complains when using INADDR_ANY.
# Change this to the external interface address
-local-address=<%= dns_auth_ipaddress %>
-query-local-address=<% if has_variable?("dns_auth_query_address") then %><%=
dns_auth_query_address %><% else %><%= dns_auth_ipaddress %><% end %>
+local-address=<%= @dns_auth_ipaddress %>
+query-local-address=<% if has_variable?("dns_auth_query_address") then %><%=
@dns_auth_query_address %><% else %><%= @dns_auth_ipaddress %><% end %>
# Change this to the actual SOA name:
-default-soa-name=<%= dns_auth_soa_name %>
+default-soa-name=<%= @dns_auth_soa_name %>
# A backend like geobackend can't make use of caching, since returned
# results will be different depending on "who's asking".
@@ -41,8 +41,8 @@
# Backends to load
launch=ldap
-ldap-host=<%= ldap_hosts.join(" ") %>
+ldap-host=<%= @ldap_hosts.join(" ") %>
ldap-method=strict
-ldap-basedn=ou=hosts,<%= ldap_base_dn %>
-ldap-binddn=<%= ldap_user_dn %>
-ldap-secret=<%= ldap_user_pass %>
+ldap-basedn=ou=hosts,<%= @ldap_base_dn %>
+ldap-binddn=<%= @ldap_user_dn %>
+ldap-secret=<%= @ldap_user_pass %>
diff --git a/templates/powerdns/recursor.conf.erb
b/templates/powerdns/recursor.conf.erb
index f265bf8..75d590b 100644
--- a/templates/powerdns/recursor.conf.erb
+++ b/templates/powerdns/recursor.conf.erb
@@ -91,7 +91,7 @@
#
# local-addressIP addresses to listen on, separated by spaces or commas
#
-local-address=<%= flatten_ips(listen_addresses).sort.join(" ") %>
+local-address=<%= flatten_ips(@listen_addresses).sort.join(" ") %>
#
# local-port port to listen on
--
To view, visit https://gerrit.wikimedia.org/r/157681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id77db8b766a40e29ad4bab80f6b12762c38cf671
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.action.edit: Improve #addButton documentation - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.action.edit: Improve #addButton documentation
..
mediawiki.action.edit: Improve #addButton documentation
Change-Id: I6ba4e711dfb492357e1364681d986b0c5515599e
---
M resources/src/mediawiki.action/mediawiki.action.edit.js
1 file changed, 14 insertions(+), 10 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js
b/resources/src/mediawiki.action/mediawiki.action.edit.js
index eacb910..e850276 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -68,17 +68,21 @@
* by placing buttons in a queue if this method is called before
* the toolbar is created.
*
-* For compatiblity, passing the properties listed below as
separate arguments
-* (in the listed order) is also supported.
+* For backwards-compatibility, passing `imageFile`,
`speedTip`, `tagOpen`, `tagClose`,
+* `sampleText` and `imageId` as separate arguments (in this
order) is also supported.
*
-* @param {Object} button Object with the following properties:
-* @param {string} button.imageFile
-* @param {string} button.speedTip
-* @param {string} button.tagOpen
-* @param {string} button.tagClose
-* @param {string} button.sampleText
-* @param {string} [button.imageId]
-* @param {Function} [button.onClick]
+* @param {Object} button Object with the following properties.
+* You are required to provide *either* the `onClick`
parameter, or the three parameters
+* `tagOpen`, `tagClose` and `sampleText`, but not both
(they're mutually exclusive).
+* @param {string} button.imageFile Image to use for the button.
+* @param {string} button.speedTip Tooltip displayed when user
mouses over the button.
+* @param {Function} [button.onClick] Function to be executed
when the button is clicked.
+* @param {string} [button.tagOpen]
+* @param {string} [button.tagClose]
+* @param {string} [button.sampleText] Alternative to
`onClick`. `tagOpen`, `tagClose` and
+* `sampleText` together provide the markup that should be
inserted into page text at
+* current cursor position.
+* @param {string} [button.imageId] `id` attribute of the
button HTML element.
*/
addButton: function () {
if ( isReady ) {
--
To view, visit https://gerrit.wikimedia.org/r/157486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ba4e711dfb492357e1364681d986b0c5515599e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Helder.wiki
Gerrit-Reviewer: Jack Phoenix
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] Fix jshint errors - change (mediawiki...Gadgets)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix jshint errors
..
Fix jshint errors
$el was a pattern in use for $( this ), which makes sense here.
Change-Id: I17cb9576e92898ff735ba723cacd1331c8d0a413
---
M modules/ext.gadgets.gadgetmanager.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.gadgets.gadgetmanager.js
b/modules/ext.gadgets.gadgetmanager.js
index ffb2916..c3dc8ab 100644
--- a/modules/ext.gadgets.gadgetmanager.js
+++ b/modules/ext.gadgets.gadgetmanager.js
@@ -349,7 +349,8 @@
// Validate
$form.find( '#mw-gadgetmanager-input-id'
).bind( 'keyup keypress keydown', function () {
- var val = $( this ).val();
+ var $el = $( this ),
+ val = $el.val();
// Reset
toggleDialogButtons( $form, 'enable' );
--
To view, visit https://gerrit.wikimedia.org/r/157630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17cb9576e92898ff735ba723cacd1331c8d0a413
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: RL2
Gerrit-Owner: Alex Monk
Gerrit-Reviewer: Helder.wiki
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
