[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[REL1_27]: print.less - modified tabel style for media print

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338318 )

Change subject: print.less - modified tabel style for media print
..


print.less - modified tabel style for media print

Change-Id: Ie2dbe746523917c1a1f6e0eba8c5e4847e2bc0a4
---
M resources/print.less
1 file changed, 12 insertions(+), 8 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/resources/print.less b/resources/print.less
index ca680ad..eb33e26 100644
--- a/resources/print.less
+++ b/resources/print.less
@@ -1,7 +1,7 @@
-#bs-main-nav, #bs-beforearticlecontent, #bs-menu-top, #bs-statebar, 
-#bs-left-column, .bsShoutBox, #bs-bluespiceprojectfeedbackhelperpanel, 
-#p-cactions, #bs-floater-right, #bs-top-gradient, #bs-after-content form, 
-#bs-after-content input, #bs-title-actions, #left-navigation, 
+#bs-main-nav, #bs-beforearticlecontent, #bs-menu-top, #bs-statebar,
+#bs-left-column, .bsShoutBox, #bs-bluespiceprojectfeedbackhelperpanel,
+#p-cactions, #bs-floater-right, #bs-top-gradient, #bs-after-content form,
+#bs-after-content input, #bs-title-actions, #left-navigation,
 #right-navigation {
display   : none !important;
visibility: hidden !important;
@@ -50,11 +50,11 @@
visibility: visible !important;
 }
 .printfooter {
-   margin-top: 1cm !important;  
+   margin-top: 1cm !important;
padding: 6px;
-   border: 1px solid #cc !important; 
+   border: 1px solid #cc !important;
font-size: 8pt;
-   color: #aa !important;
+   color: #aa !important;
 }
 h2 {
margin-top: 0.5cm !important;
@@ -81,4 +81,8 @@
 
 h1.firstHeading {
font-size: 188%;
-}
\ No newline at end of file
+}
+
+table {
+   page-break-inside: auto;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/338318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2dbe746523917c1a1f6e0eba8c5e4847e2bc0a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2070

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338319 )

Change subject: db-codfw.php: Repool db2070
..


db-codfw.php: Repool db2070

db2070 was moved to another rack and was depooled. Repool it
Also, update its rack position in the file.

Bug: T156478
Change-Id: Ida46942190eb2046d26855a038f08f9f3e762644
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 4888401..d1f19ed 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
'db2062' => 100, # B5 3.3TB 160GB, api
'db2069' => 100, # D6 3.3TB 160GB, api
-#  'db2070' => 400, # D6 3.3TB 160GB #T156478
+   'db2070' => 400, # C5 3.3TB 160GB
],
's2' => [
'db2017' => 0,   # B6 2.9TB  96GB, master

-- 
To view, visit https://gerrit.wikimedia.org/r/338319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida46942190eb2046d26855a038f08f9f3e762644
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2070

[Marostegui (Code Review)]

Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338319 )

Change subject: db-codfw.php: Repool db2070
..

db-codfw.php: Repool db2070

db2070 was moved to another rack and was depooled. Repool it
Also, update its rack position in the file.

Bug: T156478
Change-Id: Ida46942190eb2046d26855a038f08f9f3e762644
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/19/338319/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 4888401..d1f19ed 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
'db2062' => 100, # B5 3.3TB 160GB, api
'db2069' => 100, # D6 3.3TB 160GB, api
-#  'db2070' => 400, # D6 3.3TB 160GB #T156478
+   'db2070' => 400, # C5 3.3TB 160GB
],
's2' => [
'db2017' => 0,   # B6 2.9TB  96GB, master

-- 
To view, visit https://gerrit.wikimedia.org/r/338319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida46942190eb2046d26855a038f08f9f3e762644
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: print.less - modified tabel style for media print

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336999 )

Change subject: print.less - modified tabel style for media print
..


print.less - modified tabel style for media print

Change-Id: Ie2dbe746523917c1a1f6e0eba8c5e4847e2bc0a4
---
M resources/print.less
1 file changed, 12 insertions(+), 8 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/print.less b/resources/print.less
index ca680ad..eb33e26 100644
--- a/resources/print.less
+++ b/resources/print.less
@@ -1,7 +1,7 @@
-#bs-main-nav, #bs-beforearticlecontent, #bs-menu-top, #bs-statebar, 
-#bs-left-column, .bsShoutBox, #bs-bluespiceprojectfeedbackhelperpanel, 
-#p-cactions, #bs-floater-right, #bs-top-gradient, #bs-after-content form, 
-#bs-after-content input, #bs-title-actions, #left-navigation, 
+#bs-main-nav, #bs-beforearticlecontent, #bs-menu-top, #bs-statebar,
+#bs-left-column, .bsShoutBox, #bs-bluespiceprojectfeedbackhelperpanel,
+#p-cactions, #bs-floater-right, #bs-top-gradient, #bs-after-content form,
+#bs-after-content input, #bs-title-actions, #left-navigation,
 #right-navigation {
display   : none !important;
visibility: hidden !important;
@@ -50,11 +50,11 @@
visibility: visible !important;
 }
 .printfooter {
-   margin-top: 1cm !important;  
+   margin-top: 1cm !important;
padding: 6px;
-   border: 1px solid #cc !important; 
+   border: 1px solid #cc !important;
font-size: 8pt;
-   color: #aa !important;
+   color: #aa !important;
 }
 h2 {
margin-top: 0.5cm !important;
@@ -81,4 +81,8 @@
 
 h1.firstHeading {
font-size: 188%;
-}
\ No newline at end of file
+}
+
+table {
+   page-break-inside: auto;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/336999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2dbe746523917c1a1f6e0eba8c5e4847e2bc0a4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[REL1_27]: print.less - modified tabel style for media print

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338318 )

Change subject: print.less - modified tabel style for media print
..

print.less - modified tabel style for media print

Change-Id: Ie2dbe746523917c1a1f6e0eba8c5e4847e2bc0a4
---
M resources/print.less
1 file changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/18/338318/1

diff --git a/resources/print.less b/resources/print.less
index ca680ad..eb33e26 100644
--- a/resources/print.less
+++ b/resources/print.less
@@ -1,7 +1,7 @@
-#bs-main-nav, #bs-beforearticlecontent, #bs-menu-top, #bs-statebar, 
-#bs-left-column, .bsShoutBox, #bs-bluespiceprojectfeedbackhelperpanel, 
-#p-cactions, #bs-floater-right, #bs-top-gradient, #bs-after-content form, 
-#bs-after-content input, #bs-title-actions, #left-navigation, 
+#bs-main-nav, #bs-beforearticlecontent, #bs-menu-top, #bs-statebar,
+#bs-left-column, .bsShoutBox, #bs-bluespiceprojectfeedbackhelperpanel,
+#p-cactions, #bs-floater-right, #bs-top-gradient, #bs-after-content form,
+#bs-after-content input, #bs-title-actions, #left-navigation,
 #right-navigation {
display   : none !important;
visibility: hidden !important;
@@ -50,11 +50,11 @@
visibility: visible !important;
 }
 .printfooter {
-   margin-top: 1cm !important;  
+   margin-top: 1cm !important;
padding: 6px;
-   border: 1px solid #cc !important; 
+   border: 1px solid #cc !important;
font-size: 8pt;
-   color: #aa !important;
+   color: #aa !important;
 }
 h2 {
margin-top: 0.5cm !important;
@@ -81,4 +81,8 @@
 
 h1.firstHeading {
font-size: 188%;
-}
\ No newline at end of file
+}
+
+table {
+   page-break-inside: auto;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/338318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2dbe746523917c1a1f6e0eba8c5e4847e2bc0a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Make attributions more visible on static snapshot

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336905 )

Change subject: Make attributions more visible on static snapshot
..


Make attributions more visible on static snapshot

* And fix inconsistencies between static and interactive modes

Bug: T157720
Change-Id: I8bd66db6f4dbdf9d42b315226eb3c30ea47eb5eb
---
M styles/control-attribution.less
M styles/leaflet-overrides.less
2 files changed, 29 insertions(+), 12 deletions(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/styles/control-attribution.less b/styles/control-attribution.less
index 75e5233..8e0facd 100644
--- a/styles/control-attribution.less
+++ b/styles/control-attribution.less
@@ -1,10 +1,8 @@
 /* == Attribution control == */
 @import '../lib/wmui-base.less';
 
+/* Static snapshot */
 .mw-kartographer-attribution {
-   background-color: rgba( 255, 255, 255, 0.5 );
-   color: @color-base;
-
position: absolute;
right: 0;
bottom: 0;
@@ -14,14 +12,22 @@
box-shadow: none;
 }
 
-/** Override initial properties */
+/* Static + Interactive */
+.mw-kartographer-attribution,
 .leaflet-right.leaflet-bottom {
-   .leaflet-control.leaflet-control-attribution {
-   float: none;
-   clear: none;
-   }
+   background-color: rgba( 255, 255, 255, 0.8 );
+   color: @color-base;
 }
 
+/* Interactive */
+.leaflet-right.leaflet-bottom .leaflet-control.leaflet-control-attribution {
+   /** Override initial properties */
+   background-color: transparent;
+   float: none;
+   clear: none;
+}
+
+/* Static + Interactive */
 .mw-kartographer-attribution,
 .leaflet-right.leaflet-bottom .leaflet-control.leaflet-control-attribution {
font-size: 10px;
@@ -36,5 +42,20 @@
overflow: hidden;
text-overflow: clip;
white-space: normal;
+
+   }
+
+   a {
+   color: @color-base;
+   }
+}
+
+/* Static + Interactive */
+.mw-kartographer-map:hover .mw-kartographer-attribution,
+.mw-kartographer-interactive:hover .leaflet-right.leaflet-bottom {
+   background-color: rgba( 255, 255, 255, 0.9 );
+
+   a { /* stylelint-disable-line no-descending-specificity */
+   color: @color-primary;
}
 }
diff --git a/styles/leaflet-overrides.less b/styles/leaflet-overrides.less
index 9faac22..06f26a4 100644
--- a/styles/leaflet-overrides.less
+++ b/styles/leaflet-overrides.less
@@ -38,10 +38,6 @@
}
}
}
-
-   &:hover .leaflet-control-attribution a {
-   color: @color-primary;
-   }
}
 
/* Leaflet Popups */

-- 
To view, visit https://gerrit.wikimedia.org/r/336905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8bd66db6f4dbdf9d42b315226eb3c30ea47eb5eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Map attributions should be visible when sidebar is open

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336912 )

Change subject: Map attributions should be visible when sidebar is open
..


Map attributions should be visible when sidebar is open

Bug: T152978
Change-Id: Ic9ea2dcee9d60b8eed9e63177e892fc19433e85d
---
M modules/dialog/dialog.js
M styles/dialog.less
2 files changed, 15 insertions(+), 1 deletion(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dialog/dialog.js b/modules/dialog/dialog.js
index 58db1fa..89ff03d 100644
--- a/modules/dialog/dialog.js
+++ b/modules/dialog/dialog.js
@@ -104,6 +104,8 @@
return;
}
 
+   dialog.$body.toggleClass( 
'mw-kartographer-mapDialog-sidebar-opened', open );
+
mw.track( 'mediawiki.kartographer', {
action: open ? 'sidebar-show' : 'sidebar-hide',
isFullScreen: true,
diff --git a/styles/dialog.less b/styles/dialog.less
index 16734dc..70f57bf 100644
--- a/styles/dialog.less
+++ b/styles/dialog.less
@@ -1,5 +1,11 @@
 @import '../lib/wmui-base.less';
 
+/*
+   Anyone who changes the width of the sidebar should
+   update Kartographer.Dialog.DialogClass `SIDEBAR_WIDTH` accordingly
+*/
+@sidebarWidth: 320px;
+
 /* Dialog footer */
 .mw-kartographer-mapDialog-foot {
/*
@@ -37,7 +43,7 @@
Anyone who changes the width of the sidebar should
update Kartographer.Dialog.DialogClass `SIDEBAR_WIDTH` 
accordingly
*/
-   width: 321px; /* 320+1 so border is hidden on common 320px wide mobile 
devices */
+   width: @sidebarWidth + 1px; /* 320+1 so border is hidden on common 
320px wide mobile devices */
box-sizing: border-box;
background-color: #fff;
padding: 3em 2em 1em;
@@ -150,3 +156,9 @@
background-size: 32px;
background-repeat: no-repeat;
 }
+
+.mw-kartographer-mapDialog-sidebar-opened {
+   .leaflet-right.leaflet-bottom {
+   right: @sidebarWidth;
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/336912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9ea2dcee9d60b8eed9e63177e892fc19433e85d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: [WIP] Hub theme widget re-design

[Harej (Code Review)]

Harej has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338317 )

Change subject: [WIP] Hub theme widget re-design
..

[WIP] Hub theme widget re-design

Bug: T157630
Change-Id: I670fce13f2a39d350460f27ac57b0d1ca0521104
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/CollaborationHubContentEditor.php
M includes/SpecialCreateCollaborationHub.php
D modules/ext.CollaborationKit.colour.js
M modules/ext.CollaborationKit.edit.styles.less
D modules/ext.CollaborationKit.hubimage.js
A modules/ext.CollaborationKit.hubtheme.js
R modules/ext.CollaborationKit.hubtheme.styles.less
R modules/ext.CollaborationKit.icon.styles.less
11 files changed, 402 insertions(+), 337 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/17/338317/1

diff --git a/extension.json b/extension.json
index d2bc720..8dddecd 100644
--- a/extension.json
+++ b/extension.json
@@ -95,7 +95,7 @@
"ext.CollaborationKit.edit.styles": {
"styles": "ext.CollaborationKit.edit.styles.less"
},
-   "ext.CollaborationKit.iconbrowser": {
+   "ext.CollaborationKit.icon": {
"scripts": "ext.CollaborationKit.icon.js",
"dependencies": [
"oojs-ui",
@@ -110,38 +110,26 @@
"collaborationkit-icon-launchbutton",
"cancel"
],
-   "styles": "ext.CollaborationKit.iconbrowser.styles.less"
+   "styles": "ext.CollaborationKit.icon.styles.less"
},
-   "ext.CollaborationKit.hubimagebrowser": {
-   "scripts": "ext.CollaborationKit.hubimage.js",
+   "ext.CollaborationKit.hubtheme": {
+   "scripts": "ext.CollaborationKit.hubtheme.js",
"dependencies": [
"oojs-ui",
"oojs-ui.styles.icons-movement",
+   "oojs-ui.styles.icons-editing-core",
"mediawiki.widgets",
"mediawiki.widgets.UserInputWidget",
"mediawiki.widgets.MediaSearch",
-   "mediawiki.api"
+   "mediawiki.api",
+   "ext.CollaborationKit.icons"
],
"messages": [
"collaborationkit-hubimage-browser",
"collaborationkit-hubimage-select",
-   "collaborationkit-hubimage-launchbutton",
-   "cancel"
-   ]
-   },
-   "ext.CollaborationKit.colourbrowser": {
-   "scripts": "ext.CollaborationKit.colour.js",
-   "dependencies": [
-   "oojs-ui",
-   "oojs-ui.styles.icons-movement",
-   "mediawiki.widgets",
-   "mediawiki.widgets.UserInputWidget"
-   ],
-   "messages": [
+   "cancel",
"collaborationkit-colour-browser",
"collaborationkit-colour-select",
-   "collaborationkit-colour-launchbutton",
-   "cancel",
"collaborationkit-darkred",
"collaborationkit-red",
"collaborationkit-darkgrey",
@@ -166,7 +154,9 @@
"collaborationkit-khaki",
"collaborationkit-black"
],
-   "styles": 
"ext.CollaborationKit.colourbrowser.styles.less"
+   "styles": [
+   "ext.CollaborationKit.hubtheme.styles.less"
+   ]
},
"ext.CollaborationKit.list.edit": {
"scripts": "ext.CollaborationKit.list.edit.js",
diff --git a/i18n/en.json b/i18n/en.json
index f52fe47..3bfbec4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -87,10 +87,8 @@
"collaborationkit-icon-launchbutton": "Browse icons",
"collaborationkit-icon-browser": "Icon browser",
"collaborationkit-icon-select": "Select",
-   "collaborationkit-colour-launchbutton": "Browse colors",
"collaborationkit-colour-browser": "Color browser",
"collaborationkit-colour-select": "Select",
-   "collaborationkit-hubimage-launchbutton": "Browse images",
"collaborationkit-hubimage-browser": "Media browser",

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Add a collapse button next to the close button

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336921 )

Change subject: Add a collapse button next to the close button
..


Add a collapse button next to the close button

* Makes the "close" button close the full screen dialog
* Makes the "collapse" button collapse the map details sidebar

Bug: T155350
Change-Id: Ic8bf7f0feea2d0a0fad49d88bd94077e9f6d49bd
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/dialog-sidebar/sidebar.js
M styles/dialog.less
5 files changed, 32 insertions(+), 0 deletions(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 66527a0..c4946ea 100644
--- a/extension.json
+++ b/extension.json
@@ -248,6 +248,7 @@
],
"messages": [
"kartographer-fullscreen-close",
+   "kartographer-fullscreen-collapse",
"kartographer-sidebar-coordinates",
"kartographer-sidebar-description",
"kartographer-sidebar-filterdropdown",
diff --git a/i18n/en.json b/i18n/en.json
index 016f501..bb11c5c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -107,6 +107,7 @@
"mapbox-control-zoomin-title": "Zoom in",
"mapbox-control-zoomout-title": "Zoom out",
"kartographer-fullscreen-close": "Close",
+   "kartographer-fullscreen-collapse": "Hide map details",
"kartographer-fullscreen-text": "Show in full screen",
"visualeditor-mwmapsdialog-align": "Alignment",
"visualeditor-mwmapsdialog-geojson": "GeoJSON",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2f6b323..40251d3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -111,6 +111,7 @@
"mapbox-control-zoomin-title": "Title for map zoom in 
button\n{{Identical|Zoom in}}",
"mapbox-control-zoomout-title": "Title for map zoom out 
button\n{{Identical|Zoom out}}",
"kartographer-fullscreen-close": "Title of the fullscreen close 
button\n{{Identical|Close}}",
+   "kartographer-fullscreen-collapse": "Title of the map details collapse 
button",
"kartographer-fullscreen-text": "Tooltip for a button that puts the map 
into full screen",
"visualeditor-mwmapsdialog-align": "Label for setting the map's 
alignment\n{{Identical|Alignment}}",
"visualeditor-mwmapsdialog-geojson": "{{optional}}\nLabel for map 
GeoJSON data",
diff --git a/modules/dialog-sidebar/sidebar.js 
b/modules/dialog-sidebar/sidebar.js
index 5981bba..274f9fc 100644
--- a/modules/dialog-sidebar/sidebar.js
+++ b/modules/dialog-sidebar/sidebar.js
@@ -85,6 +85,7 @@
sidebar.mapPosition = map.getMapPosition( { scaled: true } );
 
sidebar.createCloseButton().$element.appendTo( $container );
+   sidebar.createCollapseButton().$element.appendTo( $container );
 
/**
 * @property {jQuery}
@@ -286,6 +287,23 @@
title: mw.msg( 'kartographer-fullscreen-close' 
),
framed: false,
classes: [ 
'mw-kartographer-mapDialog-closeButton' ]
+   } ).connect( this, { click: 
sidebar.dialog.map.closeFullScreen.bind( sidebar.dialog.map ) } );
+   return button;
+   };
+
+   /**
+* Creates a collapse button instance.
+*
+* @return {OO.ui.ButtonWidget}
+*/
+   SideBar.prototype.createCollapseButton = function () {
+   // Add close button to the sidebar
+   var sidebar = this,
+   button = new OO.ui.ButtonWidget( {
+   icon: 'expand',
+   title: mw.msg( 
'kartographer-fullscreen-collapse' ),
+   framed: false,
+   classes: [ 
'mw-kartographer-mapDialog-collapseButton' ]
} ).connect( this, { click: 
sidebar.dialog.toggleSideBar.bind( sidebar.dialog, false ) } );
return button;
};
diff --git a/styles/dialog.less b/styles/dialog.less
index fb67c62..16734dc 100644
--- a/styles/dialog.less
+++ b/styles/dialog.less
@@ -54,6 +54,17 @@
}
}
 
+   .mw-kartographer-mapDialog-collapseButton {
+   position: absolute;
+   top: 10px;
+   right: 44px;
+   margin-right: 0;
+
+   .oo-ui-buttonElement-button {
+   border: 0;
+   }
+   }
+
/* For MobileFrontend */
.skin-minerva & h2 {
margin-bottom: 0.6em;

-- 
To view, visit https://gerrit.wikimedia.org/r/336921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuSectionOptionWidget: Increase indentation between headin...

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338316 )

Change subject: MenuSectionOptionWidget: Increase indentation between heading 
and items
..

MenuSectionOptionWidget: Increase indentation between heading and items

Bug: T92452
Change-Id: I5e5c7590982c639f23c9ef71c4e4b7b95205f66d
---
M src/themes/mediawiki/widgets.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/16/338316/1

diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index ee884a9..6bac993 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1190,7 +1190,7 @@
 
 .theme-oo-ui-menuSectionOptionWidget () {
color: @color-subtle;
-   padding: 0.33em 0.75em;
+   padding: 0.33em 0.5em;
 }
 
 .theme-oo-ui-outlineOptionWidget () {

-- 
To view, visit https://gerrit.wikimedia.org/r/338316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e5c7590982c639f23c9ef71c4e4b7b95205f66d
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demo: Add DropdownWidget (with MenuSectionOptionWidget)

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338315 )

Change subject: demo: Add DropdownWidget (with MenuSectionOptionWidget)
..

demo: Add DropdownWidget (with MenuSectionOptionWidget)

Bug: T92452
Change-Id: I5209c5c1b297b47c0e91e8ac262a813968ec6bec
---
M demos/pages/widgets.js
1 file changed, 32 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/15/338315/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 4b289ad..3ab813a 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1256,6 +1256,38 @@
new OO.ui.FieldLayout(
new OO.ui.DropdownWidget( {
label: 'Select one',
+   menu: {
+   items: [
+   new 
OO.ui.MenuSectionOptionWidget( {
+   label: 
'Dogs'
+   } ),
+   new 
OO.ui.MenuOptionWidget( {
+   data: 
'corgi',
+   label: 
'Welsh Corgi',
+   
indicator: 'required'
+   } ),
+   new 
OO.ui.MenuOptionWidget( {
+   data: 
'poodle',
+   label: 
'Standard Poodle'
+   } ),
+   new 
OO.ui.MenuSectionOptionWidget( {
+   label: 
'Cats'
+   } ),
+   new 
OO.ui.MenuOptionWidget( {
+   data: 
'lion',
+   label: 
'Lion'
+   } )
+   ]
+   }
+   } ),
+   {
+   label: 'DropdownWidget (with 
MenuSectionOptionWidget)\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.DropdownWidget( {
+   label: 'Select one',
disabled: true,
menu: {
items: [

-- 
To view, visit https://gerrit.wikimedia.org/r/338315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5209c5c1b297b47c0e91e8ac262a813968ec6bec
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: DropdownInputWidget: Add support for 'optgroup'

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338314 )

Change subject: DropdownInputWidget: Add support for 'optgroup'
..

DropdownInputWidget: Add support for 'optgroup'

This isn't really optgroup because the menu items come after the optgroup
instead of inside it (like in HTML). Uses MenuSectionOption.

Bug: T135028
Change-Id: I3fecde5c529f3c8c75e56d881b58026e8496f237
---
M demos/pages/widgets.js
M src/widgets/DropdownInputWidget.js
2 files changed, 41 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/14/338314/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 4b289ad..a2e27d8 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1370,6 +1370,36 @@
new OO.ui.FieldLayout(
new OO.ui.DropdownInputWidget( {
options: [
+   {
+   optgroup: 
'Vowels'
+   },
+   {
+   data: 'a',
+   label: 'A'
+   },
+   {
+   optgroup: 
'Consonants'
+   },
+   {
+   data: 'b',
+   label: 'B'
+   },
+   {
+   data: 'c',
+   label: 'C'
+   }
+   ],
+   value: 'b',
+   title: 'Select an item'
+   } ),
+   {
+   label: 'DropdownInputWidget 
(with optgroup)',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.DropdownInputWidget( {
+   options: [
{ data: 'sq', label: 
'Albanian' },
{ data: 'frp', label: 
'Arpitan' },
{ data: 'ba', label: 
'Bashkir' },
diff --git a/src/widgets/DropdownInputWidget.js 
b/src/widgets/DropdownInputWidget.js
index 3bcd391..3755584 100644
--- a/src/widgets/DropdownInputWidget.js
+++ b/src/widgets/DropdownInputWidget.js
@@ -120,10 +120,17 @@
.clearItems()
.addItems( options.map( function ( opt ) {
var optValue = widget.cleanUpValue( opt.data );
-   return new OO.ui.MenuOptionWidget( {
-   data: optValue,
-   label: opt.label !== undefined ? opt.label : 
optValue
-   } );
+
+   if ( opt.optgroup === undefined ) {
+   return new OO.ui.MenuOptionWidget( {
+   data: optValue,
+   label: opt.label !== undefined ? 
opt.label : optValue
+   } );
+   } else {
+   return new OO.ui.MenuSectionOptionWidget( {
+   label: opt.optgroup
+   } );
+   }
} ) );
 
// Restore the previous value, or reset to something sensible

-- 
To view, visit https://gerrit.wikimedia.org/r/338314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fecde5c529f3c8c75e56d881b58026e8496f237
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TopLists[master]: Remove unused i18n toplists-msg-fb-onRateArticle-* messages

[Jack Phoenix (Code Review)]

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338313 )

Change subject: Remove unused i18n toplists-msg-fb-onRateArticle-* messages
..


Remove unused i18n toplists-msg-fb-onRateArticle-* messages

In
https://github.com/wikimedia/mediawiki-extensions-TopLists/commit/d497b5cc7bea52cc339e9bad16cedc3ccf8a82b1,
the usage of the message was removed, but the actual message wasn't
removed; This patch removes toplists-msg-fb-onRateArticle and its friends!

Change-Id: I7fa5091153c4a0518a71f355d7b05f5f802078fd
---
M i18n/ar.json
M i18n/br.json
M i18n/ca.json
M i18n/cs.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/fi.json
M i18n/fr.json
M i18n/gl.json
M i18n/hu.json
M i18n/ia.json
M i18n/ja.json
M i18n/mk.json
M i18n/ms.json
M i18n/nb.json
M i18n/nl.json
M i18n/pl.json
M i18n/pms.json
M i18n/pt-br.json
M i18n/pt.json
M i18n/ru.json
M i18n/sv.json
M i18n/tl.json
M i18n/uk.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M i18n/zh-hk.json
M i18n/zh.json
29 files changed, 2 insertions(+), 33 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/i18n/ar.json b/i18n/ar.json
index f2fa61a..90d5af9 100644
--- a/i18n/ar.json
+++ b/i18n/ar.json
@@ -71,7 +71,6 @@
"toplists-hours": "({{PLURAL:$1||ساعة واحدة|ساعتان|$1 ساعات|$1 ساعة}})",
"toplists-days": "{{PLURAL:$1||يوم واحد|يومان|$1 أيام|$1 يومًا|$1 
يوم}}",
"toplists-weeks": "{{PLURAL:$1||أسبوع واحد|أسبوعان|$1 أسابيع|$1 
أسبوعًا|$1 أسبوع}}",
-   "toplists-msg-fb-OnRateArticle-short": "صوت على قائمة أفضل 10 في 
$WIKINAME!",
"toplists-create-heading": "خاصية جديدة! إنشاء قائمة أفضل عشرة 
خاصة بك",
"toplists-create-button-msg": "إنشاء قائمة"
 }
diff --git a/i18n/br.json b/i18n/br.json
index f7e8c6c..fd29d80 100644
--- a/i18n/br.json
+++ b/i18n/br.json
@@ -66,7 +66,6 @@
"toplists-hours": "$1 {{PLURAL:$1|eur|eur}}",
"toplists-days": "$1 {{PLURAL:$1|deiz|deiz}}",
"toplists-weeks": "$1 {{PLURAL:$1|sizhun|sizhun}}",
-   "toplists-msg-fb-OnRateArticle-short": "en deus votet war ur roll Top 
10 list war $WIKINAME !",
"toplists-create-heading": "Nevez! Savit ho roll Top 10 
deoc'h-c'hwi",
"toplists-create-button-msg": "Sevel ur roll"
 }
diff --git a/i18n/ca.json b/i18n/ca.json
index 22f996a..dd5df39 100644
--- a/i18n/ca.json
+++ b/i18n/ca.json
@@ -69,7 +69,6 @@
"toplists-hours": "$1 {{PLURAL:$1|hora|hores}}",
"toplists-days": "$1 {{PLURAL:$1|dia|dies}}",
"toplists-weeks": "$1 {{PLURAL:$1|setmana|setmanes}}",
-   "toplists-msg-fb-OnRateArticle-short": "ha votat en una llista Top 10 
de $WIKINAME!",
"toplists-create-heading": "Nou! Crea la teva pròpia llista 
Top 10",
"toplists-create-button-msg": "Crear llista"
 }
diff --git a/i18n/cs.json b/i18n/cs.json
index 6126ecf..bcafadb 100644
--- a/i18n/cs.json
+++ b/i18n/cs.json
@@ -71,7 +71,6 @@
"toplists-hours": "$1 {{PLURAL:$1|hodina|hodiny|hodin}}",
"toplists-days": "$1 {{PLURAL:$1|den|dny|dní}}",
"toplists-weeks": "$1 {{PLURAL:$1|týden|týdny|týdnů}}",
-   "toplists-msg-fb-OnRateArticle-short": "hlasoval na Top 10 seznamu na 
$WIKINAME!",
"toplists-create-heading": "Novinka! Vytvořte si vlastní Top 
10 seznam",
"toplists-create-button-msg": "Vytvořit seznam"
 }
diff --git a/i18n/de.json b/i18n/de.json
index 1a7d199..3440cb8 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -71,7 +71,6 @@
"toplists-hours": "$1 {{PLURAL:$1|Stunde|Stunden}}",
"toplists-days": "$1 {{PLURAL:$1|Tag|Tage}}",
"toplists-weeks": "$1 {{PLURAL:$1|Woche|Wochen}}",
-   "toplists-msg-fb-OnRateArticle-short": "hat bei einer Top 10 Liste 
abgestimmt ($WIKINAME)!",
"toplists-create-heading": "Neu! Erstelle deine eigene Top 
10-Liste",
"toplists-create-button-msg": "Erstelle eine Liste"
 }
diff --git a/i18n/en.json b/i18n/en.json
index a373f2b..2f1792a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -71,9 +71,6 @@
"toplists-hours": "$1 {{PLURAL:$1|hour|hours}}",
"toplists-days": "$1 {{PLURAL:$1|day|days}}",
"toplists-weeks": "$1 {{PLURAL:$1|week|weeks}}",
-   "toplists-msg-fb-OnRateArticle-link": "$ARTICLENAME",
-   "toplists-msg-fb-OnRateArticle-short": "has voted on a Top 10 list on 
$WIKINAME!",
-   "toplists-msg-fb-OnRateArticle": "$TEXT",
"toplists-create-heading": "Create Your Own Top Ten",
"toplists-create-button-msg": "Create a list"
 }
diff --git a/i18n/es.json b/i18n/es.json
index 64a3193..f3c680c 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -71,7 +71,6 @@
"toplists-hours": "$1 {{PLURAL:$1|hora|horas}}",
"toplists-days": "$1 {{PLURAL:$1|dia|dias}}",
"toplists-weeks": "$1 {{PLURAL:$1|semana|semanas}}",
-   "toplists-msg-fb-OnRateArticle-short": "ha votado en una lista en 
$WIKINAME!",

[MediaWiki-commits] [Gerrit] mediawiki...TopLists[master]: Remove unused i18n message, "toplists-msg-fb-onRateArticle"

[SamanthaNguyen (Code Review)]

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338313 )

Change subject: Remove unused i18n message, "toplists-msg-fb-onRateArticle"
..

Remove unused i18n message, "toplists-msg-fb-onRateArticle"

In
https://github.com/wikimedia/mediawiki-extensions-TopLists/commit/d497b5cc7bea52cc339e9bad16cedc3ccf8a82b1,
the usage of the message was removed, but the actual message wasn't
removed; This patch removes it.

Change-Id: I7fa5091153c4a0518a71f355d7b05f5f802078fd
---
M i18n/en.json
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TopLists 
refs/changes/13/338313/1

diff --git a/i18n/en.json b/i18n/en.json
index a373f2b..aeec0e7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -73,7 +73,6 @@
"toplists-weeks": "$1 {{PLURAL:$1|week|weeks}}",
"toplists-msg-fb-OnRateArticle-link": "$ARTICLENAME",
"toplists-msg-fb-OnRateArticle-short": "has voted on a Top 10 list on 
$WIKINAME!",
-   "toplists-msg-fb-OnRateArticle": "$TEXT",
"toplists-create-heading": "Create Your Own Top Ten",
"toplists-create-button-msg": "Create a list"
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/338313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fa5091153c4a0518a71f355d7b05f5f802078fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TopLists
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TopLists[master]: Remove and replace instances of wikia references with {{SITE...

[Jack Phoenix (Code Review)]

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338310 )

Change subject: Remove and replace instances of wikia references with 
{{SITENAME}}
..


Remove and replace instances of wikia references with {{SITENAME}}

Bug: T158372
Change-Id: If956acef4b626df764833506894fc133b8fd54d4
---
M i18n/br.json
M i18n/ca.json
M i18n/cs.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/fi.json
M i18n/fr.json
M i18n/gl.json
M i18n/ia.json
M i18n/ja.json
M i18n/ms.json
M i18n/nb.json
M i18n/nl-informal.json
M i18n/nl.json
M i18n/pl.json
M i18n/pms.json
M i18n/pt-br.json
M i18n/pt.json
M i18n/sv.json
M i18n/tl.json
M i18n/zh-hans.json
M i18n/zh-hant.json
23 files changed, 23 insertions(+), 23 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/i18n/br.json b/i18n/br.json
index f7e8c6c..7353313 100644
--- a/i18n/br.json
+++ b/i18n/br.json
@@ -60,7 +60,7 @@
"toplists-list-item-voted": "Votet",
"toplists-createpage-dialog-label": "Roll Top 10",
"toplists-email-subject": "Kemmet ez eus bet ur roll Top 10",
-   "toplists-email-body": "Demat a-berzh Wikia !\n\nKemmet eo bet ar roll 
$2 war Wikia.\n\n $3\n\nEmgav war Wikia evit gwiriekaat ar 
c'hemmoù ! $1\n\n- Wikia\n\nGellout a rit paouez da resevout 
kemmoù ar roll-mañ.",
+   "toplists-email-body": "Demat a-berzh {{SITENAME}} !\n\nKemmet eo bet 
ar roll $2 war {{SITENAME}}.\n\n $3\n\nEmgav war 
{{SITENAME}} evit gwiriekaat ar c'hemmoù ! $1\n\n- {{SITENAME}}\n\nGellout a 
rit paouez da resevout kemmoù ar roll-mañ.",
"toplists-seconds": "$1 {{PLURAL:$1|eilenn|eilenn}}",
"toplists-minutes": "$1 {{PLURAL:$1|munut|munut}}",
"toplists-hours": "$1 {{PLURAL:$1|eur|eur}}",
diff --git a/i18n/ca.json b/i18n/ca.json
index 22f996a..8c30785 100644
--- a/i18n/ca.json
+++ b/i18n/ca.json
@@ -63,7 +63,7 @@
"toplists-list-item-voted": "Votat",
"toplists-createpage-dialog-label": "Lista Top 10",
"toplists-email-subject": "Una llista Top 10 s'ha modificat",
-   "toplists-email-body": "Hola des de Wikia!\n\nLa llista $2 a Wikia s'ha modificat.\n\n $3\n\nVes a Wikia per comprovar 
els canvis! $1\n\n- Wikia\n\nPots cancel·lar la subscripció 
dels canvis de la llista",
+   "toplists-email-body": "Hola des de {{SITENAME}}!\n\nLa llista $2 a {{SITENAME}} s'ha modificat.\n\n $3\n\nVes a {{SITENAME}} 
per comprovar els canvis! $1\n\n- {{SITENAME}}\n\nPots cancel·lar la subscripció dels canvis de la llista",
"toplists-seconds": "$1 {{PLURAL:$1|segon|segons}}",
"toplists-minutes": "$1 {{PLURAL:$1|minut|minuts}}",
"toplists-hours": "$1 {{PLURAL:$1|hora|hores}}",
diff --git a/i18n/cs.json b/i18n/cs.json
index 6126ecf..bd54bba 100644
--- a/i18n/cs.json
+++ b/i18n/cs.json
@@ -65,7 +65,7 @@
"toplists-list-item-voted": "Zahlasováno",
"toplists-createpage-dialog-label": "Top 10 seznam",
"toplists-email-subject": "Top 10 seznam byl změněn.",
-   "toplists-email-body": "Wikia vás zdraví!\nSeznam $2 
byl změněn.\n$3\nNavštivte Wikia a prohlédněte si změny! $1\n- 
Wikia\nOznamování změn seznamu si můžete odhlásit.",
+   "toplists-email-body": "{{SITENAME}} vás zdraví!\nSeznam $2 byl změněn.\n$3\nNavštivte {{SITENAME}} a prohlédněte si 
změny! $1\n- {{SITENAME}}\nOznamování změn seznamu si můžete odhlásit.",
"toplists-seconds": "$1 {{PLURAL:$1|sekunda|sekundy|sekund}}",
"toplists-minutes": "$1 {{PLURAL:$1|minuta|minuty|minut}}",
"toplists-hours": "$1 {{PLURAL:$1|hodina|hodiny|hodin}}",
diff --git a/i18n/de.json b/i18n/de.json
index 1a7d199..a080934 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -65,7 +65,7 @@
"toplists-list-item-voted": "Abgestimmt",
"toplists-createpage-dialog-label": "Top 10 Liste",
"toplists-email-subject": "Eine Top 10 Liste wurde geändert",
-   "toplists-email-body": "Wikia sagt Hallo!\n\nDie Liste $2 in Wikia wurde geändert.\n\n $3\n\nBesuche Wikia um dir die 
Änderungen anzusehen! $1\n\n- Wikia\n\nDu kannst die 
Änderungsbenachrichtigungen zu dieser Liste abbestellen.",
+   "toplists-email-body": "{{SITENAME}} sagt Hallo!\n\nDie Liste $2 in {{SITENAME}} wurde geändert.\n\n $3\n\nBesuche 
{{SITENAME}} um dir die Änderungen anzusehen! $1\n\n- {{SITENAME}}\n\nDu kannst 
die Änderungsbenachrichtigungen zu dieser Liste abbestellen.",
"toplists-seconds": "$1 {{PLURAL:$1|Sekunde|Sekunden}}",
"toplists-minutes": "$1 {{PLURAL:$1|Minute|Minuten}}",
"toplists-hours": "$1 {{PLURAL:$1|Stunde|Stunden}}",
diff --git a/i18n/en.json b/i18n/en.json
index a373f2b..7435fa3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -65,7 +65,7 @@
"toplists-list-item-voted": "Voted",
"toplists-createpage-dialog-label": "Top 10 list",
"toplists-email-subject": "A Top 10 list has been changed",
-   "toplists-email-body": 

[MediaWiki-commits] [Gerrit] mediawiki...TopLists[master]: Remove wgSupressPageSubtitle global technical debt

[Jack Phoenix (Code Review)]

Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338311 )

Change subject: Remove wgSupressPageSubtitle global technical debt
..


Remove wgSupressPageSubtitle global technical debt

Bug: T143145
Change-Id: Icbed68aeacf57717b21a8606c700e569110ca401
---
M specials/SpecialCreateTopList.class.php
M specials/SpecialEditTopList.class.php
2 files changed, 0 insertions(+), 10 deletions(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/specials/SpecialCreateTopList.class.php 
b/specials/SpecialCreateTopList.class.php
index 9fe60c3..fe305d8 100644
--- a/specials/SpecialCreateTopList.class.php
+++ b/specials/SpecialCreateTopList.class.php
@@ -11,8 +11,6 @@
return ( !empty( $val ) );
}
 
-   global $wgSupressPageSubtitle;
-
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
@@ -32,9 +30,6 @@
// include resources (CSS and JS)
$out->addModuleStyles( 'ext.toplists.editor.styles' );
$out->addModules( 'ext.toplists.editor.scripts' );
-
-   // hide special page subtitle
-   $wgSupressPageSubtitle = true;
 
TopListHelper::clearSessionItemsErrors();
 
diff --git a/specials/SpecialEditTopList.class.php 
b/specials/SpecialEditTopList.class.php
index 5e89f4f..62fb8d9 100644
--- a/specials/SpecialEditTopList.class.php
+++ b/specials/SpecialEditTopList.class.php
@@ -18,8 +18,6 @@
}
 
public function execute( $editListName ) {
-   global $wgSupressPageSubtitle;
-
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
@@ -43,9 +41,6 @@
// include resources (CSS and JS)
$out->addModuleStyles( 'ext.toplists.editor.styles' );
$out->addModules( 'ext.toplists.editor.scripts' );
-
-   // hide special page subtitle
-   $wgSupressPageSubtitle = true;
 
$errors = array();
$listName = null;

-- 
To view, visit https://gerrit.wikimedia.org/r/338311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbed68aeacf57717b21a8606c700e569110ca401
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TopLists
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add tests for Shell/ShellCommand

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338312 )

Change subject: Add tests for Shell/ShellCommand
..

Add tests for Shell/ShellCommand

Change-Id: I89cc40d3414486707f911516bd1045504dfad83f
---
A tests/phpunit/includes/shell/ShellCommandTest.php
A tests/phpunit/includes/shell/ShellTest.php
2 files changed, 64 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/338312/1

diff --git a/tests/phpunit/includes/shell/ShellCommandTest.php 
b/tests/phpunit/includes/shell/ShellCommandTest.php
new file mode 100644
index 000..636822a
--- /dev/null
+++ b/tests/phpunit/includes/shell/ShellCommandTest.php
@@ -0,0 +1,37 @@
+markTestSkipped( 'This test requires a POSIX 
environment.' );
+   }
+
+   $command = new ShellCommand( $command );
+   $command->execute();
+   $this->assertSame( $expectedExitCode, $command->getExitCode() );
+   $this->assertSame( $expectedOutput, $command->getOutput() );
+   }
+
+   public function provideExecute() {
+   return [
+   'success status' => [ 'true', 0, '' ],
+   'failure status' => [ 'false', 1, '' ],
+   'output' => [ [ 'echo', '-n', 'x' ], 0, 'x' ],
+   ];
+   }
+}
diff --git a/tests/phpunit/includes/shell/ShellTest.php 
b/tests/phpunit/includes/shell/ShellTest.php
new file mode 100644
index 000..1c7113a
--- /dev/null
+++ b/tests/phpunit/includes/shell/ShellTest.php
@@ -0,0 +1,27 @@
+assertInternalType( 'bool', Shell::isDisabled() ); // 
sanity
+   }
+
+   /**
+* @dataProvider provideEscape
+*/
+   public function testEscape( $args, $expected ) {
+   if ( wfIsWindows() ) {
+   $this->markTestSkipped( 'This test requires a POSIX 
environment.' );
+   }
+   $this->assertSame( $expected, call_user_func_array( [ 
Shell::class, 'escape' ], $args ) );
+   }
+
+   public function provideEscape() {
+   return [
+   'simple' => [ [ 'true' ], "'true'" ],
+   'with args' => [ [ 'convert', '-font', 'font name' ], 
"'convert' '-font' 'font name'" ],
+   'array' => [ [ [ 'convert', '-font', 'font name' ] ], 
"'convert' '-font' 'font name'" ],
+   ];
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/338312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89cc40d3414486707f911516bd1045504dfad83f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TopLists[master]: Remove wgSupressPageSubtitle global technical debt

[SamanthaNguyen (Code Review)]

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338311 )

Change subject: Remove wgSupressPageSubtitle global technical debt
..

Remove wgSupressPageSubtitle global technical debt

Bug: T143145
Change-Id: Icbed68aeacf57717b21a8606c700e569110ca401
---
M specials/SpecialCreateTopList.class.php
M specials/SpecialEditTopList.class.php
2 files changed, 0 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TopLists 
refs/changes/11/338311/1

diff --git a/specials/SpecialCreateTopList.class.php 
b/specials/SpecialCreateTopList.class.php
index 9fe60c3..fe305d8 100644
--- a/specials/SpecialCreateTopList.class.php
+++ b/specials/SpecialCreateTopList.class.php
@@ -11,8 +11,6 @@
return ( !empty( $val ) );
}
 
-   global $wgSupressPageSubtitle;
-
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
@@ -32,9 +30,6 @@
// include resources (CSS and JS)
$out->addModuleStyles( 'ext.toplists.editor.styles' );
$out->addModules( 'ext.toplists.editor.scripts' );
-
-   // hide special page subtitle
-   $wgSupressPageSubtitle = true;
 
TopListHelper::clearSessionItemsErrors();
 
diff --git a/specials/SpecialEditTopList.class.php 
b/specials/SpecialEditTopList.class.php
index 5e89f4f..62fb8d9 100644
--- a/specials/SpecialEditTopList.class.php
+++ b/specials/SpecialEditTopList.class.php
@@ -18,8 +18,6 @@
}
 
public function execute( $editListName ) {
-   global $wgSupressPageSubtitle;
-
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
@@ -43,9 +41,6 @@
// include resources (CSS and JS)
$out->addModuleStyles( 'ext.toplists.editor.styles' );
$out->addModules( 'ext.toplists.editor.scripts' );
-
-   // hide special page subtitle
-   $wgSupressPageSubtitle = true;
 
$errors = array();
$listName = null;

-- 
To view, visit https://gerrit.wikimedia.org/r/338311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbed68aeacf57717b21a8606c700e569110ca401
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TopLists
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Open the sidebar "More details" by default at high resolutions

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338305 )

Change subject: Open the sidebar "More details" by default at high resolutions
..


Open the sidebar "More details" by default at high resolutions

Bug: T155352
Change-Id: I5a06b4a6e2d2d7090ebbdf27e9f200bcd972a92b
---
M modules/dialog-sidebar/sidebar.js
M modules/dialog/dialog.js
M styles/dialog.less
3 files changed, 51 insertions(+), 5 deletions(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dialog-sidebar/sidebar.js 
b/modules/dialog-sidebar/sidebar.js
index 25716ee..5981bba 100644
--- a/modules/dialog-sidebar/sidebar.js
+++ b/modules/dialog-sidebar/sidebar.js
@@ -133,6 +133,9 @@
 * re-renders the parts of the sidebar that depend on the map position.
 */
SideBar.prototype.onMapMove = OO.ui.throttle( function () {
+   if ( !this.dialog.map ) {
+   return;
+   }
this.mapPosition = this.dialog.map.getMapPosition( { scaled: 
true } );
 
this.renderMapDetails();
@@ -322,7 +325,7 @@
 */
SideBar.prototype.tearDown = function () {
this.dialog.map.off( 'move', this.onMapMove, this );
-
+   this.dialog.sideBar = null;
this.$el.remove();
this.$el = null;
return this;
diff --git a/modules/dialog/dialog.js b/modules/dialog/dialog.js
index 05d64e1..58db1fa 100644
--- a/modules/dialog/dialog.js
+++ b/modules/dialog/dialog.js
@@ -15,9 +15,13 @@
 * @type {Kartographer.Dialog.DialogClass}
 */
var MapDialog = function () {
-   // Parent method
-   MapDialog.super.apply( this, arguments );
-   };
+   // Parent method
+   MapDialog.super.apply( this, arguments );
+   },
+   // Opens the sidebar when the screen is wide enough (greater 
than 1024px)
+   isWideScreen = $( document ).width() > 1024,
+   FOOTER_HEIGHT = 58,
+   SIDEBAR_WIDTH = 320;
 
/* Inheritance */
 
@@ -72,6 +76,13 @@
dialog.$foot.append( $inlineContainer );
 
button.on( 'change', dialog.toggleSideBar, 
null, dialog );
+
+   if ( isWideScreen ) {
+   dialog.map.doWhenReady( function () {
+   dialog.offsetMap( true );
+   dialog.toggleSideBar( true );
+   } );
+   }
} );
} );
};
@@ -115,6 +126,20 @@
} );
}
return MapDialog.super.prototype.getActionProcess.call( this, 
action );
+   };
+
+   /**
+* Adds an offset to the center of the map.
+*
+* @param {boolean} isSidebarOpen Whether the sidebar is open.
+*/
+   MapDialog.prototype.offsetMap = function ( isSidebarOpen ) {
+   var map = this.map,
+   offsetX = isSidebarOpen ? SIDEBAR_WIDTH / -2 : 0,
+   targetPoint = map.project( map.getCenter(), 
map.getZoom() ).subtract( [ offsetX, -1 * FOOTER_HEIGHT ] ),
+   targetLatLng = map.unproject( targetPoint, 
map.getZoom() );
+
+   map.setView( targetLatLng, map.getZoom() );
};
 
/**
@@ -178,11 +203,21 @@
}
 
if ( !dialog.$mapDetailsButton ) {
+   // The button does not exist 
yet, add it
dialog.addFooterButton();
+
} else if ( dialog.sideBar ) {
+   // The button exists, the 
sidebar was open, call `tearDown` and reopen it.
dialog.sideBar.tearDown();
dialog.map.doWhenReady( 
function () {
-   dialog.sideBar.render();
+   dialog.offsetMap( true 
);
+   dialog.toggleSideBar( 
true );
+   } );
+
+   } else {
+   // The button exists, the 
sidebar was not open, simply run `offsetMap`
+   dialog.map.doWhenReady( 
function () {
+   dialog.offsetMap( false 
);

[MediaWiki-commits] [Gerrit] mediawiki...TopLists[master]: Remove and replace instances of wikia references with {{SITE...

[SamanthaNguyen (Code Review)]

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338310 )

Change subject: Remove and replace instances of wikia references with 
{{SITENAME}}
..

Remove and replace instances of wikia references with {{SITENAME}}

Bug: T158372
Change-Id: If956acef4b626df764833506894fc133b8fd54d4
---
M i18n/br.json
M i18n/ca.json
M i18n/cs.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/fi.json
M i18n/fr.json
M i18n/gl.json
M i18n/ia.json
M i18n/ja.json
M i18n/ms.json
M i18n/nb.json
M i18n/nl-informal.json
M i18n/nl.json
M i18n/pl.json
M i18n/pms.json
M i18n/pt-br.json
M i18n/pt.json
M i18n/sv.json
M i18n/tl.json
M i18n/zh-hans.json
M i18n/zh-hant.json
23 files changed, 23 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TopLists 
refs/changes/10/338310/1

diff --git a/i18n/br.json b/i18n/br.json
index f7e8c6c..7353313 100644
--- a/i18n/br.json
+++ b/i18n/br.json
@@ -60,7 +60,7 @@
"toplists-list-item-voted": "Votet",
"toplists-createpage-dialog-label": "Roll Top 10",
"toplists-email-subject": "Kemmet ez eus bet ur roll Top 10",
-   "toplists-email-body": "Demat a-berzh Wikia !\n\nKemmet eo bet ar roll 
$2 war Wikia.\n\n $3\n\nEmgav war Wikia evit gwiriekaat ar 
c'hemmoù ! $1\n\n- Wikia\n\nGellout a rit paouez da resevout 
kemmoù ar roll-mañ.",
+   "toplists-email-body": "Demat a-berzh {{SITENAME}} !\n\nKemmet eo bet 
ar roll $2 war {{SITENAME}}.\n\n $3\n\nEmgav war 
{{SITENAME}} evit gwiriekaat ar c'hemmoù ! $1\n\n- {{SITENAME}}\n\nGellout a 
rit paouez da resevout kemmoù ar roll-mañ.",
"toplists-seconds": "$1 {{PLURAL:$1|eilenn|eilenn}}",
"toplists-minutes": "$1 {{PLURAL:$1|munut|munut}}",
"toplists-hours": "$1 {{PLURAL:$1|eur|eur}}",
diff --git a/i18n/ca.json b/i18n/ca.json
index 22f996a..8c30785 100644
--- a/i18n/ca.json
+++ b/i18n/ca.json
@@ -63,7 +63,7 @@
"toplists-list-item-voted": "Votat",
"toplists-createpage-dialog-label": "Lista Top 10",
"toplists-email-subject": "Una llista Top 10 s'ha modificat",
-   "toplists-email-body": "Hola des de Wikia!\n\nLa llista $2 a Wikia s'ha modificat.\n\n $3\n\nVes a Wikia per comprovar 
els canvis! $1\n\n- Wikia\n\nPots cancel·lar la subscripció 
dels canvis de la llista",
+   "toplists-email-body": "Hola des de {{SITENAME}}!\n\nLa llista $2 a {{SITENAME}} s'ha modificat.\n\n $3\n\nVes a {{SITENAME}} 
per comprovar els canvis! $1\n\n- {{SITENAME}}\n\nPots cancel·lar la subscripció dels canvis de la llista",
"toplists-seconds": "$1 {{PLURAL:$1|segon|segons}}",
"toplists-minutes": "$1 {{PLURAL:$1|minut|minuts}}",
"toplists-hours": "$1 {{PLURAL:$1|hora|hores}}",
diff --git a/i18n/cs.json b/i18n/cs.json
index 6126ecf..bd54bba 100644
--- a/i18n/cs.json
+++ b/i18n/cs.json
@@ -65,7 +65,7 @@
"toplists-list-item-voted": "Zahlasováno",
"toplists-createpage-dialog-label": "Top 10 seznam",
"toplists-email-subject": "Top 10 seznam byl změněn.",
-   "toplists-email-body": "Wikia vás zdraví!\nSeznam $2 
byl změněn.\n$3\nNavštivte Wikia a prohlédněte si změny! $1\n- 
Wikia\nOznamování změn seznamu si můžete odhlásit.",
+   "toplists-email-body": "{{SITENAME}} vás zdraví!\nSeznam $2 byl změněn.\n$3\nNavštivte {{SITENAME}} a prohlédněte si 
změny! $1\n- {{SITENAME}}\nOznamování změn seznamu si můžete odhlásit.",
"toplists-seconds": "$1 {{PLURAL:$1|sekunda|sekundy|sekund}}",
"toplists-minutes": "$1 {{PLURAL:$1|minuta|minuty|minut}}",
"toplists-hours": "$1 {{PLURAL:$1|hodina|hodiny|hodin}}",
diff --git a/i18n/de.json b/i18n/de.json
index 1a7d199..a080934 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -65,7 +65,7 @@
"toplists-list-item-voted": "Abgestimmt",
"toplists-createpage-dialog-label": "Top 10 Liste",
"toplists-email-subject": "Eine Top 10 Liste wurde geändert",
-   "toplists-email-body": "Wikia sagt Hallo!\n\nDie Liste $2 in Wikia wurde geändert.\n\n $3\n\nBesuche Wikia um dir die 
Änderungen anzusehen! $1\n\n- Wikia\n\nDu kannst die 
Änderungsbenachrichtigungen zu dieser Liste abbestellen.",
+   "toplists-email-body": "{{SITENAME}} sagt Hallo!\n\nDie Liste $2 in {{SITENAME}} wurde geändert.\n\n $3\n\nBesuche 
{{SITENAME}} um dir die Änderungen anzusehen! $1\n\n- {{SITENAME}}\n\nDu kannst 
die Änderungsbenachrichtigungen zu dieser Liste abbestellen.",
"toplists-seconds": "$1 {{PLURAL:$1|Sekunde|Sekunden}}",
"toplists-minutes": "$1 {{PLURAL:$1|Minute|Minuten}}",
"toplists-hours": "$1 {{PLURAL:$1|Stunde|Stunden}}",
diff --git a/i18n/en.json b/i18n/en.json
index a373f2b..7435fa3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -65,7 +65,7 @@
"toplists-list-item-voted": "Voted",
"toplists-createpage-dialog-label": "Top 10 list",
"toplists-email-subject": "A Top 10 list has been changed",
-   

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Guard against runtime creation of undeclared properties

[Tim Starling (Code Review)]

Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338309 )

Change subject: Guard against runtime creation of undeclared properties
..

Guard against runtime creation of undeclared properties

And fix the bugs which were thus detected.

Also fix an error in TokenGeneratorHandler.

Change-Id: Ica8ebc5ea910e6093e330e90c3e58f9ae167595a
---
A src/PropGuard.php
M src/Serializer/Serializer.php
M src/Serializer/SerializerNode.php
M src/Tokenizer/Attribute.php
M src/Tokenizer/TokenGeneratorHandler.php
M src/Tokenizer/Tokenizer.php
M src/TreeBuilder/Element.php
M src/TreeBuilder/InsertionMode.php
M src/TreeBuilder/Marker.php
M src/TreeBuilder/TreeBuilder.php
M tests/phpunit/SerializerNodeDestructionTest.php
11 files changed, 81 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/09/338309/1

diff --git a/src/PropGuard.php b/src/PropGuard.php
new file mode 100644
index 000..00c3c4d
--- /dev/null
+++ b/src/PropGuard.php
@@ -0,0 +1,21 @@
+$name = $value;
+   }
+   }
+}
diff --git a/src/Serializer/Serializer.php b/src/Serializer/Serializer.php
index 65da72e..ad7ec8d 100644
--- a/src/Serializer/Serializer.php
+++ b/src/Serializer/Serializer.php
@@ -1,6 +1,7 @@
 errorCallback = $errorCallback;
}
 
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
+
/**
 * Get the final string. This can only be called after endDocument() is 
received.
 */
diff --git a/src/Serializer/SerializerNode.php 
b/src/Serializer/SerializerNode.php
index f19b20e..2944732 100644
--- a/src/Serializer/SerializerNode.php
+++ b/src/Serializer/SerializerNode.php
@@ -1,6 +1,7 @@
 attrs = $attrs;
$this->void = $void;
}
+
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
 }
diff --git a/src/Tokenizer/Attribute.php b/src/Tokenizer/Attribute.php
index b53e3c0..293b075 100644
--- a/src/Tokenizer/Attribute.php
+++ b/src/Tokenizer/Attribute.php
@@ -1,6 +1,7 @@
 localName = $localName;
$this->value = $value;
}
+
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
 }
diff --git a/src/Tokenizer/TokenGeneratorHandler.php 
b/src/Tokenizer/TokenGeneratorHandler.php
index 4d05b73..29f94f0 100644
--- a/src/Tokenizer/TokenGeneratorHandler.php
+++ b/src/Tokenizer/TokenGeneratorHandler.php
@@ -16,7 +16,7 @@
];
}
 
-   public function endDocument() {
+   public function endDocument( $pos ) {
$this->tokens[] = [ 'type' => 'endDocument' ];
}
 
diff --git a/src/Tokenizer/Tokenizer.php b/src/Tokenizer/Tokenizer.php
index f571aba..78b2383 100644
--- a/src/Tokenizer/Tokenizer.php
+++ b/src/Tokenizer/Tokenizer.php
@@ -2,6 +2,7 @@
 
 namespace RemexHtml\Tokenizer;
 use RemexHtml\HTMLData;
+use RemexHtml\PropGuard;
 
 /**
  * HTML 5 tokenizer
@@ -67,6 +68,8 @@
protected $ignoreErrors;
protected $ignoreCharRefs;
protected $ignoreNulls;
+   protected $skipPreprocess;
+   protected $appropriateEndTag;
protected $listener;
protected $state;
protected $preprocessed;
@@ -110,6 +113,10 @@
$this->skipPreprocess = !empty( $options['skipPreprocess'] );
}
 
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
+
public function setEnableCdataCallback( $cb ) {
$this->enableCdataCallback = $cb;
}
diff --git a/src/TreeBuilder/Element.php b/src/TreeBuilder/Element.php
index c571a12..56d0ff5 100644
--- a/src/TreeBuilder/Element.php
+++ b/src/TreeBuilder/Element.php
@@ -2,6 +2,7 @@
 
 namespace RemexHtml\TreeBuilder;
 use RemexHtml\HTMLData;
+use RemexHtml\PropGuard;
 use RemexHtml\Tokenizer\Attributes;
 
 /**
@@ -54,6 +55,12 @@
 * Internal to CachingStack. A link in the scope list.
 */
public $nextScope;
+
+   /**
+* Internal to CachingStack and SimpleStack. The current stack index, or
+* null if the element is not in the stack.
+*/
+   public $stackIndex;
 
/**
 * Internal to ActiveFormattingElements.
@@ -118,6 +125,10 @@
$this->attrs = $attrs;
}
 
+   public function __set( $name, $value ) {
+   PropGuard::set( $this, $name, $value );
+   }
+
/**
 * Is the element a MathML text integration point?
 *
diff --git a/src/TreeBuilder/InsertionMode.php 
b/src/TreeBuilder/InsertionMode.php
index 9b4e6b8..5d4cd08 100644
--- a/src/TreeBuilder/InsertionMode.php
+++ b/src/TreeBuilder/InsertionMode.php
@@ -1,6 +1,7 @@
 dispatcher = $dispatcher;
}
 
+   public function __set( $name, 

[MediaWiki-commits] [Gerrit] labs...quarrybot-enwiki[master]: Addition of GNU license

[Zppix (Code Review)]

Zppix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338308 )

Change subject: Addition of GNU license
..


Addition of GNU license

Bug: T158388
Change-Id: I6610b562a12aa856b703321f9ec8d34931269486
---
A LICENSE
M README
2 files changed, 202 insertions(+), 1 deletion(-)

Approvals:
  Zppix: Verified; Looks good to me, approved



diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..39b258e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,186 @@
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. 
+
+Everyone is permitted to copy and distribute verbatim copies of this license 
document, but changing it is not allowed.
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and 
other kinds of works.
+
+The licenses for most software and other practical works are designed to take 
away your freedom to share and change the works. By contrast, the GNU General 
Public License is intended to guarantee your freedom to share and change all 
versions of a program--to make sure it remains free software for all its users. 
We, the Free Software Foundation, use the GNU General Public License for most 
of our software; it applies also to any other work released this way by its 
authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our 
General Public Licenses are designed to make sure that you have the freedom to 
distribute copies of free software (and charge for them if you wish), that you 
receive source code or can get it if you want it, that you can change the 
software or use pieces of it in new free programs, and that you know you can do 
these things.
+
+To protect your rights, we need to prevent others from denying you these 
rights or asking you to surrender the rights. Therefore, you have certain 
responsibilities if you distribute copies of the software, or if you modify it: 
responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for 
a fee, you must pass on to the recipients the same freedoms that you received. 
You must make sure that they, too, receive or can get the source code. And you 
must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert 
copyright on the software, and (2) offer you this License giving you legal 
permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that 
there is no warranty for this free software. For both users' and authors' sake, 
the GPL requires that modified versions be marked as changed, so that their 
problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified 
versions of the software inside them, although the manufacturer can do so. This 
is fundamentally incompatible with the aim of protecting users' freedom to 
change the software. The systematic pattern of such abuse occurs in the area of 
products for individuals to use, which is precisely where it is most 
unacceptable. Therefore, we have designed this version of the GPL to prohibit 
the practice for those products. If such problems arise substantially in other 
domains, we stand ready to extend this provision to those domains in future 
versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States 
should not allow patents to restrict development and use of software on 
general-purpose computers, but in those that do, we wish to avoid the special 
danger that patents applied to a free program could make it effectively 
proprietary. To prevent this, the GPL assures that patents cannot be used to 
render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification 
follow.
+TERMS AND CONDITIONS
+0. Definitions.
+
+“This License” refers to version 3 of the GNU General Public License.
+
+“Copyright” also means copyright-like laws that apply to other kinds of works, 
such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this License. 
Each licensee is addressed as “you”. “Licensees” and “recipients” may be 
individuals or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work in a 
fashion requiring copyright permission, other than the making of an exact copy. 
The resulting work is called a “modified version” of the earlier work or a work 
“based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based on the 
Program.
+
+To “propagate” a work means to do anything with it that, without permission, 
would make 

[MediaWiki-commits] [Gerrit] labs...quarrybot-enwiki[master]: Addition of GNU license

[Zppix (Code Review)]

Zppix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338308 )

Change subject: Addition of GNU license
..

Addition of GNU license

Bug: T158388
Change-Id: I6610b562a12aa856b703321f9ec8d34931269486
---
A LICENSE
M README
2 files changed, 203 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/quarrybot-enwiki 
refs/changes/08/338308/1

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..39b258e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,186 @@
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. 
+
+Everyone is permitted to copy and distribute verbatim copies of this license 
document, but changing it is not allowed.
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and 
other kinds of works.
+
+The licenses for most software and other practical works are designed to take 
away your freedom to share and change the works. By contrast, the GNU General 
Public License is intended to guarantee your freedom to share and change all 
versions of a program--to make sure it remains free software for all its users. 
We, the Free Software Foundation, use the GNU General Public License for most 
of our software; it applies also to any other work released this way by its 
authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our 
General Public Licenses are designed to make sure that you have the freedom to 
distribute copies of free software (and charge for them if you wish), that you 
receive source code or can get it if you want it, that you can change the 
software or use pieces of it in new free programs, and that you know you can do 
these things.
+
+To protect your rights, we need to prevent others from denying you these 
rights or asking you to surrender the rights. Therefore, you have certain 
responsibilities if you distribute copies of the software, or if you modify it: 
responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for 
a fee, you must pass on to the recipients the same freedoms that you received. 
You must make sure that they, too, receive or can get the source code. And you 
must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert 
copyright on the software, and (2) offer you this License giving you legal 
permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that 
there is no warranty for this free software. For both users' and authors' sake, 
the GPL requires that modified versions be marked as changed, so that their 
problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified 
versions of the software inside them, although the manufacturer can do so. This 
is fundamentally incompatible with the aim of protecting users' freedom to 
change the software. The systematic pattern of such abuse occurs in the area of 
products for individuals to use, which is precisely where it is most 
unacceptable. Therefore, we have designed this version of the GPL to prohibit 
the practice for those products. If such problems arise substantially in other 
domains, we stand ready to extend this provision to those domains in future 
versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States 
should not allow patents to restrict development and use of software on 
general-purpose computers, but in those that do, we wish to avoid the special 
danger that patents applied to a free program could make it effectively 
proprietary. To prevent this, the GPL assures that patents cannot be used to 
render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification 
follow.
+TERMS AND CONDITIONS
+0. Definitions.
+
+“This License” refers to version 3 of the GNU General Public License.
+
+“Copyright” also means copyright-like laws that apply to other kinds of works, 
such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this License. 
Each licensee is addressed as “you”. “Licensees” and “recipients” may be 
individuals or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work in a 
fashion requiring copyright permission, other than the making of an exact copy. 
The resulting work is called a “modified version” of the earlier work or a work 
“based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based on the 
Program.
+
+To “propagate” a work means to do anything with it that, 

[MediaWiki-commits] [Gerrit] mediawiki...SelectCategory[master]: Properly load scripts and stylesheets through ResourceLoader

[SamanthaNguyen (Code Review)]

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338307 )

Change subject: Properly load scripts and stylesheets through ResourceLoader
..

Properly load scripts and stylesheets through ResourceLoader

Bug: T158385
Change-Id: Ic7ef758719ba2432cf4d231ea0c24e336a33747b
---
M SelectCategory.js
M SelectCategory.php
M SelectCategory_body.php
M jquery.treeview.js
4 files changed, 42 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SelectCategory 
refs/changes/07/338307/1

diff --git a/SelectCategory.js b/SelectCategory.js
index 6dfaaec..3399d7a 100644
--- a/SelectCategory.js
+++ b/SelectCategory.js
@@ -1,5 +1,5 @@
-$j( document ).ready( function() {
-   $j( "#SelectCategoryList" ).treeview( {
+$( function() {
+   $( "#SelectCategoryList" ).treeview( {
collapsed: true
});
-} );
\ No newline at end of file
+} );
diff --git a/SelectCategory.php b/SelectCategory.php
index c0d3b6b..30dfdff 100644
--- a/SelectCategory.php
+++ b/SelectCategory.php
@@ -69,7 +69,7 @@
 $wgExtensionCredits['parserhook'][] = array(
'path'   => __FILE__,
'name'   => 'SelectCategory',
-   'version'=> '0.9.0',
+   'version'=> '0.9.1',
'author' => array( 'Leon Weber', 'Manuel Schneider', 'Christian 
Boltz' ),
'url'=> 
'https://www.mediawiki.org/wiki/Extension:SelectCategory',
'descriptionmsg' => 'selectcategory-desc',
@@ -92,3 +92,31 @@
 $wgHooks['EditPage::attemptSave'][] = array( 'SelectCategory::saveHook', false 
);
 # Hook when saving the upload
 $wgHooks['UploadForm:BeforeProcessing'][] = array( 'SelectCategory::saveHook', 
true );
+
+$wgResourceModules['ext.selectcategory.jquery.treeview.css'] = array(
+   'style' => 'jquery.treeview.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'WikiForum',
+   'position' => 'top'
+);
+
+$wgResourceModules['ext.selectcategory.jquery.treeview.js'] = array(
+   'scripts' => 'jquery.treeview.js',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SelectCategory',
+   'position' => 'bottom'
+);
+
+$wgResourceModules['ext.selectcategory.selectcategory.css'] = array(
+   'style' => 'SelectCategory.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'WikiForum',
+   'position' => 'top'
+);
+
+$wgResourceModules['ext.selectcategory.selectcategory.js'] = array(
+   'scripts' => 'SelectCategory.js',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SelectCategory',
+   'position' => 'bottom'
+);
diff --git a/SelectCategory_body.php b/SelectCategory_body.php
index 1a92e0d..bfa9342 100644
--- a/SelectCategory_body.php
+++ b/SelectCategory_body.php
@@ -26,15 +26,15 @@
 
# check if we should do anything or sleep
if ( self::checkConditions( $isUpload, $pageObj ) ) {
-   # Register CSS file for our select box
-   global $wgOut, $wgExtensionAssetsPath;
-   global $wgSelectCategoryMaxLevel;
-   global $wgSelectCategoryToplevelAllowed;
+   global $wgSelectCategoryMaxLevel, 
$wgSelectCategoryToplevelAllowed;
 
-   $wgOut->addExtensionStyle( 
"{$wgExtensionAssetsPath}/SelectCategory/SelectCategory.css" );
-   $wgOut->addExtensionStyle( 
"{$wgExtensionAssetsPath}/SelectCategory/jquery.treeview.css" );
-   $wgOut->addScriptFile( 
"{$wgExtensionAssetsPath}/SelectCategory/jquery.treeview.js" );
-   $wgOut->addScriptFile( 
"{$wgExtensionAssetsPath}/SelectCategory/SelectCategory.js" );
+   # Load stylesheets and scripts through ResourceLoader
+   $out = $this->getOutput();
+
+   $out->addModuleStyles( 
'ext.selectcategory.jquery.treeview.css' );
+   $out->addModuleStyles( 
'ext.selectcategory.selectcategory.css' );
+   $out->addModules( 
'ext.selectcategory.jquery.treeview.js' );
+   $out->addModules( 
'ext.selectcategory.selectcategory.js' );
 
# Get all categories from wiki
$allCats = self::getAllCategories( $isUpload ? NS_IMAGE 
: $pageObj->mTitle->getNamespace() );
diff --git a/jquery.treeview.js b/jquery.treeview.js
index 93c4504..05d9c8d 100644
--- a/jquery.treeview.js
+++ b/jquery.treeview.js
@@ -14,7 +14,7 @@
  *
  */
 
-;(function($j) {
+$( function() {
 
// TODO rewrite as a widget, removing all the extra plugins
$j.extend($j.fn, {
@@ -253,4 +253,4 @@
hitarea: "hitarea"
});
 
-})(jQuery);
+});

-- 
To view, visit https://gerrit.wikimedia.org/r/338307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Reduce Configuration use in BankPaymentProvider

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338306 )

Change subject: Reduce Configuration use in BankPaymentProvider
..

Reduce Configuration use in BankPaymentProvider

Provide cache params as constructor arguments

Bug: T158374
Change-Id: Ib0f5d0c1e67517c7331a2fb1bccc8dac612d603e
---
M PaymentProviders/Ingenico/BankPaymentProvider.php
M PaymentProviders/Ingenico/IngenicoPaymentProvider.php
M PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
M SmashPig.yaml
4 files changed, 46 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/06/338306/1

diff --git a/PaymentProviders/Ingenico/BankPaymentProvider.php 
b/PaymentProviders/Ingenico/BankPaymentProvider.php
index 8803ae9..9bd376b 100644
--- a/PaymentProviders/Ingenico/BankPaymentProvider.php
+++ b/PaymentProviders/Ingenico/BankPaymentProvider.php
@@ -2,6 +2,9 @@
 
 namespace SmashPig\PaymentProviders\Ingenico;
 
+use SmashPig\Core\Context;
+use Psr\Cache\CacheItemPoolInterface;
+
 /**
  * Handle bank payments via Ingenico
  * Will eventually implement PaymentProvider, but right now just looks
@@ -9,6 +12,24 @@
  * config key 'cache'.
  */
 class BankPaymentProvider extends IngenicoPaymentProvider {
+
+   /**
+* @var array()
+*/
+   protected $cacheParameters;
+
+   /**
+* @var CacheItemPoolInterface
+*/
+   protected $cache;
+
+   public function __construct( array $options = array() ) {
+   parent::__construct( $options );
+   $this->cacheParameters = $options['cache-parameters'];
+   // FIXME: provide objects in constructor
+   $config = Context::get()->getConfiguration();
+   $this->cache = $config->object( 'cache' );
+   }
 
/**
 * Look up banks
@@ -21,8 +42,7 @@
 */
public function getBankList( $country, $currency, $productId = 809 ) {
$cacheKey = $this->makeCacheKey( $country, $currency, 
$productId );
-   $cache = $this->config->object( 'cache' );
-   $cacheItem = $cache->getItem( $cacheKey );
+   $cacheItem = $this->cache->getItem( $cacheKey );
 
if ( !$cacheItem->isHit() ) {
$query = array(
@@ -32,7 +52,7 @@
$path = "products/$productId/directory";
$response = $this->makeApiCall( $path, 'GET', $query );
 
-   // TODO: base class should probably decode
+   // TODO: api class should probably decode
$decoded = json_decode( $response['body'] );
 
$banks = array();
@@ -41,15 +61,15 @@
$banks[$entry->issuerId] = $entry->issuerName;
}
$cacheItem->set( $banks );
-   $duration = $this->config->val( 'bank-cache/duration' );
+   $duration = $this->cacheParameters['duration'];
$cacheItem->expiresAfter( $duration );
-   $cache->save( $cacheItem );
+   $this->cache->save( $cacheItem );
}
return $cacheItem->get();
}
 
protected function makeCacheKey( $country, $currency, $productId ) {
-   $base = $this->config->val( 'bank-cache/key' );
+   $base = $this->cacheParameters['key-base'];
return "{$base}_{$country}_{$currency}_{$productId}";
}
 }
diff --git a/PaymentProviders/Ingenico/IngenicoPaymentProvider.php 
b/PaymentProviders/Ingenico/IngenicoPaymentProvider.php
index 3ad939a..85e2c9a 100644
--- a/PaymentProviders/Ingenico/IngenicoPaymentProvider.php
+++ b/PaymentProviders/Ingenico/IngenicoPaymentProvider.php
@@ -21,7 +21,7 @@
 */
protected $config;
 
-   public function __construct() {
+   public function __construct( $options = array() ) {
$this->config = Context::get()->getConfiguration();
}
 
diff --git 
a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php 
b/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
index bf3d702..1edfe84 100644
--- a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
+++ b/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
@@ -16,18 +16,28 @@
 */
protected $curlWrapper;
 
+   /**
+* @var BankPaymentProvider
+*/
+   protected $provider;
+
public function setUp() {
$config = $this->setConfig( 'ingenico' );
$this->curlWrapper = $this->getMock( 
'\SmashPig\Core\Http\CurlWrapper' );
$config->overrideObjectInstance( 'curl/wrapper', 
$this->curlWrapper );
$config->object( 'cache' 

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: three_d role: Add dependency on libgif-dev required by node ...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335853 )

Change subject: three_d role: Add dependency on libgif-dev required by node 
canvas
..


three_d role: Add dependency on libgif-dev required by node canvas

Change-Id: Ib5d464d9215cb6bfa31dacd0c643df0ce8db9dc2
---
M puppet/modules/three_d/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/three_d/manifests/init.pp 
b/puppet/modules/three_d/manifests/init.pp
index 51d2103..82b329e 100644
--- a/puppet/modules/three_d/manifests/init.pp
+++ b/puppet/modules/three_d/manifests/init.pp
@@ -16,6 +16,7 @@
 require_package('libxi-dev')
 require_package('libglu1-mesa-dev')
 require_package('libglew-dev')
+require_package('libgif-dev')
 
 file { $three_d_2png_dir:
 ensure => directory,

-- 
To view, visit https://gerrit.wikimedia.org/r/335853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5d464d9215cb6bfa31dacd0c643df0ce8db9dc2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add role::quiz

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338042 )

Change subject: Add role::quiz
..


Add role::quiz

Add a role for https://www.mediawiki.org/wiki/Extension:Quiz

Bug:T148432
Change-Id: Ie0efa1f08894eb3450c112712585ae7c10d0567c
---
A puppet/modules/role/manifests/quiz.pp
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/role/manifests/quiz.pp 
b/puppet/modules/role/manifests/quiz.pp
new file mode 100644
index 000..50d9382
--- /dev/null
+++ b/puppet/modules/role/manifests/quiz.pp
@@ -0,0 +1,7 @@
+# == Class: role::quiz
+# Quiz is the quiz building tool adopted on the Wikiversity.
+#
+class role::quiz {
+include ::role::mediawiki
+mediawiki::extension { 'Quiz': }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/338042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0efa1f08894eb3450c112712585ae7c10d0567c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Mvolz 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Open the sidebar "More details" by default at high resolutions

[JGirault (Code Review)]

JGirault has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338305 )

Change subject: Open the sidebar "More details" by default at high resolutions
..

Open the sidebar "More details" by default at high resolutions

Bug: T155352
Change-Id: I5a06b4a6e2d2d7090ebbdf27e9f200bcd972a92b
---
M modules/dialog/dialog.js
1 file changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/05/338305/1

diff --git a/modules/dialog/dialog.js b/modules/dialog/dialog.js
index 05d64e1..76cda29 100644
--- a/modules/dialog/dialog.js
+++ b/modules/dialog/dialog.js
@@ -15,9 +15,11 @@
 * @type {Kartographer.Dialog.DialogClass}
 */
var MapDialog = function () {
-   // Parent method
-   MapDialog.super.apply( this, arguments );
-   };
+   // Parent method
+   MapDialog.super.apply( this, arguments );
+   },
+   // Opens the sidebar when the screen is wide enough (greater 
than 1024px)
+   isWideScreen = $( document ).width() > 1024;
 
/* Inheritance */
 
@@ -72,6 +74,10 @@
dialog.$foot.append( $inlineContainer );
 
button.on( 'change', dialog.toggleSideBar, 
null, dialog );
+
+   if ( isWideScreen ) {
+   dialog.toggleSideBar( true );
+   }
} );
} );
};

-- 
To view, visit https://gerrit.wikimedia.org/r/338305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a06b4a6e2d2d7090ebbdf27e9f200bcd972a92b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Cancel 'editItem' on CapsuleMultiselectWidget

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338295 )

Change subject: RCFilters UI: Cancel 'editItem' on CapsuleMultiselectWidget
..


RCFilters UI: Cancel 'editItem' on CapsuleMultiselectWidget

This method assumes you want to edit the item manually, and so
it calls this.$input.val() on a nonexisting input (because there
is no input if a popup exists.)

Bug: T158368
Change-Id: I7bbce89e5280f97d3e85619d9a8fe23fa5e5e47c
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index 9bb1a98..7f8d79d 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -247,4 +247,9 @@
} );
};
 
+   /**
+* Override 'editItem' since it tries to use $input which does
+* not exist when a popup is available.
+*/
+   mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.editItem = 
function () {};
 }( mediaWiki, jQuery ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/338295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bbce89e5280f97d3e85619d9a8fe23fa5e5e47c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: commons_datasets: update licensing

[Yurik (Code Review)]

Yurik has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338304 )

Change subject: commons_datasets: update licensing
..


commons_datasets: update licensing

Per https://gerrit.wikimedia.org/r/#/c/332726/

Change-Id: I444e4755e03fd1299b8790f0fd6decb9d27c2293
---
M puppet/modules/role/templates/commons_datasets/settings.php.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  Yurik: Verified



diff --git a/puppet/modules/role/templates/commons_datasets/settings.php.erb 
b/puppet/modules/role/templates/commons_datasets/settings.php.erb
index aa4cf24..8c71610 100644
--- a/puppet/modules/role/templates/commons_datasets/settings.php.erb
+++ b/puppet/modules/role/templates/commons_datasets/settings.php.erb
@@ -13,7 +13,7 @@
'nsName' => 'Data',
// page name must end in ".tab", and contain at least one symbol
'pattern' => '/.\.tab$/',
-   'license' => 'CC0-1.0+',
+   'license' => 'CC0-1.0',
'isLocal' => false,
 ];
 
@@ -23,7 +23,7 @@
'nsName' => 'Data',
// page name must end in ".map", and contain at least one symbol
'pattern' => '/.\.map$/',
-   'license' => 'CC0-1.0+',
+   'license' => 'CC0-1.0',
'isLocal' => false,
 ];
 

-- 
To view, visit https://gerrit.wikimedia.org/r/338304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I444e4755e03fd1299b8790f0fd6decb9d27c2293
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: commons_datasets: update licensing

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338304 )

Change subject: commons_datasets: update licensing
..

commons_datasets: update licensing

Per https://gerrit.wikimedia.org/r/#/c/332726/

Change-Id: I444e4755e03fd1299b8790f0fd6decb9d27c2293
---
M puppet/modules/role/templates/commons_datasets/settings.php.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/04/338304/1

diff --git a/puppet/modules/role/templates/commons_datasets/settings.php.erb 
b/puppet/modules/role/templates/commons_datasets/settings.php.erb
index aa4cf24..8c71610 100644
--- a/puppet/modules/role/templates/commons_datasets/settings.php.erb
+++ b/puppet/modules/role/templates/commons_datasets/settings.php.erb
@@ -13,7 +13,7 @@
'nsName' => 'Data',
// page name must end in ".tab", and contain at least one symbol
'pattern' => '/.\.tab$/',
-   'license' => 'CC0-1.0+',
+   'license' => 'CC0-1.0',
'isLocal' => false,
 ];
 
@@ -23,7 +23,7 @@
'nsName' => 'Data',
// page name must end in ".map", and contain at least one symbol
'pattern' => '/.\.map$/',
-   'license' => 'CC0-1.0+',
+   'license' => 'CC0-1.0',
'isLocal' => false,
 ];
 

-- 
To view, visit https://gerrit.wikimedia.org/r/338304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I444e4755e03fd1299b8790f0fd6decb9d27c2293
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Move Ingenico base API wrapper functions to own class

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338303 )

Change subject: Move Ingenico base API wrapper functions to own class
..

Move Ingenico base API wrapper functions to own class

Tests for higher level functions shouldn't have to mock all the way
down at the cURL response level.

Bug: T158374
Change-Id: Icafa897a0a79430170a35b5c85427527132e5baf
---
A PaymentProviders/Ingenico/Api.php
M PaymentProviders/Ingenico/BankPaymentProvider.php
M PaymentProviders/Ingenico/IngenicoPaymentProvider.php
M SmashPig.yaml
4 files changed, 74 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/03/338303/1

diff --git a/PaymentProviders/Ingenico/Api.php 
b/PaymentProviders/Ingenico/Api.php
new file mode 100644
index 000..2ef21d2
--- /dev/null
+++ b/PaymentProviders/Ingenico/Api.php
@@ -0,0 +1,64 @@
+baseUrl = $baseUrl;
+   $this->merchantId = $merchantId;
+   // FIXME: provide objects in constructor
+   $config = Context::get()->getConfiguration();
+   $this->authenticator = $config->object( 'authenticator' );
+   }
+
+   public function makeApiCall( $path, $method = 'POST', $data = null ) {
+   if ( is_array( $data ) ) {
+   // FIXME: this is weird, maybe OutboundRequest should 
handle this part
+   if ( $method === 'GET' ) {
+   $path .= '?' . http_build_query( $data );
+   $data = null;
+   } else {
+   $data = json_encode( $data );
+   }
+   }
+   $url = $this->baseUrl . self::API_VERSION . 
"/{$this->merchantId}/$path";
+   $request = new OutboundRequest( $url, $method );
+   $request->setBody( $data );
+   if ( $method !== 'GET' ) {
+   $request->setHeader( 'Content-Type', 'application/json' 
);
+   }
+   // Set date header manually so we can use it in signature 
generation
+   $date = new DateTime( 'now', new DateTimeZone( 'UTC' ) );
+   $request->setHeader( 'Date', $date->format( 'D, d M Y H:i:s T' 
) );
+
+   // set more headers...
+
+   $this->authenticator->signRequest( $request );
+
+   $response = $request->execute();
+   // TODO error handling
+   return $response;
+   }
+}
diff --git a/PaymentProviders/Ingenico/BankPaymentProvider.php 
b/PaymentProviders/Ingenico/BankPaymentProvider.php
index 8803ae9..b7b0e05 100644
--- a/PaymentProviders/Ingenico/BankPaymentProvider.php
+++ b/PaymentProviders/Ingenico/BankPaymentProvider.php
@@ -30,7 +30,7 @@
'currencyCode' => $currency
);
$path = "products/$productId/directory";
-   $response = $this->makeApiCall( $path, 'GET', $query );
+   $response = $this->api->makeApiCall( $path, 'GET', 
$query );
 
// TODO: base class should probably decode
$decoded = json_decode( $response['body'] );
diff --git a/PaymentProviders/Ingenico/IngenicoPaymentProvider.php 
b/PaymentProviders/Ingenico/IngenicoPaymentProvider.php
index 3ad939a..9fe7ad2 100644
--- a/PaymentProviders/Ingenico/IngenicoPaymentProvider.php
+++ b/PaymentProviders/Ingenico/IngenicoPaymentProvider.php
@@ -2,12 +2,7 @@
 
 namespace SmashPig\PaymentProviders\Ingenico;
 
-use DateTime;
-use DateTimeZone;
 use SmashPig\Core\Context;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Http\OutboundRequest;
-use SmashPig\Core\UtcDate;
 
 /**
  * Base class for Ingenico payments. Each payment product group should get
@@ -15,48 +10,12 @@
  */
 abstract class IngenicoPaymentProvider {
 
-   const API_VERSION = 'v1';
-   /**
-* @var Configuration
-*/
+   protected $api;
protected $config;
 
-   public function __construct() {
+   public function __construct( $options = array() ) {
+   // FIXME: provide objects in constructor
$this->config = Context::get()->getConfiguration();
-   }
-
-   protected function makeApiCall( $path, $method = 'POST', $data = null ) 
{
-   if ( is_array( $data ) ) {
-   // FIXME: this is weird, maybe OutboundRequest should 
handle this part
-   if ( $method === 'GET' ) {
-   $path .= '?' . http_build_query( $data );
-   $data = null;
-   } else {
-   $data = json_encode( $data );
-   }
-   }
-   $base = $this->config->val( 'base-url' );
-   if ( substr( 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: sshd-phab service config needs to be a template

[20after4 (Code Review)]

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338302 )

Change subject: sshd-phab service config needs to be a template
..

sshd-phab service config needs to be a template

Can't use variables (erb) with plain file source => references

Change-Id: I2ec5deb3b2257880e34c6609a73a9121d7039b34
---
M modules/phabricator/manifests/vcs.pp
R modules/phabricator/templates/sshd-phab.conf.erb
R modules/phabricator/templates/sshd-phab.service.erb
3 files changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/338302/1

diff --git a/modules/phabricator/manifests/vcs.pp 
b/modules/phabricator/manifests/vcs.pp
index 7581970..7cb5ea6 100644
--- a/modules/phabricator/manifests/vcs.pp
+++ b/modules/phabricator/manifests/vcs.pp
@@ -27,7 +27,6 @@
 $ssh_hook_path = '/usr/local/lib/phabricator-ssh-hook.sh'
 $sshd_config = '/etc/ssh/sshd_config.phabricator'
 
-
 user { $vcs_user:
 gid=> 'phd',
 shell  => '/bin/sh',
@@ -95,14 +94,14 @@
 
 if $::initsystem == 'upstart' {
 $init_file = '/etc/init/ssh-phab.conf'
-$init_soorce = 'puppet:///modules/phabricator/sshd-phab.conf'
+$init_template = 'phabricator/sshd-phab.conf.erb'
 } else {
 $init_file = '/etc/systemd/system/ssh-phab.service'
-$init_source = 'puppet:///modules/phabricator/sshd-phab.service'
+$init_template = 'phabricator/sshd-phab.service.erb'
 }
 
 file { $init_file:
-source  => $init_source,
+content => template($init_template),
 mode=> '0644',
 owner   => 'root',
 group   => 'root',
diff --git a/modules/phabricator/files/sshd-phab.conf 
b/modules/phabricator/templates/sshd-phab.conf.erb
similarity index 100%
rename from modules/phabricator/files/sshd-phab.conf
rename to modules/phabricator/templates/sshd-phab.conf.erb
diff --git a/modules/phabricator/files/sshd-phab.service 
b/modules/phabricator/templates/sshd-phab.service.erb
similarity index 100%
rename from modules/phabricator/files/sshd-phab.service
rename to modules/phabricator/templates/sshd-phab.service.erb

-- 
To view, visit https://gerrit.wikimedia.org/r/338302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ec5deb3b2257880e34c6609a73a9121d7039b34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Coding style nitpicking

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338297 )

Change subject: Coding style nitpicking
..


Coding style nitpicking

Change-Id: I613d882cd69857c5b3218f58666c713b03629a57
---
M CollaborationKit.hooks.php
M includes/CollaborationHubContentEditor.php
M includes/CollaborationListContentEditor.php
M includes/SpecialCreateCollaborationHub.php
M includes/SpecialCreateHubFeature.php
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationKitImage.php
M includes/content/CollaborationListContent.php
M includes/content/CollaborationListContentHandler.php
9 files changed, 166 insertions(+), 159 deletions(-)

Approvals:
  Harej: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index ab56d6d..0a80756 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -153,13 +153,14 @@
// TOC disabled, mark as done.
$out->setProperty( 'CollaborationHubSubpage', true );
} elseif ( $pout->getLimitReportData() ) {
-   $out->setProperty( 'CollaborationHubSubpage', 
"in-progress" );
+   $out->setProperty( 'CollaborationHubSubpage', 
'in-progress' );
}
}
+
/**
 * Register __NOCOLLABORATIONHUBTOC__ as a magic word.
 *
-* @param Array &$magicWords All double underscore magic ids
+* @param array &$magicWords All double underscore magic ids
 */
public static function onGetDoubleUnderscoreIDs( array &$magicWords ) {
$magicWords[] = 'nocollaborationhubtoc';
diff --git a/includes/CollaborationHubContentEditor.php 
b/includes/CollaborationHubContentEditor.php
index 01f0b83..c27957e 100644
--- a/includes/CollaborationHubContentEditor.php
+++ b/includes/CollaborationHubContentEditor.php
@@ -38,7 +38,6 @@
 * @return string html
 */
protected function getFormFields( $parts ) {
-
$fields = [
'display_name' => [
'type' => 'text',
@@ -62,7 +61,7 @@
 
$colours = [];
foreach ( CollaborationHubContent::getThemeColours() as $colour 
) {
-   $colours[ 'collaborationkit-' . $colour ] = $colour;
+   $colours['collaborationkit-' . $colour] = $colour;
}
if ( $parts[4] == '' ) {
$selectedColour = 'lightgrey';
@@ -156,7 +155,7 @@
$partFields = $this->getFormFields( $parts );
// See setCollabkitTheme for how the setProperty works.
$out->setProperty( 'collabkit-theme', $this->colour );
-   $out->addHtml( Html::rawElement( 'div', [ 'class' => 
'mw-collabkit-modifiededitform' ], $partFields ) );
+   $out->addHTML( Html::rawElement( 'div', [ 'class' => 
'mw-collabkit-modifiededitform' ], $partFields ) );
}
 
/**
diff --git a/includes/CollaborationListContentEditor.php 
b/includes/CollaborationListContentEditor.php
index 6f49384..f2a73c3 100644
--- a/includes/CollaborationListContentEditor.php
+++ b/includes/CollaborationListContentEditor.php
@@ -36,7 +36,7 @@
return parent::showContentForm();
}
$out = RequestContext::getMain()->getOutput();
-   $out->addHtml( Html::Hidden( 'wpCollaborationKitOptions', 
$parts[1] ) );
+   $out->addHTML( Html::hidden( 'wpCollaborationKitOptions', 
$parts[1] ) );
 
if ( $parts[2] == '' ) {
$includedContent = '';
@@ -69,7 +69,7 @@
$dummyForm = HTMLForm::factory( 'ooui', $fields, 
$this->getContext() );
$partFields = $dummyForm->prepareForm()->getBody();
 
-   $out->addHtml( Html::rawElement( 'div', [ 'class' => 
'mw-collabkit-modifiededitform' ], $partFields ) );
+   $out->addHTML( Html::rawElement( 'div', [ 'class' => 
'mw-collabkit-modifiededitform' ], $partFields ) );
}
 
/**
diff --git a/includes/SpecialCreateCollaborationHub.php 
b/includes/SpecialCreateCollaborationHub.php
index cd35a5d..f6ed6b6 100644
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -38,7 +38,7 @@
$namespaceNames = $this->getLanguage()->getNamespaces();
$namespaceChoices = [];
foreach ( $allowedNamespaces as $nsIndex => $nsCanBeUsed ) {
-   $namespaceChoices[ $namespaceNames[ $nsIndex ] ] = 
$nsIndex;
+   $namespaceChoices[$namespaceNames[$nsIndex]] = $nsIndex;
}
 
$fields = [
@@ -76,13 +76,13 @@
 
// Our preference is the Project namespace
   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiQueryBase::addWhereFld: Don't count uncountable values

[PleaseStand (Code Review)]

PleaseStand has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338301 )

Change subject: ApiQueryBase::addWhereFld: Don't count uncountable values
..

ApiQueryBase::addWhereFld: Don't count uncountable values

In PHP 7.2, count() will generate a warning if its argument is
not an array or countable object.

https://wiki.php.net/rfc/counting_non_countables

addWhereFld() "[uses] count() to its full documented capabilities to
simultaneously test for null, empty array or empty countable object"
since r42536 (c4dd73000a734ddf). Thus, in PHP 7.2, a warning would
occur in the common case in which a scalar value is provided.

Avoid the warnings by checking, in the obvious way, whether the
value is null or an empty array, as there is no apparent reason
to check for countable objects containing zero items.

Change-Id: I562ec00cbebcaa803855e033cd07806bbcc16af0
---
M includes/api/ApiQueryBase.php
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/338301/1

diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 2d21865..c907187 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -261,9 +261,7 @@
 * @param string|string[] $value Value; ignored if null or empty array;
 */
protected function addWhereFld( $field, $value ) {
-   // Use count() to its full documented capabilities to 
simultaneously
-   // test for null, empty array or empty countable object
-   if ( count( $value ) ) {
+   if ( $value !== null && $value !== [] ) {
$this->where[$field] = $value;
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/338301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I562ec00cbebcaa803855e033cd07806bbcc16af0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Get some static Config access out of Authenticator

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338300 )

Change subject: Get some static Config access out of Authenticator
..

Get some static Config access out of Authenticator

Provide credentials via constructor params

Bug: T158374
Change-Id: I59c54829f4ac197ca9c5681f338a415c9abb6764
---
M PaymentProviders/Ingenico/Authenticator.php
M PaymentProviders/Ingenico/Tests/phpunit/AuthenticatorTest.php
M SmashPig.yaml
3 files changed, 24 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/00/338300/1

diff --git a/PaymentProviders/Ingenico/Authenticator.php 
b/PaymentProviders/Ingenico/Authenticator.php
index bbb..cbb389c 100644
--- a/PaymentProviders/Ingenico/Authenticator.php
+++ b/PaymentProviders/Ingenico/Authenticator.php
@@ -11,24 +11,28 @@
  */
 class Authenticator {
 
+   protected $keyId;
+   protected $secret;
+
+   public function __construct( $keyId, $secret ) {
+   $this->keyId = $keyId;
+   $this->secret = $secret;
+   }
+
public function signRequest( OutboundRequest $request ) {
-   $config = Context::get()->getConfiguration();
 
$toSign = $this->getStringToSign( $request );
-   $secretApiKey = $config->val( 'credentials/api-secret' );
 
$signature = base64_encode(
hash_hmac(
'sha256',
$toSign,
-   $secretApiKey,
+   $this->secret,
true
)
);
 
-   $apiKeyId = $config->val( 'credentials/api-key-id' );
-
-   $authHeader = "GCS v1HMAC:$apiKeyId:$signature";
+   $authHeader = "GCS v1HMAC:{$this->keyId}:$signature";
$request->setHeader( 'Authorization', $authHeader );
}
 
diff --git a/PaymentProviders/Ingenico/Tests/phpunit/AuthenticatorTest.php 
b/PaymentProviders/Ingenico/Tests/phpunit/AuthenticatorTest.php
index b9d9fd9..d242f6a 100644
--- a/PaymentProviders/Ingenico/Tests/phpunit/AuthenticatorTest.php
+++ b/PaymentProviders/Ingenico/Tests/phpunit/AuthenticatorTest.php
@@ -14,14 +14,16 @@
  */
 class AuthenticatorTest extends BaseSmashPigUnitTestCase {
 
+   /**
+* @var Authenticator
+*/
+   protected $authenticator;
+
public function setUp() {
-   $config = $this->setConfig( 'ingenico' );
-   $config->override( array(
-   'credentials' => array(
-   'api-key-id' => '5e45c937b9db33ae',
-   'api-secret' => 
'I42Zf4pVnRdroHfuHnRiJjJ2B6+22h0yQt/R3nZR8Xg='
-   )
-   ) );
+   $this->authenticator = new Authenticator(
+   '5e45c937b9db33ae',
+   'I42Zf4pVnRdroHfuHnRiJjJ2B6+22h0yQt/R3nZR8Xg='
+   );
parent::setUp();
}
 
@@ -31,8 +33,7 @@
public function testBasicSignature() {
$request = new OutboundRequest( 
'https://api.globalcollect.com/v1/9991/tokens/123456789' );
$request->setHeader( 'Date', 'Fri, 06 Jun 2014 13:39:43 GMT' );
-   $authenticator = new Authenticator();
-   $authenticator->signRequest( $request );
+   $this->authenticator->signRequest( $request );
$headers = $request->getHeaders();
$this->assertEquals(
'GCS 
v1HMAC:5e45c937b9db33ae:J5LjfSBvrQNhu7gG0gvifZt+IWNDReGCmHmBmth6ueI=',
@@ -43,8 +44,7 @@
public function testEncodedQuery() {
$request = new OutboundRequest( 
'https://api.globalcollect.com/v1/consumer/ANDR%C3%89E/?q=na%20me' );
$request->setHeader( 'Date', 'Fri, 06 Jun 2014 13:39:43 GMT' );
-   $authenticator = new Authenticator();
-   $authenticator->signRequest( $request );
+   $this->authenticator->signRequest( $request );
$headers = $request->getHeaders();
$this->assertEquals(
'GCS 
v1HMAC:5e45c937b9db33ae:x9S2hQmLhLTbpK0YdTuYCD8TB4D+Kf60tNW0Xw5Xls0=',
diff --git a/SmashPig.yaml b/SmashPig.yaml
index ce84b07..db44c38 100644
--- a/SmashPig.yaml
+++ b/SmashPig.yaml
@@ -446,12 +446,12 @@
 
 credentials:
 merchant-id: 1234
-api-key-id: 'apiKey'
-api-secret: 'apiSecret'
 
 authenticator:
 class: SmashPig\PaymentProviders\Ingenico\Authenticator
-constructor-parameters: []
+constructor-parameters:
+- 'apiKey'
+- 'apiSecret'
 
 bank-cache:
 key: SMASHPIG_INGENICO_IDEAL_BANK_LIST

-- 
To view, visit https://gerrit.wikimedia.org/r/338300
To 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Demote "Unverified user provided and no metadata to auth it"...

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338299 )

Change subject: Demote "Unverified user provided and no metadata to auth it" 
log message to info
..

Demote "Unverified user provided and no metadata to auth it" log message to info

Bug: T158367
Change-Id: Ic9a949204d9d4b6d154e5a8d31f6c8501043c657
---
M includes/session/SessionManager.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/338299/1

diff --git a/includes/session/SessionManager.php 
b/includes/session/SessionManager.php
index 0041450..7cc8509 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -773,7 +773,8 @@
return $failHandler();
}
} elseif ( !$info->getUserInfo()->isVerified() ) {
-   $this->logger->warning(
+   // probably just a session timeout
+   $this->logger->info(
'Session "{session}": Unverified user 
provided and no metadata to auth it',
[
'session' => $info,

-- 
To view, visit https://gerrit.wikimedia.org/r/338299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9a949204d9d4b6d154e5a8d31f6c8501043c657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Demote "throttler data not found" logs to info level

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338298 )

Change subject: Demote "throttler data not found" logs to info level
..

Demote "throttler data not found" logs to info level

Bug: T158364
Change-Id: I049c2d6da4720341ef2a380879ac19aff444b1d0
---
M includes/auth/ThrottlePreAuthenticationProvider.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/98/338298/1

diff --git a/includes/auth/ThrottlePreAuthenticationProvider.php 
b/includes/auth/ThrottlePreAuthenticationProvider.php
index 3f6a47d..ae0bc6b 100644
--- a/includes/auth/ThrottlePreAuthenticationProvider.php
+++ b/includes/auth/ThrottlePreAuthenticationProvider.php
@@ -167,7 +167,9 @@
 
$data = $this->manager->getAuthenticationSessionData( 
'LoginThrottle' );
if ( !$data ) {
-   $this->logger->error( 'throttler data not found for 
{user}', [ 'user' => $user->getName() ] );
+   // this can occur when login is happening via 
AuthenticationRequest::$loginRequest
+   // so testForAuthentication is skipped
+   $this->logger->info( 'throttler data not found for 
{user}', [ 'user' => $user->getName() ] );
return;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/338298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I049c2d6da4720341ef2a380879ac19aff444b1d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Coding style nitpicking

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338297 )

Change subject: Coding style nitpicking
..

Coding style nitpicking

Change-Id: I613d882cd69857c5b3218f58666c713b03629a57
---
M CollaborationKit.hooks.php
M includes/CollaborationHubContentEditor.php
M includes/CollaborationListContentEditor.php
M includes/SpecialCreateCollaborationHub.php
M includes/SpecialCreateHubFeature.php
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationKitImage.php
M includes/content/CollaborationListContent.php
M includes/content/CollaborationListContentHandler.php
M modules/ext.CollaborationKit.colour.js
M modules/ext.CollaborationKit.hubimage.js
M modules/ext.CollaborationKit.icon.js
M modules/ext.CollaborationKit.list.edit.js
M modules/ext.CollaborationKit.list.members.js
M modules/ext.CollaborationKit.list.ui.js
15 files changed, 210 insertions(+), 202 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/97/338297/1

diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index ab56d6d..0a80756 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -153,13 +153,14 @@
// TOC disabled, mark as done.
$out->setProperty( 'CollaborationHubSubpage', true );
} elseif ( $pout->getLimitReportData() ) {
-   $out->setProperty( 'CollaborationHubSubpage', 
"in-progress" );
+   $out->setProperty( 'CollaborationHubSubpage', 
'in-progress' );
}
}
+
/**
 * Register __NOCOLLABORATIONHUBTOC__ as a magic word.
 *
-* @param Array &$magicWords All double underscore magic ids
+* @param array &$magicWords All double underscore magic ids
 */
public static function onGetDoubleUnderscoreIDs( array &$magicWords ) {
$magicWords[] = 'nocollaborationhubtoc';
diff --git a/includes/CollaborationHubContentEditor.php 
b/includes/CollaborationHubContentEditor.php
index 01f0b83..c27957e 100644
--- a/includes/CollaborationHubContentEditor.php
+++ b/includes/CollaborationHubContentEditor.php
@@ -38,7 +38,6 @@
 * @return string html
 */
protected function getFormFields( $parts ) {
-
$fields = [
'display_name' => [
'type' => 'text',
@@ -62,7 +61,7 @@
 
$colours = [];
foreach ( CollaborationHubContent::getThemeColours() as $colour 
) {
-   $colours[ 'collaborationkit-' . $colour ] = $colour;
+   $colours['collaborationkit-' . $colour] = $colour;
}
if ( $parts[4] == '' ) {
$selectedColour = 'lightgrey';
@@ -156,7 +155,7 @@
$partFields = $this->getFormFields( $parts );
// See setCollabkitTheme for how the setProperty works.
$out->setProperty( 'collabkit-theme', $this->colour );
-   $out->addHtml( Html::rawElement( 'div', [ 'class' => 
'mw-collabkit-modifiededitform' ], $partFields ) );
+   $out->addHTML( Html::rawElement( 'div', [ 'class' => 
'mw-collabkit-modifiededitform' ], $partFields ) );
}
 
/**
diff --git a/includes/CollaborationListContentEditor.php 
b/includes/CollaborationListContentEditor.php
index 6f49384..f2a73c3 100644
--- a/includes/CollaborationListContentEditor.php
+++ b/includes/CollaborationListContentEditor.php
@@ -36,7 +36,7 @@
return parent::showContentForm();
}
$out = RequestContext::getMain()->getOutput();
-   $out->addHtml( Html::Hidden( 'wpCollaborationKitOptions', 
$parts[1] ) );
+   $out->addHTML( Html::hidden( 'wpCollaborationKitOptions', 
$parts[1] ) );
 
if ( $parts[2] == '' ) {
$includedContent = '';
@@ -69,7 +69,7 @@
$dummyForm = HTMLForm::factory( 'ooui', $fields, 
$this->getContext() );
$partFields = $dummyForm->prepareForm()->getBody();
 
-   $out->addHtml( Html::rawElement( 'div', [ 'class' => 
'mw-collabkit-modifiededitform' ], $partFields ) );
+   $out->addHTML( Html::rawElement( 'div', [ 'class' => 
'mw-collabkit-modifiededitform' ], $partFields ) );
}
 
/**
diff --git a/includes/SpecialCreateCollaborationHub.php 
b/includes/SpecialCreateCollaborationHub.php
index cd35a5d..f6ed6b6 100644
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -38,7 +38,7 @@
$namespaceNames = $this->getLanguage()->getNamespaces();
$namespaceChoices = [];
foreach ( $allowedNamespaces as $nsIndex => $nsCanBeUsed ) {
-   

[MediaWiki-commits] [Gerrit] mediawiki...PictureGame[master]: Implemented flagging reason.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336008 )

Change subject: Implemented flagging reason.
..


Implemented flagging reason.

+ Fixed flag link showing to unlogged users.

Bug: T155451
Change-Id: If98f901cd3d090e9a1fd2450ad9957582b3da455
---
M PictureGameHome.body.php
M PictureGameHooks.class.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M picturegame/PictureGame.js
A sql/picturegame-add-comment.sql
R sql/picturegame.sql
8 files changed, 162 insertions(+), 95 deletions(-)

Approvals:
  SamanthaNguyen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PictureGameHome.body.php b/PictureGameHome.body.php
index 9978497..9cdd4a2 100644
--- a/PictureGameHome.body.php
+++ b/PictureGameHome.body.php
@@ -235,7 +235,7 @@
$dbw = wfGetDB( DB_MASTER );
$dbw->update(
'picturegame_images',
-   array( 'flag' => PictureGameHome::$FLAG_NONE ),
+   array( 'flag' => PictureGameHome::$FLAG_NONE, 'comment' 
=> '' ),
array( 'id' => $id ),
__METHOD__
);
@@ -419,7 +419,7 @@
" . $this->msg( 
'picturegame-createeditfirstimage' )->plain() . "

{$imgOne}
-   " .
+   " .
$this->msg( 
'picturegame-editgameuploadtext' )->plain() . '

 
@@ -427,7 +427,7 @@
' . $this->msg( 
'picturegame-createeditsecondimage' )->plain() . "

{$imgTwo}
-   " .
+   " .
$this->msg( 
'picturegame-editgameuploadtext' )->plain() . "

 
@@ -455,7 +455,7 @@

getPageTitle()->getFullURL( "picGameAction=renderPermalink={$imgID}" 
) ) . "'\" value=\"" .
-   $this->msg( 'picturegame-buttoncancel' 
)->plain() . "\"/>
+   $this->msg( 'cancel' )->plain() . "\"/>


";
@@ -495,7 +495,7 @@
$dbw = wfGetDB( DB_MASTER );
$res = $dbw->select(
'picturegame_images',
-   array( 'id', 'img1', 'img2' ),
+   array( 'id', 'img1', 'img2', 'comment' ),
array(
'flag' => PictureGameHome::$FLAG_FLAGGED,
"img1 <> ''",
@@ -527,8 +527,14 @@
$img_one_description = $lang->truncate( $row->img1, 12 
);
$img_two_description = $lang->truncate( $row->img2, 12 
);
 
-   $output .= '
+   $reason = '';
+   if( !empty( $row->comment ) ) {
+   $reason .= "id}\">
+   " . $this->msg( 
'picturegame-adminpanelreason' )->escaped() . ": {$row->comment}
+   ";
+   }
 
+   $output .= '

{$img_one_tag}
{$img_one_description}
@@ -538,16 +544,16 @@
{$img_two_description}


-   " .
+   " .
$this->msg( 
'picturegame-adminpanelunflag' )->text() .
" |
-   img1}\" 
data-row-img2=\"{$row->img2}\">"
+   img1}\" data-row-img2=\"{$row->img2}\">"
. $this->msg( 
'picturegame-adminpaneldelete' )->text() .
-   '
+   "
+   {$reason}

-   
-
-   ';
+   
+   ";
}
 
$output .= '
@@ -598,16 +604,15 @@
{$img_two_description}


-

[MediaWiki-commits] [Gerrit] mediawiki...DuskToDawn[master]: Remove WordPress CSS and media file technical debt in DuskTo...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336343 )

Change subject: Remove WordPress CSS and media file technical debt in DuskToDawn
..


Remove WordPress CSS and media file technical debt in DuskToDawn

Bug: T157202
Change-Id: I11ff28ab9c59a69837ebec00e402caacbaea8294
---
D resources/images/ornaments-rs-ltr.png
D resources/images/ornaments-rs-rtl.png
D resources/images/page-rs-ltr.gif
D resources/images/page-rs-rtl.gif
M resources/style.css
M skin.json
6 files changed, 20 insertions(+), 725 deletions(-)

Approvals:
  Jack Phoenix: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/images/ornaments-rs-ltr.png 
b/resources/images/ornaments-rs-ltr.png
deleted file mode 100644
index 1997819..000
--- a/resources/images/ornaments-rs-ltr.png
+++ /dev/null
Binary files differ
diff --git a/resources/images/ornaments-rs-rtl.png 
b/resources/images/ornaments-rs-rtl.png
deleted file mode 100644
index 7526bbb..000
--- a/resources/images/ornaments-rs-rtl.png
+++ /dev/null
Binary files differ
diff --git a/resources/images/page-rs-ltr.gif b/resources/images/page-rs-ltr.gif
deleted file mode 100644
index 704ecd5..000
--- a/resources/images/page-rs-ltr.gif
+++ /dev/null
Binary files differ
diff --git a/resources/images/page-rs-rtl.gif b/resources/images/page-rs-rtl.gif
deleted file mode 100644
index 3b91a1b..000
--- a/resources/images/page-rs-rtl.gif
+++ /dev/null
Binary files differ
diff --git a/resources/style.css b/resources/style.css
index 3115d4b..5954034 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -151,60 +151,13 @@
position: absolute;
width: 100%;
 }
-/* Right sidebar layout */
-.right-sidebar #page {
-   /* @embed */
-   background: url(images/ornaments-rs-ltr.png) no-repeat 0 0;
-}
-.right-sidebar #main {
-   /* @embed */
-   background: url(images/page-rs-ltr.gif) repeat-y 0 0;
-}
-.right-sidebar #primary {
-   float: left;
-   margin: 0 -282px 0 0;
-}
-.right-sidebar #content {
-   margin: 0 282px 0 0;
-}
-.right-sidebar #main .widget-area {
-   float: right;
-}
-/* Get rid of the faux column from templates without sidebars */
-.page-template-full-width-page-php #main,
-.single-attachment #main,
-.error404 #main {
-   background-color: #eeeae8;
-   background-image: none;
-}
-/* Increase the size of the content area for templates without sidebars */
-.full-width #content,
-.image-attachment #content,
-.error404 #content {
-   margin: 0;
-}
+
 /* Text meant only for screen readers */
 .screen-reader-text,
 .assistive-text {
position: absolute !important;
clip: rect(1px, 1px, 1px, 1px);
 }
-/* Alignment */
-.alignleft {
-   display: inline;
-   float: left;
-}
-.alignright {
-   display: inline;
-   float: right;
-}
-.aligncenter {
-   clear: both;
-   display: block;
-   margin-left: auto;
-   margin-right: auto;
-}
-
 
 /* Global */
 
@@ -437,9 +390,7 @@
padding: 8px 30px 6px;
width: 474px;
 }
-.right-sidebar #branding hgroup {
-   margin: 2px 0 54px 54px;
-}
+
 /* ashley change: originally #site-title */
 #firstHeading {
font: 300 25px/1.3 Ubuntu, sans-serif;
@@ -461,17 +412,6 @@
 
 
 /* Content */
-
-.sticky {
-   background-color: #f6f6f6;
-}
-.sticky:first-child {
-   border-top-right-radius: 3px;
-}
-.right-sidebar .sticky:first-child {
-   border-top-right-radius: 0;
-   border-top-left-radius: 3px;
-}
 .hentry {
border-top: 1px solid #ccc;
padding: 0 0 59px 0;
@@ -488,27 +428,11 @@
margin: 0 0 47px 54px;
padding: 0 30px 0 24px;
 }
-.right-sidebar .entry-header {
-   border-left: none;
-   border-right: 6px solid #497ca7;
-   margin: 0 54px 47px 0;
-   padding: 0 24px 0 30px;
-}
-.page .entry-header,
-.no-results .entry-header {
+
+.page .entry-header {
padding: 68px 30px 0 24px;
 }
-.error404 .entry-header,
-.no-sidebar .full-width .entry-header,
-.image-attachment .entry-header {
-   border-left: none;
-   border-right: none;
-   margin: 0 0 47px 0;
-   padding: 68px 30px 0 30px;
-}
-.image-attachment .entry-header {
-   padding: 0 30px 0 24px;
-}
+
 .entry-title {
color: #0b0e18;
font: 300 22px/22px Ubuntu, sans-serif;
@@ -521,31 +445,11 @@
 .entry-title a:hover {
color: #497ca7;
 }
-.entry-content,
-.entry-summary {
+.entry-content {
padding: 0 30px 0 84px;
width: 474px;
 }
-.right-sidebar .entry-content,
-.right-sidebar .entry-summary {
-   padding: 0 84px 0 30px;
-}
-.error404 .entry-content,
-.full-width .entry-content,
-.image-attachment .entry-content {
-   padding: 0 30px;
-   width: 810px;
-}
-.image-attachment .entry-content {
-   clear: both;
-   margin: 0 0 44px 0
-}
-.image-attachment .entry-caption {
-   color: #777;
-   

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Resize thumbnails images returned by REST endpoint

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338165 )

Change subject: Resize thumbnails images returned by REST endpoint
..


Resize thumbnails images returned by REST endpoint

This change resizes thumbnails to the appropriate width
based on the value of mw.popups.gateway.THUMBNAIL_SIZE

Tests cover
* When requested thumbnail is < than original size
* When requested thumbnail is > than original size
* When requested thumbnail is an svg and originalimage
smaller than requested thumb size

Bug: T156800
Change-Id: Ib375b97e2bc959e91de5177efc3df1f2ded54a5b
---
M resources/dist/index.js
M resources/dist/index.js.map
A src/constants.js
M src/gateway/mediawiki.js
M src/gateway/rest.js
M src/index.js
M tests/qunit/ext.popups/gateway/mediawiki.test.js
M tests/qunit/ext.popups/gateway/rest.test.js
8 files changed, 302 insertions(+), 179 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jdlrobson: Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/338165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib375b97e2bc959e91de5177efc3df1f2ded54a5b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Pmiazga 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Factory for payment providers

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338296 )

Change subject: Factory for payment providers
..

Factory for payment providers

Don't make anybody new() up the PaymentProvider classes or call on
SmashPig::Configuration from higher level libraries.

Change-Id: I6ff9a837326f2714398d439a5d14a5a17ad4b564
---
M Core/Configuration.php
A PaymentProviders/PaymentProviderFactory.php
M SmashPig.yaml
3 files changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/96/338296/1

diff --git a/Core/Configuration.php b/Core/Configuration.php
index 095daec..f94d72c 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -274,6 +274,9 @@
 
// Optional keys
$arguments = array();
+   // It would be nice to be able to provide other objects defined
+   // in config as arguments. We might have had that 
pre-simplification
+   // with nodes that referred to other nodes.
if ( $this->nodeExists( $node . '/constructor-parameters' ) ) {
$arguments = $this->val( $node . 
'/constructor-parameters' );
}
diff --git a/PaymentProviders/PaymentProviderFactory.php 
b/PaymentProviders/PaymentProviderFactory.php
new file mode 100644
index 000..f84f5f2
--- /dev/null
+++ b/PaymentProviders/PaymentProviderFactory.php
@@ -0,0 +1,19 @@
+getConfiguration();
+   $node = "payment-provider/$paymentMethod";
+   return $config->object( $node );
+   }
+}
diff --git a/SmashPig.yaml b/SmashPig.yaml
index ce84b07..70655f0 100644
--- a/SmashPig.yaml
+++ b/SmashPig.yaml
@@ -170,6 +170,8 @@
 listener:
 class: SmashPig\PaymentProviders\Adyen\AdyenListener
 
+# FIXME: let's use this node to map payment methods to classes that
+# implement doPayment (aka gateway adapters). See ingenico below.
 payment-provider:
 adyen:
 api:
@@ -457,6 +459,10 @@
 key: SMASHPIG_INGENICO_IDEAL_BANK_LIST
 duration: 300
 
+payment-provider:
+rtbt:
+class: SmashPig\PaymentProviders\Ingenico\BankPaymentProvider
+
 # deprecated, delete when projects using SmashPig rename adaptors
 globalcollect:
 <<: *INGENICO

-- 
To view, visit https://gerrit.wikimedia.org/r/338296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ff9a837326f2714398d439a5d14a5a17ad4b564
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Make ssh-phab port configurable

[Paladox (Code Review)]

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338294 )

Change subject: Phabricator: Make ssh-phab port configurable
..

Phabricator: Make ssh-phab port configurable

This is manly needed for labs.

But we can switch the port from 22 to 23.

Change-Id: I882af101a772a0e861df47a4fb585f025cff1a52
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/338294/1


-- 
To view, visit https://gerrit.wikimedia.org/r/338294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I882af101a772a0e861df47a4fb585f025cff1a52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Cancel 'editItem' on CapsuleMultiselectWidget

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338295 )

Change subject: RCFilters UI: Cancel 'editItem' on CapsuleMultiselectWidget
..

RCFilters UI: Cancel 'editItem' on CapsuleMultiselectWidget

This method assumes you want to edit the item manually, and so
it calls this.$input.val() on a nonexisting input (because there
is no input if a popup exists.)

Bug: T158368
Change-Id: I7bbce89e5280f97d3e85619d9a8fe23fa5e5e47c
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/338295/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index 9bb1a98..7f8d79d 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -247,4 +247,9 @@
} );
};
 
+   /**
+* Override 'editItem' since it tries to use $input which does
+* not exist when a popup is available.
+*/
+   mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.editItem = 
function () {};
 }( mediaWiki, jQuery ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/338295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bbce89e5280f97d3e85619d9a8fe23fa5e5e47c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: WIP: T157700

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338293 )

Change subject: WIP: T157700
..

WIP: T157700

Needs tests.

Bug: T157700
Change-Id: I5307587b10f4849c4e82d3b064ff759121c2de67
---
M resources/ext.relatedArticles.readMore.bootstrap/index.js
1 file changed, 13 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles 
refs/changes/93/338293/1

diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js 
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index bf53014..6c05577 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -16,22 +16,28 @@
/**
 * Is RelatedArticles extension enabled for current user
 *
-* Returns true if the user opted into the beta feature, otherwise
-* user's session ID is used to determine the eligibility for 
RelatedArticles functionality,
+* If the user is logged in:
+*  * returns true if the user opted in to the beta feature;
+*  * otherwise false.
+*
+* If the user is logged out user's session ID is used to
+* determine the eligibility for RelatedArticles functionality,
 * based on the value of wgRelatedArticlesEnabledSamplingRate
-* thus the function will result the same outcome as long as the browser
-* hasn't been restarted or the cookie hasn't been cleared.
+* (defaults to 90%) thus the function will result the same
+* outcome as long as the browser hasn't been restarted or
+* the cookie hasn't been cleared.
 *
 * @return {boolean}
 */
function isEnabledForCurrentUser() {
var bucket,
-   samplingRate = mw.config.get( 
'wgRelatedArticlesEnabledSamplingRate', 1 );
+   samplingRate;
 
-   if ( mw.config.get( 'wgRelatedArticlesBetaFeatureEnabled' ) ) {
-   return true;
+   if ( !mw.user.isAnon() ) {
+   return mw.config.get( 
'wgRelatedArticlesBetaFeatureEnabled' );
}
 
+   samplingRate = mw.config.get( 
'wgRelatedArticlesEnabledSamplingRate', 0.9 );
bucket = mw.experiments.getBucket( {
name: 'ext.relatedArticles.visibility',
enabled: true,

-- 
To view, visit https://gerrit.wikimedia.org/r/338293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5307587b10f4849c4e82d3b064ff759121c2de67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikiLabels[master]: Replace abandoned blue with overhauled palette's blue

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338292 )

Change subject: Replace abandoned blue with overhauled palette's blue
..

Replace abandoned blue with overhauled palette's blue

Replacing abandoned blue `#347bff` with overhauled WikimediaUI
color palette's blue `#36c`. Also optimize SVG with SVGO.

Change-Id: I3f00e53a16b0b190633fbcdb10b1897428227f46
---
M images/beta-features-ltr.svg
M images/beta-features-rtl.svg
2 files changed, 36 insertions(+), 84 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLabels 
refs/changes/92/338292/1

diff --git a/images/beta-features-ltr.svg b/images/beta-features-ltr.svg
index 3a6ae4c..98bbc14 100644
--- a/images/beta-features-ltr.svg
+++ b/images/beta-features-ltr.svg
@@ -1,44 +1,20 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-wb-otherprojects-beta-ltr
-Created with Sketch.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162">
+  
+wb-otherprojects-beta-ltr
+  
+  
+
+
+
+
+
+
+
+
+  
+  
+  
 
-
\ No newline at end of file
+  
+
diff --git a/images/beta-features-rtl.svg b/images/beta-features-rtl.svg
index 099a9a9..e852929 100644
--- a/images/beta-features-rtl.svg
+++ b/images/beta-features-rtl.svg
@@ -1,44 +1,20 @@
 
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-wb-otherprojects-beta-ltr
-Created with Sketch.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162">
+  
+wb-otherprojects-beta-ltr
+  
+  
+
+
+
+
+
+
+
+
+  
+  
+  
 
-
\ No newline at end of file
+  
+

-- 
To view, visit https://gerrit.wikimedia.org/r/338292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f00e53a16b0b190633fbcdb10b1897428227f46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLabels
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: update nithum's ssh pub key

[RobH (Code Review)]

RobH has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338291 )

Change subject: update nithum's ssh pub key
..


update nithum's ssh pub key

issue with old key so replacing per nithum's request

Bug:T157724
Change-Id: I18ae25708a495f14f5e4bb1d7c56018a17706848
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  RobH: Looks good to me, approved



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ca64184..946332a 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2456,7 +2456,7 @@
 name: nithum
 realname: Nithum Thain
 ssh_keys:
-  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDdoZ4fXmaua+K80DRZ93bLfohcl3IXOixTXZ+WLUwcVPvKKZpHriUC2PmmMGU9cqgnYP5f3Rix4h9dTkHhZneW4qFyhwdeuseLjFbCJ3E7bOY9fvsIj6fVlbUWn48UG2UfkQLI+8vf5jtxfocurIgoCPkx3yxpVjfflW/l9v2hVEvdQWngKy/Skn1+3IqScvwZ0GTqPG7GKOfPPSnFrCRb6+1fiOTRMEov0WoVGqBx3H0klVQQtbAJksrUw+yNvykVGIhfXzRiSfXcch+DBgUNmk8WgMGxwKMSmE5kdDx1+mY/z/7Yz69Y8zURr/DF5SnijLdNVkoFYJn6IXL1eElx
 nithum@MBP.local
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDHQ6oDkb1WXmbizF6PX4hIELg7azLCcAaNiIl2ytjKTv7DcunsiwM/IkzoU94SUc1uIfijevzDTDU2moSTv8OJ5b/2RxG2RpL8pPVA+aLIm/2Yfo/ulCnjs0WgHbRpY7GKagliU6/PG8JV8byoLglVbPUcepie4P33yAqsA3BxdVsGxw4WnyOIIG2mRsYyAQsMNB5xwofkHW3fPLetY6MYpu9EtKCjaJzX2FzETT7E8WpjwYpqBnAC108hqueyCoZ7Q3eD6qs+pUdcKDPjFHPOQCxPulVjkdsUczct3r5s9ryze0ziSb5GvMowgc1i1Kn9fUPcPPmqRwR4to8348DN
 nithum@MBP.local
 uid: 15708
 email: nit...@gmail.com
 expiry_date: 2017-06-15

-- 
To view, visit https://gerrit.wikimedia.org/r/338291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I18ae25708a495f14f5e4bb1d7c56018a17706848
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: update nithum's ssh pub key

[RobH (Code Review)]

RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338291 )

Change subject: update nithum's ssh pub key
..

update nithum's ssh pub key

issue with old key so replacing per nithum's request

Bug:T157724
Change-Id: I18ae25708a495f14f5e4bb1d7c56018a17706848
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/338291/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ca64184..946332a 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2456,7 +2456,7 @@
 name: nithum
 realname: Nithum Thain
 ssh_keys:
-  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDdoZ4fXmaua+K80DRZ93bLfohcl3IXOixTXZ+WLUwcVPvKKZpHriUC2PmmMGU9cqgnYP5f3Rix4h9dTkHhZneW4qFyhwdeuseLjFbCJ3E7bOY9fvsIj6fVlbUWn48UG2UfkQLI+8vf5jtxfocurIgoCPkx3yxpVjfflW/l9v2hVEvdQWngKy/Skn1+3IqScvwZ0GTqPG7GKOfPPSnFrCRb6+1fiOTRMEov0WoVGqBx3H0klVQQtbAJksrUw+yNvykVGIhfXzRiSfXcch+DBgUNmk8WgMGxwKMSmE5kdDx1+mY/z/7Yz69Y8zURr/DF5SnijLdNVkoFYJn6IXL1eElx
 nithum@MBP.local
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDHQ6oDkb1WXmbizF6PX4hIELg7azLCcAaNiIl2ytjKTv7DcunsiwM/IkzoU94SUc1uIfijevzDTDU2moSTv8OJ5b/2RxG2RpL8pPVA+aLIm/2Yfo/ulCnjs0WgHbRpY7GKagliU6/PG8JV8byoLglVbPUcepie4P33yAqsA3BxdVsGxw4WnyOIIG2mRsYyAQsMNB5xwofkHW3fPLetY6MYpu9EtKCjaJzX2FzETT7E8WpjwYpqBnAC108hqueyCoZ7Q3eD6qs+pUdcKDPjFHPOQCxPulVjkdsUczct3r5s9ryze0ziSb5GvMowgc1i1Kn9fUPcPPmqRwR4to8348DN
 nithum@MBP.local
 uid: 15708
 email: nit...@gmail.com
 expiry_date: 2017-06-15

-- 
To view, visit https://gerrit.wikimedia.org/r/338291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18ae25708a495f14f5e4bb1d7c56018a17706848
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Position image correctly inside the card

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338166 )

Change subject: Position image correctly inside the card
..


Position image correctly inside the card

inline-blocks need to be forced to be aligned correctly on the baseline

Bug: T153840
Change-Id: Iec45caa4483b36b01261309e4895c71e3fc2e675
---
M resources/ext.popups/styles/ext.popups.core.less
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Jdlrobson: Looks good to me, approved



diff --git a/resources/ext.popups/styles/ext.popups.core.less 
b/resources/ext.popups/styles/ext.popups.core.less
index b4db7e3..a370979 100644
--- a/resources/ext.popups/styles/ext.popups.core.less
+++ b/resources/ext.popups/styles/ext.popups.core.less
@@ -145,7 +145,7 @@
width: 450px;
 
> div > a > svg {
-   margin-bottom: -7px;
+   vertical-align: middle;
}
 
.mwe-popups-extract {

-- 
To view, visit https://gerrit.wikimedia.org/r/338166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec45caa4483b36b01261309e4895c71e3fc2e675
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Prevent user from creating a list with an empty title

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338290 )

Change subject: Prevent user from creating a list with an empty title
..

Prevent user from creating a list with an empty title

It's currently possible for a user to create a reading list with an empty
string as the title.  When this happens, "Untitled" will be displayed as
the list title, but the true title will be an empty string, and pages will
disappear from the reading list almost immediately.

Let's prevent users from creating reading lists with empty titles.

Change-Id: If330328a60b60db96f5ccaa7af2237bcbc65a37d
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
3 files changed, 30 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/90/338290/1

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
index 08a3719..b14242b 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SwitchCompat;
@@ -13,9 +14,11 @@
 import android.view.WindowManager;
 import android.widget.EditText;
 
+import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.R;
 import org.wikipedia.util.DeviceUtil;
 import org.wikipedia.util.DimenUtil;
+import org.wikipedia.util.StringUtil;
 
 import java.util.List;
 
@@ -27,8 +30,9 @@
 }
 
 private interface TitleTextCallback {
-void onMatchesExistingTitle(@NonNull String title);
-void onDoesNotMatchExistingTitle();
+void onEntryMatchesExistingTitle(@NonNull String title);
+void onEntryEmpty();
+void onEntryOk();
 }
 
 private static class TitleTextWatcher implements TextWatcher {
@@ -44,13 +48,17 @@
 }
 
 @Override public void onTextChanged(CharSequence charSequence, int i, 
int i1, int i2) {
-for (String title : titles) {
-if (title.equals(charSequence.toString())) {
-cb.onMatchesExistingTitle(title);
-return;
-}
+if (StringUtils.isEmpty(charSequence)) {
+cb.onEntryEmpty();
+return;
 }
-cb.onDoesNotMatchExistingTitle();
+
+if (titles.contains(charSequence.toString())) {
+cb.onEntryMatchesExistingTitle(charSequence.toString());
+return;
+}
+
+cb.onEntryOk();
 }
 
 @Override public void afterTextChanged(Editable editable) {
@@ -96,18 +104,23 @@
 @Override
 public void onShow(DialogInterface dialogInterface) {
 titleView.addTextChangedListener(new 
TitleTextWatcher(otherTitles, new TitleTextCallback() {
-@Override
-public void onMatchesExistingTitle(@NonNull String title) {
-
titleContainer.setError(context.getString(R.string.reading_list_title_exists, 
title));
-
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
-
+@Override public void onEntryMatchesExistingTitle(@NonNull 
String title) {
+
setError(context.getString(R.string.reading_list_title_exists, title));
 }
 
-@Override
-public void onDoesNotMatchExistingTitle() {
+@Override public void onEntryEmpty() {
+
setError(context.getString(R.string.reading_list_entry_empty));
+}
+
+@Override public void onEntryOk() {
 titleContainer.setError(null);
 
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(true);
 }
+
+private void setError(@NonNull String error) {
+titleContainer.setError(error);
+
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
+}
 }));
 
 titleView.setText(readingList.getTitle());
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index 1e8e3d5..394b474 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -381,6 +381,7 @@
   Menu item label for 

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: On this day: wrap individual endpoint responses in object

[BearND (Code Review)]

BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338288 )

Change subject: On this day: wrap individual endpoint responses in object
..

On this day: wrap individual endpoint responses in object

By wrapping the array response in an object with the same key as used
in the 'all' response we can later use the same Swagger spec schema for
every type of endpoint. The responses would be also more consistent
between all onthisday endpoints. I just wished we would have done the
same for the other endpoints used to comprise the aggregated feed.

Note: that this schema change would require a corresponding change to
be deployed in RB at the same time.

Change-Id: I69b39501af3604da178e41521efded23302f0634
---
M routes/on-this-day.js
M test/features/onthisday/on-this-day.js
2 files changed, 32 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/88/338288/1

diff --git a/routes/on-this-day.js b/routes/on-this-day.js
index a98f850..691bf03 100644
--- a/routes/on-this-day.js
+++ b/routes/on-this-day.js
@@ -242,69 +242,63 @@
  * Gets array of WMFEvent models of births found in a document
  * @param  {!Document} document  Document to examine
  * @param  {!String}   lang  String for project language code
- * @return {!Array}  Array of WMFEvent models of births
+ * @return {!Object} Object containing list of births
  */
 const birthsInDoc = (document, lang) => {
 const selector = languages[lang].dayPage.headingIds.births;
-return eventsForYearListElements(
-listElementsByHeadingID(document, selector),
-lang
-);
+return { births: 
eventsForYearListElements(listElementsByHeadingID(document, selector), lang) };
 };
 
 /**
  * Gets array of WMFEvent models of deaths found in a document
  * @param  {!Document} document  Document to examine
  * @param  {!String}   lang  String for project language code
- * @return {!Array}  Array of WMFEvent models of deaths
+ * @return {!Object} Object containing list of deaths
  */
 const deathsInDoc = (document, lang) => {
 const selector = languages[lang].dayPage.headingIds.deaths;
-return eventsForYearListElements(
-listElementsByHeadingID(document, selector),
-lang
-);
+return { deaths:
+eventsForYearListElements(listElementsByHeadingID(document, selector), 
lang)
+};
 };
 
 /**
  * Gets array of WMFEvent models of events found in a document
  * @param  {!Document} document  Document to examine
  * @param  {!String}   lang  String for project language code
- * @return {!Array}  Array of WMFEvent models of events
+ * @return {!Object} Object containing list of events
  */
 const eventsInDoc = (document, lang) => {
 const selector = languages[lang].dayPage.headingIds.events;
-return eventsForYearListElements(
-listElementsByHeadingID(document, selector),
-lang
-);
+return { events:
+eventsForYearListElements(listElementsByHeadingID(document, selector), 
lang)
+};
 };
 
 /**
  * Gets array of WMFEvent models of holidays and observances found in a 
document
  * @param  {!Document} document  Document to examine
  * @param  {!String}   lang  String for project language code
- * @return {!Array}  Array of WMFEvent models of holidays and 
observances
+ * @return {!Object} Object containing list of holidays and 
observances
  */
 const holidaysInDoc = (document, lang) => {
 const selector = languages[lang].dayPage.headingIds.holidays;
-return holidaysForHolidayListElements(
-listElementsByHeadingID(document, selector)
-);
+return { holidays:
+holidaysForHolidayListElements(listElementsByHeadingID(document, 
selector))
+};
 };
 
 /**
- * Gets array of WMFEvent models of editor curated selected events found in a 
document
+ * Gets array of WMFEvent models of editor curated selected anniversaries 
found in a document
  * @param  {!Document} document  Document to examine
  * @param  {!String}   lang  String for project language code
- * @return {!Array}  Array of WMFEvent models of selections
+ * @return {!Object} Object containing list of selected 
anniversaries
  */
 const selectionsInDoc = (document, lang) => {
 const selector = languages[lang].selectedPage.listElementSelector;
-return eventsForYearListElements(
-document.querySelectorAll(selector),
-lang
-);
+return { selected:
+eventsForYearListElements(document.querySelectorAll(selector), lang)
+};
 };
 
 /**
@@ -313,17 +307,19 @@
  * @param  {!Document} dayDocDocument of events on a given day
  * @param  {!Document} selectionsDoc Document of editor curated events for a 
given day
  * @param  {!String}   lang  String for project 

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: WIP: On this day: add swagger spec

[BearND (Code Review)]

BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338289 )

Change subject: WIP: On this day: add swagger spec
..

WIP: On this day: add swagger spec

Plus minor refactor of URI strings in test since they started getting
long.

Change-Id: Ie06a30afb5433b0068c00be86a4c5bf860a9d09b
---
M spec.yaml
M test/features/app/spec.js
2 files changed, 165 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/89/338289/1

diff --git a/spec.yaml b/spec.yaml
index 82b10af..81d591a 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -98,6 +98,119 @@
   caption_HTML: /.+/
   countries: [ /.+/ ]
 
+  # from routes/on-this-day.js
+  /{domain}/v1/feed/onthisday/{type}/{mm}/{dd}:
+get:
+  tags:
+- Feed
+  description: |
+Provides events that historically happened on the provided day and 
month.
+Supported types of events are:
+ - All: all of the following
+ - Selected: a list of a few selected anniversaries which happen on 
the provided day and month; often the entries are curated for the current year
+ - Births: a list of birthdays which happened on the provided day and 
month
+ - Deaths: a list of deaths which happened on the provided day and 
month
+ - Holidays: a list of fixed holidays celebrated on the provided day 
and month
+ - Events: a list of significant events which happened on the provided 
day and month and which are not covered by the other types yet
+  produces:
+- application/json
+  parameters:
+- name: type
+  in: path
+  description: "type of events"
+  type: string
+  required: true
+  enum:
+- all
+- selected
+- births
+- deaths
+- holidays
+- events
+- name: mm
+  in: path
+  description: "Month events are requested for, 0-padded"
+  type: string
+  required: true
+  minimum: "01"
+  maximum: "12"
+- name: dd
+  in: path
+  description: "Day of the month the most-read articles are requested 
for"
+  type: string
+  required: true
+  minimum: "01"
+  maximum: "31"
+  responses:
+'200':
+  description: Annual events listed on this wiki for the requested 
month and day
+  schema:
+$ref: '#/definitions/onthisdayResponse'
+'404':
+  description: No data found for the requested date
+  schema:
+$ref: '#/definitions/problem'
+'501':
+  description: Unsupported language
+  schema:
+$ref: '#/definitions/problem'
+default:
+  description: Error
+  schema:
+$ref: '#/definitions/problem'
+  x-amples:
+- title: retrieve all events on January 15
+  request:
+params:
+  type: "all"
+  mm: "01"
+  dd: "15"
+  response:
+status: 200
+headers:
+  content-type: application/json
+body:
+  selected:
+- text: /.+/
+  year: /.+/
+  pages:
+- $merge: [ /.+/ ]
+  events:
+- text: /.+/
+  year: /.+/
+  pages:
+- $merge: [ /.+/ ]
+  births:
+- text: /.+/
+  year: /.+/
+  pages:
+- $merge: [ /.+/ ]
+  deaths:
+- text: /.+/
+  year: /.+/
+  pages:
+- $merge: [ /.+/ ]
+  holidays:
+- text: /.+/
+  pages:
+- $merge: [ /.+/ ]
+- title: retrieve the selected anniversaries for January 15
+  request:
+params:
+  type: "selected"
+  mm: "01"
+  dd: "15"
+  response:
+status: 200
+headers:
+  content-type: application/json
+body:
+  selected:
+- text: /.+/
+  year: /.+/
+  pages:
+- $merge: [ /.+/ ]
+
   # from routes/featured.js
   /{domain}/v1/page/featured/{}/{mm}/{dd}:
 get:
@@ -659,6 +772,41 @@
   - date
   - articles
 
+  onthisdayList:
+type: array
+items:
+  type: object
+  properties:
+text:
+  type: string
+  description: Short description of the event
+pages:
+  type: array
+  description: List of pages related to the event
+  items:
+$ref: '#/definitions/article_summary_merge_link'
+

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Do not merge as is(Squash if needed)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338286 )

Change subject: Do not merge as is(Squash if needed)
..

Do not merge as is(Squash if needed)

If we don't care about time hidden before the page has been
rendered to the user, then there is no reason to do this. If a
user opens a link in a new tab and then tabs to it, first paint
will correspond to the time the tab was switched to.

The downside of this approach is that if first paint is not
available, in this same scenario, the time visible will be 0.
(see follow up)

Change-Id: I7aee7999e7331b9dd62c38b14e01987555c93973
---
M modules/ext.wikimediaEvents.readingDepth.js
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/86/338286/1

diff --git a/modules/ext.wikimediaEvents.readingDepth.js 
b/modules/ext.wikimediaEvents.readingDepth.js
index 3ee1f45..6783c02 100644
--- a/modules/ext.wikimediaEvents.readingDepth.js
+++ b/modules/ext.wikimediaEvents.readingDepth.js
@@ -144,11 +144,6 @@
}
 
if ( isEnabled() ) {
-   if ( document.hidden ) {
-   // If a new tab is open it may have started off as 
hidden
-   // so we record as hidden from the very start.
-   pausedAt = navStart;
-   }
$( window ).on( 'beforeunload', function () {
logEvent( 'pageUnloaded' );
} ).on( 'visibilitychange', function () {

-- 
To view, visit https://gerrit.wikimedia.org/r/338286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aee7999e7331b9dd62c38b14e01987555c93973
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Do not merge as is(Squash if needed)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338287 )

Change subject: Do not merge as is(Squash if needed)
..

Do not merge as is(Squash if needed)

If we don't like that downside, we can also have some special
casing for the case where DomInteractive is available but not
first paint.

Change-Id: I283e94991d4a435654630bf158af4813b0b2c783
---
M modules/ext.wikimediaEvents.readingDepth.js
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/87/338287/1

diff --git a/modules/ext.wikimediaEvents.readingDepth.js 
b/modules/ext.wikimediaEvents.readingDepth.js
index 6783c02..c0f4e95 100644
--- a/modules/ext.wikimediaEvents.readingDepth.js
+++ b/modules/ext.wikimediaEvents.readingDepth.js
@@ -96,6 +96,14 @@
// Since we record these separately it's clear which is 
being used.
data.totalLength = Math.round( now - from );
data.visibleLength = Math.round( now - from - msPaused 
);
+   } else {
+   if ( document.hidden && !fp ) {
+   // If a new tab is open domInteractive can
+   // occur before first paint, so we must track
+   // hidden state during this period to 
accurately capture
+   // visible time.
+   pausedAt = domInteractive;
+   }
}
mw.loader.using( 'schema.ReadingDepth' ).then( function () {
mw.eventLog.logEvent( 'ReadingDepth', data );

-- 
To view, visit https://gerrit.wikimedia.org/r/338287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I283e94991d4a435654630bf158af4813b0b2c783
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jenkins: support umask via service default

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337377 )

Change subject: jenkins: support umask via service default
..


jenkins: support umask via service default

We used to set the Jenkins process umask via a .daemonrc file. Upstream
has made the sysvinit and default file to support an UMASK parameter.

Drop /var/lib/jenkins/.daemonrc
Add a umask parameter to the default template
Set umask=0002 as the jenkins class default and explicitly set at the
role::ci::master level.

Also, make the service to depends on the default file.

Change-Id: Ic4a6240695ce7ae4d2f44d66fcfe2e4764da4c5e
---
M modules/jenkins/manifests/init.pp
M modules/jenkins/templates/etc/default/jenkins.sh.erb
M modules/role/manifests/ci/master.pp
3 files changed, 8 insertions(+), 14 deletions(-)

Approvals:
  Chad: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/jenkins/manifests/init.pp 
b/modules/jenkins/manifests/init.pp
index e393958..847d2c2 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -15,10 +15,14 @@
 # [*service_enable*]
 # Passed to Puppet Service['jenkins'] as 'enable'. Default: true.
 #
+# [*umask*]
+# Control permission bits of files created by Jenkins. Passed to 'daemon'.
+# Default: '0002'
 class jenkins(
 $prefix,
 $service_ensure  = 'running',
 $service_enable = true,
+$umask = '0002'
 )
 {
 user { 'jenkins':
@@ -53,18 +57,8 @@
 require => Package['openjdk-7-jre-headless'],
 }
 
-
-# Jenkins should write everything group writable so admins can interact 
with
-# files easily, hence we need it to run with umask 0002.
-# The Jenkins software is daemonized in the init script using
-# /usr/bin/daemon which reset the umask value.  Daemon accepts per user
-# configuration via the ~/.daemonrc, set the umask there.
 file { '/var/lib/jenkins/.daemonrc':
-ensure  => 'present',
-content => "jenkins umask=0002\n",
-owner   => 'jenkins',
-group   => 'jenkins',
-mode=> '0644',
+ensure  => 'absent',
 }
 
 # Workaround for a Jenkins security issue.
@@ -93,8 +87,7 @@
 ensure => $real_ensure,
 enable => $service_enable,
 hasrestart => true,
-# Better have umask properly set before starting
-require=> File['/var/lib/jenkins/.daemonrc'],
+require=> File['/etc/default/jenkins'],
 }
 
 # nagios monitoring
diff --git a/modules/jenkins/templates/etc/default/jenkins.sh.erb 
b/modules/jenkins/templates/etc/default/jenkins.sh.erb
index 78fcceb..e12ffd6 100644
--- a/modules/jenkins/templates/etc/default/jenkins.sh.erb
+++ b/modules/jenkins/templates/etc/default/jenkins.sh.erb
@@ -64,7 +64,7 @@
 #   If commented out, the value from the OS is inherited,  which is normally 
022 (as of Ubuntu 12.04,
 #   by default umask comes from pam_umask(8) and /etc/login.defs
 
-# UMASK=027
+UMASK=<%= @umask %>
 
 # port for HTTP connector (default 8080; disable with -1)
 HTTP_PORT=8080
diff --git a/modules/role/manifests/ci/master.pp 
b/modules/role/manifests/ci/master.pp
index c4e3bb1..8ccc511 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -26,6 +26,7 @@
 # Load the Jenkins module, that setup a Jenkins master
 class { '::jenkins':
 prefix => $jenkins_prefix,
+umask  => '0002',
 }
 class { '::contint::proxy_jenkins':
 prefix => $jenkins_prefix,

-- 
To view, visit https://gerrit.wikimedia.org/r/337377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4a6240695ce7ae4d2f44d66fcfe2e4764da4c5e
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: adjust wikimania regex for mobile hosts, cover 2002-2099

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337893 )

Change subject: adjust wikimania regex for mobile hosts, cover 2002-2099
..


adjust wikimania regex for mobile hosts, cover 2002-2099

This regex was for 2012-2015, missing Wikimania wikis both before
2012 and after 2017.

In I35f9f5d75583b0 we added missing 2005 and 2006.

Existing in DNS are 2005 thru 2018.

Adjust the regex to cover them all up to 2099.

Bug: T152882
Change-Id: Icc8c73ae36b50fe68a76969da0b38f30b4abf9cf
---
M modules/varnish/templates/text-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ema: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/varnish/templates/text-frontend.inc.vcl.erb 
b/modules/varnish/templates/text-frontend.inc.vcl.erb
index a4dbe55..c3580c1 100644
--- a/modules/varnish/templates/text-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/text-frontend.inc.vcl.erb
@@ -32,7 +32,7 @@
// write overlapping/chaining regexps.
set req.http.MobileHost = req.http.Host;
set req.http.MobileHost = regsub(req.http.MobileHost, 
"^(www\.)?(mediawiki|wikisource|wikidata)\.", "m.\2.");
-   set req.http.MobileHost = regsub(req.http.MobileHost, 
"^(commons|incubator|legalteam|meta|office|outreach|pl|species|strategy|wikimania201[2-5])\.wikimedia\.",
 "\1.m.wikimedia.");
+   set req.http.MobileHost = regsub(req.http.MobileHost, 
"^(commons|incubator|legalteam|meta|office|outreach|pl|species|strategy|wikimania20[0-9][0-9])\.wikimedia\.",
 "\1.m.wikimedia.");
set req.http.MobileHost = regsub(req.http.MobileHost, 
"^((?!commons|meta|nostalgia|quote|quality|sep11|sources|species|textbook|m\b)\w+)\.(wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage)\.",
 "\1.m.\2.");
 
if (req.http.Host != req.http.MobileHost) {

-- 
To view, visit https://gerrit.wikimedia.org/r/337893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc8c73ae36b50fe68a76969da0b38f30b4abf9cf
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...eventstreams[master]: Fix lint complaints, update to version 0.0.2, change default...

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338283 )

Change subject: Fix lint complaints, update to version 0.0.2, change default 
port to 8092
..


Fix lint complaints, update to version 0.0.2, change default port to 8092

Change-Id: I66e0ba0c6afe1e61d1aa59dd60c4d993e0714a66
---
M config.dev.yaml
M config.prod.yaml
M lib/eventstreams-util.js
M routes/v2.js
4 files changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/config.dev.yaml b/config.dev.yaml
index 24253e9..9c3c1e0 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -32,7 +32,7 @@
 # version: ^0.4.0
 # per-service config
 conf:
-  port: 8000
+  port: 8092
   # interface: localhost # uncomment to only listen on localhost
   # more per-service config settings
   # the location of the spec, defaults to spec.yaml if not specified
diff --git a/config.prod.yaml b/config.prod.yaml
index d5fcdbb..3d24fdb 100644
--- a/config.prod.yaml
+++ b/config.prod.yaml
@@ -30,7 +30,7 @@
 # version: ^0.4.0
 # per-service config
 conf:
-  port: 6947
+  port: 8092
   # interface: localhost # uncomment to only listen on localhost
   # more per-service config settings
   # the location of the spec, defaults to spec.yaml if not specified
diff --git a/lib/eventstreams-util.js b/lib/eventstreams-util.js
index 8cb8849..71e3535 100644
--- a/lib/eventstreams-util.js
+++ b/lib/eventstreams-util.js
@@ -164,8 +164,7 @@
 
 if (key in this.counters) {
 this.counters[key] += delta;
-}
-else {
+} else {
 this.counters[key] = delta;
 }
 }
diff --git a/routes/v2.js b/routes/v2.js
index 1a18709..2e410c7 100644
--- a/routes/v2.js
+++ b/routes/v2.js
@@ -54,7 +54,7 @@
 
 module.exports = function(appObj) {
 
-app = appObj
+app = appObj;
 
 // Per-worker metrics will be prefixed with hostname.worker_id
 const workerMetricPrefix = `${os.hostname()}.${app.conf.worker_id}`;
@@ -89,4 +89,3 @@
 router
 };
 };
-

-- 
To view, visit https://gerrit.wikimedia.org/r/338283
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I66e0ba0c6afe1e61d1aa59dd60c4d993e0714a66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...eventstreams[master]: [WIP] Serving Swagger UI spec docs at /doc

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338284 )

Change subject: [WIP] Serving Swagger UI spec docs at /doc
..

[WIP] Serving Swagger UI spec docs at /doc

This adds static/swagger-ui, copied from swagger-ui/dist and then
modified to work for EventStreams.

This also improves spec.yaml to render nice swagger ui details.

Bug: T158066
Change-Id: I4d3f3a0f27aaef17e4a456b9f3ac29a016f635a1
---
M app.js
M config.prod.yaml
M routes/v2.js
M spec.yaml
A static/swagger-ui/css/print.css
A static/swagger-ui/css/reset.css
A static/swagger-ui/css/screen.css
A static/swagger-ui/css/style.css
A static/swagger-ui/css/typography.css
A static/swagger-ui/fonts/DroidSans-Bold.ttf
A static/swagger-ui/fonts/DroidSans.ttf
A static/swagger-ui/images/collapse.gif
A static/swagger-ui/images/expand.gif
A static/swagger-ui/images/explorer_icons.png
A static/swagger-ui/images/favicon-16x16.png
A static/swagger-ui/images/favicon-32x32.png
A static/swagger-ui/images/favicon.ico
A static/swagger-ui/images/logo_small.png
A static/swagger-ui/images/pet_store_api.png
A static/swagger-ui/images/throbber.gif
A static/swagger-ui/images/wordnik_api.png
A static/swagger-ui/index.html
A static/swagger-ui/init-scripts/systemd.erb
A static/swagger-ui/init-scripts/sysvinit.erb
A static/swagger-ui/init-scripts/upstart.erb
A static/swagger-ui/lang/ca.js
A static/swagger-ui/lang/el.js
A static/swagger-ui/lang/en.js
A static/swagger-ui/lang/es.js
A static/swagger-ui/lang/fr.js
A static/swagger-ui/lang/geo.js
A static/swagger-ui/lang/it.js
A static/swagger-ui/lang/ja.js
A static/swagger-ui/lang/ko-kr.js
A static/swagger-ui/lang/pl.js
A static/swagger-ui/lang/pt.js
A static/swagger-ui/lang/ru.js
A static/swagger-ui/lang/tr.js
A static/swagger-ui/lang/translator.js
A static/swagger-ui/lang/zh-cn.js
A static/swagger-ui/lib/backbone-min.js
A static/swagger-ui/lib/es5-shim.js
A static/swagger-ui/lib/handlebars-4.0.5.js
A static/swagger-ui/lib/highlight.9.1.0.pack.js
A static/swagger-ui/lib/highlight.9.1.0.pack_extended.js
A static/swagger-ui/lib/jquery-1.8.0.min.js
A static/swagger-ui/lib/jquery.ba-bbq.min.js
A static/swagger-ui/lib/jquery.slideto.min.js
A static/swagger-ui/lib/jquery.wiggle.min.js
A static/swagger-ui/lib/js-yaml.min.js
A static/swagger-ui/lib/jsoneditor.min.js
A static/swagger-ui/lib/lodash.min.js
A static/swagger-ui/lib/marked.js
A static/swagger-ui/lib/object-assign-pollyfill.js
A static/swagger-ui/lib/sanitize-html.min.js
A static/swagger-ui/lib/swagger-oauth.js
A static/swagger-ui/o2c.html
A static/swagger-ui/swag.js
A static/swagger-ui/swagger-ui.js
A static/swagger-ui/swagger-ui.min.js
A static/wikimedia_logo.png
61 files changed, 26,655 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams 
refs/changes/84/338284/1


-- 
To view, visit https://gerrit.wikimedia.org/r/338284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d3f3a0f27aaef17e4a456b9f3ac29a016f635a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...eventstreams[master]: Fix lint complaints, update to version 0.0.2, change default...

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338283 )

Change subject: Fix lint complaints, update to version 0.0.2, change default 
port to 8092
..

Fix lint complaints, update to version 0.0.2, change default port to 8092

Change-Id: I66e0ba0c6afe1e61d1aa59dd60c4d993e0714a66
---
M config.dev.yaml
M config.prod.yaml
M lib/eventstreams-util.js
M routes/v2.js
4 files changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams 
refs/changes/83/338283/1

diff --git a/config.dev.yaml b/config.dev.yaml
index 24253e9..9c3c1e0 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -32,7 +32,7 @@
 # version: ^0.4.0
 # per-service config
 conf:
-  port: 8000
+  port: 8092
   # interface: localhost # uncomment to only listen on localhost
   # more per-service config settings
   # the location of the spec, defaults to spec.yaml if not specified
diff --git a/config.prod.yaml b/config.prod.yaml
index d5fcdbb..3d24fdb 100644
--- a/config.prod.yaml
+++ b/config.prod.yaml
@@ -30,7 +30,7 @@
 # version: ^0.4.0
 # per-service config
 conf:
-  port: 6947
+  port: 8092
   # interface: localhost # uncomment to only listen on localhost
   # more per-service config settings
   # the location of the spec, defaults to spec.yaml if not specified
diff --git a/lib/eventstreams-util.js b/lib/eventstreams-util.js
index 8cb8849..71e3535 100644
--- a/lib/eventstreams-util.js
+++ b/lib/eventstreams-util.js
@@ -164,8 +164,7 @@
 
 if (key in this.counters) {
 this.counters[key] += delta;
-}
-else {
+} else {
 this.counters[key] = delta;
 }
 }
diff --git a/routes/v2.js b/routes/v2.js
index 1a18709..2e410c7 100644
--- a/routes/v2.js
+++ b/routes/v2.js
@@ -54,7 +54,7 @@
 
 module.exports = function(appObj) {
 
-app = appObj
+app = appObj;
 
 // Per-worker metrics will be prefixed with hostname.worker_id
 const workerMetricPrefix = `${os.hostname()}.${app.conf.worker_id}`;
@@ -89,4 +89,3 @@
 router
 };
 };
-

-- 
To view, visit https://gerrit.wikimedia.org/r/338283
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66e0ba0c6afe1e61d1aa59dd60c4d993e0714a66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/eventstreams
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: write results from getlastpageid and getlastrevid to stdout, ...

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338280 )

Change subject: write results from getlastpageid and getlastrevid to stdout, 
not stderr
..

write results from getlastpageid and getlastrevid to stdout, not stderr

Change-Id: If04eace215ad0df25c3305395a2a386020d71ebd
---
M xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c
M xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/80/338280/1

diff --git a/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c 
b/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c
index 89ef61d..03b7325 100644
--- a/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c
+++ b/xmldumps-backup/mwbzutils/getlastpageidinbz2xml.c
@@ -290,7 +290,7 @@
   }
   if (!page_id) giveup(fin);
 
-  fprintf(stderr, "page_id:%d\n", page_id);
+  fprintf(stdout, "page_id:%d\n", page_id);
   close(fin);
   exit(0);
 }  
diff --git a/xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c 
b/xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c
index 187db21..e82ae5a 100644
--- a/xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c
+++ b/xmldumps-backup/mwbzutils/getlastrevidinbz2xml.c
@@ -284,7 +284,7 @@
   }
   if (!rev_id) giveup(fin);
 
-  fprintf(stderr, "rev_id:%d\n", rev_id);
+  fprintf(stdout, "rev_id:%d\n", rev_id);
   close(fin);
   exit(0);
 }  

-- 
To view, visit https://gerrit.wikimedia.org/r/338280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If04eace215ad0df25c3305395a2a386020d71ebd
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/mwbzutils
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: script to check whether page range of bz2 checkpoint file is...

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338282 )

Change subject: script to check whether page range of bz2 checkpoint file is 
correct
..

script to check whether page range of bz2 checkpoint file is correct

Checks the filename first and last pageid against the contents.

Change-Id: I8fb05f1632ddc0d87ed9fe39968eb55fcb4750f2
---
A xmldumps-backup/mwbzutils/check_bz2_pagerange.py
1 file changed, 226 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/82/338282/1

diff --git a/xmldumps-backup/mwbzutils/check_bz2_pagerange.py 
b/xmldumps-backup/mwbzutils/check_bz2_pagerange.py
new file mode 100644
index 000..426eaf9
--- /dev/null
+++ b/xmldumps-backup/mwbzutils/check_bz2_pagerange.py
@@ -0,0 +1,226 @@
+"""
+check that bz2 checkpoint content file has the pages
+in it that the filename says it does, by checking
+first and last pageid of actual content against
+those in the filename
+"""
+
+import os
+import sys
+import getopt
+import bz2
+from subprocess import Popen, PIPE
+import requests
+
+
+def usage(message=None):
+if message is not None:
+sys.stderr.write(message)
+sys.stderr.write("\n")
+usage_message = """
+Usage:  check_bz2_pagerange.py --wiki  --date  [--renames]
+
+Arguments:
+--wiki(-w):  name of wiki as it appears in dblists
+--date(-d):  date of dump run in MMDD format
+--renames (-r):  instead of regular output, generate commands for renames of 
bad files
+
+Example:
+  python check_bz2_pagerange.py -w enwiki -d 20170201
+"""
+sys.stderr.write(usage_message)
+sys.exit(1)
+
+
+def get_pageid_from_filename(path, which):
+basename = os.path.basename(path)
+
+# enwiki-20170201-pages-meta-history9.xml-p001888020p001938728.bz2
+pages = basename.split('-')[5]
+# p001888020p001938728.bz2
+last = pages.split('p')[which]
+# 001938728.bz2
+return last.split('.')[0].lstrip('0')
+
+
+def get_last_pageid_from_name(name):
+return get_pageid_from_filename(name, 2)
+
+
+def get_first_pageid_from_name(name):
+return get_pageid_from_filename(name, 1)
+
+
+def get_basename(path):
+filename = os.path.basename(path)
+# enwiki-20170201-pages-meta-history9.xml-p001888020p001938728.bz2
+fields = filename.split('-')
+return '-'.join(fields[0:5])
+
+
+def get_ext(path):
+# 
/blah/.../enwiki-20170201-pages-meta-history9.xml-p001888020p001938728.bz2
+return path.split('.')[-1]
+
+
+def assemble_name(basename, first_id, last_id, ext):
+# enwiki-20170201-pages-meta-history9.xml-p001888020p001938728.bz2
+return (basename + "-p{first}p{last}." + ext).format(first=first_id, 
last=last_id)
+
+
+def get_args():
+wikiname = None
+date = None
+renames = False
+
+try:
+(options, remainder) = getopt.gnu_getopt(
+sys.argv[1:], "w:d:rh",
+["wiki=", "date=", "renames", "help"])
+
+except getopt.GetoptError as err:
+usage("Unknown option specified: " + str(err))
+
+for (opt, val) in options:
+if opt in ["-w", "--wiki"]:
+wikiname = val
+elif opt in ["-d", "--date"]:
+date = val
+elif opt in ["-r", "--renames"]:
+renames = True
+elif opt in ["-h", "--help"]:
+usage('Help for this script\n')
+else:
+usage("Unknown option specified: <%s>" % opt)
+
+if remainder:
+usage("Unknown option specified: <%s>" % remainder[0])
+
+if not wikiname or not date:
+usage("One of the mandatory arguments 'wikiname' or 'date' was not 
specified")
+if not date.isdigit() and len(date) != 8:
+usage("Date argument must be of the form MMDD")
+
+return wikiname, date, renames
+
+
+def get_dumpdir(wikiname, date):
+# FIXME get this from config file
+return os.path.join("/mnt/data/xmldatadumps/public", wikiname, date)
+
+
+def get_bz2_content_files(wikiname, date):
+dumpdir = get_dumpdir(wikiname, date)
+files = os.listdir(dumpdir)
+return [os.path.join(dumpdir, filename) for filename in files if 
filename.endswith('.bz2')
+and 'meta-history' in filename]
+
+
+def get_last_revid_from_file(filename):
+# FIXME get this from config file too
+command = ["/usr/local/bin/getlastrevidinbz2xml", "-f", filename]
+proc = Popen(command, stdout=PIPE, stderr=PIPE)
+output, error = proc.communicate()
+if proc.returncode:
+sys.stderr.write("failed to get revid from filename %s\n" % filename)
+if error:
+sys.stderr.write(error)
+return None
+else:
+if not output.startswith("rev_id:"):
+# bad output line, who knows
+sys.stderr.write("failed to get revid from filename, got %s\n" % 
output)
+return None
+return output.strip().split(':')[1]
+
+
+def 

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: update .gitignore with the binaries for the new utilities

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338281 )

Change subject: update .gitignore with the binaries for the new utilities
..

update .gitignore with the binaries for the new utilities

Change-Id: Ie96449ddc3d65a3a2030810786935e4715b860be
---
M xmldumps-backup/mwbzutils/.gitignore
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/81/338281/1

diff --git a/xmldumps-backup/mwbzutils/.gitignore 
b/xmldumps-backup/mwbzutils/.gitignore
index 5535828..f75aa8f 100644
--- a/xmldumps-backup/mwbzutils/.gitignore
+++ b/xmldumps-backup/mwbzutils/.gitignore
@@ -6,3 +6,5 @@
 findpageidinbz2xml
 recompressxml
 writeuptopageid
+getlastpageidinbz2xml
+getlastrevidinbz2xml

-- 
To view, visit https://gerrit.wikimedia.org/r/338281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie96449ddc3d65a3a2030810786935e4715b860be
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/mwbzutils
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...wonderbolt[master]: Note about internally referred traffic being miscategorized

[Chelsyx (Code Review)]

Chelsyx has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338279 )

Change subject: Note about internally referred traffic being miscategorized
..

Note about internally referred traffic being miscategorized

Bug: T154722
Change-Id: I57c8878519efd943b476c28de3a50e2989c99307
---
M tab_documentation/traffic_summary.md
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wonderbolt 
refs/changes/79/338279/1

diff --git a/tab_documentation/traffic_summary.md 
b/tab_documentation/traffic_summary.md
index 5cf797d..b1b7cf6 100644
--- a/tab_documentation/traffic_summary.md
+++ b/tab_documentation/traffic_summary.md
@@ -12,6 +12,7 @@
 --
 - **A**: We switched to a finalized version of the UDF that extracts internal 
traffic (see [T130083](https://phabricator.wikimedia.org/T130083))
 - **B**: On 25 August 2016 we patched the UDF to also look for [Duck Duck 
Go](https://duckduckgo.com) when it processes referer data. That referreral 
data was deleted and backfilled from 26 June 2016. See 
[T143287](https://phabricator.wikimedia.org/T143287) for more details.
+- On 22 February 2016, a bug was introduced and some of the internally 
referred traffic are miscategorized as none. See 
[T148780](https://phabricator.wikimedia.org/T148780) and 
[T154722](https://phabricator.wikimedia.org/T154722) for more details.
 
 Questions, bug reports, and feature suggestions
 --

-- 
To view, visit https://gerrit.wikimedia.org/r/338279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57c8878519efd943b476c28de3a50e2989c99307
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wonderbolt
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update revert help dialog styling

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338278 )

Change subject: Update revert help dialog styling
..

Update revert help dialog styling

Bug: T150477
Change-Id: I832883b56c656cbdfcf484abc45903f2076a6f98
---
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
M app/src/main/res/layout/view_description_edit_revert_help.xml
M app/src/main/res/values/strings_no_translate.xml
3 files changed, 18 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/78/338278/1

diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
index 6095d92..beee04d 100644
--- 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
+++ 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditRevertHelpView.java
@@ -4,7 +4,11 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
+import android.text.style.BulletSpan;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -23,21 +27,23 @@
 init(qNumber);
 }
 
-private void init(@NonNull String qNumber) {
+@SuppressWarnings("checkstyle:magicnumber") private void init(@NonNull 
String qNumber) {
 inflate(getContext(), R.layout.view_description_edit_revert_help, 
this);
 ButterKnife.bind(this);
 helpText.setMovementMethod(new LinkMovementMethod());
 
-String helpStr = getString(R.string.description_edit_revert_help_body)
+Spanned helpStr = 
StringUtil.fromHtml(getString(R.string.description_edit_revert_help_body)
 .replaceAll(":revertSubtitle", 
getString(R.string.description_edit_revert_subtitle))
 .replaceAll(":revertIntro", 
getString(R.string.description_edit_revert_intro))
-.replaceAll(":revertReason1",
-
String.format(getString(R.string.description_edit_revert_reason1), 
getString(R.string.wikidata_description_guide_url)))
-.replaceAll(":revertReason2", 
getString(R.string.description_edit_revert_reason2))
 .replaceAll(":revertHistory",
-
String.format(getString(R.string.description_edit_revert_history), 
getHistoryUri(qNumber)));
+
String.format(getString(R.string.description_edit_revert_history), 
getHistoryUri(qNumber;
 
-helpText.setText(StringUtil.fromHtml(helpStr));
+SpannableString revertReason1 = new 
SpannableString(StringUtil.fromHtml(String.format(getString(R.string.description_edit_revert_reason1),
 getString(R.string.wikidata_description_guide_url;
+SpannableString revertReason2 = new 
SpannableString(StringUtil.fromHtml(getString(R.string.description_edit_revert_reason2)));
+revertReason1.setSpan(new BulletSpan(16), 0, revertReason1.length(), 
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+revertReason2.setSpan(new BulletSpan(16), 0, revertReason2.length(), 
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+SpannableString helpSpan = new 
SpannableString(TextUtils.expandTemplate(helpStr, revertReason1, 
revertReason2));
+helpText.setText(helpSpan);
 }
 
 private Uri getHistoryUri(@NonNull String qNumber) {
diff --git a/app/src/main/res/layout/view_description_edit_revert_help.xml 
b/app/src/main/res/layout/view_description_edit_revert_help.xml
index 2a5eb4d..d5054d1 100644
--- a/app/src/main/res/layout/view_description_edit_revert_help.xml
+++ b/app/src/main/res/layout/view_description_edit_revert_help.xml
@@ -10,8 +10,9 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 style="@style/RtlAwareTextView"
-android:layout_margin="20dp"
-android:lineSpacingMultiplier="1.2"
+android:layout_margin="24dp"
+android:textSize="16sp"
+android:lineSpacingMultiplier="1.25"
 tools:text="Lorem ipsum"/>
 
 
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_no_translate.xml 
b/app/src/main/res/values/strings_no_translate.xml
index c845987..0631aca 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -95,10 +95,10 @@
 :revertSubtitle
 :revertIntro
 
-• :revertReason1
+^1
 
 
-• :revertReason2
+^2
 
 :revertHistory
 ]]>

-- 
To view, visit https://gerrit.wikimedia.org/r/338278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Use dependency injection to get BankPaymentProvider

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338277 )

Change subject: Use dependency injection to get BankPaymentProvider
..

Use dependency injection to get BankPaymentProvider

This way we don't need to mock the low-level cURL response.
Unfortunately, we need to write a substitute class. Would it really
be so bad to use SmashPig's Configuration::object in DonationInterface
code?

Bug: T128692
Change-Id: I3b35350bf944207786e8bded33d04caf1f287dbf
---
M DonationInterface.class.php
M extension.json
M globalcollect_gateway/globalcollect.adapter.php
M tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
4 files changed, 40 insertions(+), 36 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/77/338277/1

diff --git a/DonationInterface.class.php b/DonationInterface.class.php
index 5ffe3ba..d6756c9 100644
--- a/DonationInterface.class.php
+++ b/DonationInterface.class.php
@@ -74,12 +74,21 @@
return true;
}
 
-   public static function getAdapterClassForGateway( $gateway ) {
+   public static function getAdapterClassForGateway( $gateway, 
$payment_method = null ) {
global $wgDonationInterfaceGatewayAdapters;
if ( !key_exists( $gateway, $wgDonationInterfaceGatewayAdapters 
) ) {
throw new OutOfRangeException( "No adapter configured 
for $gateway" );
}
-   return $wgDonationInterfaceGatewayAdapters[$gateway];
+   $entry = $wgDonationInterfaceGatewayAdapters[$gateway];
+   if ( !is_array( $entry ) ) {
+   return $entry;
+   }
+   if ( !key_exists( $payment_method, $entry ) ) {
+   throw new OutOfRangeException(
+   "$gateway has no payment provider for 
$payment_method configured"
+   );
+   }
+   return $entry[ $payment_method ];
}
 
/**
diff --git a/extension.json b/extension.json
index dc2b360..908c221 100644
--- a/extension.json
+++ b/extension.json
@@ -451,7 +451,10 @@
"adyen": "AdyenAdapter",
"astropay": "AstroPayAdapter",
"paypal_ec": "PaypalExpressAdapter",
-   "paypal": "PaypalLegacyAdapter"
+   "paypal": "PaypalLegacyAdapter",
+   "ingenico": {
+   "rtbt": 
"SmashPig\\PaymentProviders\\Ingenico\\BankPaymentProvider"
+   }
},
"DonationInterfaceAllowedHtmlForms": []
},
diff --git a/globalcollect_gateway/globalcollect.adapter.php 
b/globalcollect_gateway/globalcollect.adapter.php
index aadbedc..6ea54f6 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1759,7 +1759,11 @@
return;
}
try {
-   $provider = new BankPaymentProvider();
+   $providerClass = 
DonationInterface::getAdapterClassForGateway(
+   'ingenico',
+   'rtbt'
+   );
+   $provider = new $providerClass();
$banks = $provider->getBankList( $country, $currency );
$meta['issuers'] = $banks;
}
diff --git 
a/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php 
b/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
index 426999c..a0f8e73 100644
--- a/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/RealTimeBankTransferIdealTest.php
@@ -17,6 +17,7 @@
  */
 use SmashPig\Core\Configuration;
 use SmashPig\Core\Context;
+use SmashPig\PaymentProviders\Ingenico\BankPaymentProvider;
 
 /**
  * 
@@ -26,42 +27,17 @@
  * @group RealTimeBankTransfer
  */
 class DonationInterface_Adapter_GlobalCollect_RealTimeBankTransferIdealTest 
extends DonationInterfaceTestCase {
-   /**
-* @var PHPUnit_Framework_MockObject_MockObject
-*/
-   protected $cache;
-   protected $curlWrapper;
 
public function setUp() {
parent::setUp();
-
-   $config = Configuration::createForView( 'ingenico' );
-   Context::initWithLogger( $config ); // gets torn down in parent
-
-   $this->cache = new HashBagOStuff();
-   $cacheWrapper = new 
Addshore\Psr\Cache\MWBagOStuffAdapter\BagOStuffPsrCache( $this->cache );
-   $config->overrideObjectInstance( 'cache', $cacheWrapper );
-
-   // FIXME: This is all wrong - in this project we should be 
mocking the
-   // parsed API 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Register ContentHandlers in $wgContentHandlers.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335270 )

Change subject: Register ContentHandlers in $wgContentHandlers.
..


Register ContentHandlers in $wgContentHandlers.

Previously, Wikibase provided content handlers dynamically,
instead of registering them in the $wgContentHandlers global.
This caused these handlers to be unknown to ContentHandler::getContentModels().

Bug: T155139
Bug: T157604
Change-Id: I73ab3f156427abe206ded671c4a9145924a2c479
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
2 files changed, 16 insertions(+), 34 deletions(-)

Approvals:
  Smalyshev: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 34457d0..a44fc9f 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -62,34 +62,38 @@
}
 
/**
-* Handler for the SetupAfterCache hook, completing setup of
-* content and namespace setup.
-*
-* @note: $wgExtraNamespaces and $wgNamespaceAliases have already been 
processed at this point
-*and should no longer be touched.
+* Handler for the SetupAfterCache hook, completing the content and 
namespace setup.
+* This updates the $wgContentHandlers and $wgNamespaceContentModels 
registries
+* according to information provided by entity type definitions and the 
entityNamespaces
+* setting.
 *
 * @throws MWException
 * @return bool
 */
public static function onSetupAfterCache() {
global $wgNamespaceContentModels;
+   global $wgContentHandlers;
 
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
$namespaces = $wikibaseRepo->getEntityNamespaces();
 
-   if ( empty( $namespaces ) ) {
-   throw new MWException( 'Wikibase: Incomplete 
configuration: '
-   . '$wgWBRepoSettings[\'entityNamespaces\'] has 
to be set to an '
-   . 'array mapping entity types to namespace IDs. 
'
-   . 'See Wikibase.example.php for details and 
examples.' );
-   }
-
+   // Register entity namespaces.
+   // Note that $wgExtraNamespaces and $wgNamespaceAliases have 
already been processed at this
+   // point and should no longer be touched.
$contentModelIds = $wikibaseRepo->getContentModelMappings();
 
foreach ( $namespaces as $entityType => $namespace ) {
if ( !isset( $wgNamespaceContentModels[$namespace] ) ) {
$wgNamespaceContentModels[$namespace] = 
$contentModelIds[$entityType];
}
+   }
+
+   // Register callbacks for instantiating ContentHandlers for 
EntityContent.
+   foreach ( $contentModelIds as $entityType => $model ) {
+   $wgContentHandlers[$model] = function () use ( 
$wikibaseRepo, $entityType ) {
+   $entityContentFactory = 
$wikibaseRepo->getEntityContentFactory();
+   return 
$entityContentFactory->getContentHandlerForType( $entityType );
+   };
}
 
return true;
@@ -844,27 +848,6 @@
}
 
return true;
-   }
-
-   /**
-* Handler for the ContentHandlerForModelID hook, implemented to create 
EntityHandler
-* instances that have knowledge of the necessary services.
-*
-* @param string $modelId
-* @param ContentHandler|null $handler
-*
-* @return bool|null False on success to stop other 
ContentHandlerForModelID hooks from running,
-*  null on error.
-*/
-   public static function onContentHandlerForModelID( $modelId, &$handler 
) {
-   $wikibaseRepo = WikibaseRepo::getDefaultInstance();
-
-   try {
-   $handler = 
$wikibaseRepo->getEntityContentFactory()->getEntityHandlerForContentModel( 
$modelId );
-   return false;
-   } catch ( OutOfBoundsException $ex ) {
-   // no entity content model id
-   }
}
 
/**
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 50671c3..cdc2e16 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -647,7 +647,6 @@
$wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] = 
'Wikibase\RepoHooks::onSkinTemplateBuildNavUrlsNavUrlsAfterPermalink';
$wgHooks['SkinMinervaDefaultModules'][] = 
'Wikibase\RepoHooks::onSkinMinervaDefaultModules';
$wgHooks['ResourceLoaderRegisterModules'][] = 
'Wikibase\RepoHooks::onResourceLoaderRegisterModules';
-   $wgHooks['ContentHandlerForModelID'][] = 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Don't allow slug buttons to take focus

[Esanders (Code Review)]

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338275 )

Change subject: Don't allow slug buttons to take focus
..

Don't allow slug buttons to take focus

Bug: T158295
Change-Id: I80dee4134f39fc2e9416d570af20c920b9a0a209
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
M src/ce/ve.ce.BranchNode.js
A src/ui/widgets/ve.ui.NoFocusButtonWidget.js
M tests/index.html
6 files changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/75/338275/1

diff --git a/build/modules.json b/build/modules.json
index c6f2a81..dde28f9 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -529,6 +529,7 @@
"src/ui/widgets/ve.ui.ContextOptionWidget.js",
"src/ui/widgets/ve.ui.DimensionsWidget.js",
"src/ui/widgets/ve.ui.MediaSizeWidget.js",
+   "src/ui/widgets/ve.ui.NoFocusButtonWidget.js",

"src/ui/widgets/ve.ui.WhitespacePreservingTextInputWidget.js",
"src/ui/tools/ve.ui.AnnotationTool.js",
"src/ui/tools/ve.ui.ClearAnnotationTool.js",
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index 99a138e..93c78e1 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -467,6 +467,7 @@



+   



diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 547acd2..5c7cb1c 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -467,6 +467,7 @@



+   



diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
index 640431f..6e680e8 100644
--- a/src/ce/ve.ce.BranchNode.js
+++ b/src/ce/ve.ce.BranchNode.js
@@ -300,7 +300,7 @@
}
this.slugNodes[ i ] = slugNode;
if ( isBlock ) {
-   slugButton = new OO.ui.ButtonWidget( {
+   slugButton = new ve.ui.NoFocusButtonWidget( {
label: ve.msg( 'visualeditor-slug-insert' ),
icon: 'add',
framed: false
diff --git a/src/ui/widgets/ve.ui.NoFocusButtonWidget.js 
b/src/ui/widgets/ve.ui.NoFocusButtonWidget.js
new file mode 100644
index 000..46b7371
--- /dev/null
+++ b/src/ui/widgets/ve.ui.NoFocusButtonWidget.js
@@ -0,0 +1,11 @@
+/**
+ * Button widget that cancels mousedown events.
+ *
+ * TODO: Make cancelButtonMouseDownEvents an upstream param,
+ * instead of requiring inheritance.
+ */
+ve.ui.NoFocusButtonWidget = function NoFocusButtonWidget() {
+   ve.ui.NoFocusButtonWidget.super.apply( this, arguments );
+};
+OO.inheritClass( ve.ui.NoFocusButtonWidget, OO.ui.ButtonWidget );
+ve.ui.NoFocusButtonWidget.static.cancelButtonMouseDownEvents = true;
diff --git a/tests/index.html b/tests/index.html
index 0cab8eb..aa0956d 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -386,6 +386,7 @@



+   




-- 
To view, visit https://gerrit.wikimedia.org/r/338275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80dee4134f39fc2e9416d570af20c920b9a0a209
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: keeping trailing new line in proxy_jenkins

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338274 )

Change subject: contint: keeping trailing new line in proxy_jenkins
..


contint: keeping trailing new line in proxy_jenkins

Follow-up 5e4a58173a

Change-Id: Ife50983b95ba9430e8da272a4ccd218910dad929
---
M modules/contint/templates/apache/proxy_jenkins.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/contint/templates/apache/proxy_jenkins.erb 
b/modules/contint/templates/apache/proxy_jenkins.erb
index 34446eb..25594b8 100644
--- a/modules/contint/templates/apache/proxy_jenkins.erb
+++ b/modules/contint/templates/apache/proxy_jenkins.erb
@@ -4,8 +4,8 @@
 #
 # vim: filetype=apache
 
-ProxyPass   <%= @prefix -%> http://localhost:8080<%= @prefix -%>
-ProxyPassReverse<%= @prefix -%> http://localhost:8080<%= @prefix -%>
+ProxyPass   <%= @prefix -%> http://localhost:8080<%= @prefix %>
+ProxyPassReverse<%= @prefix -%> http://localhost:8080<%= @prefix %>
 ProxyRequests   Off
 
 # Local reverse proxy authorization override

-- 
To view, visit https://gerrit.wikimedia.org/r/338274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife50983b95ba9430e8da272a4ccd218910dad929
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: keeping trailing new line in proxy_jenkins

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338274 )

Change subject: contint: keeping trailing new line in proxy_jenkins
..

contint: keeping trailing new line in proxy_jenkins

Follow-up 5e4a58173a

Change-Id: Ife50983b95ba9430e8da272a4ccd218910dad929
---
M modules/contint/templates/apache/proxy_jenkins.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/338274/1

diff --git a/modules/contint/templates/apache/proxy_jenkins.erb 
b/modules/contint/templates/apache/proxy_jenkins.erb
index 34446eb..25594b8 100644
--- a/modules/contint/templates/apache/proxy_jenkins.erb
+++ b/modules/contint/templates/apache/proxy_jenkins.erb
@@ -4,8 +4,8 @@
 #
 # vim: filetype=apache
 
-ProxyPass   <%= @prefix -%> http://localhost:8080<%= @prefix -%>
-ProxyPassReverse<%= @prefix -%> http://localhost:8080<%= @prefix -%>
+ProxyPass   <%= @prefix -%> http://localhost:8080<%= @prefix %>
+ProxyPassReverse<%= @prefix -%> http://localhost:8080<%= @prefix %>
 ProxyRequests   Off
 
 # Local reverse proxy authorization override

-- 
To view, visit https://gerrit.wikimedia.org/r/338274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife50983b95ba9430e8da272a4ccd218910dad929
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Tabular data license CC0-1.0+ -> CC0-1.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338208 )

Change subject: Tabular data license CC0-1.0+ -> CC0-1.0
..


Tabular data license CC0-1.0+ -> CC0-1.0

Bug: T154075
Change-Id: Ida34592cec11e05fbc0f51c3fedae198799ceb16
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 83c3a20..d31b6f1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3129,7 +3129,7 @@
'nsName' => 'Data',
// page name must end in ".tab", and contain at least one symbol
'pattern' => '/.\.tab$/',
-   'license' => 'CC0-1.0+',
+   'license' => 'CC0-1.0',
'isLocal' => false,
];
if ( $wgDBname === 'commonswiki' ) {
@@ -3163,7 +3163,7 @@
'nsName' => 'Data',
// page name must end in ".map", and contain at least one symbol
'pattern' => '/.\.map$/',
-   'license' => 'CC0-1.0+',
+   'license' => 'CC0-1.0',
'isLocal' => false,
];
if ( $wgDBname === 'commonswiki' ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/338208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida34592cec11e05fbc0f51c3fedae198799ceb16
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move wpSummary from shared.css to mediawiki.action.edit.styl...

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338273 )

Change subject: Move wpSummary from shared.css to 
mediawiki.action.edit.styles.css
..

Move wpSummary from shared.css to mediawiki.action.edit.styles.css

Change-Id: I06ca700ffda9013a59b58b09ad56ada8694944a5
---
M resources/src/mediawiki.action/mediawiki.action.edit.styles.css
M resources/src/mediawiki.legacy/shared.css
2 files changed, 21 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/338273/1

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css 
b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
index 0ee4058..a782eac 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
@@ -25,10 +25,29 @@
font-size: 0.9em;
 }
 
-#wpSummary {
+input#wpSummary {
display: block;
margin-top: 0;
-   margin-bottom: 0.5em;
+   background-color: #fff;
+   color: #000;
+   width: 80%;
+   margin-bottom: 1em;
+   padding: 0.625em 0.546875em 0.546875em;
+   border: 1px solid #a2a9b1;
+   border-radius: 2px;
+   box-shadow: inset 0 0 0 1px #fff;
+   font-family: inherit;
+   font-size: inherit;
+   -webkit-transition: border-color 200ms cubic-bezier( 0.39, 0.575, 
0.565, 1 ), box-shadow 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 );
+   -moz-transition: border-color 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 
), box-shadow 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 );
+   transition: border-color 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 ), 
box-shadow 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 );
+}
+
+input#wpSummary:focus,
+input#wpSummary:active {
+   outline: 0;
+   border-color: #36c;
+   box-shadow: inset 0 0 0 1px #36c;
 }
 
 .editButtons input:first-child {
diff --git a/resources/src/mediawiki.legacy/shared.css 
b/resources/src/mediawiki.legacy/shared.css
index 7919dc4..f761aa0 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -184,29 +184,6 @@
white-space: nowrap;
 }
 
-input#wpSummary {
-   background-color: #fff;
-   color: #000;
-   width: 80%;
-   margin-bottom: 1em;
-   padding: 0.625em 0.546875em 0.546875em;
-   border: 1px solid #a2a9b1;
-   border-radius: 2px;
-   box-shadow: inset 0 0 0 1px #fff;
-   font-family: inherit;
-   font-size: inherit;
-   -webkit-transition: border-color 200ms cubic-bezier( 0.39, 0.575, 
0.565, 1 ), box-shadow 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 );
-   -moz-transition: border-color 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 
), box-shadow 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 );
-   transition: border-color 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 ), 
box-shadow 200ms cubic-bezier( 0.39, 0.575, 0.565, 1 );
-}
-
-input#wpSummary:focus,
-input#wpSummary:active {
-   outline: 0;
-   border-color: #36c;
-   box-shadow: inset 0 0 0 1px #36c;
-}
-
 .mw-input-with-label {
white-space: nowrap;
display: inline-block;

-- 
To view, visit https://gerrit.wikimedia.org/r/338273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06ca700ffda9013a59b58b09ad56ada8694944a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[wmf/1.29.0-wmf.12]: Remove the '+' in 'CC0-1.0+'

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338013 )

Change subject: Remove the '+' in 'CC0-1.0+'
..


Remove the '+' in 'CC0-1.0+'

It implies future versions of the CC0 license, which doesn't make sense.

Bug: T154075
Change-Id: I2b8edfcc4b02e90da71793aaf0eb9013e661d091
(cherry picked from commit a05c5aab4d4c916fd49bb5d27e41c688d411e1e2)
---
M extension.json
M i18n/ast.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/fr.json
M i18n/he.json
M i18n/it.json
M i18n/ko.json
M i18n/lb.json
M i18n/mk.json
M i18n/nb.json
M i18n/pl.json
M i18n/pt.json
M i18n/qqq.json
M i18n/roa-tara.json
M i18n/uk.json
M i18n/vi.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M includes/JCMapDataContentView.php
M includes/JCTabularContentView.php
M tests/phpunit/tabular-bad/bad-fields.json
M tests/phpunit/tabular-bad/bad-fields2.json
M tests/phpunit/tabular-bad/bad-header-symbol.json
M tests/phpunit/tabular-bad/bad-schema.json
M tests/phpunit/tabular-bad/bad-summary.json
M tests/phpunit/tabular-bad/bad-summary2.json
M tests/phpunit/tabular-bad/dup-field-name.json
M tests/phpunit/tabular-bad/extra-field.json
M tests/phpunit/tabular-bad/extra-schema.json
M tests/phpunit/tabular-bad/extra-top.json
M tests/phpunit/tabular-bad/no-field-name.json
M tests/phpunit/tabular-bad/no-field-type.json
M tests/phpunit/tabular-bad/no-fields.json
M tests/phpunit/tabular-bad/no-rows.json
M tests/phpunit/tabular-bad/no-schema.json
M tests/phpunit/tabular-bad/row-count-mismatch.json
M tests/phpunit/tabular-bad/row-vals-count.json
M tests/phpunit/tabular-bad/type-mismatch.json
M tests/phpunit/tabular-bad/unknown-type.json
M tests/phpunit/tabular-good/01.json
M tests/phpunit/tabular-good/02.json
M tests/phpunit/tabular-good/03.json
M tests/phpunit/tabular-good/04.json
M tests/phpunit/tabular-good/05.json
M tests/phpunit/tabular-good/06.json
M tests/phpunit/tabular-good/07.json
M tests/phpunit/tabular-good/08.json
49 files changed, 88 insertions(+), 88 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index b7cc0c0..3d39a68 100644
--- a/extension.json
+++ b/extension.json
@@ -161,7 +161,7 @@
"value": false
},
"JsonConfigAllowedLicenses": {
-   "value": [ "CC0-1.0+" ]
+   "value": [ "CC0-1.0" ]
},
"JsonConfigInterwikiPrefix": {
"value": "commons"
diff --git a/i18n/ast.json b/i18n/ast.json
index 7fc04e4..3b33ca7 100644
--- a/i18n/ast.json
+++ b/i18n/ast.json
@@ -36,9 +36,9 @@
"jsonconfig-type-name-number": "númberu",
"jsonconfig-type-name-boolean": "lóxicu",
"jsonconfig-license": "Datos disponibles so la $1.",
-   "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero v1.0 
Universal o versión posterior",
-   "jsonconfig-license-copyrightwarning-CC0-1.0+": "Al guardar los 
cambeos, aceutes les [https://wikimediafoundation.org/wiki/Terms_of_Use 
Condiciones d'Usu], y aceutes de forma irrefugable lliberar la to contribución 
al dominiu públicu baxo llicencia 
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
-   "jsonconfig-license-notice-CC0-1.0+": "'''Nota:''' al editar esta 
páxina, aceutes lliberar la to contribución baxo llicencia 
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
+   "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero v1.0 
Universal o versión posterior",
+   "jsonconfig-license-copyrightwarning-CC0-1.0": "Al guardar los cambeos, 
aceutes les [https://wikimediafoundation.org/wiki/Terms_of_Use Condiciones 
d'Usu], y aceutes de forma irrefugable lliberar la to contribución al dominiu 
públicu baxo llicencia [https://creativecommons.org/publicdomain/zero/1.0/ 
CC0].",
+   "jsonconfig-license-notice-CC0-1.0": "'''Nota:''' al editar esta 
páxina, aceutes lliberar la to contribución baxo llicencia 
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
"right-jsonconfig-flush": "Tresformar JsonConfig pela API",
"action-jsonconfig-flush": "remanar JsonConfig pela API",
"apihelp-jsonconfig-description": "Permite l'accesu direutu al 
subsistema JsonConfig.",
diff --git a/i18n/de.json b/i18n/de.json
index c4f5525..abe6bf3 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -36,9 +36,9 @@
"jsonconfig-type-name-number": "Zahl",
"jsonconfig-type-name-boolean": "boolesch",
"jsonconfig-license": "Die Daten sind verfügbar unter der Lizenz $1.",
-   "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero",
-   "jsonconfig-license-copyrightwarning-CC0-1.0+": "Mit dem Speichern von 
Änderungen stimmst du den [https://wikimediafoundation.org/wiki/Terms_of_Use/de 
Nutzungsbedingungen] und der unwiderruflichen Veröffentlichung deiner Beiträge 
unter der Gemeinfreiheit 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: FloatableElement: Support positioning relative to all edges

[Catrope (Code Review)]

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338272 )

Change subject: FloatableElement: Support positioning relative to all edges
..

FloatableElement: Support positioning relative to all edges

This supports positioning to the top, bottom, start and end edge
of the container, both on the inside and outside, as well as centering.
For backwards compatibility, vertical positioning defaults to 'below'
and horizontal positioning defaults to 'start'.

Change-Id: I5cf8133c119694c60bbb3045a96e1c1acb83
---
M demos/pages/widgets.js
M demos/styles/demo.css
M src/mixins/FloatableElement.js
3 files changed, 217 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/72/338272/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 883526f..c71f6c9 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -7,6 +7,7 @@
horizontalDragItems = [],
verticalDragItems = [],
verticalHandledDragItems = [],
+   floatableItems = [],
$demo = demo.$element;
 
/**
@@ -169,6 +170,68 @@
UnsupportedSelectFileWidget.static.isSupported = function () {
return false;
};
+
+   function FloatableWidget( config ) {
+   // Parent constructor
+   FloatableWidget.parent.call( this, config );
+   // Mixin constructor
+   OO.ui.mixin.FloatableElement.call( this, config );
+
+   this.toggle( false );
+
+   this.$element.append( $( '' ).text( loremIpsum ) );
+   }
+   OO.inheritClass( FloatableWidget, OO.ui.Widget );
+   OO.mixinClass( FloatableWidget, OO.ui.mixin.FloatableElement );
+
+   function FloatableContainer() {
+   // Parent constructor
+   FloatableContainer.parent.apply( this, arguments );
+
+   this.$element.append( $( '' ).text( loremIpsum ) );
+   this.$element.append( $( '' ).text( loremIpsum ) );
+   this.$element.append( $( '' ).text( loremIpsum ) );
+   this.$element.append( $( '' ).text( loremIpsum ) );
+   this.$element.append( $( '' ).text( loremIpsum ) );
+   }
+   OO.inheritClass( FloatableContainer, OO.ui.Widget );
+
+   function FloatableTestWidget( config ) {
+   var widget = this;
+
+   // Parent constructor
+   FloatableTestWidget.parent.call( this, config );
+
+   this.container = new FloatableContainer();
+   this.floatable = new FloatableWidget(
+   $.extend( { $floatableContainer: 
this.container.$element }, config )
+   );
+
+   this.container.$element.on( 'click', function () {
+   widget.floatable.toggle();
+   widget.floatable.togglePositioning();
+   } );
+
+   this.$element
+   .append( this.container.$element, 
this.floatable.$element )
+   .addClass( 'oo-ui-floatableTestWidget' );
+   }
+   OO.inheritClass( FloatableTestWidget, OO.ui.Widget );
+
+   [ 'below', 'above', 'top', 'bottom', 'center' ].forEach( function ( v ) 
{
+   [ 'before', 'after', 'start', 'end', 'center' ].forEach( 
function ( h ) {
+   floatableItems.push( new OO.ui.FieldLayout(
+   new FloatableTestWidget( {
+   verticalPosition: v,
+   horizontalPosition: h
+   } ),
+   {
+   label: 'FloatableElement: ' + v + '/' + 
h + '\u200E',
+   align: 'top'
+   }
+   ) );
+   } );
+   } );
 
capsulePopupWidget = new OO.ui.NumberInputWidget( {
isInteger: true
@@ -1730,6 +1793,10 @@
]
} ),
new OO.ui.FieldsetLayout( {
+   label: 'Floatable',
+   items: floatableItems
+   } ),
+   new OO.ui.FieldsetLayout( {
label: 'Other widgets',
items: [
new OO.ui.FieldLayout(
diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index d8bd637..c4d9be1 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -81,6 +81,20 @@
max-width: 10em;
 }
 
+.oo-ui-floatableTestWidget .oo-ui-widget {
+   border: 1px black solid;
+   padding: 0.5em;
+   box-sizing: border-box;
+   width: 70%;
+}
+
+.oo-ui-floatableTestWidget .oo-ui-floatableElement-floatable {
+   border-color: red;
+   background-color: #ccc;
+ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: jenkins: support variable prefix setting

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337307 )

Change subject: jenkins: support variable prefix setting
..


jenkins: support variable prefix setting

The Jenkins master is assumed to serve requests under /ci. To allow
multiple Jenkins to work in parallel, that needs to be adjustable. This
is done in two places:

* the default file for the jenkins service (jenkins puppet module)
* the Apache proxy configuration (contint puppet module)

== jenkins module ==

Make the Jenkins default file an erb template.  Make the web prefix a
parameter to the template.  $prefix is required for the class.

Update the only call of class to pass a prefix of '/ci'.
Change the JENKINS_ARGS to use the PREFIX variable for --prefix.
Must be a noop for Wikimedia production.

Remove modules/jenkins/README.md prone to be out of date, the class
inline documentation should be the reference and is online at:
https://doc.wikimedia.org/puppet/puppet_classes/jenkins.html

Drop some extra lines in rdoc documentation for nicer online rendering
of the class documentation.

== contint module ==

Make the Apache configuration snippet for Jenkins an erb template. Pass
the prefix as well.

Finally, pass /ci to the role::ci::master class.

Change-Id: I65a3535777e7593a9eb9a809b29a2da984863e0d
---
M modules/contint/manifests/proxy_jenkins.pp
R modules/contint/templates/apache/proxy_jenkins.erb
D modules/jenkins/README.md
M modules/jenkins/manifests/init.pp
R modules/jenkins/templates/etc/default/jenkins.sh.erb
M modules/role/manifests/ci/master.pp
6 files changed, 41 insertions(+), 27 deletions(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/contint/manifests/proxy_jenkins.pp 
b/modules/contint/manifests/proxy_jenkins.pp
index 798ee9d..e558e25 100644
--- a/modules/contint/manifests/proxy_jenkins.pp
+++ b/modules/contint/manifests/proxy_jenkins.pp
@@ -1,5 +1,13 @@
+# == Class contint::proxy_jenkins
+#
 # A http proxy in front of Jenkins
-class contint::proxy_jenkins {
+#
+# [*prefix*]
+# The HTTP path used to reach the Jenkins instance. Must have a leading slash.
+# Example: /ci
+class contint::proxy_jenkins (
+$prefix,
+) {
 
   include ::contint::proxy_common
 
@@ -13,10 +21,10 @@
 
   file {
 '/etc/apache2/jenkins_proxy':
-  owner  => 'root',
-  group  => 'root',
-  mode   => '0444',
-  source => 'puppet:///modules/contint/apache/proxy_jenkins',
+  owner   => 'root',
+  group   => 'root',
+  mode=> '0444',
+  content => template('contint/apache/proxy_jenkins.erb'),
   }
 
 }
diff --git a/modules/contint/files/apache/proxy_jenkins 
b/modules/contint/templates/apache/proxy_jenkins.erb
similarity index 75%
rename from modules/contint/files/apache/proxy_jenkins
rename to modules/contint/templates/apache/proxy_jenkins.erb
index 840c82a..34446eb 100644
--- a/modules/contint/files/apache/proxy_jenkins
+++ b/modules/contint/templates/apache/proxy_jenkins.erb
@@ -4,14 +4,14 @@
 #
 # vim: filetype=apache
 
-ProxyPass   /ci http://localhost:8080/ci
-ProxyPassReverse/ci http://localhost:8080/ci
+ProxyPass   <%= @prefix -%> http://localhost:8080<%= @prefix -%>
+ProxyPassReverse<%= @prefix -%> http://localhost:8080<%= @prefix -%>
 ProxyRequests   Off
 
 # Local reverse proxy authorization override
 # Most unix distribution deny proxy by default (ie 
/etc/apache2/mods-enabled/proxy.conf in Ubuntu)
 
-http://localhost:8080/ci*>
+http://localhost:8080<%= @prefix -%>*>
 
 # user agent blacklisting for Jenkins
 SetEnvIf User-Agent 80legs bad_browser
@@ -37,11 +37,11 @@
 Header set Cache-Control "no-cache,must-revalidate" env=NO_CACHE
 
 # Prevent access to certain URLs - T63964
-SetEnvIf Request_URI ^/ci/computer/.*/builds DENY_BUILDS_ACCESS
-SetEnvIf Request_URI ^/ci/user/.*/builds DENY_BUILDS_ACCESS
-SetEnvIf Request_URI ^/ci/view/.*/builds DENY_BUILDS_ACCESS
+SetEnvIf Request_URI ^<%= @prefix -%>/computer/.*/builds DENY_BUILDS_ACCESS
+SetEnvIf Request_URI ^<%= @prefix -%>/user/.*/builds DENY_BUILDS_ACCESS
+SetEnvIf Request_URI ^<%= @prefix -%>/view/.*/builds DENY_BUILDS_ACCESS
 # Blacklist RSS feeds entirely
-SetEnvIf Request_URI ^/ci/.*/rss(All|Failed|Latest) DENY_BUILDS_ACCESS
+SetEnvIf Request_URI ^<%= @prefix -%>/.*/rss(All|Failed|Latest) 
DENY_BUILDS_ACCESS
 Order deny,allow
 deny from env=DENY_BUILDS_ACCESS
 
diff --git a/modules/jenkins/README.md b/modules/jenkins/README.md
deleted file mode 100644
index 6c57b32..000
--- a/modules/jenkins/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Jenkins module
-==
-
-To install Jenkins:
-
- include 'jenkins'
-
diff --git a/modules/jenkins/manifests/init.pp 
b/modules/jenkins/manifests/init.pp

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Adding configuration for tool-quarrybot-enwiki

[Zppix (Code Review)]

Zppix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338265 )

Change subject: Adding configuration for tool-quarrybot-enwiki
..

Adding configuration for tool-quarrybot-enwiki

Task: T158355
Change-Id: Iefaffd1b05a6b65568cb3cc002738cff3d00fcc4
---
M gerrit-channels.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/65/338265/2

diff --git a/gerrit-channels.yaml b/gerrit-channels.yaml
index 368219a..7174c5a 100644
--- a/gerrit-channels.yaml
+++ b/gerrit-channels.yaml
@@ -213,3 +213,5 @@
 mediawiki/core:
 "##Zppix-Wikipedia":
  labs/tools/zppixbot:
+ labs/tools/quarrybot-enwiki:
+

-- 
To view, visit https://gerrit.wikimedia.org/r/338265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefaffd1b05a6b65568cb3cc002738cff3d00fcc4
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Zppix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Fix systemd phd.service file

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338163 )

Change subject: Phabricator: Fix systemd phd.service file
..


Phabricator: Fix systemd phd.service file

Currently trying to start the file results in a active (exit) error.

Changing from oneshoot to forking fixes the problem.

Also move user and group under Service instead of Unit, see
http://stackoverflow.com/questions/38220995/systemd-unknown-lvalue-user-in-section-unit

Change-Id: If782ef0747715c3f0922ca87c7a725d8801183d8
---
M modules/phabricator/files/systemd/phd.service
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/phabricator/files/systemd/phd.service 
b/modules/phabricator/files/systemd/phd.service
index b0cde30..d4140ae 100644
--- a/modules/phabricator/files/systemd/phd.service
+++ b/modules/phabricator/files/systemd/phd.service
@@ -1,12 +1,12 @@
 [Unit]
 Description=phabricator-phd
-After=syslog.target network.target
+After=syslog.target network.target mysql.service
 Before=apache2.service
-User=phd
-Group=phd
 
 [Service]
-Type=oneshot
+Type=forking
+User=phd
+Group=phd
 Environment="PHABRICATOR_ENV=phd"
 
 ExecStart=/srv/phab/phabricator/bin/phd start

-- 
To view, visit https://gerrit.wikimedia.org/r/338163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If782ef0747715c3f0922ca87c7a725d8801183d8
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Update config.default_edit_summary

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337874 )

Change subject: Update config.default_edit_summary
..


Update config.default_edit_summary

- update config.default_edit_summary from pywikibot __release__
  which is 3.0-dev right now.

Change-Id: I1f8f5457a246213e4624233b5d5dd5c44ec26178
---
M pywikibot/config2.py
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Mpaa: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 4af7d4a..90877ba 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -33,7 +33,7 @@
 """
 #
 # (C) Rob W.W. Hooft, 2003
-# (C) Pywikibot team, 2003-2016
+# (C) Pywikibot team, 2003-2017
 #
 # Distributed under the terms of the MIT license.
 #
@@ -227,7 +227,7 @@
 # edit summary to use if not supplied by bot script
 # WARNING: this should NEVER be used in practice, ALWAYS supply a more
 #  relevant summary for bot edits
-default_edit_summary = u'Pywikibot v.2'
+default_edit_summary = u'Pywikibot 3.0-dev'
 
 # What permissions to use to set private files to it
 # such as password file.

-- 
To view, visit https://gerrit.wikimedia.org/r/337874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f8f5457a246213e4624233b5d5dd5c44ec26178
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Problem when the language is different between the user lang...

[Karima Rafes (Code Review)]

Karima Rafes has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338243 )

Change subject: Problem when the language is different between the user 
language and the content of Wiki for the page RDFSave
..


Problem when the language is different between the user language and the 
content of Wiki for the page RDFSave

Change-Id: I54e0167943b9a001e039aea46e9f797f91d54cf6
---
M specialpages/SpecialRDFSave.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Karima Rafes: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/specialpages/SpecialRDFSave.php b/specialpages/SpecialRDFSave.php
index e878ecc..8b0fa7c 100644
--- a/specialpages/SpecialRDFSave.php
+++ b/specialpages/SpecialRDFSave.php
@@ -83,7 +83,7 @@
 {
 global $wgOut;
 
-$category = "RDF_page";
+$category = Title::newFromText(wfMessage( 
'linkedwiki-category-rdf-page' )->inContentLanguage()->parse() 
)->getDBKey();//"RDF_page";
 
 $dbr =wfGetDB(DB_SLAVE);
 $sql = "SELECT  p.page_id AS pid, p.page_title AS title, t.old_text as 
text FROM page p 

-- 
To view, visit https://gerrit.wikimedia.org/r/338243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I54e0167943b9a001e039aea46e9f797f91d54cf6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes 
Gerrit-Reviewer: Karima Rafes 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Problem when the language is different between the user lang...

[Karima Rafes (Code Review)]

Karima Rafes has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338243 )

Change subject: Problem when the language is different between the user 
language and the content of Wiki for the page RDFSave
..

Problem when the language is different between the user language and the 
content of Wiki for the page RDFSave

Change-Id: I54e0167943b9a001e039aea46e9f797f91d54cf6
---
M specialpages/SpecialRDFSave.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LinkedWiki 
refs/changes/43/338243/1

diff --git a/specialpages/SpecialRDFSave.php b/specialpages/SpecialRDFSave.php
index e878ecc..8b0fa7c 100644
--- a/specialpages/SpecialRDFSave.php
+++ b/specialpages/SpecialRDFSave.php
@@ -83,7 +83,7 @@
 {
 global $wgOut;
 
-$category = "RDF_page";
+$category = Title::newFromText(wfMessage( 
'linkedwiki-category-rdf-page' )->inContentLanguage()->parse() 
)->getDBKey();//"RDF_page";
 
 $dbr =wfGetDB(DB_SLAVE);
 $sql = "SELECT  p.page_id AS pid, p.page_title AS title, t.old_text as 
text FROM page p 

-- 
To view, visit https://gerrit.wikimedia.org/r/338243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54e0167943b9a001e039aea46e9f797f91d54cf6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Karima Rafes 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Refactor database_statistics.getStatistics

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331407 )

Change subject: Refactor database_statistics.getStatistics
..


Refactor database_statistics.getStatistics

- Extract method compute_percentage (with tests)
- Extract method build_query (with tests)
- Avoid code duplication by using a list of fields
  to gather statistics on, and iterate on it.

Change-Id: I7d045b9a1ef83d7fc8d7b6cecd49083b2eddab5c
---
M erfgoedbot/database_statistics.py
M tests/test_database_statistics.py
2 files changed, 79 insertions(+), 56 deletions(-)

Approvals:
  Lokal Profil: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/erfgoedbot/database_statistics.py 
b/erfgoedbot/database_statistics.py
index 323cf8e..bd3b694 100755
--- a/erfgoedbot/database_statistics.py
+++ b/erfgoedbot/database_statistics.py
@@ -214,38 +214,29 @@
 queries = {}
 result = {}
 
+fields = [
+('name', 'name'),
+('address', 'address'),
+('municipality', 'municipality'),
+('coordinates', ('lat', 'lon')),
+('image', 'image'),
+('commonscat', 'commonscat'),
+('article', 'monument_article'),
+('wikidata', 'wd_item'),
+('adm0', 'adm0'),
+('adm1', 'adm1'),
+('adm2', 'adm2'),
+('adm3', 'adm3'),
+('adm4', 'adm4'),
+]
+
+for (label, database_field) in fields:
+queries[label] = build_query(database_field)
+
 queries[
 'all'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' AND 
lang='%s'"""
 queries[
-'name'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (name='' OR name IS NULL)"""
-queries[
-'address'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (address='' OR address IS NULL)"""
-queries[
-'municipality'] = u"""SELECT COUNT(*) FROM monuments_all WHERE 
country='%s' AND lang='%s' AND NOT (municipality='' OR municipality IS NULL)"""
-queries[
-'coordinates'] = u"""SELECT COUNT(*) FROM monuments_all WHERE 
country='%s' AND lang='%s' AND NOT (lat=0 OR lat IS NULL) AND NOT (lon=0 OR lon 
IS NULL)"""
-queries[
-'image'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (image='' OR image IS NULL)"""
-queries[
-'commonscat'] = u"""SELECT COUNT(*) FROM monuments_all WHERE 
country='%s' AND lang='%s' AND NOT (commonscat='' OR commonscat IS NULL)"""
-queries[
-'article'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (monument_article='' OR monument_article IS NULL)"""
-queries[
-'wikidata'] = u"""SELECT COUNT(*) FROM monuments_all WHERE 
country='%s' AND lang='%s' AND NOT (wd_item='' OR wd_item IS NULL)"""
-
-queries[
 'adm0iso'] = u"""SELECT adm0 FROM monuments_all WHERE country='%s' AND 
lang='%s' AND NOT (adm0='' OR adm0 IS NULL) LIMIT 1"""
-queries[
-'adm0'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (adm0='' OR adm0 IS NULL)"""
-queries[
-'adm1'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (adm1='' OR adm1 IS NULL)"""
-queries[
-'adm2'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (adm2='' OR adm2 IS NULL)"""
-queries[
-'adm3'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (adm3='' OR adm3 IS NULL)"""
-queries[
-'adm4'] = u"""SELECT COUNT(*) FROM monuments_all WHERE country='%s' 
AND lang='%s' AND NOT (adm4='' OR adm4 IS NULL)"""
-
 queries[
 'source'] = u"""SELECT COUNT(DISTINCT(source)) FROM monuments_all 
WHERE country='%s' AND lang='%s'"""
 
@@ -253,40 +244,27 @@
 result['lang'] = language
 
 for (stat, query) in queries.items():
-# print query % (country, language)
 result[stat] = getCount(query % (country, language), cursor)
 
-result['namePercentage'] = round(
-1.0 * result['name'] / result['all'] * 100, 2)
-result['addressPercentage'] = round(
-1.0 * result['address'] / result['all'] * 100, 2)
-result['municipalityPercentage'] = round(
-1.0 * result['municipality'] / result['all'] * 100, 2)
-result['coordinatesPercentage'] = round(
-1.0 * result['coordinates'] / result['all'] * 100, 2)
-result['imagePercentage'] = round(
-1.0 * result['image'] / result['all'] * 100, 2)
-result['commonscatPercentage'] = round(
-1.0 * result['commonscat'] / result['all'] * 100, 2)
-result['articlePercentage'] = round(
-1.0 * result['article'] / result['all'] * 100, 2)
-result['wikidataPercentage'] = round(
-1.0 * result['wikidata'] / result['all'] * 100, 2)
-
-result['adm0Percentage'] = round(
-1.0 

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Revert "Revert "Use OOjs UI icons""

[Ladsgroup (Code Review)]

Hello Aaron Schulz, Esanders, Addshore, Florianschmidtwelzow, jenkins-bot, 
VolkerE, Jforrester, Jdlrobson, Jackmcbarn, Mvolz,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/338215

to review the following change.


Change subject: Revert "Revert "Use OOjs UI icons""
..

Revert "Revert "Use OOjs UI icons""

This reverts commit 7a7609bbaf443b4862e552ae5ddc40bc59aa0a1c.

Change-Id: I5fb1a6ec0d051ca2a6e4271e4f1115c5484a5130
---
M frontend/FlaggablePageView.php
M frontend/FlaggedRevsXML.php
M frontend/modules/ext.flaggedRevs.advanced.js
M frontend/modules/ext.flaggedRevs.basic.css
D frontend/modules/img/1.png
D frontend/modules/img/2.png
D frontend/modules/img/3.png
D frontend/modules/img/arrow-down.png
D frontend/modules/img/arrow-up.png
D frontend/modules/img/checkmark-green.png
D frontend/modules/img/checkmark-orange.png
D frontend/modules/img/doc-check.png
D frontend/modules/img/doc-magnify.png
M frontend/modules/img/license.txt
D frontend/modules/img/lock-closed.png
D frontend/modules/img/lock-open.png
16 files changed, 58 insertions(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/15/338215/1

diff --git a/frontend/FlaggablePageView.php b/frontend/FlaggablePageView.php
index 610fcaa..c7f268f 100644
--- a/frontend/FlaggablePageView.php
+++ b/frontend/FlaggablePageView.php
@@ -53,6 +53,15 @@
if ( $this->article == null ) {
throw new Exception( 'FlaggablePageView has no 
context article!' );
}
+   $this->getOutput()->enableOOUI();
+   $this->getOutput()->addModuleStyles(
+   [
+   'oojs-ui.styles.icons-moderation',
+   'oojs-ui.styles.icons-movement',
+   'oojs-ui.styles.icons-content',
+   'oojs-ui.styles.icons-alerts',
+   ]
+   );
$this->out = $this->getOutput(); // convenience
}
}
diff --git a/frontend/FlaggedRevsXML.php b/frontend/FlaggedRevsXML.php
index bad5196..71fb4db 100644
--- a/frontend/FlaggedRevsXML.php
+++ b/frontend/FlaggedRevsXML.php
@@ -4,14 +4,6 @@
  * Includes functions for selectors, icons, notices, CSS, and form aspects.
  */
 class FlaggedRevsXML {
-   /**
-* Get the URL path to where the client side resources are (JS, CSS, 
images..)
-* @return string
-*/
-   public static function styleUrlPath() {
-   global $wgExtensionAssetsPath;
-   return "$wgExtensionAssetsPath/FlaggedRevs/frontend/modules";
-   }
 
/**
 * Get a selector of reviewable namespaces
@@ -310,11 +302,14 @@
 * @return string
 */
public static function ratingArrow() {
-   $encPath = htmlspecialchars( self::styleUrlPath() . '/img' );
-   $img = 'escaped() . '" />';
-   return $img;
+   return ( new OOUI\IndicatorWidget(
+   [
+   'indicator' => 'down',
+   'classes' => [ 'fr-toggle-arrow' ],
+   'id' => 'mw-fr-revisiontoggle',
+   'title' => wfMessage( 'revreview-toggle-title' 
)->text(),
+   ]
+   ) )->toString();
}
 
/**
@@ -371,25 +366,33 @@
 * @return string
 */
public static function draftStatusIcon() {
-   $encPath = htmlspecialchars( self::styleUrlPath() . '/img' );
-   $encTitle = wfMessage( 'revreview-draft-title' )->escaped();
-   return "";
+   $encTitle = wfMessage( 'revreview-draft-title' )->text();
+   return ( new OOUI\IconWidget(
+   [
+   'icon' => 'block',
+   'classes' => [ 'flaggedrevs-icon' ],
+   'title' => $encTitle,
+   ]
+   ) )->toString();
}
-   
+
/**
 * Creates CSS stable page icon
 * @param bool $isQuality
 * @return string
 */
public static function stableStatusIcon( $isQuality ) {
-   $encPath = htmlspecialchars( self::styleUrlPath() . '/img' );
-   $file = $isQuality ? '3.png' : '2.png';
+   $icon = $isQuality ? 'check' : 'eye';
$encTitle = $isQuality
-   ? wfMessage( 'revreview-quality-title' )->escaped()
-   : wfMessage( 'revreview-basic-title' )->escaped();
-   return "";
+   ? wfMessage( 'revreview-quality-title' 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Tabular data license CC0-1.0+ -> CC0-1.0

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338208 )

Change subject: Tabular data license CC0-1.0+ -> CC0-1.0
..

Tabular data license CC0-1.0+ -> CC0-1.0

Bug: T154075
Change-Id: Ida34592cec11e05fbc0f51c3fedae198799ceb16
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/08/338208/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 83c3a20..d31b6f1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3129,7 +3129,7 @@
'nsName' => 'Data',
// page name must end in ".tab", and contain at least one symbol
'pattern' => '/.\.tab$/',
-   'license' => 'CC0-1.0+',
+   'license' => 'CC0-1.0',
'isLocal' => false,
];
if ( $wgDBname === 'commonswiki' ) {
@@ -3163,7 +3163,7 @@
'nsName' => 'Data',
// page name must end in ".map", and contain at least one symbol
'pattern' => '/.\.map$/',
-   'license' => 'CC0-1.0+',
+   'license' => 'CC0-1.0',
'isLocal' => false,
];
if ( $wgDBname === 'commonswiki' ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/338208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida34592cec11e05fbc0f51c3fedae198799ceb16
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: PopupWidget (and similar): Document why it is unwise to show...

[Code Review]

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338181 )

Change subject: PopupWidget (and similar): Document why it is unwise to show 
unattached widgets, and emit warnings
..

PopupWidget (and similar): Document why it is unwise to show unattached 
widgets, and emit warnings

This should help prevent future problems similar to T158141.

A deprecation warning is emitted once per widget. The ones in
ClippableElement and FloatableElement would be sufficient, but
PopupWidget and MenuSelectWidget have extra ones to avoid confusing
theirs users with the clippable/floatable internals.

In the future, the deprecation warnings should be changed to explicitly
throwing an exception. But since this may be happening in uncommon
code paths, we should probably keep them for a few releases.

Change-Id: I4153635b1d8853ca460a526cbfe63a98bd102235
---
M src/mixins/ClippableElement.js
M src/mixins/FloatableElement.js
M src/widgets/MenuSelectWidget.js
M src/widgets/PopupWidget.js
4 files changed, 40 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/81/338181/1

diff --git a/src/mixins/ClippableElement.js b/src/mixins/ClippableElement.js
index 2a716fe..ae07d1d 100644
--- a/src/mixins/ClippableElement.js
+++ b/src/mixins/ClippableElement.js
@@ -94,6 +94,11 @@
 OO.ui.mixin.ClippableElement.prototype.toggleClipping = function ( clipping ) {
clipping = clipping === undefined ? !this.clipping : !!clipping;
 
+   if ( clipping && !this.warnedUnattached && !this.isElementAttached() ) {
+   OO.ui.warnDeprecation( 'ClippableElement#toggleClipping: Before 
calling this method, the element must be attached to the DOM.' );
+   this.warnedUnattached = true;
+   }
+
if ( this.clipping !== clipping ) {
this.clipping = clipping;
if ( clipping ) {
diff --git a/src/mixins/FloatableElement.js b/src/mixins/FloatableElement.js
index f5e0c71..360bdab 100644
--- a/src/mixins/FloatableElement.js
+++ b/src/mixins/FloatableElement.js
@@ -85,6 +85,11 @@
 
positioning = positioning === undefined ? !this.positioning : 
!!positioning;
 
+   if ( positioning && !this.warnedUnattached && !this.isElementAttached() 
) {
+   OO.ui.warnDeprecation( 'FloatableElement#togglePositioning: 
Before calling this method, the element must be attached to the DOM.' );
+   this.warnedUnattached = true;
+   }
+
if ( this.positioning !== positioning ) {
this.positioning = positioning;
 
diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index b3d3a9c..615f29a 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -16,6 +16,8 @@
  * - Down-arrow key: highlight the next menu option
  * - Esc key: hide the menu
  *
+ * Unlike most widgets, MenuSelectWidget is initially hidden and must be shown 
by calling #toggle.
+ *
  * Please see the [OOjs UI documentation on MediaWiki][1] for more information.
  * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options
  *
@@ -256,6 +258,14 @@
 };
 
 /**
+ * Toggle visibility of the menu. The menu is initially hidden and must be 
shown by calling
+ * `.toggle( true )` after its #$element is attached to the DOM.
+ *
+ * Do not show the menu while it is not attached to the DOM. The calculations 
required to display
+ * it in the right place and with the right dimensions only work correctly 
while it is attached.
+ * Side-effects may include broken interface and exceptions being thrown. This 
wasn't always
+ * strictly enforced, so currently it only generates a warning in the browser 
console.
+ *
  * @inheritdoc
  */
 OO.ui.MenuSelectWidget.prototype.toggle = function ( visible ) {
@@ -264,6 +274,11 @@
visible = ( visible === undefined ? !this.visible : !!visible ) && 
!!this.items.length;
change = visible !== this.isVisible();
 
+   if ( visible && !this.warnedUnattached && !this.isElementAttached() ) {
+   OO.ui.warnDeprecation( 'MenuSelectWidget#toggle: Before calling 
this method, the menu must be attached to the DOM.' );
+   this.warnedUnattached = true;
+   }
+
// Parent method
OO.ui.MenuSelectWidget.parent.prototype.toggle.call( this, visible );
 
diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index 00ca1a2..d11961d 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -3,6 +3,8 @@
  * By default, each popup has an anchor that points toward its origin.
  * Please see the [OOjs UI documentation on Mediawiki] [1] for more 
information and examples.
  *
+ * Unlike most widgets, PopupWidget is initially hidden and must be shown by 
calling #toggle.
+ *
  * @example
  * // A popup widget.
  * var popup = new OO.ui.PopupWidget( {
@@ -244,6 +246,14 @@
 };

[MediaWiki-commits] [Gerrit] integration/config[master]: (WIP) Timed build from Zuul

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338179 )

Change subject: (WIP) Timed build from Zuul
..

(WIP) Timed build from Zuul

This is a faulty proof of concept to eventually exercise the whole CI
stack (Zuul, Jenkins, Nodepool, OpenStack).

Zuul has support for timed jobs that trigger at a recurring time. That
must be a new pipeline and it can accept only one timer.

This patch:

Add a pipeline 'dead-man-switch' that emits every five minutes an event
to all projects.
Create a dummy jenkins job that runs on a Nodepool Trusty instance.
Attach the timed pipeline and job to the dummy Gerrit project
test/gerrit-ping

What that would do is consume an instance every 5 minutes (or 288 per
days).

The idea is probably broken. If something is broken in the infra I dont
know whether jobs requests will just pill up over and over.
Zuul has no concept has a build timing out.

Bug: T158054
Change-Id: I548d7526633d6b9460b7e2f60d6119b91611e96b
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/79/338179/1

diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index fcb28d2..4a69fad 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -20,6 +20,13 @@
 git checkout $ZUUL_COMMIT
 echo "`date -R`> $ZUUL_COMMIT" >> /srv/jenkins-autodeploy
 
+- job-template:
+name: 'integration-infra-end-to-end'
+node: ci-trusty-wikimedia
+builders:
+# FIXME make it emit something to statsd?
+- shell: "/bin/true"
+
 # Pass integration/config.git:zuul/layout.yaml to zuul-server layout validation
 # Requires zuul to be installed on the Jenkins host.
 - job-template:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4f638a3..eefa689 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -635,6 +635,14 @@
- event: ref-updated
  ref: ^refs/tags/.*$
 
+  - name: dead-man-switch
+description: End to end test of the CI infrastructure
+manager: IndependentPipelineManager
+trigger:
+  timer:
+# Every 5 minutes
+- time: '*/5 * * * *'
+
 # Fine tune some jobs
 jobs:
 
@@ -1297,6 +1305,10 @@
 # Register the Gerrit project name, apply them pipelines that in turn trigger
 # a set of jobs.
 projects:
+  - name: test/gerrit-ping
+dead-man-switch:
+  - integration-infra-end-to-end
+
   - name: gerrit
 
   - name: integration/config

-- 
To view, visit https://gerrit.wikimedia.org/r/338179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I548d7526633d6b9460b7e2f60d6119b91611e96b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: upgrade to OkHttp 3.6.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335946 )

Change subject: Hygiene: upgrade to OkHttp 3.6.0
..


Hygiene: upgrade to OkHttp 3.6.0

https://github.com/square/okhttp/blob/master/CHANGELOG.md#version-342
https://github.com/square/okhttp/blob/master/CHANGELOG.md#version-350
https://github.com/square/okhttp/blob/master/CHANGELOG.md#version-360

Change-Id: Iaa079c122b6ec998c9680ec0ae80358c0d52ae7c
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified
  Mholloway: Looks good to me, but someone else must approve



diff --git a/app/build.gradle b/app/build.gradle
index 3e0cb9d..a2daa70 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -157,7 +157,7 @@
 // use http://gradleplease.appspot.com/ or http://search.maven.org/.
 // Debug with ./gradlew -q app:dependencies --configuration compile
 
-String okHttpVersion = '3.4.1'
+String okHttpVersion = '3.6.0'
 String retrofitVersion = '2.1.0'
 String supportVersion = '25.1.1'
 String espressoVersion = '2.2.2'

-- 
To view, visit https://gerrit.wikimedia.org/r/335946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa079c122b6ec998c9680ec0ae80358c0d52ae7c
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Sniedzielski 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SecureSessions[master]: Load existing alias file

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336077 )

Change subject: Load existing alias file
..


Load existing alias file

Add it to ExtensionMessagesFiles in extension.json

Change-Id: I62812c46d1560775ec1b73e3ff2e2e1c44355c7d
---
M SecureSessions.php
M extension.json
2 files changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SecureSessions.php b/SecureSessions.php
index c035ba8..f1d11fe 100644
--- a/SecureSessions.php
+++ b/SecureSessions.php
@@ -4,6 +4,7 @@
wfLoadExtension( 'SecureSessions' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
$wgMessagesDirs['SecureSessions'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['SecureSessionsAlias'] = __DIR__ . 
'/SpecialSessions.alias.php';
/*wfWarn(
'Deprecated PHP entry point used for SecureSessions extension. 
' .
'Please use wfLoadExtension instead, ' .
diff --git a/extension.json b/extension.json
index fb76b57..2ffaf36 100644
--- a/extension.json
+++ b/extension.json
@@ -16,6 +16,9 @@
"i18n"
]
},
+   "ExtensionMessagesFiles": {
+   "SecureSessionsAlias": "SpecialSessions.alias.php"
+   },
"AutoloadClasses": {
"SecureSessions": "SecureSessions.hooks.php",
"SpecialSessions": "SpecialSessions.php"

-- 
To view, visit https://gerrit.wikimedia.org/r/336077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I62812c46d1560775ec1b73e3ff2e2e1c44355c7d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SecureSessions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.29.0-wmf.12

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338168 )

Change subject: all wikis to 1.29.0-wmf.12
..


all wikis to 1.29.0-wmf.12

Change-Id: I6c037ab45f6b50e8de386878df4ffb144d068aa6
---
M wikiversions.json
1 file changed, 300 insertions(+), 300 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikiversions.json b/wikiversions.json
index 21e8337..bc461f3 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.11",
+"aawiki": "php-1.29.0-wmf.12",
 "aawikibooks": "php-1.29.0-wmf.12",
 "aawiktionary": "php-1.29.0-wmf.12",
-"abwiki": "php-1.29.0-wmf.11",
+"abwiki": "php-1.29.0-wmf.12",
 "abwiktionary": "php-1.29.0-wmf.12",
-"acewiki": "php-1.29.0-wmf.11",
+"acewiki": "php-1.29.0-wmf.12",
 "advisorywiki": "php-1.29.0-wmf.12",
-"adywiki": "php-1.29.0-wmf.11",
-"afwiki": "php-1.29.0-wmf.11",
+"adywiki": "php-1.29.0-wmf.12",
+"afwiki": "php-1.29.0-wmf.12",
 "afwikibooks": "php-1.29.0-wmf.12",
 "afwikiquote": "php-1.29.0-wmf.12",
 "afwiktionary": "php-1.29.0-wmf.12",
-"akwiki": "php-1.29.0-wmf.11",
+"akwiki": "php-1.29.0-wmf.12",
 "akwikibooks": "php-1.29.0-wmf.12",
 "akwiktionary": "php-1.29.0-wmf.12",
-"alswiki": "php-1.29.0-wmf.11",
+"alswiki": "php-1.29.0-wmf.12",
 "alswikibooks": "php-1.29.0-wmf.12",
 "alswikiquote": "php-1.29.0-wmf.12",
 "alswiktionary": "php-1.29.0-wmf.12",
-"amwiki": "php-1.29.0-wmf.11",
+"amwiki": "php-1.29.0-wmf.12",
 "amwikiquote": "php-1.29.0-wmf.12",
 "amwiktionary": "php-1.29.0-wmf.12",
-"angwiki": "php-1.29.0-wmf.11",
+"angwiki": "php-1.29.0-wmf.12",
 "angwikibooks": "php-1.29.0-wmf.12",
 "angwikiquote": "php-1.29.0-wmf.12",
 "angwikisource": "php-1.29.0-wmf.12",
 "angwiktionary": "php-1.29.0-wmf.12",
-"anwiki": "php-1.29.0-wmf.11",
+"anwiki": "php-1.29.0-wmf.12",
 "anwiktionary": "php-1.29.0-wmf.12",
-"arbcom_cswiki": "php-1.29.0-wmf.11",
-"arbcom_dewiki": "php-1.29.0-wmf.11",
-"arbcom_enwiki": "php-1.29.0-wmf.11",
-"arbcom_fiwiki": "php-1.29.0-wmf.11",
-"arbcom_nlwiki": "php-1.29.0-wmf.11",
-"arcwiki": "php-1.29.0-wmf.11",
-"arwiki": "php-1.29.0-wmf.11",
+"arbcom_cswiki": "php-1.29.0-wmf.12",
+"arbcom_dewiki": "php-1.29.0-wmf.12",
+"arbcom_enwiki": "php-1.29.0-wmf.12",
+"arbcom_fiwiki": "php-1.29.0-wmf.12",
+"arbcom_nlwiki": "php-1.29.0-wmf.12",
+"arcwiki": "php-1.29.0-wmf.12",
+"arwiki": "php-1.29.0-wmf.12",
 "arwikibooks": "php-1.29.0-wmf.12",
 "arwikimedia": "php-1.29.0-wmf.12",
 "arwikinews": "php-1.29.0-wmf.12",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.12",
 "arwikiversity": "php-1.29.0-wmf.12",
 "arwiktionary": "php-1.29.0-wmf.12",
-"arzwiki": "php-1.29.0-wmf.11",
-"astwiki": "php-1.29.0-wmf.11",
+"arzwiki": "php-1.29.0-wmf.12",
+"astwiki": "php-1.29.0-wmf.12",
 "astwikibooks": "php-1.29.0-wmf.12",
 "astwikiquote": "php-1.29.0-wmf.12",
 "astwiktionary": "php-1.29.0-wmf.12",
-"aswiki": "php-1.29.0-wmf.11",
+"aswiki": "php-1.29.0-wmf.12",
 "aswikibooks": "php-1.29.0-wmf.12",
 "aswikisource": "php-1.29.0-wmf.12",
 "aswiktionary": "php-1.29.0-wmf.12",
 "auditcomwiki": "php-1.29.0-wmf.12",
-"avwiki": "php-1.29.0-wmf.11",
+"avwiki": "php-1.29.0-wmf.12",
 "avwiktionary": "php-1.29.0-wmf.12",
-"aywiki": "php-1.29.0-wmf.11",
+"aywiki": "php-1.29.0-wmf.12",
 "aywikibooks": "php-1.29.0-wmf.12",
 "aywiktionary": "php-1.29.0-wmf.12",
-"azbwiki": "php-1.29.0-wmf.11",
-"azwiki": "php-1.29.0-wmf.11",
+"azbwiki": "php-1.29.0-wmf.12",
+"azwiki": "php-1.29.0-wmf.12",
 "azwikibooks": "php-1.29.0-wmf.12",
 "azwikiquote": "php-1.29.0-wmf.12",
 "azwikisource": "php-1.29.0-wmf.12",
 "azwiktionary": "php-1.29.0-wmf.12",
-"barwiki": "php-1.29.0-wmf.11",
-"bat_smgwiki": "php-1.29.0-wmf.11",
-"bawiki": "php-1.29.0-wmf.11",
+"barwiki": "php-1.29.0-wmf.12",
+"bat_smgwiki": "php-1.29.0-wmf.12",
+"bawiki": "php-1.29.0-wmf.12",
 "bawikibooks": "php-1.29.0-wmf.12",
-"bclwiki": "php-1.29.0-wmf.11",
+"bclwiki": "php-1.29.0-wmf.12",
 "bdwikimedia": "php-1.29.0-wmf.12",
-"be_x_oldwiki": "php-1.29.0-wmf.11",
+"be_x_oldwiki": "php-1.29.0-wmf.12",
 "betawikiversity": "php-1.29.0-wmf.12",
-"bewiki": "php-1.29.0-wmf.11",
+"bewiki": "php-1.29.0-wmf.12",
 "bewikibooks": "php-1.29.0-wmf.12",
 "bewikimedia": "php-1.29.0-wmf.12",
 "bewikiquote": "php-1.29.0-wmf.12",
 "bewikisource": "php-1.29.0-wmf.12",
 "bewiktionary": "php-1.29.0-wmf.12",
-"bgwiki": "php-1.29.0-wmf.11",
+"bgwiki": "php-1.29.0-wmf.12",
 "bgwikibooks": "php-1.29.0-wmf.12",
 "bgwikinews": 

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Switch file store/delete operations to batch operations

[Reedy (Code Review)]

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338169 )

Change subject: Switch file store/delete operations to batch operations
..

Switch file store/delete operations to batch operations

Bug: T157738
Change-Id: Ief109d78788fc9f6346e08661b973d65a035cafe
---
M maintenance/GenerateFancyCaptchas.php
1 file changed, 51 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/69/338169/1

diff --git a/maintenance/GenerateFancyCaptchas.php 
b/maintenance/GenerateFancyCaptchas.php
index 4811692..1cc5244 100644
--- a/maintenance/GenerateFancyCaptchas.php
+++ b/maintenance/GenerateFancyCaptchas.php
@@ -126,15 +126,15 @@
)
);
 
-   $originalFiles = [];
+   $filesToDelete = [];
if ( $deleteOldCaptchas ) {
-   $this->output( "Getting a list of old 
captchas..." );
-   foreach (
-   $backend->getFileList(
-   [ 'dir' => 
$backend->getRootStoragePath() . '/captcha-render' ]
-   ) as $file
-   ) {
-   $originalFiles[] = $file;
+   $this->output( "Getting a list of old captchas 
to delete..." );
+   $path = $backend->getRootStoragePath() . 
'/captcha-render';
+   foreach ( $backend->getFileList( [ 'dir' => 
$path ] ) as $file ) {
+   $filesToDelete[] = [
+   'op' => 'delete',
+   'src' => $path . '/' . $file,
+   ];
}
$this->output( " Done.\n" );
}
@@ -151,6 +151,10 @@
);
 
$captchasGenerated = iterator_count( $iter );
+   $filesToStore = [];
+   /**
+* @var $fileInfo SplFileInfo
+*/
foreach ( $iter as $fileInfo ) {
if ( !$fileInfo->isFile() ) {
continue;
@@ -158,41 +162,53 @@
list( $salt, $hash ) = 
$instance->hashFromImageName( $fileInfo->getBasename() );
$dest = $instance->imagePath( $salt, $hash );
$backend->prepare( [ 'dir' => dirname( $dest ) 
] );
-   $status = $backend->quickStore( [
+   $filesToStore[] = [
+   'op' => 'store',
'src' => $fileInfo->getPathname(),
-   'dst' => $dest
-   ] );
-   if ( !$status->isOK() ) {
-   $this->error( "Could not save file 
'{$fileInfo->getPathname()}'.\n" );
-   }
+   'dst' => $dest,
+   ];
}
+
+   $ret = $backend->doQuickOperations( $filesToStore );
+
$storeTime += microtime( true );
-   $this->output( " Done.\n" );
 
-   $this->output(
-   sprintf(
-   "\nCopied %d captchas to storage in 
%.1f seconds\n",
-   $captchasGenerated,
-   $storeTime
-   )
-   );
-
-   if ( $deleteOldCaptchas ) {
-   $numOriginalFiles = count( $originalFiles );
-   $this->output( "Deleting {$numOriginalFiles} 
old captchas...\n" );
-   $deleteTime = -microtime( true );
-   foreach ( $originalFiles as $file ) {
-   $backend->quickDelete( [ 'src' => $file 
] );
-   }
-   $deleteTime += microtime( true );
-   $this->output( "Done.\n" );
+   if ( $ret->isOK() ) {
+   $this->output( " Done.\n" );
$this->output(
sprintf(
-   "\nDeleted %d old captchas in 
%.1f seconds\n",
- 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: all wikis to 1.29.0-wmf.12

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338168 )

Change subject: all wikis to 1.29.0-wmf.12
..

all wikis to 1.29.0-wmf.12

Change-Id: I6c037ab45f6b50e8de386878df4ffb144d068aa6
---
M wikiversions.json
1 file changed, 300 insertions(+), 300 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/68/338168/1

diff --git a/wikiversions.json b/wikiversions.json
index 21e8337..bc461f3 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,40 +1,40 @@
 {
-"aawiki": "php-1.29.0-wmf.11",
+"aawiki": "php-1.29.0-wmf.12",
 "aawikibooks": "php-1.29.0-wmf.12",
 "aawiktionary": "php-1.29.0-wmf.12",
-"abwiki": "php-1.29.0-wmf.11",
+"abwiki": "php-1.29.0-wmf.12",
 "abwiktionary": "php-1.29.0-wmf.12",
-"acewiki": "php-1.29.0-wmf.11",
+"acewiki": "php-1.29.0-wmf.12",
 "advisorywiki": "php-1.29.0-wmf.12",
-"adywiki": "php-1.29.0-wmf.11",
-"afwiki": "php-1.29.0-wmf.11",
+"adywiki": "php-1.29.0-wmf.12",
+"afwiki": "php-1.29.0-wmf.12",
 "afwikibooks": "php-1.29.0-wmf.12",
 "afwikiquote": "php-1.29.0-wmf.12",
 "afwiktionary": "php-1.29.0-wmf.12",
-"akwiki": "php-1.29.0-wmf.11",
+"akwiki": "php-1.29.0-wmf.12",
 "akwikibooks": "php-1.29.0-wmf.12",
 "akwiktionary": "php-1.29.0-wmf.12",
-"alswiki": "php-1.29.0-wmf.11",
+"alswiki": "php-1.29.0-wmf.12",
 "alswikibooks": "php-1.29.0-wmf.12",
 "alswikiquote": "php-1.29.0-wmf.12",
 "alswiktionary": "php-1.29.0-wmf.12",
-"amwiki": "php-1.29.0-wmf.11",
+"amwiki": "php-1.29.0-wmf.12",
 "amwikiquote": "php-1.29.0-wmf.12",
 "amwiktionary": "php-1.29.0-wmf.12",
-"angwiki": "php-1.29.0-wmf.11",
+"angwiki": "php-1.29.0-wmf.12",
 "angwikibooks": "php-1.29.0-wmf.12",
 "angwikiquote": "php-1.29.0-wmf.12",
 "angwikisource": "php-1.29.0-wmf.12",
 "angwiktionary": "php-1.29.0-wmf.12",
-"anwiki": "php-1.29.0-wmf.11",
+"anwiki": "php-1.29.0-wmf.12",
 "anwiktionary": "php-1.29.0-wmf.12",
-"arbcom_cswiki": "php-1.29.0-wmf.11",
-"arbcom_dewiki": "php-1.29.0-wmf.11",
-"arbcom_enwiki": "php-1.29.0-wmf.11",
-"arbcom_fiwiki": "php-1.29.0-wmf.11",
-"arbcom_nlwiki": "php-1.29.0-wmf.11",
-"arcwiki": "php-1.29.0-wmf.11",
-"arwiki": "php-1.29.0-wmf.11",
+"arbcom_cswiki": "php-1.29.0-wmf.12",
+"arbcom_dewiki": "php-1.29.0-wmf.12",
+"arbcom_enwiki": "php-1.29.0-wmf.12",
+"arbcom_fiwiki": "php-1.29.0-wmf.12",
+"arbcom_nlwiki": "php-1.29.0-wmf.12",
+"arcwiki": "php-1.29.0-wmf.12",
+"arwiki": "php-1.29.0-wmf.12",
 "arwikibooks": "php-1.29.0-wmf.12",
 "arwikimedia": "php-1.29.0-wmf.12",
 "arwikinews": "php-1.29.0-wmf.12",
@@ -42,80 +42,80 @@
 "arwikisource": "php-1.29.0-wmf.12",
 "arwikiversity": "php-1.29.0-wmf.12",
 "arwiktionary": "php-1.29.0-wmf.12",
-"arzwiki": "php-1.29.0-wmf.11",
-"astwiki": "php-1.29.0-wmf.11",
+"arzwiki": "php-1.29.0-wmf.12",
+"astwiki": "php-1.29.0-wmf.12",
 "astwikibooks": "php-1.29.0-wmf.12",
 "astwikiquote": "php-1.29.0-wmf.12",
 "astwiktionary": "php-1.29.0-wmf.12",
-"aswiki": "php-1.29.0-wmf.11",
+"aswiki": "php-1.29.0-wmf.12",
 "aswikibooks": "php-1.29.0-wmf.12",
 "aswikisource": "php-1.29.0-wmf.12",
 "aswiktionary": "php-1.29.0-wmf.12",
 "auditcomwiki": "php-1.29.0-wmf.12",
-"avwiki": "php-1.29.0-wmf.11",
+"avwiki": "php-1.29.0-wmf.12",
 "avwiktionary": "php-1.29.0-wmf.12",
-"aywiki": "php-1.29.0-wmf.11",
+"aywiki": "php-1.29.0-wmf.12",
 "aywikibooks": "php-1.29.0-wmf.12",
 "aywiktionary": "php-1.29.0-wmf.12",
-"azbwiki": "php-1.29.0-wmf.11",
-"azwiki": "php-1.29.0-wmf.11",
+"azbwiki": "php-1.29.0-wmf.12",
+"azwiki": "php-1.29.0-wmf.12",
 "azwikibooks": "php-1.29.0-wmf.12",
 "azwikiquote": "php-1.29.0-wmf.12",
 "azwikisource": "php-1.29.0-wmf.12",
 "azwiktionary": "php-1.29.0-wmf.12",
-"barwiki": "php-1.29.0-wmf.11",
-"bat_smgwiki": "php-1.29.0-wmf.11",
-"bawiki": "php-1.29.0-wmf.11",
+"barwiki": "php-1.29.0-wmf.12",
+"bat_smgwiki": "php-1.29.0-wmf.12",
+"bawiki": "php-1.29.0-wmf.12",
 "bawikibooks": "php-1.29.0-wmf.12",
-"bclwiki": "php-1.29.0-wmf.11",
+"bclwiki": "php-1.29.0-wmf.12",
 "bdwikimedia": "php-1.29.0-wmf.12",
-"be_x_oldwiki": "php-1.29.0-wmf.11",
+"be_x_oldwiki": "php-1.29.0-wmf.12",
 "betawikiversity": "php-1.29.0-wmf.12",
-"bewiki": "php-1.29.0-wmf.11",
+"bewiki": "php-1.29.0-wmf.12",
 "bewikibooks": "php-1.29.0-wmf.12",
 "bewikimedia": "php-1.29.0-wmf.12",
 "bewikiquote": "php-1.29.0-wmf.12",
 "bewikisource": "php-1.29.0-wmf.12",
 "bewiktionary": "php-1.29.0-wmf.12",
-"bgwiki": "php-1.29.0-wmf.11",
+"bgwiki": "php-1.29.0-wmf.12",
 "bgwikibooks": "php-1.29.0-wmf.12",
 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (979e9fe0e)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338167 )

Change subject: Update VE core submodule to master (979e9fe0e)
..

Update VE core submodule to master (979e9fe0e)

New changes:
f27169f68 Localisation updates from https://translatewiki.net.
edd78cf50 Increase margin on DiffElement
d723ce56a DiffElement: Use important background colours to force override
b71ee15b5 demo: Use windowAction to open diff dialog
de88ca28b Move standalone diff dialog into separate module

Change-Id: Ic67bed00c100acf9a24cc0f5b984a64c14357fa4
---
M .jsduck/eg-iframe.html
M lib/ve
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/67/338167/1

diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 77279a9..908ff63 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -479,9 +479,11 @@



-   

 
+   
+   
+


 
diff --git a/lib/ve b/lib/ve
index ac6db50..979e9fe 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit ac6db50cad8e3b47d0f52ef0e4073674d087cfc9
+Subproject commit 979e9fe0ed74d7a76417ef90a478cb69a4c80e54

-- 
To view, visit https://gerrit.wikimedia.org/r/338167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic67bed00c100acf9a24cc0f5b984a64c14357fa4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuSelectWidget: Add config option to not close on choose

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337512 )

Change subject: MenuSelectWidget: Add config option to not close on choose
..


MenuSelectWidget: Add config option to not close on choose

Change-Id: I37314afe57cbdc7bd92c4a33ee98788ddab97b24
---
M demos/pages/widgets.js
M src/widgets/MenuSelectWidget.js
2 files changed, 36 insertions(+), 2 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 883526f..4b289ad 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1314,6 +1314,36 @@
}
),
new OO.ui.FieldLayout(
+   new OO.ui.DropdownWidget( {
+   label: 'Select one',
+   menu: {
+   items: [
+   new 
OO.ui.MenuOptionWidget( {
+   data: 
'a',
+   label: 
'First'
+   } ),
+   new 
OO.ui.MenuOptionWidget( {
+   data: 
'b',
+   label: 
'Second'
+   } ),
+   new 
OO.ui.MenuOptionWidget( {
+   data: 
'c',
+   label: 
'Third'
+   } ),
+   new 
OO.ui.MenuOptionWidget( {
+   data: 
'd',
+   label: 
'Fourth'
+   } )
+   ],
+   hideOnChoose: false
+   }
+   } ),
+   {
+   label: 'DropdownWidget (does 
not close on choose)\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
new OO.ui.DropdownInputWidget( {
options: [
{
diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index b3d3a9c..5df0526 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -35,6 +35,7 @@
  *  that toggles the menu's visibility on click, the menu will be hidden then 
re-shown when the user clicks
  *  that button, unless the button (or its parent widget) is passed in here.
  * @cfg {boolean} [autoHide=true] Hide the menu when the mouse is pressed 
outside the menu.
+ * @cfg {boolean} [hideOnChoose=true] Hide the menu when the user chooses an 
option.
  * @cfg {boolean} [filterFromInput=false] Filter the displayed options from 
the input
  */
 OO.ui.MenuSelectWidget = function OoUiMenuSelectWidget( config ) {
@@ -49,6 +50,7 @@
 
// Properties
this.autoHide = config.autoHide === undefined || !!config.autoHide;
+   this.hideOnChoose = config.hideOnChoose === undefined || 
!!config.hideOnChoose;
this.filterFromInput = !!config.filterFromInput;
this.$input = config.$input ? config.$input : config.input ? 
config.input.$input : null;
this.$widget = config.widget ? config.widget.$element : null;
@@ -202,7 +204,7 @@
 /**
  * Choose an item.
  *
- * When a user chooses an item, the menu is closed.
+ * When a user chooses an item, the menu is closed, unless the hideOnChoose 
config option is set to false.
  *
  * Note that ‘choose’ should never be modified programmatically. A user can 
choose an option with the keyboard
  * or mouse and it becomes selected. To select an item programmatically, use 
the #selectItem method.
@@ -212,7 +214,9 @@
  */
 OO.ui.MenuSelectWidget.prototype.chooseItem = function ( item ) {
OO.ui.MenuSelectWidget.parent.prototype.chooseItem.call( this, item );

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Position image correctly inside the card

[TheDJ (Code Review)]

TheDJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338166 )

Change subject: Position image correctly inside the card
..

Position image correctly inside the card

inline-blocks need to be forced to be aligned correctly on the baseline

Bug: T153840§
Change-Id: Iec45caa4483b36b01261309e4895c71e3fc2e675
---
M resources/ext.popups/styles/ext.popups.core.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/66/338166/1

diff --git a/resources/ext.popups/styles/ext.popups.core.less 
b/resources/ext.popups/styles/ext.popups.core.less
index b4db7e3..a370979 100644
--- a/resources/ext.popups/styles/ext.popups.core.less
+++ b/resources/ext.popups/styles/ext.popups.core.less
@@ -145,7 +145,7 @@
width: 450px;
 
> div > a > svg {
-   margin-bottom: -7px;
+   vertical-align: middle;
}
 
.mwe-popups-extract {

-- 
To view, visit https://gerrit.wikimedia.org/r/338166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec45caa4483b36b01261309e4895c71e3fc2e675
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: TheDJ 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Introduce the reading depth schema

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336447 )

Change subject: Introduce the reading depth schema
..


Introduce the reading depth schema

A reading depth schema is enabled on all pages and logs at
a sampling rate (as defined in wgWMEReadingDepthSamplingRate)
events on page load and page unload for all browsers which
are beacon capable.

In a follow up patch it will take into account the visibility time
but for now visibleLength will always be the same as totalLength.

A follow up patch will also track the time of first paint when
available to give a more fair representation of session.

Note times are rounded up to closest integer given milliseconds
is more than enough precision.

Bug: T155639
Change-Id: Ifb6ceb51bbb949ad17da17a3b38e9d04c3bf6457
---
M README
M WikimediaEventsHooks.php
M extension.json
A modules/ext.wikimediaEvents.readingDepth.js
4 files changed, 147 insertions(+), 1 deletion(-)

Approvals:
  Bmansurov: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/README b/README
index 66a0668..176e1c3 100644
--- a/README
+++ b/README
@@ -11,3 +11,8 @@
 Although the code in this extension was developed with Wikimedia use-cases in
 mind, you may find that the functionality it implements is useful. You are
 welcome to use and adapt this extension under the terms of its license.
+
+== Measuring reading depth ==
+Using the config value `wgWMEReadingDepthEnabled` it is possible to capture
+information on user sessions. More information can be found at:
+https://phabricator.wikimedia.org/T155639
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 5e8d4b4..4df5d74 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -395,8 +395,10 @@
}
 
public static function onResourceLoaderGetConfigVars( &$vars ) {
-   global $wgWMEStatsdBaseUri;
+   global $wgWMEStatsdBaseUri, $wgWMEReadingDepthSamplingRate, 
$wgWMEReadingDepthEnabled;
$vars['wgWMEStatsdBaseUri'] = $wgWMEStatsdBaseUri;
+   $vars['wgWMEReadingDepthSamplingRate'] = 
$wgWMEReadingDepthSamplingRate;
+   $vars['wgWMEReadingDepthEnabled'] = $wgWMEReadingDepthEnabled;
}
 
/**
diff --git a/extension.json b/extension.json
index 1442680..d21cbdc 100644
--- a/extension.json
+++ b/extension.json
@@ -94,6 +94,11 @@
"schema": "DeprecatedUsage",
"revision": 7906187
},
+   "schema.ReadingDepth": {
+   "class": "ResourceLoaderSchemaModule",
+   "schema": "ReadingDepth",
+   "revision": 16325045
+   },
"schema.ModuleLoadFailure": {
"class": "ResourceLoaderSchemaModule",
"schema": "ModuleLoadFailure",
@@ -134,6 +139,7 @@
"ext.wikimediaEvents.events.js",
"ext.wikimediaEvents.statsd.js",
"ext.wikimediaEvents.kartographer.js",
+   "ext.wikimediaEvents.readingDepth.js",
"ext.wikimediaEvents.rlfeature.js",
"ext.wikimediaEvents.searchSatisfaction.js",
"ext.wikimediaEvents.geoFeatures.js"
@@ -142,6 +148,7 @@
"ext.eventLogging.subscriber",
"mediawiki.user",
"mediawiki.Uri",
+   "mediawiki.experiments",
"mediawiki.storage"
],
"targets": [
@@ -165,6 +172,8 @@
"remoteExtPath": "WikimediaEvents/modules"
},
"config": {
+   "WMEReadingDepthSamplingRate": 0.005,
+   "WMEReadingDepthEnabled": false,
"WMEStatsdBaseUri": false
},
"manifest_version": 1
diff --git a/modules/ext.wikimediaEvents.readingDepth.js 
b/modules/ext.wikimediaEvents.readingDepth.js
new file mode 100644
index 000..34c4379
--- /dev/null
+++ b/modules/ext.wikimediaEvents.readingDepth.js
@@ -0,0 +1,130 @@
+/*!
+ * Track reading session
+ * The reading depth schema is defined in 
https://phabricator.wikimedia.org/T155639
+ * and intends to capture interactions across the Wikimedia site with regards 
to how
+ * many pages a user views and how much time they spend on pages.
+ *
+ * @see https://meta.wikimedia.org/wiki/Schema:ReadingDepth
+ */
+( function ( $, mw, config, user, mwExperiments ) {
+
+   /**
+   * If available return the time in ms till first paint
+   *
+   * @param {PerformanceTiming} perf See
+   *  https://developer.mozilla.org/en-US/docs/Web/API/PerformanceTiming.
+   * @param {Float} from time in ms 

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Resize thumbnails images returned by REST endpoint

[Pmiazga (Code Review)]

Pmiazga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338165 )

Change subject: Resize thumbnails images returned by REST endpoint
..

Resize thumbnails images returned by REST endpoint

This change resizes thumbnails to the appropriate width
based on the value of mw.popups.gateway.THUMBNAIL_SIZE

Tests cover
* When requested thumbnail is < than original size
* When requested thumbnail is > than original size
* When requested thumbnail is an svg and originalimage
smaller than requested thumb size

Bug: T156800
Change-Id: Ib375b97e2bc959e91de5177efc3df1f2ded54a5b
---
M resources/dist/index.js
M resources/dist/index.js.map
A src/constants.js
M src/gateway/mediawiki.js
M src/gateway/rest.js
M src/index.js
M src/popups.js
M tests/qunit/ext.popups/gateway/mediawiki.test.js
M tests/qunit/ext.popups/gateway/rest.test.js
9 files changed, 254 insertions(+), 132 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/65/338165/1


-- 
To view, visit https://gerrit.wikimedia.org/r/338165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib375b97e2bc959e91de5177efc3df1f2ded54a5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Pmiazga 
Gerrit-Reviewer: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...cumin[master]: Add .gitreview file for Gerrit

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338153 )

Change subject: Add .gitreview file for Gerrit
..


Add .gitreview file for Gerrit

Bug: T154588
Change-Id: Ic5b4b8753ee638ef35ac783c73c5c39e88e4192c
---
A .gitreview
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Volans: Looks good to me, approved



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..c4ba267
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=operations/software/cumin.git
+track=1

-- 
To view, visit https://gerrit.wikimedia.org/r/338153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5b4b8753ee638ef35ac783c73c5c39e88e4192c
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/cumin
Gerrit-Branch: master
Gerrit-Owner: Volans 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Fix systemd phd.service file

[Paladox (Code Review)]

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338163 )

Change subject: Phabricator: Fix systemd phd.service file
..

Phabricator: Fix systemd phd.service file

Currently trying to start the file results in a active (exit) error.

Changing from oneshoot to forking fixes the problem.

Change-Id: If782ef0747715c3f0922ca87c7a725d8801183d8
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/338163/1


-- 
To view, visit https://gerrit.wikimedia.org/r/338163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If782ef0747715c3f0922ca87c7a725d8801183d8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Hygiene: Move EXTRACT_LENGTH to constants

[Pmiazga (Code Review)]

Pmiazga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338164 )

Change subject: Hygiene: Move EXTRACT_LENGTH to constants
..

Hygiene: Move EXTRACT_LENGTH to constants

Keep all configuration-like values in one file.
Changes:
 - moved EXTRACT_LENGTH to constants.js file

Change-Id: Ie7d29ddc12db4a86c99dc70a2e7f7696b67570bb
---
M resources/dist/index.js
M resources/dist/index.js.map
M src/constants.js
M src/gateway/mediawiki.js
M tests/qunit/ext.popups/gateway/mediawiki.test.js
5 files changed, 14 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/64/338164/1


-- 
To view, visit https://gerrit.wikimedia.org/r/338164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7d29ddc12db4a86c99dc70a2e7f7696b67570bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Pmiazga 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Hygiene: Use CommonJS in gateway files

[Pmiazga (Code Review)]

Pmiazga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338162 )

Change subject: Hygiene: Use CommonJS in gateway files
..

Hygiene: Use CommonJS in gateway files

Changes:
 - removed closure in gateway/mediawiki and gateway/rest

Change-Id: I1b8620bed59a99da0cf75967a6546110a9c4b262
---
M resources/dist/index.js
M resources/dist/index.js.map
M src/gateway/mediawiki.js
M src/gateway/rest.js
4 files changed, 323 insertions(+), 339 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/62/338162/1


-- 
To view, visit https://gerrit.wikimedia.org/r/338162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b8620bed59a99da0cf75967a6546110a9c4b262
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Pmiazga 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group1 wikis to 1.29.0-wmf.12

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338161 )

Change subject: group1 wikis to 1.29.0-wmf.12
..


group1 wikis to 1.29.0-wmf.12

Change-Id: I8b417178a65f37dbdd7a1fce04058dc90e3f6ccf
---
M wikiversions.json
1 file changed, 597 insertions(+), 597 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikiversions.json b/wikiversions.json
index a79730b..21e8337 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,33 +1,33 @@
 {
 "aawiki": "php-1.29.0-wmf.11",
-"aawikibooks": "php-1.29.0-wmf.11",
-"aawiktionary": "php-1.29.0-wmf.11",
+"aawikibooks": "php-1.29.0-wmf.12",
+"aawiktionary": "php-1.29.0-wmf.12",
 "abwiki": "php-1.29.0-wmf.11",
-"abwiktionary": "php-1.29.0-wmf.11",
+"abwiktionary": "php-1.29.0-wmf.12",
 "acewiki": "php-1.29.0-wmf.11",
-"advisorywiki": "php-1.29.0-wmf.11",
+"advisorywiki": "php-1.29.0-wmf.12",
 "adywiki": "php-1.29.0-wmf.11",
 "afwiki": "php-1.29.0-wmf.11",
-"afwikibooks": "php-1.29.0-wmf.11",
-"afwikiquote": "php-1.29.0-wmf.11",
-"afwiktionary": "php-1.29.0-wmf.11",
+"afwikibooks": "php-1.29.0-wmf.12",
+"afwikiquote": "php-1.29.0-wmf.12",
+"afwiktionary": "php-1.29.0-wmf.12",
 "akwiki": "php-1.29.0-wmf.11",
-"akwikibooks": "php-1.29.0-wmf.11",
-"akwiktionary": "php-1.29.0-wmf.11",
+"akwikibooks": "php-1.29.0-wmf.12",
+"akwiktionary": "php-1.29.0-wmf.12",
 "alswiki": "php-1.29.0-wmf.11",
-"alswikibooks": "php-1.29.0-wmf.11",
-"alswikiquote": "php-1.29.0-wmf.11",
-"alswiktionary": "php-1.29.0-wmf.11",
+"alswikibooks": "php-1.29.0-wmf.12",
+"alswikiquote": "php-1.29.0-wmf.12",
+"alswiktionary": "php-1.29.0-wmf.12",
 "amwiki": "php-1.29.0-wmf.11",
-"amwikiquote": "php-1.29.0-wmf.11",
-"amwiktionary": "php-1.29.0-wmf.11",
+"amwikiquote": "php-1.29.0-wmf.12",
+"amwiktionary": "php-1.29.0-wmf.12",
 "angwiki": "php-1.29.0-wmf.11",
-"angwikibooks": "php-1.29.0-wmf.11",
-"angwikiquote": "php-1.29.0-wmf.11",
-"angwikisource": "php-1.29.0-wmf.11",
-"angwiktionary": "php-1.29.0-wmf.11",
+"angwikibooks": "php-1.29.0-wmf.12",
+"angwikiquote": "php-1.29.0-wmf.12",
+"angwikisource": "php-1.29.0-wmf.12",
+"angwiktionary": "php-1.29.0-wmf.12",
 "anwiki": "php-1.29.0-wmf.11",
-"anwiktionary": "php-1.29.0-wmf.11",
+"anwiktionary": "php-1.29.0-wmf.12",
 "arbcom_cswiki": "php-1.29.0-wmf.11",
 "arbcom_dewiki": "php-1.29.0-wmf.11",
 "arbcom_enwiki": "php-1.29.0-wmf.11",
@@ -35,720 +35,720 @@
 "arbcom_nlwiki": "php-1.29.0-wmf.11",
 "arcwiki": "php-1.29.0-wmf.11",
 "arwiki": "php-1.29.0-wmf.11",
-"arwikibooks": "php-1.29.0-wmf.11",
-"arwikimedia": "php-1.29.0-wmf.11",
-"arwikinews": "php-1.29.0-wmf.11",
-"arwikiquote": "php-1.29.0-wmf.11",
-"arwikisource": "php-1.29.0-wmf.11",
-"arwikiversity": "php-1.29.0-wmf.11",
-"arwiktionary": "php-1.29.0-wmf.11",
+"arwikibooks": "php-1.29.0-wmf.12",
+"arwikimedia": "php-1.29.0-wmf.12",
+"arwikinews": "php-1.29.0-wmf.12",
+"arwikiquote": "php-1.29.0-wmf.12",
+"arwikisource": "php-1.29.0-wmf.12",
+"arwikiversity": "php-1.29.0-wmf.12",
+"arwiktionary": "php-1.29.0-wmf.12",
 "arzwiki": "php-1.29.0-wmf.11",
 "astwiki": "php-1.29.0-wmf.11",
-"astwikibooks": "php-1.29.0-wmf.11",
-"astwikiquote": "php-1.29.0-wmf.11",
-"astwiktionary": "php-1.29.0-wmf.11",
+"astwikibooks": "php-1.29.0-wmf.12",
+"astwikiquote": "php-1.29.0-wmf.12",
+"astwiktionary": "php-1.29.0-wmf.12",
 "aswiki": "php-1.29.0-wmf.11",
-"aswikibooks": "php-1.29.0-wmf.11",
-"aswikisource": "php-1.29.0-wmf.11",
-"aswiktionary": "php-1.29.0-wmf.11",
-"auditcomwiki": "php-1.29.0-wmf.11",
+"aswikibooks": "php-1.29.0-wmf.12",
+"aswikisource": "php-1.29.0-wmf.12",
+"aswiktionary": "php-1.29.0-wmf.12",
+"auditcomwiki": "php-1.29.0-wmf.12",
 "avwiki": "php-1.29.0-wmf.11",
-"avwiktionary": "php-1.29.0-wmf.11",
+"avwiktionary": "php-1.29.0-wmf.12",
 "aywiki": "php-1.29.0-wmf.11",
-"aywikibooks": "php-1.29.0-wmf.11",
-"aywiktionary": "php-1.29.0-wmf.11",
+"aywikibooks": "php-1.29.0-wmf.12",
+"aywiktionary": "php-1.29.0-wmf.12",
 "azbwiki": "php-1.29.0-wmf.11",
 "azwiki": "php-1.29.0-wmf.11",
-"azwikibooks": "php-1.29.0-wmf.11",
-"azwikiquote": "php-1.29.0-wmf.11",
-"azwikisource": "php-1.29.0-wmf.11",
-"azwiktionary": "php-1.29.0-wmf.11",
+"azwikibooks": "php-1.29.0-wmf.12",
+"azwikiquote": "php-1.29.0-wmf.12",
+"azwikisource": "php-1.29.0-wmf.12",
+"azwiktionary": "php-1.29.0-wmf.12",
 "barwiki": "php-1.29.0-wmf.11",
 "bat_smgwiki": "php-1.29.0-wmf.11",
 "bawiki": "php-1.29.0-wmf.11",
-"bawikibooks": "php-1.29.0-wmf.11",
+