[MediaWiki-commits] [Gerrit] Release 2.0rc2 - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/224222 Change subject: Release 2.0rc2 .. Release 2.0rc2 Change-Id: I64154d9f9138e25f21b32a223f6d2b96c32ca0e3 --- M ChangeLog M setup.py 2 files changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/22/224222/1 diff --git a/ChangeLog b/ChangeLog index 0af0188..7ba2f56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,47 @@ +Release 2.0rc2 (9 July 2015) + + +Bugfixes (scripts) +-- +8d76870 replace.py: remove line endings when reading from file +bfe60b0 archive.py: Don't ignore "DoNotArchiveUntil" timestamps +0df272b redirect.py: Don't break the script for hidden pages. +9806a7a upload.py: allow all formats allowed by commons +1dcbfd8, 0592360 replace.py: fix handling of addedCat + +Small new features (scripts) + +a47c0d7 clean_sandbox.py: Use pagegenerators +288b9ce replace.py: Inform about missing user-fixes.py + +Configuration updates +- +d721249 Changing the sandbox content template on Fa WP + +Family file updates +--- +21d6a8d Remove broken wikis from battlestarwiki family +3c2bcc5 Adding euskara and sicilianu languages to Vikidia family +a3a3d53 WOW Wiki subdomains hr, ro & sr deleted +474c786 Add new Wikipedia languages gom and lrc + +Bugfixes (core) +--- +c7a12b5 fix UnicodeDecodeError on api error +ea00683 pwb.py now correctly passes arguments to generate_family_file +3685a24 Fix Win32 config.editor detection +251 open_compressed: Wrap BZ2File in Py 2.7 +f2309e5 Skip RC entries without a title +ab9fdfb PatrolEntry: Allow cur/prev id to be str +156bdd0, 0b6fda9 Updates to i18n changes +49fc65f Do not use ParamInfo during action=login +796f273 Let pydot encode labels for Python 3 support +3488a4b Fix and test interwiki_graph +ba6b671 textlib: replaceExcept: Handle empty matches + Release 2.0rc1 (25 May 2015) - + Major improvements include: - Sphinx documentation at https://doc.wikimedia.org/pywikibot/ - Initial ProofreadPage support diff --git a/setup.py b/setup.py index b6d7424..75d9f64 100644 --- a/setup.py +++ b/setup.py @@ -138,7 +138,7 @@ from setuptools import setup, find_packages name = 'pywikibot' -version = '2.0rc1.post2' +version = '2.0rc2' github_url = 'https://github.com/wikimedia/pywikibot-core' setup( -- To view, visit https://gerrit.wikimedia.org/r/224222 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64154d9f9138e25f21b32a223f6d2b96c32ca0e3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: Merlijn van Deen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add djvulibre-bin to travis apt package list - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add djvulibre-bin to travis apt package list .. Add djvulibre-bin to travis apt package list This is needed for the djvu tests. Support added: https://github.com/travis-ci/travis-ci/issues/3998 Bug: T66853 Change-Id: If677e4c66b03048980d77d42a9333a12c00a6112 --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 0004dbf..39c880c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ addons: apt: packages: + - djvulibre-bin - graphviz - liblua5.1-0-dev -- To view, visit https://gerrit.wikimedia.org/r/224199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If677e4c66b03048980d77d42a9333a12c00a6112 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Mpaa Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bump version to 1.7.11 - change (operations...adminbot)
Dzahn has submitted this change and it was merged. Change subject: bump version to 1.7.11 .. bump version to 1.7.11 Change-Id: If788b7e5816d2b2dcf8842682c71868ccacd09f0 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 951a5e7..6da765d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +adminbot (1.7.11) precise-wikimedia; urgency=low + + * Change-Id: I89d69890b62c - Fix new section creation for each edit (BryanDavis) + * Change-Id: Iffc6cc636fc6 - add docs how to build and upload to repo (DZahn) + * Change-Id: If009179ac12f - fix the README file dpkg error on install (DZahn) + + -- Daniel Zahn Sat, 11 Jul 2015 04:36:23 + + adminbot (1.7.10) precise-wikimedia; urgency=low * Fixed date parsing of headers -- To view, visit https://gerrit.wikimedia.org/r/224221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If788b7e5816d2b2dcf8842682c71868ccacd09f0 Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn 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 no-op wfProfile(In|Out) calls - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove no-op wfProfile(In|Out) calls
..
Remove no-op wfProfile(In|Out) calls
Change-Id: I0beb08ed5aedc458d4f29a5d7a8a52290a28479c
---
M includes/View.php
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/View.php b/includes/View.php
index a996978..db445d2 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -46,10 +46,7 @@
}
public function show( WorkflowLoader $loader, $action ) {
- wfProfileIn( __CLASS__ . '-init' );
-
$blocks = $loader->getBlocks();
- wfProfileOut( __CLASS__ . '-init' );
$parameters = $this->extractBlockParameters( $action, $blocks );
foreach ( $loader->getBlocks() as $block ) {
--
To view, visit https://gerrit.wikimedia.org/r/224175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0beb08ed5aedc458d4f29a5d7a8a52290a28479c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bump version to 1.7.11 - change (operations...adminbot)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224221 Change subject: bump version to 1.7.11 .. bump version to 1.7.11 Change-Id: If788b7e5816d2b2dcf8842682c71868ccacd09f0 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot refs/changes/21/224221/1 diff --git a/debian/changelog b/debian/changelog index 951a5e7..24cf9b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +adminbot (1.7.11) precise-wikimedia; urgency=low + + * Change-Id: I89d69890b62c - Fix new section creation for each edit (BryanDavis) + * Change-Id: Iffc6cc636fc6 - add docs how to build and upload to repo (DZahn) + * Change-Id: If009179ac12f - fix the README file dpkg error on install (DZahn) + + -- Merlijn van Deen Fri, 10 Jul 2015 19:45:00 + + adminbot (1.7.10) precise-wikimedia; urgency=low * Fixed date parsing of headers -- To view, visit https://gerrit.wikimedia.org/r/224221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If788b7e5816d2b2dcf8842682c71868ccacd09f0 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix syntax errors in the sql query - change (analytics/limn-language-data)
jenkins-bot has submitted this change and it was merged. Change subject: Fix syntax errors in the sql query .. Fix syntax errors in the sql query Wiki codes like 'as', 'or', 'is', 'to' are reserved keywords in sql. They are now escaped using `. Change-Id: I05914b5f62418fdeb5457b530e50aebe8c88875e --- M language/content_translation_beta.sql M language/content_translation_beta_manual.sql 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/language/content_translation_beta.sql b/language/content_translation_beta.sql index df759c6..b1e949f 100644 --- a/language/content_translation_beta.sql +++ b/language/content_translation_beta.sql @@ -502,7 +502,7 @@ left join ( select count(*) as vepwiki from vepwiki.user_properties where up_property = 'cx' and up_value = 1 ) vep on 1=1 left join -( select count(*) as aswiki from aswiki.user_properties where up_property = 'cx' and up_value = 1 ) as on 1=1 +( select count(*) as aswiki from aswiki.user_properties where up_property = 'cx' and up_value = 1 ) `as` on 1=1 left join ( select count(*) as bnwiki from bnwiki.user_properties where up_property = 'cx' and up_value = 1 ) bn on 1=1 left join @@ -524,7 +524,7 @@ left join ( select count(*) as newwiki from newwiki.user_properties where up_property = 'cx' and up_value = 1 ) new on 1=1 left join -( select count(*) as orwiki from orwiki.user_properties where up_property = 'cx' and up_value = 1 ) or on 1=1 +( select count(*) as orwiki from orwiki.user_properties where up_property = 'cx' and up_value = 1 ) `or` on 1=1 left join ( select count(*) as piwiki from piwiki.user_properties where up_property = 'cx' and up_value = 1 ) pi on 1=1 left join @@ -644,7 +644,7 @@ left join ( select count(*) as tetwiki from tetwiki.user_properties where up_property = 'cx' and up_value = 1 ) tet on 1=1 left join -( select count(*) as towiki from towiki.user_properties where up_property = 'cx' and up_value = 1 ) to on 1=1 +( select count(*) as towiki from towiki.user_properties where up_property = 'cx' and up_value = 1 ) `to` on 1=1 left join ( select count(*) as tywiki from tywiki.user_properties where up_property = 'cx' and up_value = 1 ) ty on 1=1 left join @@ -668,7 +668,7 @@ left join ( select count(*) as ikwiki from ikwiki.user_properties where up_property = 'cx' and up_value = 1 ) ik on 1=1 left join -( select count(*) as iswiki from iswiki.user_properties where up_property = 'cx' and up_value = 1 ) is on 1=1 +( select count(*) as iswiki from iswiki.user_properties where up_property = 'cx' and up_value = 1 ) `is` on 1=1 left join ( select count(*) as klwiki from klwiki.user_properties where up_property = 'cx' and up_value = 1 ) kl on 1=1 ) seventh30 diff --git a/language/content_translation_beta_manual.sql b/language/content_translation_beta_manual.sql index 90db624..d227bf5 100644 --- a/language/content_translation_beta_manual.sql +++ b/language/content_translation_beta_manual.sql @@ -502,7 +502,7 @@ left join ( select count(*) as vepwiki from vepwiki.user_properties where up_property = 'cx' and up_value = 1 and up_user not in ( select up_user from vepwiki.user_properties where up_property = 'betafeatures-auto-enroll' and up_value = 1 ) ) vep on 1=1 left join -( select count(*) as aswiki from aswiki.user_properties where up_property = 'cx' and up_value = 1 and up_user not in ( select up_user from aswiki.user_properties where up_property = 'betafeatures-auto-enroll' and up_value = 1 ) ) as on 1=1 +( select count(*) as aswiki from aswiki.user_properties where up_property = 'cx' and up_value = 1 and up_user not in ( select up_user from aswiki.user_properties where up_property = 'betafeatures-auto-enroll' and up_value = 1 ) ) `as` on 1=1 left join ( select count(*) as bnwiki from bnwiki.user_properties where up_property = 'cx' and up_value = 1 and up_user not in ( select up_user from bnwiki.user_properties where up_property = 'betafeatures-auto-enroll' and up_value = 1 ) ) bn on 1=1 left join @@ -524,7 +524,7 @@ left join ( select count(*) as newwiki from newwiki.user_properties where up_property = 'cx' and up_value = 1 and up_user not in ( select up_user from newwik
[MediaWiki-commits] [Gerrit] Fix new section creation for each edit - change (operations...adminbot)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix new section creation for each edit
..
Fix new section creation for each edit
Fix extracted date vs current data comparison. A list and a tuple with
the same contents are not == in python so both need be of the same type.
Change-Id: I89d69890b62c98974682cd697af5cb13167d0b90
---
M adminlog.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, but someone else must approve
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/adminlog.py b/adminlog.py
index 330bfb6..6ff1aea 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -41,7 +41,7 @@
except ValueError:
header_date = None
break
-if header_date != (now.year, now.month, now.day):
+if header_date != [now.year, now.month, now.day]:
lines.insert(0, "")
lines.insert(0, logline)
lines.insert(0, now.strftime("{0} %Y-%m-%d {0}".format(header)))
--
To view, visit https://gerrit.wikimedia.org/r/224212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89d69890b62c98974682cd697af5cb13167d0b90
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: JanZerebecki
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 syntax errors in the sql query - change (analytics/limn-language-data)
Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/224220 Change subject: Fix syntax errors in the sql query .. Fix syntax errors in the sql query Wiki codes like 'as', 'or', 'is', 'to' are reserved keywords in sql. They are now escaped using `. Change-Id: I05914b5f62418fdeb5457b530e50aebe8c88875e --- M language/content_translation_beta.sql 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-language-data refs/changes/20/224220/1 diff --git a/language/content_translation_beta.sql b/language/content_translation_beta.sql index df759c6..b1e949f 100644 --- a/language/content_translation_beta.sql +++ b/language/content_translation_beta.sql @@ -502,7 +502,7 @@ left join ( select count(*) as vepwiki from vepwiki.user_properties where up_property = 'cx' and up_value = 1 ) vep on 1=1 left join -( select count(*) as aswiki from aswiki.user_properties where up_property = 'cx' and up_value = 1 ) as on 1=1 +( select count(*) as aswiki from aswiki.user_properties where up_property = 'cx' and up_value = 1 ) `as` on 1=1 left join ( select count(*) as bnwiki from bnwiki.user_properties where up_property = 'cx' and up_value = 1 ) bn on 1=1 left join @@ -524,7 +524,7 @@ left join ( select count(*) as newwiki from newwiki.user_properties where up_property = 'cx' and up_value = 1 ) new on 1=1 left join -( select count(*) as orwiki from orwiki.user_properties where up_property = 'cx' and up_value = 1 ) or on 1=1 +( select count(*) as orwiki from orwiki.user_properties where up_property = 'cx' and up_value = 1 ) `or` on 1=1 left join ( select count(*) as piwiki from piwiki.user_properties where up_property = 'cx' and up_value = 1 ) pi on 1=1 left join @@ -644,7 +644,7 @@ left join ( select count(*) as tetwiki from tetwiki.user_properties where up_property = 'cx' and up_value = 1 ) tet on 1=1 left join -( select count(*) as towiki from towiki.user_properties where up_property = 'cx' and up_value = 1 ) to on 1=1 +( select count(*) as towiki from towiki.user_properties where up_property = 'cx' and up_value = 1 ) `to` on 1=1 left join ( select count(*) as tywiki from tywiki.user_properties where up_property = 'cx' and up_value = 1 ) ty on 1=1 left join @@ -668,7 +668,7 @@ left join ( select count(*) as ikwiki from ikwiki.user_properties where up_property = 'cx' and up_value = 1 ) ik on 1=1 left join -( select count(*) as iswiki from iswiki.user_properties where up_property = 'cx' and up_value = 1 ) is on 1=1 +( select count(*) as iswiki from iswiki.user_properties where up_property = 'cx' and up_value = 1 ) `is` on 1=1 left join ( select count(*) as klwiki from klwiki.user_properties where up_property = 'cx' and up_value = 1 ) kl on 1=1 ) seventh30 -- To view, visit https://gerrit.wikimedia.org/r/224220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05914b5f62418fdeb5457b530e50aebe8c88875e Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-language-data 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] beta: remove deployment-logstash1 - change (operations/puppet)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/224219 Change subject: beta: remove deployment-logstash1 .. beta: remove deployment-logstash1 Follow up to Iffc3e62439d6bbccf7f5e215c1bfb56eab6f33c0 Change-Id: I5f330212dd548b49be11b2c3797d53fdbb6c3755 --- D hieradata/labs/deployment-prep/host/deployment-logstash1.yaml M hieradata/labs/deployment-prep/host/deployment-logstash2.yaml 2 files changed, 0 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/19/224219/1 diff --git a/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml b/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml deleted file mode 100644 index a04463e..000 --- a/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml +++ /dev/null @@ -1,19 +0,0 @@ -base::remote_syslog::enable: false - -# ES-specific -elasticsearch::auto_create_index: true -elasticsearch::cluster_name: labs-logstash-eqiad -elasticsearch::expected_nodes: 2 -elasticsearch::heap_memory: '5G' -elasticsearch::minimum_master_nodes: 1 -elasticsearch::multicast_group: 224.2.2.6 -elasticsearch::plugins_dir: /srv/deployment/elasticsearch/plugins -elasticsearch::recover_after_nodes: 1 -elasticsearch::recover_after_time: '1m' -elasticsearch::unicast_hosts: - - deployment-logstash2.deployment-prep.eqiad.wmflabs -elasticsearch::script_disable_dynamic: true - -# Logstash specific -logstash::filter_workers: 1 -logstash::heap_memory_mb: 128 diff --git a/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml b/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml index 8208668..9a2d584 100644 --- a/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml +++ b/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml @@ -10,8 +10,6 @@ elasticsearch::plugins_dir: /srv/deployment/elasticsearch/plugins elasticsearch::recover_after_nodes: 1 elasticsearch::recover_after_time: '1m' -elasticsearch::unicast_hosts: - - deployment-logstash1.deployment-prep.eqiad.wmflabs elasticsearch::script_disable_dynamic: true # Logstash specific -- To view, visit https://gerrit.wikimedia.org/r/224219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f330212dd548b49be11b2c3797d53fdbb6c3755 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] urlencode titles in Parsoid URL - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: urlencode titles in Parsoid URL
..
urlencode titles in Parsoid URL
This unbreaks titles containing strange characters ('%' in particular).
Bug: T105562
Change-Id: Ib538c95b2a9e23fac965c53fc67b16541ef4a386
(cherry picked from commit acc362d980719e1795ac0d3595072a00f8e31971)
---
M includes/Parsoid/Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index 87b9300..1c021ce 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -98,7 +98,7 @@
}
$request = \MWHttpRequest::factory(
- $parsoidURL . '/' . $parsoidPrefix . '/' .
$title->getPrefixedDBkey(),
+ $parsoidURL . '/' . $parsoidPrefix . '/' . urlencode(
$title->getPrefixedDBkey() ),
array(
'method' => 'POST',
'postData' => wfArrayToCgi( $params ),
--
To view, visit https://gerrit.wikimedia.org/r/224218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib538c95b2a9e23fac965c53fc67b16541ef4a386
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] urlencode titles in Parsoid URL - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224218
Change subject: urlencode titles in Parsoid URL
..
urlencode titles in Parsoid URL
This unbreaks titles containing strange characters ('%' in particular).
Bug: T105562
Change-Id: Ib538c95b2a9e23fac965c53fc67b16541ef4a386
(cherry picked from commit acc362d980719e1795ac0d3595072a00f8e31971)
---
M includes/Parsoid/Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/18/224218/1
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index 87b9300..1c021ce 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -98,7 +98,7 @@
}
$request = \MWHttpRequest::factory(
- $parsoidURL . '/' . $parsoidPrefix . '/' .
$title->getPrefixedDBkey(),
+ $parsoidURL . '/' . $parsoidPrefix . '/' . urlencode(
$title->getPrefixedDBkey() ),
array(
'method' => 'POST',
'postData' => wfArrayToCgi( $params ),
--
To view, visit https://gerrit.wikimedia.org/r/224218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib538c95b2a9e23fac965c53fc67b16541ef4a386
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] urlencode titles in Parsoid URL - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: urlencode titles in Parsoid URL
..
urlencode titles in Parsoid URL
This unbreaks titles containing strange characters ('%' in particular).
Bug: T105562
Change-Id: Ib538c95b2a9e23fac965c53fc67b16541ef4a386
---
M includes/Parsoid/Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index 87b9300..1c021ce 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -98,7 +98,7 @@
}
$request = \MWHttpRequest::factory(
- $parsoidURL . '/' . $parsoidPrefix . '/' .
$title->getPrefixedDBkey(),
+ $parsoidURL . '/' . $parsoidPrefix . '/' . urlencode(
$title->getPrefixedDBkey() ),
array(
'method' => 'POST',
'postData' => wfArrayToCgi( $params ),
--
To view, visit https://gerrit.wikimedia.org/r/224198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib538c95b2a9e23fac965c53fc67b16541ef4a386
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dump classmap after composer commands - change (mediawiki/vagrant)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/224217 Change subject: Dump classmap after composer commands .. Dump classmap after composer commands Fixes composer bug #4244 of composer require/remove breaking optmized classmaps: https://github.com/composer/composer/issues/4244 Change-Id: I82d4080261f7135fabf2ca276cfa5f0525a53ad9 --- M puppet/modules/php/templates/composer-remove-command.erb M puppet/modules/php/templates/composer-require-command.erb 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/17/224217/1 diff --git a/puppet/modules/php/templates/composer-remove-command.erb b/puppet/modules/php/templates/composer-remove-command.erb index 3446e25..9dc462f 100644 --- a/puppet/modules/php/templates/composer-remove-command.erb +++ b/puppet/modules/php/templates/composer-remove-command.erb @@ -1,3 +1,4 @@ composer <% if @dev %>--dev<% end %> \ --no-progress --update-with-dependencies \ - remove '<%= @title %>' + remove '<%= @title %>' \ + && composer dump-autoload --optimize `# workaround for https://github.com/composer/composer/issues/4244 ` diff --git a/puppet/modules/php/templates/composer-require-command.erb b/puppet/modules/php/templates/composer-require-command.erb index 2f0c3c3..f6212fa 100644 --- a/puppet/modules/php/templates/composer-require-command.erb +++ b/puppet/modules/php/templates/composer-require-command.erb @@ -1,3 +1,4 @@ composer <% if @dev %>--dev<% end %> --prefer-<%= @prefer %> \ --no-progress --update-with-dependencies \ - require '<%= @title %>' '<%= @version %>' + require '<%= @title %>' '<%= @version %>' \ + && composer dump-autoload --optimize `# workaround for https://github.com/composer/composer/issues/4244 ` -- To view, visit https://gerrit.wikimedia.org/r/224217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82d4080261f7135fabf2ca276cfa5f0525a53ad9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gergő Tisza ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow "." in filebackend container prefixes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow "." in filebackend container prefixes
..
Allow "." in filebackend container prefixes
* This character in $wgDBname seems to be common enough.
The wiki ID is the default container prefix, and if it
is not accepted, then confusing errors occur that block
all file uploads. The case of dots is handled now.
* Improved variable naming in resolveStoragePath().
Bug: T46066
Change-Id: I68458a876855894d01e8cf880bd6cfcfdae17bd0
---
M includes/filebackend/FileBackendStore.php
1 file changed, 30 insertions(+), 11 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/FileBackendStore.php
b/includes/filebackend/FileBackendStore.php
index 7d2d831..e4b07b8 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -1364,19 +1364,38 @@
abstract protected function directoriesAreVirtual();
/**
-* Check if a container name is valid.
+* Check if a short container name is valid
+*
* This checks for length and illegal characters.
+* This may disallow certain characters that can appear
+* in the prefix used to make the full container name.
+*
+* @param string $container
+* @return bool
+*/
+ final protected static function isValidShortContainerName( $container )
{
+ // Suffixes like '.xxx' (hex shard chars) or '.seg' (file
segments)
+ // might be used by subclasses. Reserve the dot character for
sanity.
+ // The only way dots end up in containers (e.g.
resolveStoragePath)
+ // is due to the wikiId container prefix or the above suffixes.
+ return self::isValidContainerName( $container ) && !preg_match(
'/[.]/', $container );
+ }
+
+ /**
+* Check if a full container name is valid
+*
+* This checks for length and illegal characters.
+* Limiting the characters makes migrations to other stores easier.
*
* @param string $container
* @return bool
*/
final protected static function isValidContainerName( $container ) {
- // This accounts for Swift and S3 restrictions while leaving
room
- // for things like '.xxx' (hex shard chars) or '.seg'
(segments).
- // This disallows directory separators or traversal characters.
+ // This accounts for NTFS, Swift, and Ceph restrictions
+ // and disallows directory separators or traversal characters.
// Note that matching strings URL encode to the same string;
- // in Swift, the length restriction is *after* URL encoding.
- return preg_match( '/^[a-z0-9][a-z0-9-_]{0,199}$/i', $container
);
+ // in Swift/Ceph, the length restriction is *after* URL
encoding.
+ return (bool)preg_match( '/^[a-z0-9][a-z0-9-_.]{0,199}$/i',
$container );
}
/**
@@ -1393,17 +1412,17 @@
* @return array (container, path, container suffix) or (null, null,
null) if invalid
*/
final protected function resolveStoragePath( $storagePath ) {
- list( $backend, $container, $relPath ) =
self::splitStoragePath( $storagePath );
+ list( $backend, $shortCont, $relPath ) =
self::splitStoragePath( $storagePath );
if ( $backend === $this->name ) { // must be for this backend
$relPath = self::normalizeContainerPath( $relPath );
- if ( $relPath !== null ) {
+ if ( $relPath !== null &&
self::isValidShortContainerName( $shortCont ) ) {
// Get shard for the normalized path if this
container is sharded
- $cShard = $this->getContainerShard( $container,
$relPath );
+ $cShard = $this->getContainerShard( $shortCont,
$relPath );
// Validate and sanitize the relative path
(backend-specific)
- $relPath = $this->resolveContainerPath(
$container, $relPath );
+ $relPath = $this->resolveContainerPath(
$shortCont, $relPath );
if ( $relPath !== null ) {
// Prepend any wiki ID prefix to the
container name
- $container = $this->fullContainerName(
$container );
+ $container = $this->fullContainerName(
$shortCont );
if ( self::isValidContainerName(
$container ) ) {
// Validate and sanitize the
container name (ba
[MediaWiki-commits] [Gerrit] [WIP] TargetLoader: Use an OOUI MessageDialog, not window.al... - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224216
Change subject: [WIP] TargetLoader: Use an OOUI MessageDialog, not
window.alert()
..
[WIP] TargetLoader: Use an OOUI MessageDialog, not window.alert()
Needs OOUI to be loaded by default on all page views so that adding a
dependency isn't be too expensive.
Change-Id: Ib6a217c988322ad17bc7e649c3281eb053b54bbc
---
M modules/ve-mw/init/ve.init.mw.TargetLoader.js
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/16/224216/1
diff --git a/modules/ve-mw/init/ve.init.mw.TargetLoader.js
b/modules/ve-mw/init/ve.init.mw.TargetLoader.js
index 10149d0..9b40767 100644
--- a/modules/ve-mw/init/ve.init.mw.TargetLoader.js
+++ b/modules/ve-mw/init/ve.init.mw.TargetLoader.js
@@ -144,7 +144,15 @@
// Page does not exist,
so let the user start with a blank document.
return
$.Deferred().resolve( '' ).promise();
} else {
- window.alert( mw.msg(
'visualeditor-loaderror-message', 'HTTP ' + response.status ) );
+ var messageDialog = new
OO.ui.MessageDialog(),
+ windowManager =
new OO.ui.WindowManager();
+
+ $( 'body' ).append(
windowManager.$element );
+
windowManager.addWindows( [ messageDialog ] );
+
windowManager.openWindow( messageDialog, {
+ title: mw.msg(
'visualeditor-loaderror-title' ),
+ message:
mw.msg( 'visualeditor-loaderror-message', 'HTTP ' + response.status )
+ } );
mw.log.warn( 'RESTBase
load failed: ' + response.statusText );
}
--
To view, visit https://gerrit.wikimedia.org/r/224216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6a217c988322ad17bc7e649c3281eb053b54bbc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Conversion to using getMainStashInstance() - change (mediawiki...FlaggedRevs)
jenkins-bot has submitted this change and it was merged.
Change subject: Conversion to using getMainStashInstance()
..
Conversion to using getMainStashInstance()
Bug: T97620
Change-Id: Ie9c261fce945922faaf1b43f1cb9261ac764c7f6
---
M backend/FRUserActivity.php
1 file changed, 72 insertions(+), 51 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/backend/FRUserActivity.php b/backend/FRUserActivity.php
old mode 100644
new mode 100755
index 5034633..fa8672d
--- a/backend/FRUserActivity.php
+++ b/backend/FRUserActivity.php
@@ -41,21 +41,21 @@
return $count;
}
- /*
+ /**
* Get who is currently reviewing a page
* @param int $pageId
* @return array (username or null, MW timestamp or null)
*/
public static function getUserReviewingPage( $pageId ) {
- global $wgMemc;
$key = wfMemcKey( 'flaggedrevs', 'userReviewingPage', $pageId );
- $val = $wgMemc->get( $key );
+ $val = ObjectCache::getMainStashInstance()->get( $key );
+
return ( count( $val ) == 3 )
? array( $val[0], $val[1] )
: array( null, null );
}
- /*
+ /**
* Check if someone is currently reviewing a page
* @param int $pageId
* @return bool
@@ -65,11 +65,11 @@
return ( $m[0] !== null );
}
- /*
+ /**
* Set the flag for who is reviewing a page if not already set by
someone.
* If already set, then increment the instance counter (multiple
windows)
* and add on time to the expiry.
- *
+*
* @param User $user
* @param int $pageId
* @return bool flag set
@@ -79,7 +79,7 @@
return self::incUserReviewingItem( $key, $user,
self::PAGE_REVIEW_SEC );
}
- /*
+ /**
* Clear an instance of a user reviewing a page by decrementing the
counter.
* If it reaches 0 instances, then clear the flag for who is reviewing
the page.
* @param User $user
@@ -91,33 +91,32 @@
return self::decUserReviewingItem( $key, $user,
self::PAGE_REVIEW_SEC );
}
- /*
+ /**
* Totally clear the flag for who is reviewing a page.
* @param int $pageId
* @return void
*/
public static function clearAllReviewingPage( $pageId ) {
- global $wgMemc;
$key = wfMemcKey( 'flaggedrevs', 'userReviewingPage', $pageId );
- $wgMemc->delete( $key );
+ ObjectCache::getMainStashInstance()->delete( $key );
}
- /*
+ /**
* Get who is currently reviewing a diff
* @param int $oldId
* @param int $newId
* @return array (username or null, MW timestamp or null)
*/
public static function getUserReviewingDiff( $oldId, $newId ) {
- global $wgMemc;
$key = wfMemcKey( 'flaggedrevs', 'userReviewingDiff', $oldId,
$newId );
- $val = $wgMemc->get( $key );
+ $val = ObjectCache::getMainStashInstance()->get( $key );
+
return ( count( $val ) == 3 )
? array( $val[0], $val[1] )
: array( null, null );
}
- /*
+ /**
* Check if someone is currently reviewing a diff
* @param int $oldId
* @param int $newId
@@ -125,23 +124,26 @@
*/
public static function diffIsUnderReview( $oldId, $newId ) {
$m = self::getUserReviewingDiff( $oldId, $newId );
+
return ( $m[0] !== null );
}
- /*
+ /**
* Set the flag for who is reviewing a diff if not already set by
someone.
* If already set, then increment the instance counter (multiple
windows)
* and add on time to the expiry.
* @param User $user
-* @param int $pageId
+* @param int $oldId
+* @param int $newId
* @return bool flag set
*/
public static function setUserReviewingDiff( User $user, $oldId, $newId
) {
$key = wfMemcKey( 'flaggedrevs', 'userReviewingDiff', $oldId,
$newId );
+
return self::incUserReviewingItem( $key, $user,
self::CHANGE_REVIEW_SEC );
}
- /*
+ /**
* Clear an instance of a user reviewing a diff by decrementing the
counter.
* If it reaches 0 instances, then clear the flag for who is reviewing
the diff.
* @param User $user
@@ -151,63 +153,82 @@
*/
public static function clearUserReviewingDiff( User $user, $oldId,
$newId ) {
$key = wfMemcKey( 'flaggedrev
[MediaWiki-commits] [Gerrit] Fix not repeating the date header - change (operations...adminbot)
JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224215
Change subject: Fix not repeating the date header
..
Fix not repeating the date header
by comparing a list to a list instead of a tuple.
Change-Id: Ie3ff98218c36b948972694fe4dc93083e8ce9de3
---
M adminlog.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot
refs/changes/15/224215/1
diff --git a/adminlog.py b/adminlog.py
index 330bfb6..6ff1aea 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -41,7 +41,7 @@
except ValueError:
header_date = None
break
-if header_date != (now.year, now.month, now.day):
+if header_date != [now.year, now.month, now.day]:
lines.insert(0, "")
lines.insert(0, logline)
lines.insert(0, now.strftime("{0} %Y-%m-%d {0}".format(header)))
--
To view, visit https://gerrit.wikimedia.org/r/224215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3ff98218c36b948972694fe4dc93083e8ce9de3
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Redirect most noc.wikimedia.org/conf URLs to git.wikimedia.org - change (operations/puppet)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224214
Change subject: Redirect most noc.wikimedia.org/conf URLs to git.wikimedia.org
..
Redirect most noc.wikimedia.org/conf URLs to git.wikimedia.org
And then get rid of the symlinks in Id55b85ed
Maybe we want to point this towards Diffusion instead of Gitblit though?
Change-Id: I9c9fb19756bd7b3ab1e25b3a5a5d26dc6082d023
---
M modules/noc/templates/noc.wikimedia.org.erb
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/224214/1
diff --git a/modules/noc/templates/noc.wikimedia.org.erb
b/modules/noc/templates/noc.wikimedia.org.erb
index cb442e1..84df76c 100644
--- a/modules/noc/templates/noc.wikimedia.org.erb
+++ b/modules/noc/templates/noc.wikimedia.org.erb
@@ -15,6 +15,23 @@
RewriteRule ^/~(.+) https://people.wikimedia.org/~$1 [R=301,L]
RewriteRule ^/dbtree(.*)$ https://dbtree.wikimedia.org [R=301,L]
+RewriteCond %{QUERY_STRING} ^file=(.*)\.php$
+RewriteRule ^/conf/highlight\.php$
https://git.wikimedia.org/blob/operations\%2Fmediawiki-config.git/HEAD/wmf-config\%2F%1.php?
[R=301,L,NE]
+
+RewriteCond %{QUERY_STRING} ^file=(.*)\.dblist$
+RewriteRule ^/conf/highlight\.php$
https://git.wikimedia.org/blob/operations\%2Fmediawiki-config.git/HEAD/%1.dblist?
[R=301,L,NE]
+
+RewriteCond %{QUERY_STRING} ^file=extension-list(-labs|-wikitech)?$
+RewriteRule ^/conf/highlight\.php$
https://git.wikimedia.org/blob/operations\%2Fmediawiki-config.git/HEAD/extension-list%1?
[R=301,L,NE]
+
+RewriteCond %{QUERY_STRING}
^file=(fc-list|langlist|wikiversions(-labs)?\.json)$
+RewriteRule ^/conf/highlight\.php$
https://git.wikimedia.org/blob/operations\%2Fmediawiki-config.git/HEAD/%1?
[R=301,L,NE]
+
+RewriteRule ^/conf/(.*)\.txt$
https://git.wikimedia.org/raw/operations\%2Fmediawiki-config.git/HEAD/wmf-config\%2F$1
[R=301,L,NE]
+RewriteRule ^/conf/(.*)\.dblist$
https://git.wikimedia.org/raw/operations\%2Fmediawiki-config.git/HEAD/$1.dblist
[R=301,L,NE]
+RewriteRule ^/conf/extension-list(-labs|-wikitech)?$
https://git.wikimedia.org/raw/operations\%2Fmediawiki-config.git/HEAD/extension-list$1
[R=301,L,NE]
+RewriteRule ^/conf/(fc-list|langlist|wikiversions(-labs)?\.json)$
https://git.wikimedia.org/raw/operations\%2Fmediawiki-config.git/HEAD/$1
[R=301,L,NE]
+
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI}
[R=301,E=ProtoRedirect]
Header always merge Vary X-Forwarded-Proto env=ProtoRedirect
--
To view, visit https://gerrit.wikimedia.org/r/224214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c9fb19756bd7b3ab1e25b3a5a5d26dc6082d023
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move majority of privates/files usage to secret() - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224213
Change subject: move majority of privates/files usage to secret()
..
move majority of privates/files usage to secret()
This is all of the trivial cases, where a fixed path was hardcoded
as a file's source attribute.
Change-Id: I0db6fdb1c75355b58095e0ec29d6028bbc614649
---
M manifests/mail.pp
M manifests/role/access_new_install.pp
M manifests/role/ci.pp
M manifests/role/designate.pp
M manifests/role/ganeti.pp
M manifests/role/mha.pp
M modules/authdns/manifests/account.pp
M modules/gerrit/manifests/jetty.pp
M modules/icinga/manifests/init.pp
M modules/icinga/manifests/nsca/client.pp
M modules/icinga/manifests/nsca/daemon.pp
M modules/keyholder/manifests/private_key.pp
M modules/labstore/manifests/init.pp
M modules/lvs/manifests/balancer/runcommand.pp
M modules/mailman/manifests/webui.pp
M modules/mw-rc-irc/manifests/ircserver.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/nova/compute.pp
M modules/puppet/manifests/self/gitclone.pp
M modules/puppetmaster/manifests/gitpuppet.pp
M modules/scap/manifests/l10nupdate.pp
M modules/statistics/manifests/sites/stats.pp
22 files changed, 35 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/224213/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 22957e4..1bc238e 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -97,7 +97,7 @@
exim4::dkim { 'wikimedia.org':
domain => 'wikimedia.org',
selector => 'wikimedia',
-source =>
'puppet:///private/dkim/wikimedia.org-wikimedia.key',
+content => secret('dkim/wikimedia.org-wikimedia.key'),
}
}
@@ -113,7 +113,7 @@
exim4::dkim { 'lists.wikimedia.org':
domain => 'lists.wikimedia.org',
selector => 'wikimedia',
-source =>
'puppet:///private/dkim/lists.wikimedia.org-wikimedia.key',
+content => secret('dkim/lists.wikimedia.org-wikimedia.key'),
}
}
@@ -121,7 +121,7 @@
exim4::dkim { 'wiki-mail':
domain => 'wikimedia.org',
selector => 'wiki-mail',
-source =>
'puppet:///private/dkim/wikimedia.org-wiki-mail.key',
+content => secret('dkim/wikimedia.org-wiki-mail.key'),
}
}
diff --git a/manifests/role/access_new_install.pp
b/manifests/role/access_new_install.pp
index ab761dd..d6385de 100644
--- a/manifests/role/access_new_install.pp
+++ b/manifests/role/access_new_install.pp
@@ -6,12 +6,12 @@
owner => 'root',
group => 'root',
mode => '0400',
-source => 'puppet:///private/ssh/new_install/new_install',
+content => secret('ssh/new_install/new_install'),
}
file { '/root/.ssh/new_install.pub':
owner => 'root',
group => 'root',
mode => '0444',
-source => 'puppet:///private/ssh/new_install/new_install.pub',
+content => secret('ssh/new_install/new_install.pub'),
}
}
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index a73c727..3e4f7e6 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -116,7 +116,7 @@
owner => 'jenkins',
group => 'jenkins',
mode=> '0400',
-source => 'puppet:///private/ssh/ci/jenkins-mwext-sync_id_rsa',
+content => secret('ssh/ci/jenkins-mwext-sync_id_rsa'),
require => User['jenkins'],
}
@@ -220,7 +220,7 @@
ensure => present,
owner => 'npmtravis',
mode=> '0400',
-source => 'puppet:///private/ssh/ci/npmtravis_id_rsa',
+content => secret('ssh/ci/npmtravis_id_rsa'),
require => File['/home/npmtravis/.ssh'],
}
diff --git a/manifests/role/designate.pp b/manifests/role/designate.pp
index e5ddbef..75de288 100644
--- a/manifests/role/designate.pp
+++ b/manifests/role/designate.pp
@@ -101,6 +101,6 @@
owner => 'designate',
group => 'designate',
mode => '0400',
-source => 'puppet:///private/ssh/puppet_cert_manager/cert_manager'
+content => secret('ssh/puppet_cert_manager/cert_manager')
}
}
diff --git a/manifests/role/ganeti.pp b/manifests/role/ganeti.pp
index 05bb1c0..afd3221 100644
--- a/manifests/role/ganeti.pp
+++ b/manifests/role/ganeti.pp
@@ -17,7 +17,7 @@
owner => 'root',
group => 'root',
mode => '0400',
-source => 'puppet:///private/ganeti/id_dsa',
+content => secret('ganeti/id_dsa'),
}
# This is here for completeness
file { '/root/.ssh/id_dsa.pub':
diff --git a/manifests/role/mha.pp b/manifests/role/mha.pp
index 5d7d118..e0ba1e5 100644
--- a/manifests/role/mh
[MediaWiki-commits] [Gerrit] Fix new section creation for each edit - change (operations...adminbot)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224212
Change subject: Fix new section creation for each edit
..
Fix new section creation for each edit
Fix extracted date vs current data comparison. A list and a tuple with
the same contents are not == in python so both need be of the same type.
Change-Id: I89d69890b62c98974682cd697af5cb13167d0b90
---
M adminlog.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot
refs/changes/12/224212/1
diff --git a/adminlog.py b/adminlog.py
index 330bfb6..6ff1aea 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -41,7 +41,7 @@
except ValueError:
header_date = None
break
-if header_date != (now.year, now.month, now.day):
+if header_date != [now.year, now.month, now.day]:
lines.insert(0, "")
lines.insert(0, logline)
lines.insert(0, now.strftime("{0} %Y-%m-%d {0}".format(header)))
--
To view, visit https://gerrit.wikimedia.org/r/224212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89d69890b62c98974682cd697af5cb13167d0b90
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made recent changes purge jobs bail more aggressively - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Made recent changes purge jobs bail more aggressively
..
Made recent changes purge jobs bail more aggressively
* This should handle unusual spikes better
Bug: T104670
Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
---
M includes/jobqueue/jobs/RecentChangesUpdateJob.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
index e86d914..d6fa26b 100644
--- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
+++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
@@ -75,11 +75,13 @@
$lockKey = wfWikiID() . ':recentchanges-prune';
$dbw = wfGetDB( DB_MASTER );
- if ( !$dbw->lock( $lockKey, __METHOD__, 1 ) ) {
+ if ( !$dbw->lockIsFree( $lockKey, __METHOD__ )
+ || !$dbw->lock( $lockKey, __METHOD__, 1 )
+ ) {
return; // already in progress
}
- $batchSize = 100; // Avoid slave lag
+ $batchSize = 100; // avoid slave lag
$cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
do {
$rcIds = $dbw->selectFieldValues( 'recentchanges',
--
To view, visit https://gerrit.wikimedia.org/r/222626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] copy files/ to modules/secret/secrets, like prod - change (labs/private)
BBlack has submitted this change and it was merged. Change subject: copy files/ to modules/secret/secrets, like prod .. copy files/ to modules/secret/secrets, like prod Change-Id: I82bb840dc65adda282721c7eee5c65a7c94a2bfd --- M files/README A modules/secret/secrets/README A modules/secret/secrets/authdns/id_rsa A modules/secret/secrets/authdns/id_rsa.pub A modules/secret/secrets/backup/ssh-keys/amanda_backup A modules/secret/secrets/backup/ssh-keys/amanda_backup.pub A modules/secret/secrets/backup/ssh-keys/amanda_restore A modules/secret/secrets/backup/ssh-keys/amanda_restore.pub A modules/secret/secrets/backup/ssh-keys/authorized_keys A modules/secret/secrets/backup/ssh-keys/authorized_keys_client A modules/secret/secrets/backup/ssh-keys/authorized_keys_server A modules/secret/secrets/backup/ssh-keys/home-rsync A modules/secret/secrets/backup/ssh-keys/home-rsync.pub A modules/secret/secrets/cgi-bin/noc/ng/config.py A modules/secret/secrets/gerrit/id_rsa A modules/secret/secrets/icinga/nsca.cfg A modules/secret/secrets/icinga/send_nsca.cfg A modules/secret/secrets/lighttpd/htdigest A modules/secret/secrets/misc/frontend-hooks.inc.vcl A modules/secret/secrets/misc/fundraising/apache.conf.civicrm A modules/secret/secrets/misc/fundraising/apache.conf.civicrm-dev A modules/secret/secrets/misc/fundraising/apache.conf.civicrm-dev-ssl A modules/secret/secrets/misc/fundraising/apache.conf.civicrm-ssl A modules/secret/secrets/misc/fundraising/apache.conf.donate A modules/secret/secrets/misc/fundraising/apache.conf.fundraising A modules/secret/secrets/misc/fundraising/civicrm.civicrm.settings.php A modules/secret/secrets/misc/fundraising/civicrm.default.settings.php A modules/secret/secrets/misc/fundraising/civicrm.settings.php A modules/secret/secrets/misc/fundraising/dev.civicrm.civicrm.settings.php A modules/secret/secrets/misc/fundraising/dev.civicrm.default.settings.php A modules/secret/secrets/misc/fundraising/dev.civicrm.settings.php A modules/secret/secrets/misc/fundraising/logrotate.paypal_ipn A modules/secret/secrets/misc/fundraising/logrotate.pfp_pending_processor A modules/secret/secrets/misc/fundraising/misc.IPNListener_Recurring.php A modules/secret/secrets/misc/fundraising/misc.IPNListener_Standalone.php A modules/secret/secrets/misc/fundraising/misc.executeStompPFPPendingProcessorSA.php A modules/secret/secrets/misc/ircd.conf A modules/secret/secrets/misc/jenkins.config.xml A modules/secret/secrets/misc/udpmxircecho.py A modules/secret/secrets/misc/zerofetcher.auth A modules/secret/secrets/nagios/contacts.cfg A modules/secret/secrets/nagios/htpasswd.users A modules/secret/secrets/nagios/nsca_frack.cfg A modules/secret/secrets/powerdns/wikimedia-task-dns-auth A modules/secret/secrets/pybal/pybal-check A modules/secret/secrets/ssh/labs-puppet-key A modules/secret/secrets/ssh/labs-puppet-key.pub A modules/secret/secrets/ssh/root-authorized-keys A modules/secret/secrets/ssh/tin/l10nupdate/id_rsa A modules/secret/secrets/ssh/tin/l10nupdate/id_rsa.pub A modules/secret/secrets/ssl/*.wikimedia.org.key A modules/secret/secrets/ssl/*.wikimedia.org.pem A modules/secret/secrets/ssl/bugzilla.wikimedia.org.key A modules/secret/secrets/ssl/icinga-admin.wikimedia.org.key A modules/secret/secrets/ssl/icinga.wikimedia.org.key A modules/secret/secrets/ssl/nfs1.pmtpa.wmnet.key A modules/secret/secrets/ssl/nfs2.pmtpa.wmnet.key A modules/secret/secrets/ssl/sanger.wikimedia.org.key A modules/secret/secrets/ssl/star.mediawiki.org.key A modules/secret/secrets/ssl/star.planet.wmflabs.org.key A modules/secret/secrets/ssl/star.wikibooks.org.key A modules/secret/secrets/ssl/star.wikimedia.org.key A modules/secret/secrets/ssl/star.wikimediafoundation.org.key A modules/secret/secrets/ssl/star.wikinews.org.key A modules/secret/secrets/ssl/star.wikipedia.org.key A modules/secret/secrets/ssl/star.wikiquote.org.key A modules/secret/secrets/ssl/star.wikisource.org.key A modules/secret/secrets/ssl/star.wikiversity.org.key A modules/secret/secrets/ssl/star.wiktionary.org.key A modules/secret/secrets/ssl/star.wmflabs.key A modules/secret/secrets/ssl/star.wmflabs.org.key A modules/secret/secrets/ssl/stream.wikimedia.org.key A modules/secret/secrets/ssl/virt1.pmtpa.wmnet.key A modules/secret/secrets/svn/svn-authz 74 files changed, 279 insertions(+), 2 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/files/README b/files/README index df5beeb..cf40b11 100644 --- a/files/README +++ b/files/README @@ -1,3 +1,3 @@ -This private repo is *not* to be shared publically. Many files in this repo are empty. This is simply to satisfy puppet's dependencies. Some of these files should eventually be filled with content. Others, like the SSL keys, should *not*, unless they are made with a labs owned CA. +DO NOT PUT NEW FILES HERE -To be very specific, this repo should not be shared with anyone. If someone needs access, they should submit for
[MediaWiki-commits] [Gerrit] copy files/ to modules/secret/secrets, like prod - change (labs/private)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/224211 Change subject: copy files/ to modules/secret/secrets, like prod .. copy files/ to modules/secret/secrets, like prod Change-Id: I82bb840dc65adda282721c7eee5c65a7c94a2bfd --- M files/README A modules/secret/secrets/README A modules/secret/secrets/authdns/id_rsa A modules/secret/secrets/authdns/id_rsa.pub A modules/secret/secrets/backup/ssh-keys/amanda_backup A modules/secret/secrets/backup/ssh-keys/amanda_backup.pub A modules/secret/secrets/backup/ssh-keys/amanda_restore A modules/secret/secrets/backup/ssh-keys/amanda_restore.pub A modules/secret/secrets/backup/ssh-keys/authorized_keys A modules/secret/secrets/backup/ssh-keys/authorized_keys_client A modules/secret/secrets/backup/ssh-keys/authorized_keys_server A modules/secret/secrets/backup/ssh-keys/home-rsync A modules/secret/secrets/backup/ssh-keys/home-rsync.pub A modules/secret/secrets/cgi-bin/noc/ng/config.py A modules/secret/secrets/gerrit/id_rsa A modules/secret/secrets/icinga/nsca.cfg A modules/secret/secrets/icinga/send_nsca.cfg A modules/secret/secrets/lighttpd/htdigest A modules/secret/secrets/misc/frontend-hooks.inc.vcl A modules/secret/secrets/misc/fundraising/apache.conf.civicrm A modules/secret/secrets/misc/fundraising/apache.conf.civicrm-dev A modules/secret/secrets/misc/fundraising/apache.conf.civicrm-dev-ssl A modules/secret/secrets/misc/fundraising/apache.conf.civicrm-ssl A modules/secret/secrets/misc/fundraising/apache.conf.donate A modules/secret/secrets/misc/fundraising/apache.conf.fundraising A modules/secret/secrets/misc/fundraising/civicrm.civicrm.settings.php A modules/secret/secrets/misc/fundraising/civicrm.default.settings.php A modules/secret/secrets/misc/fundraising/civicrm.settings.php A modules/secret/secrets/misc/fundraising/dev.civicrm.civicrm.settings.php A modules/secret/secrets/misc/fundraising/dev.civicrm.default.settings.php A modules/secret/secrets/misc/fundraising/dev.civicrm.settings.php A modules/secret/secrets/misc/fundraising/logrotate.paypal_ipn A modules/secret/secrets/misc/fundraising/logrotate.pfp_pending_processor A modules/secret/secrets/misc/fundraising/misc.IPNListener_Recurring.php A modules/secret/secrets/misc/fundraising/misc.IPNListener_Standalone.php A modules/secret/secrets/misc/fundraising/misc.executeStompPFPPendingProcessorSA.php A modules/secret/secrets/misc/ircd.conf A modules/secret/secrets/misc/jenkins.config.xml A modules/secret/secrets/misc/udpmxircecho.py A modules/secret/secrets/misc/zerofetcher.auth A modules/secret/secrets/nagios/contacts.cfg A modules/secret/secrets/nagios/htpasswd.users A modules/secret/secrets/nagios/nsca_frack.cfg A modules/secret/secrets/powerdns/wikimedia-task-dns-auth A modules/secret/secrets/pybal/pybal-check A modules/secret/secrets/ssh/labs-puppet-key A modules/secret/secrets/ssh/labs-puppet-key.pub A modules/secret/secrets/ssh/root-authorized-keys A modules/secret/secrets/ssh/tin/l10nupdate/id_rsa A modules/secret/secrets/ssh/tin/l10nupdate/id_rsa.pub A modules/secret/secrets/ssl/*.wikimedia.org.key A modules/secret/secrets/ssl/*.wikimedia.org.pem A modules/secret/secrets/ssl/bugzilla.wikimedia.org.key A modules/secret/secrets/ssl/icinga-admin.wikimedia.org.key A modules/secret/secrets/ssl/icinga.wikimedia.org.key A modules/secret/secrets/ssl/nfs1.pmtpa.wmnet.key A modules/secret/secrets/ssl/nfs2.pmtpa.wmnet.key A modules/secret/secrets/ssl/sanger.wikimedia.org.key A modules/secret/secrets/ssl/star.mediawiki.org.key A modules/secret/secrets/ssl/star.planet.wmflabs.org.key A modules/secret/secrets/ssl/star.wikibooks.org.key A modules/secret/secrets/ssl/star.wikimedia.org.key A modules/secret/secrets/ssl/star.wikimediafoundation.org.key A modules/secret/secrets/ssl/star.wikinews.org.key A modules/secret/secrets/ssl/star.wikipedia.org.key A modules/secret/secrets/ssl/star.wikiquote.org.key A modules/secret/secrets/ssl/star.wikisource.org.key A modules/secret/secrets/ssl/star.wikiversity.org.key A modules/secret/secrets/ssl/star.wiktionary.org.key A modules/secret/secrets/ssl/star.wmflabs.key A modules/secret/secrets/ssl/star.wmflabs.org.key A modules/secret/secrets/ssl/stream.wikimedia.org.key A modules/secret/secrets/ssl/virt1.pmtpa.wmnet.key A modules/secret/secrets/svn/svn-authz 74 files changed, 279 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/private refs/changes/11/224211/1 diff --git a/files/README b/files/README index df5beeb..cf40b11 100644 --- a/files/README +++ b/files/README @@ -1,3 +1,3 @@ -This private repo is *not* to be shared publically. Many files in this repo are empty. This is simply to satisfy puppet's dependencies. Some of these files should eventually be filled with content. Others, like the SSL keys, should *not*, unless they are made with a labs owned CA. +DO NOT PUT NEW FILES HERE -To be very specific, this repo should not be shared with
[MediaWiki-commits] [Gerrit] mail: hiera-ise mailman and lists - change (operations/puppet)
John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224210
Change subject: mail: hiera-ise mailman and lists
..
mail: hiera-ise mailman and lists
Add default hiera values and turn hard coded values into hiera strings.
This adds supports for having puppetised and working mailman in labs allowing
us to replicate production, test changes like base::firewall and compatibility
of current puppet code with Debian Jessie.
Change-Id: I877a50737ccb141fb2a51e557a2abafefd1e6da6
---
A hieradata/role/common/mailman.yaml
M manifests/role/mail.pp
M modules/mailman/manifests/webui.pp
M modules/mailman/templates/lists.wikimedia.org.erb
4 files changed, 24 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/224210/1
diff --git a/hieradata/role/common/mailman.yaml
b/hieradata/role/common/mailman.yaml
new file mode 100644
index 000..023c4e5
--- /dev/null
+++ b/hieradata/role/common/mailman.yaml
@@ -0,0 +1,3 @@
+mailman::lists_ipv4: '208.80.154.4'
+mailman::lists_ipv6: '2620:0:861:1::2'
+mailman::lists_servername: 'lists.wikimedia.org'
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 29d6bff..5ab45ee 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -81,13 +81,13 @@
interface::ip { 'lists.wikimedia.org_v4':
interface => 'eth0',
-address => '208.80.154.4',
+address => hiera('mailman::lists_ipv4'),
prefixlen => '32',
}
interface::ip { 'lists.wikimedia.org_v6':
interface => 'eth0',
-address => '2620:0:861:1::2',
+address => hiera('mailman::lists_ipv6'),
prefixlen => '128',
}
diff --git a/modules/mailman/manifests/webui.pp
b/modules/mailman/manifests/webui.pp
index cf7fcc3..2a1f1fd 100644
--- a/modules/mailman/manifests/webui.pp
+++ b/modules/mailman/manifests/webui.pp
@@ -9,6 +9,7 @@
'auth_digest',
]: }
+$lists_servername = hiera('mailman::lists_servername')
$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat', '365')
apache::site { 'lists.wikimedia.org':
content => template('mailman/lists.wikimedia.org.erb'),
diff --git a/modules/mailman/templates/lists.wikimedia.org.erb
b/modules/mailman/templates/lists.wikimedia.org.erb
index 7561e52..1f2e774 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -2,14 +2,14 @@
ServerAdmin webmas...@wikimedia.org
-ServerName lists.wikimedia.org
+ServerName <= @lists_servername %>
RewriteEngine on
-RewriteRule ^/(.*)$ https://lists.wikimedia.org/$1 [R=301]
+RewriteRule ^/(.*)$ https://<= @lists_servername %>/$1 [R=301]
ServerAdmin webmas...@wikimedia.org
-ServerName lists.wikimedia.org
+ServerName <= @lists_servername %>
SSLEngine On
SSLCertificateFile /etc/ssl/localcerts/lists.wikimedia.org.crt
SSLCertificateChainFile /etc/ssl/localcerts/lists.wikimedia.org.chain.crt
@@ -42,8 +42,8 @@
Alias /pipermail/ "/var/lib/mailman/archives/public/"
Alias /images/"/usr/share/images/"
-RedirectMatch permanent ^/(index\.html?)?$
https://lists.wikimedia.org/mailman/listinfo
-RedirectMatch permanent ^/mailman/$
https://lists.wikimedia.org/mailman/listinfo
+RedirectMatch permanent ^/(index\.html?)?$ https://<= @lists_servername
%>/mailman/listinfo
+RedirectMatch permanent ^/mailman/$https://<= @lists_servername
%>/mailman/listinfo
# arbcom-l paranoia. Contact Tim Starling for details/rationale
@@ -69,18 +69,18 @@
RewriteRule ^(.*)$ - [F]
# list renames
-Redirect permanent /mailman/listinfo/foundation-l
https://lists.wikimedia.org/mailman/listinfo/wikimedia-l
-Redirect permanent /mailman/listinfo/museum-l
https://lists.wikimedia.org/mailman/listinfo/glam
-Redirect permanent /mailman/listinfo/mediawiki-cvs
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
-Redirect permanent /mailman/listinfo/wsor
https://lists.wikimedia.org/mailman/listinfo/wmfresearch
-Redirect permanent /mailman/listinfo/chaptercommittee-l
https://lists.wikimedia.org/mailman/listinfo/affcom
-Redirect permanent /mailman/listinfo/allhands
https://lists.wikimedia.org/mailman/listinfo/wmfreqs
-Redirect permanent /mailman/listinfo/research-team
https://lists.wikimedia.org/mailman/listinfo/research-internal
-Redirect permanent /mailman/listinfo/wikidata-l
https://lists.wikimedia.org/mailman/listinfo/wikidata
-Redirect permanent /mailman/listinfo/pywikipedia-l
https://lists.wikimedia.org/mailman/listinfo/pywikibot
-Redirect permanent /mailman/listinfo/pywikipedia-announce
https://lists.wikimedia.org/mailman/listinfo/pywikibot-announce
-Redirect permanent /
[MediaWiki-commits] [Gerrit] Stop click event propagation for - change (labs...crosswatch)
Sitic has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224209
Change subject: Stop click event propagation for
..
Stop click event propagation for
Change-Id: I119bcf84e4ad1ef4e7ea6e50db78d506c7dc957b
---
M backend/celery/tasks.py
M frontend/src/components/watchlist/edit_oneline.directive.html
M frontend/src/components/watchlist/edit_twolines.directive.html
M frontend/src/components/watchlist/entry.directive.html
M frontend/src/components/watchlist/page.directive.js
M frontend/src/components/watchlist/user.directive.js
6 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/crosswatch
refs/changes/09/224209/1
diff --git a/backend/celery/tasks.py b/backend/celery/tasks.py
index c9e91c2..fe4df54 100644
--- a/backend/celery/tasks.py
+++ b/backend/celery/tasks.py
@@ -95,7 +95,7 @@
def fix_urls(html, url):
-a = u'translate="MINOREDIT_FLAG">
-{{::event.title}}
()
diff --git a/frontend/src/components/watchlist/edit_twolines.directive.html
b/frontend/src/components/watchlist/edit_twolines.directive.html
index 50910bb..4413525 100644
--- a/frontend/src/components/watchlist/edit_twolines.directive.html
+++ b/frontend/src/components/watchlist/edit_twolines.directive.html
@@ -1,7 +1,7 @@
translate="MINOREDIT_FLAG">
-{{::event.title}}
()
diff --git a/frontend/src/components/watchlist/entry.directive.html
b/frontend/src/components/watchlist/entry.directive.html
index c31c419..9adbcbb 100644
--- a/frontend/src/components/watchlist/entry.directive.html
+++ b/frontend/src/components/watchlist/entry.directive.html
@@ -1,6 +1,6 @@
-
@@ -22,7 +22,7 @@
-
diff --git a/frontend/src/components/watchlist/page.directive.js
b/frontend/src/components/watchlist/page.directive.js
index f7b42f8..a3e79ac 100644
--- a/frontend/src/components/watchlist/page.directive.js
+++ b/frontend/src/components/watchlist/page.directive.js
@@ -6,7 +6,7 @@
var directive = {
link: link,
scope: true,
-template: '{{::event.title}} ' +
+template: '{{::event.title}} ' +
'' +
'()' +
'',
diff --git a/frontend/src/components/watchlist/user.directive.js
b/frontend/src/components/watchlist/user.directive.js
index 8390640..c246eb2 100644
--- a/frontend/src/components/watchlist/user.directive.js
+++ b/frontend/src/components/watchlist/user.directive.js
@@ -6,7 +6,7 @@
var directive = {
link: link,
scope: true,
-template: '{{::user}} ' +
+template: '{{::user}} ' +
'' +
'()' +
'',
--
To view, visit https://gerrit.wikimedia.org/r/224209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I119bcf84e4ad1ef4e7ea6e50db78d506c7dc957b
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stop click event propagation for - change (labs...crosswatch)
Sitic has submitted this change and it was merged.
Change subject: Stop click event propagation for
..
Stop click event propagation for
Change-Id: I119bcf84e4ad1ef4e7ea6e50db78d506c7dc957b
---
M backend/celery/tasks.py
M frontend/src/components/watchlist/edit_oneline.directive.html
M frontend/src/components/watchlist/edit_twolines.directive.html
M frontend/src/components/watchlist/entry.directive.html
M frontend/src/components/watchlist/page.directive.js
M frontend/src/components/watchlist/user.directive.js
6 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Sitic: Verified; Looks good to me, approved
diff --git a/backend/celery/tasks.py b/backend/celery/tasks.py
index c9e91c2..fe4df54 100644
--- a/backend/celery/tasks.py
+++ b/backend/celery/tasks.py
@@ -95,7 +95,7 @@
def fix_urls(html, url):
-a = u'translate="MINOREDIT_FLAG">
-{{::event.title}}
()
diff --git a/frontend/src/components/watchlist/edit_twolines.directive.html
b/frontend/src/components/watchlist/edit_twolines.directive.html
index 50910bb..4413525 100644
--- a/frontend/src/components/watchlist/edit_twolines.directive.html
+++ b/frontend/src/components/watchlist/edit_twolines.directive.html
@@ -1,7 +1,7 @@
translate="MINOREDIT_FLAG">
-{{::event.title}}
()
diff --git a/frontend/src/components/watchlist/entry.directive.html
b/frontend/src/components/watchlist/entry.directive.html
index c31c419..9adbcbb 100644
--- a/frontend/src/components/watchlist/entry.directive.html
+++ b/frontend/src/components/watchlist/entry.directive.html
@@ -1,6 +1,6 @@
-
@@ -22,7 +22,7 @@
-
diff --git a/frontend/src/components/watchlist/page.directive.js
b/frontend/src/components/watchlist/page.directive.js
index f7b42f8..a3e79ac 100644
--- a/frontend/src/components/watchlist/page.directive.js
+++ b/frontend/src/components/watchlist/page.directive.js
@@ -6,7 +6,7 @@
var directive = {
link: link,
scope: true,
-template: '{{::event.title}} ' +
+template: '{{::event.title}} ' +
'' +
'()' +
'',
diff --git a/frontend/src/components/watchlist/user.directive.js
b/frontend/src/components/watchlist/user.directive.js
index 8390640..c246eb2 100644
--- a/frontend/src/components/watchlist/user.directive.js
+++ b/frontend/src/components/watchlist/user.directive.js
@@ -6,7 +6,7 @@
var directive = {
link: link,
scope: true,
-template: '{{::user}} ' +
+template: '{{::user}} ' +
'' +
'()' +
'',
--
To view, visit https://gerrit.wikimedia.org/r/224209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I119bcf84e4ad1ef4e7ea6e50db78d506c7dc957b
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic
Gerrit-Reviewer: Sitic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add checkboxes to multiple select lists - change (labs...crosswatch)
Sitic has submitted this change and it was merged.
Change subject: Add checkboxes to multiple select lists
..
Add checkboxes to multiple select lists
Bug: T100157
Change-Id: I246a560fcba2002071b4b3b422e1845cb11fc011
---
M frontend/src/app/index.css
1 file changed, 42 insertions(+), 0 deletions(-)
Approvals:
Sitic: Verified; Looks good to me, approved
diff --git a/frontend/src/app/index.css b/frontend/src/app/index.css
index 586a456..868a0b4 100644
--- a/frontend/src/app/index.css
+++ b/frontend/src/app/index.css
@@ -49,6 +49,48 @@
border-left-color: rgba(0, 0, 0, 0.12);
}
+/** Add checkbox to multiple select, adapted from
https://github.com/angular/material/issues/3244 **/
+md-select-menu[multiple] md-option {
+ padding-right: 48px;
+}
+
+md-select-menu[multiple] md-option:before {
+ transition: 240ms;
+ position: absolute;
+ top: 13px;
+ right: 16px;
+ width: 16px;
+ height: 16px;
+ border: 2px solid;
+ border-radius: 2px;
+ content: ' ';
+ border-color: rgba(0, 0, 0, 0.54);
+ z-index: 1;
+}
+
+md-select-menu[multiple] md-option[selected]:before {
+ background-color: rgb(63,81,181);
+ border-color: rgb(63,81,181);
+}
+
+md-select-menu[multiple] md-option[selected]:after {
+ -webkit-transform: rotate(45deg);
+ transform: rotate(45deg);
+ position: absolute;
+ top: 15px;
+ right: 23px;
+ display: table;
+ width: 4px;
+ height: 12px;
+ border: 2px solid;
+ border-top: 0;
+ border-left: 0;
+ content: ' ';
+ z-index: 2;
+ border-color: rgb(238,238,238);
+}
+
+/** Links **/
a {
color: #0645ad;
text-decoration: none;
--
To view, visit https://gerrit.wikimedia.org/r/224207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I246a560fcba2002071b4b3b422e1845cb11fc011
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic
Gerrit-Reviewer: Sitic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add dummy lists.wm.o key - change (labs/private)
John F. Lewis has uploaded a new change for review. https://gerrit.wikimedia.org/r/224208 Change subject: add dummy lists.wm.o key .. add dummy lists.wm.o key Change-Id: Ic02d7894cb2418aaeab809928ae009a7a137aa58 --- A files/ssl/lists.wikimedia.org.key 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/private refs/changes/08/224208/1 diff --git a/files/ssl/lists.wikimedia.org.key b/files/ssl/lists.wikimedia.org.key new file mode 100644 index 000..8b13789 --- /dev/null +++ b/files/ssl/lists.wikimedia.org.key @@ -0,0 +1 @@ + -- To view, visit https://gerrit.wikimedia.org/r/224208 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic02d7894cb2418aaeab809928ae009a7a137aa58 Gerrit-PatchSet: 1 Gerrit-Project: labs/private Gerrit-Branch: master Gerrit-Owner: John F. Lewis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add checkboxes to multiple select lists - change (labs...crosswatch)
Sitic has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224207
Change subject: Add checkboxes to multiple select lists
..
Add checkboxes to multiple select lists
Bug: T100157
Change-Id: I246a560fcba2002071b4b3b422e1845cb11fc011
---
M frontend/src/app/index.css
1 file changed, 42 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/crosswatch
refs/changes/07/224207/1
diff --git a/frontend/src/app/index.css b/frontend/src/app/index.css
index 586a456..868a0b4 100644
--- a/frontend/src/app/index.css
+++ b/frontend/src/app/index.css
@@ -49,6 +49,48 @@
border-left-color: rgba(0, 0, 0, 0.12);
}
+/** Add checkbox to multiple select, adapted from
https://github.com/angular/material/issues/3244 **/
+md-select-menu[multiple] md-option {
+ padding-right: 48px;
+}
+
+md-select-menu[multiple] md-option:before {
+ transition: 240ms;
+ position: absolute;
+ top: 13px;
+ right: 16px;
+ width: 16px;
+ height: 16px;
+ border: 2px solid;
+ border-radius: 2px;
+ content: ' ';
+ border-color: rgba(0, 0, 0, 0.54);
+ z-index: 1;
+}
+
+md-select-menu[multiple] md-option[selected]:before {
+ background-color: rgb(63,81,181);
+ border-color: rgb(63,81,181);
+}
+
+md-select-menu[multiple] md-option[selected]:after {
+ -webkit-transform: rotate(45deg);
+ transform: rotate(45deg);
+ position: absolute;
+ top: 15px;
+ right: 23px;
+ display: table;
+ width: 4px;
+ height: 12px;
+ border: 2px solid;
+ border-top: 0;
+ border-left: 0;
+ content: ' ';
+ z-index: 2;
+ border-color: rgb(238,238,238);
+}
+
+/** Links **/
a {
color: #0645ad;
text-decoration: none;
--
To view, visit https://gerrit.wikimedia.org/r/224207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I246a560fcba2002071b4b3b422e1845cb11fc011
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Sitic
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid postgres IDE error with doQuery() visibility - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid postgres IDE error with doQuery() visibility
..
Avoid postgres IDE error with doQuery() visibility
Change-Id: I25061a5d72eaa5a455c65baf3023431b2d1628d6
---
M includes/db/DatabasePostgres.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 9ad76ab..56a5b2c 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -217,7 +217,7 @@
* @since 1.19
*/
class SavepointPostgres {
- /** @var DatabaseBase Establish a savepoint within a transaction */
+ /** @var DatabasePostgres Establish a savepoint within a transaction */
protected $dbw;
protected $id;
protected $didbegin;
--
To view, visit https://gerrit.wikimedia.org/r/222438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25061a5d72eaa5a455c65baf3023431b2d1628d6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Legoktm
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] Made the prior user existence check in LoginForm use DB_MASTER - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Made the prior user existence check in LoginForm use DB_MASTER
..
Made the prior user existence check in LoginForm use DB_MASTER
* This helps if multiple account creation attempts were made in a row
and the slave selected was lagged (either too much for Chronology
Protector or the user did not resend the cookies to link the session).
* The locking also better handles concurrent attempt to make another
account, especially with CentralAuth trying to make external accounts.
This assumes that the rate of concurrent account creations with close
names is low enough given trx speed to avoid gap locking issues. This
will need to be confirmed with low error log rates to be sure.
* The User::idFromName() method now includes a $flags parameter.
Bug: T104615
Change-Id: I8385526a19efc528a016ad2bbf376b377138966b
---
M includes/User.php
M includes/specials/SpecialUserlogin.php
2 files changed, 15 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index 63c0d37..dea9750 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3705,19 +3705,29 @@
/**
* If only this user's username is known, and it exists, return the
user ID.
+*
+* @param int $flags Bitfield of User:READ_* constants; useful for
existence checks
* @return int
*/
- public function idForName() {
+ public function idForName( $flags = 0 ) {
$s = trim( $this->getName() );
if ( $s === '' ) {
return 0;
}
- $dbr = wfGetDB( DB_SLAVE );
- $id = $dbr->selectField( 'user', 'user_id', array( 'user_name'
=> $s ), __METHOD__ );
+ $db = ( ( $flags & self::READ_LATEST ) == self::READ_LATEST )
+ ? wfGetDB( DB_MASTER )
+ : wfGetDB( DB_SLAVE );
+
+ $options = ( ( $flags & self::READ_LOCKING ) ==
self::READ_LOCKING )
+ ? array( 'FOR UPDATE' )
+ : array();
+
+ $id = $db->selectField( 'user', 'user_id', array( 'user_name'
=> $s ), __METHOD__, $options );
if ( $id === false ) {
$id = 0;
}
+
return $id;
}
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index 472fdb7..aa51415 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -529,9 +529,9 @@
# Now create a dummy user ($u) and check if it is valid
$u = User::newFromName( $this->mUsername, 'creatable' );
- if ( !is_object( $u ) ) {
+ if ( !$u ) {
return Status::newFatal( 'noname' );
- } elseif ( 0 != $u->idForName() ) {
+ } elseif ( 0 != $u->idForName( User::READ_LOCKING ) ) {
return Status::newFatal( 'userexists' );
}
--
To view, visit https://gerrit.wikimedia.org/r/224201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8385526a19efc528a016ad2bbf376b377138966b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed bitfield check in User::loadFromId() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed bitfield check in User::loadFromId()
..
Fixed bitfield check in User::loadFromId()
* READ_LOCKING is a composite field, so it can yeild 00, 01,
10, or 11 for the relevant two bits. Only one of them should
pass the check to avoid locking and snapshot breaking queries
for no reason.
Change-Id: Ief04ac20c7639fcf79443a3ee39a471542a59551
---
M includes/User.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index 63c0d37..26d54ab 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -387,7 +387,8 @@
// Try cache (unless this needs to lock the DB).
// NOTE: if this thread called saveSettings(), the cache was
cleared.
- if ( ( $flags & self::READ_LOCKING ) || !$this->loadFromCache()
) {
+ $locking = ( ( $flags & self::READ_LOCKING ) ==
self::READ_LOCKING );
+ if ( $locking || !$this->loadFromCache() ) {
wfDebug( "User: cache miss for user {$this->mId}\n" );
// Load from DB (make sure this thread sees its own
changes)
if ( wfGetLB()->hasOrMadeRecentMasterChanges() ) {
--
To view, visit https://gerrit.wikimedia.org/r/224203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief04ac20c7639fcf79443a3ee39a471542a59551
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use pool counter for page parses - change (mediawiki...FlaggedRevs)
jenkins-bot has submitted this change and it was merged.
Change subject: Use pool counter for page parses
..
Use pool counter for page parses
Bug: T95750
Change-Id: Ie2ca0e6ba73c87ae25503cc63dc3a6de7abe8d8b
---
M backend/FlaggedRevs.class.php
M frontend/FlaggablePageView.php
2 files changed, 68 insertions(+), 8 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/backend/FlaggedRevs.class.php b/backend/FlaggedRevs.class.php
old mode 100644
new mode 100755
index ff4c010..510abfc
--- a/backend/FlaggedRevs.class.php
+++ b/backend/FlaggedRevs.class.php
@@ -520,6 +520,46 @@
# Parsing functions #
/**
+* Get the HTML output of a revision, using PoolCounter in the process
+*
+* Returns a Status if pool is full, null if the revision is missing
+*
+* @param FlaggedRevision $frev
+* @param ParserOptions $pOpts
+* @return ParserOutput|Status|null
+*/
+ public static function parseStableRevisionPooled(
+ FlaggedRevision $frev, ParserOptions $pOpts
+ ) {
+ $page = WikiPage::factory( $frev->getTitle() );
+ $keyPrefix = FRParserCacheStable::singleton()->getKey( $page,
$pOpts );
+ $keyPrefix = $keyPrefix ?: wfMemcKey( 'articleview',
'missingcachekey' );
+
+ $work = new PoolCounterWorkViaCallback(
+ 'ArticleView', // use standard parse PoolCounter config
+ $keyPrefix . ':revid:' . $frev->getRevId(),
+ array(
+ 'doWork' => function () use ( $frev, $pOpts ) {
+ return
FlaggedRevs::parseStableRevision( $frev, $pOpts );
+ },
+ 'doCachedWork' => function () use ( $page,
$pOpts ) {
+ // Use new cache value from other thread
+ return
FRParserCacheStable::singleton()->get( $page, $pOpts );
+ },
+ 'fallback' => function () use ( $page, $pOpts )
{
+ // Use stale cache if possible
+ return
FRParserCacheStable::singleton()->getDirty( $page, $pOpts );
+ },
+ 'error' => function ( Status $status ) {
+ return $status;
+ },
+ )
+ );
+
+ return $work->execute();
+ }
+
+ /**
* Get the HTML output of a revision.
* @param FlaggedRevision $frev
* @param ParserOptions $pOpts
diff --git a/frontend/FlaggablePageView.php b/frontend/FlaggablePageView.php
index 85364db..863e0d8 100755
--- a/frontend/FlaggablePageView.php
+++ b/frontend/FlaggablePageView.php
@@ -681,23 +681,25 @@
# Cache hit. Note that redirects are not cached.
$this->out->addParserOutput( $parserOut );
} else {
+ $parserOut = false;
# Get the new stable parser output...
if ( FlaggedRevs::inclusionSetting() ==
FR_INCLUDES_CURRENT && $synced ) {
# We can try the current version cache, since
they are the same revision
$parserOut = ParserCache::singleton()->get(
$this->article, $pOpts );
- } else {
- $parserOut = false;
}
if ( !$parserOut ) {
- $parserOut = FlaggedRevs::parseStableRevision(
$srev, $pOpts );
+ # Actually parse the revision from source text
+ $parserOut =
FlaggedRevs::parseStableRevisionPooled( $srev, $pOpts );
}
- if ( !$parserOut ) { // serious error
- $this->out->addWikiMsg( 'missing-article',
-
$this->article->getTitle()->getPrefixedText(),
- $this->msg( 'missingarticle-rev',
$srev->getRevId() )->text()
- );
+ if ( $parserOut instanceof Status ) {
+ $this->showPoolError( $parserOut );
+
+ return null;
+ } elseif ( !( $parserOut instanceof ParserOutput ) ) {
// serious error
+ $this->showMissingRevError( $srev->getRevId() );
+
return null;
}
@@ -721,6 +723,24 @@
re
[MediaWiki-commits] [Gerrit] Apex, MediaWiki themes: Add a 'notice' icon, same as the 'al... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Apex, MediaWiki themes: Add a 'notice' icon, same as the
'alert' indicator
..
Apex, MediaWiki themes: Add a 'notice' icon, same as the 'alert' indicator
Change-Id: Ie5d14875cd3d6bdbcad58e823bde0c429291c0fc
---
M demos/pages/icons.js
M src/themes/apex/icons.json
A src/themes/apex/images/icons/notice.svg
M src/themes/mediawiki/icons.json
A src/themes/mediawiki/images/icons/notice.svg
5 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 50511f4..bd73f16 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -19,6 +19,7 @@
'info',
'menu',
'next',
+ 'notice',
'picture',
'previous',
'redo',
diff --git a/src/themes/apex/icons.json b/src/themes/apex/icons.json
index 9372363..2c5f858 100644
--- a/src/themes/apex/icons.json
+++ b/src/themes/apex/icons.json
@@ -28,6 +28,7 @@
"ltr": "images/icons/move-ltr.svg",
"rtl": "images/icons/move-rtl.svg"
} },
+ "notice": { "file": "images/icons/notice.svg" },
"picture": { "file": "images/icons/picture.svg" },
"previous": { "file": {
"ltr": "images/icons/move-rtl.svg",
diff --git a/src/themes/apex/images/icons/notice.svg
b/src/themes/apex/images/icons/notice.svg
new file mode 100644
index 000..b7fb2e7
--- /dev/null
+++ b/src/themes/apex/images/icons/notice.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24" id="svg3116">
+
+
+
+
diff --git a/src/themes/mediawiki/icons.json b/src/themes/mediawiki/icons.json
index a311de0..f351b5b 100644
--- a/src/themes/mediawiki/icons.json
+++ b/src/themes/mediawiki/icons.json
@@ -50,6 +50,7 @@
"ltr": "images/icons/move-ltr.svg",
"rtl": "images/icons/move-rtl.svg"
} },
+ "notice": { "file": "images/icons/notice.svg" },
"picture": { "file": "images/icons/picture.svg" },
"previous": { "file": {
"ltr": "images/icons/move-rtl.svg",
diff --git a/src/themes/mediawiki/images/icons/notice.svg
b/src/themes/mediawiki/images/icons/notice.svg
new file mode 100644
index 000..b7fb2e7
--- /dev/null
+++ b/src/themes/mediawiki/images/icons/notice.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24" id="svg3116">
+
+
+
+
--
To view, visit https://gerrit.wikimedia.org/r/224189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5d14875cd3d6bdbcad58e823bde0c429291c0fc
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Trevor Parscal
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] AstroPay audit glue module - change (wikimedia...crm)
XenoRyet has submitted this change and it was merged.
Change subject: AstroPay audit glue module
..
AstroPay audit glue module
TODO:
Better refund test coverage. Maybe get rid of the fakedb stuff,
since it's inconsistent and means different code paths for test.
Bug: T104718
Change-Id: I095134ec841f88613bcccbc4251874519b4f8042
---
M composer.lock
M sites/all/modules/wmf_audit/BaseAuditProcessor.php
A sites/all/modules/wmf_audit/astropay/AstroPayAuditProcessor.php
A sites/all/modules/wmf_audit/astropay/astropay_audit.info
A sites/all/modules/wmf_audit/astropay/astropay_audit.module
A sites/all/modules/wmf_audit/tests/AstroPayAuditTest.php
A
sites/all/modules/wmf_audit/tests/data/AstroPay/donation/wikimedia_report_2015-06-16.csv
A
sites/all/modules/wmf_audit/tests/data/AstroPay/refund/wikimedia_report_2015-06-16.csv
A sites/all/modules/wmf_audit/tests/data/logs/payments-astropay-20150617.gz
9 files changed, 421 insertions(+), 18 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index e27cb79..5d7a343 100644
--- a/composer.lock
+++ b/composer.lock
@@ -379,6 +379,7 @@
"phpseclib/Crypt/Random.php"
]
},
+"notification-url": "https://packagist.org/downloads/";,
"include-path": [
"phpseclib/"
],
@@ -428,10 +429,6 @@
"x.509",
"x509"
],
-"support": {
-"source": "https://github.com/phpseclib/phpseclib/tree/0.3.7";,
-"issues": "https://github.com/phpseclib/phpseclib/issues";
-},
"time": "2014-07-05 16:36:21"
},
{
@@ -693,13 +690,12 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "956eeef784777671dcb7090f7f79be4481e477c7"
+"reference": "a4fc38c376a5d404aa45157c86b8d55cf47c48c3"
},
"require": {
"coderkungfu/php-queue": "dev-master",
"fusesource/stomp-php": "2.1.*",
"monolog/monolog": "1.12.0",
-"predis/predis": "1.*",
"psr/log": "1.0.0",
"zordius/lightncandy": "0.18"
},
@@ -722,7 +718,7 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library",
-"time": "2015-06-28 20:10:36"
+"time": "2015-07-06 19:45:20"
},
{
"name": "wikimedia/smash-pig",
@@ -730,7 +726,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";,
-"reference": "405bfac00a1c4f42c89352b27414d3bf07a17a97"
+"reference": "e466dd074d545da123e71a0c629cb709cd4a1198"
},
"require": {
"fusesource/stomp-php": "2.*",
@@ -769,7 +765,7 @@
"donations",
"payments"
],
-"time": "2015-06-25 18:10:49"
+"time": "2015-07-07 23:30:21"
},
{
"name": "zordius/lightncandy",
@@ -1297,16 +1293,16 @@
},
{
"name": "phpunit/phpunit-mock-objects",
-"version": "2.3.4",
+"version": "2.3.5",
"source": {
"type": "git",
"url":
"https://github.com/sebastianbergmann/phpunit-mock-objects.git";,
-"reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35"
+"reference": "1c330b1b6e1ea8fd15f2fbea46770576e366855c"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/92408bb1968a81b3217a6fdf6c1a198da83caa35";,
-"reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35",
+"url":
"https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/1c330b1b6e1ea8fd15f2fbea46770576e366855c";,
+"reference": "1c330b1b6e1ea8fd15f2fbea46770576e366855c",
"shasum": ""
},
"require": {
@@ -1348,7 +1344,7 @@
"mock",
"xunit"
],
-"time": "2015-06-11 15:55:48"
+"time": "2015-07-04 05:41:32"
},
{
"name": "sebastian/comparator",
diff --git a/sites/all/modules/wmf_audit/BaseAuditProcessor.php
b/sites/all/modules/wmf_audit/BaseAuditProcessor.php
index ef73736..48c3f94 100644
--- a/sites/all/modules/wmf_audit/BaseAuditProcessor.php
+++ b/sites/all/modules/wmf_audit/BaseAuditProcessor.php
@@ -167,9 +167,7 @@
*/
prote
[MediaWiki-commits] [Gerrit] Add httpie and jq to convenienve command line tools - change (mediawiki/vagrant)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224206
Change subject: Add httpie and jq to convenienve command line tools
..
Add httpie and jq to convenienve command line tools
Adds httpie ("curl for humans", https://github.com/jkbrzt/httpie )
and jq ( a json processor, http://stedolan.github.io/jq/tutorial/ )
to the command line tools available in vagrant.
Change-Id: I6909f67b207cef1279a7ca97d48b29fa535ae9bb
---
M puppet/modules/misc/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/06/224206/1
diff --git a/puppet/modules/misc/manifests/init.pp
b/puppet/modules/misc/manifests/init.pp
index fc77404..fc4f3ef 100644
--- a/puppet/modules/misc/manifests/init.pp
+++ b/puppet/modules/misc/manifests/init.pp
@@ -22,7 +22,7 @@
mode => '0755',
}
-package { [ 'ack-grep', 'htop', 'curl' ]:
+package { [ 'ack-grep', 'htop', 'curl', 'httpie', 'jq' ]:
ensure => present,
}
--
To view, visit https://gerrit.wikimedia.org/r/224206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6909f67b207cef1279a7ca97d48b29fa535ae9bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tendril: add config template - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224205
Change subject: tendril: add config template
..
tendril: add config template
Change-Id: I827e1a960e6b28d9aac4f41557376bb406b5b86a
---
M modules/tendril/manifests/init.pp
A modules/tendril/templates/config.php.erb
2 files changed, 27 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/224205/1
diff --git a/modules/tendril/manifests/init.pp
b/modules/tendril/manifests/init.pp
index f3e2fcf..444c9ef 100644
--- a/modules/tendril/manifests/init.pp
+++ b/modules/tendril/manifests/init.pp
@@ -11,7 +11,10 @@
) {
include passwords::ldap::wmf_cluster
+include passwords::tendril
$proxypass = $passwords::ldap::wmf_cluster::proxypass
+$tendril_user_web = $passwords::tendril::db_user_web
+$tendril_pass_web = $passwords::tendril::db_pass_web
apache::site { $site_name:
content => template("tendril/apache/${site_name}.erb");
@@ -32,4 +35,11 @@
require => File['/srv/tendril'],
}
+file { '/srv/tendril/lib/config.php':
+ensure => 'present',
+owner => 'root',
+group => 'root',
+mode => '0444',
+content => template('tendril/config.php.erb'),
+}
}
diff --git a/modules/tendril/templates/config.php.erb
b/modules/tendril/templates/config.php.erb
new file mode 100644
index 000..0f160e4
--- /dev/null
+++ b/modules/tendril/templates/config.php.erb
@@ -0,0 +1,17 @@
+';
+$_ENV['db_pass'] = '<%= @tendril_pass_web %>';
+$_ENV['db_name'] = 'tendril';
+$_ENV['db_port'] = 3306;
+
+$_ENV['mc_host'] = '127.0.0.1';
+$_ENV['mc_port'] = 11211;
+
+$_ENV['pkg_default'] = 'host';
--
To view, visit https://gerrit.wikimedia.org/r/224205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I827e1a960e6b28d9aac4f41557376bb406b5b86a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use composer show to test for installed packages - change (mediawiki/vagrant)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224204
Change subject: Use composer show to test for installed packages
..
Use composer show to test for installed packages
Grepping is not reliable since a package can appear in the suggests
section, a require-dev section that does not get applied etc.
Change-Id: I74c8459ad54287b2bea592ca8e1b767c816fda2d
---
M puppet/modules/php/manifests/composer/require.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/04/224204/1
diff --git a/puppet/modules/php/manifests/composer/require.pp
b/puppet/modules/php/manifests/composer/require.pp
index f68fd55..d5ff312 100644
--- a/puppet/modules/php/manifests/composer/require.pp
+++ b/puppet/modules/php/manifests/composer/require.pp
@@ -54,7 +54,7 @@
if $ensure == 'present' {
exec { "composer-require-${safe_package}":
command => template('php/composer-require-command.erb'),
-unless => "grep '${title}' composer.lock",
+unless => "composer show --installed | ack -w '${title}'",
cwd => $directory,
environment => [
"COMPOSER_HOME=${::php::composer::home}",
@@ -65,7 +65,7 @@
} else {
exec { "composer-remove-${safe_package}":
command => template('php/composer-remove-command.erb'),
-onlyif => "grep '${title}' composer.lock",
+onlyif => "",
cwd => $directory,
environment => [
"COMPOSER_HOME=${::php::composer::home}",
--
To view, visit https://gerrit.wikimedia.org/r/224204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74c8459ad54287b2bea592ca8e1b767c816fda2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed bitfield check in User::loadFromId() - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224203
Change subject: Fixed bitfield check in User::loadFromId()
..
Fixed bitfield check in User::loadFromId()
* READ_LOCKING is a composite field, so it can yeild 00, 01,
10, or 11 for the relevant two bits. Only one of them should
pass the check to avoid locking and snapshot breaking queries
for no reason.
Change-Id: Ief04ac20c7639fcf79443a3ee39a471542a59551
---
M includes/User.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/03/224203/1
diff --git a/includes/User.php b/includes/User.php
index 63c0d37..26d54ab 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -387,7 +387,8 @@
// Try cache (unless this needs to lock the DB).
// NOTE: if this thread called saveSettings(), the cache was
cleared.
- if ( ( $flags & self::READ_LOCKING ) || !$this->loadFromCache()
) {
+ $locking = ( ( $flags & self::READ_LOCKING ) ==
self::READ_LOCKING );
+ if ( $locking || !$this->loadFromCache() ) {
wfDebug( "User: cache miss for user {$this->mId}\n" );
// Load from DB (make sure this thread sees its own
changes)
if ( wfGetLB()->hasOrMadeRecentMasterChanges() ) {
--
To view, visit https://gerrit.wikimedia.org/r/224203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief04ac20c7639fcf79443a3ee39a471542a59551
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ButtonWidget: Check protocol of 'href' client-side against a... - change (oojs/ui)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224202
Change subject: ButtonWidget: Check protocol of 'href' client-side against a
whitelist
..
ButtonWidget: Check protocol of 'href' client-side against a whitelist
We already check it server-side in PHP, do it client side too.
To parse the url, we create an tag, and have the browser parse it.
The protocol list is duplicated from PHP, but with colons at the end.
Bug: T105413
Change-Id: I34784083b742569657494c39c2674348e561943f
---
M php/Tag.php
M src/widgets/ButtonWidget.js
A tests/widgets/ButtonWidget.test.js
3 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/02/224202/1
diff --git a/php/Tag.php b/php/Tag.php
index 173f29e..a083cd3 100644
--- a/php/Tag.php
+++ b/php/Tag.php
@@ -296,6 +296,7 @@
// reasons to ever use 'javascript:' URLs
anyway.
$protocolWhitelist = array(
// Sourced from MediaWiki's
$wgUrlProtocols
+ // Keep in sync with
src/widgets/ButtonWidget.js
'bitcoin', 'ftp', 'ftps', 'geo', 'git',
'gopher', 'http', 'https', 'irc', 'ircs',
'magnet', 'mailto', 'mms', 'news',
'nntp', 'redis', 'sftp', 'sip', 'sips', 'sms', 'ssh',
'svn', 'tel', 'telnet', 'urn',
'worldwind', 'xmpp',
diff --git a/src/widgets/ButtonWidget.js b/src/widgets/ButtonWidget.js
index 4cfe274..9c57c25 100644
--- a/src/widgets/ButtonWidget.js
+++ b/src/widgets/ButtonWidget.js
@@ -138,6 +138,20 @@
*/
OO.ui.ButtonWidget.prototype.setHref = function ( href ) {
href = typeof href === 'string' ? href : null;
+ if ( href !== null ) {
+ // Keep in sync with php/Tag.php
+ var whitelist = [
+ 'bitcoin:', 'ftp:', 'ftps:', 'geo:', 'git:', 'gopher:',
'http:', 'https:', 'irc:', 'ircs:',
+ 'magnet:', 'mailto:', 'mms:', 'news:', 'nntp:',
'redis:', 'sftp:', 'sip:', 'sips:', 'sms:', 'ssh:',
+ 'svn:', 'tel:', 'telnet:', 'urn:', 'worldwind:', 'xmpp:'
+ ],
+ a = document.createElement( 'a' );
+ a.href = href;
+ if ( $.inArray( a.protocol, whitelist ) === -1 ) {
+ throw new Error( 'Non-whitelisted protocol found in
href: ' + href );
+ }
+
+ }
if ( href !== this.href ) {
this.href = href;
diff --git a/tests/widgets/ButtonWidget.test.js
b/tests/widgets/ButtonWidget.test.js
new file mode 100644
index 000..56e13f8
--- /dev/null
+++ b/tests/widgets/ButtonWidget.test.js
@@ -0,0 +1,20 @@
+QUnit.module( 'ButtonWdiget' );
+
+QUnit.test( 'setHref', 6, function ( assert ) {
+ var widget = new OO.ui.ButtonWidget();
+ function bad( url ) {
+ assert.throws( function () {
+ widget.setHref( url );
+ }, Error );
+ }
+ function good( url ) {
+ assert.ok( widget.setHref( url ) );
+ }
+ good( 'https://example.org' );
+ /*jshint scripturl:true*/
+ bad( 'javascript:evil()' );
+ bad( 'evil:foobar' );
+ good( '//example.com' );
+ good( 'index.php' );
+ good( '/index.php' );
+} );
--
To view, visit https://gerrit.wikimedia.org/r/224202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34784083b742569657494c39c2674348e561943f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made the prior user existence check in LoginForm use DB_MASTER - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224201
Change subject: Made the prior user existence check in LoginForm use DB_MASTER
..
Made the prior user existence check in LoginForm use DB_MASTER
* This helps if multiple account creation attempts were made in a row
and the slave selected was lagged (either too much for Chronology
Protector or the user did not resend the cookies to link the session).
* The locking also better handles concurrent attempt to make another
account, especially with CentralAuth trying to make external accounts.
This assumes that the rate of concurrent account creations with close
names is low enough given trx speed to avoid gap locking issues. This
will need to be confirmed with low error log rates to be sure.
* The User::idFromName() method now includes a $flags parameter.
Bug: T104615
Change-Id: I8385526a19efc528a016ad2bbf376b377138966b
---
M includes/User.php
M includes/specials/SpecialUserlogin.php
2 files changed, 15 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/01/224201/1
diff --git a/includes/User.php b/includes/User.php
index 63c0d37..dea9750 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3705,19 +3705,29 @@
/**
* If only this user's username is known, and it exists, return the
user ID.
+*
+* @param int $flags Bitfield of User:READ_* constants; useful for
existence checks
* @return int
*/
- public function idForName() {
+ public function idForName( $flags = 0 ) {
$s = trim( $this->getName() );
if ( $s === '' ) {
return 0;
}
- $dbr = wfGetDB( DB_SLAVE );
- $id = $dbr->selectField( 'user', 'user_id', array( 'user_name'
=> $s ), __METHOD__ );
+ $db = ( ( $flags & self::READ_LATEST ) == self::READ_LATEST )
+ ? wfGetDB( DB_MASTER )
+ : wfGetDB( DB_SLAVE );
+
+ $options = ( ( $flags & self::READ_LOCKING ) ==
self::READ_LOCKING )
+ ? array( 'FOR UPDATE' )
+ : array();
+
+ $id = $db->selectField( 'user', 'user_id', array( 'user_name'
=> $s ), __METHOD__, $options );
if ( $id === false ) {
$id = 0;
}
+
return $id;
}
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index 472fdb7..aa51415 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -529,9 +529,9 @@
# Now create a dummy user ($u) and check if it is valid
$u = User::newFromName( $this->mUsername, 'creatable' );
- if ( !is_object( $u ) ) {
+ if ( !$u ) {
return Status::newFatal( 'noname' );
- } elseif ( 0 != $u->idForName() ) {
+ } elseif ( 0 != $u->idForName( User::READ_LOCKING ) ) {
return Status::newFatal( 'userexists' );
}
--
To view, visit https://gerrit.wikimedia.org/r/224201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8385526a19efc528a016ad2bbf376b377138966b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updating adam wight's public ssh key - change (operations/puppet)
RobH has submitted this change and it was merged. Change subject: updating adam wight's public ssh key .. updating adam wight's public ssh key new laptop, new ssh key replacing the old one T105563 Change-Id: I57a8049e06b27c641d69004f2f77a2961d05e209 --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index d9b4bbf..e44ad17 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -512,8 +512,8 @@ gid: 500 name: awight realname: Adam Wight -ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDCVYUIFsCWN5odLFNGGMUJ/dgC2BB/EJ14srHC61BIWouLlahZdCOT5F2Zeuhs+aTigaTWtaFrYAOIfiChcPNSffVEMI+RTbMSZ9gXJxY294aDVe3xdd+XAZUVY0VKyPwIQbrNgTHDyKRbi5w+YmA26H02FjtcPrbYYojYI3uxNoLc/6cVJRBaKu1L+ZHqbZn4JesNlFUeEDo5Urv5TEI9K7qlfXbCdT/CMg6j9GyKlolJbAReay8+nUL4WwUMDmocy+mT1rWc+O2E7VfJw41A6GxM+TUVK+WP7dvzlHXDlatXy4PR7RvoUlxtZKjb7phSPOXvJjv5Gt6mrl6/qrwH -adamw@lytho] +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDUufKplYyhM0XXNnIljJdFO2SX/YbAltqDxcrQnjTIqY1aaspEjc0c1cEPBjnP7iheRcw8oEDYSjYf7Vlw2n00rFeA+dgz8XAADwwrYZ21Adsipqo80ngaQVvDiEDvvHHU6GXb3b16vFJVOn9oin+rx747Xd5gNxeAZPYr+tEy0WyPj2UYSsEZS4m2ZUhpbxY7OU1eDupAxpClsmMqW6reXdTJsVJCulCLs2nHndeE0NJkKtSuH2JDCB/7MfBT/DEhKo45G5b36f1lhJNwyzLQhZ5/ak/tAuw9nv/NmEB9G9m/xzgGBTGfWQUrjBNsT1isY7XbXvJ0bJ4/Gyu6ZJl/ +adamw] uid: 4974 awjrichards: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/224200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57a8049e06b27c641d69004f2f77a2961d05e209 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updating adam wight's public ssh key - change (operations/puppet)
RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/224200 Change subject: updating adam wight's public ssh key .. updating adam wight's public ssh key new laptop, new ssh key replacing the old one T105563 Change-Id: I57a8049e06b27c641d69004f2f77a2961d05e209 --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/00/224200/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index d9b4bbf..e44ad17 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -512,8 +512,8 @@ gid: 500 name: awight realname: Adam Wight -ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDCVYUIFsCWN5odLFNGGMUJ/dgC2BB/EJ14srHC61BIWouLlahZdCOT5F2Zeuhs+aTigaTWtaFrYAOIfiChcPNSffVEMI+RTbMSZ9gXJxY294aDVe3xdd+XAZUVY0VKyPwIQbrNgTHDyKRbi5w+YmA26H02FjtcPrbYYojYI3uxNoLc/6cVJRBaKu1L+ZHqbZn4JesNlFUeEDo5Urv5TEI9K7qlfXbCdT/CMg6j9GyKlolJbAReay8+nUL4WwUMDmocy+mT1rWc+O2E7VfJw41A6GxM+TUVK+WP7dvzlHXDlatXy4PR7RvoUlxtZKjb7phSPOXvJjv5Gt6mrl6/qrwH -adamw@lytho] +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDUufKplYyhM0XXNnIljJdFO2SX/YbAltqDxcrQnjTIqY1aaspEjc0c1cEPBjnP7iheRcw8oEDYSjYf7Vlw2n00rFeA+dgz8XAADwwrYZ21Adsipqo80ngaQVvDiEDvvHHU6GXb3b16vFJVOn9oin+rx747Xd5gNxeAZPYr+tEy0WyPj2UYSsEZS4m2ZUhpbxY7OU1eDupAxpClsmMqW6reXdTJsVJCulCLs2nHndeE0NJkKtSuH2JDCB/7MfBT/DEhKo45G5b36f1lhJNwyzLQhZ5/ak/tAuw9nv/NmEB9G9m/xzgGBTGfWQUrjBNsT1isY7XbXvJ0bJ4/Gyu6ZJl/ +adamw] uid: 4974 awjrichards: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/224200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57a8049e06b27c641d69004f2f77a2961d05e209 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add djvulibre-bin to travis apt package list - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/224199 Change subject: Add djvulibre-bin to travis apt package list .. Add djvulibre-bin to travis apt package list This is needed for the djvu tests. Support added: https://github.com/travis-ci/travis-ci/issues/3998 Change-Id: If677e4c66b03048980d77d42a9333a12c00a6112 --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/99/224199/1 diff --git a/.travis.yml b/.travis.yml index 0004dbf..39c880c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ addons: apt: packages: + - djvulibre-bin - graphviz - liblua5.1-0-dev -- To view, visit https://gerrit.wikimedia.org/r/224199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If677e4c66b03048980d77d42a9333a12c00a6112 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] urlencode titles in Parsoid URL - change (mediawiki...Flow)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224198
Change subject: urlencode titles in Parsoid URL
..
urlencode titles in Parsoid URL
This unbreaks titles containing strange characters ('%' in particular).
Bug: T105562
Change-Id: Ib538c95b2a9e23fac965c53fc67b16541ef4a386
---
M includes/Parsoid/Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/98/224198/1
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index 87b9300..1c021ce 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -98,7 +98,7 @@
}
$request = \MWHttpRequest::factory(
- $parsoidURL . '/' . $parsoidPrefix . '/' .
$title->getPrefixedDBkey(),
+ $parsoidURL . '/' . $parsoidPrefix . '/' . urlencode(
$title->getPrefixedDBkey() ),
array(
'method' => 'POST',
'postData' => wfArrayToCgi( $params ),
--
To view, visit https://gerrit.wikimedia.org/r/224198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib538c95b2a9e23fac965c53fc67b16541ef4a386
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Comment*: Use the same icon for the CE and UI renderings - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224197
Change subject: Comment*: Use the same icon for the CE and UI renderings
..
Comment*: Use the same icon for the CE and UI renderings
Relies on the 'alert' indicator being an icon in OOjs UI, done in Ie5d14875
there. Some of the tech debt implicit in ve.ce.CommentNode.css might plausibly
be fixed, but not today.
Bug: T94479
Change-Id: If8f56d42fb4758fa4da15935ea2aca6576276bb3
---
M src/ce/nodes/ve.ce.CommentNode.js
M src/ce/styles/nodes/ve.ce.CommentNode.css
M src/ui/contextitems/ve.ui.CommentContextItem.js
M src/ui/inspectors/ve.ui.CommentInspector.js
M src/ui/tools/ve.ui.InspectorTool.js
5 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/97/224197/1
diff --git a/src/ce/nodes/ve.ce.CommentNode.js
b/src/ce/nodes/ve.ce.CommentNode.js
index 7082dcc..b4b8b9d 100644
--- a/src/ce/nodes/ve.ce.CommentNode.js
+++ b/src/ce/nodes/ve.ce.CommentNode.js
@@ -10,7 +10,7 @@
* @class
* @extends ve.ce.LeafNode
* @mixins ve.ce.FocusableNode
- * @mixins OO.ui.mixin.IndicatorElement
+ * @mixins OO.ui.mixin.IconElement
*
* @constructor
* @param {ve.dm.CommentNode} model Model to observe
@@ -22,8 +22,8 @@
// Mixin constructors
ve.ce.FocusableNode.call( this, this.$element, config );
- OO.ui.mixin.IndicatorElement.call( this, $.extend( {}, config, {
- $indicator: this.$element, indicator: 'alert'
+ OO.ui.mixin.IconElement.call( this, $.extend( {}, config, {
+ $icon: this.$element, icon: 'notice'
} ) );
// DOM changes
@@ -37,7 +37,7 @@
OO.inheritClass( ve.ce.CommentNode, ve.ce.LeafNode );
OO.mixinClass( ve.ce.CommentNode, ve.ce.FocusableNode );
-OO.mixinClass( ve.ce.CommentNode, OO.ui.mixin.IndicatorElement );
+OO.mixinClass( ve.ce.CommentNode, OO.ui.mixin.IconElement );
/* Static Properties */
diff --git a/src/ce/styles/nodes/ve.ce.CommentNode.css
b/src/ce/styles/nodes/ve.ce.CommentNode.css
index 44ce126..1874640 100644
--- a/src/ce/styles/nodes/ve.ce.CommentNode.css
+++ b/src/ce/styles/nodes/ve.ce.CommentNode.css
@@ -4,7 +4,7 @@
* @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
*/
-.ve-ce-commentNode.oo-ui-indicatorElement.oo-ui-indicatorElement-indicator {
+.ve-ce-commentNode.oo-ui-iconElement.oo-ui-iconElement-icon {
display: inline-block;
vertical-align: middle;
padding: 0.2em;
@@ -13,6 +13,6 @@
height: 1em;
background-repeat: no-repeat;
background-position: center center;
- background-size: 12px 12px;
+ background-size: 24px 24px;
opacity: 0.5;
}
diff --git a/src/ui/contextitems/ve.ui.CommentContextItem.js
b/src/ui/contextitems/ve.ui.CommentContextItem.js
index c9fcada..51f9fbe 100644
--- a/src/ui/contextitems/ve.ui.CommentContextItem.js
+++ b/src/ui/contextitems/ve.ui.CommentContextItem.js
@@ -30,7 +30,7 @@
ve.ui.CommentContextItem.static.name = 'comment';
-ve.ui.CommentContextItem.static.icon = 'comment';
+ve.ui.CommentContextItem.static.icon = 'notice';
ve.ui.CommentContextItem.static.label = OO.ui.deferMsg(
'visualeditor-commentinspector-title' );
diff --git a/src/ui/inspectors/ve.ui.CommentInspector.js
b/src/ui/inspectors/ve.ui.CommentInspector.js
index bd60878..754c9fc 100644
--- a/src/ui/inspectors/ve.ui.CommentInspector.js
+++ b/src/ui/inspectors/ve.ui.CommentInspector.js
@@ -26,7 +26,7 @@
ve.ui.CommentInspector.static.name = 'comment';
-ve.ui.CommentInspector.static.icon = 'comment';
+ve.ui.CommentInspector.static.icon = 'notice';
ve.ui.CommentInspector.static.title =
OO.ui.deferMsg( 'visualeditor-commentinspector-title' );
diff --git a/src/ui/tools/ve.ui.InspectorTool.js
b/src/ui/tools/ve.ui.InspectorTool.js
index 6895e14..b41c644 100644
--- a/src/ui/tools/ve.ui.InspectorTool.js
+++ b/src/ui/tools/ve.ui.InspectorTool.js
@@ -86,7 +86,7 @@
OO.inheritClass( ve.ui.CommentInspectorTool, ve.ui.InspectorTool );
ve.ui.CommentInspectorTool.static.name = 'comment';
ve.ui.CommentInspectorTool.static.group = 'meta';
-ve.ui.CommentInspectorTool.static.icon = 'comment';
+ve.ui.CommentInspectorTool.static.icon = 'notice';
ve.ui.CommentInspectorTool.static.title =
OO.ui.deferMsg( 'visualeditor-commentinspector-tooltip' );
ve.ui.CommentInspectorTool.static.modelClasses = [ ve.dm.CommentNode ];
--
To view, visit https://gerrit.wikimedia.org/r/224197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8f56d42fb4758fa4da15935ea2aca6576276bb3
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimed
[MediaWiki-commits] [Gerrit] tendril: let puppet git clone on changes - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: tendril: let puppet git clone on changes
..
tendril: let puppet git clone on changes
Instead of just cloning once and never updating, we want
puppet to clone when there are changes in the repo.
Bug:T98816
Change-Id: If10dbe89748a8b3905ee47fbd420949d09ab6ef2
---
M modules/tendril/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/tendril/manifests/init.pp
b/modules/tendril/manifests/init.pp
index d493cf4..f3e2fcf 100644
--- a/modules/tendril/manifests/init.pp
+++ b/modules/tendril/manifests/init.pp
@@ -24,6 +24,7 @@
}
git::clone { 'operations/software/tendril':
+ensure=> 'latest',
directory => '/srv/tendril',
branch=> 'master',
owner => 'www-data',
--
To view, visit https://gerrit.wikimedia.org/r/224196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If10dbe89748a8b3905ee47fbd420949d09ab6ef2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tendril: let puppet git clone on changes - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224196
Change subject: tendril: let puppet git clone on changes
..
tendril: let puppet git clone on changes
Instead of just cloning once and never updating, we want
puppet to clone when there are changes in the repo.
Bug:T98816
Change-Id: If10dbe89748a8b3905ee47fbd420949d09ab6ef2
---
M modules/tendril/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/224196/1
diff --git a/modules/tendril/manifests/init.pp
b/modules/tendril/manifests/init.pp
index d493cf4..f3e2fcf 100644
--- a/modules/tendril/manifests/init.pp
+++ b/modules/tendril/manifests/init.pp
@@ -24,6 +24,7 @@
}
git::clone { 'operations/software/tendril':
+ensure=> 'latest',
directory => '/srv/tendril',
branch=> 'master',
owner => 'www-data',
--
To view, visit https://gerrit.wikimedia.org/r/224196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If10dbe89748a8b3905ee47fbd420949d09ab6ef2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "test secret() again on cp1008" - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Revert "test secret() again on cp1008"
..
Revert "test secret() again on cp1008"
This reverts commit 97bf2e9880a6b2f9b7f1fd2cd8e91ab74cc10b4c.
Change-Id: I6646f731f4a8a496dacfd40b0b1335003cdf9bfa
---
M manifests/site.pp
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 630a8ec..daf6f3f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -374,12 +374,6 @@
node 'cp1008.wikimedia.org' {
role cache::text, authdns::testns
interface::add_ip6_mapped { 'main': }
-file { '/tmp/secme':
-owner => 'root',
-group => 'root',
-mode => '0400',
-content => secret('ssl/foo'),
-}
}
node /^cp104[34]\.eqiad\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/224195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6646f731f4a8a496dacfd40b0b1335003cdf9bfa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "test secret() again on cp1008" - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224195
Change subject: Revert "test secret() again on cp1008"
..
Revert "test secret() again on cp1008"
This reverts commit 97bf2e9880a6b2f9b7f1fd2cd8e91ab74cc10b4c.
Change-Id: I6646f731f4a8a496dacfd40b0b1335003cdf9bfa
---
M manifests/site.pp
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/224195/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 630a8ec..daf6f3f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -374,12 +374,6 @@
node 'cp1008.wikimedia.org' {
role cache::text, authdns::testns
interface::add_ip6_mapped { 'main': }
-file { '/tmp/secme':
-owner => 'root',
-group => 'root',
-mode => '0400',
-content => secret('ssl/foo'),
-}
}
node /^cp104[34]\.eqiad\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/224195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6646f731f4a8a496dacfd40b0b1335003cdf9bfa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent back button hiding on scroll in chrome - change (mediawiki...MobileFrontend)
Sumit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224194
Change subject: Prevent back button hiding on scroll in chrome
..
Prevent back button hiding on scroll in chrome
Add "overflow: visible" to back button to prevent it from hiding in chrome when
scrolled.
Bug: T98846
Change-Id: Id27c14f07bc870ced9d333458b4a84f35621fc67
---
M resources/mobile.overlays/Overlay.less
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/94/224194/1
diff --git a/resources/mobile.overlays/Overlay.less
b/resources/mobile.overlays/Overlay.less
index d2c421d..2c44135 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -294,6 +294,9 @@
.overlay-header-container {
top: 0;
+ .back {
+ overflow: visible;
+ }
}
.overlay-footer-container {
--
To view, visit https://gerrit.wikimedia.org/r/224194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id27c14f07bc870ced9d333458b4a84f35621fc67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Sumit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fastlane dev - change (apps...wikipedia)
Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224193
Change subject: fastlane dev
..
fastlane dev
Change-Id: I3946c5c1a07f4cb1a800e54e713309825443d4b6
---
M
Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-WikipediaUnitTests-SDWebImage.xcscheme
M Wikipedia.xcodeproj/project.pbxproj
M fastlane/Appfile
M fastlane/Fastfile
4 files changed, 48 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/93/224193/1
diff --git
a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-WikipediaUnitTests-SDWebImage.xcscheme
b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-WikipediaUnitTests-SDWebImage.xcscheme
index bccb329..63388dc 100644
---
a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-WikipediaUnitTests-SDWebImage.xcscheme
+++
b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-WikipediaUnitTests-SDWebImage.xcscheme
@@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
+
+
+
+
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 02360c9..b7ebb01 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -4045,7 +4045,7 @@
"-Werror=incompatible-pointer-types",
"-Werror=incomplete-implementation",
);
- WMF_HOCKEYAPP_IDENTIFIER =
76947f174e31a9e33fe67d81ff31732e;
+ WMF_HOCKEYAPP_IDENTIFIER =
7138507aefac3ee74c295f75a0b857e4;
WRAPPER_EXTENSION = app;
};
name = Debug;
diff --git a/fastlane/Appfile b/fastlane/Appfile
index d361e8a..039b63a 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -19,5 +19,9 @@
for_lane :store do
app_identifier "org.wikimedia.wikipedia"
end
+
+ for_lane :dev do
+app_identifier "org.wikimedia.wikipedia.developer"
+ end
end
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 238639d..0b5c97a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -88,7 +88,38 @@
deliver beta: true
end
- desc "Upload AdHoc build to Hockey."
+ desc "Upload a developer build to Hockey."
+ lane :dev do
+sigh(
+ adhoc: true,
+ force: true,
+ filename: 'build/dev.mobileprovision'
+)
+# force iTunes file sharing to be enabled (normally disabled for release
builds)
+ENV['WMF_FORCE_ITUNES_FILE_SHARING'] = '1'
+# force debug menu to be shown
+ENV['WMF_FORCE_DEBUG_MENU'] = '1'
+xcargs=
["PROVISIONING_PROFILE=#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::SIGH_UDID]}",
+ # force app ID suffix to "developer"
+ "APP_ID_SUFFIX=.developer",
+ # force hockey app ID
+ "WMF_HOCKEYAPP_IDENTIFIER=7138507aefac3ee74c295f75a0b857e4"].join
' '
+ipa(
+ configuration: "Release",
+ scheme: "Wikipedia",
+ embed: 'build/dev.mobileprovision',
+ xcargs: xcargs
+)
+hockey(
+ notes: git_commit_log,
+ notify: '0', # Do not notify
+ status: '2', # Make available for download
+ release_type: '2' # 'alpha' release type
+)
+ end
+
+
+ desc "Upload AdHoc \"Release Candidate\" build to Hockey."
lane :rc do
sigh(
adhoc: true,
@@ -100,7 +131,7 @@
# force debug menu to be shown
ENV['WMF_FORCE_DEBUG_MENU'] = '1'
ipa(
- configuration: "Wikipedia",
+ configuration: "Release",
scheme: "Wikipedia",
embed: 'build/adhoc.mobileprovision',
xcargs:
"PROVISIONING_PROFILE=#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::SIGH_UDID]}"
@@ -121,7 +152,7 @@
filename: 'build/release.mobileprovision'
)
ipa(
- configuration: "Wikipedia",
+ configuration: "Release",
scheme: "Wikipedia",
embed: 'build/release.mobileprovision',
xcargs:
"PROVISIONING_PROFILE=#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::SIGH_UDID]}"
--
To view, visit https://gerrit.wikimedia.org/r/224193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3946c5c1a07f4cb1a800e54e713309825443d4b6
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: 5.0
Gerrit-Owner: Bgerstle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move teardown of MW-Selenium TMPDIR to slave script - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged. Change subject: Move teardown of MW-Selenium TMPDIR to slave script .. Move teardown of MW-Selenium TMPDIR to slave script See Ib289d784c7b3985bd4823d967fbc07d5759dc756 Change-Id: I49216b4985f911ef273751976c2c73bdcb43f502 --- A bin/mw-selenium-teardown.sh 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Dduvall: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/mw-selenium-teardown.sh b/bin/mw-selenium-teardown.sh new file mode 100755 index 000..1a0e036 --- /dev/null +++ b/bin/mw-selenium-teardown.sh @@ -0,0 +1,10 @@ +#!/bin/bash -eu + +. /srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh + +# Cleanup/recreate the TMPDIR since it's not a tmpfs location +if test -d "$TMPDIR"; then + rm -rf "$TMPDIR" +fi + +mkdir "$TMPDIR" -- To view, visit https://gerrit.wikimedia.org/r/224192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49216b4985f911ef273751976c2c73bdcb43f502 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Dduvall Gerrit-Reviewer: Dduvall 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] Move teardown of MW-Selenium TMPDIR to slave script - change (integration/jenkins)
Dduvall has uploaded a new change for review. https://gerrit.wikimedia.org/r/224192 Change subject: Move teardown of MW-Selenium TMPDIR to slave script .. Move teardown of MW-Selenium TMPDIR to slave script See Ib289d784c7b3985bd4823d967fbc07d5759dc756 Change-Id: I49216b4985f911ef273751976c2c73bdcb43f502 --- A bin/mw-selenium-teardown.sh 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/92/224192/1 diff --git a/bin/mw-selenium-teardown.sh b/bin/mw-selenium-teardown.sh new file mode 100755 index 000..1a0e036 --- /dev/null +++ b/bin/mw-selenium-teardown.sh @@ -0,0 +1,10 @@ +#!/bin/bash -eu + +. /srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh + +# Cleanup/recreate the TMPDIR since it's not a tmpfs location +if test -d "$TMPDIR"; then + rm -rf "$TMPDIR" +fi + +mkdir "$TMPDIR" -- To view, visit https://gerrit.wikimedia.org/r/224192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49216b4985f911ef273751976c2c73bdcb43f502 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Dduvall ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] site.pp - add comments about server roles - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224191
Change subject: site.pp - add comments about server roles
..
site.pp - add comments about server roles
Change-Id: If36f75a82128c69f5e521dc3d5da91e842667d8d
---
M manifests/site.pp
1 file changed, 29 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/224191/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 5be9eaa..7064f3b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -220,6 +220,7 @@
include role::authdns::server
}
+# Bastion in Virginia
node 'bast1001.wikimedia.org' {
interface::add_ip6_mapped { 'main':
@@ -239,6 +240,7 @@
}
}
+# Bastion in Texas
node 'bast2001.wikimedia.org' {
interface::add_ip6_mapped { 'main':
interface => 'eth0',
@@ -248,6 +250,7 @@
}
+# Bastion in California
node 'bast4001.wikimedia.org' {
interface::add_ip6_mapped { 'main':
interface => 'eth0',
@@ -947,6 +950,7 @@
}
}
+# Etherpad (virtual machine)
node 'etherpad1001.eqiad.wmnet' {
include base::firewall
include role::etherpad
@@ -982,6 +986,7 @@
}
+# ZIM dumps (https://en.wikipedia.org/wiki/ZIM_%28file_format%29)
node 'francium.eqiad.wmnet' {
role dumps::zim
@@ -1000,6 +1005,7 @@
include role::logging::relay::eventlogging
}
+# Continuous Integration
node 'gallium.wikimedia.org' {
$cluster = 'misc'
@@ -1034,6 +1040,7 @@
}
}
+# Virtualization hosts
node /^ganeti[12]00[0-9]\.(codfw|eqiad)\.wmnet$/ {
role ganeti
include standard
@@ -1051,6 +1058,7 @@
include role::webperf
}
+# poolcounter - careful
node 'helium.eqiad.wmnet' {
include standard
include role::poolcounter
@@ -1058,6 +1066,7 @@
include role::backup::storage
}
+# Bacula storage
node 'heze.codfw.wmnet' {
include standard
include role::backup::storage
@@ -1075,6 +1084,7 @@
include ldap::role::client::labs
}
+# bastion in the Netherlands
node 'hooft.esams.wikimedia.org' {
$ganglia_aggregator = true
@@ -1132,6 +1142,7 @@
}
}
+# ticket.wikimedia.org
node 'iodine.wikimedia.org' {
include base::firewall
role otrs
@@ -1141,6 +1152,7 @@
}
}
+# Phabricator
node 'iridium.eqiad.wmnet' {
interface::add_ip6_mapped { 'main':
interface => 'eth0',
@@ -1330,6 +1342,7 @@
}
+# secondary mailserver
node 'lead.wikimedia.org' {
role mail::mx
include standard
@@ -1630,6 +1643,7 @@
}
}
+# RT and the other RT
node 'magnesium.wikimedia.org' {
$cluster = 'misc'
@@ -1686,6 +1700,7 @@
include standard
}
+# also see dataset1001
node 'ms1001.wikimedia.org' {
$cluster = 'misc'
@@ -1935,6 +1950,7 @@
include ldap::role::client::labs
}
+# Icinga
node 'neon.wikimedia.org' {
include base::firewall
@@ -1965,6 +1981,7 @@
}
}
+# network monitoring tool server
node 'netmon1001.wikimedia.org' {
include standard
include webserver::apache
@@ -1995,6 +2012,7 @@
}
}
+# Offline Content Generator
node /^ocg100[123]\.eqiad\.wmnet$/ {
role ocg
}
@@ -2015,6 +2033,7 @@
include standard
}
+# primary puppet master
node 'palladium.eqiad.wmnet' {
include standard
include role::ipmi
@@ -2031,11 +2050,13 @@
include role::mariadb::parsercache
}
+# virtual machine hosting
https://wikitech.wikimedia.org/wiki/Planet.wikimedia.org
node 'planet1001.eqiad.wmnet' {
include base::firewall
include role::planet
}
+# LDAP servers relied on by OIT for mail
node /(plutonium|pollux)\.wikimedia\.org/ {
$cluster = 'openldap_corp_mirror'
@@ -2044,6 +2065,7 @@
include base::firewall
}
+# primary mail server
node 'polonium.wikimedia.org' {
role mail::mx
include standard
@@ -2063,6 +2085,7 @@
}
}
+# careful when moving poolcounters
node 'potassium.eqiad.wmnet' {
include standard
include role::poolcounter
@@ -2076,6 +2099,7 @@
include base::firewall
}
+# Tor relay
node 'radium.wikimedia.org' {
include base::firewall
include standard
@@ -2250,6 +2274,7 @@
include role::poolcounter
}
+# https://wikitech.wikimedia.org/wiki/Terbium
node 'terbium.eqiad.wmnet' {
include role::mediawiki::common
include role::db::maintenance
@@ -2367,15 +2392,18 @@
}
}
+# https://www.mediawiki.org/wiki/Parsoid
node /^wtp10(0[1-9]|1[0-9]|2[0-4])\.eqiad\.wmnet$/ {
role parsoid::production
}
+# https://www.mediawiki.org/wiki/Parsoid
node /^wtp20(0[1-9]|1[0-9]|2[0-4])\.codfw\.wmnet$/ {
role parsoid::production
include standard
}
+# https://www.mediawiki.org/wiki/Gerrit
node 'ytterbium.wikimedia.org' {
# Note: whenever moving Gerrit out of ytterbium, you will need
# to update the role::zuul::production
@@ -2385,6 +2413,7 @@
}
+# https://wikitech.wikimedia.org/wiki/Zir
[MediaWiki-commits] [Gerrit] Hide wikilove link if JavaScript is disabled - change (mediawiki...WikiLove)
jenkins-bot has submitted this change and it was merged.
Change subject: Hide wikilove link if JavaScript is disabled
..
Hide wikilove link if JavaScript is disabled
WikiLove currently requires JavaScript, so hide the link if it is
disabled since it won't do anything.
The ext.wikiLove.icon module is now loaded through addModuleStyles so it
will be applied for non-JS users.
Bug: T49624
Change-Id: I0f848e7f7bbc811f35eb5a6b05394f0e33e58d6c
---
M WikiLove.hooks.php
M resources/ext.wikiLove.icon.css
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikiLove.hooks.php b/WikiLove.hooks.php
index 36a298f..67343bb 100644
--- a/WikiLove.hooks.php
+++ b/WikiLove.hooks.php
@@ -64,7 +64,8 @@
$title = self::getUserTalkPage( $skin->getTitle(),
$skin->getUser() );
// getUserTalkPage() returns a string on error
if ( !is_string( $title ) ) {
- $out->addModules( array( 'ext.wikiLove.icon',
'ext.wikiLove.init' ) );
+ $out->addModules( 'ext.wikiLove.init' );
+ $out->addModuleStyles( 'ext.wikiLove.icon' );
self::$recipient = $title->getBaseText();
}
return true;
diff --git a/resources/ext.wikiLove.icon.css b/resources/ext.wikiLove.icon.css
index 9b3999e..318a5fc 100644
--- a/resources/ext.wikiLove.icon.css
+++ b/resources/ext.wikiLove.icon.css
@@ -50,3 +50,7 @@
#ca-wikilove.icon a:focus {
background-position: -19px 60%;
}
+
+.client-nojs li#ca-wikilove {
+ display: none;
+}
--
To view, visit https://gerrit.wikimedia.org/r/224022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f848e7f7bbc811f35eb5a6b05394f0e33e58d6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass function name in DatabaseMysqlBase::setBigSelects - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Pass function name in DatabaseMysqlBase::setBigSelects
..
Pass function name in DatabaseMysqlBase::setBigSelects
This allow to see the correct function name in the debug logs
Change-Id: I913acbc39e8e7b21f647b544ef161574c5f720f8
---
M includes/db/DatabaseMysqlBase.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/DatabaseMysqlBase.php
b/includes/db/DatabaseMysqlBase.php
index e326909..846da1c 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -940,7 +940,7 @@
$value = $this->mDefaultBigSelects;
}
} elseif ( $this->mDefaultBigSelects === null ) {
- $this->mDefaultBigSelects = (bool)$this->selectField(
false, '@@sql_big_selects' );
+ $this->mDefaultBigSelects = (bool)$this->selectField(
false, '@@sql_big_selects', '', __METHOD__ );
}
$encValue = $value ? '1' : '0';
$this->query( "SET sql_big_selects=$encValue", __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/224186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I913acbc39e8e7b21f647b544ef161574c5f720f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Legoktm
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] Work around /etc/default/elasticsearch variable expansion issue - change (operations/puppet)
Gage has submitted this change and it was merged.
Change subject: Work around /etc/default/elasticsearch variable expansion issue
..
Work around /etc/default/elasticsearch variable expansion issue
When logstash1004 (jessie host) was upgraded to Elasticsearch 1.6.0 the
service failed to start with the error message:
Error: Could not find or load main class ${ES_JAVA_OPTS}
Adding `set -x` to /usr/share/elasticsearch/bin/elasticsearch showed
that the java command line constructed by that script and
/etc/init.d/elasticsearch contained this substring in the middle:
-Dfile.encoding=UTF-8 ${ES_JAVA_OPTS} -XX:GCHeapFreeLimit=10
`-Dfile.encoding=UTF-8` is the end of $JAVA_OPTS. `${ES_JAVA_OPTS}
-XX:GCHeapFreeLimit=10` is the last line of $ES_JAVA_OPTS that we were
configuring in /etc/default/elasticsearch but in a strange state where
the variable expansion had not been performed when
/etc/init.d/elasticsearch sourced the defaults file.
Change-Id: If2fd861b0bbb345317c90f0ca08e3df4a9a20bcc
---
M modules/elasticsearch/templates/elasticsearch.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Gage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/elasticsearch/templates/elasticsearch.erb
b/modules/elasticsearch/templates/elasticsearch.erb
index 0c0f8cf..eaed6c2 100644
--- a/modules/elasticsearch/templates/elasticsearch.erb
+++ b/modules/elasticsearch/templates/elasticsearch.erb
@@ -35,6 +35,6 @@
#CONF_FILE=/etc/elasticsearch/elasticsearch.yml
# Additional Java OPTS
-ES_JAVA_OPTS="-XX:HeapDumpPath=/var/lib/elasticsearch "
-ES_JAVA_OPTS="${ES_JAVA_OPTS} -XX:GCTimeLimit=70"
-ES_JAVA_OPTS="${ES_JAVA_OPTS} -XX:GCHeapFreeLimit=10"
+# Note: We've seen problems on some jessie hosts when this setting is
+# constructed by consecutive ES_JAVA_OPTS="${ES_JAVA_OPTS} ..." settings
+ES_JAVA_OPTS="-XX:HeapDumpPath=/var/lib/elasticsearch -XX:GCTimeLimit=70
-XX:GCHeapFreeLimit=10"
--
To view, visit https://gerrit.wikimedia.org/r/224185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If2fd861b0bbb345317c90f0ca08e3df4a9a20bcc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: Gage
Gerrit-Reviewer: Manybubbles
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apex, MediaWiki themes: Add a 'notice' icon, same as the 'al... - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224189
Change subject: Apex, MediaWiki themes: Add a 'notice' icon, same as the
'alert' indicator
..
Apex, MediaWiki themes: Add a 'notice' icon, same as the 'alert' indicator
Change-Id: Ie5d14875cd3d6bdbcad58e823bde0c429291c0fc
---
M demos/pages/icons.js
M src/themes/apex/icons.json
A src/themes/apex/images/icons/notice.svg
M src/themes/mediawiki/icons.json
A src/themes/mediawiki/images/icons/notice.svg
5 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/89/224189/1
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index 50511f4..bd73f16 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -19,6 +19,7 @@
'info',
'menu',
'next',
+ 'notice',
'picture',
'previous',
'redo',
diff --git a/src/themes/apex/icons.json b/src/themes/apex/icons.json
index 9372363..2c5f858 100644
--- a/src/themes/apex/icons.json
+++ b/src/themes/apex/icons.json
@@ -28,6 +28,7 @@
"ltr": "images/icons/move-ltr.svg",
"rtl": "images/icons/move-rtl.svg"
} },
+ "notice": { "file": "images/icons/notice.svg" },
"picture": { "file": "images/icons/picture.svg" },
"previous": { "file": {
"ltr": "images/icons/move-rtl.svg",
diff --git a/src/themes/apex/images/icons/notice.svg
b/src/themes/apex/images/icons/notice.svg
new file mode 100644
index 000..b7fb2e7
--- /dev/null
+++ b/src/themes/apex/images/icons/notice.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24" id="svg3116">
+
+
+
+
diff --git a/src/themes/mediawiki/icons.json b/src/themes/mediawiki/icons.json
index a311de0..f351b5b 100644
--- a/src/themes/mediawiki/icons.json
+++ b/src/themes/mediawiki/icons.json
@@ -50,6 +50,7 @@
"ltr": "images/icons/move-ltr.svg",
"rtl": "images/icons/move-rtl.svg"
} },
+ "notice": { "file": "images/icons/notice.svg" },
"picture": { "file": "images/icons/picture.svg" },
"previous": { "file": {
"ltr": "images/icons/move-rtl.svg",
diff --git a/src/themes/mediawiki/images/icons/notice.svg
b/src/themes/mediawiki/images/icons/notice.svg
new file mode 100644
index 000..b7fb2e7
--- /dev/null
+++ b/src/themes/mediawiki/images/icons/notice.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24" id="svg3116">
+
+
+
+
--
To view, visit https://gerrit.wikimedia.org/r/224189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5d14875cd3d6bdbcad58e823bde0c429291c0fc
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove code duplication from monolog config - change (operations/mediawiki-config)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/224188 Change subject: Remove code duplication from monolog config .. Remove code duplication from monolog config Change-Id: Ia96020366fc9c53a9ad20a911fd7f1a4fcdf68f8 --- M wmf-config/logging.php 1 file changed, 1 insertion(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/88/224188/1 diff --git a/wmf-config/logging.php b/wmf-config/logging.php index f73e75d..2f3e861 100644 --- a/wmf-config/logging.php +++ b/wmf-config/logging.php @@ -57,23 +57,7 @@ ), ), - 'processors' => array( - 'wiki' => array( - 'class' => '\\MediaWiki\\Logger\\Monolog\\WikiProcessor', - ), - 'psr' => array( - 'class' => '\\Monolog\\Processor\\PsrLogMessageProcessor', - ), - 'pid' => array( - 'class' => '\\Monolog\\Processor\\ProcessIdProcessor', - ), - 'uid' => array( - 'class' => '\\Monolog\\Processor\\UidProcessor', - ), - 'web' => array( - 'class' => '\\Monolog\\Processor\\WebProcessor', - ), - ), + 'processors' => $wmgMonologProcessors, 'handlers' => array( 'blackhole' => array( -- To view, visit https://gerrit.wikimedia.org/r/224188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia96020366fc9c53a9ad20a911fd7f1a4fcdf68f8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix edit pencil active state for RTL languages - change (mediawiki...MobileApp)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix edit pencil active state for RTL languages
..
Fix edit pencil active state for RTL languages
iOS doesn't want all our Android-specific stylings. This change allows
for deviation in the edit pencil.
Corresponding frontend patches:
- Android: https://gerrit.wikimedia.org/r/223225/
- iOS: https://gerrit.wikimedia.org/r/#/c/222369/
Bug: T103711
Change-Id: I4b90137fe33c0bcb01e091b3113278b454c2005c
---
M styles/editlinks.less
1 file changed, 32 insertions(+), 5 deletions(-)
Approvals:
Mholloway: Looks good to me, approved
Bgerstle: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/styles/editlinks.less b/styles/editlinks.less
index 3fede6f..5bb7dae 100644
--- a/styles/editlinks.less
+++ b/styles/editlinks.less
@@ -1,17 +1,32 @@
a.edit_section_button {
-height: 48px;
-width: 48px;
+height: 32px;
+width: 32px;
+border: 8px solid transparent;
/* @embed */
background-image: url("../images/edit.png");
background-repeat: no-repeat;
background-size: 32px 32px;
-background-position: center;
float: right;
display: inline-float;
+}
+
+a.edit_section_button.android {
+height: 48px;
+width: 48px;
+border: none;
+background-position: center;
position: relative;
}
-a.edit_section_button:before {
+a.edit_section_button:active {
+background-color: rgba(128,128,128,.1);
+}
+
+a.edit_section_button.android:active {
+background-color: transparent;
+}
+
+a.edit_section_button.android:before {
/* inactive background transform */
content: "";
position: absolute;
@@ -23,7 +38,7 @@
transition: transform 300ms cubic-bezier(0.250, 0.460, 0.450, 0.940); /*
ease out quad */
}
-a.edit_section_button:active:before {
+a.edit_section_button.android:active:before {
/* active background transform */
width: 200%;
height: 200%;
@@ -59,3 +74,15 @@
-webkit-transform: scaleX(-1);
transform: scaleX(-1);
}
+
+.content-rtl a.edit_section_button.android {
+-webkit-transform: none;
+transform: none;
+}
+
+.content-rtl .edit_section_button_wrapper.android {
+float: left;
+/* Flip it! */
+-webkit-transform: scaleX(-1);
+transform: scaleX(-1);
+}
--
To view, visit https://gerrit.wikimedia.org/r/219421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b90137fe33c0bcb01e091b3113278b454c2005c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: BearND
Gerrit-Reviewer: Bgerstle
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Fjalapeno
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Mhurd
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Escape data-mw as well as data-parsoid in tokenizer. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Escape data-mw as well as data-parsoid in tokenizer.
..
Escape data-mw as well as data-parsoid in tokenizer.
Change-Id: I0b5c99baa2c3a0d8766a40bf0f2428ccc93c4455
---
M lib/pegTokenizer.pegjs.txt
M tests/parserTests.txt
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index 938fb25..ffa3e37 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -1250,7 +1250,7 @@
// Encapsulate protected attributes.
if ( typeof name === "string" ) {
name = name.replace(
-/^(about|data-parsoid.*|data-x.*|property|rel|typeof)$/i,
+/^(about|data-mw.*|data-parsoid.*|data-x.*|property|rel|typeof)$/i,
"data-x-$1" );
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index a4a2e34..55187a9 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -23394,9 +23394,9 @@
!!test
Encapsulate protected attributes from wt
!! wikitext
-foo
+foo
!! html/parsoid
-foo
+foo
!!end
--
To view, visit https://gerrit.wikimedia.org/r/224187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b5c99baa2c3a0d8766a40bf0f2428ccc93c4455
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
Gerrit-Reviewer: Arlolra
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 search suggestions to 5.0 - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Add search suggestions to 5.0
..
Add search suggestions to 5.0
T105023
Added delegate call back to recent searches
Added recent searches as sub-VC of search VC
Change-Id: I4683f382647846049e6a7c722f977aefd93aa279
---
M Wikipedia/UI-V5/WMFSearchViewController.m
M Wikipedia/UI-V5/iPhone_Root.storyboard
M Wikipedia/View Controllers/RecentSearches/RecentSearchesViewController.h
M Wikipedia/View Controllers/RecentSearches/RecentSearchesViewController.m
M Wikipedia/View Controllers/SearchResults/SearchResultsController.m
5 files changed, 147 insertions(+), 25 deletions(-)
Approvals:
Mhurd: Looks good to me, but someone else must approve
Bgerstle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikipedia/UI-V5/WMFSearchViewController.m
b/Wikipedia/UI-V5/WMFSearchViewController.m
index 1ca94ba..43a699c 100644
--- a/Wikipedia/UI-V5/WMFSearchViewController.m
+++ b/Wikipedia/UI-V5/WMFSearchViewController.m
@@ -1,5 +1,6 @@
#import "WMFSearchViewController.h"
+#import "RecentSearchesViewController.h"
#import "WMFArticleListCollectionViewController.h"
#import "WMFSearchFetcher.h"
@@ -13,11 +14,15 @@
static NSUInteger const kWMFMinResultsBeforeAutoFullTextSearch = 12;
-@interface WMFSearchViewController ()
+@interface WMFSearchViewController ()
+
+@property (nonatomic, strong) RecentSearchesViewController*
recentSearchesViewController;
@property (nonatomic, strong) WMFArticleListCollectionViewController*
resultsListController;
+
@property (strong, nonatomic) IBOutlet UISearchBar* searchBar;
@property (strong, nonatomic) IBOutlet UIButton* searchSuggestionButton;
@property (strong, nonatomic) IBOutlet UIView* resultsListContainerView;
+@property (strong, nonatomic) IBOutlet UIView* recentSearchesContainerView;
@property (nonatomic, strong) WMFSearchFetcher* fetcher;
@@ -60,6 +65,14 @@
[self.delegate searchController:self searchStateDidChange:self.state];
}
+- (void)updateRecentSearchesVisibility {
+if ([self.searchBar.text length] == 0 && [self.searchBar isFirstResponder]
&& self.recentSearchesViewController.recentSearchesItemCount > 0) {
+[self.recentSearchesContainerView setHidden:NO];
+} else {
+[self.recentSearchesContainerView setHidden:YES];
+}
+}
+
#pragma mark - DataSource KVO
- (void)observeSavedPages {
@@ -85,12 +98,18 @@
if ([segue.destinationViewController
isKindOfClass:[WMFArticleListCollectionViewController class]]) {
self.resultsListController = segue.destinationViewController;
}
+if ([segue.destinationViewController
isKindOfClass:[RecentSearchesViewController class]]) {
+self.recentSearchesViewController =
segue.destinationViewController;
+self.recentSearchesViewController.delegate = self;
+}
}
#pragma mark - UISearchBarDelegate
- (void)searchBarTextDidBeginEditing:(UISearchBar*)searchBar {
[self updateSearchStateAndNotifyDelegate:WMFSearchStateActive];
+
+[self updateRecentSearchesVisibility];
[self.searchBar setShowsCancelButton:YES animated:YES];
@@ -102,6 +121,12 @@
}
- (void)searchBar:(UISearchBar*)searchBar textDidChange:(NSString*)searchText {
+[self updateRecentSearchesVisibility];
+
+if ([searchText length] == 0) {
+self.resultsListController.dataSource = nil;
+}
+
dispatchOnMainQueueAfterDelayInSeconds(0.4, ^{
if ([searchText isEqualToString:self.searchBar.text]) {
[self searchForSearchTerm:searchText];
@@ -110,12 +135,15 @@
}
- (void)searchBarTextDidEndEditing:(UISearchBar*)searchBar {
+[self updateRecentSearchesVisibility];
}
- (void)searchBarSearchButtonClicked:(UISearchBar*)searchBar {
+[self updateRecentSearchesVisibility];
}
- (void)searchBarCancelButtonClicked:(UISearchBar*)searchBar {
+[self updateRecentSearchesVisibility];
[self updateSearchStateAndNotifyDelegate:WMFSearchStateInactive];
self.searchBar.text = nil;
self.resultsListController.dataSource = nil;
@@ -141,7 +169,10 @@
return [AnyPromise promiseWithValue:results];
}).then(^(WMFSearchResults* results){
-self.resultsListController.dataSource = results;
+if ([searchTerm isEqualToString:results.searchTerm]) {
+self.resultsListController.dataSource = results;
+[self.recentSearchesViewController saveTerm:searchTerm
forDomain:self.fetcher.searchSite.domain type:SEARCH_TYPE_TITLES];
+}
}).catch(^(NSError* error){
NSLog(@"%@", [error description]);
});
@@ -178,6 +209,16 @@
}
}
+#pragma mark - WMFRecentSearchesViewControllerDelegate
+
+- (void)recentSearchController:(RecentSearchesViewController*)controller
didSelectSearchTerm:(NSString*)searchTerm {
+self.searchBar.text = searchTerm;
+[self searchForSearchTerm:searchTerm]
[MediaWiki-commits] [Gerrit] Pass function name in DatabaseMysqlBase::setBigSelects - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224186
Change subject: Pass function name in DatabaseMysqlBase::setBigSelects
..
Pass function name in DatabaseMysqlBase::setBigSelects
This allow to see the correct function name in the debug logs
Change-Id: I913acbc39e8e7b21f647b544ef161574c5f720f8
---
M includes/db/DatabaseMysqlBase.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/86/224186/1
diff --git a/includes/db/DatabaseMysqlBase.php
b/includes/db/DatabaseMysqlBase.php
index e326909..846da1c 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -940,7 +940,7 @@
$value = $this->mDefaultBigSelects;
}
} elseif ( $this->mDefaultBigSelects === null ) {
- $this->mDefaultBigSelects = (bool)$this->selectField(
false, '@@sql_big_selects' );
+ $this->mDefaultBigSelects = (bool)$this->selectField(
false, '@@sql_big_selects', '', __METHOD__ );
}
$encValue = $value ? '1' : '0';
$this->query( "SET sql_big_selects=$encValue", __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/224186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I913acbc39e8e7b21f647b544ef161574c5f720f8
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] Escape data-mw as well as data-parsoid in tokenizer. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224187
Change subject: Escape data-mw as well as data-parsoid in tokenizer.
..
Escape data-mw as well as data-parsoid in tokenizer.
Change-Id: I0b5c99baa2c3a0d8766a40bf0f2428ccc93c4455
---
M lib/pegTokenizer.pegjs.txt
M tests/parserTests.txt
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/87/224187/1
diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index 938fb25..ffa3e37 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -1250,7 +1250,7 @@
// Encapsulate protected attributes.
if ( typeof name === "string" ) {
name = name.replace(
-/^(about|data-parsoid.*|data-x.*|property|rel|typeof)$/i,
+/^(about|data-mw.*|data-parsoid.*|data-x.*|property|rel|typeof)$/i,
"data-x-$1" );
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index a4a2e34..55187a9 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -23394,9 +23394,9 @@
!!test
Encapsulate protected attributes from wt
!! wikitext
-foo
+foo
!! html/parsoid
-foo
+foo
!!end
--
To view, visit https://gerrit.wikimedia.org/r/224187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b5c99baa2c3a0d8766a40bf0f2428ccc93c4455
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Work around /etc/default/elasticsearch variable expansion issue - change (operations/puppet)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224185
Change subject: Work around /etc/default/elasticsearch variable expansion issue
..
Work around /etc/default/elasticsearch variable expansion issue
When logstash1004 (jessie host) was upgraded to Elasticsearch 1.6.0 the
service failed to start with the error message:
Error: Could not find or load main class ${ES_JAVA_OPTS}
Adding `set -x` to /usr/share/elasticsearch/bin/elasticsearch showed
that the java command line constructed by that script and
/etc/init.d/elasticsearch contained this substring in the middle:
-Dfile.encoding=UTF-8 ${ES_JAVA_OPTS} -XX:GCHeapFreeLimit=10
`-Dfile.encoding=UTF-8` is the end of $JAVA_OPTS. `${ES_JAVA_OPTS}
-XX:GCHeapFreeLimit=10` is the last line of $ES_JAVA_OPTS that we were
configuring in /etc/default/elasticsearch but in a strange state where
the variable expansion had not been performed when
/etc/init.d/elasticsearch sourced the defaults file.
Change-Id: If2fd861b0bbb345317c90f0ca08e3df4a9a20bcc
---
M modules/elasticsearch/templates/elasticsearch.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/224185/1
diff --git a/modules/elasticsearch/templates/elasticsearch.erb
b/modules/elasticsearch/templates/elasticsearch.erb
index 0c0f8cf..eaed6c2 100644
--- a/modules/elasticsearch/templates/elasticsearch.erb
+++ b/modules/elasticsearch/templates/elasticsearch.erb
@@ -35,6 +35,6 @@
#CONF_FILE=/etc/elasticsearch/elasticsearch.yml
# Additional Java OPTS
-ES_JAVA_OPTS="-XX:HeapDumpPath=/var/lib/elasticsearch "
-ES_JAVA_OPTS="${ES_JAVA_OPTS} -XX:GCTimeLimit=70"
-ES_JAVA_OPTS="${ES_JAVA_OPTS} -XX:GCHeapFreeLimit=10"
+# Note: We've seen problems on some jessie hosts when this setting is
+# constructed by consecutive ES_JAVA_OPTS="${ES_JAVA_OPTS} ..." settings
+ES_JAVA_OPTS="-XX:HeapDumpPath=/var/lib/elasticsearch -XX:GCTimeLimit=70
-XX:GCHeapFreeLimit=10"
--
To view, visit https://gerrit.wikimedia.org/r/224185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2fd861b0bbb345317c90f0ca08e3df4a9a20bcc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass function name in Database::selectRowCount - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Pass function name in Database::selectRowCount
..
Pass function name in Database::selectRowCount
This allow to see the correct function name in the debug logs
Change-Id: I84c94edce60efb8f15a7eb178065ee03e85fc282
---
M includes/db/Database.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 84c4a66..2f1155d 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1912,7 +1912,7 @@
) {
$rows = 0;
$sql = $this->selectSQLText( $table, '1', $conds, $fname,
$options );
- $res = $this->query( "SELECT COUNT(*) AS rowcount FROM ($sql)
tmp_count" );
+ $res = $this->query( "SELECT COUNT(*) AS rowcount FROM ($sql)
tmp_count", $fname );
if ( $res ) {
$row = $this->fetchRow( $res );
--
To view, visit https://gerrit.wikimedia.org/r/224181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84c94edce60efb8f15a7eb178065ee03e85fc282
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Legoktm
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 nondefault strings - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/224184 Change subject: Remove nondefault strings .. Remove nondefault strings Remove a couple translated strings to fix release builds. Change-Id: Ic647f7db8bedd4cec5a537a1a8ff2651d25d9d9e --- M wikipedia/res/values-af/strings.xml M wikipedia/res/values-ar/strings.xml M wikipedia/res/values-bn/strings.xml M wikipedia/res/values-br/strings.xml M wikipedia/res/values-ca/strings.xml M wikipedia/res/values-ce/strings.xml M wikipedia/res/values-cs/strings.xml M wikipedia/res/values-da/strings.xml M wikipedia/res/values-de/strings.xml M wikipedia/res/values-el/strings.xml M wikipedia/res/values-eo/strings.xml M wikipedia/res/values-es/strings.xml M wikipedia/res/values-fa/strings.xml M wikipedia/res/values-fi/strings.xml M wikipedia/res/values-fr/strings.xml M wikipedia/res/values-gl/strings.xml M wikipedia/res/values-gu/strings.xml M wikipedia/res/values-hi/strings.xml M wikipedia/res/values-hu/strings.xml M wikipedia/res/values-in/strings.xml M wikipedia/res/values-it/strings.xml M wikipedia/res/values-iw/strings.xml M wikipedia/res/values-ja/strings.xml M wikipedia/res/values-ji/strings.xml M wikipedia/res/values-ka/strings.xml M wikipedia/res/values-km/strings.xml M wikipedia/res/values-ko/strings.xml M wikipedia/res/values-kw/strings.xml M wikipedia/res/values-ky/strings.xml M wikipedia/res/values-lb/strings.xml M wikipedia/res/values-lt/strings.xml M wikipedia/res/values-mk/strings.xml M wikipedia/res/values-mr/strings.xml M wikipedia/res/values-ms/strings.xml M wikipedia/res/values-my/strings.xml M wikipedia/res/values-nb/strings.xml M wikipedia/res/values-ne/strings.xml M wikipedia/res/values-nl/strings.xml M wikipedia/res/values-oc/strings.xml M wikipedia/res/values-om/strings.xml M wikipedia/res/values-pa/strings.xml M wikipedia/res/values-pl/strings.xml M wikipedia/res/values-ps/strings.xml M wikipedia/res/values-pt-rBR/strings.xml M wikipedia/res/values-pt/strings.xml M wikipedia/res/values-ro/strings.xml M wikipedia/res/values-ru/strings.xml M wikipedia/res/values-sa/strings.xml M wikipedia/res/values-sk/strings.xml M wikipedia/res/values-sr/strings.xml M wikipedia/res/values-sv/strings.xml M wikipedia/res/values-sw/strings.xml M wikipedia/res/values-te/strings.xml M wikipedia/res/values-tl/strings.xml M wikipedia/res/values-tr/strings.xml M wikipedia/res/values-uk/strings.xml M wikipedia/res/values-ur/strings.xml M wikipedia/res/values-uz/strings.xml M wikipedia/res/values-vi/strings.xml M wikipedia/res/values-zh-rTW/strings.xml M wikipedia/res/values-zh/strings.xml 61 files changed, 0 insertions(+), 104 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/84/224184/1 diff --git a/wikipedia/res/values-af/strings.xml b/wikipedia/res/values-af/strings.xml index 7a4b4b5..059adad 100644 --- a/wikipedia/res/values-af/strings.xml +++ b/wikipedia/res/values-af/strings.xml @@ -212,8 +212,6 @@ Onlangse soektogte Verwyder onlangse soektogte Is u seker u wil u soekgeskiedenis skrap? - Vee links vir seksies, of gebruik die opsieknop regs-bo. - Ek verstaan Kon nie webblad oopmaak nie (geen webblaaier toep gevind). Vinnige feite Meer inligting diff --git a/wikipedia/res/values-ar/strings.xml b/wikipedia/res/values-ar/strings.xml index 592473f..4ff5627 100644 --- a/wikipedia/res/values-ar/strings.xml +++ b/wikipedia/res/values-ar/strings.xml @@ -211,8 +211,6 @@ أحدث عمليات البحث: حذف أحدث عمليات البحث هل أنت متأكد من حذف سجل البحث؟ - اسحب من اليسار للأقسام، أو استخدم زر القائمة في أعلى اليسار. - حسناً تعذّر فتح صفحة الويب (لا يتوفر متصفح). معلومات سريعة المزيد من المعلومات diff --git a/wikipedia/res/values-bn/strings.xml b/wikipedia/res/values-bn/strings.xml index 09810b3..357ddb6 100644 --- a/wikipedia/res/values-bn/strings.xml +++ b/wikipedia/res/values-bn/strings.xml @@ -210,7 +210,6 @@ সাম্প্রতিক অনুসন্ধান সাম্প্রতিক অনুসন্ধান গুলি মুছে ফেলুন আপনি কি নিশ্চিত যে আপনি আপনার অনুসান্ধান ইতিহাস মুছে ফেলতে ? - বুঝেছি ওয়েব পেজ টি খোলা যায়নি ( কোনও ব্রাউজার অ্যাপ্লিকেশান পাওয়া যায়নি )। দ্রুত তথ্য আরও তথ্য diff --git a/wikipedia/res/values-br/strings.xml b/wikipedia/res/values-br/strings.xml index a04e4cc..a72c049 100644 --- a/wikipedia/res/values-br/strings.xml +++ b/wikipedia/res/values-br/strings.xml @@ -214,8 +214,6 @@ Enklaskoù nevez : diverkañ an enklaskoù nevez Ha sur eo ho peus c\'hoant da ziverkañ roll-istor hoc\'h enklaskoù ? - Torchañ war-zu an tu kleiz evit ar rannskridoù, pe implijout bouton al lañser e krec\'h a-zehoù. - Mat eo Ne c\'haller ket digeriñ ar bajenn web (n\'eus bet kavet arload merdeer) Graet buan Muioc\'h a ditouroù diff --git a/wikipedia/res/values-ca/strings.xml b/wikipedia/res/values-ca/strings.xml index 6157fcd..66a1bda 100644 --- a/wikipedia/res/values-ca/strings.xml +++ b/wikipedia/res
[MediaWiki-commits] [Gerrit] Share a fact onboarding design tweaks - change (apps...wikipedia)
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224183
Change subject: Share a fact onboarding design tweaks
..
Share a fact onboarding design tweaks
- Add one second delay to showing select text onboarding tip.
- Position the select text tip at (70%, 88%).
- Add Percent Support library. This causes a size increase of
approximately 3.9 KiB. No known ProGuard requirements. Release builds
appear to function proprerly.
- Resize share tip social networks to 24dp wide and proportionally tall
from source. All densities compressed with Pngcrush.
- Vertically center share tip social network icons and add 16dp padding
to the left and right of parent view.
- Add new color scheme entry, liberal blue, #3366bb.
- Recolor share tip and share icon highlight.
Design has specified additional acceptance criteria detail.
Bug: T89985
Change-Id: I586461ed6435ab3e019a460c1db6d58fbc00c8a5
---
M wikipedia/build.gradle
M wikipedia/res/drawable-hdpi/facebook_logo.png
M wikipedia/res/drawable-hdpi/plus_logo.png
M wikipedia/res/drawable-hdpi/twitter_logo.png
M wikipedia/res/drawable-ldpi/facebook_logo.png
M wikipedia/res/drawable-ldpi/plus_logo.png
M wikipedia/res/drawable-ldpi/twitter_logo.png
M wikipedia/res/drawable-mdpi/facebook_logo.png
M wikipedia/res/drawable-mdpi/plus_logo.png
M wikipedia/res/drawable-mdpi/twitter_logo.png
M wikipedia/res/drawable-xhdpi/facebook_logo.png
M wikipedia/res/drawable-xhdpi/plus_logo.png
M wikipedia/res/drawable-xhdpi/twitter_logo.png
M wikipedia/res/drawable-xxhdpi/facebook_logo.png
M wikipedia/res/drawable-xxhdpi/plus_logo.png
M wikipedia/res/drawable-xxhdpi/twitter_logo.png
M wikipedia/res/drawable-xxxhdpi/facebook_logo.png
M wikipedia/res/drawable-xxxhdpi/plus_logo.png
M wikipedia/res/drawable-xxxhdpi/twitter_logo.png
M wikipedia/res/layout/fragment_page.xml
M wikipedia/res/layout/inflate_tool_tip_share.xml
M wikipedia/res/values/colors.xml
M wikipedia/res/values/dimens.xml
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
25 files changed, 40 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/83/224183/1
diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index cbc1f60..a6e82de 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -95,6 +95,7 @@
compile 'com.android.support:appcompat-v7:22.2.0' // includes support-v4
compile 'com.android.support:design:22.2.0'
+compile 'com.android.support:percent:22.2.0'
compile('org.mediawiki.api:json:1.3.2-SNAPSHOT') {
exclude group: 'org.json', module: 'json'
}
diff --git a/wikipedia/res/drawable-hdpi/facebook_logo.png
b/wikipedia/res/drawable-hdpi/facebook_logo.png
index e5a319a..52e051c 100644
--- a/wikipedia/res/drawable-hdpi/facebook_logo.png
+++ b/wikipedia/res/drawable-hdpi/facebook_logo.png
Binary files differ
diff --git a/wikipedia/res/drawable-hdpi/plus_logo.png
b/wikipedia/res/drawable-hdpi/plus_logo.png
index c6df910..d4226d6 100644
--- a/wikipedia/res/drawable-hdpi/plus_logo.png
+++ b/wikipedia/res/drawable-hdpi/plus_logo.png
Binary files differ
diff --git a/wikipedia/res/drawable-hdpi/twitter_logo.png
b/wikipedia/res/drawable-hdpi/twitter_logo.png
index c074f24..853c0b5 100644
--- a/wikipedia/res/drawable-hdpi/twitter_logo.png
+++ b/wikipedia/res/drawable-hdpi/twitter_logo.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldpi/facebook_logo.png
b/wikipedia/res/drawable-ldpi/facebook_logo.png
index 5723611..dbed7e6 100644
--- a/wikipedia/res/drawable-ldpi/facebook_logo.png
+++ b/wikipedia/res/drawable-ldpi/facebook_logo.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldpi/plus_logo.png
b/wikipedia/res/drawable-ldpi/plus_logo.png
index 6e8598f..06d4cd1 100644
--- a/wikipedia/res/drawable-ldpi/plus_logo.png
+++ b/wikipedia/res/drawable-ldpi/plus_logo.png
Binary files differ
diff --git a/wikipedia/res/drawable-ldpi/twitter_logo.png
b/wikipedia/res/drawable-ldpi/twitter_logo.png
index c3b3fad..367fa17 100644
--- a/wikipedia/res/drawable-ldpi/twitter_logo.png
+++ b/wikipedia/res/drawable-ldpi/twitter_logo.png
Binary files differ
diff --git a/wikipedia/res/drawable-mdpi/facebook_logo.png
b/wikipedia/res/drawable-mdpi/facebook_logo.png
index 1c6b52f..681670f 100644
--- a/wikipedia/res/drawable-mdpi/facebook_logo.png
+++ b/wikipedia/res/drawable-mdpi/facebook_logo.png
Binary files differ
diff --git a/wikipedia/res/drawable-mdpi/plus_logo.png
b/wikipedia/res/drawable-mdpi/plus_logo.png
index 40df497..33fa869 100644
--- a/wikipedia/res/drawable-mdpi/plus_logo.png
+++ b/wikipedia/res/drawable-mdpi/plus_logo.png
Binary files differ
diff --git a/wikipedia/res/drawable-mdpi/twitter_logo.png
b/wikipedia/res/drawable-mdpi/twitter_logo.png
index 522d18b..5aecc22 100644
--- a/wikipedia/res/drawable-mdpi
[MediaWiki-commits] [Gerrit] adminbot: add package build and upload docs - change (operations...adminbot)
Andrew Bogott has submitted this change and it was merged. Change subject: adminbot: add package build and upload docs .. adminbot: add package build and upload docs Change-Id: Iffc6cc636fc6cbd7b09ea27986264a74cf6c6aca --- M README 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved Merlijn van Deen: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/README b/README index 4754163..b6473ad 100644 --- a/README +++ b/README @@ -6,3 +6,20 @@ Optional dependencies: python-twitter (v1+): https://launchpad.net/python-twitter +How to build (example for WMF production): + +ssh copper.eqiad.wmnet (or the node that includes "role package::builder") +git clone https://gerrit.wikimedia.org/r/p/operations/debs/adminbot +cd adminbot +debuild -us -uc +ls ../adminbot_* + +How to import in APT repo (example for WMF production): + +# copy all the files (.deb .dsc .tar.gz .build .changes .dsc) to the repo server +scp adminbot_* carbon.eqiad.wmnet:/srv/wikimedia/incoming/ +sudo su - ; cd /srv/wikimedia/incoming/ +# include using the .changes file, not the .deb +# this should go into "main", not "universe". make sure distro version is correct +reprepro -C main include precise-wikimedia adminbot_1.7.10_amd64.changes + -- To view, visit https://gerrit.wikimedia.org/r/224182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffc6cc636fc6cbd7b09ea27986264a74cf6c6aca Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adminbot: add package build and upload docs - change (operations...adminbot)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224182 Change subject: adminbot: add package build and upload docs .. adminbot: add package build and upload docs Change-Id: Iffc6cc636fc6cbd7b09ea27986264a74cf6c6aca --- M README 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot refs/changes/82/224182/1 diff --git a/README b/README index 4754163..b6473ad 100644 --- a/README +++ b/README @@ -6,3 +6,20 @@ Optional dependencies: python-twitter (v1+): https://launchpad.net/python-twitter +How to build (example for WMF production): + +ssh copper.eqiad.wmnet (or the node that includes "role package::builder") +git clone https://gerrit.wikimedia.org/r/p/operations/debs/adminbot +cd adminbot +debuild -us -uc +ls ../adminbot_* + +How to import in APT repo (example for WMF production): + +# copy all the files (.deb .dsc .tar.gz .build .changes .dsc) to the repo server +scp adminbot_* carbon.eqiad.wmnet:/srv/wikimedia/incoming/ +sudo su - ; cd /srv/wikimedia/incoming/ +# include using the .changes file, not the .deb +# this should go into "main", not "universe". make sure distro version is correct +reprepro -C main include precise-wikimedia adminbot_1.7.10_amd64.changes + -- To view, visit https://gerrit.wikimedia.org/r/224182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffc6cc636fc6cbd7b09ea27986264a74cf6c6aca Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass function name in Database::selectRowCount - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224181
Change subject: Pass function name in Database::selectRowCount
..
Pass function name in Database::selectRowCount
This allow to see the correct function name in the debug logs
Change-Id: I84c94edce60efb8f15a7eb178065ee03e85fc282
---
M includes/db/Database.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/81/224181/1
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 84c4a66..2f1155d 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1912,7 +1912,7 @@
) {
$rows = 0;
$sql = $this->selectSQLText( $table, '1', $conds, $fname,
$options );
- $res = $this->query( "SELECT COUNT(*) AS rowcount FROM ($sql)
tmp_count" );
+ $res = $this->query( "SELECT COUNT(*) AS rowcount FROM ($sql)
tmp_count", $fname );
if ( $res ) {
$row = $this->fetchRow( $res );
--
To view, visit https://gerrit.wikimedia.org/r/224181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84c94edce60efb8f15a7eb178065ee03e85fc282
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] SECURITY: Do not allow data-ooui attributes in wikitext - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: SECURITY: Do not allow data-ooui attributes in wikitext
..
SECURITY: Do not allow data-ooui attributes in wikitext
We now automatically infuse any element with a data-ooui attribute, so
allowing them in wikitext allows rendering any arbitrary OOUI widget,
some of which (ButtonWidget) are unsafe and can lead to XSS.
By blacklisting data-ooui, widgets cannot be created in wikitext.
T101666 will enable a safe-subset of them.
Bug: T105413
Change-Id: I3f63594a41e9cac3219791e181a2f93818178263
---
M includes/Sanitizer.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 2340cd9..ddaf1b2 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -753,7 +753,7 @@
}
# Allow any attribute beginning with "data-"
- if ( !preg_match( '/^data-/i', $attribute ) && !isset(
$whitelist[$attribute] ) ) {
+ if ( !preg_match( '/^data-(?!ooui)/i', $attribute ) &&
!isset( $whitelist[$attribute] ) ) {
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/224178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f63594a41e9cac3219791e181a2f93818178263
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use TextInputLayout in Login and CreateAccount activities. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/224180 Change subject: Use TextInputLayout in Login and CreateAccount activities. .. Use TextInputLayout in Login and CreateAccount activities. Wrapped EditText's in the Login and CreateAccount activities in TextInputLayout, as well as the EditText in the Captcha entry view, and the edit preview summary. Also made PlainPasteEditText inherit from AppCompatEditText, to make sure that any styling that we apply to EditText in the future will be applied properly by AppCompat. Note: did *not* modify the EditText in the History and Saved Pages fragments, since they're being affected by a known bug in AppCompat: https://code.google.com/p/android/issues/detail?id=175228 Once the above issue is fixed, we can finish those updates. Bug: T102549 Change-Id: I72b1acd858c47ecb20dfc0b7b269c11aad5a99a9 --- M wikipedia/res/layout/activity_create_account.xml M wikipedia/res/layout/activity_login.xml M wikipedia/res/layout/fragment_preview_summary.xml M wikipedia/res/layout/group_captcha.xml M wikipedia/src/main/java/org/wikipedia/views/PlainPasteEditText.java 5 files changed, 119 insertions(+), 78 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/80/224180/1 diff --git a/wikipedia/res/layout/activity_create_account.xml b/wikipedia/res/layout/activity_create_account.xml index b72c47f..86ce7f5 100644 --- a/wikipedia/res/layout/activity_create_account.xml +++ b/wikipedia/res/layout/activity_create_account.xml @@ -16,35 +16,49 @@ android:orientation="vertical" android:padding="16dp" > - + + + - + + + - + + + - + + + - - + + + + + + + - + + + diff --git a/wikipedia/res/layout/group_captcha.xml b/wikipedia/res/layout/group_captcha.xml index cc391a4..f3f5c77 100644 --- a/wikipedia/res/layout/group_captcha.xml +++ b/wikipedia/res/layout/group_captcha.xml @@ -43,18 +43,23 @@ style="?android:textAppearanceSmall" android:gravity="center" /> - +android:layout_marginTop="8dp"> + + https://gerrit.wikimedia.org/r/224180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72b1acd858c47ecb20dfc0b7b269c11aad5a99a9 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create and cleanup TMPDIR for mw-selenium builder - change (integration/config)
Dduvall has uploaded a new change for review. https://gerrit.wikimedia.org/r/224179 Change subject: Create and cleanup TMPDIR for mw-selenium builder .. Create and cleanup TMPDIR for mw-selenium builder The MW-Selenium job is currently working around an unfortunate bug in Xvfb that forces us to use a directory under /tmp as the TMPDIR. See Iaf3287cfb3fe897de6fb4c4b79784a5e7ef900a8 Bug: T103039 Change-Id: Ib289d784c7b3985bd4823d967fbc07d5759dc756 --- M jjb/macro.yaml M jjb/mediawiki-extensions.yaml 2 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/79/224179/1 diff --git a/jjb/macro.yaml b/jjb/macro.yaml index dd3cd01..6c4201d 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -377,10 +377,17 @@ # # - tests-dir: Parent of the `features` directory. Usually `tests/browser`. # +# ALWAYS pair with 'localhost-cleanup' +# ALWAYS pair with 'mw-selenium-cleanup' +# - builder: name: mw-selenium-with-dir builders: - prepare-localhost + - shell: | +# See mw-selenium-cleanup +dir="/tmp/jenkins-$EXECUTOR_NUMBER" +test ! -d "$dir" && mkdir "$dir" - bundle-with-options: initialization: '/srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh' command: | @@ -393,12 +400,32 @@ # the MW extension directory. Note that EXT_NAME is set by # zuul/ext_dependencies.py # +# ALWAYS pair with 'localhost-cleanup' +# ALWAYS pair with 'mw-selenium-cleanup' +# - builder: name: mw-selenium builders: - mw-selenium-with-dir: tests-dir: 'src/extensions/$EXT_NAME/tests/browser' +# Cleans up anything left under /tmp/jenkins-$EXECUTOR_NUMBER +# +# Note that once the bug with Xvfb and TMPDIR is resolved, this can be +# removed. See the bin/mw-set-env-mw-selenium.sh slave script for details. +# +- publisher: +name: mw-selenium-cleanup +publishers: + - postbuildscript: + builders: + - shell: | + dir="/tmp/jenkins-$EXECUTOR_NUMBER" + test -d "$dir" && rm -rf "$dir" + # Postbuild options are confusing, setting both to false ensures the script always runs. + onsuccess: False + onfailure: False + # - src: (without trailing slash) # - project: (usually repo name or a custom title like "VisualEditor") - will be escaped # - version: (usually branch name) - will be escaped diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 50803c2..4cdb83b 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -200,6 +200,7 @@ projects: mediawiki/skins/Vector - mw-selenium publishers: + - mw-selenium-cleanup - localhost-cleanup - mw-teardown-mysql - archive-log-dir -- To view, visit https://gerrit.wikimedia.org/r/224179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib289d784c7b3985bd4823d967fbc07d5759dc756 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Dduvall ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SECURITY: Do not allow data-ooui attributes in wikitext - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224178
Change subject: SECURITY: Do not allow data-ooui attributes in wikitext
..
SECURITY: Do not allow data-ooui attributes in wikitext
We now automatically infuse any element with a data-ooui attribute, so
allowing them in wikitext allows rendering any arbitrary OOUI widget,
some of which (ButtonWidget) are unsafe and can lead to XSS.
By blacklisting data-ooui, widgets cannot be created in wikitext.
T101666 will enable a safe-subset of them.
Bug: T105413
Change-Id: I3f63594a41e9cac3219791e181a2f93818178263
---
M includes/Sanitizer.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/224178/1
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 2340cd9..ddaf1b2 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -753,7 +753,7 @@
}
# Allow any attribute beginning with "data-"
- if ( !preg_match( '/^data-/i', $attribute ) && !isset(
$whitelist[$attribute] ) ) {
+ if ( !preg_match( '/^data-(?!ooui)/i', $attribute ) &&
!isset( $whitelist[$attribute] ) ) {
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/224178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f63594a41e9cac3219791e181a2f93818178263
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nodepool: fix typo pruge -> purge - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/224177 Change subject: nodepool: fix typo pruge -> purge .. nodepool: fix typo pruge -> purge I should have tested that on labs :-/ Change-Id: I58f86e42ae557425dd2ceb847e72d50345cc0960 --- M modules/nodepool/manifests/init.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/77/224177/1 diff --git a/modules/nodepool/manifests/init.pp b/modules/nodepool/manifests/init.pp index f31c181..ffcd275 100644 --- a/modules/nodepool/manifests/init.pp +++ b/modules/nodepool/manifests/init.pp @@ -154,7 +154,7 @@ owner => 'nodepool', group => 'nodepool', recurse => true, -pruge => true, +purge => true, source => 'puppet:///modules/nodepool/elements', require => Package['nodepool'], } -- To view, visit https://gerrit.wikimedia.org/r/224177 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58f86e42ae557425dd2ceb847e72d50345cc0960 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] Protect against non-text output from StripState going into T... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Protect against non-text output from StripState going into
Title::newFromText()
..
Protect against non-text output from StripState going into Title::newFromText()
Non-string input shouldn't be fed into newFromText(). We currently handle this
indirectly with relying on Title to do it. Instead just return earlier and not
try to construct a title from bad input.
Bug: T102321
Change-Id: I9bc96111378d9d4ed5981bffc6f150cbd0c1e331
---
M includes/parser/Parser.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 7f92590..83c2b0c 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2147,7 +2147,8 @@
$link = substr( $link, 1 );
}
- $nt = Title::newFromText(
$this->mStripState->unstripNoWiki( $link ) );
+ $unstrip = $this->mStripState->unstripNoWiki( $link );
+ $nt = is_string( $unstrip ) ? Title::newFromText(
$unstrip ) : null;
if ( $nt === null ) {
$s .= $prefix . '[[' . $line;
continue;
--
To view, visit https://gerrit.wikimedia.org/r/224124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9bc96111378d9d4ed5981bffc6f150cbd0c1e331
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only allow construction of classes that extend OO.ui.Element... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Only allow construction of classes that extend OO.ui.Element in
infusion
..
Only allow construction of classes that extend OO.ui.Element in infusion
Change-Id: I6fb2c879836a2cf21d9c3f3606caf490559d6439
---
M src/Element.js
M tests/Element.test.js
2 files changed, 30 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Element.js b/src/Element.js
index 6567fc8..f1f45d3 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -121,7 +121,7 @@
*/
OO.ui.Element.static.unsafeInfuse = function ( idOrNode, top ) {
// look for a cached result of a previous infusion.
- var id, $elem, data, cls, parts, obj;
+ var id, $elem, data, cls, parts, parent, obj;
if ( typeof idOrNode === 'string' ) {
id = idOrNode;
$elem = $( document.getElementById( id ) );
@@ -166,6 +166,23 @@
throw new Error( 'Unknown widget type: id: ' + id + ',
class: ' + data._ );
}
}
+
+ // Verify that we're creating an OO.ui.Element instance
+ parent = cls.parent;
+
+ while ( parent !== undefined ) {
+ if ( parent === OO.ui.Element ) {
+ // Safe
+ break;
+ }
+
+ parent = parent.parent;
+ }
+
+ if ( parent !== OO.ui.Element ) {
+ throw new Error( 'Unknown widget type: id: ' + id + ', class: '
+ data._ );
+ }
+
$elem.data( 'ooui-infused', true ); // prevent loops
data.id = id; // implicit
data = OO.copy( data, null, function deserialize( value ) {
diff --git a/tests/Element.test.js b/tests/Element.test.js
index b37d8e3..535aaf3 100644
--- a/tests/Element.test.js
+++ b/tests/Element.test.js
@@ -15,6 +15,18 @@
}
} );
+QUnit.test( 'static.infuse', 2, function ( assert ) {
+ function infuse( data ) {
+ return OO.ui.Element.static.infuse(
+ $( '' ).attr( 'data-ooui', JSON.stringify( data ) )
+ );
+ }
+ assert.ok( infuse( { _: 'OO.ui.TextInputWidget' } ) );
+ assert.throws( function () {
+ infuse( { _: 'Array' } );
+ }, Error );
+} );
+
QUnit.test( 'static.getDocument', 10, function ( assert ) {
var frameDoc, frameEl, frameDiv,
el = this.fixture,
--
To view, visit https://gerrit.wikimedia.org/r/224112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6fb2c879836a2cf21d9c3f3606caf490559d6439
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adminbot: remove README from postinst script - change (operations...adminbot)
jenkins-bot has submitted this change and it was merged. Change subject: adminbot: remove README from postinst script .. adminbot: remove README from postinst script This file not existing caused DPKG errors when installing this package. The work-around was to touch the README file and apt-get remove, apt-get install again. Change-Id: If009179ac12f994ed47cc42c1d201da7c423d4ea --- M debian/adminbot.postinst 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/debian/adminbot.postinst b/debian/adminbot.postinst index 40fd379..ae8136e 100644 --- a/debian/adminbot.postinst +++ b/debian/adminbot.postinst @@ -52,7 +52,6 @@ chmod 755 /usr/lib/adminbot/adminlogbot.py chmod 644 /usr/lib/adminbot/adminlog.py chmod 644 /usr/lib/adminbot/statusnet.py - chmod 644 /usr/lib/adminbot/README fi ;; -- To view, visit https://gerrit.wikimedia.org/r/224176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If009179ac12f994ed47cc42c1d201da7c423d4ea Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adminbot: remove README from postinst script - change (operations...adminbot)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224176 Change subject: adminbot: remove README from postinst script .. adminbot: remove README from postinst script This file not existing caused DPKG errors when installing this package. The work around was to touch the README file and apt-get remove, apt-get install again. Change-Id: If009179ac12f994ed47cc42c1d201da7c423d4ea --- M debian/adminbot.postinst 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot refs/changes/76/224176/1 diff --git a/debian/adminbot.postinst b/debian/adminbot.postinst index 40fd379..ae8136e 100644 --- a/debian/adminbot.postinst +++ b/debian/adminbot.postinst @@ -52,7 +52,6 @@ chmod 755 /usr/lib/adminbot/adminlogbot.py chmod 644 /usr/lib/adminbot/adminlog.py chmod 644 /usr/lib/adminbot/statusnet.py - chmod 644 /usr/lib/adminbot/README fi ;; -- To view, visit https://gerrit.wikimedia.org/r/224176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If009179ac12f994ed47cc42c1d201da7c423d4ea Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Escape messages - change (mediawiki...InviteSignup)
jenkins-bot has submitted this change and it was merged. Change subject: Escape messages .. Escape messages The shoemaker's children go barefoot Bug: T85864 Change-Id: I6aab263aa1ec46f2a8ae3d2e05a4e69c526242de --- M SpecialInviteSignup.php 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialInviteSignup.php b/SpecialInviteSignup.php index 9718f51..1f7464e 100644 --- a/SpecialInviteSignup.php +++ b/SpecialInviteSignup.php @@ -82,12 +82,12 @@ Html::openElement( 'table', array( 'class' => 'wikitable' ) ) . Html::openElement( 'thead' ) . Html::openElement( 'tr' ) . - Html::rawElement( 'th', null, $this->msg( 'is-tableth-date' )->text() ) . - Html::rawElement( 'th', null, $this->msg( 'is-tableth-email' )->text() ) . - Html::rawElement( 'th', null, $this->msg( 'is-tableth-inviter' )->text() ) . - Html::rawElement( 'th', null, $this->msg( 'is-tableth-signup' )->text() ) . - Html::rawElement( 'th', null, $this->msg( 'is-tableth-groups' )->text() ) . - Html::rawElement( 'th', null, '' ) . + Html::element( 'th', null, $this->msg( 'is-tableth-date' )->text() ) . + Html::element( 'th', null, $this->msg( 'is-tableth-email' )->text() ) . + Html::element( 'th', null, $this->msg( 'is-tableth-inviter' )->text() ) . + Html::element( 'th', null, $this->msg( 'is-tableth-signup' )->text() ) . + Html::element( 'th', null, $this->msg( 'is-tableth-groups' )->text() ) . + Html::element( 'th', null, '' ) . $this->getAddRow() . Html::closeElement( 'thead' ) ); @@ -114,7 +114,7 @@ Html::element( 'td', null, $email ) . Html::element( 'td', null, User::newFromId( $invite['inviter'] )->getName() ) . Html::element( 'td', array( 'data-sort-value' => $invite['used'] ), $invite['used'] ? $lang->userTimeAndDate( $invite['used'], $user ) : '' ) . - Html::rawElement( 'td', null, $groups ) . + Html::element( 'td', null, $groups ) . Html::rawElement( 'td', null, $invite['used'] ? '' : $this->getDeleteButton( $invite['hash'] ) ) . Html::closeElement( 'tr' ) ); -- To view, visit https://gerrit.wikimedia.org/r/52 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6aab263aa1ec46f2a8ae3d2e05a4e69c526242de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/InviteSignup Gerrit-Branch: master Gerrit-Owner: Nikerabbit Gerrit-Reviewer: Siebrand Gerrit-Reviewer: Umherirrender 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 no-op wfProfile(In|Out) calls - change (mediawiki...Flow)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224175
Change subject: Remove no-op wfProfile(In|Out) calls
..
Remove no-op wfProfile(In|Out) calls
Change-Id: I0beb08ed5aedc458d4f29a5d7a8a52290a28479c
---
M includes/View.php
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/75/224175/1
diff --git a/includes/View.php b/includes/View.php
index a996978..db445d2 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -46,10 +46,7 @@
}
public function show( WorkflowLoader $loader, $action ) {
- wfProfileIn( __CLASS__ . '-init' );
-
$blocks = $loader->getBlocks();
- wfProfileOut( __CLASS__ . '-init' );
$parameters = $this->extractBlockParameters( $action, $blocks );
foreach ( $loader->getBlocks() as $block ) {
--
To view, visit https://gerrit.wikimedia.org/r/224175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0beb08ed5aedc458d4f29a5d7a8a52290a28479c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e45674e..b4cef1c - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/224174 Change subject: Syncronize VisualEditor: e45674e..b4cef1c .. Syncronize VisualEditor: e45674e..b4cef1c Change-Id: Iaec95804ff4246214bdfa8157ed7c173b1195627 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/74/224174/1 diff --git a/VisualEditor b/VisualEditor index e45674e..b4cef1c 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit e45674e8817499982fc234ba12dfb74ea693b0c3 +Subproject commit b4cef1cf0104bf1871a53a4ed21400a9350dccd5 -- To view, visit https://gerrit.wikimedia.org/r/224174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaec95804ff4246214bdfa8157ed7c173b1195627 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e45674e..b4cef1c - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: e45674e..b4cef1c .. Syncronize VisualEditor: e45674e..b4cef1c Change-Id: Iaec95804ff4246214bdfa8157ed7c173b1195627 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index e45674e..b4cef1c 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit e45674e8817499982fc234ba12dfb74ea693b0c3 +Subproject commit b4cef1cf0104bf1871a53a4ed21400a9350dccd5 -- To view, visit https://gerrit.wikimedia.org/r/224174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaec95804ff4246214bdfa8157ed7c173b1195627 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Never use original data optimisation when in clipboard mode - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Never use original data optimisation when in clipboard mode
..
Never use original data optimisation when in clipboard mode
In clipboard mode we need the full body regardless of if the reference
has changed since load or not.
Bug: T104230
Change-Id: Ie59e04d381f2fd2680e8af0cf05a80df71052822
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
M modules/ve-mw/tests/dm/ve.dm.mwExample.js
2 files changed, 44 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 37a2ba4..9454947 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -102,6 +102,7 @@
ve.dm.MWReferenceNode.static.toDomElements = function ( dataElement, doc,
converter ) {
var itemNodeHtml, originalHtml, mwData, i, iLen, keyedNodes,
setContents, contentsAlreadySet,
originalMw, listKeyParts, name,
+ isForClipboard = converter.isForClipboard(),
el = doc.createElement( 'span' ),
itemNodeWrapper = doc.createElement( 'div' ),
originalHtmlWrapper = doc.createElement( 'div' ),
@@ -162,8 +163,9 @@
( ve.getProp( mwData, 'body', 'id' ) !== undefined &&
itemNode.getAttribute( 'originalHtml' ) ) ||
'';
originalHtmlWrapper.innerHTML = originalHtml;
- // Only set body.html if itemNodeHtml and originalHtml are
actually different
- if ( !originalHtmlWrapper.isEqualNode( itemNodeWrapper ) ) {
+ // Only set body.html if itemNodeHtml and originalHtml are
actually different,
+ // or we are writing the clipboard for use in another VE
instance
+ if ( isForClipboard || !originalHtmlWrapper.isEqualNode(
itemNodeWrapper ) ) {
ve.setProp( mwData, 'body', 'html', itemNodeHtml );
}
}
@@ -199,10 +201,11 @@
delete mwData.attrs.refGroup;
}
- // If mwAttr and originalMw are the same, use originalMw to prevent
reserialization.
+ // If mwAttr and originalMw are the same, use originalMw to prevent
reserialization,
+ // unless we are writing the clipboard for use in another VE instance
// Reserialization has the potential to reorder keys and so change the
DOM unnecessarily
originalMw = dataElement.attributes.originalMw;
- if ( originalMw && ve.compare( mwData, JSON.parse( originalMw ) ) ) {
+ if ( !isForClipboard && originalMw && ve.compare( mwData, JSON.parse(
originalMw ) ) ) {
el.setAttribute( 'data-mw', originalMw );
// Return the original DOM elements if possible
diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
index dd78894..92ebf0a 100644
--- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
@@ -1227,6 +1227,43 @@
'"attrs":{"group":"g1","name":"foo"}}\\">'
+
'"}}">' +
'',
+ clipboardBody:
+ 'Foo' +
+ ''
+
+ '[1]' +
+ '' +
+ ' Baz' +
+ ''
+
+ '[g1 1]' +
+ '' +
+ ' Whee' +
+ '' +
+ '[1]' +
+ '' +
+ ' Yay' +
+ // This reference has .body.id instead of
.body.html
+ '' +
+ '[g1 2]' +
+ '' +
+ ' Quux' +
+ '' +
+ '[1]' +
+ '' +
+ ' Foo' +
+ ''
+
+ '[g1 3]' +
+ '' +
+ '' +
+ // The HTML below is enriched to wrap reference
contents in
+ // which Parsoid doesn't do yet, but T88290 asks for
+ '' +
+ '',
head: 'http://example.com"; />',
data: [
{ type: 'paragraph' },
--
To view, visit https://gerrit.wikimedia.org/r/223770
To unsubscribe, visit https
[MediaWiki-commits] [Gerrit] Updated changelog - change (operations...adminbot)
jenkins-bot has submitted this change and it was merged. Change subject: Updated changelog .. Updated changelog Change-Id: I68d838acbbb707876bfa6f5ffaeb29b449d14978 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 42755c6..951a5e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +adminbot (1.7.10) precise-wikimedia; urgency=low + + * Fixed date parsing of headers + * Changed date format to year-month-day (%Y-%m-%d) + * Made bot flag configurable + + -- Merlijn van Deen Fri, 10 Jul 2015 19:45:00 + + adminbot (1.7.9) precise-wikimedia; urgency=low * Added URL to bot IRC message -- To view, visit https://gerrit.wikimedia.org/r/224173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68d838acbbb707876bfa6f5ffaeb29b449d14978 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen Gerrit-Reviewer: Dzahn 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 changelog - change (operations...adminbot)
Merlijn van Deen has uploaded a new change for review. https://gerrit.wikimedia.org/r/224173 Change subject: Updated changelog .. Updated changelog Change-Id: I68d838acbbb707876bfa6f5ffaeb29b449d14978 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot refs/changes/73/224173/1 diff --git a/debian/changelog b/debian/changelog index 42755c6..951a5e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +adminbot (1.7.10) precise-wikimedia; urgency=low + + * Fixed date parsing of headers + * Changed date format to year-month-day (%Y-%m-%d) + * Made bot flag configurable + + -- Merlijn van Deen Fri, 10 Jul 2015 19:45:00 + + adminbot (1.7.9) precise-wikimedia; urgency=low * Added URL to bot IRC message -- To view, visit https://gerrit.wikimedia.org/r/224173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68d838acbbb707876bfa6f5ffaeb29b449d14978 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make bot flag configurable - change (operations...adminbot)
Andrew Bogott has submitted this change and it was merged.
Change subject: Make bot flag configurable
..
Make bot flag configurable
Change-Id: I71e6f1cf2da23e7947a410b425ab412136616780
---
M adminlog.py
M config.py
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
diff --git a/adminlog.py b/adminlog.py
index 140be7d..330bfb6 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -53,7 +53,11 @@
lines.append('[[Category:' +
config.wiki_category + ']]')
-page.save('\n'.join(lines), "%s (%s)" % (message, author))
+page.save(
+'\n'.join(lines),
+"%s (%s)" % (message, author),
+bot=getattr(config, 'wiki_bot', True)
+)
micro_update = ("%s: %s" % (author, message))[:140]
diff --git a/config.py b/config.py
index cbc3c6c..74f95c8 100644
--- a/config.py
+++ b/config.py
@@ -64,6 +64,9 @@
# Password of wiki bot user
wiki_pass = ""
+# Whether to use a bot flag or not
+wiki_bot = True
+
# LDAP domain to use, if needed
wiki_domain = ""
--
To view, visit https://gerrit.wikimedia.org/r/180889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71e6f1cf2da23e7947a410b425ab412136616780
Gerrit-PatchSet: 5
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: AzaToth
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Ottomata
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Ryan Lane
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Never use original data optimisation when in clipboard mode - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224172
Change subject: Never use original data optimisation when in clipboard mode
..
Never use original data optimisation when in clipboard mode
In clipboard mode we need the full body regardless of if the reference
has changed since load or not.
Bug: T104230
Change-Id: Ie59e04d381f2fd2680e8af0cf05a80df71052822
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
M modules/ve-mw/tests/dm/ve.dm.mwExample.js
2 files changed, 44 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/72/224172/1
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 37a2ba4..9454947 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -102,6 +102,7 @@
ve.dm.MWReferenceNode.static.toDomElements = function ( dataElement, doc,
converter ) {
var itemNodeHtml, originalHtml, mwData, i, iLen, keyedNodes,
setContents, contentsAlreadySet,
originalMw, listKeyParts, name,
+ isForClipboard = converter.isForClipboard(),
el = doc.createElement( 'span' ),
itemNodeWrapper = doc.createElement( 'div' ),
originalHtmlWrapper = doc.createElement( 'div' ),
@@ -162,8 +163,9 @@
( ve.getProp( mwData, 'body', 'id' ) !== undefined &&
itemNode.getAttribute( 'originalHtml' ) ) ||
'';
originalHtmlWrapper.innerHTML = originalHtml;
- // Only set body.html if itemNodeHtml and originalHtml are
actually different
- if ( !originalHtmlWrapper.isEqualNode( itemNodeWrapper ) ) {
+ // Only set body.html if itemNodeHtml and originalHtml are
actually different,
+ // or we are writing the clipboard for use in another VE
instance
+ if ( isForClipboard || !originalHtmlWrapper.isEqualNode(
itemNodeWrapper ) ) {
ve.setProp( mwData, 'body', 'html', itemNodeHtml );
}
}
@@ -199,10 +201,11 @@
delete mwData.attrs.refGroup;
}
- // If mwAttr and originalMw are the same, use originalMw to prevent
reserialization.
+ // If mwAttr and originalMw are the same, use originalMw to prevent
reserialization,
+ // unless we are writing the clipboard for use in another VE instance
// Reserialization has the potential to reorder keys and so change the
DOM unnecessarily
originalMw = dataElement.attributes.originalMw;
- if ( originalMw && ve.compare( mwData, JSON.parse( originalMw ) ) ) {
+ if ( !isForClipboard && originalMw && ve.compare( mwData, JSON.parse(
originalMw ) ) ) {
el.setAttribute( 'data-mw', originalMw );
// Return the original DOM elements if possible
diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
index dd78894..92ebf0a 100644
--- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
@@ -1227,6 +1227,43 @@
'"attrs":{"group":"g1","name":"foo"}}\\">'
+
'"}}">' +
'',
+ clipboardBody:
+ 'Foo' +
+ ''
+
+ '[1]' +
+ '' +
+ ' Baz' +
+ ''
+
+ '[g1 1]' +
+ '' +
+ ' Whee' +
+ '' +
+ '[1]' +
+ '' +
+ ' Yay' +
+ // This reference has .body.id instead of
.body.html
+ '' +
+ '[g1 2]' +
+ '' +
+ ' Quux' +
+ '' +
+ '[1]' +
+ '' +
+ ' Foo' +
+ ''
+
+ '[g1 3]' +
+ '' +
+ '' +
+ // The HTML below is enriched to wrap reference
contents in
+ // which Parsoid doesn't do yet, but T88290 asks for
+ '' +
+ '',
head: 'http://example.com"; />',
data: [
{ type: 'paragraph' },
--
To view, visit htt
[MediaWiki-commits] [Gerrit] ISO-fy date format & make date parsing fail gently - change (operations...adminbot)
Andrew Bogott has submitted this change and it was merged.
Change subject: ISO-fy date format & make date parsing fail gently
..
ISO-fy date format & make date parsing fail gently
Also allow lines up to 100 characters.
Change-Id: I5c903b36bf13e7e37a5b48f3dd154b7f424435f3
---
M adminlog.py
1 file changed, 7 insertions(+), 11 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
diff --git a/adminlog.py b/adminlog.py
index 029ad05..140be7d 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -30,25 +30,21 @@
# Um, check the date
now = datetime.datetime.utcnow()
logline = "* %02d:%02d %s: %s" % (now.hour, now.minute, author, message)
-year = str(now.year)
-month = str(now.month)
-day = str(now.day)
+
# Try extracting latest date header
header = "=" * config.wiki_header_depth
for line in lines:
position += 1
if line.startswith(header):
-undef, year, month, day, undef = line.split(" ", 4)
+try:
+header_date = [int(x) for x in line.strip(" =").split("-")]
+except ValueError:
+header_date = None
break
-if (now.year != int(year) or
-months[now.month - 1] != month or
-now.day != int(day)):
-
+if header_date != (now.year, now.month, now.day):
lines.insert(0, "")
lines.insert(0, logline)
-lines.insert(0,
-"%s %d %s %d %s" % (header, now.year, months[now.month - 1],
-now.day, header))
+lines.insert(0, now.strftime("{0} %Y-%m-%d {0}".format(header)))
else:
lines.insert(position, logline)
if config.wiki_category:
--
To view, visit https://gerrit.wikimedia.org/r/224171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c903b36bf13e7e37a5b48f3dd154b7f424435f3
Gerrit-PatchSet: 4
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ISO-fy date format & make date parsing fail gently - change (operations...adminbot)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224171
Change subject: ISO-fy date format & make date parsing fail gently
..
ISO-fy date format & make date parsing fail gently
Change-Id: I5c903b36bf13e7e37a5b48f3dd154b7f424435f3
---
M adminlog.py
1 file changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot
refs/changes/71/224171/1
diff --git a/adminlog.py b/adminlog.py
index 029ad05..919f217 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -38,17 +38,15 @@
for line in lines:
position += 1
if line.startswith(header):
-undef, year, month, day, undef = line.split(" ", 4)
+try:
+year, month, day = [int(x) for x in line.strip("
=").split("-")]
+except ValueError:
+year = month = day = None
break
-if (now.year != int(year) or
-months[now.month - 1] != month or
-now.day != int(day)):
-
+if (now.year, now.month, now.day) != (year, month, day):
lines.insert(0, "")
lines.insert(0, logline)
-lines.insert(0,
-"%s %d %s %d %s" % (header, now.year, months[now.month - 1],
-now.day, header))
+lines.insert(0, now.strftime("{0} %Y-%m-%d {0}".format(header)))
else:
lines.insert(position, logline)
if config.wiki_category:
--
To view, visit https://gerrit.wikimedia.org/r/224171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c903b36bf13e7e37a5b48f3dd154b7f424435f3
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment::server: move releases::upload into role - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: deployment::server: move releases::upload into role
..
deployment::server: move releases::upload into role
Letting releasers upload releases to caesium should be a feature
of a deployment server in general.
It should work from either of the main DCs.
This will remove it from tin but add it to the role which is applied on
tin and mira, effectively making it work on mira in codfw.
Change-Id: Ica21c2a4cc0c57e12b083e6ae184d8dd8055ac6c
---
M manifests/role/deployment.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index ede9149..3fccc1d 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -31,6 +31,7 @@
include ::apache::mod::dav_fs
include ::apache::helper_scripts
include mysql
+include role::releases::upload
include network::constants
$deployable_networks = $::network::constants::deployable_networks
diff --git a/manifests/site.pp b/manifests/site.pp
index 538b348..630a8ec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2300,7 +2300,6 @@
include standard
include role::deployment::server
include role::labsdb::manager
-include role::releases::upload
interface::add_ip6_mapped { 'main':
interface => 'eth0',
--
To view, visit https://gerrit.wikimedia.org/r/223464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica21c2a4cc0c57e12b083e6ae184d8dd8055ac6c
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change case: Astropay -> AstroPay - change (wikimedia...SmashPig)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224170
Change subject: Change case: Astropay -> AstroPay
..
Change case: Astropay -> AstroPay
D'oh!
Change-Id: Ib3c9d3c79d7b0f48f16ca8ea38b1b74d8650449e
---
R PaymentProviders/AstroPay/Actions/IncomingMessage.php
R PaymentProviders/AstroPay/AstroPayListener.php
R PaymentProviders/AstroPay/Audit/AstroPayAudit.php
R PaymentProviders/AstroPay/ExpatriatedMessages/AstroPayMessage.php
A PaymentProviders/AstroPay/ExpatriatedMessages/ExpirationMessage.php
A PaymentProviders/AstroPay/ExpatriatedMessages/PaymentMessage.php
R PaymentProviders/AstroPay/Messages/NormalizedMessage.php
R PaymentProviders/AstroPay/ReferenceData.php
R PaymentProviders/AstroPay/Tests/Data/donation.csv
R PaymentProviders/AstroPay/Tests/Data/paid.json
R PaymentProviders/AstroPay/Tests/Data/refund.csv
R PaymentProviders/AstroPay/Tests/phpunit/AuditTest.php
R PaymentProviders/AstroPay/Tests/phpunit/NormalizeTest.php
D PaymentProviders/Astropay/ExpatriatedMessages/ExpirationMessage.php
D PaymentProviders/Astropay/ExpatriatedMessages/PaymentMessage.php
M config_defaults.php
M phpunit.xml
17 files changed, 52 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/70/224170/1
diff --git a/PaymentProviders/Astropay/Actions/IncomingMessage.php
b/PaymentProviders/AstroPay/Actions/IncomingMessage.php
similarity index 91%
rename from PaymentProviders/Astropay/Actions/IncomingMessage.php
rename to PaymentProviders/AstroPay/Actions/IncomingMessage.php
index 6538a36..9e18a67 100644
--- a/PaymentProviders/Astropay/Actions/IncomingMessage.php
+++ b/PaymentProviders/AstroPay/Actions/IncomingMessage.php
@@ -1,4 +1,4 @@
-
'SmashPig\PaymentProviders\Astropay\ExpatriatedMessages\PaymentMessage',
- '8' =>
'SmashPig\PaymentProviders\Astropay\ExpatriatedMessages\ExpirationMessage',
+ '9' =>
'SmashPig\PaymentProviders\AstroPay\ExpatriatedMessages\PaymentMessage',
+ '8' =>
'SmashPig\PaymentProviders\AstroPay\ExpatriatedMessages\ExpirationMessage',
);
protected function parseEnvelope( Request $request ) {
@@ -30,7 +30,7 @@
$missing = array_diff( $required, array_keys( $requestValues )
);
if ( count( $missing ) ) {
$list = implode( ',', $missing );
- throw new ListenerDataException( "Astropay message
missing required key(s) $list." );
+ throw new ListenerDataException( "AstroPay message
missing required key(s) $list." );
}
$result = $requestValues['result'];
diff --git a/PaymentProviders/Astropay/Audit/AstropayAudit.php
b/PaymentProviders/AstroPay/Audit/AstroPayAudit.php
similarity index 93%
rename from PaymentProviders/Astropay/Audit/AstropayAudit.php
rename to PaymentProviders/AstroPay/Audit/AstroPayAudit.php
index 517fceb..de5d7a3 100644
--- a/PaymentProviders/Astropay/Audit/AstropayAudit.php
+++ b/PaymentProviders/AstroPay/Audit/AstroPayAudit.php
@@ -1,10 +1,10 @@
-ignoredStatuses = array(
diff --git a/PaymentProviders/Astropay/ExpatriatedMessages/AstropayMessage.php
b/PaymentProviders/AstroPay/ExpatriatedMessages/AstroPayMessage.php
similarity index 84%
rename from PaymentProviders/Astropay/ExpatriatedMessages/AstropayMessage.php
rename to PaymentProviders/AstroPay/ExpatriatedMessages/AstroPayMessage.php
index c58e2ee..8d05277 100644
--- a/PaymentProviders/Astropay/ExpatriatedMessages/AstropayMessage.php
+++ b/PaymentProviders/AstroPay/ExpatriatedMessages/AstroPayMessage.php
@@ -1,9 +1,9 @@
-gateway = 'astropay';
- // Astropay invoice format is ct_id.numAttempt
+ // AstroPay invoice format is ct_id.numAttempt
$invoiceParts = explode( '.', $this->x_invoice );
$queueMsg->contribution_tracking_id = $invoiceParts[0];
diff --git
a/PaymentProviders/AstroPay/ExpatriatedMessages/ExpirationMessage.php
b/PaymentProviders/AstroPay/ExpatriatedMessages/ExpirationMessage.php
new file mode 100644
index 000..0f9427a
--- /dev/null
+++ b/PaymentProviders/AstroPay/ExpatriatedMessages/ExpirationMessage.php
@@ -0,0 +1,10 @@
+parseFile( __DIR__ .
'/../Data/donation.csv' );
$this->assertEquals( 1, count( $output ), 'Should have found
one donation' );
$actual = $output[0];
@@ -37,7 +37,7 @@
* Now try a refund
*/
public function testProcessRefund() {
- $processor = new AstropayAudit();
+ $processor = new AstroPayAudit();
$output = $processor->parseFile( __DIR__ .
'/../Data/refund.csv' );
$this->assertEquals( 1, count( $output ), 'Should have found
one refund' );
$actual = $output[0];
@@ -47,7 +47,7 @@
'date' => 1434747909,
'
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 01af57d..e45674e - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 01af57d..e45674e .. Syncronize VisualEditor: 01af57d..e45674e Change-Id: Id10fdbc1ab5ed28767c071b4374b5664856a02c6 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 01af57d..e45674e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 01af57dfba184e8e73ee1441c60a7baff4ce5758 +Subproject commit e45674e8817499982fc234ba12dfb74ea693b0c3 -- To view, visit https://gerrit.wikimedia.org/r/224169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id10fdbc1ab5ed28767c071b4374b5664856a02c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 01af57d..e45674e - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/224169 Change subject: Syncronize VisualEditor: 01af57d..e45674e .. Syncronize VisualEditor: 01af57d..e45674e Change-Id: Id10fdbc1ab5ed28767c071b4374b5664856a02c6 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/69/224169/1 diff --git a/VisualEditor b/VisualEditor index 01af57d..e45674e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 01af57dfba184e8e73ee1441c60a7baff4ce5758 +Subproject commit e45674e8817499982fc234ba12dfb74ea693b0c3 -- To view, visit https://gerrit.wikimedia.org/r/224169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id10fdbc1ab5ed28767c071b4374b5664856a02c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Credit where credit is due - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Credit where credit is due .. Credit where credit is due Yay Erik B! Change-Id: Ib0a2978e580af359e05958bf6cf7028455d884dc --- M CREDITS M CirrusSearch.php 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/CREDITS b/CREDITS index 57d386c..3b8ec94 100644 --- a/CREDITS +++ b/CREDITS @@ -7,3 +7,4 @@ == Developers == * Nik Everett * Chad Horohoe +* Erik Bernhardson diff --git a/CirrusSearch.php b/CirrusSearch.php index 386afee..3efaadd 100644 --- a/CirrusSearch.php +++ b/CirrusSearch.php @@ -24,7 +24,7 @@ $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'CirrusSearch', - 'author' => array( 'Nik Everett', 'Chad Horohoe' ), + 'author' => array( 'Nik Everett', 'Chad Horohoe', 'Erik Bernhardson' ), 'descriptionmsg' => 'cirrussearch-desc', 'url'=> 'https://www.mediawiki.org/wiki/Extension:CirrusSearch', 'version'=> '0.2', -- To view, visit https://gerrit.wikimedia.org/r/224130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0a2978e580af359e05958bf6cf7028455d884dc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Chad Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: Tjones Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase puppet-run interval from 20m to 30m - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: Increase puppet-run interval from 20m to 30m .. Increase puppet-run interval from 20m to 30m We're having load problems on the puppetmaster lately, and this should help us cope until we do something better about it. Change-Id: I0b57c7b186de7ad3ac1329ffa9d2e3709bb2860b --- M modules/base/manifests/puppet/params.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Faidon Liambotis: Looks good to me, but someone else must approve BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/base/manifests/puppet/params.pp b/modules/base/manifests/puppet/params.pp index 11be0e3..d30 100644 --- a/modules/base/manifests/puppet/params.pp +++ b/modules/base/manifests/puppet/params.pp @@ -2,7 +2,7 @@ ## run puppet by cron and ## rotate puppet logs generated by cron ## This is in mins. Do not set this to 0 or > 60 -$interval = 20 +$interval = 30 $crontime = fqdn_rand(60) # Calculate freshness interval in seconds (hence *60) $freshnessinterval = $interval * 60 * 6 -- To view, visit https://gerrit.wikimedia.org/r/224131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b57c7b186de7ad3ac1329ffa9d2e3709bb2860b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack Gerrit-Reviewer: BBlack Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase puppet-run interval from 20m to 30m - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/224131 Change subject: Increase puppet-run interval from 20m to 30m .. Increase puppet-run interval from 20m to 30m We're having load problems on the puppetmaster lately, and this should help us cope until we do something better about it. Change-Id: I0b57c7b186de7ad3ac1329ffa9d2e3709bb2860b --- M modules/base/manifests/puppet/params.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/31/224131/1 diff --git a/modules/base/manifests/puppet/params.pp b/modules/base/manifests/puppet/params.pp index 11be0e3..d30 100644 --- a/modules/base/manifests/puppet/params.pp +++ b/modules/base/manifests/puppet/params.pp @@ -2,7 +2,7 @@ ## run puppet by cron and ## rotate puppet logs generated by cron ## This is in mins. Do not set this to 0 or > 60 -$interval = 20 +$interval = 30 $crontime = fqdn_rand(60) # Calculate freshness interval in seconds (hence *60) $freshnessinterval = $interval * 60 * 6 -- To view, visit https://gerrit.wikimedia.org/r/224131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b57c7b186de7ad3ac1329ffa9d2e3709bb2860b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Credit where credit is due - change (mediawiki...CirrusSearch)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/224130 Change subject: Credit where credit is due .. Credit where credit is due Yay Erik B! Change-Id: Ib0a2978e580af359e05958bf6cf7028455d884dc --- M CREDITS M CirrusSearch.php 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/30/224130/1 diff --git a/CREDITS b/CREDITS index 57d386c..3b8ec94 100644 --- a/CREDITS +++ b/CREDITS @@ -7,3 +7,4 @@ == Developers == * Nik Everett * Chad Horohoe +* Erik Bernhardson diff --git a/CirrusSearch.php b/CirrusSearch.php index 386afee..3efaadd 100644 --- a/CirrusSearch.php +++ b/CirrusSearch.php @@ -24,7 +24,7 @@ $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'CirrusSearch', - 'author' => array( 'Nik Everett', 'Chad Horohoe' ), + 'author' => array( 'Nik Everett', 'Chad Horohoe', 'Erik Bernhardson' ), 'descriptionmsg' => 'cirrussearch-desc', 'url'=> 'https://www.mediawiki.org/wiki/Extension:CirrusSearch', 'version'=> '0.2', -- To view, visit https://gerrit.wikimedia.org/r/224130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0a2978e580af359e05958bf6cf7028455d884dc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
