[MediaWiki-commits] [Gerrit] Trim extraneous " ssh-rsa " from SSH key - change (operations/puppet)
Faidon has submitted this change and it was merged. Change subject: Trim extraneous " ssh-rsa " from SSH key .. Trim extraneous " ssh-rsa " from SSH key Causes Puppet to freak out with error message "err: Failed to apply catalog: Parameter key failed: Key must not contain whitespace" errors. fu Ie9d00b1b06cf956e9a06c Change-Id: I8d624af5b7f25650641167b1fb0b3ed601fa8b2e --- M manifests/admins.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/admins.pp b/manifests/admins.pp index 9841ccb..0e0a016 100644 --- a/manifests/admins.pp +++ b/manifests/admins.pp @@ -2629,7 +2629,7 @@ ensure => present, user => $username, type => "ssh-rsa", - key=> " ssh-rsa B3NzaC1yc2EDAQABAAACAQCxNcPFGwSUYB24njYY0BX/vHm2AFXZSQtPcPGyJxP+fkkaTQOKX4pGST2oCudlV4hBnskTTDyd4r4YF1+HPAzxX7myCcCFh+9L8AOuVcdcH3g9dSiV3csAemlOsfPivrJEx2RG5sFiYqaLSfSMF65QjJUaX7thWIHRFH+sDoPfVBEJABbvO3yeA9uPBzqWPs+kII7n3WMEsiZPvbPRypsfFwa0yoZotnoOC0ZoiQOFZCm3v+Xnoxv5gRxGIZCrR86dstKoISJU0PmPaVZkYElAhtbLUxlBCsE/lSQi/phQduuI9u+pApaW+4FxpUOPD+i6NfdjchJRfNG5Lh/7PPgUo3LWXfQr3qKm5dOT0PbgY7Mif3fvkoI7CT5RG+TVau5YjU6zL8TWAx8nv7U2hgU/VuJT96FvBYbnvbySJwk7LMEl85UzZ4M3o9D74csj9lRGIc3VXoOL7T9peYzTxr6+0Uuo6mBWOdgnp5tn/ew145SXJmwL2Ly3k/KVn5lehL6F11QaUI74Yw/MuZ6eXmiR/ZBcbBHD2WnRyJOPjw/IOwUO848A4NoAcie0ESKSRk5RdmksMns5wYniUEYOCjuErk8NK3ClquQ0Wd6yOz0TTRUkPrUR4fIuEGraYlIARUvnidxK9kFj6q5KYc2MKPGw0m9scPGLGokEAnllrs+nEQ=="; + key=> "B3NzaC1yc2EDAQABAAACAQCxNcPFGwSUYB24njYY0BX/vHm2AFXZSQtPcPGyJxP+fkkaTQOKX4pGST2oCudlV4hBnskTTDyd4r4YF1+HPAzxX7myCcCFh+9L8AOuVcdcH3g9dSiV3csAemlOsfPivrJEx2RG5sFiYqaLSfSMF65QjJUaX7thWIHRFH+sDoPfVBEJABbvO3yeA9uPBzqWPs+kII7n3WMEsiZPvbPRypsfFwa0yoZotnoOC0ZoiQOFZCm3v+Xnoxv5gRxGIZCrR86dstKoISJU0PmPaVZkYElAhtbLUxlBCsE/lSQi/phQduuI9u+pApaW+4FxpUOPD+i6NfdjchJRfNG5Lh/7PPgUo3LWXfQr3qKm5dOT0PbgY7Mif3fvkoI7CT5RG+TVau5YjU6zL8TWAx8nv7U2hgU/VuJT96FvBYbnvbySJwk7LMEl85UzZ4M3o9D74csj9lRGIc3VXoOL7T9peYzTxr6+0Uuo6mBWOdgnp5tn/ew145SXJmwL2Ly3k/KVn5lehL6F11QaUI74Yw/MuZ6eXmiR/ZBcbBHD2WnRyJOPjw/IOwUO848A4NoAcie0ESKSRk5RdmksMns5wYniUEYOCjuErk8NK3ClquQ0Wd6yOz0TTRUkPrUR4fIuEGraYlIARUvnidxK9kFj6q5KYc2MKPGw0m9scPGLGokEAnllrs+nEQ==", } } } -- To view, visit https://gerrit.wikimedia.org/r/57258 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d624af5b7f25650641167b1fb0b3ed601fa8b2e Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh Gerrit-Reviewer: BBlack Gerrit-Reviewer: Faidon Gerrit-Reviewer: Jeremyb Gerrit-Reviewer: RobH Gerrit-Reviewer: Yurik Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add namespace translation for 'cy' - change (mediawiki...Scribunto)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/57261 Change subject: Add namespace translation for 'cy' .. Add namespace translation for 'cy' Requested by Lloffiwr https://translatewiki.net/wiki/Thread:Support/Module_namespace_for_cy_wikis Change-Id: I90a11fa7e4cdf8cb59742b9f61a66827c45c5a56 --- M Scribunto.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/61/57261/1 diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index c65aba6..00d218c 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -28,6 +28,11 @@ 829 => 'Diskuse_k_modulu', ); +$namespaceNames['cy'] = array( + 828 => 'Modiwl', + 829 => 'Sgwrs_modiwl', +); + $namespaceNames['de'] = array( 828 => 'Modul', 829 => 'Modul_Diskussion', -- To view, visit https://gerrit.wikimedia.org/r/57261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90a11fa7e4cdf8cb59742b9f61a66827c45c5a56 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46624) Avoid fatal when undoing deleted rev. - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (bug 46624) Avoid fatal when undoing deleted rev.
..
(bug 46624) Avoid fatal when undoing deleted rev.
An undo action that involved a revision that was delted, oversighted or
otherwise
missing content triggered a fatal error. Added a check and nice error message.-
Change-Id: I37e82b999d7eea7cf3761960a3d3df467582a596
---
M repo/Wikibase.i18n.php
M repo/includes/actions/EditEntityAction.php
2 files changed, 17 insertions(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Checked
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index 6a87374..8cb5d12 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -56,6 +56,7 @@
'wikibase-undo-samerev' => 'Cannot undo, same revision given for undo
base and undo target.',
'wikibase-undo-badpage' => 'Bad revision: Revision $2 does not belong
to [[$1]].',
'wikibase-undo-firstrev' => "Cannot undo the page's creation",
+ 'wikibase-undo-nocontent' => "Cannot load content of revision $2 of
page $1",
'wikibase-propertyedittool-full' => 'List of values is complete.',
'wikibase-ui-pendingquantitycounter-nonpending' => '$2 $1',
'wikibase-ui-pendingquantitycounter-pending' => '$2$3 $1',
@@ -493,6 +494,10 @@
* $1 is the title of the page;
* $2 is the revision id number.',
'wikibase-undo-firstrev' => "Message shown when the user attempts to
undo the very first revision of a page, that is, the page's creation.",
+ 'wikibase-undo-nocontent' => "Message shown when the content of one of
the revisions needed for undo could not be loaded.
+This may happen if there is an error ion the storage backend, or if the
respective revision has been hidden (oversighted) or deleted.
+* $1 is the title of the page;
+* $2 is the revision id number.",
'wikibase-propertyedittool-full' => 'A list of elements the user is
assumed to enter is now complete.',
'wikibase-ui-pendingquantitycounter-nonpending' => "Message for a
generic counter which will display a quantity and of what nature that quantity
is. Parameters:
* $1 is the label of the counter's subject. E.g. 'sources' in an item's
statement's references counter displayed in the heading above the references.
diff --git a/repo/includes/actions/EditEntityAction.php
b/repo/includes/actions/EditEntityAction.php
index e822e93..0af55f6 100644
--- a/repo/includes/actions/EditEntityAction.php
+++ b/repo/includes/actions/EditEntityAction.php
@@ -130,6 +130,18 @@
return Status::newFatal( 'wikibase-undo-badpage',
$this->getTitle(), $olderRevision->getId() );
}
+ if ( $olderRevision->getContent() === null ) {
+ return Status::newFatal( 'wikibase-undo-nocontent',
$this->getTitle(), $olderRevision->getId() );
+ }
+
+ if ( $newerRevision->getContent() === null ) {
+ return Status::newFatal( 'wikibase-undo-nocontent',
$this->getTitle(), $newerRevision->getId() );
+ }
+
+ if ( $latestRevision->getContent() === null ) {
+ return Status::newFatal( 'wikibase-undo-nocontent',
$this->getTitle(), $latestRevision->getId() );
+ }
+
return Status::newGood( array(
$olderRevision, $newerRevision, $latestRevision,
) );
--
To view, visit https://gerrit.wikimedia.org/r/56377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37e82b999d7eea7cf3761960a3d3df467582a596
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Jeroen De Dauw
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make icinga alert re: puppet client more precise - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57262
Change subject: Make icinga alert re: puppet client more precise
..
Make icinga alert re: puppet client more precise
Changes "Puppet has not run in the last 10 hours" to "No successful
Puppet run in the last 10 hours". When this alert is emitted, Puppet is
typically running like clockwork every half hour, but is consistently
failing because some configuration change cannot be applied. The
reworded alert makes that clearer, I think.
Change-Id: Ief78d44d8205a9220cdd486709733b6e2d6d99ca
---
M templates/icinga/checkcommands.cfg.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/57262/1
diff --git a/templates/icinga/checkcommands.cfg.erb
b/templates/icinga/checkcommands.cfg.erb
index 80b75e2..08a8d9d 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -465,7 +465,7 @@
define command{
command_namepuppet-FAIL
- command_lineecho "Puppet has not run in the last 10 hours" && exit 2
+ command_lineecho "No successful Puppet run in the last 10 hours" &&
exit 2
}
define command{
--
To view, visit https://gerrit.wikimedia.org/r/57262
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief78d44d8205a9220cdd486709733b6e2d6d99ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make icinga alert re: puppet client more precise - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: Make icinga alert re: puppet client more precise
..
Make icinga alert re: puppet client more precise
Changes "Puppet has not run in the last 10 hours" to "No successful
Puppet run in the last 10 hours". When this alert is emitted, Puppet is
typically running like clockwork every half hour, but is consistently
failing because some configuration change cannot be applied. The
reworded alert makes that clearer, I think.
Change-Id: Ief78d44d8205a9220cdd486709733b6e2d6d99ca
---
M templates/icinga/checkcommands.cfg.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/icinga/checkcommands.cfg.erb
b/templates/icinga/checkcommands.cfg.erb
index 80b75e2..08a8d9d 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -465,7 +465,7 @@
define command{
command_namepuppet-FAIL
- command_lineecho "Puppet has not run in the last 10 hours" && exit 2
+ command_lineecho "No successful Puppet run in the last 10 hours" &&
exit 2
}
define command{
--
To view, visit https://gerrit.wikimedia.org/r/57262
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief78d44d8205a9220cdd486709733b6e2d6d99ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Faidon
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Some clean up work to help get the package into Debian - change (operations...python-voluptuous)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/57263 Change subject: Some clean up work to help get the package into Debian .. Some clean up work to help get the package into Debian Signed-off-by: Paul Belanger Signed-off-by: Antoine Musso Change-Id: I7c19e422456e39e6dc196297726fbb1f503b33c6 --- M debian/changelog M debian/control M debian/gbp.conf M debian/rules 4 files changed, 26 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-voluptuous refs/changes/63/57263/1 diff --git a/debian/changelog b/debian/changelog index c104453..82d3089 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +python-voluptuous (0.6.1-3) UNRELEASED; urgency=low + + * debian/control: +- Add myself to Uploaders +- Add Build-Depends on python-nose and python-setuptools + * debian/gbp.conf: +- points cleaner to /bin/true +- paths use trailing slashes + - enable gzip compression + * debian/rules: +- Enable unit tests (based on nosetests) +- Rework get-orig-source to use --download-current-version + + -- Paul Belanger Tue, 02 Apr 2013 20:04:00 -0400 + python-voluptuous (0.6.1-2) precise; urgency=low * adds a git buildpackage configuration file suitable for Wikimedia diff --git a/debian/control b/debian/control index dc7edb6..f45457c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,11 @@ Section: python Priority: optional Maintainer: Antoine Musso -Build-Depends: debhelper (>= 9), python-all +Uploaders: Paul Belanger +Build-Depends: debhelper (>= 9), + python-all (>= 2.6.6-3), + python-nose, + python-setuptools Standards-Version: 3.9.3 Homepage: http://github.com/alecthomas/voluptuous X-Python-Version: >= 2.6 diff --git a/debian/gbp.conf b/debian/gbp.conf index c87b3c6..6ecff61 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,5 @@ [DEFAULT] +cleaner = /bin/true upstream-tag = v%(version)s [git-buildpackage] @@ -6,5 +7,6 @@ debian-branch=master overlay = True no-create-orig = True -tarball-dir = ../tarballs -export-dir = ../build-area +tarball-dir = ../tarballs/ +export-dir = ../build-area/ +compression = gzip diff --git a/debian/rules b/debian/rules index 4ba0d64..cbdc052 100755 --- a/debian/rules +++ b/debian/rules @@ -6,14 +6,13 @@ %: dh $@ --with python2 -DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') - get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --noconf --force-download --rename --repack --destdir=. --download-current-version override_dh_auto_test: set -ex; for python in $(shell pyversions -s); do \ $$python -m doctest tests.rst; \ done + nosetests --verbose .PHONY: get-orig-source override_dh_auto_test -- To view, visit https://gerrit.wikimedia.org/r/57263 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c19e422456e39e6dc196297726fbb1f503b33c6 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/python-voluptuous Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid a division by zero possibility - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57264
Change subject: Avoid a division by zero possibility
..
Avoid a division by zero possibility
$total is used as a denominator in the else condition
Change-Id: I50894bd2c155fa80855f5811c36c997fa2a8b2b2
---
M utils/StatsBar.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/64/57264/1
diff --git a/utils/StatsBar.php b/utils/StatsBar.php
index 31b84ea..7ec1d28 100644
--- a/utils/StatsBar.php
+++ b/utils/StatsBar.php
@@ -45,7 +45,7 @@
$translated = $this->stats[MessageGroupStats::TRANSLATED];
$fuzzy = $this->stats[MessageGroupStats::FUZZY];
- if ( $total === null ) {
+ if ( !$total ) {
$untranslated = null;
$wproofread = $wtranslated = $wfuzzy = $wuntranslated =
0;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/57264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50894bd2c155fa80855f5811c36c997fa2a8b2b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46065) CSS fixes to better accomodate buttons - change (mediawiki...Translate)
Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57265
Change subject: (bug 46065) CSS fixes to better accomodate buttons
..
(bug 46065) CSS fixes to better accomodate buttons
CSS has been modified to:
* Reduce the excessive padding that made button labels goto a new line before
it is needed.
* Increase the height of buttons so that they don't look broken when text
requires a second line.
* Adjust the width of view buttons to better fit their length.
Change-Id: I01b329dbd20da828c9d32994bbd1ef3100413ca6
---
M resources/css/ext.translate.messagetable.css
1 file changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/65/57265/1
diff --git a/resources/css/ext.translate.messagetable.css
b/resources/css/ext.translate.messagetable.css
index 68dee9d..7d0d209 100644
--- a/resources/css/ext.translate.messagetable.css
+++ b/resources/css/ext.translate.messagetable.css
@@ -203,13 +203,14 @@
}
.tux-action-bar .toggle.button {
- height: 35px;
- font-size: 15px;
+ height: 40px;
+ font-size: 14px;
vertical-align: middle;
border-radius: 0;
text-shadow: none;
margin: 0;
text-indent: 0;
+ padding: 0 6px;
}
.tux-action-bar .tux-view-switcher {
@@ -217,7 +218,7 @@
}
.tux-action-bar .tux-view-switcher .toggle.button {
- width: 33%;
+ padding: 0 2px 0 0;
}
.tux-action-bar .tux-view-switcher .toggle.button:first-child {
@@ -238,6 +239,10 @@
vertical-align: bottom;
}
+.tux-action-bar .translate-mode-button {
+ width: 30%;
+}
+
.tux-action-bar .translate-mode-button:before {
background: transparent url(../images/view-list.png) center center
no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-list.svg);
@@ -252,6 +257,10 @@
background-image: linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
}
+.tux-action-bar .page-mode-button {
+ width: 30%;
+}
+
.tux-action-bar .page-mode-button:before {
background: transparent url(../images/view-page.png) center center
no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-page.svg);
@@ -266,6 +275,11 @@
background-image: linear-gradient(transparent, transparent),
url(../images/view-page-hi.svg);
}
+
+.tux-action-bar .tux-proofread-button {
+ width: 36%;
+}
+
.tux-action-bar .tux-proofread-button:before {
background: transparent url(../images/view-proofread.png) center center
no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-proofread.svg);
--
To view, visit https://gerrit.wikimedia.org/r/57265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01b329dbd20da828c9d32994bbd1ef3100413ca6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Pginer
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add math operators % & | ^ << >> (version 0.0.3) - change (mediawiki...Foxway)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57266
Change subject: add math operators % & | ^ << >> (version 0.0.3)
..
add math operators % & | ^ << >> (version 0.0.3)
now are supported all the mathematical operations
Change-Id: Ieded484f844c8791d8b54725b4591a5ee8c6f5cd
---
M Foxway.php
M includes/Interpreter.php
M includes/Runtime.php
M tests/phpunit/includes/InterpreterTest.php
4 files changed, 481 insertions(+), 202 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Foxway
refs/changes/66/57266/1
diff --git a/Foxway.php b/Foxway.php
index f07851a..f95f564 100644
--- a/Foxway.php
+++ b/Foxway.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-define( 'Foxway_VERSION' , '0.0.2' );
+define( 'Foxway_VERSION' , '0.0.3' );
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(
diff --git a/includes/Interpreter.php b/includes/Interpreter.php
index 0f2d4ba..18cf6a2 100644
--- a/includes/Interpreter.php
+++ b/includes/Interpreter.php
@@ -30,9 +30,6 @@
foreach ($tokens as $token) {
if ( is_string($token) ) {
$id = $token;
- if($is_debug) {
- $debug[] = $token;
- }
} else {
list($id, $text, $line) = $token;
}
@@ -46,97 +43,38 @@
//\MWDebug::log( var_export($token,true) );
switch ($id) {
- case T_COMMENT:
- case T_DOC_COMMENT:
- if($is_debug) {
- $debug[] = '' . str_replace("\n", "\n", htmlspecialchars($text) ) . '';
- }
- break;
- case T_WHITESPACE:
- if($is_debug) {
- $debug[] = str_replace("\n",
"\n", $text);
- }
- break;
- case '"':
- if($is_debug) {
- array_pop($debug);
- $debug[] = '"';
- }
- if( $expectQuotesClose ) {
- $expectQuotesClose = false;
- $expected = array('.', ';');
- } else {
- $expectQuotesClose = true;
- $expected =
array(T_ENCAPSED_AND_WHITESPACE, T_CURLY_OPEN, T_VARIABLE, '"');
- }
- if($expectListParams){
- $expected[] = ',';
- }
- break;
case ';':
$return .=
$runtime->getCommandResult($debug);
- $expectListParams = false;
- $expected = false;
+ break;
+ case ',':
+ $runtime->separateParams();
break;
case '=':
- $runtime->setVariableOperator('=');
- $expected = array(
- T_CONSTANT_ENCAPSED_STRING,
- T_ENCAPSED_AND_WHITESPACE,
- T_LNUMBER,
- T_DNUMBER,
- T_VARIABLE,
- T_CURLY_OPEN,
- '"',
- //';',
- );
+ case T_CONCAT_EQUAL:// .=
+ case T_PLUS_EQUAL: // +=
+ case T_MINUS_EQUAL: // -=
+ case T_MUL_EQUAL: // *=
+ case T_DIV_EQUAL: // /=
+ case T_MOD_EQUAL: //
[MediaWiki-commits] [Gerrit] Logged-in widget and misc link fixing, css fixes - change (translatewiki)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57267
Change subject: Logged-in widget and misc link fixing, css fixes
..
Logged-in widget and misc link fixing, css fixes
Change-Id: I7fbb396628a34ba6fbf92f5e4c9c41fb54d87c80
---
M MainPage/resources/css/ext.translate.mainpage.css
M MainPage/specials/SpecialTwnMainPage.php
2 files changed, 86 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/67/57267/1
diff --git a/MainPage/resources/css/ext.translate.mainpage.css
b/MainPage/resources/css/ext.translate.mainpage.css
index 6f98a76..5d7afa0 100644
--- a/MainPage/resources/css/ext.translate.mainpage.css
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -83,16 +83,31 @@
}
.main-widget {
- background-color: #EFE;
+ background-color: #eee;
max-height: 580px;
opacity: 0.95;
margin: 10px;
padding: 10px;
}
+.user-stats-title {
+ padding-left: 100px;
+ background: transparent url('../images/user-small.png') no-repeat
scroll left center;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url('../images/user-small.svg');
+ background-image: -moz-linear-gradient(transparent, transparent),
url('../images/user-small.svg');
+ background-image: linear-gradient(transparent, transparent),
url('../images/user-small.svg');
+ background-position: bottom left;
+ background-size: 75px;
+}
+
+.user-stats-title h2 {
+ border-bottom: none;
+}
+
.ranking {
background-color: white;
padding: 10px;
+ border-bottom: 2px solid #eee;
}
.ranking .count {
@@ -107,6 +122,15 @@
.ranking .rank-description,
.ranking .language-description {
font-size: 16px;
+}
+
+.row.langstats-link-row {
+ padding: 10px;
+}
+
+a.langstats-link {
+ font-size: 16pt;
+ padding: 10px;
}
.twn-mainpage-search input,
@@ -203,6 +227,42 @@
background-image: linear-gradient(#2D5EA9, #2A549C);
}
+button.button.green {
+ color: #ff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #008740;
+ background-image: -ms-linear-gradient(top, #00974b, #008740);
+ background-image: -moz-linear-gradient(top, #00974b, #008740);
+ background-image: linear-gradient(#00974b, #008740);
+ background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #00974b), color-stop(100%, #008740));
+ background-image: -webkit-linear-gradient(top, #00974b, #008740);
+ border: 1px #0f9b3b solid;
+ -ms-filter:
"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00974b',
endColorstr='#008740', GradientType=0)";
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr =
'#00974b', endColorstr = '#008740', GradientType = 0);
+}
+
+button.button.green:hover {
+ background-color: #119750;
+ background-image: -moz-linear-gradient(top, #10a65b, #119750);
+ background-image: -ms-linear-gradient(top, #10a65b, #119750);
+ background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #10a65b), color-stop(100%, #119750));
+ background-image: -webkit-linear-gradient(top, #10a65b, #119750);
+ background-image: linear-gradient(#10a65b, #119750);
+ -ms-filter:
"progid:DXImageTransform.Microsoft.gradient(startColorstr='#10a65b',
endColorstr='#119750', GradientType=0)";
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr =
'#10a65b', endColorstr = '#119750', GradientType = 0);
+}
+
+button.button.green:active {
+ background-color: #007236;
+ background-image: -moz-linear-gradient(top, #007236, #007236);
+ background-image: -ms-linear-gradient(top, #007236, #007236);
+ background-image: -webkit-gradient(linear, left top, left bottom,
color-stop(0%, #007236), color-stop(100%, #007236));
+ background-image: -webkit-linear-gradient(top, #007236, #007236);
+ background-image: linear-gradient(#007236, #007236);
+ -ms-filter:
"progid:DXImageTransform.Microsoft.gradient(startColorstr='#007236',
endColorstr='#007236', GradientType=0)";
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr =
'#007236', endColorstr = '#007236', GradientType = 0);
+}
+
.searchbox {
width: 100%;
}
diff --git a/MainPage/specials/SpecialTwnMainPage.php
b/MainPage/specials/SpecialTwnMainPage.php
index d794210..6fc3cf9 100644
--- a/MainPage/specials/SpecialTwnMainPage.php
+++ b/MainPage/specials/SpecialTwnMainPage.php
@@ -61,12 +61,21 @@
'class' => 'uls-trigger column',
)
, 'English' );
- $out .= Html::element( 'a',
- array(
- 'class' => 'login column text-right',
-
[MediaWiki-commits] [Gerrit] Update limit/urlwidth param doc of prop=imageinfo - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57268
Change subject: Update limit/urlwidth param doc of prop=imageinfo
..
Update limit/urlwidth param doc of prop=imageinfo
Follow up Id0ec6a and to clarify things like bug 46782
Change-Id: I2215d022a47cd8ceeadd2f5d38064495f3197772
---
M includes/api/ApiQueryImageInfo.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/68/57268/1
diff --git a/includes/api/ApiQueryImageInfo.php
b/includes/api/ApiQueryImageInfo.php
index b2ef048..bb449c1 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -566,11 +566,13 @@
return array(
'prop' => self::getPropertyDescriptions( array(), $p ),
'urlwidth' => array( "If {$p}prop=url is set, a URL to
an image scaled to this width will be returned.",
- 'Only the current version of
the image can be scaled' ),
+ 'Only the current version of the image can be
scaled.',
+ 'For performance reasons if this option is
used, ' .
+ 'no more than ' . self::TRANSFORM_LIMIT
. ' scaled images will be returned.' ),
'urlheight' => "Similar to {$p}urlwidth. Cannot be used
without {$p}urlwidth",
'urlparam' => array( "A handler specific parameter
string. For example, pdf's ",
"might use 'page15-100px'. {$p}urlwidth must be
used and be consistent with {$p}urlparam" ),
- 'limit' => 'How many image revisions to return',
+ 'limit' => 'How many image revisions to return per
image',
'start' => 'Timestamp to start listing from',
'end' => 'Timestamp to stop listing at',
'metadataversion' => array( "Version of metadata to
use. if 'latest' is specified, use latest version.",
--
To view, visit https://gerrit.wikimedia.org/r/57268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2215d022a47cd8ceeadd2f5d38064495f3197772
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use PoolCounter to avoid inserting jobs twice - change (mediawiki...TimedMediaHandler)
J has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57269
Change subject: use PoolCounter to avoid inserting jobs twice
..
use PoolCounter to avoid inserting jobs twice
Change-Id: I1e5d2354d2116e250237336cc8c37c763c611872
---
M WebVideoTranscode/WebVideoTranscode.php
1 file changed, 14 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/69/57269/1
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index 26ae494..86121f6 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -663,7 +663,20 @@
if( self::isTranscodeReady( $file, $transcodeKey ) ){
$sources[] = self::getDerivativeSourceAttributes(
$file, $transcodeKey, $dataPrefix );
} else {
- self::updateJobQueue( $file, $transcodeKey );
+ if ( MWInit::classExists( 'PoolCounterWorkViaCallback'
) ) {
+ $poolKey = $file->getRepo()->getSharedCacheKey(
'file', md5( $file->getName() ) );
+ $poolKey = '_tmh:updateJobQueue:' . $poolKey .
':' . $transcodeKey;
+ $work = new PoolCounterWorkViaCallback(
'TMHupdateJobQueue', $poolKey,
+ array( 'doWork' => function() use
($file, $transcodeKey) {
+
WebVideoTranscode::updateJobQueue( $file, $transcodeKey );
+ return true;
+ }, 'doCachedWork' => function() {
+ return true;
+ } ) );
+ $work->execute();
+ } else {
+ self::updateJobQueue( $file, $transcodeKey );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/57269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e5d2354d2116e250237336cc8c37c763c611872
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: J
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add namespace translation for 'cy' - change (mediawiki...Scribunto)
jenkins-bot has submitted this change and it was merged. Change subject: Add namespace translation for 'cy' .. Add namespace translation for 'cy' Requested by Lloffiwr https://translatewiki.net/wiki/Thread:Support/Module_namespace_for_cy_wikis Change-Id: I90a11fa7e4cdf8cb59742b9f61a66827c45c5a56 --- M Scribunto.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index c65aba6..00d218c 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -28,6 +28,11 @@ 829 => 'Diskuse_k_modulu', ); +$namespaceNames['cy'] = array( + 828 => 'Modiwl', + 829 => 'Sgwrs_modiwl', +); + $namespaceNames['de'] = array( 828 => 'Modul', 829 => 'Modul_Diskussion', -- To view, visit https://gerrit.wikimedia.org/r/57261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90a11fa7e4cdf8cb59742b9f61a66827c45c5a56 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Anomie Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) Selenium tests for qualifiers UI (WIP, DNM) - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57270
Change subject: (testing) Selenium tests for qualifiers UI (WIP, DNM)
..
(testing) Selenium tests for qualifiers UI (WIP, DNM)
Change-Id: I80d0a4de658f517c07806104aba914279cab4b6e
---
A repo/tests/selenium/statements/qualifiers_spec.rb
M selenium/Rakefile
A selenium/lib/modules/qualifiers_module.rb
3 files changed, 544 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/70/57270/1
diff --git a/repo/tests/selenium/statements/qualifiers_spec.rb
b/repo/tests/selenium/statements/qualifiers_spec.rb
new file mode 100644
index 000..dd979c0
--- /dev/null
+++ b/repo/tests/selenium/statements/qualifiers_spec.rb
@@ -0,0 +1,492 @@
+# -*- encoding : utf-8 -*-
+# Wikidata UI tests
+#
+# Author:: Tobias Gritschacher (tobias.gritschac...@wikimedia.de)
+# License:: GNU GPL v2+
+#
+# tests for qualifiers UI
+
+require 'spec_helper'
+
+num_items = 2
+num_props_cm = 2
+num_props_item = 1
+
+# items
+count = 0
+items = Array.new
+while count < num_items do
+ items.push({"label"=>generate_random_string(10),
"description"=>generate_random_string(20)})
+ count = count + 1
+end
+
+# commons media properties
+count = 0
+properties_cm = Array.new
+while count < num_props_cm do
+ properties_cm.push({"label"=>generate_random_string(10),
"description"=>generate_random_string(20), "datatype"=>"Commons media file"})
+ count = count + 1
+end
+
+# item properties
+count = 0
+properties_item = Array.new
+while count < num_props_item do
+ properties_item.push({"label"=>generate_random_string(10),
"description"=>generate_random_string(20), "datatype"=>"Item"})
+ count = count + 1
+end
+
+cm_statement_value = "Vespa_crabro_head_01.jpg"
+cm_qualifier_value = "Blason_CH_Canton_Valais_3D.svg"
+cm_qualifier_value2 = "RapidRide_coach_6000_prototype.jpg"
+cm_qualifier_value_changed = "BlueFeather.jpg"
+cm_qualifier_value_changed2 = "Phra_Lak_Phra_Lam.jpg"
+
+describe "Check references UI" do
+ before :all do
+# set up: create items & properties & add statement
+items.each do |item|
+ visit_page(CreateItemPage) do |page|
+item['id'] = page.create_new_item(item['label'], item['description'])
+item['url'] = page.current_url
+ end
+end
+properties_cm.each do |property|
+ visit_page(NewPropertyPage) do |page|
+property['id'] = page.create_new_property(property['label'],
property['description'], property['datatype'])
+property['url'] = page.current_url
+ end
+end
+properties_item.each do |property|
+ visit_page(NewPropertyPage) do |page|
+property['id'] = page.create_new_property(property['label'],
property['description'], property['datatype'])
+property['url'] = page.current_url
+ end
+end
+on_page(ItemPage) do |page|
+ page.navigate_to items[0]["url"]
+ page.wait_for_entity_to_load
+ page.add_statement(properties_cm[0]["label"], cm_statement_value)
+end
+ end
+
+ context "Check qualifiers UI" do
+xit "should check qualifiers buttons behavior" do
+ on_page(ItemPage) do |page|
+page.navigate_to items[0]["url"]
+page.wait_for_entity_to_load
+page.editFirstStatement?.should be_true
+page.editFirstStatement
+page.editFirstStatement?.should be_false
+page.saveStatement?.should be_false
+page.cancelStatement?.should be_true
+page.removeClaimButton?.should be_true
+page.qualifiersContainer?.should be_true
+page.addQualifier?.should be_true
+page.addQualifier
+page.addQualifier?.should be_false
+page.saveStatement?.should be_false
+page.cancelStatement?.should be_true
+page.removeClaimButton?.should be_true
+page.entitySelectorInput?.should be_true
+page.entitySelectorInput.should == ""
+page.removeQualifierLine1?.should be_true
+page.removeQualifierLine1
+page.removeQualifierLine1?.should be_false
+page.entitySelectorInput?.should be_false
+page.addQualifier?.should be_true
+page.saveStatement?.should be_false
+page.cancelStatement?.should be_true
+page.removeClaimButton?.should be_true
+
+page.addQualifier
+page.addQualifier?.should be_false
+page.saveStatement?.should be_false
+page.cancelStatement?.should be_true
+page.removeClaimButton?.should be_true
+page.entitySelectorInput?.should be_true
+page.entitySelectorInput.should == ""
+page.entitySelectorInput = generate_random_string(10)
+ajax_wait
+page.saveStatement?.should be_false
+page.cancelStatement?.should be_true
+page.removeClaimButton?.should be_true
+page.qualifierValueInput1?.should be_false
+page.addQu
[MediaWiki-commits] [Gerrit] (RT 4835) Apparently api logs were moved to emery - change (operations/puppet)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/57271 Change subject: (RT 4835) Apparently api logs were moved to emery .. (RT 4835) Apparently api logs were moved to emery Based on IRC talk to Ori, api logs are no longer rsynced with stats1, hence I will need to get them from emery. This is a followup to I3ebd843da5a91f7c70ae8215f8538635492abef8 Change-Id: I2ba8d3f3725c33494715806b7f3603d4bbfba71d --- M manifests/site.pp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/71/57271/1 diff --git a/manifests/site.pp b/manifests/site.pp index 60c0919..7cfb8e6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -712,7 +712,8 @@ include admins::mortals, # RT 4312 - accounts::dandreescu + accounts::dandreescu, + accounts::yurik # RT 4835 include generic::sysctl::high-bandwidth-rsync, -- To view, visit https://gerrit.wikimedia.org/r/57271 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ba8d3f3725c33494715806b7f3603d4bbfba71d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yurik ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] yamllint: basic YAML linter - change (integration/jenkins)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57272
Change subject: yamllint: basic YAML linter
..
yamllint: basic YAML linter
The yamllint.py takes one or more directories as argument, it then find
out any files having the 'yaml' extension and attempt to parse them with
PyYAML reporting an error whenever that files.
This is intended to lint our YAML files for basic mistakes.
Change-Id: If0b80736aa05575e30611272f90124ace4dd7648
---
A tools/yamllint.py
1 file changed, 61 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/72/57272/1
diff --git a/tools/yamllint.py b/tools/yamllint.py
new file mode 100755
index 000..9f4329e
--- /dev/null
+++ b/tools/yamllint.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+#
+#
+# Copyright 2013, Antoine Musso
+# Copyright 2013, Wikimedia Foundation Inc.
+#
+# Released under GPLv2
+#
+# Disable pylint checks about globals requiring upercase first:
+# pylint: disable=C0103
+
+"""A basic script that recursively find YAML files under one or more
+ directories and attempt to parse them using PyYAML.
+"""
+import argparse
+import fnmatch
+import logging
+import os
+import sys
+import yaml
+
+parser = argparse.ArgumentParser(description=__doc__)
+parser.add_argument('-v', '-verbose', dest='verbose', action='count',
+help='increase verbosity')
+parser.add_argument('dirs', nargs='+',
+help='paths to look for YAML files')
+args = parser.parse_args()
+
+# Set up verbosity
+if args.verbose == 1:
+log_level = logging.INFO
+elif args.verbose == 2:
+log_level = logging.DEBUG
+else:
+log_level = logging.WARNING
+
+logging.basicConfig(level=log_level, format='%(levelname)s %(message)s')
+
+errors = 0
+files = 0
+for path in args.dirs:
+for root, dirnames, filenames in os.walk(path):
+for yaml_file in fnmatch.filter(filenames, '*.yaml'):
+full_path = os.path.join(root, yaml_file)
+logging.debug("Invoking yaml.load on %s", full_path)
+try:
+files += 1
+yaml.load(file(full_path))
+logging.info('[PASS] ' + full_path)
+except Exception, exc:
+logging.error("Invalid file %s raised: %s",
+ full_path, exc, exc_info=False)
+errors += 1
+
+if errors == 0:
+print "Good, all %s files passed!" % files
+sys.exit(0)
+else:
+logging.error("Oh no, found %s files with errors out of %s files.",
+ errors, files)
+sys.exit(1)
--
To view, visit https://gerrit.wikimedia.org/r/57272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0b80736aa05575e30611272f90124ace4dd7648
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid fatal errors with uselang=s - change (mediawiki/core)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57273
Change subject: Avoid fatal errors with uselang=s
..
Avoid fatal errors with uselang=s
languages is not a subclass of Language
Force valid built-in language codes to be at least two letters long.
Bug: 46710
Change-Id: Ife8885ed4bdb3a017a54e063f5dc58468ba231d5
---
M languages/Language.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/73/57273/1
diff --git a/languages/Language.php b/languages/Language.php
index 57d456a..156f7b0 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -357,7 +357,7 @@
throw new MWException( __METHOD__ . " must be passed a
string, $type given$addmsg" );
}
- return (bool)preg_match( '/^[a-z0-9-]+$/i', $code );
+ return (bool)preg_match( '/^[a-z0-9-]{2,}$/i', $code );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/57273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife8885ed4bdb3a017a54e063f5dc58468ba231d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] yamllint jobs for integration configurations - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57274
Change subject: yamllint jobs for integration configurations
..
yamllint jobs for integration configurations
Change-Id: I9329a6f6233a6461a50f627d96c354d036d0fbbf
---
M integration.yaml
M job-templates.yaml
M macro.yaml
3 files changed, 27 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/74/57274/1
diff --git a/integration.yaml b/integration.yaml
index 4a2b34d..6799783 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -15,3 +15,15 @@
name: 'integration-docroot'
jobs:
- 'integration-docroot-deploy'
+
+- project:
+name: 'integration-zuul-config'
+gerrit-name: 'integration/jenkins-zuul-config'
+jobs:
+ - '{name}-yamllint'
+
+- project:
+name: 'integration-jjb-config'
+gerrit-name: 'integration/jenkins-job-builder-config'
+jobs:
+ - '{name}-yamllint'
diff --git a/job-templates.yaml b/job-templates.yaml
index 99e6fdf..57ca683 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -49,3 +49,13 @@
publishers:
- checkstyle-xml
- phpcs
+
+- job-template:
+name: '{name}-yamllint'
+
+defaults: use-zuul
+triggers:
+ - zuul
+
+builders:
+ - yaml-lint
diff --git a/macro.yaml b/macro.yaml
index 222ae5e..8105afa 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -245,3 +245,8 @@
./configure
make
make test
+
+- builder:
+name: yaml-lint
+builders:
+ - shell: '/var/lib/jenkins/tools/yamllint.py "$WORKSPACE"'
--
To view, visit https://gerrit.wikimedia.org/r/57274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9329a6f6233a6461a50f627d96c354d036d0fbbf
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] yamllint: basic YAML linter - change (integration/jenkins)
Hashar has submitted this change and it was merged.
Change subject: yamllint: basic YAML linter
..
yamllint: basic YAML linter
The yamllint.py takes one or more directories as argument, it then find
out any files having the 'yaml' extension and attempt to parse them with
PyYAML reporting an error whenever that files.
This is intended to lint our YAML files for basic mistakes.
Change-Id: If0b80736aa05575e30611272f90124ace4dd7648
---
A tools/yamllint.py
1 file changed, 61 insertions(+), 0 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/tools/yamllint.py b/tools/yamllint.py
new file mode 100755
index 000..9f4329e
--- /dev/null
+++ b/tools/yamllint.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+#
+#
+# Copyright 2013, Antoine Musso
+# Copyright 2013, Wikimedia Foundation Inc.
+#
+# Released under GPLv2
+#
+# Disable pylint checks about globals requiring upercase first:
+# pylint: disable=C0103
+
+"""A basic script that recursively find YAML files under one or more
+ directories and attempt to parse them using PyYAML.
+"""
+import argparse
+import fnmatch
+import logging
+import os
+import sys
+import yaml
+
+parser = argparse.ArgumentParser(description=__doc__)
+parser.add_argument('-v', '-verbose', dest='verbose', action='count',
+help='increase verbosity')
+parser.add_argument('dirs', nargs='+',
+help='paths to look for YAML files')
+args = parser.parse_args()
+
+# Set up verbosity
+if args.verbose == 1:
+log_level = logging.INFO
+elif args.verbose == 2:
+log_level = logging.DEBUG
+else:
+log_level = logging.WARNING
+
+logging.basicConfig(level=log_level, format='%(levelname)s %(message)s')
+
+errors = 0
+files = 0
+for path in args.dirs:
+for root, dirnames, filenames in os.walk(path):
+for yaml_file in fnmatch.filter(filenames, '*.yaml'):
+full_path = os.path.join(root, yaml_file)
+logging.debug("Invoking yaml.load on %s", full_path)
+try:
+files += 1
+yaml.load(file(full_path))
+logging.info('[PASS] ' + full_path)
+except Exception, exc:
+logging.error("Invalid file %s raised: %s",
+ full_path, exc, exc_info=False)
+errors += 1
+
+if errors == 0:
+print "Good, all %s files passed!" % files
+sys.exit(0)
+else:
+logging.error("Oh no, found %s files with errors out of %s files.",
+ errors, files)
+sys.exit(1)
--
To view, visit https://gerrit.wikimedia.org/r/57272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0b80736aa05575e30611272f90124ace4dd7648
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers yamllint for integration repos - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/57275 Change subject: triggers yamllint for integration repos .. triggers yamllint for integration repos Jenkins Job Builder and Zuul are configured using YAML files which we hold in '-config' repositories. Triggers the jobs as V+2. Change-Id: I6ca5a342b92d318d2a3d4dd60eb4c519133bccd2 --- M layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/75/57275/1 diff --git a/layout.yaml b/layout.yaml index 49d5870..cd96bd8 100644 --- a/layout.yaml +++ b/layout.yaml @@ -358,6 +358,16 @@ # Register the Gerrit project name, apply them pipelines that in turn trigger # a set of jobs. projects: + - name: integration/jenkins-job-builder-config +# FIXME: make this 'check' whenever we have integration tests +check-voter: + - integration-jjb-config-yamllint + + - name: integration/zuul-config +# FIXME: make this 'check' whenever we have integration tests +check-voter: + - integration-zuul-config-yamllint + - name: mediawiki/core check: - mediawiki-core-merge: -- To view, visit https://gerrit.wikimedia.org/r/57275 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ca5a342b92d318d2a3d4dd60eb4c519133bccd2 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers yamllint for integration repos - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: triggers yamllint for integration repos .. triggers yamllint for integration repos Jenkins Job Builder and Zuul are configured using YAML files which we hold in '-config' repositories. Triggers the jobs as V+2. Change-Id: I6ca5a342b92d318d2a3d4dd60eb4c519133bccd2 --- M layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index 49d5870..cd96bd8 100644 --- a/layout.yaml +++ b/layout.yaml @@ -358,6 +358,16 @@ # Register the Gerrit project name, apply them pipelines that in turn trigger # a set of jobs. projects: + - name: integration/jenkins-job-builder-config +# FIXME: make this 'check' whenever we have integration tests +check-voter: + - integration-jjb-config-yamllint + + - name: integration/zuul-config +# FIXME: make this 'check' whenever we have integration tests +check-voter: + - integration-zuul-config-yamllint + - name: mediawiki/core check: - mediawiki-core-merge: -- To view, visit https://gerrit.wikimedia.org/r/57275 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ca5a342b92d318d2a3d4dd60eb4c519133bccd2 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove link to Special:ActiveUsers from Special:Statistics - change (mediawiki/core)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/57276 Change subject: Remove link to Special:ActiveUsers from Special:Statistics .. Remove link to Special:ActiveUsers from Special:Statistics Besides beign broken, causes PHP warnings. Bug: 46719 Change-Id: I23d9c9bdc9d38eb4256d0f7061e225cf86b576f8 --- M includes/specials/SpecialStatistics.php 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/76/57276/1 diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php index bc1b600..ec924b0 100644 --- a/includes/specials/SpecialStatistics.php +++ b/includes/specials/SpecialStatistics.php @@ -171,11 +171,7 @@ $this->formatRow( $this->msg( 'statistics-users' )->parse(), $this->getLanguage()->formatNum( $this->users ), array( 'class' => 'mw-statistics-users' ) ) . - $this->formatRow( $this->msg( 'statistics-users-active' )->parse() . ' ' . - Linker::linkKnown( - SpecialPage::getTitleFor( 'Activeusers' ), - $this->msg( 'listgrouprights-members' )->escaped() - ), + $this->formatRow( $this->msg( 'statistics-users-active' )->parse(), $this->getLanguage()->formatNum( $this->activeUsers ), array( 'class' => 'mw-statistics-users-active' ), 'statistics-users-active-desc', -- To view, visit https://gerrit.wikimedia.org/r/57276 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23d9c9bdc9d38eb4256d0f7061e225cf86b576f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] yamllint jobs for integration configurations - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: yamllint jobs for integration configurations
..
yamllint jobs for integration configurations
Needs the yamllint.py script I wrote in:
https://gerrit.wikimedia.org/r/#/c/57272/
Change-Id: I9329a6f6233a6461a50f627d96c354d036d0fbbf
---
M integration.yaml
M job-templates.yaml
M macro.yaml
3 files changed, 27 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/integration.yaml b/integration.yaml
index 4a2b34d..8bab017 100644
--- a/integration.yaml
+++ b/integration.yaml
@@ -15,3 +15,15 @@
name: 'integration-docroot'
jobs:
- 'integration-docroot-deploy'
+
+- project:
+name: 'integration-zuul-config'
+gerrit-name: 'integration/zuul-config'
+jobs:
+ - '{name}-yamllint'
+
+- project:
+name: 'integration-jjb-config'
+gerrit-name: 'integration/jenkins-job-builder-config'
+jobs:
+ - '{name}-yamllint'
diff --git a/job-templates.yaml b/job-templates.yaml
index 99e6fdf..57ca683 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -49,3 +49,13 @@
publishers:
- checkstyle-xml
- phpcs
+
+- job-template:
+name: '{name}-yamllint'
+
+defaults: use-zuul
+triggers:
+ - zuul
+
+builders:
+ - yaml-lint
diff --git a/macro.yaml b/macro.yaml
index 222ae5e..8105afa 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -245,3 +245,8 @@
./configure
make
make test
+
+- builder:
+name: yaml-lint
+builders:
+ - shell: '/var/lib/jenkins/tools/yamllint.py "$WORKSPACE"'
--
To view, visit https://gerrit.wikimedia.org/r/57274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9329a6f6233a6461a50f627d96c354d036d0fbbf
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add math operators % & | ^ << >> (version 0.0.3) - change (mediawiki...Foxway)
Pastakhov has submitted this change and it was merged.
Change subject: add math operators % & | ^ << >> (version 0.0.3)
..
add math operators % & | ^ << >> (version 0.0.3)
now are supported all the mathematical operations
Change-Id: Ieded484f844c8791d8b54725b4591a5ee8c6f5cd
---
M Foxway.php
M includes/Interpreter.php
M includes/Runtime.php
M tests/phpunit/includes/InterpreterTest.php
4 files changed, 495 insertions(+), 203 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/Foxway.php b/Foxway.php
index f07851a..f95f564 100644
--- a/Foxway.php
+++ b/Foxway.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-define( 'Foxway_VERSION' , '0.0.2' );
+define( 'Foxway_VERSION' , '0.0.3' );
// Register this extension on Special:Version
$wgExtensionCredits['parserhook'][] = array(
diff --git a/includes/Interpreter.php b/includes/Interpreter.php
index 0f2d4ba..c86c85f 100644
--- a/includes/Interpreter.php
+++ b/includes/Interpreter.php
@@ -30,9 +30,6 @@
foreach ($tokens as $token) {
if ( is_string($token) ) {
$id = $token;
- if($is_debug) {
- $debug[] = $token;
- }
} else {
list($id, $text, $line) = $token;
}
@@ -46,97 +43,38 @@
//\MWDebug::log( var_export($token,true) );
switch ($id) {
- case T_COMMENT:
- case T_DOC_COMMENT:
- if($is_debug) {
- $debug[] = '' . str_replace("\n", "\n", htmlspecialchars($text) ) . '';
- }
- break;
- case T_WHITESPACE:
- if($is_debug) {
- $debug[] = str_replace("\n",
"\n", $text);
- }
- break;
- case '"':
- if($is_debug) {
- array_pop($debug);
- $debug[] = '"';
- }
- if( $expectQuotesClose ) {
- $expectQuotesClose = false;
- $expected = array('.', ';');
- } else {
- $expectQuotesClose = true;
- $expected =
array(T_ENCAPSED_AND_WHITESPACE, T_CURLY_OPEN, T_VARIABLE, '"');
- }
- if($expectListParams){
- $expected[] = ',';
- }
- break;
case ';':
$return .=
$runtime->getCommandResult($debug);
- $expectListParams = false;
- $expected = false;
+ break;
+ case ',':
+ $runtime->separateParams();
break;
case '=':
- $runtime->setVariableOperator('=');
- $expected = array(
- T_CONSTANT_ENCAPSED_STRING,
- T_ENCAPSED_AND_WHITESPACE,
- T_LNUMBER,
- T_DNUMBER,
- T_VARIABLE,
- T_CURLY_OPEN,
- '"',
- //';',
- );
+ case T_CONCAT_EQUAL:// .=
+ case T_PLUS_EQUAL: // +=
+ case T_MINUS_EQUAL: // -=
+ case T_MUL_EQUAL: // *=
+ case T_DIV_EQUAL: // /=
+ case T_MOD_EQUAL: // %=
+ case T_AND_EQUAL: /
[MediaWiki-commits] [Gerrit] Remove spaces around :: - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57277
Change subject: Remove spaces around ::
..
Remove spaces around ::
Change-Id: I24fe5ad907bcf5235aa91b650785c571502456a1
---
M includes/api/ApiBase.php
M includes/api/ApiQueryCategories.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/77/57277/1
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 84a6ed9..be913cf 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -445,7 +445,7 @@
$hintPipeSeparated = false;
break;
case 'limit':
- $desc .=
$paramPrefix . "No more than {$paramSettings[self :: PARAM_MAX]}";
+ $desc .=
$paramPrefix . "No more than {$paramSettings[self::PARAM_MAX]}";
if ( isset(
$paramSettings[self::PARAM_MAX2] ) ) {
$desc
.= " ({$paramSettings[self::PARAM_MAX2]} for bots)";
}
diff --git a/includes/api/ApiQueryCategories.php
b/includes/api/ApiQueryCategories.php
index 93ae61a..b2d3b1e 100644
--- a/includes/api/ApiQueryCategories.php
+++ b/includes/api/ApiQueryCategories.php
@@ -173,7 +173,7 @@
break;
}
- $titles[] = Title :: makeTitle( NS_CATEGORY,
$row->cl_to );
+ $titles[] = Title::makeTitle( NS_CATEGORY,
$row->cl_to );
}
$resultPageSet->populateFromTitles( $titles );
}
--
To view, visit https://gerrit.wikimedia.org/r/57277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24fe5ad907bcf5235aa91b650785c571502456a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use a form for the searchbox - change (translatewiki)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57278
Change subject: Use a form for the searchbox
..
Use a form for the searchbox
Change-Id: I98a55e39904ca33c504337700d37bb9873eedb51
Followup: I3101738d0800d77caf6b8253361117af0b550a4a
---
M MainPage/resources/css/ext.translate.mainpage.css
M MainPage/resources/js/ext.translate.mainpage.js
M MainPage/specials/SpecialTwnMainPage.php
3 files changed, 12 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/78/57278/1
diff --git a/MainPage/resources/css/ext.translate.mainpage.css
b/MainPage/resources/css/ext.translate.mainpage.css
index 5d7afa0..6f252fe 100644
--- a/MainPage/resources/css/ext.translate.mainpage.css
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -267,15 +267,15 @@
width: 100%;
}
-.search-label {
+.twn-mainpage-search {
/* @embed */
- background: transparent url('../images/search.png') no-repeat scroll
right center;
+ background: #000 url('../images/search.png') no-repeat scroll left
center;
background-image: -webkit-linear-gradient(transparent, transparent),
url('../images/search.svg');
background-image: -moz-linear-gradient(transparent, transparent),
url('../images/search.svg');
background-image: linear-gradient(transparent, transparent),
url('../images/search.svg');
background-size: 30px;
- height: 32px;
- width: 32px;
+ height: 50px;
+ padding: 10px 10px 10px 40px;
float: left;
}
diff --git a/MainPage/resources/js/ext.translate.mainpage.js
b/MainPage/resources/js/ext.translate.mainpage.js
index a7f08a5..ef3b72c 100644
--- a/MainPage/resources/js/ext.translate.mainpage.js
+++ b/MainPage/resources/js/ext.translate.mainpage.js
@@ -1,16 +1 @@
-( function ( $, mw ) {
- 'use strict';
-
- function search () {
- window.location.href = new mw.Uri( mw.util.wikiGetlink(
'Special:SearchTranslations' ) )
- .extend( { query: $( 'input.searchbox' ).val() } );
- }
- $( document ).ready( function () {
- $( '.twn-mainpage-search button' ).on( 'click', search );
- $( '.twn-mainpage-search input' ).on( 'keyup', function( e ) {
- if ( e.which === 13 ) { // Enter key
- search();
- }
- } );
- } );
-}( jQuery, mediaWiki ) );
+// Main page js
diff --git a/MainPage/specials/SpecialTwnMainPage.php
b/MainPage/specials/SpecialTwnMainPage.php
index 6fc3cf9..ec72a31 100644
--- a/MainPage/specials/SpecialTwnMainPage.php
+++ b/MainPage/specials/SpecialTwnMainPage.php
@@ -81,24 +81,26 @@
}
public function searchBar() {
- $out = Html::openElement( 'div', array( 'class' => 'row
twn-mainpage-search' ) );
- $out .= Html::element( 'span',
+ $out = Html::openElement( 'form',
array(
- 'class' => 'one column search-label',
+ 'class' => 'row twn-mainpage-search',
+ 'action' => SpecialPage::getTitleFor(
'SearchTranslations' )->getLocalUrl(),
) );
$out .= Html::element( 'input',
array(
- 'class' => 'ten columns searchbox',
+ 'class' => 'eleven columns searchbox',
'placeholder' => 'Find and fix translations',
'type' => 'search',
+ 'name' => 'query',
) );
$out .= Html::element( 'button',
array(
'class' => 'one column end blue button',
+ 'type' => 'submit',
),
'Find' );
- $out .= Html::closeElement( 'div' );
+ $out .= Html::closeElement( 'form' );
return $out;
}
--
To view, visit https://gerrit.wikimedia.org/r/57278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98a55e39904ca33c504337700d37bb9873eedb51
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Integrate ULS for interface language change - change (translatewiki)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57279
Change subject: Integrate ULS for interface language change
..
Integrate ULS for interface language change
Change-Id: Ifd7345418f650aec38e7aca05d26e45bb803fc69
---
M MainPage/Resources.php
M MainPage/resources/css/ext.translate.mainpage.css
M MainPage/specials/SpecialTwnMainPage.php
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/79/57279/1
diff --git a/MainPage/Resources.php b/MainPage/Resources.php
index fe617f1..0ac0ac9 100644
--- a/MainPage/Resources.php
+++ b/MainPage/Resources.php
@@ -15,8 +15,7 @@
'scripts' => 'resources/js/ext.translate.mainpage.js',
'styles' => 'resources/css/ext.translate.mainpage.css',
'dependencies' => array(
- 'jquery.uls.grid',
- 'jquery.uls',
+ 'ext.uls.interface',
'ext.translate.statsbar',
'mediawiki.util',
'mediawiki.Uri',
diff --git a/MainPage/resources/css/ext.translate.mainpage.css
b/MainPage/resources/css/ext.translate.mainpage.css
index 6f252fe..6daf5fd 100644
--- a/MainPage/resources/css/ext.translate.mainpage.css
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -14,6 +14,7 @@
padding-left: 30px;
color: #3366BB;
padding-top: 50px;
+ cursor: pointer;
}
.twn-mainpage-title { /* @embed */
diff --git a/MainPage/specials/SpecialTwnMainPage.php
b/MainPage/specials/SpecialTwnMainPage.php
index ec72a31..b7ac8ea 100644
--- a/MainPage/specials/SpecialTwnMainPage.php
+++ b/MainPage/specials/SpecialTwnMainPage.php
@@ -41,7 +41,7 @@
}
public function header() {
- global $wgScript;
+ global $wgScript, $wgLang;
$out = Html::openElement( 'div', array( 'class' => 'row
twn-mainpage-header' ) );
$out .= Html::openElement( 'div', array( 'class' => 'ten
columns twn-mainpage-title' ) );
@@ -60,7 +60,7 @@
array(
'class' => 'uls-trigger column',
)
- , 'English' );
+ , $wgLang->getLanguageName( $wgLang->getCode() ) );
if ( $this->getUser()->isLoggedIn() ) {
$out .= Html::element( 'a',
array(
--
To view, visit https://gerrit.wikimedia.org/r/57279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd7345418f650aec38e7aca05d26e45bb803fc69
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] yamllint: supports '.yml' files and uppercase ext - change (integration/jenkins)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57280
Change subject: yamllint: supports '.yml' files and uppercase ext
..
yamllint: supports '.yml' files and uppercase ext
fncmatch only allow one unix pattern. Lets use endswith() instead which
will be good enough for now.
Change-Id: I7e81fe82762c805bff24089b300890855bd8b798
---
M tools/yamllint.py
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/80/57280/1
diff --git a/tools/yamllint.py b/tools/yamllint.py
index 9f4329e..56d56ff 100755
--- a/tools/yamllint.py
+++ b/tools/yamllint.py
@@ -13,7 +13,6 @@
directories and attempt to parse them using PyYAML.
"""
import argparse
-import fnmatch
import logging
import os
import sys
@@ -40,17 +39,18 @@
files = 0
for path in args.dirs:
for root, dirnames, filenames in os.walk(path):
-for yaml_file in fnmatch.filter(filenames, '*.yaml'):
-full_path = os.path.join(root, yaml_file)
-logging.debug("Invoking yaml.load on %s", full_path)
-try:
-files += 1
-yaml.load(file(full_path))
-logging.info('[PASS] ' + full_path)
-except Exception, exc:
-logging.error("Invalid file %s raised: %s",
- full_path, exc, exc_info=False)
-errors += 1
+for a_file in filenames:
+if a_file.lower().endswith(('.yaml', '.yml')):
+full_path = os.path.join(root, a_file)
+logging.debug("Invoking yaml.load on %s", full_path)
+try:
+files += 1
+yaml.load(file(full_path))
+logging.info('[PASS] ' + full_path)
+except Exception, exc:
+logging.error("Invalid file %s raised: %s",
+ full_path, exc, exc_info=False)
+errors += 1
if errors == 0:
print "Good, all %s files passed!" % files
--
To view, visit https://gerrit.wikimedia.org/r/57280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e81fe82762c805bff24089b300890855bd8b798
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] yamllint: supports '.yml' files and uppercase ext - change (integration/jenkins)
Hashar has submitted this change and it was merged.
Change subject: yamllint: supports '.yml' files and uppercase ext
..
yamllint: supports '.yml' files and uppercase ext
fncmatch only allow one unix pattern. Lets use endswith() instead which
will be good enough for now.
Change-Id: I7e81fe82762c805bff24089b300890855bd8b798
---
M tools/yamllint.py
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/tools/yamllint.py b/tools/yamllint.py
index 9f4329e..56d56ff 100755
--- a/tools/yamllint.py
+++ b/tools/yamllint.py
@@ -13,7 +13,6 @@
directories and attempt to parse them using PyYAML.
"""
import argparse
-import fnmatch
import logging
import os
import sys
@@ -40,17 +39,18 @@
files = 0
for path in args.dirs:
for root, dirnames, filenames in os.walk(path):
-for yaml_file in fnmatch.filter(filenames, '*.yaml'):
-full_path = os.path.join(root, yaml_file)
-logging.debug("Invoking yaml.load on %s", full_path)
-try:
-files += 1
-yaml.load(file(full_path))
-logging.info('[PASS] ' + full_path)
-except Exception, exc:
-logging.error("Invalid file %s raised: %s",
- full_path, exc, exc_info=False)
-errors += 1
+for a_file in filenames:
+if a_file.lower().endswith(('.yaml', '.yml')):
+full_path = os.path.join(root, a_file)
+logging.debug("Invoking yaml.load on %s", full_path)
+try:
+files += 1
+yaml.load(file(full_path))
+logging.info('[PASS] ' + full_path)
+except Exception, exc:
+logging.error("Invalid file %s raised: %s",
+ full_path, exc, exc_info=False)
+errors += 1
if errors == 0:
print "Good, all %s files passed!" % files
--
To view, visit https://gerrit.wikimedia.org/r/57280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e81fe82762c805bff24089b300890855bd8b798
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Fix message cache expiry semantics - change (mediawiki/core)
Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57281
Change subject: [WIP] Fix message cache expiry semantics
..
[WIP] Fix message cache expiry semantics
* Use the stale message cache while the new one is being generated
* Revert I811755d4 (make message cache load failure fatal). This
escalated several very plausible temporary site issues from barely
noticeable to complete downtime -- for example, memcached being down
on a site with only one memcached server.
* Remove $wgLocalMessageCacheSerialized, it's always been pointless
* Clarify a couple of comments.
* Untested work in progress.
Setting a 1-day expiry in memcached, with a ~10s CPU cost to replace, is
not the best idea since it inevitably leads to a cache stampede. Dealing
with the stampede by waiting for a lock is not ideal, even if it were
implemented properly, since it's not necessary to deliver perfectly
fresh message cache data to all clients.
This is especially obvious when you note that barring bugs, expiry and
regeneration always gives you back the exact same data, because we have
incremental updates (MessageCache::replace()). Keeping all clients
waiting for 10s just to give them the data they have already is pretty
pointless.
So, continue to serve the site from the stale message cache while the
new one is being generated.
One caveat: if local caching enabled, when the message cache becomes
stale, a sudden spike in network bandwidth may result due to the full
array (also typically stale) being fetched from the shared cache.
Change-Id: Ia145fd90da33956d8aac127634606aaecfaa176b
---
M RELEASE-NOTES-1.21
M includes/DefaultSettings.php
M includes/cache/MessageCache.php
3 files changed, 140 insertions(+), 132 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/81/57281/1
diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 1824910..5abe3b8 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -19,6 +19,7 @@
* (bug 29472) $wgUseDynamicDates has been removed and its functionality
disabled.
* $wgVectorUseIconWatch is now enabled by default.
+* Removed $wgLocalMessageCacheSerialized, it is now always true.
=== New features in 1.21 ===
* (bug 38110) Schema changes (adding or dropping tables, indices and
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8a5a222..6410d02 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1893,13 +1893,6 @@
$wgUseLocalMessageCache = false;
/**
- * Defines format of local cache.
- * - true: Serialized object
- * - false: PHP source file (Warning - security risk)
- */
-$wgLocalMessageCacheSerialized = true;
-
-/**
* Instead of caching everything, only cache those messages which have
* been customised in the site content language. This means that
* MediaWiki:Foo/ja is ignored if MediaWiki:Foo doesn't exist.
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 6231a61..292019f 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -119,15 +119,13 @@
/**
* Try to load the cache from a local file.
-* Actual format of the file depends on the
$wgLocalMessageCacheSerialized
-* setting.
*
* @param string $hash the hash of contents, to check validity.
* @param $code Mixed: Optional language code, see documenation of
load().
-* @return bool on failure.
+* @return The cache array
*/
- function loadFromLocal( $hash, $code ) {
- global $wgCacheDirectory, $wgLocalMessageCacheSerialized;
+ function getLocalCache( $hash, $code ) {
+ global $wgCacheDirectory;
$filename = "$wgCacheDirectory/messages-" . wfWikiID() .
"-$code";
@@ -139,31 +137,19 @@
return false; // No cache file
}
- if ( $wgLocalMessageCacheSerialized ) {
- // Check to see if the file has the hash specified
- $localHash = fread( $file, 32 );
- if ( $hash === $localHash ) {
- // All good, get the rest of it
- $serialized = '';
- while ( !feof( $file ) ) {
- $serialized .= fread( $file, 10 );
- }
- fclose( $file );
- return $this->setCache( unserialize(
$serialized ), $code );
- } else {
- fclose( $file );
- return false; // Wrong hash
+ // Check to see if the file has the hash specified
+ $localHash = fread( $file, 32 );
+ if ( $hash === $localHash ) {
+
[MediaWiki-commits] [Gerrit] Making some changes to the flyout links per Vibha - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Making some changes to the flyout links per Vibha
..
Making some changes to the flyout links per Vibha
Entire link areas should be clickable
No longer a need for conditional link to archive
Change-Id: If4954f7da91ed823e7714cccb541e4f2e64b16b1
---
M modules/overlay/ext.echo.overlay.css
M modules/overlay/ext.echo.overlay.js
2 files changed, 17 insertions(+), 30 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/overlay/ext.echo.overlay.css
b/modules/overlay/ext.echo.overlay.css
index 0f5fd86..ca78f7c 100644
--- a/modules/overlay/ext.echo.overlay.css
+++ b/modules/overlay/ext.echo.overlay.css
@@ -72,15 +72,16 @@
}
#mw-echo-overlay-footer {
- padding: 0px 0px 0px 48px;
+ padding: 0px;
border-top: 1px solid #DD;
}
#mw-echo-overlay-link {
+ display: block;
clear: left;
float: left;
- padding: 15px 0px 15px 30px;
- width: 150px;
+ padding: 15px 15px 15px 35px;
+ width: 175px;
min-height: 14px;
font-size: 13px;
/* @embed */
@@ -90,11 +91,12 @@
}
#mw-echo-overlay-pref-link {
+ display: block;
float: left;
- width: 150px;
+ width: 174px;
min-height: 14px;
font-size: 13px;
- padding: 15px 0 15px 30px;
+ padding: 15px 15px 15px 35px;
border-left: 1px solid #DD;
/* @embed */
background-image: url(../icons/Settings.png);
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index fb9cd9e..3b7d706 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -97,26 +97,20 @@
var $overlayFooter = $( '' )
.attr( 'id',
'mw-echo-overlay-footer' );
- // only show 'All notifications...'
link if there is notification
- if ( notifications.index.length > 0 ) {
- $overlayFooter.append(
- $( '' )
- .attr( 'id',
'mw-echo-overlay-link' )
- .append( $link
- .clone()
- .text(
mw.msg( 'echo-overlay-link' ) )
- )
- );
- }
+ // add link to notifications archive
+ $overlayFooter.append(
+ $link
+ .clone()
+ .attr( 'id',
'mw-echo-overlay-link' )
+ .text( mw.msg(
'echo-overlay-link' ) )
+ );
// add link to notification preferences
$overlayFooter.append(
- $( '' )
+ $prefLink
+ .clone()
.attr( 'id',
'mw-echo-overlay-pref-link' )
- .append( $prefLink
- .clone()
- .attr( 'href',
$prefLink.attr( 'href' ) + '#mw-prefsection-echo' )
- )
+ .attr( 'href',
$prefLink.attr( 'href' ) + '#mw-prefsection-echo' )
);
$overlay.append( $overlayFooter );
@@ -182,15 +176,6 @@
$overlay
.hide()
.appendTo( $(
'#pt-notifications' ) );
- // Figure out which footer link is
first and pad it appropriately
- // (Sometimes the 'All notifications'
link doesn't exist)
- if ( $( '#mw-echo-overlay-link'
).length ) {
- $( '#mw-echo-overlay-link' )
-
[MediaWiki-commits] [Gerrit] pybal: sort monitor list - change (operations/puppet)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57282
Change subject: pybal: sort monitor list
..
pybal: sort monitor list
Puppet was changing the file all the time, e.g.
-monitors = ["IdleConnection", "ProxyFetch"]
+monitors = ["ProxyFetch", "IdleConnection"]
sort the list to force a particular order.
Change-Id: Ie41a4a6019b4d3847253de78f75adf04cf572ae0
---
M templates/pybal/pybal.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/57282/1
diff --git a/templates/pybal/pybal.conf.erb b/templates/pybal/pybal.conf.erb
index bbcdeca..a8b8fd5 100644
--- a/templates/pybal/pybal.conf.erb
+++ b/templates/pybal/pybal.conf.erb
@@ -31,7 +31,7 @@
config = http://noc.wikimedia.org/pybal/<%= site %>/<%= servicename %>
bgp = <%= subserviceip.include?(":") ? (
ipv6_hosts.include?(scope.lookupvar("::hostname")) ? service.fetch('bgp', "no")
: "no" ) : service.fetch('bgp', "no") %>
depool-threshold = <%= service.fetch('depool-threshold', ".5") %>
-monitors = <%= service['monitors'].keys.inspect %>
+monitors = <%= service['monitors'].keys.sort.inspect %>
<% service['monitors'].sort.each do |monitorname, monitor| -%>
# <%= monitorname %> monitor configuration
--
To view, visit https://gerrit.wikimedia.org/r/57282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie41a4a6019b4d3847253de78f75adf04cf572ae0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pybal: sort monitor list - change (operations/puppet)
Faidon has submitted this change and it was merged.
Change subject: pybal: sort monitor list
..
pybal: sort monitor list
Puppet was changing the file all the time, e.g.
-monitors = ["IdleConnection", "ProxyFetch"]
+monitors = ["ProxyFetch", "IdleConnection"]
sort the list to force a particular order.
Change-Id: Ie41a4a6019b4d3847253de78f75adf04cf572ae0
---
M templates/pybal/pybal.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/pybal/pybal.conf.erb b/templates/pybal/pybal.conf.erb
index bbcdeca..a8b8fd5 100644
--- a/templates/pybal/pybal.conf.erb
+++ b/templates/pybal/pybal.conf.erb
@@ -31,7 +31,7 @@
config = http://noc.wikimedia.org/pybal/<%= site %>/<%= servicename %>
bgp = <%= subserviceip.include?(":") ? (
ipv6_hosts.include?(scope.lookupvar("::hostname")) ? service.fetch('bgp', "no")
: "no" ) : service.fetch('bgp', "no") %>
depool-threshold = <%= service.fetch('depool-threshold', ".5") %>
-monitors = <%= service['monitors'].keys.inspect %>
+monitors = <%= service['monitors'].keys.sort.inspect %>
<% service['monitors'].sort.each do |monitorname, monitor| -%>
# <%= monitorname %> monitor configuration
--
To view, visit https://gerrit.wikimedia.org/r/57282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie41a4a6019b4d3847253de78f75adf04cf572ae0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon
Gerrit-Reviewer: Faidon
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: Add a message tools menu - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57283
Change subject: WIP: Add a message tools menu
..
WIP: Add a message tools menu
The CSS is copied verbatim from tux-workflow-status-selector
in the ext.translate.workflowselector.css file. It probably needs
adjustments. If the adjustments are small, then the classes can
probably be unified.
Bug: 46791
Bug: 46793
Change-Id: I605147a0fabdfdad4e497ecc762c750f7ccdfeec
---
M Resources.php
M Translate.i18n.php
M resources/css/ext.translate.editor.css
M resources/js/ext.translate.editor.js
4 files changed, 92 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/83/57283/1
diff --git a/Resources.php b/Resources.php
index 75a1172..a3691bc 100644
--- a/Resources.php
+++ b/Resources.php
@@ -90,6 +90,8 @@
'tux-editor-close-tooltip',
'tux-editor-expand-tooltip',
'tux-editor-collapse-tooltip',
+ 'tux-editor-message-tools-history',
+ 'tux-editor-message-tools-translations',
'tux-editor-loading',
),
'position' => 'top',
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 57f9648..e8caa88 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -498,6 +498,8 @@
'tux-editor-close-tooltip' => 'Close',
'tux-editor-expand-tooltip' => 'Expand',
'tux-editor-collapse-tooltip' => 'Collapse',
+ 'tux-editor-message-tools-history' => 'Message history',
+ 'tux-editor-message-tools-translations' => 'Translations to all
languages',
'tux-editor-loading' => 'Loading...',
'translate-search-more-languages-info' => '$1 more
{{PLURAL:$1|language|languages}}',
'translate-statsbar-tooltip' => '$1% translated, $2% proofread',
@@ -1160,6 +1162,8 @@
{{Identical|Expand}}',
'tux-editor-collapse-tooltip' => 'Tooltip for the collapse icon of
translate editor.
{{Identical|Collapse}}',
+ 'tux-editor-message-tools-history' => 'A link to message history. An
item in a menu that appears when clicking on message title.',
+ 'tux-editor-message-tools-translations' => 'A link to translations of a
message to all languages. An item in a menu that appears when clicking on
message title.',
'tux-editor-loading' => 'Loading message while translation editor is
being prepared with helper information.
{{Identical|Loading}}',
'translate-search-more-languages-info' => 'Information shown as number
of languages matching the query using
diff --git a/resources/css/ext.translate.editor.css
b/resources/css/ext.translate.editor.css
index 452569b..bcaac5f 100644
--- a/resources/css/ext.translate.editor.css
+++ b/resources/css/ext.translate.editor.css
@@ -357,3 +357,39 @@
font-size: 14px;
color: #565656;
}
+
+.tux-message-tools-menu {
+ padding-top: 2em;
+ border: 1px solid #c9c9c9;
+ /* @noflip */
+ -webkit-box-shadow: 0 3px 3px -3px rgba(0, 0, 0, 0.5);
+ /* @noflip */
+ box-shadow: 0 3px 3px -3px rgba(0, 0, 0, 0.5);
+ font-size: 14px;
+ margin: 0 5px;
+ list-style: none;
+ padding: 4px;
+ width: 200px;
+ z-index: 10;
+ background: #fff;
+ display: block;
+ position: absolute;
+}
+
+.tux-message-tools-menu li {
+ color: #55;
+ font-size: 14px;
+ padding: 0 2px;
+}
+
+.tux-message-tools-menu li.changeable:hover {
+ cursor: pointer;
+ background-color: #f0f0f0;
+ color: #252525;
+}
+
+.tux-message-tools-menu li.selected {
+ /* @embed */
+ background: url(../images/label-tick.png) right no-repeat;
+ color: #252525;
+}
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index 972c715..e00979d 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -228,6 +228,43 @@
}
},
+ createMessageTools: function () {
+ var wgScript = mw.config.get( 'wgScript' ),
+ historyUri = new mw.Uri(),
+ translationsUri = new mw.Uri();
+
+ historyUri.path = wgScript;
+ historyUri.query = {
+ title: this.message.title,
+ action: 'history'
+ };
+
+ translationsUri.path = wgScript;
+ translationsUri.query = {
+ title: 'Special:Translations',
+ message: this.message.title.replace(
/\/[a-z\-]+$/, '' )
+ };
+
+ return $( '' )
+ .addClass( 'hide tux-message-tools-menu' )
+
[MediaWiki-commits] [Gerrit] Do not append just added group to loaded groups in User::add... - change (mediawiki/core)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/57284 Change subject: Do not append just added group to loaded groups in User::addGroup .. Do not append just added group to loaded groups in User::addGroup This causes the group to appear twice. Bug: 46844 Change-Id: I14eb6e5a5333d887d71d545e42570493437dd320 --- M includes/User.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/84/57284/1 diff --git a/includes/User.php b/includes/User.php index 9427a9e..2bf4a40 100644 --- a/includes/User.php +++ b/includes/User.php @@ -2671,7 +2671,6 @@ } } $this->loadGroups(); - $this->mGroups[] = $group; $this->mRights = User::getGroupPermissions( $this->getEffectiveGroups( true ) ); $this->invalidateCache(); -- To view, visit https://gerrit.wikimedia.org/r/57284 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14eb6e5a5333d887d71d545e42570493437dd320 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] Login form - change (translatewiki)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57285
Change subject: Login form
..
Login form
Change-Id: I43ff6a6e00629cb9b043964d24c9f68e0db51597
---
M MainPage/resources/css/ext.translate.mainpage.css
M MainPage/specials/SpecialTwnMainPage.php
2 files changed, 93 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/85/57285/1
diff --git a/MainPage/resources/css/ext.translate.mainpage.css
b/MainPage/resources/css/ext.translate.mainpage.css
index 6daf5fd..09a7fe6 100644
--- a/MainPage/resources/css/ext.translate.mainpage.css
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -84,11 +84,42 @@
}
.main-widget {
- background-color: #eee;
+ background-color: #fff;
max-height: 580px;
opacity: 0.95;
- margin: 10px;
padding: 10px;
+ max-width: 500px;
+}
+
+.main-widget label {
+ font-size: 14pt;
+}
+
+.main-widget input {
+ padding: 10px;
+ font-size: 16pt;
+ border: 1px solid #555;
+ margin: 10px;
+}
+
+.main-widget button {
+ height: 32px;
+ padding: 10px;
+ font-size: 20pt;
+ margin: 10px;
+}
+
+.main-widget h1,
+.main-widget h2 {
+ border-bottom: none;
+ padding: 10px;
+}
+
+.signup-language-selector {
+ font-size: 12pt;
+ background-color: #eee;
+ margin: 10px;
+ cursor: pointer;
}
.user-stats-title {
diff --git a/MainPage/specials/SpecialTwnMainPage.php
b/MainPage/specials/SpecialTwnMainPage.php
index b7ac8ea..bd042ed 100644
--- a/MainPage/specials/SpecialTwnMainPage.php
+++ b/MainPage/specials/SpecialTwnMainPage.php
@@ -305,7 +305,66 @@
}
public function loginForm() {
- $out = Html::element( 'div', array( 'class' => 'five columns
main-widget login-widget' ) );
+ global $wgLang;
+ $languageCode = $this->getLanguage()->getCode();
+ $languageName = $wgLang->getLanguageName( ( $languageCode ) );
+
+ $out = Html::openElement( 'form',
+ array( 'class' => 'five columns offset-by-one
main-widget login-widget',
+ 'method' => 'post',
+ 'action' => SpecialPage::getTitleFor(
'UserLogin' )
+ ->getLocalUrl( array(
+ 'returnto'=> 'Special:MainPage',
+ 'type' => 'signup' ) ),
+ ) );
+ $out .= Html::element( 'h1', array(
+ 'class' => 'row'
+ ), 'Become a translator' );
+ $out .= Html::element( 'h2', array(
+ 'class' => 'row'
+ ), 'Choose languages you know' );
+ $out .= Xml::checkLabel( $languageName,
'wpLanguage1','wpLanguage1', true,array() ) ;
+ $out .= Html::openElement( 'div', array( 'class' => 'row' ) );
+ $out .= Html::element( 'div', array(
+ 'class' => 'eight columns offset-by-one
signup-language-selector'
+ ), 'Choose another language...' );
+ $out .= Html::closeElement( 'div' );
+ $out .= Html::element( 'h2', array(
+ 'class' => 'row'
+ ), 'Fill in your account details' );
+ $out .= Html::openElement( 'div', array( 'class' => 'row' ) );
+ $out .= Html::element( 'input', array(
+ 'class' => 'eleven columns',
+ 'name' => 'wpName',
+ 'placeholder' => 'Username',
+ ) );
+ $out .= Html::closeElement( 'div' );
+
+ $out .= Html::openElement( 'div', array( 'class' => 'row' ) );
+ $out .= Html::element( 'input', array(
+ 'class' => 'eleven columns',
+ 'name' => 'wpPassword',
+ 'type' => 'password',
+ 'placeholder' => 'Password',
+ ) );
+ $out .= Html::closeElement( 'div' );
+
+ $out .= Html::openElement( 'div', array( 'class' => 'row' ) );
+ $out .= Html::element( 'input', array(
+ 'class' => 'eleven columns',
+ 'name' => 'wpEmail',
+ 'type' => 'email',
+ 'placeholder' => 'Email',
+ ) );
+ $out .= Html::closeElement( 'div' );
+
+ $out .= Html::openElement( 'div', array( 'class' => 'row' ) );
+ $out .= Html::element( 'button', array(
+ 'class' => 'six columns green button offset-by-three',
+ ), 'Create account' );
+ $out .= Html::closeElement( 'div' );
+
+ $out .=
[MediaWiki-commits] [Gerrit] Allow registered users to reset transcodes - change (mediawiki...TimedMediaHandler)
J has uploaded a new change for review. https://gerrit.wikimedia.org/r/57286 Change subject: Allow registered users to reset transcodes .. Allow registered users to reset transcodes resetting transcodes is like an expensive purge, this should be available to normal users, that way users can retry failed encodes in case the error was transient. Change-Id: Ide9505fdcea13b96b55372a79ee588cc4c63a00e --- M TimedMediaHandler.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/86/57286/1 diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php index 5e6d4da..abd1a2b 100644 --- a/TimedMediaHandler.php +++ b/TimedMediaHandler.php @@ -48,6 +48,8 @@ // Which users can restart failed or expired transcode jobs: $wgGroupPermissions['sysop']['transcode-reset'] = true; +$wgGroupPermissions['user']['transcode-reset'] = true; + // Which users can see Special:TimedMediaHandler $wgGroupPermissions['sysop']['transcode-status'] = true; -- To view, visit https://gerrit.wikimedia.org/r/57286 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ide9505fdcea13b96b55372a79ee588cc4c63a00e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: J ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove spaces around :: - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove spaces around ::
..
Remove spaces around ::
Change-Id: I24fe5ad907bcf5235aa91b650785c571502456a1
---
M includes/api/ApiBase.php
M includes/api/ApiQueryCategories.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 84a6ed9..be913cf 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -445,7 +445,7 @@
$hintPipeSeparated = false;
break;
case 'limit':
- $desc .=
$paramPrefix . "No more than {$paramSettings[self :: PARAM_MAX]}";
+ $desc .=
$paramPrefix . "No more than {$paramSettings[self::PARAM_MAX]}";
if ( isset(
$paramSettings[self::PARAM_MAX2] ) ) {
$desc
.= " ({$paramSettings[self::PARAM_MAX2]} for bots)";
}
diff --git a/includes/api/ApiQueryCategories.php
b/includes/api/ApiQueryCategories.php
index 93ae61a..b2d3b1e 100644
--- a/includes/api/ApiQueryCategories.php
+++ b/includes/api/ApiQueryCategories.php
@@ -173,7 +173,7 @@
break;
}
- $titles[] = Title :: makeTitle( NS_CATEGORY,
$row->cl_to );
+ $titles[] = Title::makeTitle( NS_CATEGORY,
$row->cl_to );
}
$resultPageSet->populateFromTitles( $titles );
}
--
To view, visit https://gerrit.wikimedia.org/r/57277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24fe5ad907bcf5235aa91b650785c571502456a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Parent5446
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 wgUseMemCached, died in 1.17 - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: Remove wgUseMemCached, died in 1.17 .. Remove wgUseMemCached, died in 1.17 Change-Id: I0ab1def3cf8bf10b91b1a391df622ec2136f21e9 --- M wmf-config/mc-eqiad.php M wmf-config/mc-labs.php M wmf-config/mc-pmtpa.php 3 files changed, 0 insertions(+), 3 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved diff --git a/wmf-config/mc-eqiad.php b/wmf-config/mc-eqiad.php index fb51f61..65d95b8 100644 --- a/wmf-config/mc-eqiad.php +++ b/wmf-config/mc-eqiad.php @@ -3,7 +3,6 @@ $wgMainCacheType = 'memcached-pecl'; $wgMemCachedPersistent = false; -$wgUseMemCached = true; $wgMemCachedTimeout = 25; # default is 10 $wgMemCachedInstanceSize = 2000; diff --git a/wmf-config/mc-labs.php b/wmf-config/mc-labs.php index a6262cf..34116a2 100644 --- a/wmf-config/mc-labs.php +++ b/wmf-config/mc-labs.php @@ -14,7 +14,6 @@ * */ $wgMemCachedPersistent = true; -$wgUseMemCached = true; $wgMainCacheType = CACHE_MEMCACHED; $wgMemCachedTimeout = 50; # micro seconds $wgSessionsInMemcached = true; diff --git a/wmf-config/mc-pmtpa.php b/wmf-config/mc-pmtpa.php index 6cae5f7..2e8c596 100644 --- a/wmf-config/mc-pmtpa.php +++ b/wmf-config/mc-pmtpa.php @@ -3,7 +3,6 @@ $wgMainCacheType = 'memcached-pecl'; $wgMemCachedPersistent = false; -$wgUseMemCached = true; $wgMemCachedTimeout = 25; # default is 10 $wgMemCachedInstanceSize = 2000; -- To view, visit https://gerrit.wikimedia.org/r/57206 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ab1def3cf8bf10b91b1a391df622ec2136f21e9 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46489) Set wmgBabelCategoryNames for Ukrainian Wikinews - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: (bug 46489) Set wmgBabelCategoryNames for Ukrainian Wikinews .. (bug 46489) Set wmgBabelCategoryNames for Ukrainian Wikinews Change-Id: Ie8777cd7ccc09581b0d5137e8343184002fb0ddc --- M wmf-config/InitialiseSettings.php 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ea12210..129df7e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11547,6 +11547,15 @@ '5' => false, 'N' => 'User %code%-N', ), + 'ukwikinews' => array( + '0' => 'User %code%-0', + '1' => 'User %code%-1', + '2' => 'User %code%-2', + '3' => 'User %code%-3', + '4' => 'User %code%-4', + '5' => 'User %code%-5', + 'N' => 'User %code%-N', + ), // Bug 46489 'vowiktionary' => array( '0' => 'Geban %code%-0', '1' => 'Geban %code%-1', -- To view, visit https://gerrit.wikimedia.org/r/56420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8777cd7ccc09581b0d5137e8343184002fb0ddc Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46154) Override $wgGroupPermissions for thwiki Add abus... - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: (bug 46154) Override $wgGroupPermissions for thwiki Add abusefilter-log-detail and patrol for autoconfirmed on thwiki .. (bug 46154) Override $wgGroupPermissions for thwiki Add abusefilter-log-detail and patrol for autoconfirmed on thwiki Change-Id: I6ee327e79333788be0a99507deffad6ad3f4f14a --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 129df7e..7ba755b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7431,6 +7431,12 @@ 'upload' => true, ), ), + 'thwiki' => array( + 'autoconfirmed' => array( + 'abusefilter-log-detail' => true, // Bug 46154 + 'patrol' => true, // Bug 46154 + ), + ), 'trwiki' => array( 'autoreview' => array( 'autopatrol' => true, // Bug 38690 -- To view, visit https://gerrit.wikimedia.org/r/56564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ee327e79333788be0a99507deffad6ad3f4f14a Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45643) Add new user groups to urwiki with specific righ... - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged.
Change subject: (bug 45643) Add new user groups to urwiki with specific rights
Add abusefilter and rollbacker user groups, modify $wgAddGroups for crats and
sysops, modify $wgRemoveGroups for crats
..
(bug 45643) Add new user groups to urwiki with specific rights
Add abusefilter and rollbacker user groups, modify $wgAddGroups
for crats and sysops, modify $wgRemoveGroups for crats
Change-Id: I35e44b7a9d63fd4f0ed648fc2f85a0f549998ad5
---
M wmf-config/InitialiseSettings.php
M wmf-config/abusefilter.php
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Reedy: Verified; Looks good to me, approved
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 7ba755b..0245d89 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7492,6 +7492,9 @@
'ukwikimedia' => array(
'sysop' => array( 'importupload' => true ), //
https://bugzilla.wikimedia.org/show_bug.cgi?id=17167
),
+ 'urwiki' => array(
+ 'rollbacker' => array( 'rollback' => true ), // bug 45642
+ ),
'vecwiki' => array(
'flood' => array( 'bot' => true ),
),
@@ -7962,8 +7965,8 @@
'sysop' => array( 'autoeditor' ),
),
'+urwiki' => array(
- 'bureaucrat' => array( 'import', 'confirmed' ), // Bug 42737
- 'sysop' => array( 'confirmed' ), // Bug 42737
+ 'bureaucrat' => array( 'import', 'confirmed', 'abusefilter',
'rollbacker' ), // Bug 42737 and 45643
+ 'sysop' => array( 'confirmed', 'abusefilter', 'rollbacker' ),
// Bug 42737 and 45643
),
'+viwiki' => array(
'sysop' => array( 'rollbacker', 'flood' ),
@@ -8376,7 +8379,7 @@
'sysop' => array( 'autoeditor' ),
),
'+urwiki' => array(
- 'bureaucrat' => array( 'import', 'confirmed' ), // Bug 42737
+ 'bureaucrat' => array( 'import', 'confirmed', 'abusefilter',
'rollbacker' ), // Bug 42737 and 45643
'sysop' => array( 'confirmed' ), // Bug 42737
),
'+viwiki' => array(
diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index 73c8d04..f3f350c 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -280,4 +280,6 @@
} elseif ( $wgDBname == 'wikidatawiki' ) {
$wgAbuseFilterNotifications = "udp"; // bug 45083
$wgAbuseFilterNotificationsPrivate = true; // bug 45083
+} elseif ( $wgDBname == 'urwiki' ) {
+ $wgGroupPermissions['abusefilter']['abusefilter-modify'] = true; // bug
45643
}
--
To view, visit https://gerrit.wikimedia.org/r/56578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35e44b7a9d63fd4f0ed648fc2f85a0f549998ad5
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Document parser cache IPs in db files - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/57287 Change subject: Document parser cache IPs in db files .. Document parser cache IPs in db files Keep looking for IP addresses in the db file due to mysql errors Change-Id: Ia34a2e8112700031692015985315580c0ff42464 --- M wmf-config/db-eqiad.php M wmf-config/db-pmtpa.php 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/87/57287/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c01b462..65c93c5 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -9,6 +9,11 @@ #$wgReadOnly = "Wikimedia Sites are currently read-only during maintenance, please try again soon."; +// Parser cache - not configured in this file! +// '10.64.16.156' => 'pc1001' +// '10.64.16.157' => 'pc1002' +// '10.64.16.158' => 'pc1003' + $wmgOldExtTemplate = array( '10.64.0.25' => 1, # es1001 '10.64.16.40' => 1, # es1002 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index 372b2fc..86d93a7 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -9,6 +9,11 @@ #$wgReadOnly = "Wikimedia Sites are currently read-only during maintenance, please try again soon."; +// Parser cache - not configured in this file! +// '10.0.0.221' => 'pc1' +// '10.0.0.222' => 'pc2' +// '10.0.0.223' => 'pc3' + $wmgOldExtTemplate = array( '10.64.0.25' => 0, # es1001 '10.0.0.225' => 1, # es1, pmtpa master -- To view, visit https://gerrit.wikimedia.org/r/57287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia34a2e8112700031692015985315580c0ff42464 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] Document parser cache IPs in db files - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: Document parser cache IPs in db files .. Document parser cache IPs in db files Keep looking for IP addresses in the db file due to mysql errors Change-Id: Ia34a2e8112700031692015985315580c0ff42464 --- M wmf-config/db-eqiad.php M wmf-config/db-pmtpa.php 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c01b462..65c93c5 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -9,6 +9,11 @@ #$wgReadOnly = "Wikimedia Sites are currently read-only during maintenance, please try again soon."; +// Parser cache - not configured in this file! +// '10.64.16.156' => 'pc1001' +// '10.64.16.157' => 'pc1002' +// '10.64.16.158' => 'pc1003' + $wmgOldExtTemplate = array( '10.64.0.25' => 1, # es1001 '10.64.16.40' => 1, # es1002 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index 372b2fc..86d93a7 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -9,6 +9,11 @@ #$wgReadOnly = "Wikimedia Sites are currently read-only during maintenance, please try again soon."; +// Parser cache - not configured in this file! +// '10.0.0.221' => 'pc1' +// '10.0.0.222' => 'pc2' +// '10.0.0.223' => 'pc3' + $wmgOldExtTemplate = array( '10.64.0.25' => 0, # es1001 '10.0.0.225' => 1, # es1, pmtpa master -- To view, visit https://gerrit.wikimedia.org/r/57287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia34a2e8112700031692015985315580c0ff42464 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rubylint job template - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57288
Change subject: rubylint job template
..
rubylint job template
Ruby has two versions under Precise: 1.8 and 1.9.3 and they can have
some differences. The ruby-lint template is a parameterized jobs that
accept RUBY_BIN parameters (defaulting to 'ruby') which is then used as
the ruby interpreter to check syntax with.
For most jobs, we are probably never going to need to specify RUBY_BIN
though.
Change-Id: Ib714ad9d7242d0c19bc1a24af11f0e5bdbb7eb51
---
M job-templates.yaml
1 file changed, 27 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/88/57288/1
diff --git a/job-templates.yaml b/job-templates.yaml
index 57ca683..d3033d7 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -50,6 +50,33 @@
- checkstyle-xml
- phpcs
+# Run ruby syntax check against any file named '.rb' under the workspace.
+# The interpreter defaults to 'ruby' which can be overriden with the RUBY_BIN
+# job variable.
+- job-template:
+name: '{name}-rubylint'
+defaults: use-zuul
+
+triggers:
+ - zuul
+
+parameters:
+ - choice:
+name: RUBY_BIN
+choices:
+ - ruby
+ - ruby1.8
+ - ruby1.9.3
+description: "Ruby interpreter to uses for syntax checking"
+
+builders:
+ # The shell script makes sure we have a sane default for the $RUBY_BIN
+ # environement variable although Jenkins would use 'ruby' by default.
+ # Remember the string is passed to python str.format(), the curly braces
+ # thus need to be escaped by doubling them.
+ - shell: |
+find "$WORKSPACE" -name '*.rb' -exec ${{RUBY_BIN="ruby"}} -c {{}} \;
+
- job-template:
name: '{name}-yamllint'
--
To view, visit https://gerrit.wikimedia.org/r/57288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib714ad9d7242d0c19bc1a24af11f0e5bdbb7eb51
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] job qa-browsertests-rubylint - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57289
Change subject: job qa-browsertests-rubylint
..
job qa-browsertests-rubylint
qa/browsertests.git requires ruby 1.9, so pass it as a RUBY_BIN
parameter to make sure we properly syntax check the files.
Change-Id: I6015dbe287e7d11c0152e8859378d500bf4d1913
---
A qa.yaml
1 file changed, 8 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/89/57289/1
diff --git a/qa.yaml b/qa.yaml
new file mode 100644
index 000..8d553bb
--- /dev/null
+++ b/qa.yaml
@@ -0,0 +1,8 @@
+- project:
+name: 'qa-browsertests'
+gerrit-name: 'qa/browsertests'
+
+jobs:
+ - '{name}-rubylint':
+RUBY_BIN: 'ruby1.9.3'
+ - '{name}-yamllint'
--
To view, visit https://gerrit.wikimedia.org/r/57289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6015dbe287e7d11c0152e8859378d500bf4d1913
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trigger rubylint on qa/browsertests - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/57290 Change subject: trigger rubylint on qa/browsertests .. trigger rubylint on qa/browsertests Change-Id: I4cc93c5d6362150f59d9b66bbf16328b78c0dd40 --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/90/57290/1 diff --git a/layout.yaml b/layout.yaml index cd96bd8..76771c8 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2758,6 +2758,10 @@ gate-and-submit: - php-wmerrors-build + - name: qa/browsertests +check-voter: + - qa-browsertests-rubylint + - name: sartoris check: - sartoris-pep8 -- To view, visit https://gerrit.wikimedia.org/r/57290 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4cc93c5d6362150f59d9b66bbf16328b78c0dd40 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trigger rubylint on qa/browsertests - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: trigger rubylint on qa/browsertests .. trigger rubylint on qa/browsertests Change-Id: I4cc93c5d6362150f59d9b66bbf16328b78c0dd40 --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index cd96bd8..76771c8 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2758,6 +2758,10 @@ gate-and-submit: - php-wmerrors-build + - name: qa/browsertests +check-voter: + - qa-browsertests-rubylint + - name: sartoris check: - sartoris-pep8 -- To view, visit https://gerrit.wikimedia.org/r/57290 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4cc93c5d6362150f59d9b66bbf16328b78c0dd40 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] First step for sandbox feature - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57291
Change subject: First step for sandbox feature
..
First step for sandbox feature
Change-Id: I66f2028151bc407cbcb8242a6b035be1b2739f96
---
M Translate.i18n.php
M Translate.php
M _autoload.php
A tests/TranslateSandboxTest.php
A utils/TranslateSandbox.php
5 files changed, 188 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/91/57291/1
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 57f9648..cabf0aa 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -390,6 +390,10 @@
'logentry-translationreview-message' => '$1 {{GENDER:$2|accepted}}
translation $3',
'logentry-translationreview-group' => '$1 {{GENDER:$2|changed}} the
state of $4 translations of $3 from $6 to $7',
+ // The limit was increased at some point, but possible BC issue
+ 'group-translate-sandboxed' => 'Unapproved translators',
+ 'group-translate-sandboxed-member' => '{{GENDER:$1|unapproved
translator}}',
+
// The actual states, when set, come after the hyphen.
// The dangling hyphen hints that it's unset.
'translate-workflow-state-' => '(unset)',
diff --git a/Translate.php b/Translate.php
index c4924fc..4c72271 100644
--- a/Translate.php
+++ b/Translate.php
@@ -548,6 +548,24 @@
$wgTranslateYamlLibrary = 'spyc';
#
+# Sandbox
+#
+
+/**
+ * Whether to allow users to sign up via a sandbox. Sandboxed users cannot do
+ * much until approved and thus they can be get rid of easily.
+ * @since 2013-04
+ */
+$wgTranslateUseSandbox = false;
+
+/**
+ * To which group the translators are promoted. If left at false, they will
just
+ * be removed from sandbox and become normal users.
+ * @since 2013-04
+ */
+$wgTranslateSandboxPromotedGroup = false;
+
+#
# === Unsorted ===
#
/**
diff --git a/_autoload.php b/_autoload.php
index 5788ec1..ff73233 100644
--- a/_autoload.php
+++ b/_autoload.php
@@ -97,6 +97,7 @@
$wgAutoloadClasses['TranslatePreferences'] = "$dir/utils/UserToggles.php";
$wgAutoloadClasses['TranslateRcFilter'] = "$dir/utils/RcFilter.php";
$wgAutoloadClasses['TranslateRegistrationStats'] =
"$dir/specials/SpecialTranslationStats.php";
+$wgAutoloadClasses['TranslateSandbox'] = "$dir/utils/TranslateSandbox.php";
$wgAutoloadClasses['TranslateStatsOutput'] =
"$dir/scripts/groupStatistics.php";
$wgAutoloadClasses['TranslateToolbox'] = "$dir/utils/ToolBox.php";
$wgAutoloadClasses['TranslateYaml'] = "$dir/utils/TranslateYaml.php";
diff --git a/tests/TranslateSandboxTest.php b/tests/TranslateSandboxTest.php
new file mode 100644
index 000..8ba2334
--- /dev/null
+++ b/tests/TranslateSandboxTest.php
@@ -0,0 +1,75 @@
+setMwGlobals( array(
+ 'wgTranslateUseSandbox' => true,
+ 'wgTranslateSandboxPromotedGroup' => 'translator',
+ ) );
+ }
+
+ public function testAddUser() {
+ $user = TranslateSandbox::addUser( 'Test user',
't...@example.com', 'test password' );
+ $this->assertTrue( $user->isLoggedIn(), 'User exists' );
+
+ // Work around for https://bugzilla.wikimedia.org/46844
+ $groups = array_unique( $user->getGroups() );
+ $this->assertSame( array( 'translate-sandboxed' ), $groups,
'User is in the sandboxed group' );
+ }
+
+ public function testDeleteUser() {
+ $user = TranslateSandbox::addUser( 'Test user2',
't...@example.com', 'test password' );
+ TranslateSandbox::deleteUser( $user );
+ $this->assertFalse( $user->isLoggedIn(), 'User no longer
exists' );
+ }
+
+ /**
+* @expectedException MWException
+* @expectedExceptionMessage Not a sandboxed user
+*/
+ public function testDeleteUserPromoted() {
+ $user = TranslateSandbox::addUser( 'Test user3',
't...@example.com', 'test password' );
+ TranslateSandbox::promoteUser( $user );
+ TranslateSandbox::deleteUser( $user );
+ }
+
+ public function testGetUsers() {
+ $atStart = TranslateSandbox::getUsers()->count();
+
+ $user = TranslateSandbox::addUser( 'Test user4',
't...@example.com', 'test password' );
+
+
+ $this->assertEquals( $atStart + 1,
TranslateSandbox::getUsers()->count(), 'One sandboxed user created' );
+
+ TranslateSandbox::deleteUser( $user );
+ $this->assertEquals( $atStart,
TranslateSandbox::getUsers()->count(), 'No sandboxed users after deleted' );
+ }
+
+ public function testGetUsersPromotion() {
+ $atStart = TranslateSandbox::getUsers()->count();
+
+ $user = TranslateSandbox::addUser( 'Test user5',
't...@example.com', 'test password' );
+ $this->as
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (qa/browsertests)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/57292 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I8e00f1e75e86705da22283a729cfcce63458508a --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/92/57292/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/57292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e00f1e75e86705da22283a729cfcce63458508a Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (minor) removed commented out stuff from selenium test - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57293
Change subject: (minor) removed commented out stuff from selenium test
..
(minor) removed commented out stuff from selenium test
Change-Id: I3447e77147b67801273795116357bee6c45ca69e
---
M repo/tests/selenium/statements/statements_deleted_prop_spec.rb
1 file changed, 2 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/93/57293/1
diff --git a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb
b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb
index 41b9eac..38184d2 100644
--- a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb
+++ b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb
@@ -71,8 +71,6 @@
page.navigate_to items[0]["url"]
page.wait_for_entity_to_load
page.add_statement(properties_cm[0]["label"], cm_string)
-# TODO: refresh needed because of bug 44101 & bug 44547
-#@browser.refresh
page.add_reference_to_first_claim(properties_cm[0]["label"], cm_string)
page.statement1Name.should == properties_cm[0]["label"]
page.statement1ClaimValue1.should == cm_string
@@ -152,23 +150,12 @@
page.statement1Name.should_not == properties_item[0]["label"]
page.statement1Name.include?(properties_item[0]["id"]).should be_true
page.statement1Name.include?("Deleted property").should be_true
-# TODO: there's still a bug in the UI showing the referenced item as
"deleted": bug 45904
-#page.editFirstStatement
-#page.statementValueInput.should == cm_string
-#page.statementValueInput_element.clear
-#page.statementValueInput = items[0]["label"]
-#page.saveStatement
-#ajax_wait
-#page.wbErrorDiv?.should be_true
-#page.cancelStatement
+
page.toggle_reference_section
page.reference1Property.should_not == properties_item[0]["label"]
page.reference1Property.include?(properties_item[0]["id"]).should
be_true
page.reference1Property.include?("Deleted property").should be_true
-# TODO: there's still a bug in the UI showing the referenced item as
"deleted": bug 45904
-#page.reference1ValueLink?.should be_false
-#page.editReference1
-#page.referenceValueInput.should == cm_string
+
# TODO: should it be allowed to edit a reference whose property was
deleted?
#page.referenceValueInput_element.clear
#page.referenceValueInput = "changed"
--
To view, visit https://gerrit.wikimedia.org/r/57293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3447e77147b67801273795116357bee6c45ca69e
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] (minor) removed commented out stuff from selenium test - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (minor) removed commented out stuff from selenium test
..
(minor) removed commented out stuff from selenium test
Change-Id: I3447e77147b67801273795116357bee6c45ca69e
---
M repo/tests/selenium/statements/statements_deleted_prop_spec.rb
1 file changed, 2 insertions(+), 15 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb
b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb
index 41b9eac..38184d2 100644
--- a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb
+++ b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb
@@ -71,8 +71,6 @@
page.navigate_to items[0]["url"]
page.wait_for_entity_to_load
page.add_statement(properties_cm[0]["label"], cm_string)
-# TODO: refresh needed because of bug 44101 & bug 44547
-#@browser.refresh
page.add_reference_to_first_claim(properties_cm[0]["label"], cm_string)
page.statement1Name.should == properties_cm[0]["label"]
page.statement1ClaimValue1.should == cm_string
@@ -152,23 +150,12 @@
page.statement1Name.should_not == properties_item[0]["label"]
page.statement1Name.include?(properties_item[0]["id"]).should be_true
page.statement1Name.include?("Deleted property").should be_true
-# TODO: there's still a bug in the UI showing the referenced item as
"deleted": bug 45904
-#page.editFirstStatement
-#page.statementValueInput.should == cm_string
-#page.statementValueInput_element.clear
-#page.statementValueInput = items[0]["label"]
-#page.saveStatement
-#ajax_wait
-#page.wbErrorDiv?.should be_true
-#page.cancelStatement
+
page.toggle_reference_section
page.reference1Property.should_not == properties_item[0]["label"]
page.reference1Property.include?(properties_item[0]["id"]).should
be_true
page.reference1Property.include?("Deleted property").should be_true
-# TODO: there's still a bug in the UI showing the referenced item as
"deleted": bug 45904
-#page.reference1ValueLink?.should be_false
-#page.editReference1
-#page.referenceValueInput.should == cm_string
+
# TODO: should it be allowed to edit a reference whose property was
deleted?
#page.referenceValueInput_element.clear
#page.referenceValueInput = "changed"
--
To view, visit https://gerrit.wikimedia.org/r/57293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3447e77147b67801273795116357bee6c45ca69e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher
Gerrit-Reviewer: Tobias Gritschacher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove second parameter from TranslateUtils::getLanguageName() - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove second parameter from TranslateUtils::getLanguageName()
..
Remove second parameter from TranslateUtils::getLanguageName()
Was marked as a code path to be deprecated. Also checked TranslateSVG,
TranslationNotifications and CentralNotice for possible usages.
Change-Id: Icf216db16f46c4d6c4cc9862814397e43f3b310f
---
M TranslateEditAddons.php
M TranslateUtils.php
M ffs/DtdFFS.php
M ffs/FlatPhpFFS.php
M ffs/GettextFFS.php
M ffs/JavaFFS.php
M ffs/JavaScriptFFS.php
M ffs/MediaWikiExtensionFFS.php
M ffs/Simple.php
M ffs/YamlFFS.php
M specials/SpecialLanguageStats.php
M specials/SpecialSearchTranslations.php
M specials/SpecialTranslationStats.php
M specials/SpecialTranslations.php
M tag/PageTranslationHooks.php
M tag/PageTranslationLogFormatter.php
M utils/MessageWebImporter.php
M utils/TranslateLogFormatter.php
M utils/TranslationHelpers.php
19 files changed, 21 insertions(+), 27 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslateEditAddons.php b/TranslateEditAddons.php
index 5c59f7f..44874cb 100644
--- a/TranslateEditAddons.php
+++ b/TranslateEditAddons.php
@@ -203,7 +203,7 @@
if ( $handle->isDoc() ) {
$langCode = $context->getLanguage()->getCode();
- $name = TranslateUtils::getLanguageName(
$handle->getCode(), false, $langCode );
+ $name = TranslateUtils::getLanguageName(
$handle->getCode(), $langCode );
$accessKey = $context->msg( 'accesskey-save' )->plain();
$temp = array(
'id' => 'wpSave',
diff --git a/TranslateUtils.php b/TranslateUtils.php
index f655dc3..b4ce2f3 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -138,17 +138,11 @@
/**
* Returns a localised language name.
* @param string $code Language code.
-* @param bool|string $native Use only native names.
* @param string $language Language code of language the the name
should be in.
* @return string Best-effort localisation of wanted language name.
*/
- public static function getLanguageName( $code, $native = false,
$language = 'en' ) {
- if ( $native ) {
- // TODO: deprecate this code path
- $languages = Language::getLanguageNames( false );
- } else {
- $languages = TranslateUtils::getLanguageNames(
$language );
- }
+ public static function getLanguageName( $code, $language = 'en' ) {
+ $languages = TranslateUtils::getLanguageNames( $language );
if ( isset( $languages[$code] ) ) {
return $languages[$code];
diff --git a/ffs/DtdFFS.php b/ffs/DtdFFS.php
index 6c73720..e437f73 100644
--- a/ffs/DtdFFS.php
+++ b/ffs/DtdFFS.php
@@ -85,7 +85,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
$output = "# Messages for $name ($native)\n";
$output .= "# Exported from $wgSitename\n\n";
diff --git a/ffs/FlatPhpFFS.php b/ffs/FlatPhpFFS.php
index 5d47bc8..75852e4 100644
--- a/ffs/FlatPhpFFS.php
+++ b/ffs/FlatPhpFFS.php
@@ -84,7 +84,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
if ( $wgTranslateDocumentationLanguageCode ) {
$docu = "\n * See the
$wgTranslateDocumentationLanguageCode 'language' for message documentation
incl. usage of parameters";
diff --git a/ffs/GettextFFS.php b/ffs/GettextFFS.php
index 5e1b07f..bcdda15 100644
--- a/ffs/GettextFFS.php
+++ b/ffs/GettextFFS.php
@@ -376,7 +376,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
$authors = $this->doAuthors( $collection );
if ( isset( $this->extra['header'] ) ) {
$extra = "# --\n" . $this->extra['header'];
diff --git a/ffs/JavaFFS.php b/ffs/JavaFFS.php
index f291a28..140c6f8 100644
--- a/ffs/JavaFFS.php
+++ b/ffs/JavaFFS.php
@@ -216,7 +216,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::g
[MediaWiki-commits] [Gerrit] Disable Tomasz's account - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57294
Change subject: Disable Tomasz's account
..
Disable Tomasz's account
Change-Id: I9388b1a080d1bb17b7b66a3673651c616dfb7c86
---
M manifests/admins.pp
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/57294/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 5c4b798..cec5c6e 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1174,6 +1174,7 @@
$username = "tfinc"
$realname = "Tomasz Finc"
$uid = 2006
+ $enabled = "false"
unixaccount { $realname: username => $username, uid => $uid,
gid => $gid }
@@ -1181,13 +1182,13 @@
Ssh_authorized_key { require => Unixaccount[$realname] }
ssh_authorized_key { "tomasz@scratch":
- ensure => present,
+ ensure => absent,
user=> $username,
type=> "ssh-dss",
key =>
"B3NzaC1kc3MAAACBAME+XGr43e1N0iWu7qmC2Do/mGBoWEGrSObLXk6Fll9+WJ9nRNHvmQAkEUexWEQaolI+ItWFEAVU/j9pO10MvF4YcGQSGcUEbsQD50W91P3+T/ojnP6bhjI2/aX4HAg6bk0Sq2ckYNpu4owJdhDnTHNk3luptOSwVLnJ92Nm9S7JFQD7L3zwmi9owkB+HhHxzqgwWAB7LQAAAIAOTsZLkm8nfbqMF0QRWKCb4NU7spftTiFLgVNiq1nQcSA69krEzZPi17vOfJ1a1iMWJL1zKHZhIxbXimDxMAwKS45WU2RxfMbtZw70dAK4AW635yb5riIyuc94NwmhquRypPcGUQKN+/mhxB+NDs8AG32iQjVD5e7M+fczfLsRfIBoRL51kK9c36OMcrzOJVR8J9b6bkV/AclSQmlNzm2b3armXf9w2OlifqobOpoJL2PG8HWKd7QAqv7PvON20HErNDBMCYhfRmX/Bn4WcWgZzq5y5I66rGs86nqyycbWAFbz/Yd+zq6P1z/LpzXnGsy8j8CAJGQ8c2tXvNGhHToHtA=="
}
ssh_authorized_key { "tomasz@wmf-barry":
- ensure => present,
+ ensure => absent,
user=> $username,
type=> "ssh-rsa",
key =>
"B3NzaC1yc2EBIwAAAQEAxk8Zks1Z1qsFhu7CmcYC8474ikLmDVXXLqeC2ekBznIsdX2/1IPaYIZp8w4G8M2X1InMOqQswCqTfvQFuMOFWxJvTQXxZOJUC8L2El1xB7t4O7mvDXw8uq1h20L7ODsLkFga3M7W7IIg3pU12HS1UAInYDQt0SCXtLaTbPQpgP8H0XNZhn/I3P/NVQnaUx00YzrS9ZojNbwEHB8cUpwp2N/gfv/byTTe48Xaq3wlAxw/QTow5G+r3atEOVJ0QKGztl+uScF/ZzP8QYficdMP7aNffg9aQhf/uER10hXu2F16UZQyoMx/sFkS2U8ZNVkCKLhI7MKti7+ZGz4/+fcCOw=="
--
To view, visit https://gerrit.wikimedia.org/r/57294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9388b1a080d1bb17b7b66a3673651c616dfb7c86
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attempt to keep 20% SSD space free - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57295
Change subject: Attempt to keep 20% SSD space free
..
Attempt to keep 20% SSD space free
Change-Id: I0ecc9817095bed3918a496d6ca65ecd461628713
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/57295/1
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index 2f5509d..9c19486 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -5,7 +5,7 @@
# * layout:
# - / : ext3, RAID1, 10GB
# - swap: RAID1, 1GB
-# - the rest of each respective disk (no RAID) formatted as xfs,
+# - 80% of the rest of each respective disk (no RAID) formatted as xfs,
# to be used by Varnish
d-ipartman-auto/method string raid
@@ -24,10 +24,12 @@
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 500 -1 xfs \
+ 100 500 10 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
+ 100 500 2 linux-swap \
+ method { keep } \
.
# Parameters are:
--
To view, visit https://gerrit.wikimedia.org/r/57295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ecc9817095bed3918a496d6ca65ecd461628713
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update PHPDoc - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Update PHPDoc
..
Update PHPDoc
Change-Id: I89407c090d60e929d58e32acd764b062269018f4
---
M specials/SpecialMagic.php
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/SpecialMagic.php b/specials/SpecialMagic.php
index 6380096..7cc82a2 100644
--- a/specials/SpecialMagic.php
+++ b/specials/SpecialMagic.php
@@ -16,7 +16,6 @@
* @ingroup SpecialPage TranslateSpecialPage
*/
class SpecialMagic extends SpecialPage {
-
const MODULE_MAGIC = 'words';
const MODULE_SPECIAL = 'special';
const MODULE_NAMESPACE = 'namespace';
@@ -84,8 +83,8 @@
/**
* Helper function get module selector.
*
-* @param $selectedId \string Which value should be selected by default
-* @return \string HTML5-compatible select-element.
+* @param string $selectedId Which value should be selected by default
+* @return string HTML5-compatible select-element.
*/
protected function moduleSelector( $selectedId ) {
// Give grep a chance to find the usages:
--
To view, visit https://gerrit.wikimedia.org/r/57059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89407c090d60e929d58e32acd764b062269018f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid a division by zero possibility - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid a division by zero possibility
..
Avoid a division by zero possibility
$total is used as a denominator in the else condition
Change-Id: I50894bd2c155fa80855f5811c36c997fa2a8b2b2
---
M utils/StatsBar.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/utils/StatsBar.php b/utils/StatsBar.php
index 31b84ea..7ec1d28 100644
--- a/utils/StatsBar.php
+++ b/utils/StatsBar.php
@@ -45,7 +45,7 @@
$translated = $this->stats[MessageGroupStats::TRANSLATED];
$fuzzy = $this->stats[MessageGroupStats::FUZZY];
- if ( $total === null ) {
+ if ( !$total ) {
$untranslated = null;
$wproofread = $wtranslated = $wfuzzy = $wuntranslated =
0;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/57264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50894bd2c155fa80855f5811c36c997fa2a8b2b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attempt to keep 20% SSD space free - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Attempt to keep 20% SSD space free
..
Attempt to keep 20% SSD space free
Change-Id: I0ecc9817095bed3918a496d6ca65ecd461628713
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index 2f5509d..d8295b7 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -5,7 +5,7 @@
# * layout:
# - / : ext3, RAID1, 10GB
# - swap: RAID1, 1GB
-# - the rest of each respective disk (no RAID) formatted as xfs,
+# - 80% of the rest of each respective disk (no RAID) formatted as xfs,
# to be used by Varnish
d-ipartman-auto/method string raid
@@ -24,10 +24,12 @@
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 500 -1 xfs \
+ 100 500 10 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
+ 100 500 2 linux-swap \
+ method{ keep } \
.
# Parameters are:
--
To view, visit https://gerrit.wikimedia.org/r/57295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ecc9817095bed3918a496d6ca65ecd461628713
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CSS fixes to better accommodate buttons - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: CSS fixes to better accommodate buttons
..
CSS fixes to better accommodate buttons
CSS has been modified to:
* Reduce the excessive padding that made button labels goto a new line before
it is needed.
* Increase the height of buttons so that they don't look broken when text
requires a second line.
* Adjust the width of view buttons to better fit their length.
Bug: 46065
Change-Id: I01b329dbd20da828c9d32994bbd1ef3100413ca6
---
M resources/css/ext.translate.messagetable.css
1 file changed, 17 insertions(+), 3 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.translate.messagetable.css
b/resources/css/ext.translate.messagetable.css
index 68dee9d..7d0d209 100644
--- a/resources/css/ext.translate.messagetable.css
+++ b/resources/css/ext.translate.messagetable.css
@@ -203,13 +203,14 @@
}
.tux-action-bar .toggle.button {
- height: 35px;
- font-size: 15px;
+ height: 40px;
+ font-size: 14px;
vertical-align: middle;
border-radius: 0;
text-shadow: none;
margin: 0;
text-indent: 0;
+ padding: 0 6px;
}
.tux-action-bar .tux-view-switcher {
@@ -217,7 +218,7 @@
}
.tux-action-bar .tux-view-switcher .toggle.button {
- width: 33%;
+ padding: 0 2px 0 0;
}
.tux-action-bar .tux-view-switcher .toggle.button:first-child {
@@ -238,6 +239,10 @@
vertical-align: bottom;
}
+.tux-action-bar .translate-mode-button {
+ width: 30%;
+}
+
.tux-action-bar .translate-mode-button:before {
background: transparent url(../images/view-list.png) center center
no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-list.svg);
@@ -252,6 +257,10 @@
background-image: linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
}
+.tux-action-bar .page-mode-button {
+ width: 30%;
+}
+
.tux-action-bar .page-mode-button:before {
background: transparent url(../images/view-page.png) center center
no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-page.svg);
@@ -266,6 +275,11 @@
background-image: linear-gradient(transparent, transparent),
url(../images/view-page-hi.svg);
}
+
+.tux-action-bar .tux-proofread-button {
+ width: 36%;
+}
+
.tux-action-bar .tux-proofread-button:before {
background: transparent url(../images/view-proofread.png) center center
no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-proofread.svg);
--
To view, visit https://gerrit.wikimedia.org/r/57265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01b329dbd20da828c9d32994bbd1ef3100413ca6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Pginer
Gerrit-Reviewer: Amire80
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 up pf_localurl, implement pf_servername and pf_server. - change (mediawiki...Parsoid)
Subramanya Sastry has submitted this change and it was merged.
Change subject: Fix up pf_localurl, implement pf_servername and pf_server.
..
Fix up pf_localurl, implement pf_servername and pf_server.
This just helps reduce noise in parsertests, and exposes some tests which
were failing because {{SERVER}} wasn't found -- but should be failing for
other reasons (for example: bugzilla 46826).
Change-Id: I035bfcd84bc9f8fd7079a1179c1cc0d013ca0a88
---
M js/lib/ext.core.ParserFunctions.js
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
Subramanya Sastry: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/js/lib/ext.core.ParserFunctions.js
b/js/lib/ext.core.ParserFunctions.js
index 9ff14a2..40e5eba 100644
--- a/js/lib/ext.core.ParserFunctions.js
+++ b/js/lib/ext.core.ParserFunctions.js
@@ -650,7 +650,7 @@
console.trace();
throw( err );
}
- cb({ tokens: [ '/' +
+ cb({ tokens: [
// FIXME! Figure out correct prefix to
use
//this.env.conf.wiki.wgScriptPath +
env.conf.wiki.script + '?title=' +
@@ -771,6 +771,22 @@
ParserFunctions.prototype.pf_scriptpath = function ( token, frame, cb, args ) {
cb( { tokens: [this.env.conf.wiki.wgScriptPath] } );
};
+ParserFunctions.prototype.pf_server = function ( token, frame, cb, args ) {
+ var dataAttribs = Util.clone(token.dataAttribs);
+ cb( { tokens: [
+ new TagTk('a', [
+ new KV('rel', 'nofollow'),
+ new KV('class', 'external free'),
+ new KV('href', this.env.conf.wiki.server),
+ new KV('typeof', 'mw:ExtLink/URL')
+ ], dataAttribs),
+ this.env.conf.wiki.server,
+ new EndTagTk('a')
+ ] } );
+};
+ParserFunctions.prototype.pf_servername = function ( token, frame, cb, args ) {
+ cb( { tokens: [this.env.conf.wiki.server.replace(/^https?:\/\//,'')] }
);
+};
ParserFunctions.prototype.pf_talkpagename = function ( token, frame, cb, args
) {
cb( { tokens: [this.env.page.name.replace(/^[^:]:/, 'Talk:' ) || ''] }
);
};
--
To view, visit https://gerrit.wikimedia.org/r/50623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I035bfcd84bc9f8fd7079a1179c1cc0d013ca0a88
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: install ruby1.9.3 - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/57296 Change subject: contint: install ruby1.9.3 .. contint: install ruby1.9.3 The qa/browsertests.git repository requires ruby 1.9+, to be able to syntax check the ruby scripts there, we need ruby 1.9.3 to be installed on the continuous integration box. Change-Id: I91a1e957cc1fb395dd145a13374350cff7ad52e2 --- M modules/contint/manifests/packages.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/96/57296/1 diff --git a/modules/contint/manifests/packages.pp b/modules/contint/manifests/packages.pp index 55698bb..4f6e8a8 100644 --- a/modules/contint/manifests/packages.pp +++ b/modules/contint/manifests/packages.pp @@ -53,6 +53,7 @@ 'asciidoc', 'rake', +'ruby1.9.3', # To let us syntax check scripts using 1.9 'pep8', 'pyflakes', -- To view, visit https://gerrit.wikimedia.org/r/57296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91a1e957cc1fb395dd145a13374350cff7ad52e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] qa/browsertests needs ruby lint 1.9+ - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/57297 Change subject: qa/browsertests needs ruby lint 1.9+ .. qa/browsertests needs ruby lint 1.9+ Change-Id: Ic603968c4a054d35d7e2e76ca6c4c47d14ca --- M layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/97/57297/1 diff --git a/layout.yaml b/layout.yaml index 76771c8..585970d 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2760,7 +2760,7 @@ - name: qa/browsertests check-voter: - - qa-browsertests-rubylint + - qa-browsertests-ruby1.9.3lint - name: sartoris check: -- To view, visit https://gerrit.wikimedia.org/r/57297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic603968c4a054d35d7e2e76ca6c4c47d14ca Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: install ruby1.9.3 - change (operations/puppet)
Faidon has submitted this change and it was merged. Change subject: contint: install ruby1.9.3 .. contint: install ruby1.9.3 The qa/browsertests.git repository requires ruby 1.9+, to be able to syntax check the ruby scripts there, we need ruby 1.9.3 to be installed on the continuous integration box. Change-Id: I91a1e957cc1fb395dd145a13374350cff7ad52e2 --- M modules/contint/manifests/packages.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/contint/manifests/packages.pp b/modules/contint/manifests/packages.pp index 55698bb..4f6e8a8 100644 --- a/modules/contint/manifests/packages.pp +++ b/modules/contint/manifests/packages.pp @@ -53,6 +53,7 @@ 'asciidoc', 'rake', +'ruby1.9.3', # To let us syntax check scripts using 1.9 'pep8', 'pyflakes', -- To view, visit https://gerrit.wikimedia.org/r/57296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91a1e957cc1fb395dd145a13374350cff7ad52e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar Gerrit-Reviewer: Faidon Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] qa/browsertests needs ruby lint 1.9+ - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: qa/browsertests needs ruby lint 1.9+ .. qa/browsertests needs ruby lint 1.9+ Change-Id: Ic603968c4a054d35d7e2e76ca6c4c47d14ca --- M layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 76771c8..585970d 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2760,7 +2760,7 @@ - name: qa/browsertests check-voter: - - qa-browsertests-rubylint + - qa-browsertests-ruby1.9.3lint - name: sartoris check: -- To view, visit https://gerrit.wikimedia.org/r/57297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic603968c4a054d35d7e2e76ca6c4c47d14ca Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rubylint job templates - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: rubylint job templates
..
rubylint job templates
Ruby has two versions under Precise: 1.8 and 1.9.3 and they can have
some differences. The ruby-lint macro thus ruby-lint macro thus accept
an 'interpreter' parameter which must be used to specify the ruby
command to use.
Change-Id: Ib714ad9d7242d0c19bc1a24af11f0e5bdbb7eb51
---
M job-templates.yaml
M macro.yaml
2 files changed, 41 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job-templates.yaml b/job-templates.yaml
index 57ca683..0ff8172 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -51,6 +51,39 @@
- phpcs
- job-template:
+name: '{name}-rubylint'
+defaults: use-zuul
+
+triggers:
+ - zuul
+
+builders:
+ - ruby-lint:
+interpreter: 'ruby'
+
+- job-template:
+name: '{name}-ruby1.8lint'
+defaults: use-zuul
+
+triggers:
+ - zuul
+
+builders:
+ - ruby-lint:
+interpreter: 'ruby1.8'
+
+- job-template:
+name: '{name}-ruby1.9.3lint'
+defaults: use-zuul
+
+triggers:
+ - zuul
+
+builders:
+ - ruby-lint:
+interpreter: 'ruby1.9.3'
+
+- job-template:
name: '{name}-yamllint'
defaults: use-zuul
diff --git a/macro.yaml b/macro.yaml
index 8105afa..2507ba4 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -246,6 +246,14 @@
make
make test
+# Run ruby syntax check against any file named '.rb' under the workspace.
+# The ruby interpreter is passed using 'interpreter'
+- builder:
+name: ruby-lint
+builders:
+ - shell: |
+find "$WORKSPACE" -type f -name '*.rb' -print0 | xargs -t -n1 -0
{interpreter} -c
+
- builder:
name: yaml-lint
builders:
--
To view, visit https://gerrit.wikimedia.org/r/57288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib714ad9d7242d0c19bc1a24af11f0e5bdbb7eb51
Gerrit-PatchSet: 4
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] job qa-browsertests-rubylint - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: job qa-browsertests-rubylint
..
job qa-browsertests-rubylint
qa/browsertests.git requires ruby 1.9.
Change-Id: I6015dbe287e7d11c0152e8859378d500bf4d1913
---
A qa.yaml
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/qa.yaml b/qa.yaml
new file mode 100644
index 000..70f6fd3
--- /dev/null
+++ b/qa.yaml
@@ -0,0 +1,7 @@
+- project:
+name: 'qa-browsertests'
+gerrit-name: 'qa/browsertests'
+
+jobs:
+ - '{name}-ruby1.9.3lint'
+ - '{name}-yamllint'
--
To view, visit https://gerrit.wikimedia.org/r/57289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6015dbe287e7d11c0152e8859378d500bf4d1913
Gerrit-PatchSet: 4
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rsyncing API logs from emery to stat1 - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57298
Change subject: Rsyncing API logs from emery to stat1
..
Rsyncing API logs from emery to stat1
Change-Id: I5f3206e084efb360a0bd43638e2e886488cfd4b8
---
M manifests/misc/statistics.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/57298/1
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index dbb8bab..c75de32 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -573,6 +573,12 @@
destination => "/a/squid/archive/zero",
}
+ # API logs from emery
+ misc::statistics::rsync_job { "api":
+ source =>
"emery.wikimedia.org::udp2log/archive/api-usage*.gz",
+ destination => "/a/squid/archive/api",
+ }
+
# teahouse logs from emery
misc::statistics::rsync_job { "teahouse":
source =>
"emery.wikimedia.org::udp2log/archive/teahouse*.gz",
--
To view, visit https://gerrit.wikimedia.org/r/57298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f3206e084efb360a0bd43638e2e886488cfd4b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rsyncing API logs from emery to stat1 - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Rsyncing API logs from emery to stat1
..
Rsyncing API logs from emery to stat1
Change-Id: I5f3206e084efb360a0bd43638e2e886488cfd4b8
---
M manifests/misc/statistics.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index dbb8bab..c75de32 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -573,6 +573,12 @@
destination => "/a/squid/archive/zero",
}
+ # API logs from emery
+ misc::statistics::rsync_job { "api":
+ source =>
"emery.wikimedia.org::udp2log/archive/api-usage*.gz",
+ destination => "/a/squid/archive/api",
+ }
+
# teahouse logs from emery
misc::statistics::rsync_job { "teahouse":
source =>
"emery.wikimedia.org::udp2log/archive/teahouse*.gz",
--
To view, visit https://gerrit.wikimedia.org/r/57298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f3206e084efb360a0bd43638e2e886488cfd4b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lint translatewiki YAML files - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57299
Change subject: lint translatewiki YAML files
..
lint translatewiki YAML files
Requested by Siebrand 8-)
Change-Id: I0b9bf7fb97bff6c9803ca4cae2ffb6fd7840a128
---
M translatewiki.yaml
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/99/57299/1
diff --git a/translatewiki.yaml b/translatewiki.yaml
index 5ad7b6e..bbb1cc0 100644
--- a/translatewiki.yaml
+++ b/translatewiki.yaml
@@ -35,3 +35,4 @@
jobs:
- translatewiki-jobs
- '{name}-phplint'
+ - '{name}-yamllint'
--
To view, visit https://gerrit.wikimedia.org/r/57299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b9bf7fb97bff6c9803ca4cae2ffb6fd7840a128
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lint translatewiki YAML files - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: lint translatewiki YAML files
..
lint translatewiki YAML files
Requested by Siebrand 8-)
Change-Id: I0b9bf7fb97bff6c9803ca4cae2ffb6fd7840a128
---
M translatewiki.yaml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/translatewiki.yaml b/translatewiki.yaml
index 5ad7b6e..bbb1cc0 100644
--- a/translatewiki.yaml
+++ b/translatewiki.yaml
@@ -35,3 +35,4 @@
jobs:
- translatewiki-jobs
- '{name}-phplint'
+ - '{name}-yamllint'
--
To view, visit https://gerrit.wikimedia.org/r/57299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b9bf7fb97bff6c9803ca4cae2ffb6fd7840a128
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trigger translatewiki-yamllint (non voting) - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/57300 Change subject: trigger translatewiki-yamllint (non voting) .. trigger translatewiki-yamllint (non voting) Change-Id: I9dd7714a002a328ea84e6959c7256a905d74645e --- M layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/00/57300/1 diff --git a/layout.yaml b/layout.yaml index 585970d..536285b 100644 --- a/layout.yaml +++ b/layout.yaml @@ -355,6 +355,10 @@ - name: ^parsoid-server-sanity-check$ voting: false + # Lot of YAML files still fails the python linter. + - name: translatewiki-yamllint +voting: false + # Register the Gerrit project name, apply them pipelines that in turn trigger # a set of jobs. projects: @@ -526,10 +530,12 @@ - translatewiki-phplint - translatewiki-puppet-validate - translatewiki-shelllint + - translatewiki-yamllint gate-and-submit: - translatewiki-phplint - translatewiki-puppet-validate - translatewiki-shelllint + - translatewiki-yamllint - name: wikimedia/bugzilla/wikibugs # Only lint on submission for now, that will be voting -- To view, visit https://gerrit.wikimedia.org/r/57300 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9dd7714a002a328ea84e6959c7256a905d74645e Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trigger translatewiki-yamllint (non voting) - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: trigger translatewiki-yamllint (non voting) .. trigger translatewiki-yamllint (non voting) Change-Id: I9dd7714a002a328ea84e6959c7256a905d74645e --- M layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 585970d..536285b 100644 --- a/layout.yaml +++ b/layout.yaml @@ -355,6 +355,10 @@ - name: ^parsoid-server-sanity-check$ voting: false + # Lot of YAML files still fails the python linter. + - name: translatewiki-yamllint +voting: false + # Register the Gerrit project name, apply them pipelines that in turn trigger # a set of jobs. projects: @@ -526,10 +530,12 @@ - translatewiki-phplint - translatewiki-puppet-validate - translatewiki-shelllint + - translatewiki-yamllint gate-and-submit: - translatewiki-phplint - translatewiki-puppet-validate - translatewiki-shelllint + - translatewiki-yamllint - name: wikimedia/bugzilla/wikibugs # Only lint on submission for now, that will be voting -- To view, visit https://gerrit.wikimedia.org/r/57300 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9dd7714a002a328ea84e6959c7256a905d74645e Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the empty partition a primary - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57301
Change subject: Make the empty partition a primary
..
Make the empty partition a primary
Change-Id: I28f1a019efd1af3a56273e4a09983ec27c92b6ce
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/57301/1
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index d8295b7..d1ee6ce 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -29,7 +29,7 @@
format{ } use_filesystem{ } \
filesystem{ xfs } \
100 500 2 linux-swap \
- method{ keep } \
+ $primary{ } method{ keep } \
.
# Parameters are:
--
To view, visit https://gerrit.wikimedia.org/r/57301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28f1a019efd1af3a56273e4a09983ec27c92b6ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the empty partition a primary - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Make the empty partition a primary
..
Make the empty partition a primary
Change-Id: I28f1a019efd1af3a56273e4a09983ec27c92b6ce
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index d8295b7..d1ee6ce 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -29,7 +29,7 @@
format{ } use_filesystem{ } \
filesystem{ xfs } \
100 500 2 linux-swap \
- method{ keep } \
+ $primary{ } method{ keep } \
.
# Parameters are:
--
To view, visit https://gerrit.wikimedia.org/r/57301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28f1a019efd1af3a56273e4a09983ec27c92b6ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
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-wm now sends translatewiki notif to #mediawiki-i18n - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57302
Change subject: gerrit-wm now sends translatewiki notif to #mediawiki-i18n
..
gerrit-wm now sends translatewiki notif to #mediawiki-i18n
* registers gerrit::ircbot to join #mediawiki-i18n, relaying content in
mediawiki-i18n.log
* make translatewiki and any future translatewiki/* repositories to use
mediawiki-i18n.log
* updated tests
Test plan:
$ cd files/gerrit/hooks
$ python hookhelper_test.py
--
Ran 16 tests in 0.003s
OK
$
Change-Id: I5dc98959b3e06728838239e57a56e4c27f49092d
---
M files/gerrit/hooks/hookhelper_test.py
M manifests/gerrit.pp
M templates/gerrit/hookconfig.py.erb
3 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/57302/1
diff --git a/files/gerrit/hooks/hookhelper_test.py
b/files/gerrit/hooks/hookhelper_test.py
index ff25fc1..0fc7c2b 100644
--- a/files/gerrit/hooks/hookhelper_test.py
+++ b/files/gerrit/hooks/hookhelper_test.py
@@ -124,5 +124,11 @@
self.assertLogFile('wikimedia-dev.log',
'qa/browsertests')
+def test_twn_to_mediawiki_i18n(self):
+self.assertLogFile('mediawiki-i18n.log',
+'translatewiki')
+self.assertLogFile('mediawiki-i18n.log',
+'translatewiki/futureproject')
+
if __name__ == '__main__':
unittest.main()
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 6d9dfa5..fbb5e5a 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -343,6 +343,7 @@
"${ircecho_logbase}/parsoid.log" =>
"#mediawiki-parsoid",
"${ircecho_logbase}/visualeditor.log"=>
"#mediawiki-visualeditor",
"${ircecho_logbase}/mediawiki.log" =>
"#mediawiki",
+ "${ircecho_logbase}/mediawiki-i18n.log" =>
"#mediawiki-i18n",
"${ircecho_logbase}/wikimedia-dev.log" =>
"#wikimedia-dev",
"${ircecho_logbase}/semantic-mediawiki.log" =>
["#semantic-mediawiki", "#mediawiki"],
"${ircecho_logbase}/wikidata.log"=>
"#wikimedia-wikidata",
diff --git a/templates/gerrit/hookconfig.py.erb
b/templates/gerrit/hookconfig.py.erb
index cf69199..71ecedb 100644
--- a/templates/gerrit/hookconfig.py.erb
+++ b/templates/gerrit/hookconfig.py.erb
@@ -51,6 +51,9 @@
"mediawiki/extensions/Diff" : "wikidata.log",
"mediawiki/extensions/DataValues" : "wikidata.log",
+"translatewiki": "mediawiki-i18n.log",
+"translatewiki/*": "mediawiki-i18n.log",
+
"default": "mediawiki.log"
}
--
To view, visit https://gerrit.wikimedia.org/r/57302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dc98959b3e06728838239e57a56e4c27f49092d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not normalise magic words - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not normalise magic words
..
Do not normalise magic words
This is a bit unfortunate, because of existing legacy. I'd rather leave
the current behavior in place, but it increases chances of unintended
breakage.
Bug: 46614
Bug: 46613
Change-Id: I8f1442e1f44f6f617f33dcb7b029596744a5644d
---
M ffs/MediaWikiComplexMessages.php
1 file changed, 15 insertions(+), 4 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ffs/MediaWikiComplexMessages.php b/ffs/MediaWikiComplexMessages.php
index 718fd02..3c31b11 100644
--- a/ffs/MediaWikiComplexMessages.php
+++ b/ffs/MediaWikiComplexMessages.php
@@ -14,7 +14,6 @@
* @todo Needs documentation.
*/
abstract class ComplexMessages {
-
const LANG_MASTER = 0;
const LANG_CHAIN = 1;
const LANG_CURRENT = 2;
@@ -343,15 +342,27 @@
return $this->databaseMsg . '/' . $this->language;
}
- function formatForSave( $request ) {
+ /**
+* @param WebRequest $request
+* @return string
+*/
+ function formatForSave( WebRequest $request ) {
$text = '';
+
+ // Do not replace spaces by underscores for magic words. See
bug 46613
+ $replaceSpace = $request->getVal( 'module') !== 'magic';
+
foreach ( array_keys( $this->data ) as $group ) {
foreach ( $this->getIterator( $group ) as $key ) {
$data = $request->getText(
$this->getKeyForEdit( $key ) );
// Make a nice array out of the submit with
trimmed values.
$data = array_map( 'trim', explode( ',', $data
) );
- // Normalise: Replace spaces with underscores.
- $data = str_replace( ' ', '_', $data );
+
+ if ( $replaceSpace ) {
+ // Normalise: Replace spaces with
underscores.
+ $data = str_replace( ' ', '_', $data );
+ }
+
// Create final format.
$data = implode( ', ', $data );
if ( $data !== '' ) {
--
To view, visit https://gerrit.wikimedia.org/r/57062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f1442e1f44f6f617f33dcb7b029596744a5644d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing period - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57303
Change subject: Add missing period
..
Add missing period
Change-Id: I8a19bc046ed69134576fe7c23777a96ac925856a
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/57303/1
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index d1ee6ce..e0f7fb7 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -28,6 +28,7 @@
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
+ . \
100 500 2 linux-swap \
$primary{ } method{ keep } \
.
--
To view, visit https://gerrit.wikimedia.org/r/57303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a19bc046ed69134576fe7c23777a96ac925856a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing period - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Add missing period
..
Add missing period
Change-Id: I8a19bc046ed69134576fe7c23777a96ac925856a
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index d1ee6ce..e0f7fb7 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -28,6 +28,7 @@
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
+ . \
100 500 2 linux-swap \
$primary{ } method{ keep } \
.
--
To view, visit https://gerrit.wikimedia.org/r/57303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a19bc046ed69134576fe7c23777a96ac925856a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] yamllint: load all doc + use safe loader - change (integration/jenkins)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57304
Change subject: yamllint: load all doc + use safe loader
..
yamllint: load all doc + use safe loader
load() by itself has two drawbacks:
- it is unsafe
- it only parse a single document
yaml.safe_load_all() addresses both issues :-]
Change-Id: I1c35d1a71f3b29f6ce3f842cac277e41de2399b7
---
M tools/yamllint.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/04/57304/1
diff --git a/tools/yamllint.py b/tools/yamllint.py
index 56d56ff..cd7f6f0 100755
--- a/tools/yamllint.py
+++ b/tools/yamllint.py
@@ -42,10 +42,10 @@
for a_file in filenames:
if a_file.lower().endswith(('.yaml', '.yml')):
full_path = os.path.join(root, a_file)
-logging.debug("Invoking yaml.load on %s", full_path)
+logging.debug("Invoking yaml.safe_load_all on %s", full_path)
try:
files += 1
-yaml.load(file(full_path))
+yaml.safe_load_all(file(full_path))
logging.info('[PASS] ' + full_path)
except Exception, exc:
logging.error("Invalid file %s raised: %s",
--
To view, visit https://gerrit.wikimedia.org/r/57304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c35d1a71f3b29f6ce3f842cac277e41de2399b7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] yamllint: load all doc + use safe loader - change (integration/jenkins)
Hashar has submitted this change and it was merged.
Change subject: yamllint: load all doc + use safe loader
..
yamllint: load all doc + use safe loader
load() by itself has two drawbacks:
- it is unsafe
- it only parse a single document
yaml.safe_load_all() addresses both issues :-]
Change-Id: I1c35d1a71f3b29f6ce3f842cac277e41de2399b7
---
M tools/yamllint.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/tools/yamllint.py b/tools/yamllint.py
index 56d56ff..cd7f6f0 100755
--- a/tools/yamllint.py
+++ b/tools/yamllint.py
@@ -42,10 +42,10 @@
for a_file in filenames:
if a_file.lower().endswith(('.yaml', '.yml')):
full_path = os.path.join(root, a_file)
-logging.debug("Invoking yaml.load on %s", full_path)
+logging.debug("Invoking yaml.safe_load_all on %s", full_path)
try:
files += 1
-yaml.load(file(full_path))
+yaml.safe_load_all(file(full_path))
logging.info('[PASS] ' + full_path)
except Exception, exc:
logging.error("Invalid file %s raised: %s",
--
To view, visit https://gerrit.wikimedia.org/r/57304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c35d1a71f3b29f6ce3f842cac277e41de2399b7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki-yamllint now voting - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/57305 Change subject: translatewiki-yamllint now voting .. translatewiki-yamllint now voting The translatewiki repository has a few YAML files containing several documents. The yaml linter was simply not recognizing them. It does since https://gerrit.wikimedia.org/r/57304 , so I am making the job voting :-] Change-Id: I8647933453d173e0db5c52fd953cb7be453ca9c7 --- M layout.yaml 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/05/57305/1 diff --git a/layout.yaml b/layout.yaml index 536285b..2b1c692 100644 --- a/layout.yaml +++ b/layout.yaml @@ -355,10 +355,6 @@ - name: ^parsoid-server-sanity-check$ voting: false - # Lot of YAML files still fails the python linter. - - name: translatewiki-yamllint -voting: false - # Register the Gerrit project name, apply them pipelines that in turn trigger # a set of jobs. projects: -- To view, visit https://gerrit.wikimedia.org/r/57305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8647933453d173e0db5c52fd953cb7be453ca9c7 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki-yamllint now voting - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: translatewiki-yamllint now voting .. translatewiki-yamllint now voting The translatewiki repository has a few YAML files containing several documents. The yaml linter was simply not recognizing them. It does since https://gerrit.wikimedia.org/r/57304 , so I am making the job voting :-] Change-Id: I8647933453d173e0db5c52fd953cb7be453ca9c7 --- M layout.yaml 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 536285b..2b1c692 100644 --- a/layout.yaml +++ b/layout.yaml @@ -355,10 +355,6 @@ - name: ^parsoid-server-sanity-check$ voting: false - # Lot of YAML files still fails the python linter. - - name: translatewiki-yamllint -voting: false - # Register the Gerrit project name, apply them pipelines that in turn trigger # a set of jobs. projects: -- To view, visit https://gerrit.wikimedia.org/r/57305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8647933453d173e0db5c52fd953cb7be453ca9c7 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust partition priorities - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57306
Change subject: Adjust partition priorities
..
Adjust partition priorities
Change-Id: Ic04aa4e448220d012240331684295dfe9c4e8a86
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/57306/1
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index e0f7fb7..0d9fa2c 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -24,12 +24,12 @@
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 500 10 xfs \
+ 100 400 10 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
. \
- 100 500 2 linux-swap \
+ 100 100 2 linux-swap \
$primary{ } method{ keep } \
.
--
To view, visit https://gerrit.wikimedia.org/r/57306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic04aa4e448220d012240331684295dfe9c4e8a86
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust partition priorities - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Adjust partition priorities
..
Adjust partition priorities
Change-Id: Ic04aa4e448220d012240331684295dfe9c4e8a86
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index e0f7fb7..0d9fa2c 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -24,12 +24,12 @@
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 500 10 xfs \
+ 100 400 10 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
. \
- 100 500 2 linux-swap \
+ 100 100 2 linux-swap \
$primary{ } method{ keep } \
.
--
To view, visit https://gerrit.wikimedia.org/r/57306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic04aa4e448220d012240331684295dfe9c4e8a86
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated authors list. - change (mediawiki...Parsoid)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/57307 Change subject: Updated authors list. .. Updated authors list. Change-Id: I4df1db1d514c7070949a92c25d9600cee2bccf50 --- M AUTHORS.txt 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid refs/changes/07/57307/1 diff --git a/AUTHORS.txt b/AUTHORS.txt index e89cdd2..c2cc0dd 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -13,16 +13,17 @@ Catrope Brion Vibber plancalculus +Jeff Evans Siebrand Mazeland Antoine Musso -lwelling +Luke Welling Neil Kandalgaonkar Trevor Parscal Timo Tijhof Audrey Tang (au) MZMcBride Ori Livneh -GWicke +Inez Korczyński A version of this list can be regenerated with the following one-liner: -- To view, visit https://gerrit.wikimedia.org/r/57307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4df1db1d514c7070949a92c25d9600cee2bccf50 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust priorities/partition sizes, suppress prompt - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57308
Change subject: Adjust priorities/partition sizes, suppress prompt
..
Adjust priorities/partition sizes, suppress prompt
Change-Id: I55524eb34aba149d89e1fcbecce11ea9145c1000
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/57308/1
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index 0d9fa2c..547eda1 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -18,18 +18,18 @@
# Define physical partitions
d-ipartman-auto/expert_recipe string \
multiraid ::\
- 500080001 raid\
+ 1 1 1 raid\
$primary{ } method{ raid } \
. \
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 400 10 xfs \
+ 0 400 10 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
. \
- 100 100 2 linux-swap \
+ 0 100 2 linux-swap \
$primary{ } method{ keep } \
.
@@ -54,3 +54,7 @@
# the first is for lucid, the second for precise (partman-xfs >= 45)
d-ipartman-xfs/no_mount_point boolean false
d-ipartman-basicfilesystems/no_mount_point boolean false
+
+# method{ keep } on a partition that has no known filesystem
+# produces a "No file system is specified for partition" prompt; silence it
+d-ipartman-basicmethods/method_onlyboolean false
--
To view, visit https://gerrit.wikimedia.org/r/57308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55524eb34aba149d89e1fcbecce11ea9145c1000
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust priorities/partition sizes, suppress prompt - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Adjust priorities/partition sizes, suppress prompt
..
Adjust priorities/partition sizes, suppress prompt
Change-Id: I55524eb34aba149d89e1fcbecce11ea9145c1000
---
M files/autoinstall/partman/raid1-varnish.cfg
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/partman/raid1-varnish.cfg
b/files/autoinstall/partman/raid1-varnish.cfg
index 0d9fa2c..547eda1 100644
--- a/files/autoinstall/partman/raid1-varnish.cfg
+++ b/files/autoinstall/partman/raid1-varnish.cfg
@@ -18,18 +18,18 @@
# Define physical partitions
d-ipartman-auto/expert_recipe string \
multiraid ::\
- 500080001 raid\
+ 1 1 1 raid\
$primary{ } method{ raid } \
. \
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 400 10 xfs \
+ 0 400 10 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
. \
- 100 100 2 linux-swap \
+ 0 100 2 linux-swap \
$primary{ } method{ keep } \
.
@@ -54,3 +54,7 @@
# the first is for lucid, the second for precise (partman-xfs >= 45)
d-ipartman-xfs/no_mount_point boolean false
d-ipartman-basicfilesystems/no_mount_point boolean false
+
+# method{ keep } on a partition that has no known filesystem
+# produces a "No file system is specified for partition" prompt; silence it
+d-ipartman-basicmethods/method_onlyboolean false
--
To view, visit https://gerrit.wikimedia.org/r/57308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55524eb34aba149d89e1fcbecce11ea9145c1000
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] IcuCollation::$tailoringFirstLetters: letter removal rules f... - change (mediawiki/core)
Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/57309 Change subject: IcuCollation::$tailoringFirstLetters: letter removal rules for Finnish .. IcuCollation::$tailoringFirstLetters: letter removal rules for Finnish Four non-ASCII letters - Ǥ, Ŋ, Ŧ, Ʒ - are sorted the same as their unaccented base ASCII versions - G, N, T, Z - causing unexpected output on category pages. Bug: 46330 Change-Id: I976dedfdc651fcc96a2291934924aa40b27f4c2f --- M includes/Collation.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/09/57309/1 diff --git a/includes/Collation.php b/includes/Collation.php index a0e1d2d..2cbe3c1 100644 --- a/includes/Collation.php +++ b/includes/Collation.php @@ -208,6 +208,7 @@ 'be-tarask' => array( "Ё" ), 'en' => array(), 'fi' => array( "Å", "Ä", "Ö" ), + '-fi' => array( "Ǥ", "Ŋ", "Ŧ", "Ʒ" ), // sorted like G, N, T, Z - bug 46330 'hu' => array( "Cs", "Dz", "Dzs", "Gy", "Ly", "Ny", "Ö", "Sz", "Ty", "Ü", "Zs" ), 'it' => array(), 'pl' => array( "Ą", "Ć", "Ę", "Ł", "Ń", "Ó", "Ś", "Ź", "Ż" ), -- To view, visit https://gerrit.wikimedia.org/r/57309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I976dedfdc651fcc96a2291934924aa40b27f4c2f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf12 Gerrit-Owner: Matmarex ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hopefully adding bond-master bond0 to all of the sub-interfaces - change (operations/puppet)
Lcarr has uploaded a new change for review. https://gerrit.wikimedia.org/r/57310 Change subject: hopefully adding bond-master bond0 to all of the sub-interfaces .. hopefully adding bond-master bond0 to all of the sub-interfaces Change-Id: Iea82f2c77768a7491bac864534e0ae05cf2d0ede --- M manifests/generic-definitions.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/57310/1 diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp index 401dce0..3f2f8ea 100644 --- a/manifests/generic-definitions.pp +++ b/manifests/generic-definitions.pp @@ -359,6 +359,7 @@ "set iface[. = '$interface'] '$interface'", "set iface[. = '$interface']/family 'inet'", "set iface[. = '$interface']/method 'manual'", + "set iface[. = '$interface']/bond-master '$master'" ], notify => Exec["ifup $interface"] } -- To view, visit https://gerrit.wikimedia.org/r/57310 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea82f2c77768a7491bac864534e0ae05cf2d0ede Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Honor transform limit for images with many old revisions - change (mediawiki/core)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57311
Change subject: Honor transform limit for images with many old revisions
..
Honor transform limit for images with many old revisions
When preparing Id0ec6a0a, for some reason I thought the thumbnailing
only applied to the current revision. Fix that oversight.
Change-Id: I2e8aecc76a1190bac353a2b9855bc6a19ec06dec
---
M includes/api/ApiQueryImageInfo.php
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/11/57311/1
diff --git a/includes/api/ApiQueryImageInfo.php
b/includes/api/ApiQueryImageInfo.php
index b2ef048..87bdbfe 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -170,9 +170,12 @@
}
break;
}
- $fit = $this->addPageSubItem( $pageId,
- self::getInfo( $oldie, $prop,
$result,
- $finalThumbParams,
$params['metadataversion'] ) );
+ $fit = self::getTransformCount() <
self::TRANSFORM_LIMIT &&
+ $this->addPageSubItem( $pageId,
+ self::getInfo( $oldie,
$prop, $result,
+
$finalThumbParams, $params['metadataversion']
+ )
+ );
if ( !$fit ) {
if ( count( $pageIds[NS_FILE] )
== 1 ) {
$this->setContinueEnumParameter( 'start',
--
To view, visit https://gerrit.wikimedia.org/r/57311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e8aecc76a1190bac353a2b9855bc6a19ec06dec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve API 'origin' parameter description - change (mediawiki/core)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/57312 Change subject: Improve API 'origin' parameter description .. Improve API 'origin' parameter description When making CORS pre-flight requests, the origin parameter must still be included. This means that it cannot be in the POST body, as that is not sent for pre-flight. Document that. Change-Id: I3fc809cf2e4ca9c2566f62d32f96d24377c72863 --- M includes/api/ApiMain.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/12/57312/1 diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index a6813e3..abd47b2 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -1048,6 +1048,7 @@ 'servedby' => 'Include the hostname that served the request in the results. Unconditionally shown on error', 'origin' => array( 'When accessing the API using a cross-domain AJAX request (CORS), set this to the originating domain.', + 'This must be included in any pre-flight request, and therefore must be part of the request URI (not the POST body).', 'This must match one of the origins in the Origin: header exactly, so it has to be set to something like http://en.wikipedia.org or https://meta.wikimedia.org .', 'If this parameter does not match the Origin: header, a 403 response will be returned.', 'If this parameter matches the Origin: header and the origin is whitelisted, an Access-Control-Allow-Origin header will be set.', -- To view, visit https://gerrit.wikimedia.org/r/57312 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3fc809cf2e4ca9c2566f62d32f96d24377c72863 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Anomie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add cp3005/3006 to Puppet - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57313
Change subject: Add cp3005/3006 to Puppet
..
Add cp3005/3006 to Puppet
Change-Id: I6121f3b461de0bd4ded19651e72369c33a19ac27
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/57313/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 60c0919..9d4af7c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -325,7 +325,7 @@
}
}
-node /^cp30(0[34789]|10)\.esams\.wikimedia\.org$/ {
+node /^cp30(0[3-9]|10)\.esams\.wikimedia\.org$/ {
if $::hostname =~ /^cp300[34]$/ {
$ganglia_aggregator = "true"
}
--
To view, visit https://gerrit.wikimedia.org/r/57313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6121f3b461de0bd4ded19651e72369c33a19ac27
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add cp3005/3006 to Puppet - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Add cp3005/3006 to Puppet
..
Add cp3005/3006 to Puppet
Change-Id: I6121f3b461de0bd4ded19651e72369c33a19ac27
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 60c0919..9d4af7c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -325,7 +325,7 @@
}
}
-node /^cp30(0[34789]|10)\.esams\.wikimedia\.org$/ {
+node /^cp30(0[3-9]|10)\.esams\.wikimedia\.org$/ {
if $::hostname =~ /^cp300[34]$/ {
$ganglia_aggregator = "true"
}
--
To view, visit https://gerrit.wikimedia.org/r/57313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6121f3b461de0bd4ded19651e72369c33a19ac27
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added option to run mobile frontend tests at en.m.wikipedia.... - change (mediawiki...MobileFrontend)
Cmcmahon has submitted this change and it was merged.
Change subject: Added option to run mobile frontend tests at
en.m.wikipedia.beta.wmflabs.org
..
Added option to run mobile frontend tests at en.m.wikipedia.beta.wmflabs.org
Created three new Jenkins jobs:
- en.m.wikipedia.beta.wmflabs.org-MobileFrontend-linux-android
- en.m.wikipedia.beta.wmflabs.org-MobileFrontend-mac-ipad
- en.m.wikipedia.beta.wmflabs.org-MobileFrontend-mac-iphone
Change-Id: Ibb74ccb36025dc50c562a7359a314db600ad3312
---
M tests/acceptance/docs/template.md
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
Cmcmahon: Verified; Looks good to me, approved
diff --git a/tests/acceptance/docs/template.md
b/tests/acceptance/docs/template.md
index 5820395..7313b1c 100644
--- a/tests/acceptance/docs/template.md
+++ b/tests/acceptance/docs/template.md
@@ -67,6 +67,20 @@
- master
- debug
+## Site
+
+- ID: SITE
+ - Display Name: Site
+ - Type: Select a string among many
+ - UI Mode: Dropdown list (no inline help, but more compact UI)
+ - Options
+- Display Name: (name)
+- Value: (name)
+
+- name:
+ - en.m.wikipedia.beta.wmflabs.org
+ - en.m.wikipedia.org
+
## Jelly-based transformation
- Property
@@ -152,7 +166,7 @@
export BROWSER_LABEL=${BROWSER_LABEL}
export ENVIRONMENT=cloudbees
-export MEDIAWIKI_URL=http://en.m.wikipedia.org/wiki/
+export MEDIAWIKI_URL=http://${SITE}/wiki/
curl -s -o use-ruby
https://repository-cloudbees.forge.cloudbees.com/distributions/ci-addons/ruby/use-ruby
RUBY_VERSION=2.0.0-p0 \
--
To view, visit https://gerrit.wikimedia.org/r/56505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb74ccb36025dc50c562a7359a314db600ad3312
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Zfilipin
Gerrit-Reviewer: Cmcmahon
Gerrit-Reviewer: Mgrover
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] It is useful to sometimes debug problems in Firefox - change (mediawiki...MobileFrontend)
Cmcmahon has submitted this change and it was merged. Change subject: It is useful to sometimes debug problems in Firefox .. It is useful to sometimes debug problems in Firefox I need to debug in Firefox right now. Change-Id: Iad85d611fd32232c309145e6ca506cc393005ba4 --- M tests/acceptance/docs/template.md 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/tests/acceptance/docs/template.md b/tests/acceptance/docs/template.md index 5820395..28ba86d 100644 --- a/tests/acceptance/docs/template.md +++ b/tests/acceptance/docs/template.md @@ -26,6 +26,7 @@ - android - ipad - iphone + - firefox ## bundle exec -- To view, visit https://gerrit.wikimedia.org/r/56591 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad85d611fd32232c309145e6ca506cc393005ba4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin Gerrit-Reviewer: Cmcmahon Gerrit-Reviewer: Mgrover Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enabling tests that were disabled because of a know MediaWik... - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Enabling tests that were disabled because of a know MediaWiki bugs .. Enabling tests that were disabled because of a know MediaWiki bugs Bug: 46168, 46367 Change-Id: I68a480a44c122c80f6c15fd1a24abcdbd3880d31 --- M features/guided_tour.feature M features/page_triage.feature 2 files changed, 1 insertion(+), 4 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/features/guided_tour.feature b/features/guided_tour.feature index 3d33946..425ab9e 100644 --- a/features/guided_tour.feature +++ b/features/guided_tour.feature @@ -25,8 +25,6 @@ When I save the page without changing anything Then Looking for more to do guider should not appear - # https://bugzilla.wikimedia.org/show_bug.cgi?id=46168 - @bug Scenario: Check that "Looking for more to do" guider does appear when page is changed and saved Given I am on a page with You're almost finished guider When I save the page is changed and saved diff --git a/features/page_triage.feature b/features/page_triage.feature index 27b20b4..e7873c1 100644 --- a/features/page_triage.feature +++ b/features/page_triage.feature @@ -8,8 +8,7 @@ And I should not see a Review button # https://bugzilla.wikimedia.org/show_bug.cgi?id=43598 ie - # https://bugzilla.wikimedia.org/show_bug.cgi?id=46367 ff - @ie6-bug @ie7-bug @firefox-bug + @ie6-bug @ie7-bug Scenario: Check set filters selection Given I am at the NewPagesFeed page When I click Set filters -- To view, visit https://gerrit.wikimedia.org/r/56609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68a480a44c122c80f6c15fd1a24abcdbd3880d31 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin Gerrit-Reviewer: Cmcmahon ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show that the Echo notification messages support {{GENDER:$1}} - change (mediawiki...OpenStackManager)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57314
Change subject: Show that the Echo notification messages support {{GENDER:$1}}
..
Show that the Echo notification messages support {{GENDER:$1}}
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Notification-osm-instance-reboot-completed/en
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Notification-osm-instance-deleted/en
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Notification-osm-instance-build-completed/en
Change-Id: Ifee3dfb22b0377f8e3fdfccdd5fd81fa8ed54e8f
---
M OpenStackManager.i18n.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/14/57314/1
diff --git a/OpenStackManager.i18n.php b/OpenStackManager.i18n.php
index b68fffc..f77e5e3 100644
--- a/OpenStackManager.i18n.php
+++ b/OpenStackManager.i18n.php
@@ -416,9 +416,9 @@
'action-manageproject' => 'manage OpenStack projects and roles',
'right-loginviashell' => 'Login via shell',
- 'notification-osm-instance-deleted' => '$1 deleted instance \'$3\' in
project [[$2]]',
- 'notification-osm-instance-build-completed' => '$1 built instance
\'$3\' in project [[$2]]',
- 'notification-osm-instance-reboot-completed' => '$1 rebooted instance
\'$3\' in project [[$2]]',
+ 'notification-osm-instance-deleted' => '{{GENDER:$1|$1}} deleted
instance \'$3\' in project [[$2]]',
+ 'notification-osm-instance-build-completed' => '{{GENDER:$1|$1}} built
instance \'$3\' in project [[$2]]',
+ 'notification-osm-instance-reboot-completed' => '{{GENDER:$1|$1}}
rebooted instance \'$3\' in project [[$2]]',
'echo-pref-email-osm-instance-deleted' => 'Deletes an instance from a
project I\'m a admin on.',
'echo-pref-email-osm-instance-build-completed' => 'Builds an instance
on a project I\'m a admin on.',
'echo-pref-email-osm-instance-reboot-completed' => 'Reboots an
instance.',
--
To view, visit https://gerrit.wikimedia.org/r/57314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifee3dfb22b0377f8e3fdfccdd5fd81fa8ed54e8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a GUI for manipulating sudo 'run as' policy. - change (mediawiki...OpenStackManager)
jenkins-bot has submitted this change and it was merged.
Change subject: Add a GUI for manipulating sudo 'run as' policy.
..
Add a GUI for manipulating sudo 'run as' policy.
This includes a fair bit of refactoring to allow
the gui to properly display nonstandard sudo members
like %groupname.
Change-Id: I0c2c9318f5469b3a127b1de03524f06d869df72e
---
M OpenStackManager.i18n.php
M nova/OpenStackNovaProject.php
M nova/OpenStackNovaServiceGroup.php
M nova/OpenStackNovaSudoer.php
M special/SpecialNovaSudoer.php
5 files changed, 162 insertions(+), 33 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/OpenStackManager.i18n.php b/OpenStackManager.i18n.php
index b68fffc..52e4980 100644
--- a/OpenStackManager.i18n.php
+++ b/OpenStackManager.i18n.php
@@ -345,10 +345,12 @@
'openstackmanager-commadelimiter' => 'Comma separated',
'openstackmanager-sudoerusers' => 'Users',
'openstackmanager-sudoerhosts' => 'Hosts',
+ 'openstackmanager-sudoerrunas' => 'Allow running as',
'openstackmanager-sudoercommands' => 'Commands',
'openstackmanager-requirepassword' => 'Require authentication',
'openstackmanager-sudoeroptions' => 'Options',
'openstackmanager-allmembers' => 'All project members',
+ 'openstackmanager-membersofgroup' => 'Members of group $1',
'openstackmanager-deletesudoer' => 'Delete sudo policy',
'openstackmanager-deletesudoer-confirm' => 'Are you sure you would like
to delete sudo policy $1?',
'openstackmanager-createsudoerfailed' => 'Failed to create sudo
policy.',
@@ -1194,10 +1196,12 @@
'openstackmanager-commadelimiter' => 'Unused at this time.',
'openstackmanager-sudoerusers' => '{{Identical|User}}',
'openstackmanager-sudoerhosts' => 'Used as label for multi-select box
and as heading cell in "resource" table.',
+ 'openstackmanager-sudoerrunas' => 'Used as label for multi-select box
and as heading cell in "resource" table in Special:NovaSudoer',
'openstackmanager-sudoercommands' => 'Used as label for textarea and as
heading cell in "resource" table, in Special:NovaSudoer.',
'openstackmanager-requirepassword' => 'When this option is checked,
sudo will require the user password',
'openstackmanager-sudoeroptions' => '{{Identical|Options}}',
'openstackmanager-allmembers' => 'Label for a checkbox that includes
all project members in a sudo policy',
+ 'openstackmanager-membersofgroup' => 'Column entry for sudo policies;
indicates a rule applies to all members of a given user group. $1 is the group
name.',
'openstackmanager-deletesudoer' => 'Used as page title in
Special:NovaSudoer.',
'openstackmanager-deletesudoer-confirm' => '*$1 - sudo policy name',
'openstackmanager-createsudoerfailed' => 'Used as failure message in
Special:NovaSudoer.
diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 6118e16..7ce8e95 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -677,7 +677,7 @@
// Create a default, permissive sudo policy.
$projectGroup = "%" .
$project->getProjectGroup()->getProjectGroupName();
if ( OpenStackNovaSudoer::createSudoer( 'default',
$projectname, array( $projectGroup ),
- array( 'ALL' ), array( 'ALL' ),
+ array( 'ALL' ), array(),
array( 'ALL' ),
array( '!authenticate' ) ) ) {
$wgAuth->printDebug( "Successfully created
default sudo policy for $projectname", NONSENSITIVE );
}
diff --git a/nova/OpenStackNovaServiceGroup.php
b/nova/OpenStackNovaServiceGroup.php
index 7dd2ee2..cdd119a 100644
--- a/nova/OpenStackNovaServiceGroup.php
+++ b/nova/OpenStackNovaServiceGroup.php
@@ -265,6 +265,7 @@
$project->projectname,
array( $groupName ),
array( 'ALL' ),
+ array(),
array( 'chown -R ' . $groupName . ':' .
$groupName . ' ' . $homeDir ),
array( '!authenticate' ) ) ) {
$wgAuth->printDebug( "Successfully created chmod sudo
policy for $groupName",
diff --git a/nova/OpenStackNovaSudoer.php b/nova/OpenStackNovaSudoer.php
index a720a60..6ee6437 100644
--- a/nova/OpenStackNovaSudoer.php
+++ b/nova/OpenStackNovaSudoer.php
@@ -91,6 +91,21 @@
}
/**
+* Return the 'run as' users for the policy
+*
+* @return array
+*/
+ function getSudoerRunAsUsers() {
+ if ( isset( $this->sudoerInfo[0]['sudorunasuser'] ) ) {
+
[MediaWiki-commits] [Gerrit] Universal Language Selector Accept-Language feature tests no... - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged.
Change subject: Universal Language Selector Accept-Language feature tests now
work on Sauce Labs too
..
Universal Language Selector Accept-Language feature tests now work on Sauce
Labs too
Bug: 46222
Change-Id: Ic885a67e1427930848e5d6ccd3bcebac78359eac
---
M features/accept_language.feature
M features/step_definitions/accept_language_steps.rb
M features/support/env.rb
3 files changed, 30 insertions(+), 16 deletions(-)
Approvals:
Nikerabbit: Looks good to me, but someone else must approve
Cmcmahon: Verified; Looks good to me, approved
diff --git a/features/accept_language.feature b/features/accept_language.feature
index 0ed33bc..f35dbe6 100644
--- a/features/accept_language.feature
+++ b/features/accept_language.feature
@@ -1,5 +1,4 @@
-# TODO: at the moment only works locally, does not work at Sauce Labs
-@firefox @firefox-bug
+@firefox @language
Feature: Universal Language Selector Accept-Language
Scenario Outline: Accept-Language
diff --git a/features/step_definitions/accept_language_steps.rb
b/features/step_definitions/accept_language_steps.rb
index 4703199..936c722 100644
--- a/features/step_definitions/accept_language_steps.rb
+++ b/features/step_definitions/accept_language_steps.rb
@@ -1,9 +1,5 @@
Given /^that my browser's accept language is (.+)$/ do |language|
- @browser.close
-
- profile = Selenium::WebDriver::Firefox::Profile.new
- profile['intl.accept_languages'] = language
- @browser = Watir::Browser.new :firefox, :profile => profile
+ @browser = browser(environment, test_name(@scenario), @saucelabs_username,
@saucelabs_key, language)
end
When /^I visit a random page$/ do
diff --git a/features/support/env.rb b/features/support/env.rb
index 9384576..6e963d2 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -7,11 +7,11 @@
World(PageObject::PageFactory)
-def browser(environment, test_name, saucelabs_username, saucelabs_key)
+def browser(environment, test_name, saucelabs_username, saucelabs_key,
language)
if environment == :cloudbees
-sauce_browser(test_name, saucelabs_username, saucelabs_key)
+sauce_browser(test_name, saucelabs_username, saucelabs_key, language)
else
-local_browser
+local_browser(language)
end
end
def environment
@@ -21,23 +21,36 @@
:local
end
end
-def local_browser
+def local_browser(language)
if ENV['BROWSER_LABEL']
browser_label = ENV['BROWSER_LABEL'].to_sym
else
browser_label = :firefox
end
- Watir::Browser.new browser_label
+ if language == 'default'
+Watir::Browser.new browser_label
+ else
+profile = Selenium::WebDriver::Firefox::Profile.new
+profile['intl.accept_languages'] = language
+Watir::Browser.new browser_label, :profile => profile
+ end
end
def sauce_api(json, saucelabs_username, saucelabs_key)
%x{curl -H 'Content-Type:text/json' -s -X PUT -d '#{json}'
http://#{saucelabs_username}:#{saucelabs_key}@saucelabs.com/rest/v1/#{saucelabs_username}/jobs/#{$session_id}}
end
-def sauce_browser(test_name, saucelabs_username, saucelabs_key)
+def sauce_browser(test_name, saucelabs_username, saucelabs_key, language)
config = YAML.load_file('config/config.yml')
browser_label = config[ENV['BROWSER_LABEL']]
- caps = Selenium::WebDriver::Remote::Capabilities.send(browser_label['name'])
+ if language == 'default'
+caps =
Selenium::WebDriver::Remote::Capabilities.send(browser_label['name'])
+ else
+profile = Selenium::WebDriver::Firefox::Profile.new
+profile['intl.accept_languages'] = language
+caps =
Selenium::WebDriver::Remote::Capabilities.send(browser_label['name'],
:firefox_profile => profile)
+ end
+
caps.platform = browser_label['platform']
caps.version = browser_label['version']
caps[:name] = "#{test_name} #{ENV['JOB_NAME']}##{ENV['BUILD_NUMBER']}"
@@ -85,6 +98,12 @@
saucelabs_key = secret['saucelabs_key']
end
+Before('@language') do |scenario|
+ @language = true
+ @saucelabs_username = saucelabs_username
+ @saucelabs_key = saucelabs_key
+ @scenario = scenario
+end
Before('@login') do
puts "secret.yml file at /private/wmf/ or config/ is required for tests
tagged @login" if secret_yml_location == nil
end
@@ -94,11 +113,11 @@
@does_not_exist_page_name = Random.new.rand.to_s
@mediawiki_username = mediawiki_username
@mediawiki_password = mediawiki_password
- @browser = browser(environment, test_name(scenario), saucelabs_username,
saucelabs_key)
- $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
+ @browser = browser(environment, test_name(scenario), saucelabs_username,
saucelabs_key, 'default') unless @language
end
After do |scenario|
+ $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
if environment == :cloudbees
sauce_api(%Q{{"passed": #{scenario.passed?}}}, saucelabs_username,
saucelabs_key)
[MediaWiki-commits] [Gerrit] Gems needed for tests to run on Windows - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Gems needed for tests to run on Windows .. Gems needed for tests to run on Windows Change-Id: I9832ab808a0adb8e1d552e609c68078cce0ea569 --- M Gemfile.lock 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/Gemfile.lock b/Gemfile.lock index 56c5aa8..34e9b4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,10 @@ faker (1.1.2) i18n (~> 0.5) ffi (1.6.0) +ffi (1.6.0-x86-mingw32) gherkin (2.11.6) + json (>= 1.7.6) +gherkin (2.11.6-x86-mingw32) json (>= 1.7.6) i18n (0.6.4) json (1.7.7) @@ -49,6 +52,7 @@ PLATFORMS ruby + x86-mingw32 DEPENDENCIES chunky_png -- To view, visit https://gerrit.wikimedia.org/r/56590 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9832ab808a0adb8e1d552e609c68078cce0ea569 Gerrit-PatchSet: 2 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin Gerrit-Reviewer: Cmcmahon ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
