[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add Wikibase Client extension requirement to APISite.unconne...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337275 )
Change subject: Add Wikibase Client extension requirement to
APISite.unconnectedpages()
..
Add Wikibase Client extension requirement to APISite.unconnectedpages()
This special page is only available on wikis that have this extension
installed.
Change-Id: I779ad61afa1d9d5496bf171b3187f9149dcc4bc2
---
M pywikibot/site.py
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 2491a54..aedb42a 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -6543,6 +6543,7 @@
return lrgen
@deprecated_args(step=None)
+@need_extension('Wikibase Client')
def unconnected_pages(self, total=None):
"""Yield Page objects from Special:UnconnectedPages.
--
To view, visit https://gerrit.wikimedia.org/r/337275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I779ad61afa1d9d5496bf171b3187f9149dcc4bc2
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek
Gerrit-Reviewer: Dalba
Gerrit-Reviewer: Magul
Gerrit-Reviewer: Mpaa
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: Zhuyifei1999
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [DEPR] deprecate removed arguemt
Xqt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348039 )
Change subject: [DEPR] deprecate removed arguemt
..
[DEPR] deprecate removed arguemt
follow-up for I87fbc467be1bce6b24076e3c5eac9dcc58558909
Change-Id: I8531dc196a4922de677f51dfba94da316b28d122
---
M pywikibot/page.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/39/348039/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 2606d79..04c8ab9 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -3789,6 +3789,7 @@
self._revid = value
@latest_revision_id.deleter
+@remove_last_args(('value', ))
def latest_revision_id(self):
self.clear_cache()
--
To view, visit https://gerrit.wikimedia.org/r/348039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8531dc196a4922de677f51dfba94da316b28d122
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Consolidate the BetaCluster and production configs i...
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348038 )
Change subject: Config: Consolidate the BetaCluster and production configs into
one
..
Config: Consolidate the BetaCluster and production configs into one
We kept the configs separate in ops/puppet, but not a lot of things vary
between all our environments: the UA, the storage groups and domains are
the only differences, so move their definitions into the respective
vars.yaml file.
The domains follow this structure:
section:
domain: project
where section is the name of the domain block (like 'Wikipedia' or
'Specials'), domain is the domain name itself and project is the name of
project template to use (which must be defined in config.yaml.j2).
Change-Id: Ia3a989c0994383aab0d502a79f0a517622ba63d2
---
M scap/environments/beta/vars.yaml
M scap/environments/dev-cluster/vars.yaml
M scap/environments/staging/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
5 files changed, 833 insertions(+), 788 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/38/348038/1
diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 885c144..5f33aad 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,2 +1,41 @@
salt_key: '123456'
page_size: 10
+user_agent: RESTBase/deployment-prep
+storage_groups: []
+domains:
+ BetaCluster:
+aa.wikipedia.beta.wmflabs.org: default_project
+ar.wikipedia.beta.wmflabs.org: default_project
+ca.wikipedia.beta.wmflabs.org: default_project
+commons.wikimedia.beta.wmflabs.org: default_project
+deployment.wikimedia.beta.wmflabs.org: default_project
+de.wikipedia.beta.wmflabs.org: default_project
+de.wiktionary.beta.wmflabs.org: wiktionary_project
+en-rtl.wikipedia.beta.wmflabs.org: default_project
+en.wikibooks.beta.wmflabs.org: default_project
+en.wikinews.beta.wmflabs.org: default_project
+en.wikipedia.beta.wmflabs.org: en.wikipedia.org
+en.wikiquote.beta.wmflabs.org: default_project
+en.wikisource.beta.wmflabs.org: default_project
+en.wiktionary.beta.wmflabs.org: wiktionary_project
+en.wikiversity.beta.wmflabs.org: default_project
+en.wikivoyage.beta.wmflabs.org: default_project
+eo.wikipedia.beta.wmflabs.org: default_project
+es.wikipedia.beta.wmflabs.org: default_project
+fa.wikipedia.beta.wmflabs.org: default_project
+he.wikipedia.beta.wmflabs.org: default_project
+he.wiktionary.beta.wmflabs.org: wiktionary_project
+hi.wikipedia.beta.wmflabs.org: default_project
+ja.wikipedia.beta.wmflabs.org: default_project
+ko.wikipedia.beta.wmflabs.org: default_project
+login.wikimedia.beta.wmflabs.org: default_project
+meta.wikimedia.beta.wmflabs.org: default_project
+nl.wikipedia.beta.wmflabs.org: default_project
+ru.wikipedia.beta.wmflabs.org: default_project
+simple.wikipedia.beta.wmflabs.org: default_project
+sq.wikipedia.beta.wmflabs.org: default_project
+test.wikimedia.beta.wmflabs.org: default_project
+uk.wikipedia.beta.wmflabs.org: default_project
+wikidata.beta.wmflabs.org: wikidata.org
+zero.wikimedia.beta.wmflabs.org: default_project
+zh.wikipedia.beta.wmflabs.org: default_project
diff --git a/scap/environments/dev-cluster/vars.yaml
b/scap/environments/dev-cluster/vars.yaml
index 620f9f6..bdfcac5 100644
--- a/scap/environments/dev-cluster/vars.yaml
+++ b/scap/environments/dev-cluster/vars.yaml
@@ -1 +1,2 @@
skip_updates: true
+user_agent: RESTBase/DevCluster
diff --git a/scap/environments/staging/vars.yaml
b/scap/environments/staging/vars.yaml
index 620f9f6..4944a40 100644
--- a/scap/environments/staging/vars.yaml
+++ b/scap/environments/staging/vars.yaml
@@ -1 +1,2 @@
skip_updates: true
+user_agent: RESTBase/Staging
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index c80838a..6dc451f 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -38,14 +38,14 @@
type: statsd
batch: true
-<% if rl_seeds|length > 0 %>
+<%- if rl_seeds|length > 0 %>
ratelimiter:
type: kademlia
listen:
address: <%= ipaddress %>
port: 3050
seeds: ['<%= rl_seeds|join("','") %>']
-<% endif %>
+<%- endif %>
# load & parametrise project templates. These are referenced / shared
# between domains in the root_spec further down.
@@ -67,29 +67,10 @@
<% endfor -%>
<% endif %>
storage_groups:
-- name: phase0.group.local
- domains:
-- /^(?:test.*\.wiki.*\.org|www.mediawiki.org)$/
-- name: wikipedia.group.local
- domains: /\.wikipedia\.org$/
-- name: wikimedia.group.local
- domains: /\.wikimedia\.org$/
-- name: wiktionary.group.local
- domains: /\.wiktionary\.org$/
-- nam
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: DesktopArticleTarget.init: Don't call setEditorPreference twice
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348020 )
Change subject: DesktopArticleTarget.init: Don't call setEditorPreference twice
..
DesktopArticleTarget.init: Don't call setEditorPreference twice
This is run after the targetPromise completes (via the platform-agnostic
setDefaultMode proxy), which is the correct time to do so. We should not
do this twice, and we definitely shouldn't do this before the target has
successfully loaded, lest a user ends up with us setting their option to
"prefer" an editor that they actually can't load. Whoops.
Bug: T156316
Change-Id: Icf4b5ddd9c8265ade55f43328f807344b41db350
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 4657f4e..9a2ae1e 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -260,12 +260,6 @@
.done( incrementLoadingProgress );
}
- if ( mode === 'visual' ) {
- setEditorPreference( 'visualeditor' );
- } else {
- setEditorPreference( 'wikitext' );
- }
-
showLoading();
incrementLoadingProgress();
active = true;
--
To view, visit https://gerrit.wikimedia.org/r/348020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf4b5ddd9c8265ade55f43328f807344b41db350
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS:Add mgmt and production DNS for db20[7-9][0-9]
Papaul has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348037 )
Change subject: DNS:Add mgmt and production DNS for db20[7-9][0-9]
..
DNS:Add mgmt and production DNS for db20[7-9][0-9]
Bug:T162159
Change-Id: I97c03441da60369d865d66e55dfffe3e8260926e
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 132 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/37/348037/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 14d65c9..d1a4152 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2587,6 +2587,13 @@
1 1H IN PTR vrrp-gw-2017.codfw.wmnet.
2 1H IN PTR ae1-2017.cr1-codfw.wikimedia.org.
3 1H IN PTR ae1-2017.cr2-codfw.wikimedia.org.
+4 1H IN PTR db2071.codfw.wmnet.
+5 1H IN PTR db2075.codfw.wmnet.
+6 1H IN PTR db2079.codfw.wmnet.
+7 1H IN PTR db2081.codfw.wmnet.
+8 1H IN PTR db2085.codfw.wmnet.
+9 1H IN PTR db2089.codfw.wmnet.
+10 1H IN PTR db2091.codfw.wmnet.
13 1H IN PTR db2010.codfw.wmnet.
14 1H IN PTR db2011.codfw.wmnet.
@@ -2743,6 +2750,11 @@
34 1H IN PTR maps-test2003.codfw.wmnet.
35 1H IN PTR maps-test2004.codfw.wmnet.
36 1H IN PTR scb2004.codfw.wmnet.
+37 1H IN PTR db2072.codfw.wmnet.
+38 1H IN PTR db2076.codfw.wmnet.
+39 1H IN PTR db2082.codfw.wmnet.
+40 1H IN PTR db2086.codfw.wmnet.
+41 1H IN PTR db2092.codfw.wmnet.
43 1H IN PTR wtp2001.codfw.wmnet.
44 1H IN PTR wtp2002.codfw.wmnet.
@@ -3090,6 +3102,12 @@
164 1H IN PTR ms-be2034.codfw.wmnet.
165 1H IN PTR ms-be2035.codfw.wmnet.
166 1H IN PTR ms-be2036.codfw.wmnet.
+167 1H IN PTR db2073.codfw.wmnet.
+168 1H IN PTR db2077.codfw.wmnet.
+169 1H IN PTR db2080.codfw.wmnet.
+170 1H IN PTR db2083.codfw.wmnet.
+171 1H IN PTR db2087.codfw.wmnet.
+172 1H IN PTR db2090.codfw.wmnet.
$ORIGIN 33.192.{{ zonename }}.
1 1H IN PTR vl2019-eth2.lvs2001.codfw.wmnet.
@@ -3190,6 +3208,10 @@
81 1H IN PTR ms-be2037.codfw.wmnet.
82 1H IN PTR ms-be2038.codfw.wmnet.
83 1H IN PTR ms-be2039.codfw.wmnet.
+84 1H IN PTR db2074.codfw.wmnet.
+85 1H IN PTR db2078.codfw.wmnet.
+86 1H IN PTR db2084.codfw.wmnet.
+87 1H IN PTR db2088.codfw.wmnet.
$ORIGIN 49.192.{{ zonename }}.
1 1H IN PTR vl2020-eth3.lvs2001.codfw.wmnet.
@@ -3363,7 +3385,24 @@
49 1H IN PTR labtestweb2001.mgmt.codfw.wmnet.
49 1H IN PTR wmf5847.mgmt.codfw.wmnet.
50 1H IN PTR wmf3641.mgmt.codfw.wmnet.
-
+51 1H IN PTR db2071.mgmt.codfw.wmnet.
+51 1H IN PTR wmf6533.mgmt.codfw.wmnet.
+52 1H IN PTR db2072.mgmt.codfw.wmnet.
+52 1H IN PTR wmf6534.mgmt.codfw.wmnet.
+53 1H IN PTR db2073.mgmt.codfw.wmnet.
+53 1H IN PTR wmf6535.mgmt.codfw.wmnet.
+54 1H IN PTR db2074.mgmt.codfw.wmnet.
+54 1H IN PTR wmf6536.mgmt.codfw.wmnet.
+55 1H IN PTR db2075.mgmt.codfw.wmnet.
+55 1H IN PTR wmf6537.mgmt.codfw.wmnet.
+56 1H IN PTR db2076.mgmt.codfw.wmnet.
+56 1H IN PTR wmf6538.mgmt.codfw.wmnet.
+57 1H IN PTR db2077.mgmt.codfw.wmnet.
+57 1H IN PTR wmf6539.mgmt.codfw.wmnet.
+58 1H IN PTR db2078.mgmt.codfw.wmnet.
+58 1H IN PTR wmf6540.mgmt.codfw.wmnet.
+59 1H IN PTR db2079.mgmt.codfw.wmnet.
+59 1H IN PTR wmf6541.mgmt.codfw.wmnet.
60 1H IN PTR db2010.mgmt.codfw.wmnet.
60 1H IN PTR wmf3637.mgmt.codfw.wmnet.
61 1H IN PTR db2011.mgmt.codfw.wmnet.
@@ -3390,7 +3429,12 @@
73 1H IN PTR db2023.mgmt.codfw.wmnet.
73 1H IN PTR wmf5718.mgmt.codfw.wmnet.
74 1H IN PTR wmf5719.mgmt.codfw.wmnet.
-
+75 1H IN PTR db2080.mgmt.codfw.wmnet.
+75 1H IN PTR wmf6542.mgmt.codfw.wmnet.
+76 1H IN PTR db2081.mgmt.codfw.wmnet.
+76 1H IN PTR wmf6543.mgmt.codfw.wmnet.
+77 1H IN PTR db2082.mgmt.codfw.wmnet.
+77 1H IN PTR wmf6544.mgmt.codfw.wmnet.
78 1H IN PTR db2028.mgmt.codfw.wmnet.
78 1H IN PTR wmf5723.mgmt.codfw.wmnet.
79 1H IN PTR db2029.mgmt.codfw.wmnet.
@@ -3399,7 +3443,8 @@
80 1H IN PTR wmf5725.mgmt.codfw.wmnet.
81 1H IN PTR db2031.mgmt.codfw.wmnet.
81 1H IN PTR wmf5755.mgmt.codfw.wmnet.
-
+82 1H IN PTR db2083.mgmt.codfw.wmnet.
+82 1H IN PTR wmf6545.mgmt.codfw.wmnet.
83 1H IN PTR db2033.mgmt.codfw.wmnet.
83 1H IN PTR wmf6117.mgmt.codfw.wmnet.
84 1H IN PTR db2034.mgmt.codfw.wmnet.
@@ -3558,7 +3603,6 @@
161 1H IN PTR wmf6478.mgmt.codfw.wmnet.
162 1H IN PTR wdqs2003.mgmt.codfw.wmnet.
162 1H IN PTR wmf6479.mgmt.codfw.wmnet.
-
163 1H IN PTR elastic2025.mgmt.codfw.wmnet.
163 1H IN PTR wmf6490.mgmt.codfw.wmnet.
164 1H IN PTR elastic2026.mgmt.codfw.wmnet.
@@ -3938,6 +3982,24 @@
118 1H IN PTR wmf5845.mgmt.codfw.wmnet.
119 1H IN PTR eventlog2001.mgmt.codfw.wmnet.
119 1H IN PTR wmf3811.mgmt.codfw.wmnet.
+120 1H IN PTR db2084.mgmt.codfw.wmnet.
+120 1H IN PTR wmf6546.mgmt.codfw.wmnet.
+121 1H IN PTR db2085.mgmt.codfw.wmnet.
+121 1H IN PTR wmf6547.mgmt.codfw.wmnet.
+122 1H IN PTR db2086.mgmt.codfw.wmnet.
+122 1H IN
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Upgrade to jQuery v3
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/322812 ) Change subject: Upgrade to jQuery v3 .. Upgrade to jQuery v3 Source code: https://code.jquery.com/jquery-3.2.1.js https://code.jquery.com/jquery-migrate-3.0.0.js Documentation: https://blog.jquery.com/2016/06/09/jquery-3-0-final-released/ https://jquery.com/upgrade-guide/3.0/ This is not a breaking change because jQuery Migrate covers all breaking changes. However some extensions (especially unit tests) may've relied on undocumented behaviour. For that reason, and due to unresolved upsteam issues this is still behind a feature flag for now. It is true by default to ensure this has wide exposure to discover issues as quickly as possible. If this is not resolved before the end of the 1.29 release cycle it should be turned off again. Bug: T124742 Change-Id: I3c3dedaa9a9d449eaa2b7e5d24b4540e7fa421c0 --- M RELEASE-NOTES-1.29 M includes/DefaultSettings.php M resources/Resources.php A resources/lib/jquery/jquery.migrate.js A resources/lib/jquery/jquery3.js 5 files changed, 10,812 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/322812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c3dedaa9a9d449eaa2b7e5d24b4540e7fa421c0 Gerrit-PatchSet: 35 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: environment: Upgrade jQuery from 1.11.3 to 3.2.1
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348036 )
Change subject: environment: Upgrade jQuery from 1.11.3 to 3.2.1
..
environment: Upgrade jQuery from 1.11.3 to 3.2.1
Change-Id: I74582ce911783ec4fd8802846273ba62fdd4a8b0
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/36/348036/2
diff --git a/package.json b/package.json
index 381572d..b69d46d 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"jenkins": "npm test && jsduck && npm run postdoc"
},
"dependencies": {
-"jquery": "1.11.3",
+"jquery": "3.2.1",
"oojs": "2.0.0"
},
"devDependencies": {
--
To view, visit https://gerrit.wikimedia.org/r/348036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74582ce911783ec4fd8802846273ba62fdd4a8b0
Gerrit-PatchSet: 2
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] mediawiki...Refreshed[master]: Fix language section in sidebar
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347803 )
Change subject: Fix language section in sidebar
..
Fix language section in sidebar
The language section of the sidebar was not placed in a section tag, and no
text appeared in the header of the language section because an "echo" was
missing. Both issues are now resolved.
Bug: T162766
Change-Id: I2459ed095fc4253152ac8f00bcb576ffee2226e1
---
M Refreshed.skin.php
M skin.json
2 files changed, 12 insertions(+), 10 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Refreshed.skin.php b/Refreshed.skin.php
index dbc5537..851aa06 100644
--- a/Refreshed.skin.php
+++ b/Refreshed.skin.php
@@ -423,15 +423,17 @@
if ( $this->data['language_urls'] ) {
?>
- getMsg(
'otherlanguages' )->text() ?>
-
- data['language_urls'] as $key => $link ) {
- echo
$this->makeListItem( $key, $link, array( 'link-class' => 'sub', 'link-fallback'
=> 'span' ) );
- }
- ?>
-
-
+
+ getMsg( 'otherlanguages' )->text() ?>
+
+ data['language_urls'] as $key => $link ) {
+ echo
$this->makeListItem( $key, $link, array( 'link-class' => 'sub', 'link-fallback'
=> 'span' ) );
+ }
+ ?>
+
+
+
https://gerrit.wikimedia.org/r/347803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2459ed095fc4253152ac8f00bcb576ffee2226e1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: MtMNC
Gerrit-Reviewer: SamanthaNguyen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Citoid[master]: tests: Fiddle with templatedata cache insertion to avoid fai...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348031 )
Change subject: tests: Fiddle with templatedata cache insertion to avoid failed
XHRs
..
tests: Fiddle with templatedata cache insertion to avoid failed XHRs
Bug: T124742
Change-Id: I6bd8ae8d71d6761384d11f0f9145e03bdc316407
---
M modules/tests/index.test.js
1 file changed, 24 insertions(+), 25 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tests/index.test.js b/modules/tests/index.test.js
index 7933cf8..b12773a 100644
--- a/modules/tests/index.test.js
+++ b/modules/tests/index.test.js
@@ -18,8 +18,7 @@
* @return {Object} a Promise for the transclusion with added template
*/
function testMaps( maps, citation, expected, assert ) {
- var serial,
- data = {
+ var data = {
target: {
wt: 'Cite web',
href: './Template:Cite_web'
@@ -1418,23 +1417,23 @@
// Set maps for this test
templateData.maps = maps;
- // Add templateData to template
- template.spec.extend( templateData );
+ // Add templateData to the template cache
+ transclusion.specCache[ template.getTitle() ] = templateData;
- // Test target method
- ve.ui.CiteFromIdInspector.static.populateTemplate( template, citation );
- serial = template.serialize().template;
+ // Make sure template can be added to transclusion
+ return transclusion.addPart( template ).then( function () {
+ // Test target method
+ ve.ui.CiteFromIdInspector.static.populateTemplate( template,
citation );
- // Make sure serialised template matches expected data
- assert.deepEqual( serial, expected );
-
- return assert.ok( transclusion.addPart( template ) ); // Make sure
template can be added to transclusion
+ // Make sure serialised template matches expected data
+ assert.deepEqual( template.serialize().template, expected );
+ } );
}
/* Tests */
-QUnit.test( 'Create template with using valid templateData', 2, function (
assert ) {
+QUnit.test( 'Create template with using valid templateData', function ( assert
) {
var expected = {
target: {
wt: 'Cite web',
@@ -1515,7 +1514,7 @@
} );
-QUnit.test( 'Invalid templateData; String (cit) / Array (td) mismatch', 2,
function ( assert ) {
+QUnit.test( 'Invalid templateData; String (cit) / Array (td) mismatch',
function ( assert ) {
// This test mismatches a flat field in the citation data (title) with
an Array in the
// TemplateData. Expected result is for the field to be skipped in the
resulting template,
// and for no VE errors to be thrown.
@@ -1596,7 +1595,7 @@
} );
-QUnit.test( 'Invalid templateData; String (cit) / 2D Array (td) mismatch', 2,
function ( assert ) {
+QUnit.test( 'Invalid templateData; String (cit) / 2D Array (td) mismatch',
function ( assert ) {
// This test mismatches a flat field in the citation data (title) with
a 2D Array in the TemplateData
// Expected result is for the field to be skipped in the resulting
template, and for no VE
// errors to be thrown.
@@ -1677,7 +1676,7 @@
} );
-QUnit.test( 'Mismatched templateData; Array (cit) / String (td) mismatch', 2,
function ( assert ) {
+QUnit.test( 'Mismatched templateData; Array (cit) / String (td) mismatch',
function ( assert ) {
// This test mismatches an Array in the citation data (isbn) with a
flat field in the TemplateData
// Expected result is for the array to be turned into a string with the
fields separated by
// a comma, and for no VE errors to be thrown.
@@ -1761,7 +1760,7 @@
} );
-QUnit.test( 'Mismatched templateData; Array (cit) / 2D Array (td) mismatch',
2, function ( assert ) {
+QUnit.test( 'Mismatched templateData; Array (cit) / 2D Array (td) mismatch',
function ( assert ) {
// This test mismatches a Array in the citation data (isbn) with a flat
field in the TemplateData
// Expected result is for the field to be skipped in the resulting
template, and for no VE
// errors to be thrown.
@@ -1842,7 +1841,7 @@
} );
-QUnit.test( 'Mismatched templateData; 2D Array (cit) / Array (td) mismatch',
2, function ( assert ) {
+QUnit.test( 'Mismatched templateData; 2D Array (cit) / Array (td) mismatch',
function ( assert ) {
// This test mismatches a 2D Array in the citation data (author) with a
1D array in the
// TemplateData. Expected result is for the inner fields to be
concatenated with a space divider,
// and for no VE errors to be thrown.
@@ -1914,7 +1913,7 @@
} );
-QUnit.test( 'Mismatched templateData; 2D Array (cit) / String (td) mi
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove old IP addresses from autoblock_whitelist message
TTO has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348035 )
Change subject: Remove old IP addresses from autoblock_whitelist message
..
Remove old IP addresses from autoblock_whitelist message
These addresses were added way back in r17937 (2006) and I doubt
whether they really need to be there anymore. The addresses in
question appear to still be registered to AOL, but there's a good
chance their addressing infrastructure has changed in the last 9
years.
The page http://webmaster.info.aol.com/proxyinfo.html doesn't exist
anymore, and the AOL website barely mentions proxies:
https://google.com/search?q=site:aol.com+proxy
Bug: T110824
Change-Id: Ica2a8dc4251e78271530d4adb1dbe22fa406826a
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/35/348035/2
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 582f5f7..a4e2a03 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3549,7 +3549,7 @@
"autoredircomment": "Redirected page to [[$1]]",
"autosumm-new": "Created page with \"$1\"",
"autosumm-newblank": "Created blank page",
- "autoblock_whitelist": "AOL
http://webmaster.info.aol.com/proxyinfo.html\n*64.12.96.0/19\n*149.174.160.0/20\n*152.163.240.0/21\n*152.163.248.0/22\n*152.163.252.0/23\n*152.163.96.0/22\n*152.163.100.0/23\n*195.93.32.0/22\n*195.93.48.0/22\n*195.93.64.0/19\n*195.93.96.0/19\n*195.93.16.0/20\n*198.81.0.0/22\n*198.81.16.0/20\n*198.81.8.0/23\n*202.67.64.128/25\n*205.188.192.0/20\n*205.188.208.0/23\n*205.188.112.0/20\n*205.188.146.144/30\n*207.200.112.0/21";,
+ "autoblock_whitelist": "",
"size-bytes": "$1 {{PLURAL:$1|byte|bytes}}",
"size-kilobytes": "$1 KB",
"size-megabytes": "$1 MB",
--
To view, visit https://gerrit.wikimedia.org/r/348035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica2a8dc4251e78271530d4adb1dbe22fa406826a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (e4540d87f)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348008 ) Change subject: Update VE core submodule to master (e4540d87f) .. Update VE core submodule to master (e4540d87f) New changes: 57c61dcf8 VisualDiff: Ignore un-rendered modified elements d426f8066 Tweak document padding 0d19e0640 Follow-up 16231a81: Fix typo in update-oojs-ui.sh a611080f0 Update OOjs UI to v0.21.0 6f4d44ea6 tests: Switch to use mocha for reporting Bug: T162622 Change-Id: I329a0b4525120f6bebe0ef5ff608eae4461a17a8 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 1338c50..e4540d8 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 1338c50f5888ac4c3c7da9dbf0e34bee62d36500 +Subproject commit e4540d87f8d6bf2b855cc17213830ca1c4bd651c -- To view, visit https://gerrit.wikimedia.org/r/348008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I329a0b4525120f6bebe0ef5ff608eae4461a17a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Update queries to account for expiring user groups
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341947 )
Change subject: Update queries to account for expiring user groups
..
Update queries to account for expiring user groups
Bug: T157015
Change-Id: I8f65d36fceabaadbc8f538ee740c3f286a4d1f6f
---
M frontend/specialpages/reports/ValidationStatistics_body.php
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
EddieGP: Looks good to me, but someone else must approve
20after4: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
Anomie: Looks good to me, but someone else must approve
diff --git a/frontend/specialpages/reports/ValidationStatistics_body.php
b/frontend/specialpages/reports/ValidationStatistics_body.php
index 96d32ab..5f7dada 100644
--- a/frontend/specialpages/reports/ValidationStatistics_body.php
+++ b/frontend/specialpages/reports/ValidationStatistics_body.php
@@ -232,13 +232,19 @@
protected function getEditorCount() {
return $this->db->selectField( 'user_groups', 'COUNT(*)',
- array( 'ug_group' => 'editor' ),
+ array(
+ 'ug_group' => 'editor',
+ 'ug_expiry IS NULL OR ug_expiry >= ' .
$this->db->addQuotes( $this->db->timestamp() )
+ ),
__METHOD__ );
}
protected function getReviewerCount() {
return $this->db->selectField( 'user_groups', 'COUNT(*)',
- array( 'ug_group' => 'reviewer' ),
+ array(
+ 'ug_group' => 'reviewer',
+ 'ug_expiry IS NULL OR ug_expiry >= ' .
$this->db->addQuotes( $this->db->timestamp() )
+ ),
__METHOD__ );
}
--
To view, visit https://gerrit.wikimedia.org/r/341947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f65d36fceabaadbc8f538ee740c3f286a4d1f6f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: TTO
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: EddieGP
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: TTO
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Don't prevent SavedPageSyncService from running when offline
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348034 )
Change subject: Don't prevent SavedPageSyncService from running when offline
..
Don't prevent SavedPageSyncService from running when offline
Currently we stop the SavedPageSyncService from running when the device
is offline. With the new caching setup, this is no longer always what we
want; it may well be the case that the content the user wants to save is
in the net cache and available for persisting in the save cache. So, this
removes the check for online status.
This also allows the service to perform deletes while offline, which were
also prevented while offline before as a side effect of the check.
Hygiene: Removes the now-unused DeviceUtil.isOnline() method.
Bug: T162270
Change-Id: If98f58fe08324c195aec890d5f3cb976d08870a3
---
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/java/org/wikipedia/util/DeviceUtil.java
2 files changed, 0 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/34/348034/1
diff --git
a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
index d37964f..057c8fa 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
@@ -20,7 +20,6 @@
import org.wikipedia.readinglist.page.ReadingListPageRow;
import org.wikipedia.readinglist.page.database.ReadingListPageDao;
import org.wikipedia.readinglist.page.database.disk.ReadingListPageDiskRow;
-import org.wikipedia.util.DeviceUtil;
import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.UriUtil;
import org.wikipedia.util.log.L;
@@ -49,12 +48,6 @@
}
@Override protected void onHandleIntent(@Nullable Intent intent) {
-// todo: allow deletes while offline
-if (!DeviceUtil.isOnline(this)) {
-L.i("Device is offline; aborting sync service");
-return;
-}
-
List queue = new ArrayList<>();
Collection rows = dao.startDiskTransaction();
diff --git a/app/src/main/java/org/wikipedia/util/DeviceUtil.java
b/app/src/main/java/org/wikipedia/util/DeviceUtil.java
index 6134bee..9401979 100644
--- a/app/src/main/java/org/wikipedia/util/DeviceUtil.java
+++ b/app/src/main/java/org/wikipedia/util/DeviceUtil.java
@@ -77,14 +77,6 @@
(ConnectivityManager)
context.getSystemService(Context.CONNECTIVITY_SERVICE));
}
-public static boolean isOnline(Context context) {
-ConnectivityManager connManager = (ConnectivityManager)
context.getSystemService(Context.CONNECTIVITY_SERVICE);
-return ((connManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE)
!= null
-&&
connManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).isConnected())
-|| (connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI)
!= null
-&&
connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()));
-}
-
public static boolean isLocationServiceEnabled(@NonNull Context context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
int locationMode = Settings.Secure.LOCATION_MODE_OFF;
--
To view, visit https://gerrit.wikimedia.org/r/348034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If98f58fe08324c195aec890d5f3cb976d08870a3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348032 ) Change subject: Update GUI .. Update GUI Change-Id: I6289d7b3f0723926a3090207aedbd15e005bc333 --- M gui 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/gui b/gui index ee8f535..80c1a0a 16 --- a/gui +++ b/gui @@ -1 +1 @@ -Subproject commit ee8f5350806b4f1eb9cdcb2380c2d44b05fa9dd9 +Subproject commit 80c1a0add8b1161c48c4de9be219e0c1a4ee91f0 -- To view, visit https://gerrit.wikimedia.org/r/348032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6289d7b3f0723926a3090207aedbd15e005bc333 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Avoid using DB_MASTER on account authentication
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348033 )
Change subject: Avoid using DB_MASTER on account authentication
..
Avoid using DB_MASTER on account authentication
This matches core after 8d59074.
Bug: T92375
Change-Id: I5e22a184fda813923fdf4762754df58c4936c426
---
M includes/CentralAuthPrimaryAuthenticationProvider.php
1 file changed, 17 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/33/348033/1
diff --git a/includes/CentralAuthPrimaryAuthenticationProvider.php
b/includes/CentralAuthPrimaryAuthenticationProvider.php
index 4b87861..00c1680 100644
--- a/includes/CentralAuthPrimaryAuthenticationProvider.php
+++ b/includes/CentralAuthPrimaryAuthenticationProvider.php
@@ -124,7 +124,7 @@
$pass = false;
// First, check normal login
- $centralUser = CentralAuthUser::getMasterInstanceByName(
$username );
+ $centralUser = CentralAuthUser::getInstanceByName( $username );
$pass = $centralUser->authenticate( $req->password ) === 'ok';
// See if it's a user affected by a rename, if applicable.
@@ -177,13 +177,23 @@
// If we don't have a central account, see if all local
accounts match
// the password and can be globalized. (bug T72392)
if ( !$centralUser->exists() ) {
- $this->logger->debug( 'no global account for
"{username}"', [ 'username' => $username ] );
- if ( $this->autoMigrateNonGlobalAccounts ) {
- $ok = $centralUser->storeAndMigrate( [
$req->password ], /* $sendToRC = */ true, /* $safe = */ true, /* $checkHome =
*/ true );
+ $this->logger->debug(
+ 'no global account for "{username}"', [
'username' => $username ] );
+ // Confirm using DB_MASTER in case of replication lag
+ $latestCentralUser =
CentralAuthUser::getMasterInstanceByName( $username );
+ if ( $this->autoMigrateNonGlobalAccounts &&
!$latestCentralUser->exists() ) {
+ $ok = $latestCentralUser->storeAndMigrate(
+ [ $req->password ],
+ /* $sendToRC = */ true,
+ /* $safe = */ true,
+ /* $checkHome = */ true
+ );
if ( $ok ) {
- $this->logger->debug(
'wgCentralAuthAutoMigrateNonGlobalAccounts successful in creating a global
account for "{username}"', [
- 'username' => $username
- ] );
+ $this->logger->debug(
+
'wgCentralAuthAutoMigrateNonGlobalAccounts successful in creating ' .
+ 'a global account for
"{username}"',
+ [ 'username' => $username ]
+ );
$this->setPasswordResetFlag( $username,
$status );
return AuthenticationResponse::newPass(
$username );
}
--
To view, visit https://gerrit.wikimedia.org/r/348033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e22a184fda813923fdf4762754df58c4936c426
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
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] mediawiki/core[master]: resourceloader: Fold legacy modules into base modules request
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/282505 )
Change subject: resourceloader: Fold legacy modules into base modules request
..
resourceloader: Fold legacy modules into base modules request
Follows-up 0ac4f998 (restore "blocking" legacy modules).
After d790562, legacy modules in the top queue were no longer consistently
loaded before the bottom queue due to the top queue being async.
The implied dependency was made explicit by 0ac4f998 by forcing all modules
to wait for legacy modules before executing.
This had the negative side-effect of putting an extra HTTP request between
the startup module request, base modules request, and actual execution
of page modules.
(Indentation aligns with when a request is triggered.)
Before:
1. Request: Startup module.
2. Request: Base modules
3. Request: Legacy modules
4. Page module request (or local store hit) and execution
After:
1. Request: Startup module.
2. Request: Base+legacy modules
3. Page module request (or local store hit) and execution
This could alternatively be fixed by moving the top queue to be before
the embedded modules and enforcing the embed in a different way.
It could also be fixed by debouncing module load calls so they naturally
end up in the same request as page modules.
However for now I'm addressing this by adding legacy modules to the
list of modules in the initial load request from the startup module.
This was not possible before because the legacy wikibits had dependencies
and base modules cannot have dependencies. Fixed in I7f9f61ea81ad1ef.
Bug: T159911
Change-Id: I54f087655e1cde1b8ff1ca5fe56e82f7f7d80965
---
M includes/resourceloader/ResourceLoaderStartUpModule.php
M includes/skins/Skin.php
M resources/src/mediawiki/mediawiki.js
3 files changed, 8 insertions(+), 14 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php
b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 04b2f72..d92dc0a 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -112,7 +112,6 @@
'wgIllegalFileChars' =>
Title::convertByteClassToUnicodeClass( $illegalFileChars ),
'wgResourceLoaderStorageVersion' => $conf->get(
'ResourceLoaderStorageVersion' ),
'wgResourceLoaderStorageEnabled' => $conf->get(
'ResourceLoaderStorageEnabled' ),
- 'wgResourceLoaderLegacyModules' =>
self::getLegacyModules(),
'wgForeignUploadTargets' => $conf->get(
'ForeignUploadTargets' ),
'wgEnableUploads' => $conf->get( 'EnableUploads' ),
];
@@ -330,9 +329,11 @@
*/
public static function getStartupModulesUrl( ResourceLoaderContext
$context ) {
$rl = $context->getResourceLoader();
-
$derivative = new DerivativeResourceLoaderContext( $context );
- $derivative->setModules( self::getStartupModules() );
+ $derivative->setModules( array_merge(
+ self::getStartupModules(),
+ self::getLegacyModules()
+ ) );
$derivative->setOnly( 'scripts' );
// Must setModules() before makeVersionQuery()
$derivative->setVersion( $rl->makeVersionQuery( $derivative ) );
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 52678d4..99658f29 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -164,8 +164,6 @@
'content' => [
'mediawiki.page.ready',
],
- // modules that exist for legacy reasons
- 'legacy' =>
ResourceLoaderStartUpModule::getLegacyModules(),
// modules relating to search functionality
'search' => [],
// modules relating to functionality relating to
watching an article
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 86a9a0a..a49db79 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1270,10 +1270,7 @@
registry[ module ].state = 'executing';
runScript = function () {
- var script, markModuleReady,
nestedAddScript, legacyWait, implicitDependencies,
- // Expand to include
dependencies since we have to exclude both legacy modules
- // and their dependencies from
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348032 ) Change subject: Update GUI .. Update GUI Change-Id: I6289d7b3f0723926a3090207aedbd15e005bc333 --- M gui 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/32/348032/1 diff --git a/gui b/gui index ee8f535..80c1a0a 16 --- a/gui +++ b/gui @@ -1 +1 @@ -Subproject commit ee8f5350806b4f1eb9cdcb2380c2d44b05fa9dd9 +Subproject commit 80c1a0add8b1161c48c4de9be219e0c1a4ee91f0 -- To view, visit https://gerrit.wikimedia.org/r/348032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6289d7b3f0723926a3090207aedbd15e005bc333 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Citoid[master]: tests: Fiddle with templatedata cache insertion to avoid fai...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348031 )
Change subject: tests: Fiddle with templatedata cache insertion to avoid failed
XHRs
..
tests: Fiddle with templatedata cache insertion to avoid failed XHRs
Change-Id: I6bd8ae8d71d6761384d11f0f9145e03bdc316407
---
M modules/tests/index.test.js
1 file changed, 24 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid
refs/changes/31/348031/1
diff --git a/modules/tests/index.test.js b/modules/tests/index.test.js
index 7933cf8..b12773a 100644
--- a/modules/tests/index.test.js
+++ b/modules/tests/index.test.js
@@ -18,8 +18,7 @@
* @return {Object} a Promise for the transclusion with added template
*/
function testMaps( maps, citation, expected, assert ) {
- var serial,
- data = {
+ var data = {
target: {
wt: 'Cite web',
href: './Template:Cite_web'
@@ -1418,23 +1417,23 @@
// Set maps for this test
templateData.maps = maps;
- // Add templateData to template
- template.spec.extend( templateData );
+ // Add templateData to the template cache
+ transclusion.specCache[ template.getTitle() ] = templateData;
- // Test target method
- ve.ui.CiteFromIdInspector.static.populateTemplate( template, citation );
- serial = template.serialize().template;
+ // Make sure template can be added to transclusion
+ return transclusion.addPart( template ).then( function () {
+ // Test target method
+ ve.ui.CiteFromIdInspector.static.populateTemplate( template,
citation );
- // Make sure serialised template matches expected data
- assert.deepEqual( serial, expected );
-
- return assert.ok( transclusion.addPart( template ) ); // Make sure
template can be added to transclusion
+ // Make sure serialised template matches expected data
+ assert.deepEqual( template.serialize().template, expected );
+ } );
}
/* Tests */
-QUnit.test( 'Create template with using valid templateData', 2, function (
assert ) {
+QUnit.test( 'Create template with using valid templateData', function ( assert
) {
var expected = {
target: {
wt: 'Cite web',
@@ -1515,7 +1514,7 @@
} );
-QUnit.test( 'Invalid templateData; String (cit) / Array (td) mismatch', 2,
function ( assert ) {
+QUnit.test( 'Invalid templateData; String (cit) / Array (td) mismatch',
function ( assert ) {
// This test mismatches a flat field in the citation data (title) with
an Array in the
// TemplateData. Expected result is for the field to be skipped in the
resulting template,
// and for no VE errors to be thrown.
@@ -1596,7 +1595,7 @@
} );
-QUnit.test( 'Invalid templateData; String (cit) / 2D Array (td) mismatch', 2,
function ( assert ) {
+QUnit.test( 'Invalid templateData; String (cit) / 2D Array (td) mismatch',
function ( assert ) {
// This test mismatches a flat field in the citation data (title) with
a 2D Array in the TemplateData
// Expected result is for the field to be skipped in the resulting
template, and for no VE
// errors to be thrown.
@@ -1677,7 +1676,7 @@
} );
-QUnit.test( 'Mismatched templateData; Array (cit) / String (td) mismatch', 2,
function ( assert ) {
+QUnit.test( 'Mismatched templateData; Array (cit) / String (td) mismatch',
function ( assert ) {
// This test mismatches an Array in the citation data (isbn) with a
flat field in the TemplateData
// Expected result is for the array to be turned into a string with the
fields separated by
// a comma, and for no VE errors to be thrown.
@@ -1761,7 +1760,7 @@
} );
-QUnit.test( 'Mismatched templateData; Array (cit) / 2D Array (td) mismatch',
2, function ( assert ) {
+QUnit.test( 'Mismatched templateData; Array (cit) / 2D Array (td) mismatch',
function ( assert ) {
// This test mismatches a Array in the citation data (isbn) with a flat
field in the TemplateData
// Expected result is for the field to be skipped in the resulting
template, and for no VE
// errors to be thrown.
@@ -1842,7 +1841,7 @@
} );
-QUnit.test( 'Mismatched templateData; 2D Array (cit) / Array (td) mismatch',
2, function ( assert ) {
+QUnit.test( 'Mismatched templateData; 2D Array (cit) / Array (td) mismatch',
function ( assert ) {
// This test mismatches a 2D Array in the citation data (author) with a
1D array in the
// TemplateData. Expected result is for the inner fields to be
concatenated with a space divider,
// and for no VE errors to be thrown.
@@ -1914,7 +1913,7 @@
} );
-QUnit.test( 'Mismatched templateData; 2D Array (cit) / String (td)
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Make opportunistic password hash upgrades post-send
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348030 )
Change subject: Make opportunistic password hash upgrades post-send
..
Make opportunistic password hash upgrades post-send
Bug: T92357
Change-Id: Ie0fbf797ede6dc3139c2ecc5781484e2343a9c7c
---
M includes/CentralAuthUser.php
1 file changed, 9 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/30/348030/1
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index 0b472fa..de353f6 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -1886,14 +1886,15 @@
$passwordFactory = new PasswordFactory();
$passwordFactory->init(
RequestContext::getMain()->getConfig() );
- if (
- $passwordFactory->needsUpdate(
$status->getValue() )
- &&
!CentralAuthUtils::getCentralDB()->isReadOnly()
- ) {
-
Profiler::instance()->getTransactionProfiler()->setSilenced( true );
- $this->setPassword( $password );
- $this->saveSettings();
-
Profiler::instance()->getTransactionProfiler()->setSilenced( false );
+ if ( $passwordFactory->needsUpdate( $status->getValue()
) ) {
+ DeferredUpdates::addCallableUpdate( function ()
use ( $password ) {
+ if (
CentralAuthUtils::getCentralDB()->isReadOnly() ) {
+ return;
+ }
+
+ $this->setPassword( $password );
+ $this->saveSettings();
+ } );
}
return "ok";
--
To view, visit https://gerrit.wikimedia.org/r/348030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0fbf797ede6dc3139c2ecc5781484e2343a9c7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
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] mediawiki...VisualEditor[master]: ext.visualEditor.mwcore: Depend on mediawiki.notify for the ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348024 ) Change subject: ext.visualEditor.mwcore: Depend on mediawiki.notify for the warning .. ext.visualEditor.mwcore: Depend on mediawiki.notify for the warning Change-Id: Iac1ddd975ba565f289f856f28e7a2b173d074342 --- M extension.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 01856d0..1328478 100644 --- a/extension.json +++ b/extension.json @@ -1236,6 +1236,7 @@ "mediawiki.jqueryMsg", "jquery.cookie", "jquery.byteLimit", + "mediawiki.notify", "mediawiki.skinning.content.parsoid", "mediawiki.widgets", "ext.visualEditor.switching", -- To view, visit https://gerrit.wikimedia.org/r/348024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac1ddd975ba565f289f856f28e7a2b173d074342 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add ability to search archive via runSearch.php
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348029 )
Change subject: Add ability to search archive via runSearch.php
..
Add ability to search archive via runSearch.php
Use option --archive to switch to archive search. It will use
PageArchive::listPagesBySearch() and return its results.
Change-Id: I9b86ed96c68d3168c46274788fadb352a23ec4ea
---
M maintenance/runSearch.php
1 file changed, 91 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/29/348029/1
diff --git a/maintenance/runSearch.php b/maintenance/runSearch.php
index cd7c89d..478b6fe 100644
--- a/maintenance/runSearch.php
+++ b/maintenance/runSearch.php
@@ -5,9 +5,11 @@
use CirrusSearch;
use CirrusSearch\SearchConfig;
use CirrusSearch\Search\ResultSet;
+use PageArchive;
use RequestContext;
use SearchSuggestionSet;
use Status;
+use Wikimedia\Rdbms\ResultWrapper;
/**
* Run search queries provided on stdin
@@ -57,6 +59,7 @@
$this->addOption( 'decode', 'urldecode() queries before running
them', false, false );
$this->addOption( 'explain', 'Include lucene explanation in the
results', false, false );
$this->addOption( 'limit', 'Set the max number of results
returned by query (defaults to 10)', false, true );
+ $this->addOption( 'archive', 'Search in archive instead of the
main index', false, false );
}
public function execute() {
@@ -104,43 +107,23 @@
if ( $this->getOption( 'decode' ) ) {
$query = urldecode( $query );
}
+ $archiveSearch = $this->getOption( 'archive' );
$data = [ 'query' => $query ];
- $status = $this->searchFor( $query );
+ if ( $archiveSearch) {
+ $status = $this->searchArchive( $query );
+ } else {
+ $status = $this->searchFor( $query );
+ }
if ( $status->isOK() ) {
$value = $status->getValue();
- if ( $value instanceof ResultSet ) {
- // these are prefix or full text results
- $data['totalHits'] = $value->getTotalHits();
- $data['rows'] = [];
- $result = $value->next();
- while ( $result ) {
- $data['rows'][] = [
- // use getDocId() rather than
asking the title to allow this script
- // to work when a production
index has been imported to a test es instance
- 'docId' => $result->getDocId(),
- 'title' =>
$result->getTitle()->getPrefixedText(),
- 'score' => $result->getScore(),
- 'snippets' => [
- 'text' =>
$result->getTextSnippet( [$query] ),
- 'title' =>
$result->getTitleSnippet(),
- 'redirect' =>
$result->getRedirectSnippet(),
- 'section' =>
$result->getSectionSnippet(),
- 'category' =>
$result->getCategorySnippet(),
- ],
- 'explanation' =>
$result->getExplanation(),
- ];
- $result = $value->next();
- }
+ if( $archiveSearch ) {
+ // Archive search results
+ $data += $this->processArchiveResult( $value );
+ } elseif ( $value instanceof ResultSet ) {
+ $data += $this->processResultSet( $value,
$query );
} elseif ( $value instanceof SearchSuggestionSet ) {
// these are suggestion results
- $data['totalHits'] = $value->getSize();
- foreach ( $value->getSuggestions() as
$suggestion ) {
- $data['rows'][] = [
- 'pageId' =>
$suggestion->getSuggestedTitleID(),
- 'title' =>
$suggestion->getSuggestedTitle()->getPrefixedText(),
- 'snippets' => [],
-
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.test.utils: Don't try to write user options in test suites
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348021 )
Change subject: ve.test.utils: Don't try to write user options in test suites
..
ve.test.utils: Don't try to write user options in test suites
Bug: T162810
Change-Id: I8c2588fe4f7577b962200b583efd68f9cb80367e
---
M modules/ve-mw/tests/ve.test.utils.js
1 file changed, 12 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/tests/ve.test.utils.js
b/modules/ve-mw/tests/ve.test.utils.js
index db4c648..b140dae 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -15,7 +15,18 @@
// HACK: MW targets are async and heavy, use a DummyTarget
// but override the global registration
target = new ve.test.utils.DummyTarget();
- mwTarget = new ve.init.mw.ArticleTarget();
+
+ // HACK: Mock setDefaultMode() because it causes untracked
+ // ajax requests (T162810)
+ // HACK: Has to be a subclass instead of assignment to mwTarget
+ // because it is called in the constructor
+ function SubMwArticleTarget() {
+ SubMwArticleTarget.super.call( this );
+ }
+ OO.inheritClass( SubMwArticleTarget, ve.init.mw.ArticleTarget );
+ SubMwArticleTarget.prototype.setDefaultMode = function () {};
+
+ mwTarget = new SubMwArticleTarget();
$( '#qunit-fixture' ).append( target.$element );
target.addSurface( doc );
--
To view, visit https://gerrit.wikimedia.org/r/348021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c2588fe4f7577b962200b583efd68f9cb80367e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/limn-ee-data[master]: Add frwiki, hewiki, etwiki to list of RCFilters wikis
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348028 ) Change subject: Add frwiki, hewiki, etwiki to list of RCFilters wikis .. Add frwiki, hewiki, etwiki to list of RCFilters wikis Change-Id: I80a2fed919d31729c0cd56af8fda44a3947f9ebb --- M ee-beta-features/rcfilters_dbs.txt 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-ee-data refs/changes/28/348028/1 diff --git a/ee-beta-features/rcfilters_dbs.txt b/ee-beta-features/rcfilters_dbs.txt index 35ea5ad..952046d 100644 --- a/ee-beta-features/rcfilters_dbs.txt +++ b/ee-beta-features/rcfilters_dbs.txt @@ -1,9 +1,13 @@ plwiki ptwiki +frwiki fawiki -nlwiki ruwiki trwiki +nlwiki wikidatawiki cswiki +hewiki +etwiki enwiki +dewiki -- To view, visit https://gerrit.wikimedia.org/r/348028 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80a2fed919d31729c0cd56af8fda44a3947f9ebb Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-ee-data 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] mediawiki...DonationInterface[master]: Update smashpig lib
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348027 )
Change subject: Update smashpig lib
..
Update smashpig lib
This gets the patch to stop howling when people try iDEAL in unsupported
currencies. TODO: also show them a helpful error, instead of an empty list/
Bug: T161073
Change-Id: I985797c1a3320750356ae066dc4365d3e840de9b
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/27/348027/1
diff --git a/composer.lock b/composer.lock
index 39567d5..705f7fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -936,7 +936,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";,
-"reference": "d1a135b94870ff263154c5dab084416eb318e05f"
+"reference": "ec6ea516530400dfb7bb02a72ef52318a40b7bb6"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -987,7 +987,7 @@
"donations",
"payments"
],
-"time": "2017-03-20 17:58:32"
+"time": "2017-04-10 22:28:50"
},
{
"name": "zordius/lightncandy",
--
To view, visit https://gerrit.wikimedia.org/r/348027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I985797c1a3320750356ae066dc4365d3e840de9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: [WIP] Remove CentralAuthLatest=1 kludge and rely on Chronolo...
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348026 )
Change subject: [WIP] Remove CentralAuthLatest=1 kludge and rely on
ChronologyProtector
..
[WIP] Remove CentralAuthLatest=1 kludge and rely on ChronologyProtector
ChronologyProtector (CP) has supported cross-domain redirects since
a3dacac90 and c954a4ef.
Furthermore, the comments about avoiding delay became wrong since 1edd7a415.
Also, since 1edd7a415, in the case were CP did not properly store the
positions, then the checks here would likely not help since getLaggedSlaveMode()
only applies if there are several seconds of lag; in the common case, the POST
request that did DB writes was only 100s of milliseconds ago.
In the case where CP stores the positions and times out waiting, this will
use a lagged replica. If there is that much lag, then the user will likely
have temporary problems accessing their login anway (since we cannot just keep
using DB_MASTER for everything they do did the code even try to do that).
Change-Id: Id81f292608d53c4c90d68420e373cbbfe0f8b35e
---
M includes/CentralAuthHooks.php
M includes/CentralAuthUser.php
M includes/specials/SpecialCentralLogin.php
3 files changed, 1 insertion(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/26/348026/1
diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index 4ad2d8a..d3e84ec 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -409,12 +409,6 @@
if ( self::isMobileDomain() ) {
$params['mobile'] = 1;
}
- // On account creation, where a central user is
added to the DB
- // make sure the local wiki request actually
sees the new row.
- // ChronologyProtector does not work accross
domains.
- if (
CentralAuthUser::centralLBHasRecentMasterChanges() ) {
- $params['CentralAuthLatest'] = 1;
- }
$url = wfAppendQuery(
$wiki->getFullUrl(
'Special:CentralAutoLogin/start' ),
$params
@@ -550,12 +544,6 @@
CentralAuthUtils::getSessionCache()->set( $key, $data,
60 );
$query = array( 'token' => $token );
- // On account creation, where a central user is added
to the DB,
- // make sure the login wiki request actually sees the
new row.
- // ChronologyProtector does not work cross-domain (it
uses cookies).
- if ( CentralAuthUser::centralLBHasRecentMasterChanges()
) {
- $query['CentralAuthLatest'] = 1;
- }
$wiki = WikiMap::getWiki( $wgCentralAuthLoginWiki );
// Use WikiReference::getFullUrl(), returns a
protocol-relative URL if needed
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index 0b472fa..e89ac14 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -174,25 +174,13 @@
/**
* Check hasOrMadeRecentMasterChanges() on the CentralAuth load balancer
-* and whether 'CentralAuthLatest' is set for HTTP requests (which
implies
-* that a write from a prior request needs to be seen here)
*
* @return bool
*/
public static function centralLBHasRecentMasterChanges() {
global $wgCentralAuthDatabase;
- $lb = wfGetLB( $wgCentralAuthDatabase );
- if ( $lb->hasOrMadeRecentMasterChanges() ) {
- return true; // changes already made in this request
- }
-
- return (
- // Request followed redirect from a write request
response
- RequestContext::getMain()->getRequest()->getCheck(
'CentralAuthLatest' )
- // ... and ChronologyProtector timed out waiting on a
slave (before or now)
- && $lb->getLaggedSlaveMode( $wgCentralAuthDatabase )
- );
+ return wfGetLB( $wgCentralAuthDatabase
)->hasOrMadeRecentMasterChanges();
}
/**
diff --git a/includes/specials/SpecialCentralLogin.php
b/includes/specials/SpecialCentralLogin.php
index adc3b31..2fa38ed 100644
--- a/includes/specials/SpecialCentralLogin.php
+++ b/includes/specials/SpecialCentralLogin.php
@@ -155,12 +155,6 @@
$cache->set( $key, $data, 60 );
$query = array( 'token' => $token );
- // On account creation, where a central
[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Remove -new suffix from refund queue
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348025 )
Change subject: Remove -new suffix from refund queue
..
Remove -new suffix from refund queue
Deployment note: needs some coordination!
Bug: T162852
Change-Id: I263c6d908e845b779986a8d62257938845faa116
---
M Maintenance/RequeueDelayedMessages.php
M PaymentProviders/PayPal/Tests/config_test.yaml
M PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
M SmashPig.yaml
4 files changed, 7 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/25/348025/1
diff --git a/Maintenance/RequeueDelayedMessages.php
b/Maintenance/RequeueDelayedMessages.php
index 1d0eb6a..70b446a 100644
--- a/Maintenance/RequeueDelayedMessages.php
+++ b/Maintenance/RequeueDelayedMessages.php
@@ -42,7 +42,7 @@
foreach( $messages as $message ) {
$queueName = $message['original_queue'];
- // FIXME: getting it by alias, this will be annoying
cos -new
+ // FIXME: getting it by alias
$queue = BaseQueueConsumer::getQueue( $queueName );
unset( $message['original_queue'] );
$queue->push( $message );
diff --git a/PaymentProviders/PayPal/Tests/config_test.yaml
b/PaymentProviders/PayPal/Tests/config_test.yaml
index 9ba9920..657933e 100644
--- a/PaymentProviders/PayPal/Tests/config_test.yaml
+++ b/PaymentProviders/PayPal/Tests/config_test.yaml
@@ -24,7 +24,7 @@
connection_string: 'sqlite::memory:'
queue: recurring
-refund-new:
+refund:
class: PHPQueue\Backend\PDO
constructor-parameters:
-
diff --git
a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
index 1f91150..7af7c01 100644
--- a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
+++ b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
@@ -30,10 +30,10 @@
'subscr_signup.json' => 'recurring',
'subscr_payment.json' => 'recurring',
'recurring_payment.json' => 'recurring',
- 'refund.json' => 'refund-new',
- 'refund_ec.json' => 'refund-new',
- 'refund_recurring_ec.json' => 'refund-new',
- 'chargeback_settlement.json' => 'refund-new',
+ 'refund.json' => 'refund',
+ 'refund_ec.json' => 'refund',
+ 'refund_recurring_ec.json' => 'refund',
+ 'chargeback_settlement.json' => 'refund',
// this should not actually get written to
// TODO 'new_case.json' => 'no-op',
);
diff --git a/SmashPig.yaml b/SmashPig.yaml
index ac7159b..019294a 100644
--- a/SmashPig.yaml
+++ b/SmashPig.yaml
@@ -50,12 +50,6 @@
queue: recurring
refund:
-class: SmashPig\Core\DataStores\MultiQueueWriter
-constructor-parameters:
--
-- refund-new
-
-refund-new:
class: PHPQueue\Backend\Predis
constructor-parameters:
-
@@ -432,7 +426,7 @@
refund:
class: SmashPig\PaymentProviders\PayPal\RefundMessage
-queue: refund-new # FIXME make the -new go away
+queue: refund
txn_types:
- adjustment
- refund
--
To view, visit https://gerrit.wikimedia.org/r/348025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I263c6d908e845b779986a8d62257938845faa116
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ext.visualEditor.mwcore: Depend on mediawiki.notify for the ...
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348024 ) Change subject: ext.visualEditor.mwcore: Depend on mediawiki.notify for the warning .. ext.visualEditor.mwcore: Depend on mediawiki.notify for the warning Change-Id: Iac1ddd975ba565f289f856f28e7a2b173d074342 --- M extension.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/24/348024/1 diff --git a/extension.json b/extension.json index 01856d0..1328478 100644 --- a/extension.json +++ b/extension.json @@ -1236,6 +1236,7 @@ "mediawiki.jqueryMsg", "jquery.cookie", "jquery.byteLimit", + "mediawiki.notify", "mediawiki.skinning.content.parsoid", "mediawiki.widgets", "ext.visualEditor.switching", -- To view, visit https://gerrit.wikimedia.org/r/348024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac1ddd975ba565f289f856f28e7a2b173d074342 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] wikimedia...SmashPig[master]: Mark refunds with correct gateway
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345189 )
Change subject: Mark refunds with correct gateway
..
Mark refunds with correct gateway
Express checkout sets the transaction_subject field to an explicit description
Legacy puts a tracking number in that field, we can use that to distinguish
the proper gateway.
Bug: T161121
Change-Id: Ibf14e1083b92d3caa50066315256b6614e77af9c
---
M PaymentProviders/PayPal/RefundMessage.php
A PaymentProviders/PayPal/Tests/Data/refund_ec.json
A PaymentProviders/PayPal/Tests/Data/refund_ec_transformed.json
A PaymentProviders/PayPal/Tests/Data/refund_recurring_ec.json
A PaymentProviders/PayPal/Tests/Data/refund_recurring_ec_transformed.json
M PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
6 files changed, 131 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/PaymentProviders/PayPal/RefundMessage.php
b/PaymentProviders/PayPal/RefundMessage.php
index cbac123..98227a6 100644
--- a/PaymentProviders/PayPal/RefundMessage.php
+++ b/PaymentProviders/PayPal/RefundMessage.php
@@ -13,6 +13,14 @@
} else {
$message['type'] = 'refund';
}
- $message['gateway'] = 'paypal';
+
+ // Express checkout puts a description in transaction_subject,
Legacy puts a contribution
+ // tracking ID there. Chargebacks don't set the field at all.
+ if ( isset( $ipnMessage['transaction_subject'] ) &&
!is_numeric( $ipnMessage['transaction_subject'] ) ) {
+ $message['gateway'] = 'paypal_ec';
+ } else {
+ $message['gateway'] = 'paypal';
+ }
+
}
}
diff --git a/PaymentProviders/PayPal/Tests/Data/refund_ec.json
b/PaymentProviders/PayPal/Tests/Data/refund_ec.json
new file mode 100644
index 000..03b6048
--- /dev/null
+++ b/PaymentProviders/PayPal/Tests/Data/refund_ec.json
@@ -0,0 +1,37 @@
+{
+ "mc_gross": "-150",
+ "invoice": "46239229.0",
+ "protection_eligibility": "Ineligible",
+ "payer_id": "RWASDASJ2AS3A",
+ "payment_date": "09:34:59 Mar 22, 2017 PDT",
+ "payment_status": "Refunded",
+ "charset": "UTF-8",
+ "first_name": "Testy",
+ "mc_fee": "-43",
+ "notify_version": "3.8",
+ "reason_code": "refund",
+ "custom": "46239229",
+ "business": "gi...@takers.org",
+ "verify_sign": "Ar65LQ8D4i5231dnJnwTy8lT8UaGAoJGWSH0c1M93d3B86D4ZGVpax3T",
+ "payer_email": "do...@generous.net",
+ "parent_txn_id": "1V551844CE5526421",
+ "txn_id": "3HD08833MR473623T",
+ "payment_type": "instant",
+ "last_name": "McTesterson",
+ "receiver_email": "gi...@takers.org",
+ "payment_fee": "",
+ "shipping_discount": "0",
+ "receiver_id": "TWDK67ASD2XXY",
+ "insurance_amount": "0",
+ "item_name": "Donation to the Wikimedia Foundation",
+ "discount": "0",
+ "mc_currency": "JPY",
+ "item_number": "",
+ "residence_country": "US",
+ "handling_amount": "0",
+ "shipping_method": "Default",
+ "transaction_subject": "Donation to the Wikimedia Foundation",
+ "payment_gross": "",
+ "shipping": "0",
+ "ipn_track_id": "4e93f423dd88b"
+}
diff --git a/PaymentProviders/PayPal/Tests/Data/refund_ec_transformed.json
b/PaymentProviders/PayPal/Tests/Data/refund_ec_transformed.json
new file mode 100644
index 000..06cfd66
--- /dev/null
+++ b/PaymentProviders/PayPal/Tests/Data/refund_ec_transformed.json
@@ -0,0 +1,20 @@
+{
+ "date": 1490200499,
+ "gateway_parent_id": "1V551844CE5526421",
+ "gateway_txn_id": "3HD08833MR473623T",
+ "currency": "JPY",
+ "type": "refund",
+ "contribution_tracking_id": "46239229",
+ "email": "do...@generous.net",
+ "first_name": "Testy",
+ "last_name": "McTesterson",
+ "gross": "-150",
+ "fee": "-43",
+ "order_id": "46239229",
+ "gateway_refund_id": "3HD08833MR473623T",
+ "gross_currency": "JPY",
+ "gateway": "paypal_ec",
+ "source_name": "SmashPig",
+ "source_type": "listener",
+ "source_version": "unknown"
+}
diff --git a/PaymentProviders/PayPal/Tests/Data/refund_recurring_ec.json
b/PaymentProviders/PayPal/Tests/Data/refund_recurring_ec.json
new file mode 100644
index 000..41f7e78
--- /dev/null
+++ b/PaymentProviders/PayPal/Tests/Data/refund_recurring_ec.json
@@ -0,0 +1,42 @@
+{
+ "mc_gross": "-150",
+ "period_type": " Regular",
+ "outstanding_balance": "0",
+ "next_payment_date": "N\/A",
+ "protection_eligibility": "Ineligible",
+ "payment_cycle": "Monthly",
+ "payer_id": "RWASDASJ2AS3A",
+ "payment_date": "09:33:51 Mar 22, 2017 PDT",
+ "payment_status": "Refunded",
+ "product_name": "Monthly donation to the Wikimedia Foundation",
+ "charset": "UTF-8",
+ "rp_invoice_id": "45931681",
+ "recurring_payment_id": "I-DD1FNAAAUU22",
+ "first_name": "Testy",
+ "mc_fee": "-43",
+ "notify_version": "3.8",
+ "amount_per_cycle": "150",
+ "reason_code": "refund",
+ "c
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Element: Use JSON.parse rather than the deprecated $.parseJSON
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348017 )
Change subject: Element: Use JSON.parse rather than the deprecated $.parseJSON
..
Element: Use JSON.parse rather than the deprecated $.parseJSON
Bug: T160802
Change-Id: I11349d1bad15aaa479e7d4d082576459da237ca6
---
M src/Element.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Element.js b/src/Element.js
index c33f6fa..fd597e9 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -163,7 +163,7 @@
throw new Error( 'No infusion data found: ' + id );
}
try {
- data = $.parseJSON( data );
+ data = JSON.parse( data );
} catch ( _ ) {
data = null;
}
--
To view, visit https://gerrit.wikimedia.org/r/348017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11349d1bad15aaa479e7d4d082576459da237ca6
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add comments to ApiBase::isWriteMode()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348005 )
Change subject: Add comments to ApiBase::isWriteMode()
..
Add comments to ApiBase::isWriteMode()
Change-Id: I3581f5e3055c425367d265a5c57831bb34dd5a2f
---
M includes/api/ApiBase.php
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index b698cef..37750c8 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -385,6 +385,13 @@
/**
* Indicates whether this module requires write mode
+*
+* This should return true for modules that may require synchronous
database writes.
+* Modules that do not need such writes should also not rely on master
database access,
+* since only read queries are needed and each master DB is a single
point of failure.
+* Additionally, requests that only need replica DBs can be efficiently
routed to any
+* datacenter via the Promise-Non-Write-API-Action header.
+*
* @return bool
*/
public function isWriteMode() {
--
To view, visit https://gerrit.wikimedia.org/r/348005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3581f5e3055c425367d265a5c57831bb34dd5a2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Use tabs to indent in json
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345907 )
Change subject: Use tabs to indent in json
..
Use tabs to indent in json
Change-Id: If29d35e3c78ff1a739e537d50f92a6705a6c73ed
---
M gateway_common/i18n/canada-provinces/fr.json
M gateway_common/i18n/countries/ar.json
M gateway_common/i18n/countries/bg.json
M gateway_common/i18n/countries/cs.json
M gateway_common/i18n/countries/da.json
M gateway_common/i18n/countries/de.json
M gateway_common/i18n/countries/el.json
M gateway_common/i18n/countries/es.json
M gateway_common/i18n/countries/fi.json
M gateway_common/i18n/countries/fr.json
M gateway_common/i18n/countries/he.json
M gateway_common/i18n/countries/hu.json
M gateway_common/i18n/countries/it.json
M gateway_common/i18n/countries/ja.json
M gateway_common/i18n/countries/nb.json
M gateway_common/i18n/countries/nl.json
M gateway_common/i18n/countries/nn.json
M gateway_common/i18n/countries/pl.json
M gateway_common/i18n/countries/pt-br.json
M gateway_common/i18n/countries/pt.json
M gateway_common/i18n/countries/ro.json
M gateway_common/i18n/countries/ru.json
M gateway_common/i18n/countries/sk.json
M gateway_common/i18n/countries/sv.json
M gateway_common/i18n/countries/tr.json
M gateway_common/i18n/countries/zh-hant.json
M gateway_common/i18n/country-specific/fr.json
M gateway_common/i18n/country-specific/pt.json
M gateway_common/i18n/country-specific/sw.json
M gateway_common/i18n/interface/zh-hk.json
M gateway_common/i18n/interface/zh-tw.json
M package.json
32 files changed, 215 insertions(+), 215 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/gateway_common/i18n/canada-provinces/fr.json
b/gateway_common/i18n/canada-provinces/fr.json
index 5f96616..0062af1 100644
--- a/gateway_common/i18n/canada-provinces/fr.json
+++ b/gateway_common/i18n/canada-provinces/fr.json
@@ -1,20 +1,20 @@
{
-"@metadata": {
-"authors": []
-},
-"donate_interface-province-dropdown-YY": "Sélectionnez une Province",
-"donate_interface-province-dropdown-XX": "En dehors du Canada",
-"donate_interface-province-dropdown-AB": "Alberta",
-"donate_interface-province-dropdown-BC": "Colombie-Britannique",
-"donate_interface-province-dropdown-MB": "Manitoba",
-"donate_interface-province-dropdown-NB": "Nouveau-Brunswick",
-"donate_interface-province-dropdown-NL": "Terre-Neuve-et-Labrador",
-"donate_interface-province-dropdown-NT": "Territoires du Nord-Ouest",
-"donate_interface-province-dropdown-NS": "Nouvelle-Écosse",
-"donate_interface-province-dropdown-NU": "Nunavut",
-"donate_interface-province-dropdown-ON": "Ontario",
-"donate_interface-province-dropdown-PE": "Île-du-Prince-Édouard",
-"donate_interface-province-dropdown-QC": "Québec",
-"donate_interface-province-dropdown-SK": "Saskatchewan",
-"donate_interface-province-dropdown-YT": "Yukon"
+ "@metadata": {
+ "authors": []
+ },
+ "donate_interface-province-dropdown-YY": "Sélectionnez une Province",
+ "donate_interface-province-dropdown-XX": "En dehors du Canada",
+ "donate_interface-province-dropdown-AB": "Alberta",
+ "donate_interface-province-dropdown-BC": "Colombie-Britannique",
+ "donate_interface-province-dropdown-MB": "Manitoba",
+ "donate_interface-province-dropdown-NB": "Nouveau-Brunswick",
+ "donate_interface-province-dropdown-NL": "Terre-Neuve-et-Labrador",
+ "donate_interface-province-dropdown-NT": "Territoires du Nord-Ouest",
+ "donate_interface-province-dropdown-NS": "Nouvelle-Écosse",
+ "donate_interface-province-dropdown-NU": "Nunavut",
+ "donate_interface-province-dropdown-ON": "Ontario",
+ "donate_interface-province-dropdown-PE": "Île-du-Prince-Édouard",
+ "donate_interface-province-dropdown-QC": "Québec",
+ "donate_interface-province-dropdown-SK": "Saskatchewan",
+ "donate_interface-province-dropdown-YT": "Yukon"
}
\ No newline at end of file
diff --git a/gateway_common/i18n/countries/ar.json
b/gateway_common/i18n/countries/ar.json
index bde78e6..110f9d8 100644
--- a/gateway_common/i18n/countries/ar.json
+++ b/gateway_common/i18n/countries/ar.json
@@ -1,7 +1,7 @@
{
-"@metadata": {
-"authors": []
-},
-"donate_interface-country-dropdown-SA": "السعودية",
-"donate_interface-country-dropdown-MR": "موريتانيا"
+ "@metadata": {
+ "authors": []
+ },
+ "donate_interface-country-dropdown-SA": "السعودية",
+ "donate_interface-country-dropdown-MR": "موريتانيا"
}
\ No newline at end of file
diff --git a/gateway_common/i18n/countries/bg.json
b/gateway_common/i18n/countries/bg.json
index 34942c3..52c8fb6 100644
--- a/gateway_common/i18n/countries/bg.json
+++ b/gateway_common/i18n/countries/bg.json
@@ -1,6 +1,6 @@
{
-"@metadata": {
-"authors": []
-},
[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Relax private access control
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/300906 )
Change subject: Relax private access control
..
Relax private access control
There's almost never an excuse for "private" access--plus the combination of
"private static" is setting off lint warnings.
Change-Id: Ibf33654af8cdc68c56ac25b3429ab7f72dfe7353
---
M Core/Configuration.php
M Core/DataFiles/CsvReader.php
M Core/Logging/LogContextHandler.php
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/Core/Configuration.php b/Core/Configuration.php
index f94d72c..f499aa6 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -325,7 +325,7 @@
* or empty string to begin.
* @throws SmashPigException
*/
- private static function treeMerge( &$base, $graft, $myRoot = '' ) {
+ protected static function treeMerge( &$base, $graft, $myRoot = '' ) {
foreach ( $graft as $graftNodeName => $graftNodeValue ) {
$node = ($myRoot ? "{$myRoot}/{$graftNodeName}" :
$graftNodeName);
diff --git a/Core/DataFiles/CsvReader.php b/Core/DataFiles/CsvReader.php
index 8f3f963..9c026ed 100644
--- a/Core/DataFiles/CsvReader.php
+++ b/Core/DataFiles/CsvReader.php
@@ -24,7 +24,7 @@
/**
* @var string Delimiter for the csv file.
*/
- private $delimiter = null;
+ protected $delimiter = null;
/**
* Create an iterative CSV file reader.
diff --git a/Core/Logging/LogContextHandler.php
b/Core/Logging/LogContextHandler.php
index 50fc794..5d04579 100644
--- a/Core/Logging/LogContextHandler.php
+++ b/Core/Logging/LogContextHandler.php
@@ -6,13 +6,13 @@
class LogContextHandler {
/** @var [LogEvent[]] Stack of LogEvent arrays holding all log lines
for a context */
- private $contextData = array( array() );
+ protected $contextData = array( array() );
/** @var string[] Stack of strings holding context names */
- private $contextNames;
+ protected $contextNames;
/** @var ILogStream[] */
- private $logStreams;
+ protected $logStreams;
public function __construct( $rootName, $logStreams ) {
$this->contextNames = array( $rootName );
--
To view, visit https://gerrit.wikimedia.org/r/300906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf33654af8cdc68c56ac25b3429ab7f72dfe7353
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "LVS: remove direct use of achernar recdns"
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348023 )
Change subject: Revert "LVS: remove direct use of achernar recdns"
..
Revert "LVS: remove direct use of achernar recdns"
This reverts commit 11ab395f8d62b460fc7a316314f446572cc11a5e.
Change-Id: I729bd09746ab1a4dc210e72d035c3bc5e4a3b0bc
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 3af8738..fe9c5e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1676,7 +1676,7 @@
# so they need to use the recursive DNS backends directly
# (acamar and achernar) with fallback to eqiad
# (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1811,7 +1811,7 @@
# ULSFO lvs servers
node /^lvs400[1-4]\.ulsfo\.wmnet$/ {
# ns override for all lvs for now, see T103921
-$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
--
To view, visit https://gerrit.wikimedia.org/r/348023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I729bd09746ab1a4dc210e72d035c3bc5e4a3b0bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "LVS: remove direct use of achernar recdns"
Hello Giuseppe Lavagetto, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/348023
to review the following change.
Change subject: Revert "LVS: remove direct use of achernar recdns"
..
Revert "LVS: remove direct use of achernar recdns"
This reverts commit 11ab395f8d62b460fc7a316314f446572cc11a5e.
Change-Id: I729bd09746ab1a4dc210e72d035c3bc5e4a3b0bc
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/348023/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 3af8738..fe9c5e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1676,7 +1676,7 @@
# so they need to use the recursive DNS backends directly
# (acamar and achernar) with fallback to eqiad
# (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1811,7 +1811,7 @@
# ULSFO lvs servers
node /^lvs400[1-4]\.ulsfo\.wmnet$/ {
# ns override for all lvs for now, see T103921
-$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
--
To view, visit https://gerrit.wikimedia.org/r/348023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I729bd09746ab1a4dc210e72d035c3bc5e4a3b0bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labtest: avoid broken Icinga checks on labtest
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348022 )
Change subject: labtest: avoid broken Icinga checks on labtest
..
labtest: avoid broken Icinga checks on labtest
Bug: T152024
Change-Id: I332797bf6b1c8f3b302214e430c70efde806f7b8
---
M hieradata/regex.yaml
M modules/role/manifests/labs/dns.pp
2 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/348022/1
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index c5d38e1..60742a0 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -481,6 +481,7 @@
labs_puppet_master: &labspuppetmaster "labtestcontrol2001.wikimedia.org"
labs_keystone_host: &labskeystonehost "labtestcontrol2001.wikimedia.org"
wikitech_db_name: 'labtestwiki'
+ labs::dns::gridmaster::monitor: false
labsldapconfig:
hostname: labtestservices2001.wikimedia.org
secondary_hostname: labtestservices2001.wikimedia.org
diff --git a/modules/role/manifests/labs/dns.pp
b/modules/role/manifests/labs/dns.pp
index 44fa93d..94ceec4 100644
--- a/modules/role/manifests/labs/dns.pp
+++ b/modules/role/manifests/labs/dns.pp
@@ -128,15 +128,17 @@
ip_address => $::ipaddress_eth0,
}
-monitoring::service { "${auth_soa_name} Auth DNS UDP":
-host => $auth_soa_name,
-description => 'Check for gridmaster host resolution UDP',
-check_command =>
"check_dig!${auth_soa_name}!tools-grid-master.tools.eqiad.wmflabs",
-}
+ if hiera('labs::dns::gridmaster::monitor', true) {
+monitoring::service { "${auth_soa_name} Auth DNS UDP":
+host => $auth_soa_name,
+description => 'Check for gridmaster host resolution UDP',
+check_command =>
"check_dig!${auth_soa_name}!tools-grid-master.tools.eqiad.wmflabs",
+}
-monitoring::service { "${auth_soa_name} Auth DNS TCP":
-host => $auth_soa_name,
-description => 'Check for gridmaster host resolution TCP',
-check_command =>
"check_dig_tcp!${auth_soa_name}!tools-grid-master.tools.eqiad.wmflabs",
+ monitoring::service { "${auth_soa_name} Auth DNS TCP":
+host => $auth_soa_name,
+description => 'Check for gridmaster host resolution TCP',
+check_command =>
"check_dig_tcp!${auth_soa_name}!tools-grid-master.tools.eqiad.wmflabs",
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/348022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I332797bf6b1c8f3b302214e430c70efde806f7b8
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] mediawiki...VisualEditor[master]: ve.test.utils: Don't try to write user options in test suites
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348021 )
Change subject: ve.test.utils: Don't try to write user options in test suites
..
ve.test.utils: Don't try to write user options in test suites
Depends-On: I0ff3e7c77a19e7eef8f67c0ae10a26acb3ce320d
Change-Id: I8c2588fe4f7577b962200b583efd68f9cb80367e
---
M modules/ve-mw/tests/ve.test.utils.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/21/348021/1
diff --git a/modules/ve-mw/tests/ve.test.utils.js
b/modules/ve-mw/tests/ve.test.utils.js
index db4c648..1cebfb7 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -15,7 +15,7 @@
// HACK: MW targets are async and heavy, use a DummyTarget
// but override the global registration
target = new ve.test.utils.DummyTarget();
- mwTarget = new ve.init.mw.ArticleTarget();
+ mwTarget = new ve.init.mw.ArticleTarget( { doNotSetDefaultMode: true }
);
$( '#qunit-fixture' ).append( target.$element );
target.addSurface( doc );
--
To view, visit https://gerrit.wikimedia.org/r/348021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c2588fe4f7577b962200b583efd68f9cb80367e
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] VisualEditor/VisualEditor[master]: ve.init.Target: Be able to not set default mode, for tests
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348019 )
Change subject: ve.init.Target: Be able to not set default mode, for tests
..
ve.init.Target: Be able to not set default mode, for tests
Change-Id: I0ff3e7c77a19e7eef8f67c0ae10a26acb3ce320d
---
M src/init/ve.init.Target.js
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/19/348019/1
diff --git a/src/init/ve.init.Target.js b/src/init/ve.init.Target.js
index a2705d0..fea509d 100644
--- a/src/init/ve.init.Target.js
+++ b/src/init/ve.init.Target.js
@@ -43,7 +43,11 @@
this.toolbarScrollOffset = 0;
this.modes = config.modes || this.constructor.static.modes;
- this.setDefaultMode( config.defaultMode );
+
+ if ( !config.doNotSetDefaultMode ) {
+ // HACK QUACK: T162810
+ this.setDefaultMode( config.defaultMode );
+ }
this.setupTriggerListeners();
--
To view, visit https://gerrit.wikimedia.org/r/348019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ff3e7c77a19e7eef8f67c0ae10a26acb3ce320d
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/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] mediawiki...VisualEditor[master]: ve.init.mw.DesktopArticleTarget.init: Don't do this twice, w...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348020 )
Change subject: ve.init.mw.DesktopArticleTarget.init: Don't do this twice, we
do it after the promise anyway
..
ve.init.mw.DesktopArticleTarget.init: Don't do this twice, we do it after the
promise anyway
Change-Id: Icf4b5ddd9c8265ade55f43328f807344b41db350
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/20/348020/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 4657f4e..9a2ae1e 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -260,12 +260,6 @@
.done( incrementLoadingProgress );
}
- if ( mode === 'visual' ) {
- setEditorPreference( 'visualeditor' );
- } else {
- setEditorPreference( 'wikitext' );
- }
-
showLoading();
incrementLoadingProgress();
active = true;
--
To view, visit https://gerrit.wikimedia.org/r/348020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf4b5ddd9c8265ade55f43328f807344b41db350
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] wikimedia...wonderbolt[master]: Let users view non-bot pageview traffic breakdown
Bearloga has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348018 )
Change subject: Let users view non-bot pageview traffic breakdown
..
Let users view non-bot pageview traffic breakdown
Bug: T161932
Change-Id: I80c6c8a20ac0559e9ba4e4b2711acf505cadb547
---
M server.R
M ui.R
M utils.R
3 files changed, 113 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wonderbolt
refs/changes/18/348018/1
diff --git a/server.R b/server.R
index 42ff6bf..528fb21 100644
--- a/server.R
+++ b/server.R
@@ -9,14 +9,30 @@
function(input, output, session) {
if (Sys.Date() != existing_date) {
+progress <- shiny::Progress$new(session, min = 0, max = 1)
+on.exit(progress$close())
+progress$set(message = "Downloading overall pageview counts...", value = 0)
read_traffic()
+progress$set(message = "Downloading non-bot pageview counts...", value =
1/2)
+read_nonbot_traffic()
+progress$set(message = "Finished downloading datasets.", value = 1)
existing_date <<- Sys.Date()
}
output$traffic_summary_dygraph <- renderDygraph({
-input$platform_traffic_summary_prop %>%
-
polloi::data_select(summary_traffic_data_prop[[input$platform_traffic_summary]],
-
summary_traffic_data[[input$platform_traffic_summary]]) %>%
+input$include_automata_traffic_summary %>%
+ polloi::data_select(
+polloi::data_select(
+ input$platform_traffic_summary_prop,
+ summary_traffic_data_prop[[input$platform_traffic_summary]],
+ summary_traffic_data[[input$platform_traffic_summary]]
+),
+polloi::data_select(
+ input$platform_traffic_summary_prop,
+ summary_traffic_nonbot_data_prop[[input$platform_traffic_summary]],
+ summary_traffic_nonbot_data[[input$platform_traffic_summary]]
+)
+ ) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global, input$smoothing_traffic_summary))
%>%
polloi::make_dygraph(xlab = "Date", ylab =
ifelse(input$platform_traffic_summary_prop, "Pageview Share (%)", "Pageviews"),
title = "Sources of page views (e.g. search engines
and internal referers)") %>%
@@ -31,9 +47,19 @@
})
output$traffic_bysearch_dygraph <- renderDygraph({
-input$platform_traffic_bysearch_prop %>%
-
polloi::data_select(bysearch_traffic_data_prop[[input$platform_traffic_bysearch]],
-
bysearch_traffic_data[[input$platform_traffic_bysearch]]) %>%
+input$include_automata_traffic_bysearch %>%
+ polloi::data_select(
+polloi::data_select(
+ input$platform_traffic_bysearch_prop,
+ bysearch_traffic_data_prop[[input$platform_traffic_bysearch]],
+ bysearch_traffic_data[[input$platform_traffic_bysearch]]
+),
+polloi::data_select(
+ input$platform_traffic_bysearch_prop,
+ bysearch_traffic_nonbot_data_prop[[input$platform_traffic_bysearch]],
+ bysearch_traffic_nonbot_data[[input$platform_traffic_bysearch]]
+)
+ ) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_traffic_bysearch)) %>%
polloi::make_dygraph(xlab = "Date", ylab =
ifelse(input$platform_traffic_bysearch_prop, "Pageview Share (%)", "Pageviews"),
title = "Pageviews from external search engines,
broken down by engine") %>%
diff --git a/ui.R b/ui.R
index 6baa5be..e4cf745 100644
--- a/ui.R
+++ b/ui.R
@@ -2,6 +2,10 @@
library(shinydashboard)
library(dygraphs)
+spider_checkbox <- function(input_id) {
+ shiny::checkboxInput(input_id, "Include automata", value = TRUE, width =
NULL)
+}
+
function(request) {
dashboardPage(
@@ -29,26 +33,34 @@
tabItems(
tabItem(tabName = "traffic_summary",
fluidRow(
- column(selectizeInput(inputId = "platform_traffic_summary",
label = "Platform", choices = c("All", "Desktop", "Mobile Web")), width = 2),
- column(HTML("Scale"),
+ column(selectizeInput(inputId = "platform_traffic_summary",
label = "Platform", choices = c("All", "Desktop", "Mobile Web")), width = 3),
+ column(HTML("Data"),
+ spider_checkbox("include_automata_traffic_summary"),
width = 2),
+
column(conditionalPanel("!input.platform_traffic_summary_prop", HTML("Scale")),
conditionalPanel("!input.platform_traffic_summary_prop",
checkboxInput("platform_traffic_summary_log", label = "Use Log scale", value =
FALSE)),
+ width = 2),
+
column(conditionalPanel("!input.platform_traffic_summary_log", HTML("Type")),
conditionalPanel("!input.platform_traffic_summary_log",
checkboxInput(
[MediaWiki-commits] [Gerrit] oojs/ui[master]: src: Use JSON.parse rather than the deprecated $.parseJSON
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348017 )
Change subject: src: Use JSON.parse rather than the deprecated $.parseJSON
..
src: Use JSON.parse rather than the deprecated $.parseJSON
Change-Id: I11349d1bad15aaa479e7d4d082576459da237ca6
---
M src/Element.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/17/348017/1
diff --git a/src/Element.js b/src/Element.js
index c33f6fa..fd597e9 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -163,7 +163,7 @@
throw new Error( 'No infusion data found: ' + id );
}
try {
- data = $.parseJSON( data );
+ data = JSON.parse( data );
} catch ( _ ) {
data = null;
}
--
To view, visit https://gerrit.wikimedia.org/r/348017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11349d1bad15aaa479e7d4d082576459da237ca6
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] mediawiki...MobileFrontend[printstyles]: H3 through H6 should be sans-serif
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347890 )
Change subject: H3 through H6 should be sans-serif
..
H3 through H6 should be sans-serif
We discussed this during implementation of the print styles.
Sans-serif should be used for subheadings.
Serif font should be used for H2's and page title
This should apply in both print and screen mode.
Bug: T159857
Change-Id: I97c7f828f91ee0f22c986a64a26f5435afb06004
---
M resources/skins.minerva.content.styles/headings.less
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/skins.minerva.content.styles/headings.less
b/resources/skins.minerva.content.styles/headings.less
index 526825a..ea31639 100644
--- a/resources/skins.minerva.content.styles/headings.less
+++ b/resources/skins.minerva.content.styles/headings.less
@@ -46,11 +46,19 @@
.pre-content h1,
.content h1,
+.content h2 {
+ font-family: @fontFamilyHeading;
+}
+
+h3, h4, h5, h6 {
+ font-family: @fontFamily;
+}
+
+.pre-content h1,
+.content h1,
.content h2,
h3, h4, h5, h6 {
- font-family: @fontFamilyHeading;
line-height: @headingLineHeight;
-
word-wrap: break-word;
// This value isn't valid per the specification [0] but fixes the
behaviour in
--
To view, visit https://gerrit.wikimedia.org/r/347890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97c7f828f91ee0f22c986a64a26f5435afb06004
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: printstyles
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[printstyles]: Tweaks for printing layout
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347533 )
Change subject: Tweaks for printing layout
..
Tweaks for printing layout
* Use @page to override print margins in Chrome and force legal size
* Limit desktop auto margin rules to the screen media type. In print
mode this can cause rendering issues - for example the footer that is
printed is incomplete. This seems to be due to the auto margin rules.
Given in print mode we have a fixed canvas this should not be necessary
Bug: T159857
Change-Id: Ia4d619ce6dd0e96580bca389867aad4a10c924d6
---
M resources/mobile.languages.structured/LanguageOverlay.less
M resources/skins.minerva.print.styles/styles.less
M resources/skins.minerva.tablet.styles/common.less
3 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.languages.structured/LanguageOverlay.less
b/resources/mobile.languages.structured/LanguageOverlay.less
index 641f8cd..5639979 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.less
+++ b/resources/mobile.languages.structured/LanguageOverlay.less
@@ -80,7 +80,7 @@
}
}
-@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
.language-overlay {
.overlay-content {
margin: 0;
diff --git a/resources/skins.minerva.print.styles/styles.less
b/resources/skins.minerva.print.styles/styles.less
index 8b60513..134d424 100644
--- a/resources/skins.minerva.print.styles/styles.less
+++ b/resources/skins.minerva.print.styles/styles.less
@@ -1,4 +1,16 @@
@media print {
+ // Chrome: override the default margins and reveal the footer
+ // Experimental technology (see
https://developer.mozilla.org/en-US/docs/Web/CSS/@page/size)
+ @page {
+ size: legal;
+ margin: 0;
+ padding: 0;
+ }
+
+ html {
+ padding: 0 50px;
+ }
+
@import 'header.less';
@import 'article.less';
@import 'blockquotes.less';
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 113ac78..2f4fefa 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -135,7 +135,7 @@
}
}
-@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
// FIXME: Zero should use banner-container class or better - append to
banner-container
#mw-mf-page-center .mw-mf-banner,
.banner-container,
--
To view, visit https://gerrit.wikimedia.org/r/347533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4d619ce6dd0e96580bca389867aad4a10c924d6
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: printstyles
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: base: blacklist acpi_pad kernel module
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348016 ) Change subject: base: blacklist acpi_pad kernel module .. base: blacklist acpi_pad kernel module This module has caused us lots of problems: (T123924, T141675, T137647, T110202, T159870..) And the solution was usually to rmmod. So blacklist this module globally now. Bug: 162850 Change-Id: Idda7b0dc32e47a28712856fb375f53ead0d69bd0 --- M modules/base/files/kernel/blacklist-wmf.conf 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/16/348016/1 diff --git a/modules/base/files/kernel/blacklist-wmf.conf b/modules/base/files/kernel/blacklist-wmf.conf index b7fffb6..f1c061f 100644 --- a/modules/base/files/kernel/blacklist-wmf.conf +++ b/modules/base/files/kernel/blacklist-wmf.conf @@ -11,3 +11,4 @@ blacklist dccp_diag blacklist n_hdlc blacklist intel_uncore +blacklist acpi_pad -- To view, visit https://gerrit.wikimedia.org/r/348016 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idda7b0dc32e47a28712856fb375f53ead0d69bd0 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] mediawiki...Echo[master]: Make date headings a proper semantic heading
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348015 )
Change subject: Make date headings a proper semantic heading
..
Make date headings a proper semantic heading
To support accessibility, make sure the titles in Special:Notifications
are headings.
Bug: T149955
Change-Id: I4f15694efb04896e9bd7b026d297891047759644
---
M modules/styles/mw.echo.ui.DatedSubGroupListWidget.less
M modules/ui/mw.echo.ui.DatedSubGroupListWidget.js
2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/15/348015/1
diff --git a/modules/styles/mw.echo.ui.DatedSubGroupListWidget.less
b/modules/styles/mw.echo.ui.DatedSubGroupListWidget.less
index f09d038..75820b2 100644
--- a/modules/styles/mw.echo.ui.DatedSubGroupListWidget.less
+++ b/modules/styles/mw.echo.ui.DatedSubGroupListWidget.less
@@ -1,7 +1,14 @@
@import '../echo.variables';
.mw-echo-ui-datedSubGroupListWidget {
- &-title {
+ .mw-body-content &-title {
+ // Since the title is we want to specifically
+ // change the styling to bring it back to mimic a
+ // content span. We also must override the h2 rules
+ // so specificity is important
font-weight: normal;
+ font-size: 14px;
+ border: 0;
+ font-family: sans-serif;
&-primary {
font-size: 1.5em;
diff --git a/modules/ui/mw.echo.ui.DatedSubGroupListWidget.js
b/modules/ui/mw.echo.ui.DatedSubGroupListWidget.js
index 83d3e52..8196e0b 100644
--- a/modules/ui/mw.echo.ui.DatedSubGroupListWidget.js
+++ b/modules/ui/mw.echo.ui.DatedSubGroupListWidget.js
@@ -18,7 +18,7 @@
.addClass(
'mw-echo-ui-datedSubGroupListWidget-title-primary' ),
$secondaryDate = $( '' )
.addClass(
'mw-echo-ui-datedSubGroupListWidget-title-secondary' ),
- $title = $( '' )
+ $title = $( '' )
.addClass(
'mw-echo-ui-datedSubGroupListWidget-title' )
.append( $primaryDate, $secondaryDate );
--
To view, visit https://gerrit.wikimedia.org/r/348015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f15694efb04896e9bd7b026d297891047759644
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make LoadBalancer::waitFor() more robust via try/finally
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348014 )
Change subject: Make LoadBalancer::waitFor() more robust via try/finally
..
Make LoadBalancer::waitFor() more robust via try/finally
Change-Id: I50742752bb94ca17997138b440b911849bcbadf3
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 11 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/14/348014/1
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index d268f83..a392658 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -430,18 +430,19 @@
public function waitFor( $pos ) {
$oldPos = $this->mWaitForPos;
- $this->mWaitForPos = $pos;
-
- // If a generic reader connection was already established, then
wait now
- $i = $this->mReadIndex;
- if ( $i > 0 ) {
- if ( !$this->doWait( $i ) ) {
- $this->laggedReplicaMode = true;
+ try {
+ $this->mWaitForPos = $pos;
+ // If a generic reader connection was already
established, then wait now
+ $i = $this->mReadIndex;
+ if ( $i > 0 ) {
+ if ( !$this->doWait( $i ) ) {
+ $this->laggedReplicaMode = true;
+ }
}
+ } finally {
+ // Restore the older position if it was higher
+ $this->setWaitForPositionIfHigher( $oldPos );
}
-
- // Restore the older position if it was higher
- $this->setWaitForPositionIfHigher( $oldPos );
}
public function waitForOne( $pos, $timeout = null ) {
--
To view, visit https://gerrit.wikimedia.org/r/348014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50742752bb94ca17997138b440b911849bcbadf3
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] wikimedia...process-control[master]: Log the subprocess log path; dial normal lock messages down ...
Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348013 )
Change subject: Log the subprocess log path; dial normal lock messages down to
debug
..
Log the subprocess log path; dial normal lock messages down to debug
Change-Id: Id5913b86329d0e976aa56eb5b2a38d4495180bba
---
M processcontrol/lock.py
M processcontrol/runner.py
2 files changed, 3 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/13/348013/1
diff --git a/processcontrol/lock.py b/processcontrol/lock.py
index 1ea9f98..a55c39a 100644
--- a/processcontrol/lock.py
+++ b/processcontrol/lock.py
@@ -44,7 +44,7 @@
os.unlink(filename)
with open(filename, "w") as f:
-config.log.info("Writing lockfile.")
+config.log.debug("Writing lockfile.")
f.write(str(os.getpid()))
global lockfile
@@ -55,7 +55,7 @@
global lockfile
if lockfile:
if os.path.exists(lockfile):
-config.log.info("Clearing lockfile.")
+config.log.debug("Clearing lockfile.")
os.unlink(lockfile)
else:
raise LockError("Already unlocked!")
diff --git a/processcontrol/runner.py b/processcontrol/runner.py
index 42ed3b5..1d1352a 100644
--- a/processcontrol/runner.py
+++ b/processcontrol/runner.py
@@ -73,6 +73,7 @@
self.process = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=self.job.environment)
streamer = output_streamer.OutputStreamer(self.process, self.job.slug,
command_string, self.start_time)
self.logfile = streamer.filename
+config.log.info("Logging to {path}".format(path=self.logfile))
streamer.start()
# should be safe from deadlocks because our OutputStreamer
--
To view, visit https://gerrit.wikimedia.org/r/348013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5913b86329d0e976aa56eb5b2a38d4495180bba
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Stop shadowing Response
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348012 ) Change subject: Stop shadowing Response .. Stop shadowing Response Already a class in same NS that extends the Symfony one Hat tip to Scrutinizer! Change-Id: I0dfdbca8741e287334d8525ce2674652f3ab9a03 --- M Core/Http/HttpStatusValidator.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig refs/changes/12/348012/1 diff --git a/Core/Http/HttpStatusValidator.php b/Core/Http/HttpStatusValidator.php index 7a88f0b..ab452f3 100644 --- a/Core/Http/HttpStatusValidator.php +++ b/Core/Http/HttpStatusValidator.php @@ -3,7 +3,6 @@ namespace SmashPig\Core\Http; use SmashPig\Core\Logging\Logger; -use Symfony\Component\HttpFoundation\Response; /** * Determines whether to retry HTTP requests based on status code -- To view, visit https://gerrit.wikimedia.org/r/348012 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0dfdbca8741e287334d8525ce2674652f3ab9a03 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/SmashPig Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dumps[master]: Prune nonexistent config files
Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348011 )
Change subject: Prune nonexistent config files
..
Prune nonexistent config files
This is a workaround, but also maybe a reasonable thing to do.
The real problem is that some child jobs take a --config argument, which
doesn't map well to our concept of multiple levels of cascading config file.
Change-Id: Ibdd52b89e3e40477bac2acba2579118d0cfcdaa5
---
M xmldumps-backup/dumps/WikiDump.py
1 file changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/11/348011/1
diff --git a/xmldumps-backup/dumps/WikiDump.py
b/xmldumps-backup/dumps/WikiDump.py
index 09d3b6a..1afc157 100644
--- a/xmldumps-backup/dumps/WikiDump.py
+++ b/xmldumps-backup/dumps/WikiDump.py
@@ -19,20 +19,26 @@
self.db_user = None
self.db_password = None
-home = os.path.dirname(sys.argv[0])
+self.files = []
+
+root_dir = os.path.dirname(sys.argv[0])
if not config_file:
-config_file = "wikidump.conf"
-self.files = [
-os.path.join(home, config_file),
-"/etc/wikidump.conf"
-]
+config_file = os.path.join(root_dir, "wikidump.conf")
+if os.path.exists(config_file):
+self.files.append(config_file)
+
+if os.path.exists("/etc/wikidump.conf"):
+self.files.append("/etc/wikidump.conf")
+
home = os.getenv("HOME")
if home is not None:
-self.files.append(os.path.join(os.getenv("HOME"),
- ".wikidump.conf"))
+home_conf = os.path.join(os.getenv("HOME"), ".wikidump.conf")
+if os.path.exists(home_conf):
+self.files.append(home_conf)
self.conf = ConfigParser.SafeConfigParser()
-self.conf.readfp(open('defaults.conf', "rb"))
+default_conf = os.path.join(root_dir, 'defaults.conf')
+self.conf.readfp(open(default_conf, "rb"))
self.conf.read(self.files)
if not self.conf.has_section("wiki"):
--
To view, visit https://gerrit.wikimedia.org/r/348011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdd52b89e3e40477bac2acba2579118d0cfcdaa5
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...Wikimedia-Emoji-Bot[master]: Update README.md file
D3r1ck01 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348010 ) Change subject: Update README.md file .. Update README.md file * Updated README.md with information on how to setup the project locally for developers. * Gave credits for the original authors of the NYPL bot his team. * Various commands on how to test and how to contribute to the repo is also included in the README.md file. Change-Id: I70b49569ddfc0cf151598cce245340a5acb5650f --- M README.md 1 file changed, 75 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/Wikimedia-Emoji-Bot refs/changes/10/348010/1 diff --git a/README.md b/README.md index 0afd4b9..32c3456 100644 --- a/README.md +++ b/README.md @@ -1 +1,75 @@ -# Wikimedia Emoji Bot \ No newline at end of file +# Wikimedia Emoji Bot + +The source code for the Wikimedia Emoji Bot lives here + +## Configuration + +1. Clone project: + ```shell + git clone https://github.com/wikimedia/labs-tools-Wikimedia-Emoji-Bot + ``` + +2. Install Package Manager/Management (NPM) on Mac OS X: + ```shell + brew install npm + ``` + + Will add `npm` installation commands for other systems later here. + +3. Install dependencies for the project: + + ```shell + npm install + ``` + +4. Copy the example `.env` file: + + ```shell + cp .env.example .env + ``` + +5. [Get credentials for your bot](https://dev.twitter.com/) and complete the `.env` + +* When logged-in on the Twitter's developer site, check the link on the top menu `My apps` (and it will take you to this site: https://apps.twitter.com/) or go straight away to type: https://apps.twitter.com/ on your browser. + +* On the top-right, there is a button saying `Create New App`, click on it and follow the steps to fill in the form fields. + +* Click the `Create your Twitter Application` button when you finish the immediate above step. + +* Once the application is created, under the `Details` section, you will find the credentials to fill into your `.env` file and additionally, under the `Keys and Access tokens`, you will find all the keys and access tokens needed in the `.env` file. + +* When all these configs are done, your app can then connect to Twitter successfully and perform its various functions. + +## Usage + +### To check status of the bot (by posting a tweet): + +```shell +npm run status +``` + +### To reply to replies + +```shell +npm run reply +``` + +### Run automated unit tests + +```shell +npm test +``` + +## Contributing + +Emoji additions, bug reports, fixes, and new features are welcomed. If you'd like to contribute code, please: + +1. Fork the project + +2. Start a branch named for your new feature or bug + +3. Create a Pull Request + +## Forked / Built on + +This project is originally built on the [NYPL Emoji Bot project](https://github.com/lolibrarian/NYPL-Emoji-Bot). Initial credits go to: Lauren Lampasone and other contributors for building the NYPL-Emoji-Bot. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/348010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70b49569ddfc0cf151598cce245340a5acb5650f Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/Wikimedia-Emoji-Bot Gerrit-Branch: master Gerrit-Owner: D3r1ck01 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: import kmod puppet module to manage kernel modules
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348009 ) Change subject: import kmod puppet module to manage kernel modules .. import kmod puppet module to manage kernel modules This is an import from Puppet Forge https://forge.puppet.com/camptocamp/kmod https://github.com/camptocamp/puppet-kmod It's puppet module to handle kernel modules. I am suggesting to add it because we'd like to globally blacklist the "acpi_pad" module which caused us many problems. (T123924, T141675, T137647, T110202, T159870..) And this module has a nice "kmod::blacklist". This seemed nicer than just adding an "exec rmmod" in base. Change-Id: Ic04fd2e08a1f3e9caddb819c9e9f9b826af6bd6d --- A modules/kmod/CHANGELOG.md A modules/kmod/Gemfile A modules/kmod/LICENSE A modules/kmod/README.md A modules/kmod/Rakefile A modules/kmod/manifests/alias.pp A modules/kmod/manifests/blacklist.pp A modules/kmod/manifests/init.pp A modules/kmod/manifests/install.pp A modules/kmod/manifests/load.pp A modules/kmod/manifests/option.pp A modules/kmod/manifests/setting.pp A modules/kmod/metadata.json A modules/kmod/spec/acceptance/nodesets/centos-5-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/centos-5.yml A modules/kmod/spec/acceptance/nodesets/centos-6-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml A modules/kmod/spec/acceptance/nodesets/centos-6.yml A modules/kmod/spec/acceptance/nodesets/centos-7-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml A modules/kmod/spec/acceptance/nodesets/centos-7.yml A modules/kmod/spec/acceptance/nodesets/debian-6-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml A modules/kmod/spec/acceptance/nodesets/debian-6.yml A modules/kmod/spec/acceptance/nodesets/debian-7-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml A modules/kmod/spec/acceptance/nodesets/debian-7.yml A modules/kmod/spec/acceptance/nodesets/debian-8-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml A modules/kmod/spec/acceptance/nodesets/debian-8.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-12.04.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-14.04.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-14.10.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-15.04.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-15.10.yml A modules/kmod/spec/acceptance/nodesets/ubuntu-16.04.yml A modules/kmod/spec/classes/kmod_spec.rb A modules/kmod/spec/defines/kmod_alias_spec.rb A modules/kmod/spec/defines/kmod_blacklist_spec.rb A modules/kmod/spec/defines/kmod_install_spec.rb A modules/kmod/spec/defines/kmod_load_spec.rb A modules/kmod/spec/defines/kmod_setting_spec.rb A modules/kmod/spec/spec.opts A modules/kmod/spec/spec_helper.rb A modules/kmod/templates/redhat.modprobe.erb 60 files changed, 1,642 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/09/348009/1 diff --git a/modules/kmod/CHANGELOG.md b/modules/kmod/CHANGELOG.md new file mode 100644 index 000..54daf6d --- /dev/null +++ b/modules/kmod/CHANGELOG.md @@ -0,0 +1,81 @@ +## 2015-08-27 - Release 2.1.0 + +Add minimal SuSE support + +## 2015-08-21 - Release 2.0.11 + +Use docker for acceptance tests + +## 2015-06-26 - Release 2.0.10 + +Fix strict_variables activation with rspec-puppet 2.2 + +## 2015-05-28 - Release 2.0.9 + +Add beaker_spec_helper to Gemfile + +## 2015-05-26 - Release 2.0.8 + +Use random application order in nodeset + +## 2015-05-26 - Release 2.0.7 + +add utopic & vivid nodesets + +## 2015-05-25 - Release 2.0.6 + +Don't allow failure on Puppet 4 + +## 2015-05-13 - Release 2.0.5 + +Add puppet-lint-file_source_rights-check gem + +## 2015-05-12 - Release 2.0.4 + +Don't pin beaker + +##
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (e4540d87f)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348008 ) Change subject: Update VE core submodule to master (e4540d87f) .. Update VE core submodule to master (e4540d87f) New changes: 57c61dcf8 VisualDiff: Ignore un-rendered modified elements d426f8066 Tweak document padding 0d19e0640 Follow-up 16231a81: Fix typo in update-oojs-ui.sh a611080f0 Update OOjs UI to v0.21.0 6f4d44ea6 tests: Switch to use mocha for reporting Bug: T162622 Change-Id: I329a0b4525120f6bebe0ef5ff608eae4461a17a8 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/08/348008/1 diff --git a/lib/ve b/lib/ve index 1338c50..e4540d8 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 1338c50f5888ac4c3c7da9dbf0e34bee62d36500 +Subproject commit e4540d87f8d6bf2b855cc17213830ca1c4bd651c -- To view, visit https://gerrit.wikimedia.org/r/348008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I329a0b4525120f6bebe0ef5ff608eae4461a17a8 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] wikidata...gui-deploy[production]: Merging from 80c1a0add8b1161c48c4de9be219e0c1a4ee91f0:
Smalyshev has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/347988 ) Change subject: Merging from 80c1a0add8b1161c48c4de9be219e0c1a4ee91f0: .. Merging from 80c1a0add8b1161c48c4de9be219e0c1a4ee91f0: Merge "Preview Item labels in GraphResultBrowserNodeBrowser" Change-Id: I2399a0eb9fdb81148e936b6781da3e4dfbcc8c0d --- M embed.html M i18n/eo.json M i18n/id.json M index.html D js/embed.wdqs.min.2cbb831fb957ffcdd476.js A js/embed.wdqs.min.43d9fcb8b129e425f94e.js A js/wdqs.min.e4e5330759808ac2dc78.js D js/wdqs.min.f5a46c67b5cbc718aa61.js 8 files changed, 17 insertions(+), 14 deletions(-) Approvals: Smalyshev: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/347988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2399a0eb9fdb81148e936b6781da3e4dfbcc8c0d Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: Smalyshev Gerrit-Reviewer: Siebrand Gerrit-Reviewer: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Tweaks for printing layout
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348007 )
Change subject: Tweaks for printing layout
..
Tweaks for printing layout
* Use @page to override print margins in Chrome and force legal size
* Limit desktop auto margin rules to the screen media type. In print
mode this can cause rendering issues - for example the footer that is
printed is incomplete. This seems to be due to the auto margin rules.
Given in print mode we have a fixed canvas this should not be necessary
Bug: T159857
Change-Id: Ia4d619ce6dd0e96580bca389867aad4a10c924d6
---
M resources/mobile.languages.structured/LanguageOverlay.less
M resources/skins.minerva.print.styles/styles.less
M resources/skins.minerva.tablet.styles/common.less
3 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/07/348007/1
diff --git a/resources/mobile.languages.structured/LanguageOverlay.less
b/resources/mobile.languages.structured/LanguageOverlay.less
index 641f8cd..5639979 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.less
+++ b/resources/mobile.languages.structured/LanguageOverlay.less
@@ -80,7 +80,7 @@
}
}
-@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
.language-overlay {
.overlay-content {
margin: 0;
diff --git a/resources/skins.minerva.print.styles/styles.less
b/resources/skins.minerva.print.styles/styles.less
index 8b60513..134d424 100644
--- a/resources/skins.minerva.print.styles/styles.less
+++ b/resources/skins.minerva.print.styles/styles.less
@@ -1,4 +1,16 @@
@media print {
+ // Chrome: override the default margins and reveal the footer
+ // Experimental technology (see
https://developer.mozilla.org/en-US/docs/Web/CSS/@page/size)
+ @page {
+ size: legal;
+ margin: 0;
+ padding: 0;
+ }
+
+ html {
+ padding: 0 50px;
+ }
+
@import 'header.less';
@import 'article.less';
@import 'blockquotes.less';
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 113ac78..2f4fefa 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -135,7 +135,7 @@
}
}
-@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
+@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
// FIXME: Zero should use banner-container class or better - append to
banner-container
#mw-mf-page-center .mw-mf-banner,
.banner-container,
--
To view, visit https://gerrit.wikimedia.org/r/348007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4d619ce6dd0e96580bca389867aad4a10c924d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: [DO NOT MERGE] Fiddling with Selenium tests
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/348006 ) Change subject: [DO NOT MERGE] Fiddling with Selenium tests .. [DO NOT MERGE] Fiddling with Selenium tests Change-Id: Ic6bcd1088249109e49a47cc9007e6ee002d3d8ba --- M tests/browser/features/step_definition/badge_steps.rb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/06/348006/1 diff --git a/tests/browser/features/step_definition/badge_steps.rb b/tests/browser/features/step_definition/badge_steps.rb index 541b446..aa8e31e 100644 --- a/tests/browser/features/step_definition/badge_steps.rb +++ b/tests/browser/features/step_definition/badge_steps.rb @@ -2,9 +2,9 @@ # Work in both nojs and js version Given(/^I click the alert badge$/) do - on(ArticlePage).alerts.badge_element.when_present.click + on(ArticlePage).alerts.badge_element.when_present.parent.click end Given(/^I click the notice badge$/) do - on(ArticlePage).notices.badge_element.when_present.click + on(ArticlePage).notices.badge_element.when_present.parent.click end -- To view, visit https://gerrit.wikimedia.org/r/348006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6bcd1088249109e49a47cc9007e6ee002d3d8ba Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add comments to ApiBase::isWriteMode()
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348005 )
Change subject: Add comments to ApiBase::isWriteMode()
..
Add comments to ApiBase::isWriteMode()
Change-Id: I3581f5e3055c425367d265a5c57831bb34dd5a2f
---
M includes/api/ApiBase.php
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/348005/1
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index b698cef..37750c8 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -385,6 +385,13 @@
/**
* Indicates whether this module requires write mode
+*
+* This should return true for modules that may require synchronous
database writes.
+* Modules that do not need such writes should also not rely on master
database access,
+* since only read queries are needed and each master DB is a single
point of failure.
+* Additionally, requests that only need replica DBs can be efficiently
routed to any
+* datacenter via the Promise-Non-Write-API-Action header.
+*
* @return bool
*/
public function isWriteMode() {
--
To view, visit https://gerrit.wikimedia.org/r/348005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3581f5e3055c425367d265a5c57831bb34dd5a2f
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] operations/mediawiki-config[master]: Wikitech: Don't try to do cross-wiki uploads to Commons
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/347422 ) Change subject: Wikitech: Don't try to do cross-wiki uploads to Commons .. Wikitech: Don't try to do cross-wiki uploads to Commons Bug: T162374 Change-Id: I8a1af6e9e0cc4b8a8ec31b007bdd430d0be488a9 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index c6deacd..5cbce44 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13229,6 +13229,7 @@ 'commonswiki' => [ 'local' ], 'test2wiki' => [ 'testwikirepo' ], 'testwiki' => [ 'local' ], + 'wikitech' => [ 'local' ], // T162374 'zhwiki' => [ 'local' ], // T139257 ], -- To view, visit https://gerrit.wikimedia.org/r/347422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a1af6e9e0cc4b8a8ec31b007bdd430d0be488a9 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Catrope Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[wmf/1.29.0-wmf.20]: RCFilters: Provide a separate message in GuidedTour for no O...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348004 )
Change subject: RCFilters: Provide a separate message in GuidedTour for no ORES
models
..
RCFilters: Provide a separate message in GuidedTour for no ORES models
Bug: T162693
Change-Id: I9fd4aed15c4d84240649d7b99df067345e291b08
(cherry picked from commit 7226b8a86e1b13efd6bfc4703b8649ba9b45ee62)
---
M WikimediaMessages.hooks.php
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
M modules/rcfilters-beta-tour.js
4 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index b6dfa52..d17cb54 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -1351,6 +1351,7 @@
if ( !$user->getOption(
'rcenhancedfilters-tried-highlight' ) ) {
$out->addModules(
'ext.guidedTour.tour.RcFiltersHighlight' );
+ $out->addJsConfigVars(
'wgRCFiltersORESAvailable', self::isOresAvailable() );
}
}
@@ -1367,6 +1368,7 @@
'messages' => [
'eri-rcfilters-tour-welcome-title',
'eri-rcfilters-tour-welcome-description',
+
'eri-rcfilters-tour-welcome-no-ores-description',
'eri-rcfilters-tour-welcome-button',
],
'dependencies' => [
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index a168afb..ec50ef0 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -277,6 +277,7 @@
"eri-rcfilters-beta-description-ores": "Review edits on Recent Changes
using an easier and more powerful interface and many new tools, including
predictive filters powered by [[m:Objective Revision Evaluation Service|ORES]],
a machine-learning program.",
"eri-rcfilters-tour-welcome-title": "Introducing: New Filters for Edit
Review (beta)",
"eri-rcfilters-tour-welcome-description": "Combine improved tools, a
new interface and the power of machine learning to fight vandalism and help new
users.",
+ "eri-rcfilters-tour-welcome-no-ores-description": "Review edits using
an easier and more powerful interface, additional filters, user-defined
highlighting and other improvements.",
"eri-rcfilters-tour-welcome-button": "OK, got it",
"eri-rcfilters-tour-highlight-title": "Color code your results",
"eri-rcfilters-tour-highlight-description": "Use highlighting to
visually distinguish selected properties.You can combine highlights
with filters or use highlighting independently.",
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index dc255fe..f71f982 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -304,7 +304,8 @@
"eri-rcfilters-beta-description": "Description for the RC Filter beta
feature where ORES '''is not''' available. \"Recent Changes\" should be based
on {{msg-mw|Recentchanges}}.",
"eri-rcfilters-beta-description-ores": "Description for the RC Filter
beta feature where ORES '''is''' available. \"Recent Changes\" should be based
on {{msg-mw|Recentchanges}}.",
"eri-rcfilters-tour-welcome-title": "Title of the first step of the
guided tour introducing the RC filters beta feature.",
- "eri-rcfilters-tour-welcome-description": "Description of the first
step of the guided tour introducing the RC filters beta feature.",
+ "eri-rcfilters-tour-welcome-description": "Description of the first
step of the guided tour introducing the RC filters beta feature, if machine
learning tools are available on this wiki.",
+ "eri-rcfilters-tour-welcome-no-ores-description": "Description of the
first step of the guided tour introducing the RC filters beta feature, if
machine learning tools are not available on the wiki.",
"eri-rcfilters-tour-welcome-button": "Text of the button to close the
RC filters beta feature guided tour.",
"eri-rcfilters-tour-highlight-title": "Title of the first step of the
guided tour introducing the RC filters highlight feature.",
"eri-rcfilters-tour-highlight-description": "Description of the first
step of the guided tour introducing the RC filters highlight feature.",
diff --git a/modules/rcfilters-beta-tour.js b/modules/rcfilters-beta-tour.js
index 87d4a58..e01ea6b 100644
--- a/modules/rcfilters-beta-tour.js
+++ b/modules/rcfilters-beta-tour.js
@@ -8,7 +8,9 @@
tour.firstStep( {
name: 'Welcome',
titlemsg: 'eri-rcfilters-tour-welcome-title',
- descriptionmsg: 'eri-rcfilters-tour-welcome-description',
+
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.20]: mw.widgets.Complex*: Fix setDisabled
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347994 )
Change subject: mw.widgets.Complex*: Fix setDisabled
..
mw.widgets.Complex*: Fix setDisabled
* Check if elements exists before trying to disable them
* Return `this`, as the method is marked as chainable
Follows-up I6747f4e64dd81197bb3e37c09876399f1cb3be07
Bug: T162667
Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
(cherry picked from commit 7a80c55421e474835ef3b4492e7d75fed177dafb)
---
M resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
2 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
index b0c9f91..9edd0bd 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
@@ -120,8 +120,9 @@
*/
mw.widgets.ComplexNamespaceInputWidget.prototype.setDisabled = function
( disabled ) {
mw.widgets.ComplexNamespaceInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
-
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
if ( this.invert ) {
this.invert.setDisabled( disabled );
}
@@ -129,6 +130,7 @@
if ( this.associated ) {
this.associated.setDisabled( disabled );
}
+ return this;
};
}( jQuery, mediaWiki ) );
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
index 030fbb0..a01fbde 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
@@ -108,8 +108,14 @@
*/
mw.widgets.ComplexTitleInputWidget.prototype.setDisabled = function (
disabled ) {
mw.widgets.ComplexTitleInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
- this.title.setDisabled( disabled );
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
+
+ if ( this.title ) {
+ this.title.setDisabled( disabled );
+ }
+ return this;
};
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/347994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.20
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[wmf/1.29.0-wmf.20]: Log only infoboxes which are not a direct children of lead s...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347990 )
Change subject: Log only infoboxes which are not a direct children of lead
section
..
Log only infoboxes which are not a direct children of lead section
Changes:
- fixed xPath selector
Bug: T149884
Change-Id: Ib0fa44e997954f3f7d7a144fe0a8f734d65d97d2
---
M includes/MobileFormatter.php
M tests/phpunit/MobileFormatterTest.php
2 files changed, 44 insertions(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 7644c70..2171d3d 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -263,7 +263,8 @@
* @param DOMXPath $xPath
*/
private function logInfoboxesWrappedInContainers( $leadSectionBody,
DOMXPath $xPath ) {
- $infoboxes = $xPath->query(
'.//table[contains(@class,"infobox")]', $leadSectionBody );
+ $infoboxes = $xPath->query(
'./*//table[contains(@class,"infobox")]', $leadSectionBody );
+
if ( $infoboxes->length > 0 ) {
\MediaWiki\Logger\LoggerFactory::getInstance( 'mobile'
)->info(
"Found infobox wrapped with container on
{$this->title} (rev:{$this->revId})"
diff --git a/tests/phpunit/MobileFormatterTest.php
b/tests/phpunit/MobileFormatterTest.php
index 174ce23..8cbb2f2 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -820,16 +820,15 @@
/**
* @see https://phabricator.wikimedia.org/T149884
+* @dataProvider
provideLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped
* @covers MobileFormatter::filterContent
+* @param string $input
*/
- public function testLoggingOfInfoboxesBeingWrappedInContainers() {
+ public function
testLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped( $input ) {
$this->setMwGlobals( [
'wgMFLogWrappedInfoboxes' => true
] );
- $input =
- 'infobox' .
- 'paragraph 1';
$title = 'Special:T149884';
$formatter = new MobileFormatter( MobileFormatter::wrapHTML(
$input ),
@@ -849,4 +848,43 @@
$this->setLogger( 'mobile', $loggerMock );
$formatter->filterContent( false, false, false, true );
}
+
+ public function
provideLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped() {
+ $box = 'infobox';
+
+ return [
+ // wrapped once
+ [ "$box" ],
+ // wrapped twice
+ [ "$box" ],
+ // wrapped inside different infobox
+ [ "$box" ],
+ // wrapped multiple times
+ [
"Test$box" ]
+ ];
+ }
+
+ /**
+* @see https://phabricator.wikimedia.org/T149884
+* @covers MobileFormatter::filterContent
+*/
+ public function
testLoggingOfInfoboxesBeingWrappedInContainersWhenNotWrapped() {
+ $this->setMwGlobals( [
+ 'wgMFLogWrappedInfoboxes' => true
+ ] );
+
+ $input = 'infobox';
+ $title = 'Special:T149884';
+
+ $formatter = new MobileFormatter( MobileFormatter::wrapHTML(
$input ),
+ Title::newFromText( $title ) );
+ $formatter->enableExpandableSections();
+
+ $loggerMock = $this->getMock( \Psr\Log\LoggerInterface::class );
+ $loggerMock->expects( $this->never() )
+ ->method( 'debug' );
+
+ $this->setLogger( 'mobile', $loggerMock );
+ $formatter->filterContent( false, false, false, true );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/347990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0fa44e997954f3f7d7a144fe0a8f734d65d97d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.29.0-wmf.20
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Pmiazga
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.19]: mw.widgets.Complex*: Fix setDisabled
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347993 )
Change subject: mw.widgets.Complex*: Fix setDisabled
..
mw.widgets.Complex*: Fix setDisabled
* Check if elements exists before trying to disable them
* Return `this`, as the method is marked as chainable
Follows-up I6747f4e64dd81197bb3e37c09876399f1cb3be07
Bug: T162667
Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
(cherry picked from commit 7a80c55421e474835ef3b4492e7d75fed177dafb)
---
M resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
2 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
index b0c9f91..9edd0bd 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
@@ -120,8 +120,9 @@
*/
mw.widgets.ComplexNamespaceInputWidget.prototype.setDisabled = function
( disabled ) {
mw.widgets.ComplexNamespaceInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
-
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
if ( this.invert ) {
this.invert.setDisabled( disabled );
}
@@ -129,6 +130,7 @@
if ( this.associated ) {
this.associated.setDisabled( disabled );
}
+ return this;
};
}( jQuery, mediaWiki ) );
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
index 030fbb0..a01fbde 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
@@ -108,8 +108,14 @@
*/
mw.widgets.ComplexTitleInputWidget.prototype.setDisabled = function (
disabled ) {
mw.widgets.ComplexTitleInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
- this.title.setDisabled( disabled );
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
+
+ if ( this.title ) {
+ this.title.setDisabled( disabled );
+ }
+ return this;
};
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/347993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.19
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[wmf/1.29.0-wmf.20]: RCFilters: Provide a separate message in GuidedTour for no O...
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348004 )
Change subject: RCFilters: Provide a separate message in GuidedTour for no ORES
models
..
RCFilters: Provide a separate message in GuidedTour for no ORES models
Bug: T162693
Change-Id: I9fd4aed15c4d84240649d7b99df067345e291b08
(cherry picked from commit 7226b8a86e1b13efd6bfc4703b8649ba9b45ee62)
---
M WikimediaMessages.hooks.php
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
M modules/rcfilters-beta-tour.js
4 files changed, 8 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/04/348004/1
diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index b6dfa52..d17cb54 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -1351,6 +1351,7 @@
if ( !$user->getOption(
'rcenhancedfilters-tried-highlight' ) ) {
$out->addModules(
'ext.guidedTour.tour.RcFiltersHighlight' );
+ $out->addJsConfigVars(
'wgRCFiltersORESAvailable', self::isOresAvailable() );
}
}
@@ -1367,6 +1368,7 @@
'messages' => [
'eri-rcfilters-tour-welcome-title',
'eri-rcfilters-tour-welcome-description',
+
'eri-rcfilters-tour-welcome-no-ores-description',
'eri-rcfilters-tour-welcome-button',
],
'dependencies' => [
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index a168afb..ec50ef0 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -277,6 +277,7 @@
"eri-rcfilters-beta-description-ores": "Review edits on Recent Changes
using an easier and more powerful interface and many new tools, including
predictive filters powered by [[m:Objective Revision Evaluation Service|ORES]],
a machine-learning program.",
"eri-rcfilters-tour-welcome-title": "Introducing: New Filters for Edit
Review (beta)",
"eri-rcfilters-tour-welcome-description": "Combine improved tools, a
new interface and the power of machine learning to fight vandalism and help new
users.",
+ "eri-rcfilters-tour-welcome-no-ores-description": "Review edits using
an easier and more powerful interface, additional filters, user-defined
highlighting and other improvements.",
"eri-rcfilters-tour-welcome-button": "OK, got it",
"eri-rcfilters-tour-highlight-title": "Color code your results",
"eri-rcfilters-tour-highlight-description": "Use highlighting to
visually distinguish selected properties.You can combine highlights
with filters or use highlighting independently.",
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index dc255fe..f71f982 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -304,7 +304,8 @@
"eri-rcfilters-beta-description": "Description for the RC Filter beta
feature where ORES '''is not''' available. \"Recent Changes\" should be based
on {{msg-mw|Recentchanges}}.",
"eri-rcfilters-beta-description-ores": "Description for the RC Filter
beta feature where ORES '''is''' available. \"Recent Changes\" should be based
on {{msg-mw|Recentchanges}}.",
"eri-rcfilters-tour-welcome-title": "Title of the first step of the
guided tour introducing the RC filters beta feature.",
- "eri-rcfilters-tour-welcome-description": "Description of the first
step of the guided tour introducing the RC filters beta feature.",
+ "eri-rcfilters-tour-welcome-description": "Description of the first
step of the guided tour introducing the RC filters beta feature, if machine
learning tools are available on this wiki.",
+ "eri-rcfilters-tour-welcome-no-ores-description": "Description of the
first step of the guided tour introducing the RC filters beta feature, if
machine learning tools are not available on the wiki.",
"eri-rcfilters-tour-welcome-button": "Text of the button to close the
RC filters beta feature guided tour.",
"eri-rcfilters-tour-highlight-title": "Title of the first step of the
guided tour introducing the RC filters highlight feature.",
"eri-rcfilters-tour-highlight-description": "Description of the first
step of the guided tour introducing the RC filters highlight feature.",
diff --git a/modules/rcfilters-beta-tour.js b/modules/rcfilters-beta-tour.js
index 87d4a58..e01ea6b 100644
--- a/modules/rcfilters-beta-tour.js
+++ b/modules/rcfilters-beta-tour.js
@@ -8,7 +8,9 @@
tour.firstStep( {
name: 'Welcome',
titlemsg: 'eri-rcfilters-tour-welcome-title',
- descriptionmsg: 'eri-rcfilters-tour-welcome-desc
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable wgCiteResponsiveReferences on cawiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344722 ) Change subject: Enable wgCiteResponsiveReferences on cawiki .. Enable wgCiteResponsiveReferences on cawiki Bug: T161307 Change-Id: I0a2c44ed4359c6bbd5c25c48c60b8f2f5cfe3bc3 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 984bbea..f20882c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14683,6 +14683,7 @@ 'mediawikiwiki' => true, // Wikis by request + 'cawiki' => true, // T161307 'frwiki' => true, // T160609 'hewiki' => true, // T161804 'itwiki' => true, // T160932 -- To view, visit https://gerrit.wikimedia.org/r/344722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a2c44ed4359c6bbd5c25c48c60b8f2f5cfe3bc3 Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Catrope Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable wgCiteResponsiveReferences on bgwiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346333 ) Change subject: Enable wgCiteResponsiveReferences on bgwiki .. Enable wgCiteResponsiveReferences on bgwiki Bug: T162145 Change-Id: I8c013a5634ce0678597c69f232818407327de749 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index f20882c..c6deacd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14683,6 +14683,7 @@ 'mediawikiwiki' => true, // Wikis by request + 'bgwiki' => true, // T162145 'cawiki' => true, // T161307 'frwiki' => true, // T160609 'hewiki' => true, // T161804 -- To view, visit https://gerrit.wikimedia.org/r/346333 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c013a5634ce0678597c69f232818407327de749 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Catrope Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update the LoginNotify config to match what would be going i...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348003 )
Change subject: Update the LoginNotify config to match what would be going into
prod
..
Update the LoginNotify config to match what would be going into prod
Bug: T162104
Change-Id: I8ad6ca996917fb5f7579f93762e31ad9a807969a
---
M wmf-config/CommonSettings-labs.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index c1cb82d..4ad54e9 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -348,7 +348,8 @@
if ( $wmgUseLoginNotify ) {
wfLoadExtension( 'LoginNotify' );
- $wgLoginNotifyAttemptsKnownIP = 4;
+ $wgLoginNotifyAttemptsKnownIP = 10;
+ $wgLoginNotifyAttemptsNewIP = 1;
}
$wgMessageCacheType = CACHE_ACCEL;
--
To view, visit https://gerrit.wikimedia.org/r/348003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ad6ca996917fb5f7579f93762e31ad9a807969a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "LVS: remove direct use of acamar recdns"
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348000 )
Change subject: Revert "LVS: remove direct use of acamar recdns"
..
Revert "LVS: remove direct use of acamar recdns"
This reverts commit 94132b1b53a153b7f07d98315aa667b396e42362.
Bug: T155411
Change-Id: I8ad17b25ce9a1734de5f6c8251dfbcb3657849f0
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 757c6d7..fe9c5e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1676,7 +1676,7 @@
# so they need to use the recursive DNS backends directly
# (acamar and achernar) with fallback to eqiad
# (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '208.80.153.42', '208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1811,7 +1811,7 @@
# ULSFO lvs servers
node /^lvs400[1-4]\.ulsfo\.wmnet$/ {
# ns override for all lvs for now, see T103921
-$nameservers_override = [ '208.80.153.42', '208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
--
To view, visit https://gerrit.wikimedia.org/r/348000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ad17b25ce9a1734de5f6c8251dfbcb3657849f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LVS: remove direct use of achernar recdns
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348001 )
Change subject: LVS: remove direct use of achernar recdns
..
LVS: remove direct use of achernar recdns
Will revert after achernar's reinstall
Bug: T155411
Change-Id: I777180e8d598303198634cc66ac6b97ff9f71f0b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index fe9c5e0..3af8738 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1676,7 +1676,7 @@
# so they need to use the recursive DNS backends directly
# (acamar and achernar) with fallback to eqiad
# (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
role(lvs::balancer)
interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1811,7 +1811,7 @@
# ULSFO lvs servers
node /^lvs400[1-4]\.ulsfo\.wmnet$/ {
# ns override for all lvs for now, see T103921
-$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
role(lvs::balancer)
--
To view, visit https://gerrit.wikimedia.org/r/348001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I777180e8d598303198634cc66ac6b97ff9f71f0b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: RCFilters: Provide a separate message in GuidedTour for no O...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347981 )
Change subject: RCFilters: Provide a separate message in GuidedTour for no ORES
models
..
RCFilters: Provide a separate message in GuidedTour for no ORES models
Bug: T162693
Change-Id: I9fd4aed15c4d84240649d7b99df067345e291b08
---
M WikimediaMessages.hooks.php
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
M modules/rcfilters-beta-tour.js
4 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index b6dfa52..d17cb54 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -1351,6 +1351,7 @@
if ( !$user->getOption(
'rcenhancedfilters-tried-highlight' ) ) {
$out->addModules(
'ext.guidedTour.tour.RcFiltersHighlight' );
+ $out->addJsConfigVars(
'wgRCFiltersORESAvailable', self::isOresAvailable() );
}
}
@@ -1367,6 +1368,7 @@
'messages' => [
'eri-rcfilters-tour-welcome-title',
'eri-rcfilters-tour-welcome-description',
+
'eri-rcfilters-tour-welcome-no-ores-description',
'eri-rcfilters-tour-welcome-button',
],
'dependencies' => [
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index a168afb..ec50ef0 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -277,6 +277,7 @@
"eri-rcfilters-beta-description-ores": "Review edits on Recent Changes
using an easier and more powerful interface and many new tools, including
predictive filters powered by [[m:Objective Revision Evaluation Service|ORES]],
a machine-learning program.",
"eri-rcfilters-tour-welcome-title": "Introducing: New Filters for Edit
Review (beta)",
"eri-rcfilters-tour-welcome-description": "Combine improved tools, a
new interface and the power of machine learning to fight vandalism and help new
users.",
+ "eri-rcfilters-tour-welcome-no-ores-description": "Review edits using
an easier and more powerful interface, additional filters, user-defined
highlighting and other improvements.",
"eri-rcfilters-tour-welcome-button": "OK, got it",
"eri-rcfilters-tour-highlight-title": "Color code your results",
"eri-rcfilters-tour-highlight-description": "Use highlighting to
visually distinguish selected properties.You can combine highlights
with filters or use highlighting independently.",
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index dc255fe..f71f982 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -304,7 +304,8 @@
"eri-rcfilters-beta-description": "Description for the RC Filter beta
feature where ORES '''is not''' available. \"Recent Changes\" should be based
on {{msg-mw|Recentchanges}}.",
"eri-rcfilters-beta-description-ores": "Description for the RC Filter
beta feature where ORES '''is''' available. \"Recent Changes\" should be based
on {{msg-mw|Recentchanges}}.",
"eri-rcfilters-tour-welcome-title": "Title of the first step of the
guided tour introducing the RC filters beta feature.",
- "eri-rcfilters-tour-welcome-description": "Description of the first
step of the guided tour introducing the RC filters beta feature.",
+ "eri-rcfilters-tour-welcome-description": "Description of the first
step of the guided tour introducing the RC filters beta feature, if machine
learning tools are available on this wiki.",
+ "eri-rcfilters-tour-welcome-no-ores-description": "Description of the
first step of the guided tour introducing the RC filters beta feature, if
machine learning tools are not available on the wiki.",
"eri-rcfilters-tour-welcome-button": "Text of the button to close the
RC filters beta feature guided tour.",
"eri-rcfilters-tour-highlight-title": "Title of the first step of the
guided tour introducing the RC filters highlight feature.",
"eri-rcfilters-tour-highlight-description": "Description of the first
step of the guided tour introducing the RC filters highlight feature.",
diff --git a/modules/rcfilters-beta-tour.js b/modules/rcfilters-beta-tour.js
index 87d4a58..e01ea6b 100644
--- a/modules/rcfilters-beta-tour.js
+++ b/modules/rcfilters-beta-tour.js
@@ -8,7 +8,9 @@
tour.firstStep( {
name: 'Welcome',
titlemsg: 'eri-rcfilters-tour-welcome-title',
- descriptionmsg: 'eri-rcfilters-tour-welcome-description',
+ descriptionmsg: mw.config.get( 'wgRCFiltersORESAvailable' ) ?
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update the LoginNotify config to match what would be going i...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348003 )
Change subject: Update the LoginNotify config to match what would be going into
prod
..
Update the LoginNotify config to match what would be going into prod
Bug: T162104
Change-Id: I8ad6ca996917fb5f7579f93762e31ad9a807969a
---
M wmf-config/CommonSettings-labs.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/03/348003/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index c1cb82d..4ad54e9 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -348,7 +348,8 @@
if ( $wmgUseLoginNotify ) {
wfLoadExtension( 'LoginNotify' );
- $wgLoginNotifyAttemptsKnownIP = 4;
+ $wgLoginNotifyAttemptsKnownIP = 10;
+ $wgLoginNotifyAttemptsNewIP = 1;
}
$wgMessageCacheType = CACHE_ACCEL;
--
To view, visit https://gerrit.wikimedia.org/r/348003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ad6ca996917fb5f7579f93762e31ad9a807969a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[printstyles]: Infobox print styles
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346659 )
Change subject: Infobox print styles
..
Infobox print styles
* Treat as table
* Add padding
* Align left
* Add border to rows and table
Bug: T159857
Change-Id: Ie860fcf8e1325ef256432219f950da716b3de805
---
M minerva.less/minerva.variables.less
A resources/skins.minerva.print.styles/infobox.less
M resources/skins.minerva.print.styles/styles.less
3 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/minerva.less/minerva.variables.less
b/minerva.less/minerva.variables.less
index 2147e2e..575a4ac 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -116,3 +116,4 @@
// Print specific
@printBorderColor: #9aa0a7;
+@printBorderColorLight: @colorGray12;
diff --git a/resources/skins.minerva.print.styles/infobox.less
b/resources/skins.minerva.print.styles/infobox.less
new file mode 100644
index 000..93a13b2
--- /dev/null
+++ b/resources/skins.minerva.print.styles/infobox.less
@@ -0,0 +1,23 @@
+@import 'minerva.variables';
+@import 'minerva.mixins';
+
+.infobox {
+ font-size: 30px;
+ border-radius: 5px;
+ display: table !important;
+
+ tr {
+ border: solid 2px @printBorderColor;
+ border-bottom: solid 2px @printBorderColorLight;
+
+ &:last-child {
+ border-bottom: solid 2px @printBorderColor;
+ }
+ }
+
+ td,
+ th {
+ text-align: left !important;
+ padding: 20px 0 20px 42px;
+ }
+}
diff --git a/resources/skins.minerva.print.styles/styles.less
b/resources/skins.minerva.print.styles/styles.less
index 32e8dbc..ebd76f0 100644
--- a/resources/skins.minerva.print.styles/styles.less
+++ b/resources/skins.minerva.print.styles/styles.less
@@ -2,6 +2,7 @@
@import 'header.less';
@import 'article.less';
@import 'blockquotes.less';
+ @import 'infobox.less';
@import 'references.less';
@import 'footer.less';
}
--
To view, visit https://gerrit.wikimedia.org/r/346659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie860fcf8e1325ef256432219f950da716b3de805
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: printstyles
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dumps[master]: Split out retrieving globals and use a more machine-readable...
Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348002 )
Change subject: Split out retrieving globals and use a more machine-readable
format
..
Split out retrieving globals and use a more machine-readable format
The --globals output was too difficult to parse, and failed when variable
values are not a simple string.
Change-Id: I9ab54a32c347ad9debf3df988ecfa674f69731b1
---
M xmldumps-backup/dumps/utils.py
1 file changed, 19 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/02/348002/1
diff --git a/xmldumps-backup/dumps/utils.py b/xmldumps-backup/dumps/utils.py
index de9d1e0..b7e80a5 100644
--- a/xmldumps-backup/dumps/utils.py
+++ b/xmldumps-backup/dumps/utils.py
@@ -2,6 +2,7 @@
misc utils for dumps
'''
+import json
import os
from os.path import exists
import re
@@ -109,8 +110,6 @@
php=MiscUtils.shell_escape(self.wiki.config.php),
command=" ".join(command_list),
dbname=MiscUtils.shell_escape(self.db_name))
-if do_globals:
-command += " --globals"
results = RunSimpleCommand.run_with_output(
command, shell=True, log_callback=self.error_callback).strip()
if not results:
@@ -124,32 +123,25 @@
if ':' in self.db_server:
self.db_server, _, self.db_port = self.db_server.rpartition(':')
-if not do_globals:
-return
+if do_globals:
+self.get_config_variables()
-# [wgDBprefix] => stuff
-wgdb_prefix_pattern =
re.compile(r"\s+\[wgDBprefix\]\s+=>\s+(?P.*)$")
-wgcanonserver_pattern =
re.compile(r"\s+\[wgCanonicalServer\]\s+=>\s+(?P.*)$")
-wgscriptpath_pattern =
re.compile(r"\s+\[wgScriptPath\]\s+=>\s+(?P.*)$")
-for line in lines:
-match = wgdb_prefix_pattern.match(line)
-if match:
-self.db_table_prefix = match.group('prefix').strip()
-else:
-match = wgcanonserver_pattern.match(line)
-if match:
-wgcanonserver = match.group('prefix').strip()
-else:
-match = wgscriptpath_pattern.match(line)
-if match:
-wgscriptpath = match.group('prefix').strip()
-# if we didn't see these in the globals list, something is broken.
-if self.db_table_prefix is None:
-raise BackupError("Failed to get database table prefix for %s,
bailing."
- % self.wiki.config.php)
-if wgcanonserver is None or wgscriptpath is None:
-raise BackupError("Failed to get apibase for %s, bailing."
- % self.wiki.config.php)
+def get_config_variables(self):
+command_list = MultiVersion.mw_script_as_array(self.wiki.config,
"getConfiguration.php")
+command = "{php} {command} --wiki={dbname} --group=dump --format=json
--regex='wgDBprefix|wgCanonicalServer|wgScriptPath'".format(
+php=MiscUtils.shell_escape(self.wiki.config.php),
+command=" ".join(command_list),
+dbname=MiscUtils.shell_escape(self.db_name))
+results = RunSimpleCommand.run_with_output(
+command, shell=True, log_callback=self.error_callback).strip()
+settings = json.loads(results)
+if not settings or len(settings) != 3:
+raise BackupError("Failed to get configuration for %s" %
self.wiki.config.php)
+
+self.db_table_prefix = settings['wgDBprefix']
+wgcanonserver = settings['wgCanonicalServer']
+wgscriptpath = settings['wgScriptPath']
+
self.apibase = "/".join([wgcanonserver, wgscriptpath, "api.php"])
def mysql_standard_parameters(self):
--
To view, visit https://gerrit.wikimedia.org/r/348002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ab54a32c347ad9debf3df988ecfa674f69731b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[printstyles]: Style footer in printed version
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347028 )
Change subject: Style footer in printed version
..
Style footer in printed version
Note despite showing with the print media query applied,
when actually looking at the print preview the footer is not appearing
This is rectified in Ia4d619ce6dd0e96580bca389867aad4a10c924d6
follow up task.
Bug: T159857
Change-Id: I7a329b3f286d50bfac4c4f29a22d10501ad6c9a3
---
A resources/skins.minerva.print.styles/footer.less
M resources/skins.minerva.print.styles/styles.less
2 files changed, 57 insertions(+), 0 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/skins.minerva.print.styles/footer.less
b/resources/skins.minerva.print.styles/footer.less
new file mode 100644
index 000..1e5db17
--- /dev/null
+++ b/resources/skins.minerva.print.styles/footer.less
@@ -0,0 +1,56 @@
+@import 'minerva.variables';
+@import 'minerva.mixins';
+
+.printfooter {
+ display: block;
+ padding-top: 108px;
+ font-size: 30px;
+}
+
+footer {
+ border-top: solid 4px #000;
+ padding-top: 23px;
+ background: #fff !important;
+
+ .mw-ui-icon:before {
+ display: none !important;
+ }
+
+ .last-modified-bar {
+ background: none !important;
+ border: 0 !important;
+ }
+
+ .last-modifier-tagline {
+ font-size: 36px;
+ padding-top: 0 !important;
+ padding-bottom: 16px !important;
+ }
+
+ .last-modified-bar,
+ .last-modified-bar a {
+ font-weight: bold !important;
+ color: #000 !important;
+ }
+
+ .post-content {
+ margin-top: 15px !important;
+ // FIXME: There is a print style in skins.minerva.base.styles
+ // that sets display: none; When promoting to stable the
!important here
+ // should be dropped and skins.minerva.base.styles moved into
here.
+ display: block !important;
+
+ // ... and add these instead.
+ .hlist,
+ h2 {
+ display: none;
+ }
+
+ .license a,
+ .license {
+ font-size: 30px;
+ color: @printBorderColor;
+ font-weight: normal;
+ }
+ }
+}
diff --git a/resources/skins.minerva.print.styles/styles.less
b/resources/skins.minerva.print.styles/styles.less
index b648e11..9da26ee 100644
--- a/resources/skins.minerva.print.styles/styles.less
+++ b/resources/skins.minerva.print.styles/styles.less
@@ -2,4 +2,5 @@
@import 'article.less';
@import 'blockquotes.less';
@import 'references.less';
+ @import 'footer.less';
}
--
To view, visit https://gerrit.wikimedia.org/r/347028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a329b3f286d50bfac4c4f29a22d10501ad6c9a3
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: printstyles
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LVS: remove direct use of achernar recdns
BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348001 )
Change subject: LVS: remove direct use of achernar recdns
..
LVS: remove direct use of achernar recdns
Will revert after achernar's reinstall
Bug: T155411
Change-Id: I777180e8d598303198634cc66ac6b97ff9f71f0b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/348001/1
diff --git a/manifests/site.pp b/manifests/site.pp
index fe9c5e0..3af8738 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1676,7 +1676,7 @@
# so they need to use the recursive DNS backends directly
# (acamar and achernar) with fallback to eqiad
# (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
role(lvs::balancer)
interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1811,7 +1811,7 @@
# ULSFO lvs servers
node /^lvs400[1-4]\.ulsfo\.wmnet$/ {
# ns override for all lvs for now, see T103921
-$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
role(lvs::balancer)
--
To view, visit https://gerrit.wikimedia.org/r/348001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I777180e8d598303198634cc66ac6b97ff9f71f0b
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] operations/puppet[production]: Revert "LVS: remove direct use of acamar recdns"
BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348000 )
Change subject: Revert "LVS: remove direct use of acamar recdns"
..
Revert "LVS: remove direct use of acamar recdns"
This reverts commit 94132b1b53a153b7f07d98315aa667b396e42362.
Bug: T155411
Change-Id: I8ad17b25ce9a1734de5f6c8251dfbcb3657849f0
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/348000/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 757c6d7..fe9c5e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1676,7 +1676,7 @@
# so they need to use the recursive DNS backends directly
# (acamar and achernar) with fallback to eqiad
# (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '208.80.153.42', '208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1811,7 +1811,7 @@
# ULSFO lvs servers
node /^lvs400[1-4]\.ulsfo\.wmnet$/ {
# ns override for all lvs for now, see T103921
-$nameservers_override = [ '208.80.153.42', '208.80.154.254' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
--
To view, visit https://gerrit.wikimedia.org/r/348000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ad17b25ce9a1734de5f6c8251dfbcb3657849f0
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] mediawiki...MobileFrontend[printstyles]: Thumbnail styles
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346931 )
Change subject: Thumbnail styles
..
Thumbnail styles
Left align thumbnails,
Add dividing line underneath
reset width if one has been specified
Bug: T159857
Change-Id: Id89ed933e531274a57bf44e46b9c466923a55e1c
---
M resources/skins.minerva.print.styles/article.less
1 file changed, 36 insertions(+), 8 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/skins.minerva.print.styles/article.less
b/resources/skins.minerva.print.styles/article.less
index 7819f79..573e246 100644
--- a/resources/skins.minerva.print.styles/article.less
+++ b/resources/skins.minerva.print.styles/article.less
@@ -1,6 +1,9 @@
@import 'minerva.variables';
@import 'minerva.mixins';
+@dividerHeight: 2px;
+@dividerSpacing: 28px;
+
.pre-content {
display: block;
padding: 51px 0 35px;
@@ -28,19 +31,44 @@
#bodyContent {
padding-top: 55px;
position: relative;
-
&:before {
- position: absolute;
top: 0;
- left: 0;
- content: '';
- display: block;
- width: 55px;
- height: 2px;
- background: @printBorderColor;
}
}
+.thumbinner {
+ width: auto !important;
+}
+
+.thumb {
+ position: relative;
+ padding: (@dividerSpacing*2) + @dividerHeight 0 !important;
+ text-align: left;
+ margin: 0 !important;
+
+ &:after {
+ bottom: @dividerHeight + @dividerSpacing;
+ }
+}
+
+.thumb:after,
+#bodyContent:before {
+ position: absolute;
+ left: 0;
+ content: '';
+ display: block;
+ width: 55px;
+ height: @dividerHeight;
+ background: @printBorderColor;
+}
+
+.thumbcaption {
+ margin-top: 23px !important;
+ width: 100%;
+ font-style: italic;
+ font-size: 28px;
+}
+
#mw-content-text {
font-size: 36px;
--
To view, visit https://gerrit.wikimedia.org/r/346931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id89ed933e531274a57bf44e46b9c466923a55e1c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: printstyles
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: site: remove all the "$cluster = 'misc'"
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347867 )
Change subject: site: remove all the "$cluster = 'misc'"
..
site: remove all the "$cluster = 'misc'"
There is a a "if undef then misc" statement in site.pp anyways,
so all of these are not really needed.
And it should be only for Ganglia, which we are deprecating.
Change-Id: I785ba217353d1019c0379d0af9841761903e0764
---
M manifests/site.pp
1 file changed, 0 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 0d27ab0..757c6d7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -152,7 +152,6 @@
role(bastionhost::general)
interface::add_ip6_mapped { 'main': interface => 'eth0', }
-$cluster = 'misc'
}
# Bastion in Texas
@@ -160,7 +159,6 @@
role(bastionhost::general)
interface::add_ip6_mapped { 'main': interface => 'eth0', }
-$cluster = 'misc'
}
# Bastion in the Netherlands (replaced bast3001)
@@ -1259,8 +1257,6 @@
installserver::preseed,
aptrepo::wikimedia)
-$cluster = 'misc'
-
interface::add_ip6_mapped { 'main':
interface => 'eth0',
}
@@ -1877,7 +1873,6 @@
# archiva.wikimedia.org
node 'meitnerium.wikimedia.org' {
-$cluster = 'misc'
role(archiva)
include ::standard
}
@@ -1898,7 +1893,6 @@
# also see dataset1001
node 'ms1001.wikimedia.org' {
-$cluster = 'misc'
role(dataset::secondary, dumps::server)
@@ -2143,7 +2137,6 @@
# mw logging host codfw
node 'mwlog2001.codfw.wmnet' {
role(xenon)
-$cluster = 'misc'
include ::base::firewall
include ::standard
@@ -2156,7 +2149,6 @@
# mw logging host eqiad
node 'mwlog1001.eqiad.wmnet' {
role(xenon)
-$cluster = 'misc'
include ::base::firewall
include ::standard
--
To view, visit https://gerrit.wikimedia.org/r/347867
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I785ba217353d1019c0379d0af9841761903e0764
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Make VisualEditor gutter area clickable
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347986 )
Change subject: Make VisualEditor gutter area clickable
..
Make VisualEditor gutter area clickable
Code adapted from VisualEditor's ve.init.mw.DesktopArticleTarget-vector.css.
Bug: T162838
Change-Id: I828b97b060d631d7c86bff308802fb05c3dff781
---
M resources/extensions/VisualEditor.core.less
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/resources/extensions/VisualEditor.core.less
b/resources/extensions/VisualEditor.core.less
index 74c5e55..a140fef 100644
--- a/resources/extensions/VisualEditor.core.less
+++ b/resources/extensions/VisualEditor.core.less
@@ -10,6 +10,17 @@
top: @fixed-header-height + @color-height;
}
+ // Make the gutter area clickable (T162838)
+ .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface {
+ margin-left: -@content-padding;
+ margin-right: -@content-padding;
+ }
+ .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface
.ve-ce-documentNode,
+ .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface
.ve-ui-surface-placeholder {
+ padding-left: @content-padding;
+ padding-right: @content-padding;
+ }
+
@media (min-width: @desktop-small-floor) and (max-width:
@desktop-small-width) {
.ve-ui-toolbar {
margin-top: -.5em;
--
To view, visit https://gerrit.wikimedia.org/r/347986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I828b97b060d631d7c86bff308802fb05c3dff781
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Remove workaround for T162493
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347978 )
Change subject: Remove workaround for T162493
..
Remove workaround for T162493
Change-Id: Icb1f7632512b4a8fd0e2bf50035e40d3a89cd9bb
---
M resources/extensions/VisualEditor.core.less
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/resources/extensions/VisualEditor.core.less
b/resources/extensions/VisualEditor.core.less
index d9c50ba..74c5e55 100644
--- a/resources/extensions/VisualEditor.core.less
+++ b/resources/extensions/VisualEditor.core.less
@@ -10,12 +10,6 @@
top: @fixed-header-height + @color-height;
}
- // Apparently the margin is normally removed/negated elsewhere in other
skins (T162493)
- .ve-ce-documentNode {
- padding: 0.94em 1.88em;
- margin: auto -1.88em;
- }
-
@media (min-width: @desktop-small-floor) and (max-width:
@desktop-small-width) {
.ve-ui-toolbar {
margin-top: -.5em;
--
To view, visit https://gerrit.wikimedia.org/r/347978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb1f7632512b4a8fd0e2bf50035e40d3a89cd9bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiQueryLinks: Remove legacy FORCE INDEX directive
Mholloway has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/347998 ) Change subject: ApiQueryLinks: Remove legacy FORCE INDEX directive .. ApiQueryLinks: Remove legacy FORCE INDEX directive ApiQueryLinks contains a USE INDEX directive (ultimately changed to a FORCE INDEX directive in the abstraction layer) originally intended to work around an index selection bug in MySQL 4.[1] MySQL 4 is no longer supported in the current MW version, and EXPLAIN results from queries of Wikipedia data on the DB replicas indicate that the expected index is being used without being explicitly forced. [1] https://github.com/wikimedia/mediawiki/commit/ba0f2974df812bc6e1f9e7972b616ed5b9d689f0 Change-Id: I2632981302c92b52722bd4cef9b5e275cd623fb7 --- M includes/api/ApiQueryLinks.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/98/347998/1 diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php index 29c0b74..b314cb7 100644 --- a/includes/api/ApiQueryLinks.php +++ b/includes/api/ApiQueryLinks.php @@ -137,7 +137,6 @@ $order[] = $this->prefix . '_title' . $sort; $this->addOption( 'ORDER BY', $order ); - $this->addOption( 'USE INDEX', $this->prefix . '_from' ); $this->addOption( 'LIMIT', $params['limit'] + 1 ); $res = $this->select( __METHOD__ ); -- To view, visit https://gerrit.wikimedia.org/r/347998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2632981302c92b52722bd4cef9b5e275cd623fb7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mholloway ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiQueryLinks: add query parameter to filter by exists or !e...
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347999 )
Change subject: ApiQueryLinks: add query parameter to filter by exists or
!exists
..
ApiQueryLinks: add query parameter to filter by exists or !exists
It would at times be useful to obtain from a links query only the links
that are missing (or only those that are not). This would greatly help
the apps work around T119266, but could also be generally useful to other
API consumers.
This patch adds a 'filter' parameter with two defined values, 'exists' and
'!exists'. When a filter is specified, a left join condition is added to
the query against the page database table so that the linked titles
present in or missing from the page table are filtered out as desired.
Bug: T119266
Change-Id: I1183a6f248e0b7810cb4858549a609309d7b
---
M includes/api/ApiQueryLinks.php
A tests/phpunit/includes/api/ApiQueryLinksTest.php
2 files changed, 109 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/99/347999/1
diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index b314cb7..3a37b53 100644
--- a/includes/api/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -135,6 +135,13 @@
$order[] = $this->prefix . '_namespace' . $sort;
}
+ if ( $params['filter'] && in_array( $params['filter'],
array('exists', '!exists'), true ) ) {
+ $this->addTables( 'page' );
+ $this->addJoinConds( [ 'page' => [ 'LEFT JOIN', [
"page_title={$this->prefix}_title",
+
"page_namespace={$this->prefix}_namespace" ] ] ] );
+ $this->addWhere( "page_title " . ( $params['filter']
=== "exists" ? "IS NOT" : "IS" ) . " NULL" );
+ }
+
$order[] = $this->prefix . '_title' . $sort;
$this->addOption( 'ORDER BY', $order );
$this->addOption( 'LIMIT', $params['limit'] + 1 );
@@ -204,6 +211,12 @@
'descending'
]
],
+ 'filter' => [
+ ApiBase::PARAM_TYPE => [
+ 'exists',
+ '!exists'
+ ]
+ ],
];
}
@@ -218,6 +231,10 @@
=> "apihelp-{$path}-example-generator",
"action=query&prop={$name}&titles=Main%20Page&{$this->prefix}namespace=2|10"
=> "apihelp-{$path}-example-namespaces",
+
"action=query&generator={$name}&titles=Staraya%20Ladoga&{$this->prefix}filter=exists"
+ => "apihelp-{$path}-example-exists",
+
"action=query&generator={$name}&titles=Staraya%20Ladoga&{$this->prefix}filter=!exists"
+ => "apihelp-{$path}-example-!exists",
];
}
diff --git a/tests/phpunit/includes/api/ApiQueryLinksTest.php
b/tests/phpunit/includes/api/ApiQueryLinksTest.php
new file mode 100644
index 000..d414fc4
--- /dev/null
+++ b/tests/phpunit/includes/api/ApiQueryLinksTest.php
@@ -0,0 +1,92 @@
+addCoreDBData();
+
+ $newTitleString = 'Foo';
+ $newPage = WikiPage::factory( Title::newFromText(
$newTitleString ) );
+
+ $newPage->doEditContent(
+ ContentHandler::makeContent(
"[[{$existingPageTitle}]]", $newPage->getTitle() ),
+ 'adding redlink'
+ );
+
+ $result = $this->doApiRequest( [
+ 'action' => 'query',
+ 'generator' => 'links',
+ 'titles' => $newTitleString ] );
+
+ $this->assertArrayHasKey( 'query', $result[0] );
+ $this->assertArrayHasKey( 'pages', $result[0]['query'] );
+ $this->assertNotEquals( 0, count( $result[0]['query']['pages']
),
+ 'expected a page to be present' );
+ }
+
+ public function testFilterExists() {
+ $existingPageTitle = 'UTPage'; // added in
MediaWikiTestCase->addCoreDBData();
+
+ $newTitleString = 'Foo';
+ $newPage = WikiPage::factory( Title::newFromText(
$newTitleString ) );
+
+ $newPage->doEditContent(
+ ContentHandler::makeContent(
"[[{$existingPageTitle}]]", $newPage->getTitle() ),
+ 'adding redlink'
+ );
+
+ $result = $this->doApiRequest( [
+ 'action' => 'query',
+ 'generator' =>
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Fix frameless button on sidebar from having white border
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347997 )
Change subject: Fix frameless button on sidebar from having white border
..
Fix frameless button on sidebar from having white border
Due to changes to OOUI 0.21.0
Change-Id: Ie617267af91459721401e904c7dcb1a999e189c4
---
M modules/styles/common.less
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/97/347997/1
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 32b1ea9..8916401 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -96,6 +96,14 @@
height: 100px;
}
+
+// Override oojs-ui's frameless-buttons having
+// a white border inside the description area
+// (which has a grey background)
+.flow-ui-boardDescriptionWidget-editButton.oo-ui-widget.oo-ui-buttonElement
.oo-ui-buttonElement-button {
+ border-color: transparent;
+}
+
@media all and ( min-width: @small ) {
.flow-topic-meta {
font-size: 1em;
--
To view, visit https://gerrit.wikimedia.org/r/347997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie617267af91459721401e904c7dcb1a999e189c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: site/install: unify install nodes into a single regex
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347862 )
Change subject: site/install: unify install nodes into a single regex
..
site/install: unify install nodes into a single regex
Change-Id: I1fc19e11840ef1b5c2245f9d15846377e03ec60b
---
M manifests/site.pp
1 file changed, 3 insertions(+), 23 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 9ccb1b3..0d27ab0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1250,8 +1250,8 @@
include ::base::firewall
}
-# replaced carbon and install1001 (T132757)
-node 'install1002.wikimedia.org' {
+# replaced carbon and install1001/install2001 (T132757, T84380, T156440)
+node /^install[12]002\.wikimedia\.org$/ {
role(installserver::tftp,
installserver::dhcp,
installserver::http,
@@ -1266,27 +1266,7 @@
}
class { '::ganglia::monitor::aggregator':
-sites => 'eqiad',
-}
-}
-
-# replaced carbon and install2001 (T84380, T156440)
-node 'install2002.wikimedia.org' {
-role(installserver::tftp,
-installserver::dhcp,
-installserver::http,
-installserver::proxy,
-installserver::preseed,
-aptrepo::wikimedia)
-
-$cluster = 'misc'
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-
-class { '::ganglia::monitor::aggregator':
-sites => 'codfw',
+sites => $::site,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/347862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1fc19e11840ef1b5c2245f9d15846377e03ec60b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[printstyles]: Header styles
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343976 )
Change subject: Header styles
..
Header styles
When printing, show the logo and header.
Bug: T159857
Change-Id: If4d4a72b28f983460140ced54abfc9bee82b9033
---
A resources/skins.minerva.print.styles/header.less
M resources/skins.minerva.print.styles/styles.less
2 files changed, 45 insertions(+), 0 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/skins.minerva.print.styles/header.less
b/resources/skins.minerva.print.styles/header.less
new file mode 100644
index 000..28ef7f0
--- /dev/null
+++ b/resources/skins.minerva.print.styles/header.less
@@ -0,0 +1,44 @@
+// FIXME: Ensure resources/skins.minerva.base.styles/print.less is removed
when promoting
+.header-container {
+ background: @skinContentBgColor !important;
+ box-shadow: none !important;
+}
+
+.header {
+ display: block;
+ height: auto;
+
+ .branding-box {
+ padding-left: 0 !important;
+
+ // Beta indication is hidden in print mode
+ sup {
+ display: none !important;
+ }
+ }
+
+ > div {
+ display: none !important;
+ }
+
+ > .branding-box {
+ height: auto;
+ display: block !important;
+ padding: 66px 0 51px 50px;
+
+ h1 {
+ font-size: inherit;
+
+ > * {
+ float: none;
+ }
+
+ // assumes SVG...
+ img {
+ height: 41px;
+ width: auto;
+ vertical-align: inherit;
+ }
+ }
+ }
+}
diff --git a/resources/skins.minerva.print.styles/styles.less
b/resources/skins.minerva.print.styles/styles.less
index b648e11..8b60513 100644
--- a/resources/skins.minerva.print.styles/styles.less
+++ b/resources/skins.minerva.print.styles/styles.less
@@ -1,4 +1,5 @@
@media print {
+ @import 'header.less';
@import 'article.less';
@import 'blockquotes.less';
@import 'references.less';
--
To view, visit https://gerrit.wikimedia.org/r/343976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4d4a72b28f983460140ced54abfc9bee82b9033
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: printstyles
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "mysql-predump.erb: Reduce the number of jobs"
Hello Giuseppe Lavagetto, Marostegui, Alexandros Kosiaris, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/347996
to review the following change.
Change subject: Revert "mysql-predump.erb: Reduce the number of jobs"
..
Revert "mysql-predump.erb: Reduce the number of jobs"
I think it is taking too much time now. Close to 24 hours.
This reverts commit 972f99500d8bb98d446a3642954bc40742da9205.
Change-Id: I52c84dbcabd508f43a3ea04c464ab73476923aed
---
M modules/backup/templates/mysql-predump.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/347996/1
diff --git a/modules/backup/templates/mysql-predump.erb
b/modules/backup/templates/mysql-predump.erb
index f155349..a4b789a 100644
--- a/modules/backup/templates/mysql-predump.erb
+++ b/modules/backup/templates/mysql-predump.erb
@@ -51,7 +51,7 @@
find <%= @local_dump_dir %> -name "*sql.gz" -mtime +15 -exec rm {} \;
for database in `$MYSQL -B -N -e "select schema_name from
information_schema.schemata where schema_name not like '%\_schema'"`
do
- NP=$((<%= @processorcount %> * 3 / 6)) # This is guaranteed to return
an integer
+ NP=$((<%= @processorcount %> * 3 / 4)) # This is guaranteed to return
an integer
while [ $(jobs -p | wc -l) -ge $NP ]
do
sleep 1 # a magic number
--
To view, visit https://gerrit.wikimedia.org/r/347996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52c84dbcabd508f43a3ea04c464ab73476923aed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Marostegui
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: site/redis_slave: remove duplicate base::firewall include
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347881 )
Change subject: site/redis_slave: remove duplicate base::firewall include
..
site/redis_slave: remove duplicate base::firewall include
This is already included in the role and the other nodes with
the same role in the other DC also don't have it.
Change-Id: I3a4065aa18a93562f0f7eeb6b10bd9226aed694b
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 655a997..9ccb1b3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2466,7 +2466,6 @@
node /^rdb200[246]\.codfw\.wmnet/ {
role(jobqueue_redis::slave)
-include ::base::firewall
}
node /^relforge100[1-2]\.eqiad\.wmnet/ {
--
To view, visit https://gerrit.wikimedia.org/r/347881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a4065aa18a93562f0f7eeb6b10bd9226aed694b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rewording for cascadeprotectedwarning
TerraCodes has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347995 )
Change subject: rewording for cascadeprotectedwarning
..
rewording for cascadeprotectedwarning
Bug: T60228
Change-Id: I2ec4cbe4c552dc095dce0fae0f0b8e4a52f0c6a9
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/95/347995/1
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 582f5f7..a003a10 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -732,7 +732,7 @@
"readonlywarning": "Warning: The database has been locked for
maintenance, so you will not be able to save your edits right
now.\nYou may wish to copy and paste your text into a text file and
save it for later.\n\nThe system administrator who locked it offered this
explanation: $1",
"protectedpagewarning": "Warning: This page has been protected
so that only users with administrator privileges can edit it.\nThe
latest log entry is provided below for reference:",
"semiprotectedpagewarning": "Note: This page has been
protected so that only registered users can edit it.\nThe latest log entry is
provided below for reference:",
- "cascadeprotectedwarning": "Warning: This page has
been protected so that only users with administrator privileges can edit it
because it is transcluded in the following cascade-protected
{{PLURAL:$1|page|pages}}:",
+ "cascadeprotectedwarning": "Warning: This page has
been protected so that only users with [[Special:ListGroupRights|specific
rights]] can edit it because it is transcluded in the following
cascade-protected {{PLURAL:$1|page|pages}}:",
"titleprotectedwarning": "Warning: This page has been protected
so that [[Special:ListGroupRights|specific rights]] are needed to create
it.\nThe latest log entry is provided below for reference:",
"templatesused": "{{PLURAL:$1|Template|Templates}} used on this page:",
"templatesusedpreview": "{{PLURAL:$1|Template|Templates}} used in this
preview:",
--
To view, visit https://gerrit.wikimedia.org/r/347995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ec4cbe4c552dc095dce0fae0f0b8e4a52f0c6a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TerraCodes
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.20]: mw.widgets.Complex*: Fix setDisabled
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347994 )
Change subject: mw.widgets.Complex*: Fix setDisabled
..
mw.widgets.Complex*: Fix setDisabled
* Check if elements exists before trying to disable them
* Return `this`, as the method is marked as chainable
Follows-up I6747f4e64dd81197bb3e37c09876399f1cb3be07
Bug: T162667
Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
(cherry picked from commit 7a80c55421e474835ef3b4492e7d75fed177dafb)
---
M resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
2 files changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/94/347994/1
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
index b0c9f91..9edd0bd 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
@@ -120,8 +120,9 @@
*/
mw.widgets.ComplexNamespaceInputWidget.prototype.setDisabled = function
( disabled ) {
mw.widgets.ComplexNamespaceInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
-
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
if ( this.invert ) {
this.invert.setDisabled( disabled );
}
@@ -129,6 +130,7 @@
if ( this.associated ) {
this.associated.setDisabled( disabled );
}
+ return this;
};
}( jQuery, mediaWiki ) );
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
index 030fbb0..a01fbde 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
@@ -108,8 +108,14 @@
*/
mw.widgets.ComplexTitleInputWidget.prototype.setDisabled = function (
disabled ) {
mw.widgets.ComplexTitleInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
- this.title.setDisabled( disabled );
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
+
+ if ( this.title ) {
+ this.title.setDisabled( disabled );
+ }
+ return this;
};
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/347994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.20
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.19]: mw.widgets.Complex*: Fix setDisabled
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347993 )
Change subject: mw.widgets.Complex*: Fix setDisabled
..
mw.widgets.Complex*: Fix setDisabled
* Check if elements exists before trying to disable them
* Return `this`, as the method is marked as chainable
Follows-up I6747f4e64dd81197bb3e37c09876399f1cb3be07
Bug: T162667
Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
(cherry picked from commit 7a80c55421e474835ef3b4492e7d75fed177dafb)
---
M resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
2 files changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/93/347993/1
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
index b0c9f91..9edd0bd 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexNamespaceInputWidget.js
@@ -120,8 +120,9 @@
*/
mw.widgets.ComplexNamespaceInputWidget.prototype.setDisabled = function
( disabled ) {
mw.widgets.ComplexNamespaceInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
-
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
if ( this.invert ) {
this.invert.setDisabled( disabled );
}
@@ -129,6 +130,7 @@
if ( this.associated ) {
this.associated.setDisabled( disabled );
}
+ return this;
};
}( jQuery, mediaWiki ) );
diff --git
a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
index 030fbb0..a01fbde 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js
@@ -108,8 +108,14 @@
*/
mw.widgets.ComplexTitleInputWidget.prototype.setDisabled = function (
disabled ) {
mw.widgets.ComplexTitleInputWidget.parent.prototype.setDisabled.call( this,
disabled );
- this.namespace.setDisabled( disabled );
- this.title.setDisabled( disabled );
+ if ( this.namespace ) {
+ this.namespace.setDisabled( disabled );
+ }
+
+ if ( this.title ) {
+ this.title.setDisabled( disabled );
+ }
+ return this;
};
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/347993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17665e57537dbed0821bc3226377849eb8388a32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.19
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Use a generic retry for the read only message
Volans has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/347992 ) Change subject: Use a generic retry for the read only message .. Use a generic retry for the read only message Bug: T160178 Change-Id: If3c6cd0cdd93c54aec2896725ebae0accbfede35 --- M wmf-config/db-codfw.php M wmf-config/db-eqiad.php 2 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/92/347992/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 1f81f82..9fe8b54 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -637,13 +637,13 @@ # These read only messages should currently be kept, # to prevent accidental write to eqiad from codfw. 'readOnlyBySection' => [ - 's1' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', - 's2' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', - 'DEFAULT' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', # s3 - 's4' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', - 's5' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', - 's6' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', - 's7' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', + 's1' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', + 's2' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', + 'DEFAULT' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', # s3 + 's4' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', + 's5' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', + 's6' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', + 's7' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', ], ]; diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c9b620b..107cf72 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -660,13 +660,13 @@ # This key must exist for the master switch script to work 'readOnlyBySection' => [ -# 's1' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', -# 's2' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', -# 'DEFAULT' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', # s3 -# 's4' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', -# 's5' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', -# 's6' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', -# 's7' => 'MediaWiki is in read-only mode for maintenance. Please try again in 3 minutes', +# 's1' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', +# 's2' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', +# 'DEFAULT' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', # s3 +# 's4' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', +# 's5' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', +# 's6' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', +# 's7' => 'MediaWiki is in read-only mode for maintenance. Please try again in few minutes', ], ]; -- To view, visit https://gerrit.wikimedia.org/r/347992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3c6cd0cdd93c54aec2896725ebae0accbfede35 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Volans ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Log only infoboxes which are not a direct children of lead s...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347973 )
Change subject: Log only infoboxes which are not a direct children of lead
section
..
Log only infoboxes which are not a direct children of lead section
Changes:
- fixed xPath selector
Bug: T149884
Change-Id: Ib0fa44e997954f3f7d7a144fe0a8f734d65d97d2
---
M includes/MobileFormatter.php
M tests/phpunit/MobileFormatterTest.php
2 files changed, 44 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 7644c70..2171d3d 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -263,7 +263,8 @@
* @param DOMXPath $xPath
*/
private function logInfoboxesWrappedInContainers( $leadSectionBody,
DOMXPath $xPath ) {
- $infoboxes = $xPath->query(
'.//table[contains(@class,"infobox")]', $leadSectionBody );
+ $infoboxes = $xPath->query(
'./*//table[contains(@class,"infobox")]', $leadSectionBody );
+
if ( $infoboxes->length > 0 ) {
\MediaWiki\Logger\LoggerFactory::getInstance( 'mobile'
)->info(
"Found infobox wrapped with container on
{$this->title} (rev:{$this->revId})"
diff --git a/tests/phpunit/MobileFormatterTest.php
b/tests/phpunit/MobileFormatterTest.php
index 174ce23..8cbb2f2 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -820,16 +820,15 @@
/**
* @see https://phabricator.wikimedia.org/T149884
+* @dataProvider
provideLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped
* @covers MobileFormatter::filterContent
+* @param string $input
*/
- public function testLoggingOfInfoboxesBeingWrappedInContainers() {
+ public function
testLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped( $input ) {
$this->setMwGlobals( [
'wgMFLogWrappedInfoboxes' => true
] );
- $input =
- 'infobox' .
- 'paragraph 1';
$title = 'Special:T149884';
$formatter = new MobileFormatter( MobileFormatter::wrapHTML(
$input ),
@@ -849,4 +848,43 @@
$this->setLogger( 'mobile', $loggerMock );
$formatter->filterContent( false, false, false, true );
}
+
+ public function
provideLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped() {
+ $box = 'infobox';
+
+ return [
+ // wrapped once
+ [ "$box" ],
+ // wrapped twice
+ [ "$box" ],
+ // wrapped inside different infobox
+ [ "$box" ],
+ // wrapped multiple times
+ [
"Test$box" ]
+ ];
+ }
+
+ /**
+* @see https://phabricator.wikimedia.org/T149884
+* @covers MobileFormatter::filterContent
+*/
+ public function
testLoggingOfInfoboxesBeingWrappedInContainersWhenNotWrapped() {
+ $this->setMwGlobals( [
+ 'wgMFLogWrappedInfoboxes' => true
+ ] );
+
+ $input = 'infobox';
+ $title = 'Special:T149884';
+
+ $formatter = new MobileFormatter( MobileFormatter::wrapHTML(
$input ),
+ Title::newFromText( $title ) );
+ $formatter->enableExpandableSections();
+
+ $loggerMock = $this->getMock( \Psr\Log\LoggerInterface::class );
+ $loggerMock->expects( $this->never() )
+ ->method( 'debug' );
+
+ $this->setLogger( 'mobile', $loggerMock );
+ $formatter->filterContent( false, false, false, true );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/347973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0fa44e997954f3f7d7a144fe0a8f734d65d97d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Pmiazga
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Changing cookie name to match cookie naming conventions
Kaldari has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347991 )
Change subject: Changing cookie name to match cookie naming conventions
..
Changing cookie name to match cookie naming conventions
We typically do extensionname_blah, see CentralNotice and
CentralAuth cookies.
Also, "logins" is more accurate than "login" as it can store
multiple user login records (default is 6).
Change-Id: I1e20fc2bbc713613cfa27cf37fff371dbb0be25e
---
M LoginNotify_body.php
M tests/phpunit/LoginNotifyTests.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/91/347991/1
diff --git a/LoginNotify_body.php b/LoginNotify_body.php
index b8edee6..4e473bd 100644
--- a/LoginNotify_body.php
+++ b/LoginNotify_body.php
@@ -17,7 +17,7 @@
*/
class LoginNotify implements LoggerAwareInterface {
- const COOKIE_NAME = 'mw_prevLogin';
+ const COOKIE_NAME = 'loginnotify_prevlogins';
const NO_INFO_AVAILABLE = 2;
/** @var BagOStuff */
diff --git a/tests/phpunit/LoginNotifyTests.php
b/tests/phpunit/LoginNotifyTests.php
index a12fd4d..3438569 100644
--- a/tests/phpunit/LoginNotifyTests.php
+++ b/tests/phpunit/LoginNotifyTests.php
@@ -115,7 +115,7 @@
$res1 = $this->inst->getPrevLoginCookie( $req );
$this->assertEquals( '', $res1, "no cookie set" );
- $req->setCookie( 'mw_prevLogin', 'foo', '' );
+ $req->setCookie( 'loginnotify_prevlogins', 'foo', '' );
$res2 = $this->inst->getPrevLoginCookie( $req );
$this->assertEquals( 'foo', $res2, "get dummy cookie" );
}
--
To view, visit https://gerrit.wikimedia.org/r/347991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e20fc2bbc713613cfa27cf37fff371dbb0be25e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Kaldari
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Ensure logo preload transforms urls if needed
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347970 )
Change subject: Ensure logo preload transforms urls if needed
..
Ensure logo preload transforms urls if needed
Follows-up 5f55e9c9c2a24.
If the logo url is from within /w, then ResourceLoaderSkinModule
will (as it should) apply a file hash query to it.
The preloader didn't do that, so it specified the wrong url.
Refactored SkinModule to make this logic re-usable.
Bug: T100999
Change-Id: I1ba11f7c70d1a725ad72754fee4a3f33c2a4c1be
---
M includes/OutputPage.php
M includes/resourceloader/ResourceLoaderSkinModule.php
M tests/phpunit/includes/OutputPageTest.php
3 files changed, 73 insertions(+), 31 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index df49bf6..5c05ad7 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -4005,29 +4005,22 @@
* @since 1.26
*/
protected function addLogoPreloadLinkHeaders() {
- $logo = $this->getConfig()->get( 'Logo' ); // wgLogo
- $logoHD = $this->getConfig()->get( 'LogoHD' ); // wgLogoHD
+ $logo = ResourceLoaderSkinModule::getLogo( $this->getConfig() );
$tags = [];
$logosPerDppx = [];
$logos = [];
- $logosPerDppx['1.0'] = $logo;
-
- if ( !$logoHD ) {
+ if ( !is_array( $logo ) ) {
// No media queries required if we only have one variant
$this->addLinkHeader( '<' . $logo .
'>;rel=preload;as=image' );
return;
}
- foreach ( $logoHD as $dppx => $src ) {
- // Only 1.5x and 2x are supported
- // Note: Keep in sync with ResourceLoaderSkinModule
- if ( in_array( $dppx, [ '1.5x', '2x' ] ) ) {
- // LogoHD uses a string in this format: "1.5x"
- $dppx = substr( $dppx, 0, -1 );
- $logosPerDppx[$dppx] = $src;
- }
+ foreach ( $logo as $dppx => $src ) {
+ // Keys are in this format: "1.5x"
+ $dppx = substr( $dppx, 0, -1 );
+ $logosPerDppx[$dppx] = $src;
}
// Because PHP can't have floats as array keys
diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php
b/includes/resourceloader/ResourceLoaderSkinModule.php
index 7d37944..5740925 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -28,46 +28,78 @@
* @return array
*/
public function getStyles( ResourceLoaderContext $context ) {
- $conf = $this->getConfig();
- $logo = $conf->get( 'Logo' );
- $logoHD = $conf->get( 'LogoHD' );
-
- $logo1 = OutputPage::transformResourcePath( $conf, $logo );
- $logo15 = OutputPage::transformResourcePath( $conf,
$logoHD['1.5x'] );
- $logo2 = OutputPage::transformResourcePath( $conf,
$logoHD['2x'] );
-
+ $logo = $this->getLogo( $this->getConfig() );
$styles = parent::getStyles( $context );
+
+ $default = !is_array( $logo ) ? $logo : $logo['1x'];
$styles['all'][] = '.mw-wiki-logo { background-image: ' .
- CSSMin::buildUrlValue( $logo1 ) .
- '; }';
- // Only 1.5x and 2x are supported
- // Note: Keep in sync with
OutputPage::addLogoPreloadLinkHeaders()
- if ( $logoHD ) {
- if ( isset( $logoHD['1.5x'] ) ) {
+ CSSMin::buildUrlValue( $default ) .
+ '; }';
+
+ if ( is_array( $logo ) ) {
+ if ( isset( $logo['1.5x'] ) ) {
$styles[
'(-webkit-min-device-pixel-ratio: 1.5),
' .
'(min--moz-device-pixel-ratio: 1.5), ' .
'(min-resolution: 1.5dppx), ' .
'(min-resolution: 144dpi)'
][] = '.mw-wiki-logo { background-image: ' .
- CSSMin::buildUrlValue( $logo15 ) . ';' .
+ CSSMin::buildUrlValue( $logo['1.5x'] ) . ';' .
'background-size: 135px auto; }';
}
- if ( isset( $logoHD['2x'] ) ) {
+ if ( isset( $logo['2x'] ) ) {
$styles
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[wmf/1.29.0-wmf.20]: Log only infoboxes which are not a direct children of lead s...
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347990 )
Change subject: Log only infoboxes which are not a direct children of lead
section
..
Log only infoboxes which are not a direct children of lead section
Changes:
- fixed xPath selector
Bug: T149884
Change-Id: Ib0fa44e997954f3f7d7a144fe0a8f734d65d97d2
---
M includes/MobileFormatter.php
M tests/phpunit/MobileFormatterTest.php
2 files changed, 44 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/90/347990/1
diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 7644c70..2171d3d 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -263,7 +263,8 @@
* @param DOMXPath $xPath
*/
private function logInfoboxesWrappedInContainers( $leadSectionBody,
DOMXPath $xPath ) {
- $infoboxes = $xPath->query(
'.//table[contains(@class,"infobox")]', $leadSectionBody );
+ $infoboxes = $xPath->query(
'./*//table[contains(@class,"infobox")]', $leadSectionBody );
+
if ( $infoboxes->length > 0 ) {
\MediaWiki\Logger\LoggerFactory::getInstance( 'mobile'
)->info(
"Found infobox wrapped with container on
{$this->title} (rev:{$this->revId})"
diff --git a/tests/phpunit/MobileFormatterTest.php
b/tests/phpunit/MobileFormatterTest.php
index 174ce23..8cbb2f2 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -820,16 +820,15 @@
/**
* @see https://phabricator.wikimedia.org/T149884
+* @dataProvider
provideLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped
* @covers MobileFormatter::filterContent
+* @param string $input
*/
- public function testLoggingOfInfoboxesBeingWrappedInContainers() {
+ public function
testLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped( $input ) {
$this->setMwGlobals( [
'wgMFLogWrappedInfoboxes' => true
] );
- $input =
- 'infobox' .
- 'paragraph 1';
$title = 'Special:T149884';
$formatter = new MobileFormatter( MobileFormatter::wrapHTML(
$input ),
@@ -849,4 +848,43 @@
$this->setLogger( 'mobile', $loggerMock );
$formatter->filterContent( false, false, false, true );
}
+
+ public function
provideLoggingOfInfoboxesBeingWrappedInContainersWhenWrapped() {
+ $box = 'infobox';
+
+ return [
+ // wrapped once
+ [ "$box" ],
+ // wrapped twice
+ [ "$box" ],
+ // wrapped inside different infobox
+ [ "$box" ],
+ // wrapped multiple times
+ [
"Test$box" ]
+ ];
+ }
+
+ /**
+* @see https://phabricator.wikimedia.org/T149884
+* @covers MobileFormatter::filterContent
+*/
+ public function
testLoggingOfInfoboxesBeingWrappedInContainersWhenNotWrapped() {
+ $this->setMwGlobals( [
+ 'wgMFLogWrappedInfoboxes' => true
+ ] );
+
+ $input = 'infobox';
+ $title = 'Special:T149884';
+
+ $formatter = new MobileFormatter( MobileFormatter::wrapHTML(
$input ),
+ Title::newFromText( $title ) );
+ $formatter->enableExpandableSections();
+
+ $loggerMock = $this->getMock( \Psr\Log\LoggerInterface::class );
+ $loggerMock->expects( $this->never() )
+ ->method( 'debug' );
+
+ $this->setLogger( 'mobile', $loggerMock );
+ $formatter->filterContent( false, false, false, true );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/347990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0fa44e997954f3f7d7a144fe0a8f734d65d97d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.29.0-wmf.20
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Pmiazga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RC Filters: Disable defaults for legacy filters in structure...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346548 )
Change subject: RC Filters: Disable defaults for legacy filters in structured UI
..
RC Filters: Disable defaults for legacy filters in structured UI
Some legacy filters are replaced in structured UI by new filters.
It's important that their default value doesn't cause them
to filter the results when they are not even visible to the
user.
Bug: T162158
Change-Id: I3ff09164bbc0d14283302aa37bdee2c7ef9f5eb3
---
M includes/changes/ChangesListBooleanFilter.php
M includes/specialpage/ChangesListSpecialPage.php
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/changes/ChangesListBooleanFilter.php
b/includes/changes/ChangesListBooleanFilter.php
index 4117a11..851d173 100644
--- a/includes/changes/ChangesListBooleanFilter.php
+++ b/includes/changes/ChangesListBooleanFilter.php
@@ -136,10 +136,15 @@
}
/**
+* Get the default value
+*
+* @param bool $structuredUI Are we currently showing the structured UI
* @return bool|null Default value
*/
- public function getDefault() {
- return $this->defaultValue;
+ public function getDefault( $structuredUI = false ) {
+ return $this->isReplacedInStructuredUi && $structuredUI ?
+ false :
+ $this->defaultValue;
}
/**
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index ad9a248..d9472af 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -707,6 +707,7 @@
public function getDefaultOptions() {
$config = $this->getConfig();
$opts = new FormOptions();
+ $structuredUI = $this->getUser()->getOption(
'rcenhancedfilters' );
// Add all filters
foreach ( $this->filterGroups as $filterGroup ) {
@@ -716,7 +717,7 @@
$opts->add( $filterGroup->getName(),
$filterGroup->getDefault() );
} else {
foreach ( $filterGroup->getFilters() as $filter
) {
- $opts->add( $filter->getName(),
$filter->getDefault() );
+ $opts->add( $filter->getName(),
$filter->getDefault( $structuredUI ) );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/346548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ff09164bbc0d14283302aa37bdee2c7ef9f5eb3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson
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] labs/striker[master]: Implement Tool Labs membership application and processing
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347392 )
Change subject: Implement Tool Labs membership application and processing
..
Implement Tool Labs membership application and processing
* Membership request form
* List of membership requests
* Admin interface for approving/denying requests
* Leave message on user's talk page after approval
Things needed still for a robust system:
* notification to admins when new request is posted
* moderation/suppression of request details for abuse
* UI link to request queue
Bug: T162508
Change-Id: I6d5fa4b62f7bb71a025da4e90c2b290cea57c889
---
M requirements.txt
M static/css/site.css
M striker/mediawiki.py
A striker/openstack.py
M striker/settings.py
M striker/striker.ini
M striker/templates/goals/TOOL_MEMBER.html
M striker/templates/tools/index.html
A striker/templates/tools/membership.html
A striker/templates/tools/membership/apply.html
A striker/templates/tools/membership/status.html
M striker/tools/admin.py
M striker/tools/forms.py
A striker/tools/migrations/0003_accessrequest.py
M striker/tools/models.py
M striker/tools/urls.py
M striker/tools/views.py
17 files changed, 555 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt
index 1e43579..fdaa877 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,6 +19,7 @@
pycparser>=2.14 # BSD
PyJWT>=1.4.0 # MIT
pyldap>=2.4.25.1 # Python style
+python-keystoneclient>=3.10.0 # Apache 2.0
python-logstash>=0.4.6 # MIT
python-memcached>=1.58 # Python style
requests>=2.10.0 # Apache 2.0
diff --git a/static/css/site.css b/static/css/site.css
index e34ce18..f74bf6c 100644
--- a/static/css/site.css
+++ b/static/css/site.css
@@ -121,3 +121,26 @@
background-color:#5cb85c;
border-color:#4cae4c;
}
+.sortable {
+ color:inherit;
+ display:block;
+ position:relative;
+ padding-right:10px;
+}
+.sorted-asc:after,
+.sorted-desc:after {
+ content:' ';
+ position:absolute;
+ width:10px;
+ height:10px;
+ right:0;
+ border:8px solid transparent;
+}
+.sorted-asc:after {
+ border-bottom-color:#333;
+ bottom:25%;
+}
+.sorted-desc:after {
+ border-top-color:#333;
+ top:25%;
+}
diff --git a/striker/mediawiki.py b/striker/mediawiki.py
index 553a016..c8ef260 100644
--- a/striker/mediawiki.py
+++ b/striker/mediawiki.py
@@ -144,3 +144,14 @@
token=token
)
return result['oathvalidate']
+
+def get_page(self, title, follow_redirects=True):
+"""Get a Page object."""
+page = self.site.Pages[title]
+while follow_redirects and page.redirect:
+page = next(page.links())
+return page
+
+def user_talk_page(self, username):
+"""Get a user's talk page."""
+return self.get_page('User_talk:{}'.format(username))
diff --git a/striker/openstack.py b/striker/openstack.py
new file mode 100644
index 000..c7d4a70
--- /dev/null
+++ b/striker/openstack.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2017 Wikimedia Foundation and contributors.
+# All Rights Reserved.
+#
+# This file is part of Striker.
+#
+# Striker is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Striker is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Striker. If not, see
[MediaWiki-commits] [Gerrit] labs/striker[master]: Make Tool model field naming match LDAP attribute naming
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347391 )
Change subject: Make Tool model field naming match LDAP attribute naming
..
Make Tool model field naming match LDAP attribute naming
Update field naming used in striker.tools.models.Tool to match LDAP
attribute naming. This convention should make working with LDAP models
easier than remembering some arbitrary remapping of the attribute names.
Change-Id: I0925898edd01b437a1bdac12b77a3c7570793247
---
M striker/tools/migrations/0001_squashed.py
M striker/tools/models.py
M striker/tools/views.py
3 files changed, 19 insertions(+), 17 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/striker/tools/migrations/0001_squashed.py
b/striker/tools/migrations/0001_squashed.py
index 17a5f18..06ed066 100644
--- a/striker/tools/migrations/0001_squashed.py
+++ b/striker/tools/migrations/0001_squashed.py
@@ -10,7 +10,10 @@
class Migration(migrations.Migration):
-replaces = [('tools', '0001_initial'), ('tools',
'0002_auto_20160531_1653')]
+replaces = [
+('tools', '0001_initial'),
+('tools', '0002_auto_20160531_1653')
+]
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
@@ -43,9 +46,9 @@
name='Tool',
fields=[
('dn', models.CharField(max_length=200)),
-('group_name', ldapdb.models.fields.CharField(max_length=200,
serialize=False, primary_key=True, db_column='cn')),
-('gid', ldapdb.models.fields.IntegerField(unique=True,
db_column='gidNumber')),
-('maintainer_ids',
ldapdb.models.fields.ListField(db_column='member')),
+('cn', ldapdb.models.fields.CharField(max_length=200,
serialize=False, primary_key=True, db_column='cn')),
+('gid_number', ldapdb.models.fields.IntegerField(unique=True,
db_column='gidNumber')),
+('members',
ldapdb.models.fields.ListField(db_column='member')),
],
options={
'abstract': False,
diff --git a/striker/tools/models.py b/striker/tools/models.py
index bba5187..fd6f6aa 100644
--- a/striker/tools/models.py
+++ b/striker/tools/models.py
@@ -41,7 +41,7 @@
class ToolManager(models.Manager):
def get_queryset(self):
return super(ToolManager, self).get_queryset().filter(
-group_name__startswith='tools.')
+cn__startswith='tools.')
class Tool(ldapdb.models.Model):
@@ -51,24 +51,24 @@
objects = ToolManager()
-group_name = fields.CharField(
+cn = fields.CharField(
db_column='cn', max_length=200, primary_key=True)
-gid = fields.IntegerField(db_column='gidNumber', unique=True)
-maintainer_ids = fields.ListField(db_column='member')
+gid_number = fields.IntegerField(db_column='gidNumber', unique=True)
+members = fields.ListField(db_column='member')
@property
def name(self):
-return self.group_name[6:]
+return self.cn[6:]
@name.setter
def name(self, value):
-self.group_name = 'tools.{0!s}'.format(value)
+self.cn = 'tools.{0!s}'.format(value)
def maintainers(self):
# OMG, this is horrible. You can't search LDAP by dn.
return Maintainer.objects.filter(
username__in=(
-dn.split(',')[0].split('=')[1] for dn in self.maintainer_ids))
+dn.split(',')[0].split('=')[1] for dn in self.members))
def __str__(self):
return self.name
diff --git a/striker/tools/views.py b/striker/tools/views.py
index 6150d4e..aa147b5 100644
--- a/striker/tools/views.py
+++ b/striker/tools/views.py
@@ -48,8 +48,7 @@
if 'tool' in kwargs:
name = kwargs['tool']
try:
-kwargs['tool'] = Tool.objects.get(
-group_name='tools.{0}'.format(name))
+kwargs['tool'] = Tool.objects.get(cn='tools.{0}'.format(name))
except ObjectDoesNotExist:
req = args[0]
messages.error(
@@ -63,7 +62,7 @@
def tool_member(tool, user):
if user.is_anonymous():
return False
-return user.ldap_dn in tool.maintainer_ids
+return user.ldap_dn in tool.members
def index(req):
@@ -74,14 +73,14 @@
if not req.user.is_anonymous():
# TODO: do we need to paginate the user's tools too? Magnus has 60!
ctx['my_tools'] = Tool.objects.filter(
-maintainer_ids__contains=req.user.ldap_dn).order_by('group_name')
+members__contains=req.user.ldap_dn).order_by('cn')
page = req.GET.get('p')
if ctx['query'] == '':
tool_list = Tool.objects.all()
else:
-tool_list = Tool.objects.filter(group_name__icontains=ctx['query'])
-tool_list = tool_list.order_by('group_name')
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Document Education Program task reference
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/347989 ) Change subject: Document Education Program task reference .. Document Education Program task reference Change-Id: I54195acd5dac6a9863db860793efe1179d9f032f --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/89/347989/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 984bbea..bb4286e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16585,7 +16585,7 @@ 'hewiktionary' => true, // T89393 'legalteamwiki' => true, // T64610 'lvwiki' => true, // T89898 - 'mkwiki' => true, + 'mkwiki' => true, // T50262 'nlwiki' => true, // T52574 'ptwiki' => true, // T54870 'ruwiki' => true, // T89588 -- To view, visit https://gerrit.wikimedia.org/r/347989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54195acd5dac6a9863db860793efe1179d9f032f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 80c1a0add8b1161c48c4de9be219e0c1a4ee91f0:
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/347988 ) Change subject: Merging from 80c1a0add8b1161c48c4de9be219e0c1a4ee91f0: .. Merging from 80c1a0add8b1161c48c4de9be219e0c1a4ee91f0: Merge "Preview Item labels in GraphResultBrowserNodeBrowser" Change-Id: I2399a0eb9fdb81148e936b6781da3e4dfbcc8c0d --- M embed.html M i18n/eo.json M i18n/id.json M index.html D js/embed.wdqs.min.2cbb831fb957ffcdd476.js A js/embed.wdqs.min.43d9fcb8b129e425f94e.js A js/wdqs.min.e4e5330759808ac2dc78.js D js/wdqs.min.f5a46c67b5cbc718aa61.js 8 files changed, 17 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy refs/changes/88/347988/1 -- To view, visit https://gerrit.wikimedia.org/r/347988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2399a0eb9fdb81148e936b6781da3e4dfbcc8c0d Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Education Program on it.wikiversity
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/347987 ) Change subject: Enable Education Program on it.wikiversity .. Enable Education Program on it.wikiversity Bug: T162692 Change-Id: Ic8a9871178858e918d22c5d384aa203e92cb81a3 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/87/347987/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 984bbea..6a49ddd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16583,6 +16583,7 @@ 'frwikisource' => true, // T105853 'hewiki' => true, // T50848 'hewiktionary' => true, // T89393 + 'itwikiversity' => true, // T162692 'legalteamwiki' => true, // T64610 'lvwiki' => true, // T89898 'mkwiki' => true, -- To view, visit https://gerrit.wikimedia.org/r/347987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8a9871178858e918d22c5d384aa203e92cb81a3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Make VisualEditor gutter area clickable
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347986 )
Change subject: Make VisualEditor gutter area clickable
..
Make VisualEditor gutter area clickable
Code adapted from VisualEditor's ve.init.mw.DesktopArticleTarget-vector.css.
Bug: T162838
Change-Id: I828b97b060d631d7c86bff308802fb05c3dff781
---
M resources/extensions/VisualEditor.core.less
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless
refs/changes/86/347986/1
diff --git a/resources/extensions/VisualEditor.core.less
b/resources/extensions/VisualEditor.core.less
index 74c5e55..a140fef 100644
--- a/resources/extensions/VisualEditor.core.less
+++ b/resources/extensions/VisualEditor.core.less
@@ -10,6 +10,17 @@
top: @fixed-header-height + @color-height;
}
+ // Make the gutter area clickable (T162838)
+ .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface {
+ margin-left: -@content-padding;
+ margin-right: -@content-padding;
+ }
+ .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface
.ve-ce-documentNode,
+ .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface
.ve-ui-surface-placeholder {
+ padding-left: @content-padding;
+ padding-right: @content-padding;
+ }
+
@media (min-width: @desktop-small-floor) and (max-width:
@desktop-small-width) {
.ve-ui-toolbar {
margin-top: -.5em;
--
To view, visit https://gerrit.wikimedia.org/r/347986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I828b97b060d631d7c86bff308802fb05c3dff781
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Order properties in SpecialListProperties based on numeric id
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347985 )
Change subject: Order properties in SpecialListProperties based on numeric id
..
Order properties in SpecialListProperties based on numeric id
Bug: T158108
Change-Id: Iffda5633a1e5fd10baf1df22cd6978012e9988b4
---
M repo/includes/Specials/SpecialListProperties.php
M repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
2 files changed, 24 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/85/347985/1
diff --git a/repo/includes/Specials/SpecialListProperties.php
b/repo/includes/Specials/SpecialListProperties.php
index d2e928f..3a42014 100644
--- a/repo/includes/Specials/SpecialListProperties.php
+++ b/repo/includes/Specials/SpecialListProperties.php
@@ -218,8 +218,8 @@
$propertyIds = array();
- foreach ( $propertyInfo as $serialization => $info ) {
- $propertyIds[] = new PropertyId( $serialization );
+ foreach ( $propertyInfo as $id ) {
+ $propertyIds[] =
PropertyId::newFromRepositoryAndNumber( '', $id );
}
$this->prefetchingTermLookup->prefetchTerms( $propertyIds );
@@ -228,7 +228,7 @@
}
/**
-* @return array[] An associative array mapping property IDs to info
arrays.
+* @return int[] An array containing numeric ids of properties
*/
private function getPropertyInfo() {
if ( $this->dataType === '' ) {
@@ -239,9 +239,7 @@
);
}
- // NOTE: $propertyInfo uses serialized property IDs as keys!
- ksort( $propertyInfo );
- return $propertyInfo;
+ return $this->orderProperties( $propertyInfo );
}
/**
@@ -258,4 +256,19 @@
return $this->dataTypeFactory->getTypeIds();
}
+ /**
+* @param $propertyInfo
+* @return int[]
+*/
+ private function orderProperties( $propertyInfo ) {
+ $propertiesById = [];
+ foreach ( $propertyInfo as $serialization => $info ) {
+ $id = (int)substr( PropertyId::splitSerialization(
$serialization )[2], 1 );
+ $propertiesById[] = $id;
+ }
+ sort( $propertiesById );
+
+ return $propertiesById;
+ }
+
}
diff --git a/repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
b/repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
index 42207b1..8ecedc9 100644
--- a/repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
+++ b/repo/tests/phpunit/includes/Specials/SpecialListPropertiesTest.php
@@ -47,7 +47,7 @@
private function getPropertyInfoStore() {
$propertyInfoLookup = new MockPropertyInfoLookup( [
'P789' => [ PropertyInfoLookup::KEY_DATA_TYPE =>
'string' ],
- 'P456' => [ PropertyInfoLookup::KEY_DATA_TYPE =>
'wikibase-item' ],
+ 'P45' => [ PropertyInfoLookup::KEY_DATA_TYPE =>
'wikibase-item' ],
'P123' => [ PropertyInfoLookup::KEY_DATA_TYPE =>
'wikibase-item' ],
] );
@@ -134,15 +134,15 @@
$this->assertContains( 'wikibase-listproperties-summary',
$output );
$this->assertContains( 'wikibase-listproperties-legend',
$output );
$this->assertNotContains(
'wikibase-listproperties-invalid-datatype', $output );
- $this->assertRegExp( '/P123.*P456.*P789/', $output ); // order
is relevant
+ $this->assertRegExp( '/P45.*P123.*P789/', $output ); // order
is relevant
}
public function testOffsetAndLimit() {
$request = new \FauxRequest( array( 'limit' => '1', 'offset' =>
'1' ) );
list( $output, ) = $this->executeSpecialPage( '', $request,
'qqx' );
+ $this->assertContains( 'P45', $output );
$this->assertNotContains( 'P123', $output );
- $this->assertContains( 'P456', $output );
$this->assertNotContains( 'P789', $output );
}
@@ -163,8 +163,8 @@
// Use en-gb as language to test language fallback
list( $output, ) = $this->executeSpecialPage( 'wikibase-item',
null, 'en-gb' );
+ $this->assertContains( 'Property with label P45', $output );
$this->assertContains( 'Property with label P123', $output );
- $this->assertContains( 'Property with label P456', $output );
$this->assertNotContains( 'P789', $output );
$this->assertContains( 'lang="en"', $output );
@@ -174,8 +174,8 @@
public function testExecute_string()
