[MediaWiki-commits] [Gerrit] mediawiki: add dsh entries for codfw - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199230
Change subject: mediawiki: add dsh entries for codfw
..
mediawiki: add dsh entries for codfw
Change-Id: Iebb705e5b5ecd825a2ec654facbf89aa04ab6cca
---
M manifests/role/mediawiki.pp
M modules/dsh/files/group/mediawiki-installation
2 files changed, 198 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/199230/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index fd20275..4bd89e2 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -49,12 +49,10 @@
pools = $nutcracker_pools,
}
-if $::site == 'eqiad' {
-monitoring::service { 'mediawiki-installation DSH group':
-description = 'mediawiki-installation DSH group',
-check_command = 'check_dsh_groups!mediawiki-installation',
-normal_check_interval = 60,
-}
+monitoring::service { 'mediawiki-installation DSH group':
+description = 'mediawiki-installation DSH group',
+check_command = 'check_dsh_groups!mediawiki-installation',
+normal_check_interval = 60,
}
$scap_proxies = hiera('dsh::config::scap_proxies',[])
diff --git a/modules/dsh/files/group/mediawiki-installation
b/modules/dsh/files/group/mediawiki-installation
index 6373cbc..5f910df 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -266,3 +266,197 @@
mw1256
mw1257
mw1258
+
+#Codfw
+mw2001
+mw2002
+mw2003
+mw2004
+mw2005
+mw2006
+mw2007
+mw2008
+mw2009
+mw2010
+mw2011
+mw2012
+mw2013
+mw2014
+mw2015
+mw2016
+mw2017
+mw2018
+mw2019
+mw2020
+mw2021
+mw2022
+mw2023
+mw2024
+mw2025
+mw2026
+mw2027
+mw2028
+mw2029
+mw2030
+mw2031
+mw2032
+mw2033
+mw2034
+mw2035
+mw2036
+mw2037
+mw2038
+mw2039
+mw2040
+mw2041
+mw2042
+mw2043
+mw2044
+mw2045
+mw2046
+mw2047
+mw2048
+mw2049
+#mw2050
+mw2051
+mw2052
+mw2053
+mw2054
+mw2055
+mw2056
+mw2057
+mw2058
+mw2059
+mw2060
+mw2061
+mw2062
+mw2063
+mw2064
+mw2065
+mw2066
+mw2067
+mw2068
+mw2069
+mw2070
+mw2071
+mw2072
+mw2073
+mw2074
+mw2075
+mw2076
+mw2077
+mw2078
+mw2079
+mw2080
+mw2081
+mw2082
+mw2083
+mw2084
+mw2085
+mw2086
+mw2087
+#mw2088
+mw2089
+mw2090
+mw2091
+mw2092
+mw2093
+mw2094
+mw2095
+mw2096
+mw2097
+mw2098
+mw2099
+mw2100
+mw2101
+mw2102
+mw2103
+mw2104
+mw2105
+mw2106
+mw2107
+mw2108
+mw2109
+mw2110
+mw2111
+mw2112
+mw2113
+mw2114
+mw2115
+mw2116
+mw2117
+mw2118
+mw2119
+mw2120
+# mw 2121-2134 are being installed now
+mw2135
+mw2136
+mw2137
+mw2138
+mw2139
+mw2140
+mw2141
+mw2142
+mw2143
+mw2144
+mw2145
+mw2146
+mw2147
+mw2149
+mw2150
+mw2151
+mw2152
+mw2153
+mw2154
+mw2155
+mw2156
+mw2157
+mw2158
+mw2159
+mw2160
+mw2161
+mw2162
+mw2163
+mw2164
+mw2165
+mw2166
+mw2167
+mw2168
+mw2169
+mw2170
+mw2171
+mw2172
+mw2173
+mw2174
+mw2175
+mw2176
+mw2177
+mw2178
+#mw2179
+mw2180
+mw2181
+mw2182
+mw2183
+mw2185
+mw2186
+mw2187
+mw2188
+mw2189
+mw2190
+mw2191
+mw2192
+mw2193
+mw2194
+#mw2195
+mw2196
+mw2197
+mw2198
+mw2199
+mw2201
+mw2202
+mw2203
+mw2204
+mw2205
+mw2206
+mw2207
+#mw2208-2214 will be installed
--
To view, visit https://gerrit.wikimedia.org/r/199230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebb705e5b5ecd825a2ec654facbf89aa04ab6cca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Copy content links (edit, history etc) to the sidebar - change (mediawiki...LivingStyleGuide)
Werdna has submitted this change and it was merged.
Change subject: Copy content links (edit, history etc) to the sidebar
..
Copy content links (edit, history etc) to the sidebar
Change-Id: Iebda84da6dbedce123276a24770fc06a8618be3b
---
A resources/edit.svg
A resources/history.svg
M resources/master.less
A resources/talk.svg
A resources/view.svg
M templates/Skin.php
M templates/sidebar.template
7 files changed, 122 insertions(+), 1 deletion(-)
Approvals:
Werdna: Verified; Looks good to me, approved
diff --git a/resources/edit.svg b/resources/edit.svg
new file mode 100644
index 000..47a2e27
--- /dev/null
+++ b/resources/edit.svg
@@ -0,0 +1,11 @@
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+width=24px height=24px viewBox=0 0 24 24 enable-background=new
0 0 24 24 xml:space=preserve
+g transform=matrix(1 0 0 -1 0 1638)
+ path fill=#fff
d=M4.289,1623.035c0.203-0.141,0.508-0.414,0.914-0.82l11.766,10.641c-0.211,0.375-0.527,0.633-0.949,0.773L4.289,1623.035z
+
M3.023,1623.516l13.043,11.695c0.977-0.164,1.84-0.648,2.59-1.453s1.152-1.703,1.207-2.695L6.809,1619.32l-4.828-0.516
+ L3.023,1623.516z/
+/g
+/svg
diff --git a/resources/history.svg b/resources/history.svg
new file mode 100644
index 000..9d740b3
--- /dev/null
+++ b/resources/history.svg
@@ -0,0 +1,14 @@
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+width=24px height=24px viewBox=0 0 24 24 enable-background=new
0 0 24 24 xml:space=preserve
+g transform=matrix(1 0 0 -1 0 1638)
+ path fill=#fff
d=M11.555,1632.387H9.586v-6.586l4.477-2.578l0.141,0.246c0.234,0.398,0.289,0.82,0.164,1.266s-0.383,0.785-0.773,1.02
+ l-2.039,1.195V1632.387z
M10.758,1634.977c1.461,0,2.812-0.359,4.055-1.078c1.25-0.719,2.234-1.703,2.953-2.953
+
c0.719-1.242,1.078-2.594,1.078-4.055s-0.359-2.812-1.078-4.055c-0.719-1.25-1.703-2.234-2.953-2.953
+
c-1.242-0.719-2.594-1.078-4.055-1.078c-1.453,0-2.805,0.359-4.055,1.078s-2.234,1.703-2.953,2.953
+
c-0.719,1.242-1.082,2.594-1.09,4.055c0.008,1.461,0.371,2.812,1.09,4.055c0.719,1.25,1.703,2.234,2.953,2.953
+ S9.305,1634.977,10.758,1634.977z/
+/g
+/svg
diff --git a/resources/master.less b/resources/master.less
index 96193cf..51125cc 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -105,6 +105,7 @@
z-index: 0;
background-color: #2B5ECF;
color: #fff;
+ padding: 50px;
ul {
list-style: none;
@@ -119,6 +120,41 @@
}
}
}
+
+ h1 {
+ margin: 0;
+ padding: 0;
+ font-size: 2em;
+ }
+
+ ul.content-links {
+ padding: 0;
+ margin-top: 30px;
+
+ li {
+ padding: 5px 0;
+
+ a {
+ display: inline-block;
+ padding: 3px 0 3px 70px;
+ font-size: 0.8em;
+ background-repeat: no-repeat;
+ background-position: center left;
+ }
+
+ #ca-view {
+ background-image: url(view.svg);
+ }
+
+ #ca-edit {
+ background-image: url(edit.svg);
+ }
+
+ #ca-history {
+ background-image: url(history.svg);
+ }
+ }
+ }
}
/* Offscreen Navigation */
diff --git a/resources/talk.svg b/resources/talk.svg
new file mode 100644
index 000..19f5fcc
--- /dev/null
+++ b/resources/talk.svg
@@ -0,0 +1,10 @@
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+width=24px height=24px viewBox=0 0 24 24 enable-background=new
0 0 24 24 xml:space=preserve
+g transform=matrix(1 0 0 -1 0 1638)
+ path
[MediaWiki-commits] [Gerrit] Add link to talk page - change (mediawiki...LivingStyleGuide)
jenkins-bot has submitted this change and it was merged.
Change subject: Add link to talk page
..
Add link to talk page
Change-Id: I196eb8780ed6dd1639c1c507a493b780152eed64
---
M resources/master.less
M resources/talk.svg
M templates/Skin.php
M templates/sidebar.template
4 files changed, 25 insertions(+), 3 deletions(-)
Approvals:
Werdna: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/master.less b/resources/master.less
index 191886b..2103e3b 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -153,6 +153,10 @@
#ca-history {
background-image: url(history.svg);
}
+
+ #ca-talk {
+ background-image: url(talk.svg);
+ }
}
}
}
diff --git a/resources/talk.svg b/resources/talk.svg
index 19f5fcc..d447346 100644
--- a/resources/talk.svg
+++ b/resources/talk.svg
@@ -4,7 +4,7 @@
svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
width=24px height=24px viewBox=0 0 24 24 enable-background=new
0 0 24 24 xml:space=preserve
g transform=matrix(1 0 0 -1 0 1638)
- path
d=M7.957,1629.797h12.492v-8.555l2.18-2.438H9.34c-0.641,0-1.066,0.289-1.277,0.867c-0.07,0.195-0.105,0.367-0.105,0.516
+ path fill=#fff
d=M7.957,1629.797h12.492v-8.555l2.18-2.438H9.34c-0.641,0-1.066,0.289-1.277,0.867c-0.07,0.195-0.105,0.367-0.105,0.516
V1629.797z
M2.695,1634.473h12.516v-3.574H6.844v-7.418h-6.34l2.191,2.449V1634.473z/
/g
/svg
diff --git a/templates/Skin.php b/templates/Skin.php
index b3d8d20..5d0f912 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -210,7 +210,16 @@
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')), ENT_QUOTES,
'UTF-8').'
/a
/li
-';}).'
+';}).' li
+ a
+
href='.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('content_navigation','namespaces','talk','href')), ENT_QUOTES, 'UTF-8').'
+
class='.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('content_navigation','namespaces','talk','class')), ENT_QUOTES,
'UTF-8').'
+
id='.htmlentities((string)$cx['funcs']['v']($cx, $in,
array('content_navigation','namespaces','talk','id')), ENT_QUOTES, 'UTF-8').'
+
+ '.htmlentities((string)$cx['funcs']['v']($cx,
$in, array('content_navigation','namespaces','talk','text')), ENT_QUOTES,
'UTF-8').'
+ /a
+
+ /li
/ul
h2 id=navigation-headerNavigation/h2
@@ -244,7 +253,7 @@
/div
ul class=nav navbar-nav navbar-right
- lia href=#Desktop/a/li
+ lia rhref=#Desktop/a/li
lia href=#Mobile/a/li
/ul
/nav
diff --git a/templates/sidebar.template b/templates/sidebar.template
index 18ddd5f..d80925e 100644
--- a/templates/sidebar.template
+++ b/templates/sidebar.template
@@ -12,7 +12,16 @@
/a
/li
{{/each}}
+ li
+ a
+ href={{content_navigation.namespaces.talk.href}}
+ class={{content_navigation.namespaces.talk.class}}
+ id={{content_navigation.namespaces.talk.id}}
+
+ {{content_navigation.namespaces.talk.text}}
+ /a
+ /li
/ul
h2 id=navigation-headerNavigation/h2
--
To view, visit https://gerrit.wikimedia.org/r/197502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I196eb8780ed6dd1639c1c507a493b780152eed64
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/LivingStyleGuide
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Werdna agarr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] servermon - Enable HSTS max-age=7 days - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: servermon - Enable HSTS max-age=7 days
..
servermon - Enable HSTS max-age=7 days
https://servermon.wikimedia.org is HTTPS only.
Bug: T40516
Change-Id: I9e2d7a00d76991805ddc456c1a3d6a4874615ca2
---
M templates/apache/sites/servermon.wikimedia.org.erb
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Checked
Dzahn: Looks good to me, but someone else must approve
diff --git a/templates/apache/sites/servermon.wikimedia.org.erb
b/templates/apache/sites/servermon.wikimedia.org.erb
index 12b3ae6..35e1905 100644
--- a/templates/apache/sites/servermon.wikimedia.org.erb
+++ b/templates/apache/sites/servermon.wikimedia.org.erb
@@ -11,6 +11,7 @@
RewriteCond %{REQUEST_URI} !^/status$
RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI}
[R=301,E=ProtoRedirect]
Header always merge Vary X-Forwarded-Proto env=ProtoRedirect
+Header set Strict-Transport-Security max-age=604800
DocumentRoot /srv/nonexistent
Directory /
--
To view, visit https://gerrit.wikimedia.org/r/199134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e2d7a00d76991805ddc456c1a3d6a4874615ca2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chmarkine chmark...@hotmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dsh: add more codfw servers - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/199240 Change subject: dsh: add more codfw servers .. dsh: add more codfw servers Change-Id: I1aa654a58f1717b4a44b09d22ae55ae3c52df9b5 --- M modules/dsh/files/group/mediawiki-installation 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/199240/1 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 5f910df..befd1c5 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -388,7 +388,20 @@ mw2118 mw2119 mw2120 -# mw 2121-2134 are being installed now +mw2121 +mw2122 +mw2123 +mw2124 +mw2125 +mw2126 +mw2127 +mw2128 +mw2129 +mw2130 +mw2131 +mw2132 +mw2133 +mw2134 mw2135 mw2136 mw2137 @@ -452,6 +465,7 @@ mw2197 mw2198 mw2199 +#mw2200 mw2201 mw2202 mw2203 -- To view, visit https://gerrit.wikimedia.org/r/199240 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1aa654a58f1717b4a44b09d22ae55ae3c52df9b5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...MultimediaViewer)
Raimond Spekking has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I1d0cf004f0ac9882f2d087c4f29741171edab381 --- M i18n/be-tarask.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved Legoktm: Looks good to me, approved Raimond Spekking: Verified; Looks good to me, approved diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json index bfcae80..272c225 100644 --- a/i18n/be-tarask.json +++ b/i18n/be-tarask.json @@ -13,6 +13,7 @@ multimediaviewer-help-mmv: Даведка, multimediaviewer-view-expanded: Адкрыць у мэдыяпраглядальніку, multimediaviewer-close-popup-text: Закрыць гэты інструмэнт (Esc), + multimediaviewer-fullscreen-popup-text: Паказаць на ўвесь экран, multimediaviewer-options-dialog-header: Адключыць мэдыяпраглядальнік?, multimediaviewer-options-text-header: Адключыць гэтую функцыю прагляду для ўсіх файлаў., multimediaviewer-options-text-body: Вы можаце потым уключыць яго на старонцы зьвестак пра файл., -- To view, visit https://gerrit.wikimedia.org/r/198608 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d0cf004f0ac9882f2d087c4f29741171edab381 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't include a node in its own seeds - change (operations...cassandra)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Don't include a node in its own seeds
..
Don't include a node in its own seeds
In multi-node clusters we want to make sure that a new node bootstraps (loads
data from other nodes) fully before accepting requests. While not directly
leading to incorrect query results when using LOCALQUORUM reads, an empty node
joining the cluster before a repair will lead to incorrect query results for
queries with consistency level of ONE.
Bootstrapping is disabled if the node is listed among its own seeds. Hence,
this patch ensures that we don't list a node among its seeds in multi-node
clusters.
This also means that multi-node clusters will require manual intervention
during initialization, as none of the nodes will be able to successfully
bootstrap. To initialize a new multi-node cluster, we need to temporarily add
a node among its own seeds in order to break the symmetry and allow it to
fully start up. All other nodes will then normally bootstrap from this node.
Bug: T91617
Change-Id: Iaa3bbf07b6053e139dc9483f849f6d4acba1418b
---
M manifests/init.pp
M templates/cassandra.yaml.erb
2 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/init.pp b/manifests/init.pp
index 2ea990d..bb7baa3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -266,8 +266,8 @@
fail('storage_port must be a port number between 1 and 65535')
}
-if (empty($seeds)) {
-fail('seeds must not be empty')
+if (!is_array($seeds) or empty($seeds)) {
+fail('seeds must be an array and not be empty')
}
if (empty($data_file_directories)) {
diff --git a/templates/cassandra.yaml.erb b/templates/cassandra.yaml.erb
index c6c7d84..994bd53 100644
--- a/templates/cassandra.yaml.erb
+++ b/templates/cassandra.yaml.erb
@@ -262,8 +262,14 @@
parameters:
# seeds is actually a comma-delimited list of addresses.
# Ex: ip1,ip2,ip3
- - seeds: %= Array(@seeds).join(',') %
-
+ # Omit own host name / IP in multi-node clusters (see
+ # https://phabricator.wikimedia.org/T91617).
+ % clean_seeds = @seeds.length 1 ? @seeds.select { |x|
+ x != @hostname \
+ x != @ipaddress \
+ x != @fqdn
+ }.join(',') :
@seeds.join(',') %
+ - seeds: %= clean_seeds %
# For workloads with more data than can fit in memory, Cassandra's
# bottleneck will be reads that need to fetch data from
# disk. concurrent_reads should be set to (16 * number_of_drives) in
--
To view, visit https://gerrit.wikimedia.org/r/195483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa3bbf07b6053e139dc9483f849f6d4acba1418b
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet/cassandra
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Eevans eev...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Firewall for Holmium - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Firewall for Holmium
..
Firewall for Holmium
Change-Id: I938807648720b48d1b0742dd7cb76ed58ff5a12d
---
M manifests/role/designate.pp
M manifests/role/labsdns.pp
M manifests/site.pp
3 files changed, 38 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/designate.pp b/manifests/role/designate.pp
index 612b47d..31a6304 100644
--- a/manifests/role/designate.pp
+++ b/manifests/role/designate.pp
@@ -73,4 +73,17 @@
class { 'openstack::designate::service':
designateconfig = $designateconfig,
}
+
+
+# Firewall
+$wikitech = '208.80.154.136'
+$horizon = '208.80.154.147'
+$controller = '208.80.154.18'
+
+# Poke a firewall hole for the designate api
+ferm::rule { 'designate-api':
+rule = saddr (${wikitech} ${horizon} ${controller}) proto tcp dport
(9001) ACCEPT;,
+}
+
+
}
diff --git a/manifests/role/labsdns.pp b/manifests/role/labsdns.pp
index 7254d80..a03132c 100644
--- a/manifests/role/labsdns.pp
+++ b/manifests/role/labsdns.pp
@@ -10,4 +10,28 @@
pdns_recursor = '208.80.154.239',
recursor_ip_range = '10.68.16.0/21',
}
+
+ferm::service { 'udp_dns_rec':
+proto = 'udp',
+port = '53',
+}
+
+ferm::service { 'tcp_dns_rec':
+proto = 'tcp',
+port = '53',
+}
+
+ferm::rule { 'skip_dns_conntrack-out':
+desc = 'Skip DNS outgoing connection tracking',
+table = 'raw',
+chain = 'OUTPUT',
+rule = 'proto udp sport 53 NOTRACK;',
+}
+
+ferm::rule { 'skip_dns_conntrack-in':
+desc = 'Skip DNS incoming connection tracking',
+table = 'raw',
+chain = 'PREROUTING',
+rule = 'proto udp dport 53 NOTRACK;',
+}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index ef01667..de2713c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2534,6 +2534,7 @@
include standard
include admin
+include base::firewall
include role::labsdns
include role::designate::server
}
--
To view, visit https://gerrit.wikimedia.org/r/199258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I938807648720b48d1b0742dd7cb76ed58ff5a12d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] scap: add codfw proxies - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: scap: add codfw proxies .. scap: add codfw proxies For now, we keep all the scap proxies together. Change-Id: Ic96b8a2e4a57c8fe00a6e71b3bbe18632601ff7c --- M hieradata/common/dsh/config.yaml 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, but someone else must approve Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/common/dsh/config.yaml b/hieradata/common/dsh/config.yaml index 859b456..e3ba5cf 100644 --- a/hieradata/common/dsh/config.yaml +++ b/hieradata/common/dsh/config.yaml @@ -1,10 +1,16 @@ # Scap proxy list # scap_proxies: -# - mw1010.eqiad.wmnet # A6 + - mw1010.eqiad.wmnet # A6 - mw1033.eqiad.wmnet # A7 - mw1070.eqiad.wmnet # B6 - mw1097.eqiad.wmnet # B7 - mw1216.eqiad.wmnet # B8 - mw1161.eqiad.wmnet # C6 - mw1201.eqiad.wmnet # D5 + - mw2001.codfw.wmnet # A3 codfw + - mw2041.codfw.wmnet # A4 codfw + - mw2080.codfw.wmnet # B3 codfw + - mw2119.codfw.wmnet # B4 codfw + - mw2148.codfw.wmnet # C3 codfw + - mw2187.codfw.wmnet # C4 codfw -- To view, visit https://gerrit.wikimedia.org/r/197885 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic96b8a2e4a57c8fe00a6e71b3bbe18632601ff7c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lvs: add loadbalancers for appservers, api and rendering - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: lvs: add loadbalancers for appservers, api and rendering
..
lvs: add loadbalancers for appservers, api and rendering
Bug: T92377
Change-Id: I4e76e44ed80304ed7c236678859e0e9158b4afcb
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index e82053a..37b6b44 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -55,6 +55,9 @@
$sip['dns_rec'][$::site],
],
/^(lvs200[36])$/ = [
+$sip['apaches'][$::site],
+$sip['api'][$::site],
+$sip['rendering'][$::site],
$sip['swift'][$::site],
],
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index f2759cd..f1a9703 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -123,12 +123,15 @@
},
'apaches' = {
'eqiad' = 10.2.2.1,
+'codfw' = '10.2.1.1',
},
'rendering' = {
'eqiad' = 10.2.2.21,
+'codfw' = 10.2.1.21,
},
'api' = {
'eqiad' = 10.2.2.22,
+'codfw' = '10.2.1.22',
},
'mobile' = {
'eqiad' = { 'mobilelb' = 208.80.154.236, 'mobilelb6' =
'2620:0:861:ed1a::1:c', 'mobilesvc' = 10.2.2.26},
@@ -508,7 +511,7 @@
apaches = {
'description' = Main MediaWiki application server cluster,
appservers.svc.eqiad.wmnet,
'class' = low-traffic,
-'sites' = [ eqiad ],
+'sites' = [ eqiad, 'codfw' ],
'ip' = $service_ips['apaches'][$::site],
'bgp' = yes,
'depool-threshold' = .9,
@@ -523,7 +526,7 @@
rendering = {
'description' = MediaWiki thumbnail rendering cluster,
rendering.svc.eqiad.wmnet,
'class' = low-traffic,
-'sites' = [ eqiad ],
+'sites' = [ eqiad, 'codfw' ],
'ip' = $service_ips['rendering'][$::site],
'bgp' = yes,
'depool-threshold' = .74,
@@ -538,7 +541,7 @@
api = {
'description' = MediaWiki API cluster, api.svc.eqiad.wmnet,
'class' = low-traffic,
-'sites' = [ eqiad ],
+'sites' = [ eqiad, 'codfw' ],
'ip' = $service_ips['api'][$::site],
'bgp' = yes,
'depool-threshold' = .6,
--
To view, visit https://gerrit.wikimedia.org/r/195899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e76e44ed80304ed7c236678859e0e9158b4afcb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add pool counter config for Translate - change (operations/mediawiki-config)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/199263 Change subject: Add pool counter config for Translate .. Add pool counter config for Translate Bug: T54728 Change-Id: I089a9a7e4924ceddf13d4130e512605c022a0aa7 --- M wmf-config/PoolCounterSettings-common.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/63/199263/1 diff --git a/wmf-config/PoolCounterSettings-common.php b/wmf-config/PoolCounterSettings-common.php index ae8beee..66ff236 100644 --- a/wmf-config/PoolCounterSettings-common.php +++ b/wmf-config/PoolCounterSettings-common.php @@ -52,6 +52,13 @@ 'slots' = 8, 'maxqueue' = 100 ), + 'TranslateFetchTranslators' = array( + 'class' = 'PoolCounter_Client', + 'timeout' = 8, + 'workers' = 2, + 'slots' = 8, + 'maxqueue' = 20, + ), ); require( getRealmSpecificFilename( $wmfConfigDir/PoolCounterSettings.php ) ); -- To view, visit https://gerrit.wikimedia.org/r/199263 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I089a9a7e4924ceddf13d4130e512605c022a0aa7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Firewall for Holmium - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199258
Change subject: Firewall for Holmium
..
Firewall for Holmium
Change-Id: I938807648720b48d1b0742dd7cb76ed58ff5a12d
---
M manifests/role/designate.pp
M manifests/role/labsdns.pp
M manifests/site.pp
3 files changed, 38 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/199258/1
diff --git a/manifests/role/designate.pp b/manifests/role/designate.pp
index 612b47d..31a6304 100644
--- a/manifests/role/designate.pp
+++ b/manifests/role/designate.pp
@@ -73,4 +73,17 @@
class { 'openstack::designate::service':
designateconfig = $designateconfig,
}
+
+
+# Firewall
+$wikitech = '208.80.154.136'
+$horizon = '208.80.154.147'
+$controller = '208.80.154.18'
+
+# Poke a firewall hole for the designate api
+ferm::rule { 'designate-api':
+rule = saddr (${wikitech} ${horizon} ${controller}) proto tcp dport
(9001) ACCEPT;,
+}
+
+
}
diff --git a/manifests/role/labsdns.pp b/manifests/role/labsdns.pp
index 7254d80..a03132c 100644
--- a/manifests/role/labsdns.pp
+++ b/manifests/role/labsdns.pp
@@ -10,4 +10,28 @@
pdns_recursor = '208.80.154.239',
recursor_ip_range = '10.68.16.0/21',
}
+
+ferm::service { 'udp_dns_rec':
+proto = 'udp',
+port = '53',
+}
+
+ferm::service { 'tcp_dns_rec':
+proto = 'tcp',
+port = '53',
+}
+
+ferm::rule { 'skip_dns_conntrack-out':
+desc = 'Skip DNS outgoing connection tracking',
+table = 'raw',
+chain = 'OUTPUT',
+rule = 'proto udp sport 53 NOTRACK;',
+}
+
+ferm::rule { 'skip_dns_conntrack-in':
+desc = 'Skip DNS incoming connection tracking',
+table = 'raw',
+chain = 'PREROUTING',
+rule = 'proto udp dport 53 NOTRACK;',
+}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 2790ee2..bfa97ce 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2532,6 +2532,7 @@
include standard
include admin
+include base::firewall
include role::labsdns
include role::designate::server
}
--
To view, visit https://gerrit.wikimedia.org/r/199258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I938807648720b48d1b0742dd7cb76ed58ff5a12d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cassandra submodule - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/199261 Change subject: Update cassandra submodule .. Update cassandra submodule To have the the Iaa3bbf07b6053e139dc9483f849f6d4acba1418b change included Change-Id: I6497c32cc8f14f77c38cda39893edce0631ec6d7 --- M modules/cassandra 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/61/199261/1 diff --git a/modules/cassandra b/modules/cassandra index 3fdcb03..65fde18 16 --- a/modules/cassandra +++ b/modules/cassandra -Subproject commit 3fdcb03ee514ba32700f04c15502243f20f64278 +Subproject commit 65fde188705cb1f3306777a93047723042386690 -- To view, visit https://gerrit.wikimedia.org/r/199261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6497c32cc8f14f77c38cda39893edce0631ec6d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Labs: upgrade codfw labstores to Jessie - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Labs: upgrade codfw labstores to Jessie
..
Labs: upgrade codfw labstores to Jessie
(This is probably the last real opportunity to do so without
outage or interruptions).
Bug: T93740
Change-Id: I4a47e6184fbb62b16ca8498aa3247ae49a1c2775
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index a41cdfc..281d21b 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2170,11 +2170,15 @@
host labstore2001 {
hardware ethernet 78:2b:cb:76:1c:d2;
fixed-address labstore2001.codfw.wmnet;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
host labstore2002 {
hardware ethernet 78:2b:cb:75:8e:43;
fixed-address labstore2002.codfw.wmnet;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
host labsdb1004 {
--
To view, visit https://gerrit.wikimedia.org/r/198728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a47e6184fbb62b16ca8498aa3247ae49a1c2775
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix JS error when wgGatherCollections is not defined - change (mediawiki...Gather)
Jhernandez has uploaded a new change for review. https://gerrit.wikimedia.org/r/199257 Change subject: Fix JS error when wgGatherCollections is not defined .. Fix JS error when wgGatherCollections is not defined Bug: T93738 Change-Id: I7f6bf3092554f1b49248c47417e1b51c2b3dbc79 --- M resources/ext.gather.watchstar/init.js 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/57/199257/1 diff --git a/resources/ext.gather.watchstar/init.js b/resources/ext.gather.watchstar/init.js index 21891c6..0fd9e72 100644 --- a/resources/ext.gather.watchstar/init.js +++ b/resources/ext.gather.watchstar/init.js @@ -18,7 +18,8 @@ var collections = mw.config.get( 'wgGatherCollections' ), // Show to anonymous or a user with only watchstar as a collection // note ES5 method usage - showToUser = user.isAnon() || Object.keys( collections ).length === 1; + showToUser = user.isAnon() || + ( collections Object.keys( collections ).length === 1 ); if ( // User only has a watchlist, meaning they have not created a collection -- To view, visit https://gerrit.wikimedia.org/r/199257 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f6bf3092554f1b49248c47417e1b51c2b3dbc79 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jhernandez jhernan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch order of descriptions and aliases in header - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199262
Change subject: Switch order of descriptions and aliases in header
..
Switch order of descriptions and aliases in header
Bug: T93209
Change-Id: I66175f104661693d8bb1f712afc3496a527cf422
(cherry picked from commit e59cc39fa642c466a7ae282db192d12b63e07470)
---
M
lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
M repo/includes/View/EntityTermsView.php
M repo/resources/templates.php
5 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/62/199262/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
index 1cf2d1d..02f2e69 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -52,8 +52,8 @@
templateParams: [
mw.msg(
'wikibase-entitytermsforlanguagelistview-language' ),
mw.msg( 'wikibase-entitytermsforlanguagelistview-label'
),
- mw.msg(
'wikibase-entitytermsforlanguagelistview-aliases' ),
mw.msg(
'wikibase-entitytermsforlanguagelistview-description' ),
+ mw.msg(
'wikibase-entitytermsforlanguagelistview-aliases' ),
'' // entitytermsforlanguageview
],
templateShortCuts: {
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
index 8f36f77..ffca465 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
@@ -67,8 +67,8 @@
);
},
'', // label
- '', // aliases
'', // description
+ '', // aliases
'' // toolbar placeholder
],
templateShortCuts: {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
index a6296c4..a26d60c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
@@ -55,10 +55,10 @@
templateParams: [
'', // label class
'', // labelview
- '', // aliases class
- '', // aliasesview
'', // description class
'', // descriptionview
+ '', // aliases class
+ '', // aliasesview
'', // entitytermsforlanguagelistview
'', // additional entitytermsforlanguagelistview
container class(es)
'' // toolbar placeholder
diff --git a/repo/includes/View/EntityTermsView.php
b/repo/includes/View/EntityTermsView.php
index d1f06d7..88ee5bb 100644
--- a/repo/includes/View/EntityTermsView.php
+++ b/repo/includes/View/EntityTermsView.php
@@ -83,10 +83,10 @@
return $this-templateFactory-render(
'wikibase-entitytermsview',
$labels-hasTermForLanguage( $this-languageCode ) ? ''
: 'wb-empty',
$this-getHtmlForLabel( $labels, $entityId ),
- $aliasGroups-hasGroupForLanguage( $this-languageCode
) ? '' : 'wb-empty',
- $this-getHtmlForAliases( $aliasGroups ),
$descriptions-hasTermForLanguage( $this-languageCode
) ? '' : 'wb-empty',
$this-getDescriptionText( $descriptions ),
+ $aliasGroups-hasGroupForLanguage( $this-languageCode
) ? '' : 'wb-empty',
+ $this-getHtmlForAliases( $aliasGroups ),
$termBoxHtml,
$textInjector-newMarker(
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class'
@@ -182,8 +182,8 @@
return $this-templateFactory-render(
'wikibase-entitytermsforlanguagelistview',
$this-msg(
'wikibase-entitytermsforlanguagelistview-language' ),
$this-msg(
'wikibase-entitytermsforlanguagelistview-label' ),
- $this-msg(
[MediaWiki-commits] [Gerrit] Add .codfw.wmnet to tin's domain search - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Add .codfw.wmnet to tin's domain search .. Add .codfw.wmnet to tin's domain search scap needs that Change-Id: Ieebdab7826ce622fb628287f9c8e90fe7d3c260a --- M hieradata/hosts/tin.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml index 6595a39..ed1c067 100644 --- a/hieradata/hosts/tin.yaml +++ b/hieradata/hosts/tin.yaml @@ -2,6 +2,7 @@ - wikimedia.org - eqiad.wmnet - esams.wikimedia.org + - codfw.wmnet mediawiki::users::web: www-data admin::groups: - deployment -- To view, visit https://gerrit.wikimedia.org/r/199243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieebdab7826ce622fb628287f9c8e90fe7d3c260a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup bits in SpecialSetLabelDescriptionAliasesTest - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199260
Change subject: Cleanup bits in SpecialSetLabelDescriptionAliasesTest
..
Cleanup bits in SpecialSetLabelDescriptionAliasesTest
* Fix type hints.
* Split long lines.
* Fix formatting.
* Simplify private helper method calls.
Change-Id: If7911bab6e5bf6b1fd09cad92b3fe528c54a84b6
---
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
1 file changed, 35 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/60/199260/1
diff --git
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
index ef35947..96fb5b3 100644
---
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
+++
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
@@ -2,8 +2,10 @@
namespace Wikibase\Test;
+use FauxRequest;
use ValueValidators\Result;
use WebRequest;
+use WebResponse;
use Wikibase\ChangeOp\FingerprintChangeOpFactory;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
@@ -35,7 +37,6 @@
class SpecialSetLabelDescriptionAliasesTest extends
SpecialWikibaseRepoPageTestBase {
protected $languageCodes = array( 'en', 'de', 'de-ch', 'ii', 'zh' );
-
/**
* @see SpecialPageTestBase::newSpecialPage()
@@ -91,7 +92,7 @@
-disableOriginalConstructor()
-getMock();
- $self = $this; // yay PHP 5.3
+ $self = $this;
$detector-expects( $this-any() )
-method( 'detectTermConflicts' )
-will( $this-returnCallback( function(
@@ -117,7 +118,7 @@
*
* @param string[] $terms
*
-* @return array
+* @return UniquenessViolation[]
*/
public function detectDupes( $terms ) {
$errors = array();
@@ -152,7 +153,7 @@
-method( 'getLanguages' )
-will( $this-returnValue( $this-languageCodes ) );
- $languageCodes = $this-languageCodes; // for PHP 5.3
+ $languageCodes = $this-languageCodes;
$languages-expects( $this-any() )
-method( 'hasLanguage' )
-will( $this-returnCallback( function( $code ) use (
$languageCodes ) {
@@ -165,11 +166,15 @@
/**
* @param string[] $labels
* @param string[] $descriptions
-* @param string[][] $aliases
+* @param array[] $aliases
*
* @return Fingerprint
*/
- private function makeFingerprint( array $labels, array $descriptions,
array $aliases ) {
+ private function makeFingerprint(
+ array $labels = array(),
+ array $descriptions = array(),
+ array $aliases = array()
+ ) {
$fingerprint = new Fingerprint();
foreach ( $labels as $lang = $text ) {
@@ -187,7 +192,7 @@
return $fingerprint;
}
- public function provideExecute() {
+ public function executeProvider() {
$formMatchers['id'] = array(
'tag' = 'input',
'attributes' = array(
@@ -256,9 +261,7 @@
$withLanguageMatchers['label']['attributes']['value'] = 'foo';
$fooFingerprint = $this-makeFingerprint(
- array( 'de' = 'foo' ),
- array(),
- array()
+ array( 'de' = 'foo' )
);
return array(
@@ -289,7 +292,7 @@
'with id and language attribute' = array(
$fooFingerprint,
'$id',
- new \FauxRequest( array( 'language' = 'de' ) ),
+ new FauxRequest( array( 'language' = 'de' ) ),
$withLanguageMatchers,
null
),
@@ -297,43 +300,38 @@
'add label' = array(
$fooFingerprint,
'$id',
- new \FauxRequest( array( 'language' = 'en',
'label' = 'FOO' ), true ),
+ new FauxRequest( array( 'language' = 'en',
'label' = 'FOO' ), true ),
array(),
$this-makeFingerprint(
- array( 'de' = 'foo', 'en' = 'FOO' ),
- array(),
-
[MediaWiki-commits] [Gerrit] Bump service-runner to 0.1.5 - change (mediawiki...mobileapps)
Mobrovac has submitted this change and it was merged.
Change subject: Bump service-runner to 0.1.5
..
Bump service-runner to 0.1.5
Change-Id: I8fd4c8f61ae9c1163b4f74baa9462f34cb05377e
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/package.json b/package.json
index 5d0853f..4223f67 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
js-yaml: ^3.2.7,
node-uuid: ^1.4.3,
preq: ^0.3.12,
-service-runner: ^0.1.4
+service-runner: ^0.1.5
},
devDependencies: {
assert: ^1.3.0,
--
To view, visit https://gerrit.wikimedia.org/r/199259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fd4c8f61ae9c1163b4f74baa9462f34cb05377e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump service-runner to 0.1.5 - change (mediawiki...mobileapps)
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199259
Change subject: Bump service-runner to 0.1.5
..
Bump service-runner to 0.1.5
Change-Id: I8fd4c8f61ae9c1163b4f74baa9462f34cb05377e
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/59/199259/1
diff --git a/package.json b/package.json
index 5d0853f..4223f67 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
js-yaml: ^3.2.7,
node-uuid: ^1.4.3,
preq: ^0.3.12,
-service-runner: ^0.1.4
+service-runner: ^0.1.5
},
devDependencies: {
assert: ^1.3.0,
--
To view, visit https://gerrit.wikimedia.org/r/199259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fd4c8f61ae9c1163b4f74baa9462f34cb05377e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch order of descriptions and aliases in header - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Switch order of descriptions and aliases in header
..
Switch order of descriptions and aliases in header
Bug: T93209
Change-Id: I66175f104661693d8bb1f712afc3496a527cf422
---
M
lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
M repo/includes/View/EntityTermsView.php
M repo/resources/templates.php
5 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
Lydia Pintscher: Looks good to me, but someone else must approve
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
index 1cf2d1d..02f2e69 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -52,8 +52,8 @@
templateParams: [
mw.msg(
'wikibase-entitytermsforlanguagelistview-language' ),
mw.msg( 'wikibase-entitytermsforlanguagelistview-label'
),
- mw.msg(
'wikibase-entitytermsforlanguagelistview-aliases' ),
mw.msg(
'wikibase-entitytermsforlanguagelistview-description' ),
+ mw.msg(
'wikibase-entitytermsforlanguagelistview-aliases' ),
'' // entitytermsforlanguageview
],
templateShortCuts: {
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
index 8f36f77..ffca465 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.js
@@ -67,8 +67,8 @@
);
},
'', // label
- '', // aliases
'', // description
+ '', // aliases
'' // toolbar placeholder
],
templateShortCuts: {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
index a6296c4..a26d60c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
@@ -55,10 +55,10 @@
templateParams: [
'', // label class
'', // labelview
- '', // aliases class
- '', // aliasesview
'', // description class
'', // descriptionview
+ '', // aliases class
+ '', // aliasesview
'', // entitytermsforlanguagelistview
'', // additional entitytermsforlanguagelistview
container class(es)
'' // toolbar placeholder
diff --git a/repo/includes/View/EntityTermsView.php
b/repo/includes/View/EntityTermsView.php
index d1f06d7..88ee5bb 100644
--- a/repo/includes/View/EntityTermsView.php
+++ b/repo/includes/View/EntityTermsView.php
@@ -83,10 +83,10 @@
return $this-templateFactory-render(
'wikibase-entitytermsview',
$labels-hasTermForLanguage( $this-languageCode ) ? ''
: 'wb-empty',
$this-getHtmlForLabel( $labels, $entityId ),
- $aliasGroups-hasGroupForLanguage( $this-languageCode
) ? '' : 'wb-empty',
- $this-getHtmlForAliases( $aliasGroups ),
$descriptions-hasTermForLanguage( $this-languageCode
) ? '' : 'wb-empty',
$this-getDescriptionText( $descriptions ),
+ $aliasGroups-hasGroupForLanguage( $this-languageCode
) ? '' : 'wb-empty',
+ $this-getHtmlForAliases( $aliasGroups ),
$termBoxHtml,
$textInjector-newMarker(
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class'
@@ -182,8 +182,8 @@
return $this-templateFactory-render(
'wikibase-entitytermsforlanguagelistview',
$this-msg(
'wikibase-entitytermsforlanguagelistview-language' ),
$this-msg(
'wikibase-entitytermsforlanguagelistview-label' ),
-
[MediaWiki-commits] [Gerrit] Popus avoid referring to screen colors in messages - change (mediawiki...Popups)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/199228 Change subject: Popus avoid referring to screen colors in messages .. Popus avoid referring to screen colors in messages See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Popups-settings-description/en Change-Id: Ic89f2f71556bb1202f0d452e430f716ee359e264 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/28/199228/1 diff --git a/i18n/en.json b/i18n/en.json index 0b14cb1..acd3002 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -7,7 +7,7 @@ popups-last-edited: Last edited $1, popups-redirects: redirects to h3$1/h3, popups-settings-title: Page preview, -popups-settings-description: This tool lets you preview blue links and references., +popups-settings-description: This tool lets you preview links to wiki pages and to references., popups-settings-option-simple: Simple, popups-settings-option-simple-description: See the lead sentence of a page and a preview image. This is recommended for readers., popups-settings-option-advanced: Advanced, -- To view, visit https://gerrit.wikimedia.org/r/199228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic89f2f71556bb1202f0d452e430f716ee359e264 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix prioritizing sort in dispatchChanges. - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/199232 Change subject: Fix prioritizing sort in dispatchChanges. .. Fix prioritizing sort in dispatchChanges. This fixes a bug that causes the order in which clients are picked for dispatching to be random, instead of selecting the most lagged client first. Backporting this to have more control over the deploy. Change-Id: If390b4773debdc41889d211934f6c92550b4cfc1 (cherry picked from commit 07fbc59bccdca26a46cdde7ea9f21534052e5abe) --- M lib/maintenance/dispatchChanges.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/32/199232/1 diff --git a/lib/maintenance/dispatchChanges.php b/lib/maintenance/dispatchChanges.php index f2131d8..81d896b 100644 --- a/lib/maintenance/dispatchChanges.php +++ b/lib/maintenance/dispatchChanges.php @@ -418,9 +418,9 @@ , __METHOD__, array( - 'ORDER BY chd_seen ASC', + 'ORDER BY' = 'chd_seen ASC', 'FOR UPDATE', - 'LIMIT ' . (int)$this-randomness + 'LIMIT' = (int)$this-randomness ) ); -- To view, visit https://gerrit.wikimedia.org/r/199232 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If390b4773debdc41889d211934f6c92550b4cfc1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 47af0b6..8c48b30 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/199236 Change subject: Syncronize VisualEditor: 47af0b6..8c48b30 .. Syncronize VisualEditor: 47af0b6..8c48b30 Change-Id: I929037c17ec645a37de77bcd583542aac546173c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/36/199236/1 diff --git a/VisualEditor b/VisualEditor index 47af0b6..8c48b30 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 47af0b6449271e945dfccc335baf092691d3b08a +Subproject commit 8c48b3055fa0d7851b69772961be61813459f955 -- To view, visit https://gerrit.wikimedia.org/r/199236 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I929037c17ec645a37de77bcd583542aac546173c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 47af0b6..8c48b30 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 47af0b6..8c48b30 .. Syncronize VisualEditor: 47af0b6..8c48b30 Change-Id: I929037c17ec645a37de77bcd583542aac546173c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 47af0b6..8c48b30 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 47af0b6449271e945dfccc335baf092691d3b08a +Subproject commit 8c48b3055fa0d7851b69772961be61813459f955 -- To view, visit https://gerrit.wikimedia.org/r/199236 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I929037c17ec645a37de77bcd583542aac546173c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Add padding to the Headings dropdown screenshot - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Add padding to the Headings dropdown screenshot
..
[BrowserTest] Add padding to the Headings dropdown screenshot
Makes it look nicer.
Follow up to
Iff47eaa2c3fe09264501ae82f6ee1bf7044a3556
Change-Id: Ic4d473159942918776b7c5e7107e48b824c228e3
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 4a40371..6d28a62 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -151,7 +151,8 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.format_indicator_element,
@current_page.heading_dropdown_menus_element]
+[@current_page.format_indicator_element,
@current_page.heading_dropdown_menus_element],
+3
)
end
--
To view, visit https://gerrit.wikimedia.org/r/199215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4d473159942918776b7c5e7107e48b824c228e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deploy Capiunto on beta - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Deploy Capiunto on beta
..
Deploy Capiunto on beta
Bug: T93418
Change-Id: Id83fe5374400843cdc75bfdc8153ac82a324d679
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/extension-list-labs
3 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
Aude: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index d5adac4..178a3e2 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -221,6 +221,10 @@
$wgSentryDsn = $wmgSentryDsn;
}
+if ( $wmgUseCapiunto ) {
+ require_once $IP/extensions/Capiunto/Capiunto.php;
+}
+
// Experimental
$wgGadgetsCaching = false;
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 447ab53..e2805be 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -531,6 +531,10 @@
'wgRateLimitsExcludedIPs' = array(
'default' = array( '198.73.209.0/24' ), // T87841 Office IP
),
+
+ 'wmgUseCapiunto' = array(
+ 'default' = true,
+ ),
);
} # wmflLabsSettings()
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 15d62ad..101e5aa 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,4 +1,5 @@
$IP/extensions/ApiFeatureUsage/ApiFeatureUsage.php
+$IP/extensions/Capiunto/Capiunto.php
$IP/extensions/Gather/Gather.php
$IP/extensions/GlobalUserPage/GlobalUserPage.php
$IP/extensions/Sentry/Sentry.php
--
To view, visit https://gerrit.wikimedia.org/r/198776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id83fe5374400843cdc75bfdc8153ac82a324d679
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Lydia Pintscher lydia.pintsc...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add array type hints to RepoItemLinkGenerator - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Add array type hints to RepoItemLinkGenerator
..
Add array type hints to RepoItemLinkGenerator
Change-Id: I0e6375e39e54ca1e327862f116af387b32bfddc1
---
M client/includes/RepoItemLinkGenerator.php
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/RepoItemLinkGenerator.php
b/client/includes/RepoItemLinkGenerator.php
index 34a6fc0..90bac80 100644
--- a/client/includes/RepoItemLinkGenerator.php
+++ b/client/includes/RepoItemLinkGenerator.php
@@ -2,8 +2,8 @@
namespace Wikibase\Client;
-use Title;
use Html;
+use Title;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\NamespaceChecker;
@@ -71,12 +71,12 @@
* @param Title $title
* @param string $action
* @param bool $hasLangLinks
-* @param array|null $noExternalLangLinks
+* @param string[]|null $noExternalLangLinks
* @param string|null $prefixedId
*
* @return string|null HTML or null for no link
*/
- public function getLink( Title $title, $action, $hasLangLinks,
$noExternalLangLinks, $prefixedId ) {
+ public function getLink( Title $title, $action, $hasLangLinks, array
$noExternalLangLinks = null, $prefixedId ) {
$entityId = null;
if ( is_string( $prefixedId ) ) {
$entityId = $this-entityIdParser-parse( $prefixedId );
@@ -96,11 +96,11 @@
/**
* @param Title $title
* @param string $action
-* @param mixed $noExternalLangLinks
+* @param string[]|null $noExternalLangLinks
*
* @return bool
*/
- private function canHaveLink( Title $title, $action,
$noExternalLangLinks ) {
+ private function canHaveLink( Title $title, $action, array
$noExternalLangLinks = null ) {
if ( $action !== 'view' ) {
return false;
}
@@ -116,11 +116,11 @@
}
/**
-* @param null|array $noExternalLangLinks
+* @param string[]|null $noExternalLangLinks
*
* @return bool
*/
- private function isSuppressed( $noExternalLangLinks ) {
+ private function isSuppressed( array $noExternalLangLinks = null ) {
return $noExternalLangLinks !== null in_array( '*',
$noExternalLangLinks );
}
--
To view, visit https://gerrit.wikimedia.org/r/191352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e6375e39e54ca1e327862f116af387b32bfddc1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix/enhance PHPDoc tags in TermIndex classes - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix/enhance PHPDoc tags in TermIndex classes
..
Fix/enhance PHPDoc tags in TermIndex classes
This is split from I6d83809. This is a pure documentation-only change.
And I'm splitting long lines.
This is a resubmission of I2bb472c which already does have a +2.
Change-Id: I66c952d4627c080db90c507368b9867fa8a2dfce
---
M lib/includes/store/TermIndex.php
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/store/MockTermIndex.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
4 files changed, 80 insertions(+), 43 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/TermIndex.php b/lib/includes/store/TermIndex.php
index 10b9dfb..a7f30d4 100644
--- a/lib/includes/store/TermIndex.php
+++ b/lib/includes/store/TermIndex.php
@@ -48,7 +48,11 @@
*
* @return Term[]
*/
- public function getTermsOfEntity( EntityId $entityId, array $termTypes
= null, array $languageCodes = null );
+ public function getTermsOfEntity(
+ EntityId $entityId,
+ array $termTypes = null,
+ array $languageCodes = null
+ );
/**
* Returns the terms stored for the given entities. Can be filtered by
language.
@@ -64,7 +68,11 @@
*
* @return Term[]
*/
- public function getTermsOfEntities( array $entityIds, array $termTypes
= null, array $languageCodes = null );
+ public function getTermsOfEntities(
+ array $entityIds,
+ array $termTypes = null,
+ array $languageCodes = null
+ );
/**
* Returns the terms that match the provided conditions.
@@ -91,7 +99,12 @@
*
* @return Term[]
*/
- public function getMatchingTerms( array $terms, $termType = null,
$entityType = null, array $options = array() );
+ public function getMatchingTerms(
+ array $terms,
+ $termType = null,
+ $entityType = null,
+ array $options = array()
+ );
/**
* Returns the IDs that match the provided conditions.
diff --git a/lib/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
index c642753..501f6bd 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -11,6 +11,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\LegacyIdInterpreter;
+use Wikibase\DataModel\Term\AliasGroup;
use Wikibase\DataModel\Term\Fingerprint;
use Wikibase\DataModel\Term\FingerprintProvider;
use Wikibase\Lib\Store\LabelConflictFinder;
@@ -91,7 +92,7 @@
*
* @param EntityDocument $entity
*
-* @return boolean Success indicator
+* @return bool Success indicator
*/
public function saveTermsOfEntity( EntityDocument $entity ) {
//First check whether there's anything to update
@@ -136,7 +137,7 @@
* @param Term[] $terms
* @param DatabaseBase $dbw
*
-* @return boolean Success indicator
+* @return bool Success indicator
*/
public function insertTermsInternal( EntityDocument $entity, $terms,
DatabaseBase $dbw ) {
$entityIdentifiers = array(
@@ -222,6 +223,7 @@
$terms[] = $term;
}
+ /** @var AliasGroup $aliasGroup */
foreach ( $fingerprint-getAliasGroups() as $aliasGroup ) {
foreach ( $aliasGroup-getAliases() as $alias ) {
$term = new Term( $extraFields );
@@ -249,7 +251,7 @@
* @param Term[] $terms
* @param DatabaseBase $dbw
*
-* @return boolean Success indicator
+* @return bool Success indicator
*/
public function deleteTermsInternal( EntityId $entityId, $terms,
DatabaseBase $dbw ) {
//TODO: Make getTermsOfEntity() collect term_row_id values, so
we can use them here.
@@ -341,7 +343,7 @@
*
* @param EntityId $entityId
*
-* @return boolean Success indicator
+* @return bool Success indicator
*/
public function deleteTermsOfEntity( EntityId $entityId ) {
$dbw = $this-getConnection( DB_MASTER );
@@ -413,7 +415,7 @@
* @param string[]|null $languageCodes
*
* @throws MWException
-* @return array
+* @return Term[]
*/
private function fetchTerms(
array $entityIds,
@@ -481,7 +483,7 @@
}
/**
-* Returns the Database connection to wich to write.
+* Returns the Database connection to which to write.
[MediaWiki-commits] [Gerrit] Add a full stop to a message for consistency - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged. Change subject: Add a full stop to a message for consistency .. Add a full stop to a message for consistency Change-Id: I00923db8a968b7497a82d9498b5aeefa1714cf3c --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jhernandez: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 2bc6e34..ed88a71 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3,7 +3,7 @@ authors: [] }, gather-remove-from-collection-failed-toast: Unable to remove page from collection., - gather-add-to-collection-failed-toast: Unable to add page to collection, + gather-add-to-collection-failed-toast: Unable to add page to collection., gather-lists-collection-owner: Owner, gather-lists-collection-title: Title, gather-lists-collection-description: Description, -- To view, visit https://gerrit.wikimedia.org/r/199249 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00923db8a968b7497a82d9498b5aeefa1714cf3c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ULS: message text grammar enhanced - change (mediawiki...UniversalLanguageSelector)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/199234 Change subject: ULS: message text grammar enhanced .. ULS: message text grammar enhanced see: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-ulslocalization-description/en Change-Id: Id606d97da68a303b45d534b4f26be94b7deea37b --- M i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/34/199234/1 diff --git a/i18n/en.json b/i18n/en.json index 1f9d863..1c7a765 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -67,8 +67,8 @@ apihelp-languagesearch-example-1: Search for \Te\, apihelp-languagesearch-example-2: Search for \ഫി\, apihelp-languagesearch-example-3: Search for \ഫി\, allowing one typo, - apihelp-ulslocalization-description: Get the localization of ULS in given language., + apihelp-ulslocalization-description: Get the localization of ULS in the given language., apihelp-ulslocalization-param-language: Language string., apihelp-ulslocalization-example-1: Get Tamil localization, apihelp-ulslocalization-example-2: Get Hindi localization -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/199234 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id606d97da68a303b45d534b4f26be94b7deea37b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dsh: add more codfw servers - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: dsh: add more codfw servers .. dsh: add more codfw servers Change-Id: I1aa654a58f1717b4a44b09d22ae55ae3c52df9b5 --- M modules/dsh/files/group/mediawiki-installation 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 5f910df..befd1c5 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -388,7 +388,20 @@ mw2118 mw2119 mw2120 -# mw 2121-2134 are being installed now +mw2121 +mw2122 +mw2123 +mw2124 +mw2125 +mw2126 +mw2127 +mw2128 +mw2129 +mw2130 +mw2131 +mw2132 +mw2133 +mw2134 mw2135 mw2136 mw2137 @@ -452,6 +465,7 @@ mw2197 mw2198 mw2199 +#mw2200 mw2201 mw2202 mw2203 -- To view, visit https://gerrit.wikimedia.org/r/199240 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1aa654a58f1717b4a44b09d22ae55ae3c52df9b5 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a full stop to a message for consistency - change (mediawiki...Gather)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/199249 Change subject: Add a full stop to a message for consistency .. Add a full stop to a message for consistency Change-Id: I00923db8a968b7497a82d9498b5aeefa1714cf3c --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/49/199249/1 diff --git a/i18n/en.json b/i18n/en.json index 2bc6e34..ed88a71 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3,7 +3,7 @@ authors: [] }, gather-remove-from-collection-failed-toast: Unable to remove page from collection., - gather-add-to-collection-failed-toast: Unable to add page to collection, + gather-add-to-collection-failed-toast: Unable to add page to collection., gather-lists-collection-owner: Owner, gather-lists-collection-title: Title, gather-lists-collection-description: Description, -- To view, visit https://gerrit.wikimedia.org/r/199249 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00923db8a968b7497a82d9498b5aeefa1714cf3c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix css for Wikibase special pages - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199253
Change subject: Fix css for Wikibase special pages
..
Fix css for Wikibase special pages
remove float: left from .wb-fieldset
Bug: T93183
Change-Id: Iee06284671950e32467b777fba7b0956f51ae25c
(cherry picked from commit 31e211909e294cc2c03d9ece6c2e7d1c5d95c8f0)
---
M repo/resources/wikibase.special/wikibase.special.css
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/53/199253/1
diff --git a/repo/resources/wikibase.special/wikibase.special.css
b/repo/resources/wikibase.special/wikibase.special.css
index f5c9e68..cb37733 100644
--- a/repo/resources/wikibase.special/wikibase.special.css
+++ b/repo/resources/wikibase.special/wikibase.special.css
@@ -9,10 +9,6 @@
/** Create item/property page **/
-.wb-fieldset {
- float: left;
-}
-
.wb-label, .wb-input, .wb-button, .wb-select {
display: block;
float: left;
--
To view, visit https://gerrit.wikimedia.org/r/199253
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee06284671950e32467b777fba7b0956f51ae25c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf22
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Render qualifiers in statementview after being saved - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199251
Change subject: Render qualifiers in statementview after being saved
..
Render qualifiers in statementview after being saved
While this could probably be done in a nicer way, this
is consistent with the changes in I9444ae5 and to avoid
massive merge conflicts.
Bug: T93073
Change-Id: I9db87de4e7f2f079393800412e6af3d14976f88a
(cherry picked from commit 049bdabd1ce61a770c95f0e77657c3aaad70e551)
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/51/199251/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index bcb6c72..72f1435 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -478,7 +478,11 @@
: this.option( 'predefined' ).mainSnak || null
);
- if( this.isInEditMode() ) {
+ if( this.isInEditMode()
+ || this.options.value
+
this.options.value.getClaim().getQualifiers().length
+!this.$qualifiers.children().length
+ ) {
this._createQualifiersListview(
this.options.value
?
this.options.value.getClaim().getQualifiers()
--
To view, visit https://gerrit.wikimedia.org/r/199251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9db87de4e7f2f079393800412e6af3d14976f88a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf22
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: add dsh entries for codfw - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: add dsh entries for codfw
..
mediawiki: add dsh entries for codfw
Change-Id: Iebb705e5b5ecd825a2ec654facbf89aa04ab6cca
---
M manifests/role/mediawiki.pp
M modules/dsh/files/group/mediawiki-installation
2 files changed, 198 insertions(+), 6 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index fd20275..4bd89e2 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -49,12 +49,10 @@
pools = $nutcracker_pools,
}
-if $::site == 'eqiad' {
-monitoring::service { 'mediawiki-installation DSH group':
-description = 'mediawiki-installation DSH group',
-check_command = 'check_dsh_groups!mediawiki-installation',
-normal_check_interval = 60,
-}
+monitoring::service { 'mediawiki-installation DSH group':
+description = 'mediawiki-installation DSH group',
+check_command = 'check_dsh_groups!mediawiki-installation',
+normal_check_interval = 60,
}
$scap_proxies = hiera('dsh::config::scap_proxies',[])
diff --git a/modules/dsh/files/group/mediawiki-installation
b/modules/dsh/files/group/mediawiki-installation
index 6373cbc..5f910df 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -266,3 +266,197 @@
mw1256
mw1257
mw1258
+
+#Codfw
+mw2001
+mw2002
+mw2003
+mw2004
+mw2005
+mw2006
+mw2007
+mw2008
+mw2009
+mw2010
+mw2011
+mw2012
+mw2013
+mw2014
+mw2015
+mw2016
+mw2017
+mw2018
+mw2019
+mw2020
+mw2021
+mw2022
+mw2023
+mw2024
+mw2025
+mw2026
+mw2027
+mw2028
+mw2029
+mw2030
+mw2031
+mw2032
+mw2033
+mw2034
+mw2035
+mw2036
+mw2037
+mw2038
+mw2039
+mw2040
+mw2041
+mw2042
+mw2043
+mw2044
+mw2045
+mw2046
+mw2047
+mw2048
+mw2049
+#mw2050
+mw2051
+mw2052
+mw2053
+mw2054
+mw2055
+mw2056
+mw2057
+mw2058
+mw2059
+mw2060
+mw2061
+mw2062
+mw2063
+mw2064
+mw2065
+mw2066
+mw2067
+mw2068
+mw2069
+mw2070
+mw2071
+mw2072
+mw2073
+mw2074
+mw2075
+mw2076
+mw2077
+mw2078
+mw2079
+mw2080
+mw2081
+mw2082
+mw2083
+mw2084
+mw2085
+mw2086
+mw2087
+#mw2088
+mw2089
+mw2090
+mw2091
+mw2092
+mw2093
+mw2094
+mw2095
+mw2096
+mw2097
+mw2098
+mw2099
+mw2100
+mw2101
+mw2102
+mw2103
+mw2104
+mw2105
+mw2106
+mw2107
+mw2108
+mw2109
+mw2110
+mw2111
+mw2112
+mw2113
+mw2114
+mw2115
+mw2116
+mw2117
+mw2118
+mw2119
+mw2120
+# mw 2121-2134 are being installed now
+mw2135
+mw2136
+mw2137
+mw2138
+mw2139
+mw2140
+mw2141
+mw2142
+mw2143
+mw2144
+mw2145
+mw2146
+mw2147
+mw2149
+mw2150
+mw2151
+mw2152
+mw2153
+mw2154
+mw2155
+mw2156
+mw2157
+mw2158
+mw2159
+mw2160
+mw2161
+mw2162
+mw2163
+mw2164
+mw2165
+mw2166
+mw2167
+mw2168
+mw2169
+mw2170
+mw2171
+mw2172
+mw2173
+mw2174
+mw2175
+mw2176
+mw2177
+mw2178
+#mw2179
+mw2180
+mw2181
+mw2182
+mw2183
+mw2185
+mw2186
+mw2187
+mw2188
+mw2189
+mw2190
+mw2191
+mw2192
+mw2193
+mw2194
+#mw2195
+mw2196
+mw2197
+mw2198
+mw2199
+mw2201
+mw2202
+mw2203
+mw2204
+mw2205
+mw2206
+mw2207
+#mw2208-2214 will be installed
--
To view, visit https://gerrit.wikimedia.org/r/199230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebb705e5b5ecd825a2ec654facbf89aa04ab6cca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ULS: message text grammar enhanced - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: ULS: message text grammar enhanced .. ULS: message text grammar enhanced see: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-ulslocalization-description/en Change-Id: Id606d97da68a303b45d534b4f26be94b7deea37b --- M i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Santhosh: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 1f9d863..1c7a765 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -67,8 +67,8 @@ apihelp-languagesearch-example-1: Search for \Te\, apihelp-languagesearch-example-2: Search for \ഫി\, apihelp-languagesearch-example-3: Search for \ഫി\, allowing one typo, - apihelp-ulslocalization-description: Get the localization of ULS in given language., + apihelp-ulslocalization-description: Get the localization of ULS in the given language., apihelp-ulslocalization-param-language: Language string., apihelp-ulslocalization-example-1: Get Tamil localization, apihelp-ulslocalization-example-2: Get Hindi localization -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/199234 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id606d97da68a303b45d534b4f26be94b7deea37b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8c48b30..cbed069 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/199237 Change subject: Syncronize VisualEditor: 8c48b30..cbed069 .. Syncronize VisualEditor: 8c48b30..cbed069 Change-Id: I17465de0d0a7df29fe8e01ebe37e06ea1a8324e3 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/37/199237/1 diff --git a/VisualEditor b/VisualEditor index 8c48b30..cbed069 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 8c48b3055fa0d7851b69772961be61813459f955 +Subproject commit cbed0699841232469cf48d4f34c79f8466de8b1a -- To view, visit https://gerrit.wikimedia.org/r/199237 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17465de0d0a7df29fe8e01ebe37e06ea1a8324e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Rename headings dropdown scenario - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Rename headings dropdown scenario
..
[BrowserTest] Rename headings dropdown scenario
Change-Id: Ib59cf24ad30823ddfcf1d31a9eb2c45efd0199fc
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 6d28a62..0cf4dea 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -144,10 +144,10 @@
Then(/^I should see Headings pull-down menu$/) do
on(VisualEditorPage).heading_dropdown_menus_element.when_present.should
be_visible
- step 'I take screenshot of pull-dowm menu'
+ step 'I take screenshot of Headings pull-down menu'
end
-Then(/^I take screenshot of pull-dowm menu$/) do
+Then(/^I take screenshot of Headings pull-down menu$/) do
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
--
To view, visit https://gerrit.wikimedia.org/r/199222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib59cf24ad30823ddfcf1d31a9eb2c45efd0199fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8c48b30..cbed069 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 8c48b30..cbed069 .. Syncronize VisualEditor: 8c48b30..cbed069 Change-Id: I17465de0d0a7df29fe8e01ebe37e06ea1a8324e3 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 8c48b30..cbed069 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 8c48b3055fa0d7851b69772961be61813459f955 +Subproject commit cbed0699841232469cf48d4f34c79f8466de8b1a -- To view, visit https://gerrit.wikimedia.org/r/199237 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17465de0d0a7df29fe8e01ebe37e06ea1a8324e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Capture the whole formatting button in the scr... - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199238
Change subject: [BrowserTest] Capture the whole formatting button in the
screenshot
..
[BrowserTest] Capture the whole formatting button in the screenshot
This makes the screenshot nicer and more complete.
Using .parent.parent helps avoid adding classes to the JavaScript.
Change-Id: I0dd9efd2978ff5468ab6101b11b7e6fdd3b0da30
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/38/199238/1
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 0cf4dea..25fe598 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -165,7 +165,7 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.ve_text_style_element,
@current_page.formatting_option_menus_element]
+[@current_page.ve_text_style_element.parent.parent,
@current_page.formatting_option_menus_element]
)
end
--
To view, visit https://gerrit.wikimedia.org/r/199238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dd9efd2978ff5468ab6101b11b7e6fdd3b0da30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding new tags for #wikimedia-commons-tech - change (labs...wikibugs2)
Steinsplitter has uploaded a new change for review. https://gerrit.wikimedia.org/r/199242 Change subject: Adding new tags for #wikimedia-commons-tech .. Adding new tags for #wikimedia-commons-tech - Commons-App(-.*)? - GWToolset - Uploading Change-Id: Ib61a3dfa9a079b0eac2658da4ee4d9014a8a58c3 --- M channels.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/42/199242/1 diff --git a/channels.yaml b/channels.yaml index 5a1bff9..f3d371a 100644 --- a/channels.yaml +++ b/channels.yaml @@ -119,6 +119,9 @@ #wikimedia-commons-tech: - Commons + - Commons-App(-.*)? + - GWToolset + - Uploading # The following changes should ALWAYS be in #wikimedia-dev, even if the bugs # are also reported elsewhere. -- To view, visit https://gerrit.wikimedia.org/r/199242 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib61a3dfa9a079b0eac2658da4ee4d9014a8a58c3 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Steinsplitter steinsplit...@wikipedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Render qualifiers in statementview after being saved - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Render qualifiers in statementview after being saved
..
Render qualifiers in statementview after being saved
While this could probably be done in a nicer way, this
is consistent with the changes in I9444ae5 and to avoid
massive merge conflicts.
Bug: T93073
Change-Id: I9db87de4e7f2f079393800412e6af3d14976f88a
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index bcb6c72..72f1435 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -478,7 +478,11 @@
: this.option( 'predefined' ).mainSnak || null
);
- if( this.isInEditMode() ) {
+ if( this.isInEditMode()
+ || this.options.value
+
this.options.value.getClaim().getQualifiers().length
+!this.$qualifiers.children().length
+ ) {
this._createQualifiersListview(
this.options.value
?
this.options.value.getClaim().getQualifiers()
--
To view, visit https://gerrit.wikimedia.org/r/197631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9db87de4e7f2f079393800412e6af3d14976f88a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Capture the whole formatting button in the scr... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Capture the whole formatting button in the
screenshot
..
[BrowserTest] Capture the whole formatting button in the screenshot
This makes the screenshot nicer and more complete.
Change-Id: I0dd9efd2978ff5468ab6101b11b7e6fdd3b0da30
---
M modules/ve-mw/init/ve.init.mw.Target.js
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
3 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 960257c..9b5f3dc 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -182,6 +182,7 @@
},
// Style
{
+ classes: [ 've-test-toolbar-style' ],
type: 'list',
icon: 'text-style',
indicator: 'down',
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 0cf4dea..91eb37b 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -165,7 +165,7 @@
Screenshot.capture(
@browser,
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.ve_text_style_element,
@current_page.formatting_option_menus_element]
+[@current_page.ve_text_style_button_element,
@current_page.formatting_option_menus_element]
)
end
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 9a7b242..918966f 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -179,6 +179,7 @@
span(:ve_strikethrough, class: 'oo-ui-iconElement-icon
oo-ui-icon-strikethrough-s')
span(:ve_subscript, class: 'oo-ui-iconElement-icon oo-ui-icon-subscript')
span(:ve_superscript, class: 'oo-ui-iconElement-icon oo-ui-icon-superscript')
+ div(:ve_text_style_button, class: 've-test-toolbar-style')
span(:ve_text_style, class: 'oo-ui-iconElement-icon oo-ui-icon-text-style')
span(:ve_underline, class: 'oo-ui-iconElement-icon oo-ui-icon-underline-u')
div(:visual_editor_toolbar, class: 'oo-ui-toolbar-tools')
--
To view, visit https://gerrit.wikimedia.org/r/199238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0dd9efd2978ff5468ab6101b11b7e6fdd3b0da30
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: cbed069..1d1ffac - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: cbed069..1d1ffac .. Syncronize VisualEditor: cbed069..1d1ffac Change-Id: I7c2d685656121b7c4b638bdacfd5791e27727e6c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index cbed069..1d1ffac 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit cbed0699841232469cf48d4f34c79f8466de8b1a +Subproject commit 1d1ffac74ed2eb2de32fa05e4ae7e3827d18f499 -- To view, visit https://gerrit.wikimedia.org/r/199244 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c2d685656121b7c4b638bdacfd5791e27727e6c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BREAKING] Make Citoid use service-template-node and service... - change (mediawiki...citoid)
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199250
Change subject: [BREAKING] Make Citoid use service-template-node and
service-runner
..
[BREAKING] Make Citoid use service-template-node and service-runner
This patch converts Citoid into a service-template-node-based service,
thus easing its development and deployment. Amongst other things, this
new basis brings:
- unified command-line arguments
- unified configuration management; localsettings.js is gone, the
configuration is to be managed by altering config.dev.yaml
- support for process clustering; this should improve performance and
availability, as until now only one process per host has been executed
- support for process management (OOM prevents and the like)
- support for logging directly to logstash (no more grepping and tailing)
- support for metrics reporting, both to a StatsD server, as well as to
the logger when run locally during development
- support for auto-magic error handling (with or without promises)
- code coverage reporting
- support for API versioning (yet to be used in Citoid)
This patch also structures and adds some more tests. Grunt has been
removed in favour of mocha. Note that 'npm test' still reports only
jshint results as a compatibility requirement with Jenkins. To run all
of the tests locally, use the 'mocha' command instead.
Note that, due to the disruptive nature of the patch, the following
commands should be run:
rm localsettings.js
rm -rf node_modules
npm install
Bug: T75993
Change-Id: I7370c9a91e67c263a291aab4b8ae9014a23efa5f
---
M .gitignore
M .jshintignore
M .jshintrc
D Gruntfile.js
A app.js
A config.dev.yaml
A config.yaml
M lib/CitoidService.js
M lib/Scraper.js
M lib/ZoteroService.js
M lib/pubMedRequest.js
M lib/translators/general.js
M lib/translators/openGraph.js
M lib/unshorten.js
A lib/util.js
D localsettings.js.sample
M package.json
A routes/root.js
M server.js
A test/features/app/index.js
A test/features/errors/index.js
A test/features/scraping/index.js
A test/features/scraping/lang.js
M test/index.js
A test/mocha.opts
A test/utils/assert.js
A test/utils/logStream.js
A test/utils/server.js
28 files changed, 1,154 insertions(+), 543 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/50/199250/1
diff --git a/.gitignore b/.gitignore
index c88c5d5..ea81c00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
*~
.DS_Store
*.log
-
-localsettings.js
-
node_modules
+coverage
diff --git a/.jshintignore b/.jshintignore
index 79e6ea4..1c69eee 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,2 +1,3 @@
+coverage
node_modules
-test
\ No newline at end of file
+test
diff --git a/.jshintrc b/.jshintrc
index bae215e..6e8ef79 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,4 +1,10 @@
{
+
+ predef: [
+ Map,
+ Set
+ ],
+
// Enforcing
bitwise: true,
eqeqeq: true,
@@ -6,7 +12,6 @@
noarg: true,
nonew: true,
undef: true,
- unused: true,
curly: true,
newcap: true,
@@ -33,5 +38,7 @@
module: true,
global: true
},
+ node: true,
esnext: true
+
}
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 7178f57..000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,39 +0,0 @@
-module.exports = function( grunt ) {
-
- // These plugins provide necessary tasks.
- grunt.loadNpmTasks('grunt-contrib-jshint');
- grunt.loadNpmTasks('grunt-simple-mocha');
-
- // Project configuration.
- grunt.initConfig({
- // Task configuration.
- jshint: {
- options: {
- jshintrc: true
- },
- all: [
- '*.js',
- 'localsettings.js.sample',
- 'lib/*.js',
- 'lib/translators/*.js',
- 'test/*.js'
- ]
- },
- simplemocha: {
- options: {
- globals: ['describe', 'its'],
- timeout: 2,
- ignoreLeaks: false,
- ui: 'bdd',
- reporter: 'tap'
- },
- all: { src: ['test/*.js'] }
- }
- });
-
- // Default task.
- grunt.registerTask('test', ['jshint:all']);
- grunt.registerTask('all', ['jshint:all', 'simplemocha']);
- grunt.registerTask('default', 'test');
-
-};
diff --git a/app.js b/app.js
new file mode 100644
index 000..d636a6b
--- /dev/null
+++ b/app.js
@@ -0,0 +1,148 @@
+'use strict';
+
+
+var http = require('http');
[MediaWiki-commits] [Gerrit] Make options nullable/optional in all ValueParsers - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Make options nullable/optional in all ValueParsers
..
Make options nullable/optional in all ValueParsers
Change-Id: Icbe0f3e420f44469400cb15e8a7e187f413fe316
---
M lib/includes/parsers/MWTimeIsoParser.php
M lib/includes/parsers/MonolingualTextParser.php
M lib/includes/parsers/PhpDateTimeParser.php
M lib/includes/parsers/TimeParser.php
M lib/includes/parsers/YearMonthTimeParser.php
M lib/includes/parsers/YearTimeParser.php
6 files changed, 39 insertions(+), 49 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/parsers/MWTimeIsoParser.php
b/lib/includes/parsers/MWTimeIsoParser.php
index cbf75e6..1d1e4fa 100644
--- a/lib/includes/parsers/MWTimeIsoParser.php
+++ b/lib/includes/parsers/MWTimeIsoParser.php
@@ -79,16 +79,13 @@
* @see StringValueParser::__construct
*/
public function __construct( ParserOptions $options = null ) {
- if( is_null( $options ) ) {
- $options = new ParserOptions();
- }
-
parent::__construct( $options );
- $this-lang = Language::factory(
$this-getOptions()-getOption( ValueParser::OPT_LANG ) );
+
+ $this-lang = Language::factory( $this-getOption(
ValueParser::OPT_LANG ) );
$this-isoTimestampParser = new IsoTimestampParser(
- new CalendarModelParser(),
- $this-getOptions()
+ new CalendarModelParser( $this-options ),
+ $this-options
);
}
diff --git a/lib/includes/parsers/MonolingualTextParser.php
b/lib/includes/parsers/MonolingualTextParser.php
index 22a1ab4..348e4f8 100644
--- a/lib/includes/parsers/MonolingualTextParser.php
+++ b/lib/includes/parsers/MonolingualTextParser.php
@@ -31,11 +31,11 @@
* @return MonolingualTextValue
*/
protected function stringParse( $value ) {
- if ( !$this-getOptions()-hasOption( 'valuelang' ) ) {
+ if ( !$this-options-hasOption( 'valuelang' ) ) {
throw new ParseException( 'Cannot construct a
MonolingualTextValue without a language code.' );
}
- $lang = $this-getOptions()-getOption( 'valuelang' );
+ $lang = $this-getOption( 'valuelang' );
try {
return new MonolingualTextValue( trim( $lang ), trim(
$value ) );
diff --git a/lib/includes/parsers/PhpDateTimeParser.php
b/lib/includes/parsers/PhpDateTimeParser.php
index c84b5dc..2853b3a 100644
--- a/lib/includes/parsers/PhpDateTimeParser.php
+++ b/lib/includes/parsers/PhpDateTimeParser.php
@@ -50,15 +50,15 @@
private $eraParser;
/**
-* @param EraParser $eraParser
+* @param EraParser|null $eraParser
* @param ParserOptions|null $options
*/
- public function __construct( EraParser $eraParser, ParserOptions
$options = null ) {
+ public function __construct( EraParser $eraParser = null, ParserOptions
$options = null ) {
parent::__construct( $options );
$languageCode = $this-getOption( ValueParser::OPT_LANG );
$this-monthUnlocalizer = new MonthNameUnlocalizer(
$languageCode );
- $this-eraParser = $eraParser;
+ $this-eraParser = $eraParser ?: new EraParser( $this-options
);
}
/**
@@ -72,9 +72,6 @@
*/
protected function stringParse( $value ) {
$rawValue = $value;
-
- $calendarModelParser = new CalendarModelParser();
- $options = $this-getOptions();
try {
list( $sign, $value ) = $this-eraParser-parse( $value
);
@@ -101,7 +98,10 @@
}
// Pass the reformatted string into a base parser that
parses this +/-Y-m-d\TH:i:s\Z format with a precision
- $valueParser = new IsoTimestampParser(
$calendarModelParser, $options );
+ $valueParser = new IsoTimestampParser(
+ new CalendarModelParser( $this-options ),
+ $this-options
+ );
return $valueParser-parse( $timeString );
} catch ( Exception $exception ) {
throw new ParseException( $exception-getMessage(),
$rawValue, self::FORMAT_NAME );
diff --git a/lib/includes/parsers/TimeParser.php
b/lib/includes/parsers/TimeParser.php
index 8ba1b62..e203c78 100644
--- a/lib/includes/parsers/TimeParser.php
+++ b/lib/includes/parsers/TimeParser.php
@@ -5,7 +5,6 @@
use DataValues\TimeValue;
use ValueParsers\CalendarModelParser;
use ValueParsers\ParseException;
-use
[MediaWiki-commits] [Gerrit] UserDailyContribs: message text clarification - change (mediawiki...UserDailyContribs)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/199256 Change subject: UserDailyContribs: message text clarification .. UserDailyContribs: message text clarification See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-userdailycontribs-param-basetimestamp/en Change-Id: Ibd2a6f89adaa319dc4fd7a26e5caa032531ae733 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserDailyContribs refs/changes/56/199256/1 diff --git a/i18n/en.json b/i18n/en.json index cd917a9..0c07ab6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -8,6 +8,6 @@ apihelp-userdailycontribs-description: Get the total number of user edits, time of registration, and edits in a given timeframe., apihelp-userdailycontribs-param-user: Username to query., apihelp-userdailycontribs-param-daysago: Number of edits since this many days ago., - apihelp-userdailycontribs-param-basetimestamp: Date from which $1daysago will be calculated, instead of \today\. Count returned in timeFrameEdits will be editcount between this date and the date \$1daysago\ from it., + apihelp-userdailycontribs-param-basetimestamp: Date from which code$1daysago/code will be calculated, instead of \today\. The count returned in codetimeFrameEdits/code will be the edit count between this date and the date \code$1daysago/code\ from it., apihelp-userdailycontribs-example-1: Get edit statistics for [[User:WikiSysop]] over the past 5 days } -- To view, visit https://gerrit.wikimedia.org/r/199256 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd2a6f89adaa319dc4fd7a26e5caa032531ae733 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserDailyContribs Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:ItemByTitle should preserve url parameters - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:ItemByTitle should preserve url parameters
..
Special:ItemByTitle should preserve url parameters
The most prominent use case for this is
Special:ItemByTitle/enwiki/Wikipedia?action=history,
which should redirect to Q52?action=history,
keeping the action=history parameter.
But also all other parameters will be preserved.
Bug: T50037
Change-Id: Ieb70546481d8e58824bd5df96c5116fbe063c02a
---
M repo/includes/specials/SpecialItemByTitle.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/specials/SpecialItemByTitle.php
b/repo/includes/specials/SpecialItemByTitle.php
index d42a132..152b351 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -154,7 +154,9 @@
// Redirect to the item page if we found its content
if ( $itemId !== null ) {
$title = $this-titleLookup-getTitleForId(
$itemId );
- $itemUrl = $title-getFullUrl();
+ $query = $request-getValues();
+ unset( $query['title'] );
+ $itemUrl = $title-getFullUrl( $query );
$this-getOutput()-redirect( $itemUrl );
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/199239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb70546481d8e58824bd5df96c5116fbe063c02a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Schnark listenle...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wgMFEditorOptions to ResourceLoaderGetConfigVars hook - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199227
Change subject: Move wgMFEditorOptions to ResourceLoaderGetConfigVars hook
..
Move wgMFEditorOptions to ResourceLoaderGetConfigVars hook
If the value is changed, it shouldn't require to purge all page caches
toprevent different behavior for different pages. Resources are cached for
a very short time, so confusion is minimal, if the value changes.
Bug: T93210
Change-Id: Ic3335c7b99b8982b5671690f3f33a80fd50d5498
---
M includes/MobileFrontend.hooks.php
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaAlpha.php
M javascripts/modules/editor/init.js
4 files changed, 19 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/27/199227/1
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 70ef90d..5fc3e59 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -354,20 +354,24 @@
* @return boolean
*/
public static function onResourceLoaderGetConfigVars( $vars ) {
- global $wgMFNearbyEndpoint, $wgMFContentNamespace;
- $vars['wgMFNearbyEndpoint'] = $wgMFNearbyEndpoint;
- $vars['wgMFThumbnailSizes'] = array(
- 'tiny' = MobilePage::TINY_IMAGE_WIDTH,
- 'small' = MobilePage::SMALL_IMAGE_WIDTH,
- );
- $vars['wgMFContentNamespace'] = $wgMFContentNamespace;
+ $context = MobileContext::singleton();
+ $config = $context-getMFConfig();
- // Set the licensing agreement that is displayed in the editor.
- $wgMFLicenseLink = SkinMinerva::getLicenseLink( 'editor' );
- $vars['wgMFLicenseLink'] = $wgMFLicenseLink;
- // Set the licensing agreement that is displayed in the
uploading interface.
- $wgMFUploadLicenseLink = SkinMinerva::getLicenseLink( 'upload'
);
- $vars['wgMFUploadLicenseLink'] = $wgMFUploadLicenseLink;
+ $vars += array(
+ 'wgMFNearbyEndpoint' = $config-get(
'MFNearbyEndpoint' ),
+ 'wgMFThumbnailSizes' = array(
+ 'tiny' = MobilePage::TINY_IMAGE_WIDTH,
+ 'small' = MobilePage::SMALL_IMAGE_WIDTH,
+ ),
+ 'wgMFContentNamespace' = $config-get(
'MFContentNamespace' ),
+ 'wgMFEditorOptions' = $config-get( 'MFEditorOptions'
),
+
+ // Set the licensing agreement that is displayed in the
editor.
+ 'wgMFLicenseLink' = SkinMinerva::getLicenseLink(
'editor' ),
+ // Set the licensing agreement that is displayed in the
uploading interface.
+ 'wgMFUploadLicenseLink' = SkinMinerva::getLicenseLink(
'upload' ),
+ );
+
return true;
}
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 05a3577..7f61663 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -844,7 +844,6 @@
'wgMFEnableJSConsoleRecruitment' = $config-get(
'MFEnableJSConsoleRecruitment' ),
'wgMFWikiDataEndpoint' = $config-get(
'MFWikiDataEndpoint' ),
'wgMFUseCentralAuthToken' = $config-get(
'MFUseCentralAuthToken' ),
- 'wgMFEditorOptions' = $config-get( 'MFEditorOptions'
),
'wgMFPhotoUploadAppendToDesc' = $config-get(
'MFPhotoUploadAppendToDesc' ),
'wgMFLeadPhotoUploadCssSelector' = $config-get(
'MFLeadPhotoUploadCssSelector' ),
'wgMFPhotoUploadEndpoint' =
diff --git a/includes/skins/SkinMinervaAlpha.php
b/includes/skins/SkinMinervaAlpha.php
index f9cadcd..121a540 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -54,7 +54,6 @@
$config = $this-getMFConfig();
$vars = parent::getSkinConfigVariables();
- $vars['wgMFEditorOptions']['anonymousEditing'] = true;
$vars['wgWikiBasePropertyConfig'] = $config-get(
'WikiBasePropertyConfig' );
$vars['wgMFInfoboxConfig'] = $config-get( 'MFInfoboxConfig' );
$vars['wgMFShowRedLinks'] = true;
diff --git a/javascripts/modules/editor/init.js
b/javascripts/modules/editor/init.js
index e2634fc..38bba63 100644
--- a/javascripts/modules/editor/init.js
+++ b/javascripts/modules/editor/init.js
@@ -16,6 +16,7 @@
enabledClass = enabledEditIcon.getGlyphClassName(),
disabledClass = disabledEditIcon.getGlyphClassName(),
browser = M.require( 'browser' ),
[MediaWiki-commits] [Gerrit] i18n: Remove reference to color in description message - change (mediawiki...Popups)
jenkins-bot has submitted this change and it was merged. Change subject: i18n: Remove reference to color in description message .. i18n: Remove reference to color in description message See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Popups-settings-description/en Change-Id: Ic89f2f71556bb1202f0d452e430f716ee359e264 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Prtksxna: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 0b14cb1..acd3002 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -7,7 +7,7 @@ popups-last-edited: Last edited $1, popups-redirects: redirects to h3$1/h3, popups-settings-title: Page preview, -popups-settings-description: This tool lets you preview blue links and references., +popups-settings-description: This tool lets you preview links to wiki pages and to references., popups-settings-option-simple: Simple, popups-settings-option-simple-description: See the lead sentence of a page and a preview image. This is recommended for readers., popups-settings-option-advanced: Advanced, -- To view, visit https://gerrit.wikimedia.org/r/199228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic89f2f71556bb1202f0d452e430f716ee359e264 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org Gerrit-Reviewer: Prtksxna psax...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix/enhance PHPDoc tags in TermIndex classes - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199245
Change subject: Fix/enhance PHPDoc tags in TermIndex classes
..
Fix/enhance PHPDoc tags in TermIndex classes
This is split from I6d83809. This is a pure documentation-only change.
And I'm splitting long lines.
This is a resubmission of I2bb472c which already does have a +2.
Change-Id: I66c952d4627c080db90c507368b9867fa8a2dfce
---
M lib/includes/store/TermIndex.php
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/store/MockTermIndex.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
4 files changed, 80 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/45/199245/1
diff --git a/lib/includes/store/TermIndex.php b/lib/includes/store/TermIndex.php
index 10b9dfb..a7f30d4 100644
--- a/lib/includes/store/TermIndex.php
+++ b/lib/includes/store/TermIndex.php
@@ -48,7 +48,11 @@
*
* @return Term[]
*/
- public function getTermsOfEntity( EntityId $entityId, array $termTypes
= null, array $languageCodes = null );
+ public function getTermsOfEntity(
+ EntityId $entityId,
+ array $termTypes = null,
+ array $languageCodes = null
+ );
/**
* Returns the terms stored for the given entities. Can be filtered by
language.
@@ -64,7 +68,11 @@
*
* @return Term[]
*/
- public function getTermsOfEntities( array $entityIds, array $termTypes
= null, array $languageCodes = null );
+ public function getTermsOfEntities(
+ array $entityIds,
+ array $termTypes = null,
+ array $languageCodes = null
+ );
/**
* Returns the terms that match the provided conditions.
@@ -91,7 +99,12 @@
*
* @return Term[]
*/
- public function getMatchingTerms( array $terms, $termType = null,
$entityType = null, array $options = array() );
+ public function getMatchingTerms(
+ array $terms,
+ $termType = null,
+ $entityType = null,
+ array $options = array()
+ );
/**
* Returns the IDs that match the provided conditions.
diff --git a/lib/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
index c642753..501f6bd 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -11,6 +11,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\LegacyIdInterpreter;
+use Wikibase\DataModel\Term\AliasGroup;
use Wikibase\DataModel\Term\Fingerprint;
use Wikibase\DataModel\Term\FingerprintProvider;
use Wikibase\Lib\Store\LabelConflictFinder;
@@ -91,7 +92,7 @@
*
* @param EntityDocument $entity
*
-* @return boolean Success indicator
+* @return bool Success indicator
*/
public function saveTermsOfEntity( EntityDocument $entity ) {
//First check whether there's anything to update
@@ -136,7 +137,7 @@
* @param Term[] $terms
* @param DatabaseBase $dbw
*
-* @return boolean Success indicator
+* @return bool Success indicator
*/
public function insertTermsInternal( EntityDocument $entity, $terms,
DatabaseBase $dbw ) {
$entityIdentifiers = array(
@@ -222,6 +223,7 @@
$terms[] = $term;
}
+ /** @var AliasGroup $aliasGroup */
foreach ( $fingerprint-getAliasGroups() as $aliasGroup ) {
foreach ( $aliasGroup-getAliases() as $alias ) {
$term = new Term( $extraFields );
@@ -249,7 +251,7 @@
* @param Term[] $terms
* @param DatabaseBase $dbw
*
-* @return boolean Success indicator
+* @return bool Success indicator
*/
public function deleteTermsInternal( EntityId $entityId, $terms,
DatabaseBase $dbw ) {
//TODO: Make getTermsOfEntity() collect term_row_id values, so
we can use them here.
@@ -341,7 +343,7 @@
*
* @param EntityId $entityId
*
-* @return boolean Success indicator
+* @return bool Success indicator
*/
public function deleteTermsOfEntity( EntityId $entityId ) {
$dbw = $this-getConnection( DB_MASTER );
@@ -413,7 +415,7 @@
* @param string[]|null $languageCodes
*
* @throws MWException
-* @return array
+* @return Term[]
*/
private function fetchTerms(
array $entityIds,
@@ -481,7 +483,7 @@
}
/**
-* Returns the Database connection to wich to write.
+*
[MediaWiki-commits] [Gerrit] BlueSiceExtensions: minor message text enhancement - change (mediawiki...BlueSpiceExtensions)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/199254 Change subject: BlueSiceExtensions: minor message text enhancement .. BlueSiceExtensions: minor message text enhancement See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Bs-pageaccess-error-included-forbidden-template/en https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikigrok-dialog-error-message-heading/en Change-Id: I51bfa9c6c1cda0382fe60379712e4a7996e00c1d --- M PageAccess/PageAccess.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/54/199254/1 diff --git a/PageAccess/PageAccess.i18n.php b/PageAccess/PageAccess.i18n.php index a56555b..e9cf848 100644 --- a/PageAccess/PageAccess.i18n.php +++ b/PageAccess/PageAccess.i18n.php @@ -34,8 +34,8 @@ $messages['en'] = array( 'bs-pageaccess-desc' = 'Controls access on page level.', 'bs-pageaccess-error-no-groups-given' = 'No groups were specified.', - 'bs-pageaccess-error-not-member-of-given-groups' = 'You\'re not a member of the given groups. In order to prevent you from locking yourself out, saving was disabled.', - 'bs-pageaccess-error-included-forbidden-template' = 'You\'ve tried to use the template $1 to which you don\'t have read access. In order to prevent you from locking yourself out, saving was disabled.', + 'bs-pageaccess-error-not-member-of-given-groups' = 'You are not a member of the given groups. In order to prevent you from locking yourself out, saving was disabled.', + 'bs-pageaccess-error-included-forbidden-template' = 'You have tried to use the template $1 to which you do not have read access. In order to prevent you from locking yourself out, saving was disabled.', 'bs-pageaccess-tag-groups-desc' = 'Specify the groups that should have exclusive access to this page. Multiple groups can be separated by commas.', 'pageaccess' = 'Pages secured by PageAccess' ); -- To view, visit https://gerrit.wikimedia.org/r/199254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51bfa9c6c1cda0382fe60379712e4a7996e00c1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Store/Sql tests to correct directory - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move Store/Sql tests to correct directory .. Move Store/Sql tests to correct directory Change-Id: Ib5f0e68940d588468e38f02244826ed4d28b25a4 --- R lib/tests/phpunit/store/Sql/PropertyInfoTableTest.php R lib/tests/phpunit/store/Sql/SiteLinkTableTest.php R lib/tests/phpunit/store/Sql/SqlEntityInfoBuilderTest.php 3 files changed, 0 insertions(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/lib/tests/phpunit/store/PropertyInfoTableTest.php b/lib/tests/phpunit/store/Sql/PropertyInfoTableTest.php similarity index 100% rename from lib/tests/phpunit/store/PropertyInfoTableTest.php rename to lib/tests/phpunit/store/Sql/PropertyInfoTableTest.php diff --git a/lib/tests/phpunit/store/SiteLinkTableTest.php b/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php similarity index 100% rename from lib/tests/phpunit/store/SiteLinkTableTest.php rename to lib/tests/phpunit/store/Sql/SiteLinkTableTest.php diff --git a/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php b/lib/tests/phpunit/store/Sql/SqlEntityInfoBuilderTest.php similarity index 100% rename from lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php rename to lib/tests/phpunit/store/Sql/SqlEntityInfoBuilderTest.php -- To view, visit https://gerrit.wikimedia.org/r/191013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5f0e68940d588468e38f02244826ed4d28b25a4 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API mode=hidelist showlist for action=editlist - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: API mode=hidelist showlist for action=editlist
..
API mode=hidelist showlist for action=editlist
* editlist now uses mode parameter. By default it is update
* mode=remove replaces 'remove=1'
* mode=deletelist replaces 'deletelist=1'
* Added mode=hidelist showlist - only available
to the users with the gather-hidelist right
* query's list=lists now returns perm=public|private|hidden
in addition to public=true|false -- should migrate and remove it
* Deleted extension.json - unable to keep it in sync,
pointless and dangerous to keep until we migrate.
* Your local settings should have this code:
if ( class_exists( 'ExtensionRegistry' ) file_exists(
$IP/extensions/Gather/extension.json ) ) {
ExtensionRegistry::getInstance()-queue(
$IP/extensions/Gather/extension.json );
} else {
include_once $IP/extensions/Gather/Gather.php;
}
Bug: T93382
Bug: T93263
Change-Id: I752976a8afbba42485aef545deda1f6e84846d0b
---
M Gather.php
D extension.json
M i18n/en.json
M includes/api/ApiEditList.php
M includes/api/ApiQueryListPages.php
M includes/api/ApiQueryLists.php
M resources/ext.gather.watchstar/CollectionsApi.js
M tests/phpunit/api/GatherTests.php
8 files changed, 302 insertions(+), 375 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gather.php b/Gather.php
index 6dbe42c..29c3143 100644
--- a/Gather.php
+++ b/Gather.php
@@ -90,5 +90,10 @@
// Configuration
$wgGatherShouldShowTutorial = true;
+// Permissions
+$wgAvailableRights[] = 'gather-hidelist';
+$wgGroupPermissions['*']['gather-hidelist'] = false;
+$wgGroupPermissions['sysop']['gather-hidelist'] = true;
+
// ResourceLoader modules
require_once __DIR__ . /resources/Resources.php;
diff --git a/extension.json b/extension.json
deleted file mode 100644
index af7cc62..000
--- a/extension.json
+++ /dev/null
@@ -1,290 +0,0 @@
-{
- name: Gather,
- author: [
- Jon Robson,
- Joaquin Hernandez,
- Rob Moen
- ],
- url: https://www.mediawiki.org/wiki/Gather;,
- descriptionmsg: gather-desc,
- license-name: GPL-2.0+,
- type: other,
- ExtensionFunctions: [
- Gather\\Hooks::onExtensionSetup
- ],
- SpecialPages: {
- Gather: Gather\\SpecialGather,
- GatherLists: Gather\\SpecialGatherLists
- },
- MessagesDirs: {
- Gather: [
- i18n
- ]
- },
- ExtensionMessagesFiles: {
- GatherAlias: Gather.alias.php
- },
- AutoloadClasses: {
- Gather\\Hooks: includes/Gather.hooks.php,
- Gather\\UpdaterHooks: schema/Updater.hooks.php,
- Gather\\models\\CollectionItem:
includes/models/CollectionItem.php,
- Gather\\models\\CollectionBase:
includes/models/CollectionBase.php,
- Gather\\models\\CollectionInfo:
includes/models/CollectionInfo.php,
- Gather\\models\\Collection: includes/models/Collection.php,
- Gather\\models\\CollectionsList:
includes/models/CollectionsList.php,
- Gather\\models\\WithImage: includes/models/WithImage.php,
- Gather\\models\\ArraySerializable:
includes/models/ArraySerializable.php,
- Gather\\views\\View: includes/views/View.php,
- Gather\\views\\NotFound: includes/views/NotFound.php,
- Gather\\views\\NoPublic: includes/views/NoPublic.php,
- Gather\\views\\Collection: includes/views/Collection.php,
- Gather\\views\\CollectionItemCard:
includes/views/CollectionItemCard.php,
- Gather\\views\\Image: includes/views/Image.php,
- Gather\\views\\CollectionsList:
includes/views/CollectionsList.php,
- Gather\\views\\CollectionsListItemCard:
includes/views/CollectionsListItemCard.php,
- Gather\\views\\helpers\\CSS: includes/views/helpers/CSS.php,
- Gather\\SpecialGather: includes/specials/SpecialGather.php,
- Gather\\SpecialGatherLists:
includes/specials/SpecialGatherLists.php,
- Gather\\api\\ApiEditList: includes/api/ApiEditList.php,
- Gather\\api\\ApiQueryLists: includes/api/ApiQueryLists.php,
- Gather\\api\\ApiQueryListPages:
includes/api/ApiQueryListPages.php
- },
- APIModules: {
- editlist: Gather\\api\\ApiEditList
- },
- APIListModules: {
- lists: Gather\\api\\ApiQueryLists,
- listpages: Gather\\api\\ApiQueryListPages
- },
- ResourceModules: {
- ext.gather.icons: {
- targets: [
- mobile,
- desktop
-
[MediaWiki-commits] [Gerrit] Fix prioritizing sort in dispatchChanges. - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Fix prioritizing sort in dispatchChanges. .. Fix prioritizing sort in dispatchChanges. This fixes a bug that causes the order in which clients are picked for dispatching to be random, instead of selecting the most lagged client first. Backporting this to have more control over the deploy. Change-Id: If390b4773debdc41889d211934f6c92550b4cfc1 (cherry picked from commit 07fbc59bccdca26a46cdde7ea9f21534052e5abe) --- M lib/maintenance/dispatchChanges.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Aude: Looks good to me, approved Daniel Kinzler: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/lib/maintenance/dispatchChanges.php b/lib/maintenance/dispatchChanges.php index f2131d8..81d896b 100644 --- a/lib/maintenance/dispatchChanges.php +++ b/lib/maintenance/dispatchChanges.php @@ -418,9 +418,9 @@ , __METHOD__, array( - 'ORDER BY chd_seen ASC', + 'ORDER BY' = 'chd_seen ASC', 'FOR UPDATE', - 'LIMIT ' . (int)$this-randomness + 'LIMIT' = (int)$this-randomness ) ); -- To view, visit https://gerrit.wikimedia.org/r/199232 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If390b4773debdc41889d211934f6c92550b4cfc1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Strip out X-Parsoid-Performance headers - change (mediawiki...parsoid)
Memeht has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199231
Change subject: Strip out X-Parsoid-Performance headers
..
Strip out X-Parsoid-Performance headers
Removed the X-Parsoid-Performance headers from HTTP responses in api/routes.js
and mediawiki.parser.environment.js. These headers have been replaced with
performance instrumentation using Graphite.
Change-Id: I936ada7b18e2cf6d9ca0091f68575f3d37b45b07
---
M api/routes.js
M lib/mediawiki.parser.environment.js
2 files changed, 15 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/31/199231/1
diff --git a/api/routes.js b/api/routes.js
index b98c21c..fceb869 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -113,7 +113,6 @@
};
var rtResponse = function( env, req, res, data ) {
- apiUtils.setHeader( res, env, 'X-Parsoid-Performance',
env.getPerformanceHeader() );
apiUtils.renderResponse( res, env, roundtrip, data );
env.log( info, completed parsing in, env.performance.duration, ms
);
};
@@ -321,7 +320,6 @@
doc.body, function( chunk ) { out.push( chunk ); },
false
);
}).timeout( REQ_TIMEOUT ).then(function() {
- apiUtils.setHeader(res, env, 'X-Parsoid-Performance',
env.getPerformanceHeader());
var output = out.join(''),
contentType =
'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0;charset=utf-8';
if ( v2 ) {
@@ -337,7 +335,8 @@
}
if ( timer ) {
- timer.timing( 'html2wt.total', '', ( Date.now() -
startTimers.get( 'html2wt.total' )) );
+ timer.timing( 'html2wt.total', '', ( Date.now() -
+ startTimers.get( 'html2wt.total' )) );
timer.timing( 'html2wt.size.output', '', output.length
);
}
@@ -378,7 +377,6 @@
}
function sendRes(doc) {
- apiUtils.setHeader(res, env, 'X-Parsoid-Performance',
env.getPerformanceHeader());
var output, contentType =
'text/html;profile=mediawiki.org/specs/html/1.0.0;charset=utf-8';
if ( v2 v2.format === pagebundle ) {
var dpScriptElt = doc.getElementById('mw-data-parsoid');
@@ -403,13 +401,16 @@
if ( timer ){
if ( startTimers.has( 'wt2html.wt.parse' ) ){
- timer.timing( 'wt2html.wt.parse', '', (
Date.now() - startTimers.get( 'wt2html.wt.parse' )) );
+ timer.timing( 'wt2html.wt.parse', '', (
Date.now() -
+ startTimers.get( 'wt2html.wt.parse' ))
);
timer.timing( 'wt2html.wt.size.output', '',
output.length );
} else if ( startTimers.has(
'wt2html.pageWithOldid.parse' ) ){
- timer.timing( 'wt2html.pageWithOldid.parse',
'', ( Date.now() - startTimers.get( 'wt2html.pageWithOldid.parse' )) );
+ timer.timing( 'wt2html.pageWithOldid.parse',
'', ( Date.now() -
+ startTimers.get(
'wt2html.pageWithOldid.parse' )) );
timer.timing(
'wt2html.pageWithOldid.size.output', '', output.length );
}
- timer.timing( 'wt2html.total', '', ( Date.now() -
startTimers.get( 'wt2html.total' )) );
+ timer.timing( 'wt2html.total', '', ( Date.now() -
+ startTimers.get( 'wt2html.total' )) );
}
env.log(info, completed parsing in,
env.performance.duration, ms);
@@ -419,7 +420,8 @@
env.log('info', 'started parsing');
if ( timer ){
- timer.timing( 'wt2html.wt.init', '', ( Date.now() -
startTimers.get( 'wt2html.init' )) );
+ timer.timing( 'wt2html.wt.init', '', ( Date.now() -
+ startTimers.get( 'wt2html.init' )) );
startTimers.set( 'wt2html.wt.parse', Date.now() );
timer.timing( 'wt2html.wt.size.input', '', wt.length );
}
@@ -442,7 +444,8 @@
function parsePageWithOldid() {
if ( timer ){
- timer.timing( 'wt2html.pageWithOldid.init', '', (
Date.now() - startTimers.get( 'wt2html.init' )) );
+ timer.timing( 'wt2html.pageWithOldid.init', '', (
Date.now() -
+ startTimers.get( 'wt2html.init' )) );
startTimers.set( 'wt2html.pageWithOldid.parse',
Date.now() );
timer.timing('wt2html.pageWithOldid.size.input', '',
env.page.src.length );
[MediaWiki-commits] [Gerrit] Fix prioritizing sort in dispatchChanges. - change (mediawiki...Wikibase)
Hoo man has submitted this change and it was merged. Change subject: Fix prioritizing sort in dispatchChanges. .. Fix prioritizing sort in dispatchChanges. This fixes a bug that causes the order in which clients are picked for dispatching to be random, instead of selecting the most lagged client first. Change-Id: If390b4773debdc41889d211934f6c92550b4cfc1 --- M lib/maintenance/dispatchChanges.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/maintenance/dispatchChanges.php b/lib/maintenance/dispatchChanges.php index 96ae2cf..8b99b38 100644 --- a/lib/maintenance/dispatchChanges.php +++ b/lib/maintenance/dispatchChanges.php @@ -418,9 +418,9 @@ , __METHOD__, array( - 'ORDER BY chd_seen ASC', + 'ORDER BY' = 'chd_seen ASC', 'FOR UPDATE', - 'LIMIT ' . (int)$this-randomness + 'LIMIT' = (int)$this-randomness ) ); -- To view, visit https://gerrit.wikimedia.org/r/199147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If390b4773debdc41889d211934f6c92550b4cfc1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Survey)
Raimond Spekking has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I14d19e782bc00c2664ce231cd8780807ad932384 --- M Survey.alias.php 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved Raimond Spekking: Verified; Looks good to me, approved diff --git a/Survey.alias.php b/Survey.alias.php index 8659326..6850acc 100644 --- a/Survey.alias.php +++ b/Survey.alias.php @@ -71,6 +71,14 @@ 'TakeSurvey' = array( 'Umfroog_beantworte' ), ); +/** Hebrew (עברית) */ +$specialPageAliases['he'] = array( + 'EditSurvey' = array( 'עריכת_סקר' ), + 'Surveys' = array( 'סקרים' ), + 'SurveyStats' = array( 'סטטיסטיקות_סקר' ), + 'TakeSurvey' = array( 'מילוי_סקר' ), +); + /** Interlingua (interlingua) */ $specialPageAliases['ia'] = array( 'EditSurvey' = array( 'Modificar_questionario', 'Questionario' ), -- To view, visit https://gerrit.wikimedia.org/r/198621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14d19e782bc00c2664ce231cd8780807ad932384 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Survey Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Private by default in TermSqlIndex - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Private by default in TermSqlIndex
..
Private by default in TermSqlIndex
This class does not have subclasses. Protected is meaningless and can
be replaced with private. Should be the default anyway.
Change-Id: I97c961cb3ec032f7e41d38f2b192432d8750172c
---
M lib/includes/store/sql/TermSqlIndex.php
1 file changed, 8 insertions(+), 20 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
index 501f6bd..535d2ec 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -30,30 +30,26 @@
class TermSqlIndex extends DBAccessBase implements TermIndex,
LabelConflictFinder {
/**
-* @since 0.1
-*
* @var string
*/
- protected $tableName;
+ private $tableName;
/**
* @var StringNormalizer
*/
- protected $stringNormalizer;
+ private $stringNormalizer;
/**
* @var int
*/
- protected $maxConflicts = 10;
+ private $maxConflicts = 10;
/**
* Maps table fields to TermIndex interface field names.
*
-* @since 0.2
-*
* @var array
*/
- protected $termFieldMap = array(
+ private $termFieldMap = array(
'term_entity_type' = 'entityType',
'term_type' = 'termType',
'term_language' = 'termLanguage',
@@ -297,13 +293,11 @@
*
* TODO Should be moved to its own object and be added via dependency
injection
*
-* @since 0.4
-*
* @param EntityDocument $entity
*
* @return float weight
*/
- protected function getWeight( EntityDocument $entity ) {
+ private function getWeight( EntityDocument $entity ) {
// FIXME: OCP violation. No support for new types of entities
can be registered
if ( $entity instanceof Item ) {
@@ -316,13 +310,11 @@
/**
* Returns an array with the database table fields for the provided
term.
*
-* @since 0.2
-*
* @param Term $term
*
* @return array
*/
- protected function getTermFields( Term $term ) {
+ private function getTermFields( Term $term ) {
$fields = array(
'term_language' = $term-getLanguage(),
'term_type' = $term-getType(),
@@ -660,8 +652,6 @@
}
/**
-* @since 0.5
-*
* @param DatabaseBase $db
* @param Term $term
* @param string|null $termType
@@ -670,7 +660,7 @@
*
* @return array
*/
- protected function termMatchConditions(
+ private function termMatchConditions(
DatabaseBase $db,
Term $term,
$termType,
@@ -741,13 +731,11 @@
* Modifies the provided terms to use the field names expected by the
interface
* rather then the table field names. Also ensures the values are of
the correct type.
*
-* @since 0.2
-*
* @param Iterator|array $obtainedTerms PHP fails for not having a
common iterator/array thing :0
*
* @return Term[]
*/
- protected function buildTermResult( $obtainedTerms ) {
+ private function buildTermResult( $obtainedTerms ) {
$matchingTerms = array();
foreach ( $obtainedTerms as $obtainedTerm ) {
--
To view, visit https://gerrit.wikimedia.org/r/191014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97c961cb3ec032f7e41d38f2b192432d8750172c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CentralAuth: add PLURAL to messages with lists. - change (mediawiki...CentralAuth)
Purodha has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199248
Change subject: CentralAuth: add PLURAL to messages with lists.
..
CentralAuth: add PLURAL to messages with lists.
See
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Centralauth-list-attached-dryrun/ksh
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Centralauth-list-attached/en_(2)
Change-Id: I5ee8dd124060e64f3a48f654262c2ad7af9cdb6a
---
M i18n/en.json
M includes/specials/SpecialMergeAccount.php
2 files changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/48/199248/1
diff --git a/i18n/en.json b/i18n/en.json
index 0246b43..54af761 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -65,8 +65,8 @@
centralauth-list-home-title: Home wiki,
centralauth-list-home-dryrun: The password and email address set at
this wiki will be used for your unified account.,
centralauth-list-attached-title: Attached accounts,
- centralauth-list-attached: The accounts named \$1\ on each of the
following sites have been automatically attached to the unified account:,
- centralauth-list-attached-dryrun: The accounts named \$1\ on each
of the following sites will be automatically attached to the unified account:,
+ centralauth-list-attached: The {{PLURAL:$2|account named \$1\ on
the following site|accounts named \$1\ on each of the following sites}} have
been automatically attached to the unified account:,
+ centralauth-list-attached-dryrun: The {{PLURAL:$2|account named
\$1\ on the following site|accounts named \$1\ on each of the following
sites}} will be automatically attached to the unified account:,
centralauth-list-unattached-title: Unattached accounts,
centralauth-list-unattached: The {{PLURAL:$2|account|accounts}}
named \$1\ could not be automatically confirmed as belonging to you on the
following {{PLURAL:$2|site|sites}};\nmost likely {{PLURAL:$2|it has|they have}}
a different password from your primary account:,
centralauth-foreign-link: User $1 on $2,
diff --git a/includes/specials/SpecialMergeAccount.php
b/includes/specials/SpecialMergeAccount.php
index 76c4d4f..4de91d1 100644
--- a/includes/specials/SpecialMergeAccount.php
+++ b/includes/specials/SpecialMergeAccount.php
@@ -392,8 +392,11 @@
if ( $merged ) {
$this-getOutput()-addHTML( Xml::element( 'hr' ) );
- $this-getOutput()-addWikiMsg(
'centralauth-list-attached',
- $this-mUserName );
+ $this-getOutput()-addWikiMsg(
+ 'centralauth-list-attached',
+ $this-mUserName,
+ count( $merged )
+ );
$this-getOutput()-addHTML( $this-listAttached(
$merged ) );
}
@@ -607,7 +610,8 @@
$html .= Html::rawElement( 'h3', array(),
$this-msg( 'centralauth-list-attached-title'
)-escaped()
) . $this-msg( 'centralauth-list-attached-dryrun',
- $this-getUser()-getName() )-parseAsBlock();
+ $this-getUser()-getName(),
+ count( $attached ) )-parseAsBlock();
}
$html .= $this-listAttached( $attached, $methods ) .
--
To view, visit https://gerrit.wikimedia.org/r/199248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ee8dd124060e64f3a48f654262c2ad7af9cdb6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Purodha puro...@blissenbach.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add credits to i18n files - change (mediawiki...Gather)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199252
Change subject: Add credits to i18n files
..
Add credits to i18n files
Change-Id: Ib9468fa255e2c05be6950b0bb862c5e370601e54
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/52/199252/1
diff --git a/i18n/en.json b/i18n/en.json
index 2bc6e34..8e7aac6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,6 +1,10 @@
{
@metadata: {
- authors: []
+ authors: [
+ Joaquin Hernandez,
+ Jon Robson,
+ Rob Moen
+ ]
},
gather-remove-from-collection-failed-toast: Unable to remove page
from collection.,
gather-add-to-collection-failed-toast: Unable to add page to
collection,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0366a19..bb78b7f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,6 +1,10 @@
{
@metadata: {
authors: [
+ Dan Garry,
+ Joaquin Hernandez,
+ Jon Robson,
+ Rob Moen,
Liuxinyu970226,
Robby
]
--
To view, visit https://gerrit.wikimedia.org/r/199252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9468fa255e2c05be6950b0bb862c5e370601e54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid name collision - change (mediawiki...OOUIPlayground)
Werdna has uploaded a new change for review. https://gerrit.wikimedia.org/r/199229 Change subject: Avoid name collision .. Avoid name collision Change-Id: I2571caa2866821a2712c29b7ee984970a3c3a7fd --- M includes/container.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OOUIPlayground refs/changes/29/199229/1 diff --git a/includes/container.php b/includes/container.php index 462fec9..055b711 100644 --- a/includes/container.php +++ b/includes/container.php @@ -3,10 +3,10 @@ namespace OOUIPlayground; use FormatJson; -use Pimple\Container; +use Pimple\Container as PimpleContainer; use SimpleLightNCandy; -$container = new Container; +$container = new PimpleContainer; $container['classMap'] = array( 'buttongroup' = array( -- To view, visit https://gerrit.wikimedia.org/r/199229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2571caa2866821a2712c29b7ee984970a3c3a7fd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OOUIPlayground Gerrit-Branch: master Gerrit-Owner: Werdna agarr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make all QUnit tests pass for languages other than English - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199241
Change subject: Make all QUnit tests pass for languages other than English
..
Make all QUnit tests pass for languages other than English
Some tablesorter tests were failing for a content language different from
English, and the test for two functions from mw.language for a different
UI language.
This patch provides a mocked environment for all these tests, simulating
English language.
Bug: T59776
Change-Id: Ibfc83c34a896dc5fb5e892fb0ffd60e618880781
---
M tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
M tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
M tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
3 files changed, 61 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/41/199241/1
diff --git
a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
index 2c56eea..97a3ae1 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
@@ -6,17 +6,40 @@
var text, ipv4,
simpleMDYDatesInMDY, simpleMDYDatesInDMY, oldMDYDates,
complexMDYDates, clobberedDates, MYDates, YDates,
- currencyData, transformedCurrencyData,
- config = {
+ currencyData, transformedCurrencyData;
+
+ QUnit.module( 'jquery.tablesorter.parsers', QUnit.newMwEnvironment( {
+ setup: function () {
+ this.liveMonths = mw.language.months;
+ mw.language.months = {
+ 'keys': {
+ 'names': ['january', 'february',
'march', 'april', 'may_long', 'june',
+ 'july', 'august', 'september',
'october', 'november', 'december'],
+ 'genitive': ['january-gen',
'february-gen', 'march-gen', 'april-gen', 'may-gen', 'june-gen',
+ 'july-gen', 'august-gen',
'september-gen', 'october-gen', 'november-gen', 'december-gen'],
+ 'abbrev': ['jan', 'feb', 'mar', 'apr',
'may', 'jun',
+ 'jul', 'aug', 'sep', 'oct',
'nov', 'dec']
+ },
+ 'names': ['January', 'February', 'March',
'April', 'May', 'June',
+ 'July', 'August', 'September',
'October', 'November', 'December'],
+ 'genitive': ['January', 'February', 'March',
'April', 'May', 'June',
+ 'July', 'August', 'September',
'October', 'November', 'December'],
+ 'abbrev': ['Jan', 'Feb', 'Mar', 'Apr', 'May',
'Jun',
+ 'Jul', 'Aug', 'Sep', 'Oct',
'Nov', 'Dec']
+ };
+ },
+ teardown: function () {
+ mw.language.months = this.liveMonths;
+ },
+ config: {
wgContentLanguage: 'en',
/* default date format of the content language */
wgDefaultDateFormat: 'dmy',
/* These two are important for numeric interpretations
*/
wgSeparatorTransformTable: ['', ''],
wgDigitTransformTable: ['', '']
- };
-
- QUnit.module( 'jquery.tablesorter.parsers', QUnit.newMwEnvironment( {
config: config } ) );
+ }
+ } ) );
/**
* For a value, check if the parser recognizes it and how it transforms
it
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index f7700f8..f63aa27 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -156,9 +156,29 @@
];
QUnit.module( 'jquery.tablesorter', QUnit.newMwEnvironment( {
+ setup: function () {
+ this.liveMonths = mw.language.months;
+ mw.language.months = {
+ 'keys': {
+ 'names': ['january', 'february',
'march', 'april', 'may_long', 'june',
+ 'july', 'august', 'september',
'october', 'november', 'december'],
+ 'genitive': ['january-gen',
'february-gen', 'march-gen', 'april-gen',
[MediaWiki-commits] [Gerrit] wip: set button height - change (oojs/ui)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199246
Change subject: wip: set button height
..
wip: set button height
Change-Id: I6e191c6308fbbb6075b5f4b6b8fb0ae87aa58480
---
M demos/pages/widgets.js
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
3 files changed, 86 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/46/199246/1
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 642d4e3..085817a 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -487,6 +487,90 @@
label: 'ButtonWidget
(frameless, indicator)\u200E',
align: 'top'
}
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
+ flags: [ 'constructive',
'primary' ],
+ label: 'Button',
+ } ),
+ {
+ label: 'ButtonWidget
(constructive)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
+ flags: [ 'constructive',
'primary' ],
+ icon: 'picture',
+ } ),
+ {
+ label: 'ButtonWidget (only
icon, constructive)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
+ flags: [ 'constructive',
'primary' ],
+ indicator: 'down',
+ } ),
+ {
+ label: 'ButtonWidget (only
indicator, constructive)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
+ flags: [ 'constructive',
'primary' ],
+ icon: 'picture',
+ label: 'Button with Icon',
+ } ),
+ {
+ label: 'ButtonWidget (icon and
label, constructive)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
+ flags: [ 'constructive',
'primary' ],
+ indicator: 'down',
+ label: 'Button with Indicator',
+ } ),
+ {
+ label: 'ButtonWidget (label and
indicator, constructive)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
+ flags: [ 'constructive',
'primary' ],
+ icon: 'picture',
+ indicator: 'down',
+ label: 'Button with Icon
Indicator',
+ } ),
+ {
+ label: 'ButtonWidget (label,
icon and indicator, constructive)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
+
[MediaWiki-commits] [Gerrit] Prepare time parsers for dependency injection - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199255
Change subject: Prepare time parsers for dependency injection
..
Prepare time parsers for dependency injection
Some simple basic refactoring to prepare these classes for proper
dependency injection.
Change-Id: Ieb3008bc17411093422a0689addf719c043ebec5
---
M lib/includes/parsers/MWTimeIsoParser.php
M lib/includes/parsers/PhpDateTimeParser.php
M lib/includes/parsers/YearMonthTimeParser.php
M lib/includes/parsers/YearTimeParser.php
4 files changed, 29 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/55/199255/1
diff --git a/lib/includes/parsers/MWTimeIsoParser.php
b/lib/includes/parsers/MWTimeIsoParser.php
index 1d1e4fa..21b589d 100644
--- a/lib/includes/parsers/MWTimeIsoParser.php
+++ b/lib/includes/parsers/MWTimeIsoParser.php
@@ -71,7 +71,7 @@
private $lang;
/**
-* @var IsoTimestampParser
+* @var ValueParser
*/
private $isoTimestampParser;
@@ -82,7 +82,6 @@
parent::__construct( $options );
$this-lang = Language::factory( $this-getOption(
ValueParser::OPT_LANG ) );
-
$this-isoTimestampParser = new IsoTimestampParser(
new CalendarModelParser( $this-options ),
$this-options
diff --git a/lib/includes/parsers/PhpDateTimeParser.php
b/lib/includes/parsers/PhpDateTimeParser.php
index 2853b3a..9c42faf 100644
--- a/lib/includes/parsers/PhpDateTimeParser.php
+++ b/lib/includes/parsers/PhpDateTimeParser.php
@@ -40,25 +40,34 @@
const FORMAT_NAME = 'datetime';
/**
+* @var ValueParser
+*/
+ private $eraParser;
+
+ /**
* @var MonthNameUnlocalizer
*/
private $monthUnlocalizer;
/**
-* @var EraParser
+* @var ValueParser
*/
- private $eraParser;
+ private $isoTimestampParser;
/**
-* @param EraParser|null $eraParser
+* @param ValueParser|null $eraParser
* @param ParserOptions|null $options
*/
- public function __construct( EraParser $eraParser = null, ParserOptions
$options = null ) {
+ public function __construct( ValueParser $eraParser = null,
ParserOptions $options = null ) {
parent::__construct( $options );
$languageCode = $this-getOption( ValueParser::OPT_LANG );
- $this-monthUnlocalizer = new MonthNameUnlocalizer(
$languageCode );
$this-eraParser = $eraParser ?: new EraParser( $this-options
);
+ $this-monthUnlocalizer = new MonthNameUnlocalizer(
$languageCode );
+ $this-isoTimestampParser = new IsoTimestampParser(
+ new CalendarModelParser( $this-options ),
+ $this-options
+ );
}
/**
@@ -98,11 +107,7 @@
}
// Pass the reformatted string into a base parser that
parses this +/-Y-m-d\TH:i:s\Z format with a precision
- $valueParser = new IsoTimestampParser(
- new CalendarModelParser( $this-options ),
- $this-options
- );
- return $valueParser-parse( $timeString );
+ return $this-isoTimestampParser-parse( $timeString );
} catch ( Exception $exception ) {
throw new ParseException( $exception-getMessage(),
$rawValue, self::FORMAT_NAME );
}
diff --git a/lib/includes/parsers/YearMonthTimeParser.php
b/lib/includes/parsers/YearMonthTimeParser.php
index 0e67254..d770728 100644
--- a/lib/includes/parsers/YearMonthTimeParser.php
+++ b/lib/includes/parsers/YearMonthTimeParser.php
@@ -30,12 +30,21 @@
protected $lang;
/**
+* @var ValueParser
+*/
+ private $isoTimestampParser;
+
+ /**
* @see StringValueParser::__construct
*/
public function __construct( ParserOptions $options = null ) {
parent::__construct( $options );
$this-lang = Language::factory( $this-getOption(
ValueParser::OPT_LANG ) );
+ $this-isoTimestampParser = new IsoTimestampParser(
+ new CalendarModelParser( $this-options ),
+ $this-options
+ );
}
/**
@@ -137,12 +146,7 @@
* @return TimeValue
*/
private function getTimeFromYearMonth( $year, $month ) {
- $isoTimestampParser = new IsoTimestampParser(
- new CalendarModelParser( $this-options ),
- $this-options
- );
-
- return
[MediaWiki-commits] [Gerrit] Change the ToC toggle button to a dedicated icon fixed to th... - change (mediawiki...LivingStyleGuide)
Werdna has submitted this change and it was merged.
Change subject: Change the ToC toggle button to a dedicated icon fixed to the
side of the content
..
Change the ToC toggle button to a dedicated icon fixed to the side of the
content
Design spec at M43
Change-Id: Iff766c43043131d6af8a33bc6bddc4fc4ff3bddd
---
M resources/master.less
A resources/menu-clicked.svg
M resources/menu.js
M resources/menu.svg
M templates/Skin.php
M templates/Skin.template
6 files changed, 37 insertions(+), 5 deletions(-)
Approvals:
Werdna: Verified; Looks good to me, approved
diff --git a/resources/master.less b/resources/master.less
index 51125cc..191886b 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -283,9 +283,6 @@
a.navbar-brand {
border-right: 2px solid #eee;
- background-image: url( 'menu.svg' );
- background-position: center left -10px;
- background-repeat: no-repeat;
display: inline-block;
height: 100%;
line-height: 50px;
@@ -297,6 +294,25 @@
}
/* Navbar */
+#toc-toggle {
+ display: block;
+ height: 24px;
+ width: 24px;
+ background-image: url( 'menu.svg' );
+ background-position: center left;
+ background-repeat: no-repeat;
+ position: fixed;
+ top: 115px;
+ left: 110px;
+ transition: all 1s ease;
+
+ .clicked {
+ background-image: url( 'menu-clicked.svg' );
+ top: 57px;
+ left: 20px;
+ }
+}
+
/* MediaWiki Stuff */
@media screen {
diff --git a/resources/menu-clicked.svg b/resources/menu-clicked.svg
new file mode 100644
index 000..68bd648
--- /dev/null
+++ b/resources/menu-clicked.svg
@@ -0,0 +1,11 @@
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+width=24px height=24px viewBox=0 0 24 24 enable-background=new
0 0 24 24 xml:space=preserve
+g transform=matrix(1 0 0 -1 0 1638)
+ path fill=#fff d=M17.613,1624.945H4.195v2.848h13.418V1624.945z
M12.398,1618.805H5.883c-0.469,0-0.867,0.164-1.195,0.492
+ s-0.492,0.723-0.492,1.184v1.172h8.203V1618.805z
M4.195,1631.086v2.848h14.344c0.469,0,0.867-0.164,1.195-0.492
+ s0.492-0.727,0.492-1.195v-1.16H4.195z/
+/g
+/svg
diff --git a/resources/menu.js b/resources/menu.js
index 316af0a..b00224c 100644
--- a/resources/menu.js
+++ b/resources/menu.js
@@ -1,6 +1,7 @@
$( function () {
- $( '.navbar-brand' ).click( function ( e ) {
+ $( '#toc-toggle' ).click( function ( e ) {
e.preventDefault();
+ $( this ).toggleClass( 'clicked' );
$( '#site-wrap' ).toggleClass( 'site-shift' );
} );
} );
diff --git a/resources/menu.svg b/resources/menu.svg
index 5dbcb94..5b3bf26 100644
--- a/resources/menu.svg
+++ b/resources/menu.svg
@@ -4,7 +4,7 @@
svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
width=24px height=24px viewBox=0 0 24 24 enable-background=new
0 0 24 24 xml:space=preserve
g transform=matrix(1 0 0 -1 0 1638)
- path d=M17.613,1624.945H4.195v2.848h13.418V1624.945z
M12.398,1618.805H5.883c-0.469,0-0.867,0.164-1.195,0.492
+ path fill=#347bff d=M17.613,1624.945H4.195v2.848h13.418V1624.945z
M12.398,1618.805H5.883c-0.469,0-0.867,0.164-1.195,0.492
s-0.492,0.723-0.492,1.184v1.172h8.203V1618.805z
M4.195,1631.086v2.848h14.344c0.469,0,0.867-0.164,1.195-0.492
s0.492-0.727,0.492-1.195v-1.16H4.195z/
/g
diff --git a/templates/Skin.php b/templates/Skin.php
index 5ee49f4..4a70dea 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -246,6 +246,8 @@
/ul
/nav
+ a href=javascript:void(0) id=toc-toggle/a
+
div class=container id=content
h1 class=firstHeading id=firstHeading
'.$cx['funcs']['v']($cx, $in, array('title')).'
diff --git a/templates/Skin.template b/templates/Skin.template
index 99a5b5a..5226fb8 100755
--- a/templates/Skin.template
+++ b/templates/Skin.template
@@ -40,6 +40,8 @@
/ul
/nav
+ a href=javascript:void(0) id=toc-toggle/a
+
div class=container id=content
h1 class=firstHeading id=firstHeading
{{{title}}}
--
To view, visit https://gerrit.wikimedia.org/r/197501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-03-24T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/199235 Change subject: New Wikidata Build - 2015-03-24T10:00:01+ .. New Wikidata Build - 2015-03-24T10:00:01+ Change-Id: I54955b26d120ebd2c87079888141166759c6e674 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/PropertySuggester/build/travis/after_script.sh M extensions/PropertySuggester/build/travis/before_script.sh M extensions/PropertySuggester/build/travis/script.sh M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js M extensions/ValueView/tests/lib/jquery/jquery.focusAt.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.tests.js M extensions/Wikibase/.jscsrc M extensions/Wikibase/README.md M extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/build/travis/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/script.sh M extensions/Wikibase/build/travis/update-db.sh M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php A extensions/Wikibase/client/i18n/ang.json M extensions/Wikibase/client/i18n/arq.json M extensions/Wikibase/client/i18n/as.json M extensions/Wikibase/client/i18n/az.json M extensions/Wikibase/client/i18n/be-tarask.json A extensions/Wikibase/client/i18n/bho.json M extensions/Wikibase/client/i18n/da.json M extensions/Wikibase/client/i18n/de.json A extensions/Wikibase/client/i18n/gom-deva.json M extensions/Wikibase/client/i18n/kk-cyrl.json M extensions/Wikibase/client/i18n/lt.json M extensions/Wikibase/client/i18n/lzh.json M extensions/Wikibase/client/i18n/oc.json M extensions/Wikibase/client/i18n/ps.json M extensions/Wikibase/client/i18n/qqq.json M extensions/Wikibase/client/i18n/ru.json M extensions/Wikibase/client/i18n/sr-el.json A extensions/Wikibase/client/i18n/tcy.json M extensions/Wikibase/client/i18n/tt-cyrl.json M extensions/Wikibase/client/i18n/uk.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/Changes/ChangeHandler.php M extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php M extensions/Wikibase/client/includes/scribunto/EntityAccessor.php A extensions/Wikibase/client/includes/store/sql/BulkSubscriptionUpdater.php A extensions/Wikibase/client/maintenance/updateSubscriptions.php A extensions/Wikibase/client/tests/phpunit/includes/store/sql/BulkSubscriptionUpdaterTest.php M extensions/Wikibase/composer.json M extensions/Wikibase/docs/json.wiki A extensions/Wikibase/lib/i18n/arq.json M extensions/Wikibase/lib/i18n/as.json M extensions/Wikibase/lib/i18n/az.json A extensions/Wikibase/lib/i18n/gom-deva.json M extensions/Wikibase/lib/i18n/hr.json M extensions/Wikibase/lib/i18n/lt.json A extensions/Wikibase/lib/i18n/ne.json M extensions/Wikibase/lib/i18n/oc.json M extensions/Wikibase/lib/i18n/ps.json M extensions/Wikibase/lib/i18n/qqq.json M extensions/Wikibase/lib/i18n/qu.json M extensions/Wikibase/lib/i18n/sr-ec.json M extensions/Wikibase/lib/i18n/sr-el.json M extensions/Wikibase/lib/i18n/sv.json A extensions/Wikibase/lib/i18n/sw.json M extensions/Wikibase/lib/i18n/uk.json M extensions/Wikibase/lib/includes/Summary.php M extensions/Wikibase/lib/includes/changes/EntityChange.php M extensions/Wikibase/lib/includes/formatters/CommonsLinkFormatter.php M extensions/Wikibase/lib/includes/formatters/EntityIdHtmlLinkFormatterFactory.php M extensions/Wikibase/lib/includes/formatters/EntityIdLinkFormatter.php M extensions/Wikibase/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php M extensions/Wikibase/lib/includes/formatters/HtmlTimeFormatter.php M extensions/Wikibase/lib/includes/formatters/HtmlUrlFormatter.php M extensions/Wikibase/lib/includes/formatters/MonolingualHtmlFormatter.php M extensions/Wikibase/lib/includes/formatters/MwTimeIsoFormatter.php M extensions/Wikibase/lib/includes/formatters/PropertyValueSnakFormatter.php M extensions/Wikibase/lib/includes/formatters/QuantityDetailsFormatter.php M extensions/Wikibase/lib/includes/formatters/TimeDetailsFormatter.php M extensions/Wikibase/lib/includes/formatters/UnDeserializableValueFormatter.php D extensions/Wikibase/lib/includes/parsers/DateTimeParser.php M extensions/Wikibase/lib/includes/parsers/EntityIdValueParser.php M extensions/Wikibase/lib/includes/parsers/MWTimeIsoParser.php A extensions/Wikibase/lib/includes/parsers/PhpDateTimeParser.php M extensions/Wikibase/lib/includes/parsers/TimeParser.php M extensions/Wikibase/lib/includes/parsers/YearMonthTimeParser.php M extensions/Wikibase/lib/includes/parsers/YearTimeParser.php M extensions/Wikibase/lib/maintenance/dispatchChanges.php D extensions/Wikibase/lib/maintenance/rebuildAllData.php M
[MediaWiki-commits] [Gerrit] Special:ItemByTitle should preserve url parameters - change (mediawiki...Wikibase)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199239
Change subject: Special:ItemByTitle should preserve url parameters
..
Special:ItemByTitle should preserve url parameters
The most prominent use case for this is
Special:ItemByTitle/enwiki/Wikipedia?action=history, which should redirect to
Q52?action=history, keeping the action=history parameter. But also all other
parameters will be preserved.
Bug: T50037
Change-Id: Ieb70546481d8e58824bd5df96c5116fbe063c02a
---
M repo/includes/specials/SpecialItemByTitle.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/39/199239/1
diff --git a/repo/includes/specials/SpecialItemByTitle.php
b/repo/includes/specials/SpecialItemByTitle.php
index d42a132..152b351 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -154,7 +154,9 @@
// Redirect to the item page if we found its content
if ( $itemId !== null ) {
$title = $this-titleLookup-getTitleForId(
$itemId );
- $itemUrl = $title-getFullUrl();
+ $query = $request-getValues();
+ unset( $query['title'] );
+ $itemUrl = $title-getFullUrl( $query );
$this-getOutput()-redirect( $itemUrl );
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/199239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb70546481d8e58824bd5df96c5116fbe063c02a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Schnark listenle...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .codfw.wmnet to tin's domain search - change (operations/puppet)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/199243 Change subject: Add .codfw.wmnet to tin's domain search .. Add .codfw.wmnet to tin's domain search scap needs that Change-Id: Ieebdab7826ce622fb628287f9c8e90fe7d3c260a --- M hieradata/hosts/tin.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/43/199243/1 diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml index 6595a39..ed1c067 100644 --- a/hieradata/hosts/tin.yaml +++ b/hieradata/hosts/tin.yaml @@ -2,6 +2,7 @@ - wikimedia.org - eqiad.wmnet - esams.wikimedia.org + - codfw.wmnet mediawiki::users::web: www-data admin::groups: - deployment -- To view, visit https://gerrit.wikimedia.org/r/199243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieebdab7826ce622fb628287f9c8e90fe7d3c260a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: cbed069..1d1ffac - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/199244 Change subject: Syncronize VisualEditor: cbed069..1d1ffac .. Syncronize VisualEditor: cbed069..1d1ffac Change-Id: I7c2d685656121b7c4b638bdacfd5791e27727e6c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/44/199244/1 diff --git a/VisualEditor b/VisualEditor index cbed069..1d1ffac 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit cbed0699841232469cf48d4f34c79f8466de8b1a +Subproject commit 1d1ffac74ed2eb2de32fa05e4ae7e3827d18f499 -- To view, visit https://gerrit.wikimedia.org/r/199244 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c2d685656121b7c4b638bdacfd5791e27727e6c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] exec(line) of other packages is unexpected... - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: exec(line) of other packages is unexpected...
..
exec(line) of other packages is unexpected...
Change-Id: I9b4b9334c5af52cd2cf869b6aac9a62c66578013
---
M pywikibot/version.py
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 723a221..7f06fa1 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -274,7 +274,10 @@
with codecs.open(fn, 'r', utf-8) as f:
for line in f.readlines():
if line.find('__version__') == 0:
-exec(line)
+try:
+exec(line)
+except:
+pass
break
stat = os.stat(fn)
mtime = datetime.datetime.fromtimestamp(stat.st_mtime).isoformat(' ')
--
To view, visit https://gerrit.wikimedia.org/r/192066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b4b9334c5af52cd2cf869b6aac9a62c66578013
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Eranroz eranro...@gmail.com
Gerrit-Reviewer: Eranroz eranro...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Survey)
Raimond Spekking has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I6506f94c72a2538028028c6ab39dbc18b7fdddbf --- M Survey.alias.php 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved Raimond Spekking: Verified; Looks good to me, approved diff --git a/Survey.alias.php b/Survey.alias.php index 8659326..6850acc 100644 --- a/Survey.alias.php +++ b/Survey.alias.php @@ -71,6 +71,14 @@ 'TakeSurvey' = array( 'Umfroog_beantworte' ), ); +/** Hebrew (עברית) */ +$specialPageAliases['he'] = array( + 'EditSurvey' = array( 'עריכת_סקר' ), + 'Surveys' = array( 'סקרים' ), + 'SurveyStats' = array( 'סטטיסטיקות_סקר' ), + 'TakeSurvey' = array( 'מילוי_סקר' ), +); + /** Interlingua (interlingua) */ $specialPageAliases['ia'] = array( 'EditSurvey' = array( 'Modificar_questionario', 'Questionario' ), -- To view, visit https://gerrit.wikimedia.org/r/199052 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6506f94c72a2538028028c6ab39dbc18b7fdddbf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Survey Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make progress bar qunit tests more robust - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199247
Change subject: Make progress bar qunit tests more robust
..
Make progress bar qunit tests more robust
Bug: T93540
Change-Id: Id46d3ffd4e9f89a834162b595e36a26e1186c0a5
---
M tests/qunit/mmv/ui/mmv.ui.progressBar.test.js
1 file changed, 7 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/47/199247/1
diff --git a/tests/qunit/mmv/ui/mmv.ui.progressBar.test.js
b/tests/qunit/mmv/ui/mmv.ui.progressBar.test.js
index 99fe1a6..8e82187 100644
--- a/tests/qunit/mmv/ui/mmv.ui.progressBar.test.js
+++ b/tests/qunit/mmv/ui/mmv.ui.progressBar.test.js
@@ -26,7 +26,8 @@
QUnit.test( 'animateTo()', 8, function ( assert ) {
var $qf = $( '#qunit-fixture' ),
- progress = new mw.mmv.ui.ProgressBar( $qf );
+ $div = $( 'div' ).css( { width: 250, position:
'relative' } ).appendTo( $qf )
+ progress = new mw.mmv.ui.ProgressBar( $div );
assert.ok( progress.$progress.hasClass( 'empty' ), 'Progress
bar is hidden' );
assert.strictEqual( progress.$percent.width(), 0, 'Progress
bar\'s indicator is at 0' );
@@ -37,7 +38,8 @@
} );
progress.animateTo( 50 );
assert.ok( !progress.$progress.hasClass( 'empty' ), 'Progress
bar is visible' );
- assert.strictEqual( progress.$percent.width(), $qf.width() / 2,
'Progress bar\'s indicator is at half' );
+
+ assert.strictEqual( progress.$percent.width(), 125, 'Progress
bar\'s indicator is at half' );
$.fn.animate.restore();
this.sandbox.stub( $.fn, 'animate', function ( target,
duration, transition, callback ) {
@@ -56,7 +58,8 @@
QUnit.test( 'jumpTo()/hide()', 6, function ( assert ) {
var $qf = $( '#qunit-fixture' ),
- progress = new mw.mmv.ui.ProgressBar( $qf );
+ $div = $( 'div' ).css( { width: 250, position:
'relative' } ).appendTo( $qf )
+ progress = new mw.mmv.ui.ProgressBar( $div );
assert.ok( progress.$progress.hasClass( 'empty' ), 'Progress
bar is hidden' );
assert.strictEqual( progress.$percent.width(), 0, 'Progress
bar\'s indicator is at 0' );
@@ -64,7 +67,7 @@
progress.jumpTo( 50 );
assert.ok( !progress.$progress.hasClass( 'empty' ), 'Progress
bar is visible' );
- assert.strictEqual( progress.$percent.width(), $qf.width() / 2,
'Progress bar\'s indicator is at half' );
+ assert.strictEqual( progress.$percent.width(), 125, 'Progress
bar\'s indicator is at half' );
progress.hide();
--
To view, visit https://gerrit.wikimedia.org/r/199247
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id46d3ffd4e9f89a834162b595e36a26e1186c0a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CentralAuth: add PLURAL to messages with lists. - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: CentralAuth: add PLURAL to messages with lists.
..
CentralAuth: add PLURAL to messages with lists.
See
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Centralauth-list-attached-dryrun/ksh
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Centralauth-list-attached/en_(2)
Change-Id: I5ee8dd124060e64f3a48f654262c2ad7af9cdb6a
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialMergeAccount.php
3 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 0246b43..54af761 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -65,8 +65,8 @@
centralauth-list-home-title: Home wiki,
centralauth-list-home-dryrun: The password and email address set at
this wiki will be used for your unified account.,
centralauth-list-attached-title: Attached accounts,
- centralauth-list-attached: The accounts named \$1\ on each of the
following sites have been automatically attached to the unified account:,
- centralauth-list-attached-dryrun: The accounts named \$1\ on each
of the following sites will be automatically attached to the unified account:,
+ centralauth-list-attached: The {{PLURAL:$2|account named \$1\ on
the following site|accounts named \$1\ on each of the following sites}} have
been automatically attached to the unified account:,
+ centralauth-list-attached-dryrun: The {{PLURAL:$2|account named
\$1\ on the following site|accounts named \$1\ on each of the following
sites}} will be automatically attached to the unified account:,
centralauth-list-unattached-title: Unattached accounts,
centralauth-list-unattached: The {{PLURAL:$2|account|accounts}}
named \$1\ could not be automatically confirmed as belonging to you on the
following {{PLURAL:$2|site|sites}};\nmost likely {{PLURAL:$2|it has|they have}}
a different password from your primary account:,
centralauth-foreign-link: User $1 on $2,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index df8a431..ae60a2a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -80,8 +80,8 @@
centralauth-list-home-title: Information about user's home
wiki.\n{{Identical|Home wiki}},
centralauth-list-home-dryrun: Message that indication that provided
information will be used for authenticating.,
centralauth-list-attached-title: List title/header.,
- centralauth-list-attached: Text before the list of local wikis
attached to a unified account, shown on the special page \MergeAccount\
(Login unification complete!).\n\nParameters:\n* $1 - an account/user name,
- centralauth-list-attached-dryrun: Text to inform users of which
accounts can be unified after a dry-run. Parameters:\n* $1 - an account/user
name,
+ centralauth-list-attached: Text before the list of local wikis
attached to a unified account, shown on the special page \MergeAccount\
(Login unification complete!).\n\nParameters:\n* $1 - an account/user name\n*
$2 - number of accounts/names in the list following the message,
+ centralauth-list-attached-dryrun: Text to inform users of which
accounts can be unified after a dry-run. Parameters:\n* $1 - an account/user
name\n* $2 - number of accounts/names in the list following the message,
centralauth-list-unattached-title: {{Identical|Unattached
accounts}},
centralauth-list-unattached: Used in Special:MergeAccount.
Parameters:\n* $1 - username\n* $2 - number of unattached accounts,
centralauth-foreign-link: Tool tip in list of local accounts on
[{{canonicalurl:meta:Special:CentralAuth|target=Siebrand}} Global user manager]
special page.\n\nParameters:\n* $1 - the username\n* $2 - the name of the local
wiki,
diff --git a/includes/specials/SpecialMergeAccount.php
b/includes/specials/SpecialMergeAccount.php
index 76c4d4f..4de91d1 100644
--- a/includes/specials/SpecialMergeAccount.php
+++ b/includes/specials/SpecialMergeAccount.php
@@ -392,8 +392,11 @@
if ( $merged ) {
$this-getOutput()-addHTML( Xml::element( 'hr' ) );
- $this-getOutput()-addWikiMsg(
'centralauth-list-attached',
- $this-mUserName );
+ $this-getOutput()-addWikiMsg(
+ 'centralauth-list-attached',
+ $this-mUserName,
+ count( $merged )
+ );
$this-getOutput()-addHTML( $this-listAttached(
$merged ) );
}
@@ -607,7 +610,8 @@
$html .= Html::rawElement( 'h3', array(),
$this-msg( 'centralauth-list-attached-title'
)-escaped()
) . $this-msg(
[MediaWiki-commits] [Gerrit] Modify c3 style value to work with widgets - change (wikimedia...bower_modules)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199507
Change subject: Modify c3 style value to work with widgets
..
Modify c3 style value to work with widgets
Change-Id: I04a7801024d6400bd3f89c6eee5aca57e4263555
---
M c3/c3.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/src/bower_modules
refs/changes/07/199507/1
diff --git a/c3/c3.js b/c3/c3.js
index 233d1b5..98c4c56 100644
--- a/c3/c3.js
+++ b/c3/c3.js
@@ -877,7 +877,7 @@
.attr('width', $$.width)
.attr('height', $$.height);
// MEMO: parent div's height will be bigger than svg when !DOCTYPE
html
-$$.selectChart.style('max-height', $$.currentHeight + px);
+$$.selectChart.style('max-height',
$$.currentHeight+($$.currentHeight/5) + px);
};
--
To view, visit https://gerrit.wikimedia.org/r/199507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04a7801024d6400bd3f89c6eee5aca57e4263555
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash/src/bower_modules
Gerrit-Branch: master
Gerrit-Owner: Ssmith ssm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Customize Jenkins top left icon - change (integration/docroot)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Customize Jenkins top left icon
..
Revert Customize Jenkins top left icon
Per foundation visual identity guidelines, the logo must have space around it.
Also, on a blank background, the regular logo should not be used as it's too
dark. The default Jenkins logo is fine. This is a Jenkins install. It doesn't
need
branding I think. Or we can do it good and make a good branding for it, but
as-is the default is better than this.
This reverts commit 0b77026c983a5596b5a9ff2aa0175fdcc63d8aa9.
Change-Id: I2c62d9a40321b6125defe55aa8179fa45f7b6691
---
D org/wikimedia/integration/jenkins-wmf.css
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/org/wikimedia/integration/jenkins-wmf.css
b/org/wikimedia/integration/jenkins-wmf.css
deleted file mode 100644
index 6fbbe0b..000
--- a/org/wikimedia/integration/jenkins-wmf.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#jenkins-head-icon {
- width:0px; height:0px; padding:19px;
- background-image:
url('//upload.wikimedia.org/wikipedia/commons/thumb/8/81/Wikimedia-logo.svg/37px-Wikimedia-logo.svg.png');
-}
--
To view, visit https://gerrit.wikimedia.org/r/199513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2c62d9a40321b6125defe55aa8179fa45f7b6691
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] transparency: make it HTTPS only and enable HSTS - change (operations/puppet)
Chmarkine has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199517
Change subject: transparency: make it HTTPS only and enable HSTS
..
transparency: make it HTTPS only and enable HSTS
Make https://transparency.wikimedia.org/ HTTPS only, and enable
HSTS with max-age=7 days. I also deleted the unused 404 code.
Bug: T40516
Change-Id: I14f5cf359c9754c3f7359827b34859aa41d5ac76
---
M manifests/role/transparency.pp
M templates/apache/sites/transparency.wikimedia.org.erb
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/199517/1
diff --git a/manifests/role/transparency.pp b/manifests/role/transparency.pp
index 77dd7f3..9b177b9 100644
--- a/manifests/role/transparency.pp
+++ b/manifests/role/transparency.pp
@@ -6,6 +6,7 @@
class role::transparency {
include ::apache
include ::apache::mod::rewrite
+include ::apache::mod::headers
$repo_dir = '/srv/org/wikimedia/TransparencyReport'
$docroot = ${repo_dir}/build
diff --git a/templates/apache/sites/transparency.wikimedia.org.erb
b/templates/apache/sites/transparency.wikimedia.org.erb
index 82f9393..44abf7c 100644
--- a/templates/apache/sites/transparency.wikimedia.org.erb
+++ b/templates/apache/sites/transparency.wikimedia.org.erb
@@ -1,5 +1,5 @@
# vim:ft=apache: ts=4 sw=4
-# Apache configuration for http://transparency.wikimedia.org
+# Apache configuration for https://transparency.wikimedia.org
# This file is managed by Puppet.
VirtualHost *:80
ServerName transparency.wikimedia.org
@@ -15,10 +15,9 @@
allow from all
/Directory
-# Serve 404s for all requests until the launch, at 2014-Aug-06 08:30 UTC.
-# This code can be removed any time after that. --OL
RewriteEngine on
-RewriteCond %{ENV:REDIRECT_STATUS} !=404
-RewriteCond %{TIME} %= Time.utc(2014, 'Aug', 6, 8,
30).strftime('%Y%m%d%H%M%S') %
-RewriteRule .* - [L,R=404]
+RewriteCond %{HTTP:X-Forwarded-Proto} !https
+RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI}
[R=301,E=ProtoRedirect]
+Header always merge Vary X-Forwarded-Proto env=ProtoRedirect
+Header always set Strict-Transport-Security max-age=604800
/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/199517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14f5cf359c9754c3f7359827b34859aa41d5ac76
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chmarkine chmark...@hotmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pre-deploy interface fixes - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199518
Change subject: Pre-deploy interface fixes
..
Pre-deploy interface fixes
Need better widget flow for smaller widgets but this is good for now.
Change-Id: I8c0ed19a4f1b455adcf6bd063fcff2839cf92fb7
---
M src/components/boards/generic-board/generic-board.html
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.html
M src/components/widgets/x-by-y/x-by-y.html
M src/css/style.css
8 files changed, 272 insertions(+), 293 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/18/199518/1
diff --git a/src/components/boards/generic-board/generic-board.html
b/src/components/boards/generic-board/generic-board.html
index 5484460..80f0fa8 100644
--- a/src/components/boards/generic-board/generic-board.html
+++ b/src/components/boards/generic-board/generic-board.html
@@ -1,6 +1,6 @@
div class=col-md-12
-div class=row row-top
+div class=row
div class=col-md-4 titleCol
h2 style=display:inline data-bind=text:
displayedBoard().displayName/h2
p data-bind=text: displayDate/p
@@ -12,8 +12,10 @@
/div
/div
-div class=row data-bind=foreach: displayedBoard().widgets
-div data-bind=component: { name: widgetCode, params: { title:
displayName, description: description, configuration: configuration,
widgetInstance: id, widgetCode: widgetCode, dataLoading: dataLoading,
sharedContext: $parent.sharedContext } }span data-bind=text:
display_name/span/div
+div class=row widgetDisplayRow data-bind=foreach:
displayedBoard().widgets
+div class=col-md-12 style=padding-left:0
+span class=floatingWidget data-bind=component: { name:
widgetCode, params: { title: displayName, description: description,
configuration: configuration, widgetInstance: id, widgetCode: widgetCode,
dataLoading: dataLoading, sharedContext: $parent.sharedContext } }span
data-bind=text: display_name/span/span
+/div
/div
/div
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
index be07c74..0f64b3a 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html
@@ -1,20 +1,23 @@
-div class=col-md-6 lastWidget
- div class=panel panel-purple
- div class=panel-heading
- p class=pull-left data-bind=text:title/p
- div class=btn-group btn-group-xs pull-right
- button type=button class=btn btn-sm
btn-default dropdown-toggle data-toggle=modal data-bind=attr: {
'data-target': '#remove'+instanceID }i class=fa fa-times/i/button
- /div
+
+div class=panel panel-purple widget-6
+ div class=panel-heading
+ p class=pull-left data-bind=text:title/p
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-sm btn-default
dropdown-toggle data-toggle=modal data-bind=attr: { 'data-target':
'#remove'+instanceID }i class=fa fa-times/i/button
/div
- div class=panel-body
- p data-bind=visible: !hasData()No data available.
This widget requires a widget like Totals Earned to provide data./p
- div class=col-md-12
- div id=avgUSDperSecond/div
- /div
+ /div
+ div class=panel-body
+ div class=alert alert-warning style=padding:20px
data-bind=visible: !hasData()
+ h3i class=fa fa-2x fa-puzzle-piece/i No data
available./h3
+ This widget works in tandem with another widget, like
emTotals Earned/em. Add the other widget to this board and you'll see the
chart.
+ /div
+ div class=col-md-12
+ div id=avgUSDperSecond/div
/div
/div
/div
+
div class=modal fade data-bind=attr: { id: 'remove'+instanceID }
div class=modal-dialog modal-sm
div class=modal-content
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
index 950b808..096f204 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.html
@@ -1,22 +1,25 @@
-div class=col-md-6
[MediaWiki-commits] [Gerrit] Fix WikiGrok bug - change (mediawiki/core)
MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/199524 Change subject: Fix WikiGrok bug .. Fix WikiGrok bug Change-Id: I217062844c13c25a726278ad83138b8561a66148 --- M extensions/WikiGrok 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/24/199524/1 diff --git a/extensions/WikiGrok b/extensions/WikiGrok index 5bed330..a6d736f 16 --- a/extensions/WikiGrok +++ b/extensions/WikiGrok -Subproject commit 5bed33009ad2fe397056a40e7cceef53a54c5602 +Subproject commit a6d736f30323d0d4af7d3f4550a23d9a66f3a4a1 -- To view, visit https://gerrit.wikimedia.org/r/199524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I217062844c13c25a726278ad83138b8561a66148 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: MaxSem maxsem.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix WikiGrok bug - change (mediawiki/core)
MaxSem has submitted this change and it was merged. Change subject: Fix WikiGrok bug .. Fix WikiGrok bug Change-Id: I2425512999b341df2ce87d0ef7a3df2bac228c43 --- M extensions/WikiGrok 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: MaxSem: Verified; Looks good to me, approved diff --git a/extensions/WikiGrok b/extensions/WikiGrok index 5bed330..f95f133 16 --- a/extensions/WikiGrok +++ b/extensions/WikiGrok -Subproject commit 5bed33009ad2fe397056a40e7cceef53a54c5602 +Subproject commit f95f1337cc59a9772af7f43b58bd09eaaae2d3c1 -- To view, visit https://gerrit.wikimedia.org/r/199523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2425512999b341df2ce87d0ef7a3df2bac228c43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix 'Not set up' on new widget - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199531
Change subject: Fix 'Not set up' on new widget
..
Fix 'Not set up' on new widget
New fraud gauges weren't showing the chart till you saved and
reloaded
Change-Id: Iff9d8df07617f8dcd4bc3709da1661bef562438d
---
M src/components/widgets/fraud-gauge/fraud-gauge.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/31/199531/1
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 425bcc1..04482a7 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -257,6 +257,7 @@
});
} else{
+ self.configSet( true );
//gauge time period
self.queryRequest.timespan =
self.selectedTimePeriod();
--
To view, visit https://gerrit.wikimedia.org/r/199531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff9d8df07617f8dcd4bc3709da1661bef562438d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a cat playing a trombone - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199530
Change subject: Add a cat playing a trombone
..
Add a cat playing a trombone
Change-Id: I91f62e5ee0d3e2a4e6076c85cf95e624d85fe730
---
M persistence.sql
M src/app/startup.js
A src/components/widgets/cat-trombone/cat-trombone.html
A src/components/widgets/cat-trombone/cat-trombone.js
A src/images/catmusician.gif
5 files changed, 47 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/30/199530/1
diff --git a/persistence.sql b/persistence.sql
index d676b56..744b20f 100644
--- a/persistence.sql
+++ b/persistence.sql
@@ -63,6 +63,7 @@
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'amt-per-second-chart', 'Amount Per Second', 'Shows USD per second
required to reach Big English goal', 'images/amt-per-sec.png');
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'distance-to-goal-chart', 'Distance to Goal', 'Line chart showing
USD needed to reach overall Big English goal', 'images/distance-to-goal.png');
INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'totals-earned-chart', 'Totals Earned', 'Main Big English bar chart
showing daily and hourly donation totals and counts',
'images/totals-earned.png');
+INSERT IGNORE INTO dash_widget ( code, display_name, description, preview_path
) VALUES ( 'cat-trombone', 'Trombone Cat', 'A cat is playing a TROMBONE',
'images/catmusician.gif');
/* Tailor these to your liking
GRANT INSERT, SELECT, UPDATE, DELETE ON dash_widget_instance_board TO
'testuser'@'localhost';
diff --git a/src/app/startup.js b/src/app/startup.js
index e6cc743..65f0d20 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -25,6 +25,7 @@
ko.components.register( 'distance-to-goal-chart', { require:
'components/widgets/distance-to-goal-chart/distance-to-goal-chart' });
ko.components.register( 'amt-per-second-chart', { require:
'components/widgets/amt-per-second-chart/amt-per-second-chart' });
ko.components.register( 'x-by-y', { require:
'components/widgets/x-by-y/x-by-y' });
+ko.components.register( 'cat-trombone', { require:
'components/widgets/cat-trombone/cat-trombone' });
//fire up router
ko.applyBindings({ route: router.currentRoute });
diff --git a/src/components/widgets/cat-trombone/cat-trombone.html
b/src/components/widgets/cat-trombone/cat-trombone.html
new file mode 100644
index 000..fffac86
--- /dev/null
+++ b/src/components/widgets/cat-trombone/cat-trombone.html
@@ -0,0 +1,31 @@
+
+div class=panel panel-purple widget-6
+ div class=panel-heading
+ p class=pull-leftThis cat is playing a trombone/p
+ div class=btn-group btn-group-xs pull-right
+ button type=button class=btn btn-sm btn-default
dropdown-toggle data-toggle=modal data-bind=attr: { 'data-target':
'#remove'+instanceID }i class=fa fa-times/i/button
+ /div
+ /div
+ div class=panel-body
+ div class=row-fluid
+ div class=col-md-12
+ p class=text-centerimg
src=/images/catmusician.gif/p
+ /div
+ /div
+ /div
+/div
+
+
+div class=modal fade data-bind=attr: { id: 'remove'+instanceID }
+ div class=modal-dialog modal-sm
+ div class=modal-content
+ div class=modal-header
+ h2Remove this widget from the board?/h2
+ /div
+ div class=modal-body
+ button class=btn btn-lg btn-success
pull-right data-dismiss=modal data-bind=click:
$parents[2].removeWidgetFromBoard OK/button
+ button class=btn btn-lg btn-danger
pull-right data-dismiss=modal Cancel/button
+ /div
+ /div!-- /.modal-content --
+ /div
+/div
\ No newline at end of file
diff --git a/src/components/widgets/cat-trombone/cat-trombone.js
b/src/components/widgets/cat-trombone/cat-trombone.js
new file mode 100644
index 000..48f5b81
--- /dev/null
+++ b/src/components/widgets/cat-trombone/cat-trombone.js
@@ -0,0 +1,14 @@
+define( [
+ 'knockout',
+ 'text!components/widgets/cat-trombone/cat-trombone.html',
+ 'WidgetBase'
+], function( ko, template, WidgetBase ){
+
+ function CatTromboneViewModel( params ){
+
+ var self = this;
+ WidgetBase.call( this, params );
+
+ }
+ return { viewModel: CatTromboneViewModel, template: template };
+});
diff --git a/src/images/catmusician.gif b/src/images/catmusician.gif
new file mode 100644
index 000..012e511
--- /dev/null
+++
[MediaWiki-commits] [Gerrit] Register EL schema ResourceLoader module - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199532
Change subject: Register EL schema ResourceLoader module
..
Register EL schema ResourceLoader module
Register empty module when EL not installed
Register the schema module when it is.
Bug: T93706
Change-Id: I5ddc2620dd31a94a4912704a2a65762284118397
---
M Gather.php
M includes/Gather.hooks.php
M resources/Resources.php
3 files changed, 31 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/32/199532/1
diff --git a/Gather.php b/Gather.php
index 29c3143..ad2bdb1 100644
--- a/Gather.php
+++ b/Gather.php
@@ -78,6 +78,7 @@
$wgHooks['MakeGlobalVariablesScript'][] =
'Gather\Hooks::onMakeGlobalVariablesScript';
$wgHooks['ResourceLoaderTestModules'][] =
'Gather\Hooks::onResourceLoaderTestModules';
$wgHooks['EventLoggingRegisterSchemas'][] =
'Gather\Hooks::onEventLoggingRegisterSchemas';
+$wgHooks['ResourceLoaderRegisterModules'][] =
'Gather\Hooks::onResourceLoaderRegisterModules';
// Maintenance Hooks
$wgHooks['LoadExtensionSchemaUpdates'][] =
'Gather\UpdaterHooks::onLoadExtensionSchemaUpdates';
diff --git a/includes/Gather.hooks.php b/includes/Gather.hooks.php
index 26575f3..a5d9eb0 100644
--- a/includes/Gather.hooks.php
+++ b/includes/Gather.hooks.php
@@ -20,6 +20,34 @@
*/
class Hooks {
/**
+* ResourceLoaderRegisterModules hook handler
+*
+* Registers the mobile.loggingSchemas module without a dependency on
the
+* ext.EventLogging module so that calls to the various log functions
are
+* effectively NOPs.
+*
+* @see
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderRegisterModules
+*
+* @param ResourceLoader $resourceLoader The ResourceLoader object
+* @return bool Always true
+*/
+ public static function onResourceLoaderRegisterModules( \ResourceLoader
$resourceLoader ) {
+ // register an empty RL module
+ self::registerSchemas();
+ return true;
+ }
+
+ public static function registerSchemas( $dependencies = array() ) {
+ global $wgResourceModules;
+ $schema = array(
+ 'dependencies' = $dependencies,
+ 'targets' = array( 'desktop', 'mobile' ),
+ );
+ $wgResourceModules['ext.gather.schema'] = $schema;
+ return true;
+ }
+
+ /**
* EventLoggingRegisterSchemas hook handler.
*
* Registers our EventLogging schemas so that they can be converted to
@@ -37,6 +65,7 @@
$schemas += array(
'GatherClicks' = 11639881,
);
+ self::registerSchemas( array( 'schema.GatherClicks' ) );
return true;
}
diff --git a/resources/Resources.php b/resources/Resources.php
index 89f7df4..0574486 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -86,6 +86,7 @@
'mobile.startup',
// FIXME: getUserEditCount should be part of mw.user
'mobile.user',
+ 'ext.gather.schema',
),
'scripts' = array(
'ext.gather.logging/SchemaGather.js',
--
To view, visit https://gerrit.wikimedia.org/r/199532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ddc2620dd31a94a4912704a2a65762284118397
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use elseif instead of else if - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Use elseif instead of else if
..
Use elseif instead of else if
Per https://mediawiki.org/wiki/CC/PHP#C_borrowings
Change-Id: I728eb9048e3ddee7d63cccfae933eae53f9933c5
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f763deb..8126fa8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -254,7 +254,7 @@
if ( gethostname() === 'osmium' ) {
$wgResourceLoaderStorageEnabled = false;
-} else if ( !in_array( $wgDBname, array( 'testwiki', 'testwikidatawiki',
'labswiki' ) ) isset( $_SERVER['SERVER_NAME'] ) ) {
+} elseif ( !in_array( $wgDBname, array( 'testwiki', 'testwikidatawiki',
'labswiki' ) ) isset( $_SERVER['SERVER_NAME'] ) ) {
// Make testing JS/skin changes easy by not running load.php through
bits for testwiki
$wgLoadScript =
//{$wmfHostnames['bits']}/{$_SERVER['SERVER_NAME']}/load.php;
}
--
To view, visit https://gerrit.wikimedia.org/r/192894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I728eb9048e3ddee7d63cccfae933eae53f9933c5
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Southparkfan southparkfan...@hotmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Surface last updated time in Special:GatherLists - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Surface last updated time in Special:GatherLists
..
Surface last updated time in Special:GatherLists
Uses user preference date/time format (utc by default)
Add FIXMEs to the page.
Bug: T93303
Change-Id: Ie945cb671e4fda00523d05e658f558684bed0648
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialGatherLists.php
3 files changed, 15 insertions(+), 3 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 925ac5a..1e83dbb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,6 +7,7 @@
]
},
gather-lists-collection-owner: Owner,
+ gather-lists-collection-last-updated: Last updated,
gather-lists-collection-title: Title,
gather-lists-collection-description: Description,
gather-lists-collection-count: Count,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e5fff93..c9a5f62 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -12,6 +12,7 @@
gather-lists-collection-owner: Label for owner of collection on list
of all collections\n{{Identical|Owner}},
gather-lists-collection-title: Label for title of collection on list
of all collections\n{{Identical|Title}},
gather-lists-collection-description: Label for description of
collection on list of all collections\n{{Identical|Description}},
+ gather-lists-collection-last-updated: Label for last updated time of
a collection,
gather-lists-collection-count: Label for count of collection on list
of all collections\n{{Identical|Count}},
gather-lists-hide-collection: Label asking for confirmation when
hiding a user's collection for moderation purposes. Parameters:\n* $1 - Title
of the collection.\n* $2 - User name of the owner.,
gather-lists-hide-success-toast: Label for toast displaying that
specified list was hidden successfully. Parameters:\n* $1 - Title of the
collection.\n,
diff --git a/includes/specials/SpecialGatherLists.php
b/includes/specials/SpecialGatherLists.php
index c8e4a53..653a291 100644
--- a/includes/specials/SpecialGatherLists.php
+++ b/includes/specials/SpecialGatherLists.php
@@ -11,6 +11,7 @@
use FauxRequest;
use Html;
use Gather\views\helpers\CSS;
+use MWTimestamp;
/**
* Render a collection of articles.
@@ -37,12 +38,13 @@
* Render the special page
*/
public function execute() {
+ // FIXME: Make method on CollectionsList
$api = new ApiMain( new FauxRequest( array(
'action' = 'query',
'list' = 'lists',
'lstmode' = 'allpublic',
// FIXME: Need owner to link to collection
- 'lstprop' = 'label|description|image|count',
+ 'lstprop' = 'label|description|image|count|updated',
// TODO: Pagination
'continue' = '',
) ) );
@@ -65,6 +67,7 @@
$out-setProperty( 'unstyledContent', true );
$out-setPageTitle( wfMessage( 'gather-lists-title' ) );
+ // FIXME: Move below to View.
$html = '';
$html .= Html::openElement( 'div', array( 'class' = 'content
gather-lists' ) );
$html .= Html::openElement( 'ul', array() );
@@ -72,7 +75,8 @@
. Html::element( 'span', array(), wfMessage(
'gather-lists-collection-owner' ) )
. Html::element( 'span', array(), wfMessage(
'gather-lists-collection-title' ) )
. Html::element( 'span', array(), wfMessage(
'gather-lists-collection-description' ) )
- . Html::element( 'span', array(), wfMessage(
'gather-lists-collection-count' ) );
+ . Html::element( 'span', array(), wfMessage(
'gather-lists-collection-count' ) )
+ . Html::element( 'span', array(), wfMessage(
'gather-lists-collection-last-updated' ) );
if ( $this-canHideLists() ) {
$html .= Html::element( 'span', array(), '' );
}
@@ -100,11 +104,17 @@
* @return string
*/
private function row( $data ) {
+ $lang = $this-getLanguage();
+ $user = $this-getUser();
+ $ts = $lang-userTimeAndDate( new MWTimestamp( $data['updated']
), $user );
+
$html = Html::openElement( 'li', array( 'class' =
$additionalClasses ) )
. $this-userLink( $data['owner'] )
. $this-collectionLink( $data['label'],
$data['owner'], $data['id'] )
. Html::element( 'span', array(), $data['description'] )
- . Html::element( 'span', array(), $data['count'] );
+
[MediaWiki-commits] [Gerrit] Revert Customize Jenkins top left icon - change (integration/docroot)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199513
Change subject: Revert Customize Jenkins top left icon
..
Revert Customize Jenkins top left icon
Per foundation visual identity guidelines, the logo must have space around it.
Also, on a blank background, the regular logo should not be used as it's too
dark. The default Jenkins logo is fine. This is a Jenkins install. It doesn't
need
branding I think. Or we can do it good and make a good branding for it, but
as-is the default is better than this.
This reverts commit 0b77026c983a5596b5a9ff2aa0175fdcc63d8aa9.
Change-Id: I2c62d9a40321b6125defe55aa8179fa45f7b6691
---
D org/wikimedia/integration/jenkins-wmf.css
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/docroot
refs/changes/13/199513/1
diff --git a/org/wikimedia/integration/jenkins-wmf.css
b/org/wikimedia/integration/jenkins-wmf.css
deleted file mode 100644
index 6fbbe0b..000
--- a/org/wikimedia/integration/jenkins-wmf.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#jenkins-head-icon {
- width:0px; height:0px; padding:19px;
- background-image:
url('//upload.wikimedia.org/wikipedia/commons/thumb/8/81/Wikimedia-logo.svg/37px-Wikimedia-logo.svg.png');
-}
--
To view, visit https://gerrit.wikimedia.org/r/199513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c62d9a40321b6125defe55aa8179fa45f7b6691
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix WikiGrok bug - change (mediawiki/core)
MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/199523 Change subject: Fix WikiGrok bug .. Fix WikiGrok bug Change-Id: I2425512999b341df2ce87d0ef7a3df2bac228c43 --- M extensions/WikiGrok 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/23/199523/1 diff --git a/extensions/WikiGrok b/extensions/WikiGrok index 5bed330..f95f133 16 --- a/extensions/WikiGrok +++ b/extensions/WikiGrok -Subproject commit 5bed33009ad2fe397056a40e7cceef53a54c5602 +Subproject commit f95f1337cc59a9772af7f43b58bd09eaaae2d3c1 -- To view, visit https://gerrit.wikimedia.org/r/199523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2425512999b341df2ce87d0ef7a3df2bac228c43 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: MaxSem maxsem.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal - change (mediawiki...WikiGrok)
MaxSem has submitted this change and it was merged. Change subject: Fix fatal .. Fix fatal Change-Id: I0bfb5013b5d1fe4fbab2179e5590a64572e32fb4 --- M WikiGrok.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: MaxSem: Verified; Looks good to me, approved diff --git a/WikiGrok.php b/WikiGrok.php index 36a311c..a6bea3f 100644 --- a/WikiGrok.php +++ b/WikiGrok.php @@ -85,7 +85,7 @@ $wgHooks['OutputPageParserOutput'][] = 'WikiGrok\Hooks::onOutputPageParserOutput'; $wgHooks['LinksUpdate'][] = 'WikiGrok\Hooks::onLinksUpdate'; - $wgHooks['ArticleDeleteComplete'][] = 'WikiGrok\Hooks::onArticleDeleteComplete'; + $wgHooks['ArticleDeleteComplete'][] = 'WikiGrok\Hooks::onArticleDeleteComplete_client'; $wgHooks['BeforePageDisplay'][] = 'WikiGrok\Hooks::onBeforePageDisplay'; $wgHooks['ResourceLoaderGetConfigVars'][] = 'WikiGrok\Hooks::onResourceLoaderGetConfigVars'; $wgHooks['EventLoggingRegisterSchemas'][] = 'WikiGrok\Hooks::onEventLoggingRegisterSchemas'; -- To view, visit https://gerrit.wikimedia.org/r/199521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0bfb5013b5d1fe4fbab2179e5590a64572e32fb4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiGrok Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fatal - change (mediawiki...WikiGrok)
MaxSem has submitted this change and it was merged. Change subject: Fix fatal .. Fix fatal Change-Id: I0bfb5013b5d1fe4fbab2179e5590a64572e32fb4 --- M WikiGrok.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Kaldari: Looks good to me, approved jenkins-bot: Verified diff --git a/WikiGrok.php b/WikiGrok.php index 36a311c..a6bea3f 100644 --- a/WikiGrok.php +++ b/WikiGrok.php @@ -85,7 +85,7 @@ $wgHooks['OutputPageParserOutput'][] = 'WikiGrok\Hooks::onOutputPageParserOutput'; $wgHooks['LinksUpdate'][] = 'WikiGrok\Hooks::onLinksUpdate'; - $wgHooks['ArticleDeleteComplete'][] = 'WikiGrok\Hooks::onArticleDeleteComplete'; + $wgHooks['ArticleDeleteComplete'][] = 'WikiGrok\Hooks::onArticleDeleteComplete_client'; $wgHooks['BeforePageDisplay'][] = 'WikiGrok\Hooks::onBeforePageDisplay'; $wgHooks['ResourceLoaderGetConfigVars'][] = 'WikiGrok\Hooks::onResourceLoaderGetConfigVars'; $wgHooks['EventLoggingRegisterSchemas'][] = 'WikiGrok\Hooks::onEventLoggingRegisterSchemas'; -- To view, visit https://gerrit.wikimedia.org/r/199519 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0bfb5013b5d1fe4fbab2179e5590a64572e32fb4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiGrok Gerrit-Branch: master Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: Kaldari rkald...@wikimedia.org Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix WikiGrok bug - change (mediawiki/core)
MaxSem has submitted this change and it was merged. Change subject: Fix WikiGrok bug .. Fix WikiGrok bug Change-Id: I217062844c13c25a726278ad83138b8561a66148 --- M extensions/WikiGrok 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: MaxSem: Verified; Looks good to me, approved diff --git a/extensions/WikiGrok b/extensions/WikiGrok index 5bed330..a6d736f 16 --- a/extensions/WikiGrok +++ b/extensions/WikiGrok -Subproject commit 5bed33009ad2fe397056a40e7cceef53a54c5602 +Subproject commit a6d736f30323d0d4af7d3f4550a23d9a66f3a4a1 -- To view, visit https://gerrit.wikimedia.org/r/199524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I217062844c13c25a726278ad83138b8561a66148 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Start blazegraph for integration tests - change (wikidata...rdf)
jenkins-bot has submitted this change and it was merged.
Change subject: Start blazegraph for integration tests
..
Start blazegraph for integration tests
We'll use this to test the update tool.
Change-Id: Ib080fe55f36ffb87acbb15301a0b96f09fb72747
---
M .gitignore
M README.md
M pom.xml
M tools/pom.xml
A tools/src/test/java/org/wikidata/rdf/tool/BlazegraphCanaryIntegrationTest.java
A tools/src/test/resources/blazegraph/RWStore.properties
6 files changed, 151 insertions(+), 1 deletion(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 676a294..7e54b9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
data/
*.iml
.idea
+**/rules.log
diff --git a/README.md b/README.md
index be7be87..f1e042b 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,7 @@
** Apache Licensed
* blazegraph - Blazegraph extension to make querying Wikibase instances more
efficient
** GPLv2 Licensed
+
+Development Notes
+-
+* Eclipse - Works well with m2e.
diff --git a/pom.xml b/pom.xml
index 6bb2ac8..cd11fe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -300,6 +300,10 @@
idbigdata.releases/id
urlhttp://www.systap.com/maven/releases/url
/repository
+repository
+ idwmf.mirrored/id
+ urlhttp://archiva.wikimedia.org/repository/mirrored/url
+/repository
/repositories
profiles
diff --git a/tools/pom.xml b/tools/pom.xml
index 3eb7673..4103948 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -1,4 +1,5 @@
-project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
parent
groupIdorg.wikidata.query.rdf/groupId
@@ -81,6 +82,95 @@
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-javadoc-plugin/artifactId
/plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-dependency-plugin/artifactId
+version2.10/version
+executions
+ execution
+idunpack/id
+phasepre-integration-test/phase
+goals
+ goalunpack/goal
+/goals
+configuration
+ artifactItems
+artifactItem
+ groupIdcom.bigdata/groupId
+ artifactIdbigdata/artifactId
+ version1.5.1/version
+ typewar/type
+/artifactItem
+ /artifactItems
+
outputDirectory${project.build.directory}/blazegraph/outputDirectory
+/configuration
+ /execution
+/executions
+ /plugin
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdproperties-maven-plugin/artifactId
+version1.0-alpha-2/version
+executions
+ execution
+idsetup-blazegraph-properties/id
+goals
+ goalset-system-properties/goal
+/goals
+phasepre-integration-test/phase
+configuration
+ properties
+property
+ !-- By default Blazegraph's WAR thinks it running in tomcat
and uses funky relative paths. They suggest
+you overwrite it. We do. --
+
namecom.bigdata.rdf.sail.webapp.ConfigParams.propertyFile/name
+
value${project.basedir}/src/test/resources/blazegraph/RWStore.properties/value
+/property
+ /properties
+/configuration
+ /execution
+/executions
+ /plugin
+ plugin
+groupIdorg.eclipse.jetty/groupId
+artifactIdjetty-maven-plugin/artifactId
+version9.2.10.v20150310/version
+configuration
+ scanIntervalSeconds10/scanIntervalSeconds
+ stopKeystopblazegraphrightnowplzkthx/stopKey
+ stopPort9898/stopPort
+/configuration
+executions
+ execution
+idstart-blzegraph/id
+phasepre-integration-test/phase
+goals
+ goalstart/goal
+/goals
+!-- This complains some because this project _isn't_ a war. But
we want to start the Blazegraph war. --
+configuration
+ scanIntervalSeconds0/scanIntervalSeconds
+ httpConnector
+port/port
+ /httpConnector
+ contextHandlers
+contextHandler
implementation=org.eclipse.jetty.maven.plugin.JettyWebAppContext
+ !-- TODO a war with the blazegraph extensions --
+
[MediaWiki-commits] [Gerrit] Make page action overlay pointer position correctly. - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Make page action overlay pointer position correctly.
..
Make page action overlay pointer position correctly.
This adds two new events.
The BannerImage fires a loaded event when it loads.
The Skin renders changed whenever something happens to the rendering of
the skin.
Also:
Left align the pointer so it points to the middle of the $target
Bug: T91047
Change-Id: Ifcf3829b4d18748670ffd4de6979e54f1e17ce91
---
M javascripts/Skin.js
M javascripts/modules/bannerImage/BannerImage.js
M javascripts/modules/bannerImage/init.js
M javascripts/modules/tutorials/ContentOverlay.js
M javascripts/modules/uploads/init.js
M javascripts/modules/watchstar/init.js
6 files changed, 22 insertions(+), 9 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/Skin.js b/javascripts/Skin.js
index 12b27f0..9a6d6d5 100644
--- a/javascripts/Skin.js
+++ b/javascripts/Skin.js
@@ -136,6 +136,11 @@
$el.addClass( 'touch-events' );
}
$( 'div class=transparent-shield cloaked-element'
).appendTo( '#mw-mf-page-center' );
+ /**
+* @event changed
+* Fired when appearance of skin changes.
+*/
+ this.emit( 'changed' );
},
/**
diff --git a/javascripts/modules/bannerImage/BannerImage.js
b/javascripts/modules/bannerImage/BannerImage.js
index 34e7fa6..82112df 100644
--- a/javascripts/modules/bannerImage/BannerImage.js
+++ b/javascripts/modules/bannerImage/BannerImage.js
@@ -87,7 +87,11 @@
.show();
self.resizeFrame();
-
+ /**
+* @event loaded
+* Fired when image has loaded and been rendered in
page.
+*/
+ self.emit( 'loaded' );
if ( !self.hasLoadedOnce ) {
self.hasLoadedOnce = true;
M.on( 'resize', function () {
diff --git a/javascripts/modules/bannerImage/init.js
b/javascripts/modules/bannerImage/init.js
index a481d56..bf7c981 100644
--- a/javascripts/modules/bannerImage/init.js
+++ b/javascripts/modules/bannerImage/init.js
@@ -1,9 +1,10 @@
-( function ( M ) {
+( function ( M, $ ) {
M.require( 'context' ).assertMode( [ 'alpha', 'beta' ] );
var MobileViewBannerImageRepository = M.require(
'modules/bannerImage/MobileViewBannerImageRepository' ),
BannerImage = M.require( 'modules/bannerImage/BannerImage' ),
page = M.getCurrentPage(),
+ skin = M.require( 'skin' ),
repository,
bannerImage;
@@ -16,6 +17,7 @@
bannerImage = new BannerImage( {
repository: repository
} );
+ bannerImage.on( 'loaded', $.proxy( skin, 'emit', 'changed' ) );
bannerImage.insertBefore( '.pre-content' );
}
-}( mw.mobileFrontend ) );
+}( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/modules/tutorials/ContentOverlay.js
b/javascripts/modules/tutorials/ContentOverlay.js
index 8f36fb1..0d152a5 100644
--- a/javascripts/modules/tutorials/ContentOverlay.js
+++ b/javascripts/modules/tutorials/ContentOverlay.js
@@ -1,6 +1,7 @@
( function ( M, $ ) {
var ContentOverlay,
+ skin = M.require( 'skin' ),
Overlay = M.require( 'Overlay' );
/**
@@ -34,12 +35,7 @@
$target = $( options.target );
// Ensure we position the overlay correctly but
do not show the arrow
self._position( $target );
- // Ensure that any reflows due to tablet styles
have happened before showing
- // the arrow.
- setTimeout( function () {
- self.addPointerArrow( $target );
- M.on( 'resize', $.proxy( self,
'refreshPointerArrow', options.target ) );
- }, 0 );
+ this.addPointerArrow( $target );
}
},
/**
@@ -82,6 +78,8 @@
// remove the left offset of the overlay as
margin auto may be applied to it
left: paOffset.left + 10 - overlayOffset.left
} ).appendTo( this.$el );
+ skin.on( 'changed', $.proxy( this,
'refreshPointerArrow', this.options.target ) );
+ M.on( 'resize', $.proxy( this,
[MediaWiki-commits] [Gerrit] Fix JS exception when tutorial loads - change (mediawiki...Gather)
Robmoen has uploaded a new change for review. https://gerrit.wikimedia.org/r/199537 Change subject: Fix JS exception when tutorial loads .. Fix JS exception when tutorial loads Uncaught TypeError: Cannot read property 'remove' of undefined Might be related to bug: 1147115 Change-Id: I76cd5c8956e79145e18e5af9eea6839a85d4f28a --- M resources/ext.gather.watchstar/init.js 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/37/199537/1 diff --git a/resources/ext.gather.watchstar/init.js b/resources/ext.gather.watchstar/init.js index 2197a2b..5715aff 100644 --- a/resources/ext.gather.watchstar/init.js +++ b/resources/ext.gather.watchstar/init.js @@ -7,6 +7,7 @@ settingOverlayWasDismissed = 'gather-has-dismissed-tutorial', user = M.require( 'user' ), page = M.getCurrentPage(); + settings.remove( settingOverlayWasDismissed ); /** * Determines if collection tutorial should be shown @@ -67,9 +68,6 @@ overlayDismissed(); } ); actionOverlay.show(); - // Refresh pointer otherwise it is not positioned - // FIXME: Remove when ContentOverlay is fixed - actionOverlay.refreshPointerArrow( $star ); } /** -- To view, visit https://gerrit.wikimedia.org/r/199537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76cd5c8956e79145e18e5af9eea6839a85d4f28a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Robmoen rm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update bower_modules to include the c3 fix - change (wikimedia...dash)
jenkins-bot has submitted this change and it was merged. Change subject: Update bower_modules to include the c3 fix .. Update bower_modules to include the c3 fix Change-Id: I8bf9bea7a5c41c6aece1f5f28bf9878770d7c11d --- M src/bower_modules 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ssmith: Looks good to me, approved jenkins-bot: Verified diff --git a/src/bower_modules b/src/bower_modules index b570271..f776d8b 16 --- a/src/bower_modules +++ b/src/bower_modules -Subproject commit b57027165c9375498978d3f65b8324d95621351c +Subproject commit f776d8b7f3152ceccfb02f425985c4612d957643 -- To view, visit https://gerrit.wikimedia.org/r/199520 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8bf9bea7a5c41c6aece1f5f28bf9878770d7c11d Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update RestBaseUpdateJobs extension to current master - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update RestBaseUpdateJobs extension to current master .. Update RestBaseUpdateJobs extension to current master Change-Id: I8e85ead5e6faa492b2e0cdd6f82a6a88cc7c63b2 --- M extensions/RestBaseUpdateJobs 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/RestBaseUpdateJobs b/extensions/RestBaseUpdateJobs index 335b2db..da80f0a 16 --- a/extensions/RestBaseUpdateJobs +++ b/extensions/RestBaseUpdateJobs -Subproject commit 335b2db57921b1d5c698f35c665c73fc125d764b +Subproject commit da80f0a96e886b5acfc12977c7ed33964b0d9065 -- To view, visit https://gerrit.wikimedia.org/r/199526 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e85ead5e6faa492b2e0cdd6f82a6a88cc7c63b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Defer loading of collections till watchlist click - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Defer loading of collections till watchlist click
..
Defer loading of collections till watchlist click
Bug: T92573
Bug: T92711
Change-Id: I20913e785f4500f28ab6ca6ae649b486343135ee
---
M includes/Gather.hooks.php
M resources/ext.gather.watchstar/CollectionsApi.js
M resources/ext.gather.watchstar/CollectionsContentOverlay.js
M resources/ext.gather.watchstar/CollectionsWatchstar.js
M resources/ext.gather.watchstar/init.js
5 files changed, 47 insertions(+), 28 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Gather.hooks.php b/includes/Gather.hooks.php
index 26575f3..cb05071 100644
--- a/includes/Gather.hooks.php
+++ b/includes/Gather.hooks.php
@@ -131,21 +131,6 @@
global $wgGatherShouldShowTutorial;
$user = $out-getUser();
$title = $out-getTitle();
- if ( !$user-isAnon() !$title-isSpecialPage() ) {
- $member = $title-getPrefixedText();
- $collectionsList = models\CollectionsList::newFromApi(
$user, true, $member );
- $gatherCollections = array();
- foreach ( $collectionsList as $collectionInfo ) {
- if ( $collectionInfo !== null ) {
- $collection =
$collectionInfo-toArray();
- if ( $member ) {
-
$collection['titleInCollection'] = $collectionInfo-isKnownMember( $member );
- }
- $gatherCollections[] = $collection;
- }
- }
- $vars['wgGatherCollections'] = $gatherCollections;
- }
$vars['wgGatherShouldShowTutorial'] =
$wgGatherShouldShowTutorial;
// Expose page image.
// FIXME: Should probably be in PageImages extension
diff --git a/resources/ext.gather.watchstar/CollectionsApi.js
b/resources/ext.gather.watchstar/CollectionsApi.js
index ee0a026..48b6535 100644
--- a/resources/ext.gather.watchstar/CollectionsApi.js
+++ b/resources/ext.gather.watchstar/CollectionsApi.js
@@ -88,6 +88,35 @@
} );
},
/**
+* Gets an object representing all the current users collections
+* @method
+* @param {String} owner of the collections
+* @param {Page} page the current page.
+*/
+ getCurrentUsersCollections: function ( owner, page ) {
+ return this.get( {
+ action: 'query',
+ list: 'lists',
+ lsttitle: page.getTitle(),
+ lstprop: 'label|description|public|image|count',
+ lstowner: owner
+ } ).then( function ( resp ) {
+ if ( resp.query resp.query.lists ) {
+ return $.map( resp.query.lists,
function ( list ) {
+ // FIXME: API should handle all
these inconsistencies.
+ list.isWatchlist = list.id ===
0;
+ list.titleInCollection =
list.title;
+ list.title = list.label;
+ list.owner = owner;
+ delete list.label;
+ return list;
+ } );
+ } else {
+ return [];
+ }
+ } );
+ },
+ /**
* Edits a collection
* @method
* @param {Number} id unique identifier of collection
diff --git a/resources/ext.gather.watchstar/CollectionsContentOverlay.js
b/resources/ext.gather.watchstar/CollectionsContentOverlay.js
index d398b50..f578a5e 100644
--- a/resources/ext.gather.watchstar/CollectionsContentOverlay.js
+++ b/resources/ext.gather.watchstar/CollectionsContentOverlay.js
@@ -4,6 +4,7 @@
schema = new SchemaGather(),
icons = M.require( 'icons' ),
toast = M.require( 'toast' ),
+ user = M.require( 'user' ),
Icon = M.require( 'Icon' ),
CollectionsApi = M.require(
'ext.gather.watchstar/CollectionsApi' ),
CollectionsContentOverlayBase =
[MediaWiki-commits] [Gerrit] Render settings arc on either button - change (wikimedia...dash)
Ssmith has submitted this change and it was merged. Change subject: Render settings arc on either button .. Render settings arc on either button Quick-n-dirty fix Change-Id: Ibc94ac525af04ed68e7ebd0c9150ce4952733465 --- M src/components/widgets/fraud-gauge/fraud-gauge.html 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ssmith: Looks good to me, approved diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html b/src/components/widgets/fraud-gauge/fraud-gauge.html index 00cf2c2..125e18c 100644 --- a/src/components/widgets/fraud-gauge/fraud-gauge.html +++ b/src/components/widgets/fraud-gauge/fraud-gauge.html @@ -26,7 +26,7 @@ div class=col-md-12 div class=setupAsk h3This widget hasn't been set up yet./h3 -button type=button class=btn btn-primary btn-lg btn-block data-toggle=modal data-target=#modifyModalSet it up/button +button type=button class=btn btn-primary btn-lg btn-block data-toggle=modal data-target=#modifyModal data-bind=click: renderPercentRangeChartSet it up/button /div /div /div -- To view, visit https://gerrit.wikimedia.org/r/199533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc94ac525af04ed68e7ebd0c9150ce4952733465 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix 'Not set up' on new widget - change (wikimedia...dash)
Ssmith has submitted this change and it was merged.
Change subject: Fix 'Not set up' on new widget
..
Fix 'Not set up' on new widget
New fraud gauges weren't showing the chart till you saved and
reloaded
Change-Id: Iff9d8df07617f8dcd4bc3709da1661bef562438d
---
M src/components/widgets/fraud-gauge/fraud-gauge.js
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ssmith: Looks good to me, approved
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 425bcc1..04482a7 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -257,6 +257,7 @@
});
} else{
+ self.configSet( true );
//gauge time period
self.queryRequest.timespan =
self.selectedTimePeriod();
--
To view, visit https://gerrit.wikimedia.org/r/199531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff9d8df07617f8dcd4bc3709da1661bef562438d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ctools to 7.x-1.7 - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Update ctools to 7.x-1.7
..
Update ctools to 7.x-1.7
Change-Id: Ifdc607a20dd3296dee25d95bcffe5d8346e969b5
---
M sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
M sites/all/modules/contrib/ctools/ctools.info
M sites/all/modules/contrib/ctools/ctools.module
M
sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
M sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
M
sites/all/modules/contrib/ctools/ctools_custom_content/ctools_custom_content.info
M
sites/all/modules/contrib/ctools/ctools_plugin_example/ctools_plugin_example.info
M sites/all/modules/contrib/ctools/includes/content.menu.inc
M sites/all/modules/contrib/ctools/includes/context-admin.inc
A sites/all/modules/contrib/ctools/includes/entity-access.inc
M sites/all/modules/contrib/ctools/page_manager/page_manager.admin.inc
M sites/all/modules/contrib/ctools/page_manager/page_manager.info
M
sites/all/modules/contrib/ctools/page_manager/plugins/task_handlers/http_response.inc
M sites/all/modules/contrib/ctools/page_manager/plugins/tasks/term_view.inc
M sites/all/modules/contrib/ctools/plugins/arguments/entity_id.inc
M sites/all/modules/contrib/ctools/plugins/contexts/user_edit_form.inc
M sites/all/modules/contrib/ctools/plugins/export_ui/ctools_export_ui.class.php
M sites/all/modules/contrib/ctools/stylizer/stylizer.info
M sites/all/modules/contrib/ctools/term_depth/term_depth.info
M
sites/all/modules/contrib/ctools/tests/ctools_export_test/ctools_export_test.info
M sites/all/modules/contrib/ctools/tests/ctools_plugin_test.info
M
sites/all/modules/contrib/ctools/views_content/plugins/content_types/views_panes.inc
M sites/all/modules/contrib/ctools/views_content/views_content.info
23 files changed, 344 insertions(+), 142 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
b/sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
index 1e9031d..fd35545 100644
--- a/sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
+++ b/sites/all/modules/contrib/ctools/bulk_export/bulk_export.info
@@ -6,9 +6,9 @@
version = CTOOLS_MODULE_VERSION
-; Information added by Drupal.org packaging script on 2015-01-28
-version = 7.x-1.6
+; Information added by Drupal.org packaging script on 2015-03-18
+version = 7.x-1.7
core = 7.x
project = ctools
-datestamp = 1422471484
+datestamp = 1426696183
diff --git a/sites/all/modules/contrib/ctools/ctools.info
b/sites/all/modules/contrib/ctools/ctools.info
index bd2e3c1..3283454 100644
--- a/sites/all/modules/contrib/ctools/ctools.info
+++ b/sites/all/modules/contrib/ctools/ctools.info
@@ -9,9 +9,9 @@
files[] = includes/stylizer.inc
files[] = tests/css_cache.test
-; Information added by Drupal.org packaging script on 2015-01-28
-version = 7.x-1.6
+; Information added by Drupal.org packaging script on 2015-03-18
+version = 7.x-1.7
core = 7.x
project = ctools
-datestamp = 1422471484
+datestamp = 1426696183
diff --git a/sites/all/modules/contrib/ctools/ctools.module
b/sites/all/modules/contrib/ctools/ctools.module
index c37b96f..3e8cc88 100644
--- a/sites/all/modules/contrib/ctools/ctools.module
+++ b/sites/all/modules/contrib/ctools/ctools.module
@@ -23,7 +23,7 @@
* ; Requires CTools v7.x-1.4 or newer.
* dependencies[] = ctools (=1.4)
*/
-define('CTOOLS_MODULE_VERSION', '7.x-1.6');
+define('CTOOLS_MODULE_VERSION', '7.x-1.7');
/**
* Test the CTools API version.
diff --git
a/sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
b/sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
index 2180cec..d7ec175 100644
---
a/sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
+++
b/sites/all/modules/contrib/ctools/ctools_access_ruleset/ctools_access_ruleset.info
@@ -5,9 +5,9 @@
version = CTOOLS_MODULE_VERSION
dependencies[] = ctools
-; Information added by Drupal.org packaging script on 2015-01-28
-version = 7.x-1.6
+; Information added by Drupal.org packaging script on 2015-03-18
+version = 7.x-1.7
core = 7.x
project = ctools
-datestamp = 1422471484
+datestamp = 1426696183
diff --git
a/sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
b/sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
index 009662f..bc1a213 100644
---
a/sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
+++
b/sites/all/modules/contrib/ctools/ctools_ajax_sample/ctools_ajax_sample.info
@@ -5,9 +5,9 @@
dependencies[] = ctools
core = 7.x
-; Information added by Drupal.org packaging script on 2015-01-28
-version = 7.x-1.6
+; Information added by Drupal.org packaging script on 2015-03-18
+version = 7.x-1.7
core = 7.x
project = ctools
