[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: update gui

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: update gui
..

update gui

Change-Id: Ic1d49b6feb3a03a8539d9b3fb47ebbd4c5f2d6f4
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/54/317754/1

diff --git a/gui b/gui
index 20252a5..e4c4f4e 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 20252a5a2212d0f21a4435cd0956c8f946f2a2aa
+Subproject commit e4c4f4e0b3041c4a3bfad11ab1f456c4484d2894

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1d49b6feb3a03a8539d9b3fb47ebbd4c5f2d6f4
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fix mapframe preview with enabled snapshot

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Fix mapframe preview with enabled snapshot
..

Fix mapframe preview with enabled snapshot

Bug: T149070
Change-Id: Ib5c43b9f18ad3c94171b0f26962600773bd5f8c9
---
M includes/Tag/MapFrame.php
M includes/Tag/TagHandler.php
2 files changed, 12 insertions(+), 7 deletions(-)


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

diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index ecab4a9..ced690c 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -50,6 +50,11 @@
$framed = $caption !== null || $this->getText( 'frameless', 
null ) === null;
 
$output = $this->parser->getOutput();
+   $options = $this->parser->getOptions();
+
+   $useSnapshot =
+   $wgKartographerStaticMapframe && 
!$options->getIsPreview() &&
+   !$options->getIsSectionPreview();
 
switch ( $wgKartographerFrameMode ) {
/* Not implemented in Kartotherian yet
@@ -88,11 +93,9 @@
*/
 
case 'interactive':
-   if ( $wgKartographerStaticMapframe ) {
-   $output->addModules( 
'ext.kartographer.staticframe' );
-   } else {
-   $output->addModules( 
'ext.kartographer.frame' );
-   }
+   $output->addModules( $useSnapshot
+   ? 'ext.kartographer.staticframe'
+   : 'ext.kartographer.frame' );
 
$fullWidth = false;
 
@@ -167,7 +170,7 @@
$attrs['style'] .= " width: {$width}; height: 
{$height};";
$attrs['class'] .= " {$containerClass} 
{$alignClasses[$this->align]}";
 
-   return Html::rawElement( $wgKartographerStaticMapframe 
? 'a' : 'div', $attrs );
+   return Html::rawElement( $useSnapshot ? 'a' : 'div', 
$attrs );
}
 
$attrs['style'] .= " height: {$height};";
@@ -176,7 +179,7 @@
$captionFrame = Html::rawElement( 'div', [ 'class' => 
'thumbcaption' ],
$this->parser->recursiveTagParse( $caption ) );
 
-   $mapDiv = Html::rawElement( $wgKartographerStaticMapframe ? 'a' 
: 'div', $attrs );
+   $mapDiv = Html::rawElement( $useSnapshot ? 'a' : 'div', $attrs 
);
 
return Html::rawElement( 'div', [ 'class' => $containerClass ],
Html::rawElement( 'div', [
diff --git a/includes/Tag/TagHandler.php b/includes/Tag/TagHandler.php
index 7412e71..2b8b6a0 100644
--- a/includes/Tag/TagHandler.php
+++ b/includes/Tag/TagHandler.php
@@ -303,6 +303,8 @@
$options = $parser->getOptions();
if ( $data && ( $options->getIsPreview() || 
$options->getIsSectionPreview() ) ) {
$output->addJsConfigVars( 'wgKartographerLiveData', 
$data );
+   // Preview generates HTML that is different from normal
+   $output->updateCacheExpiry( 0 );
} else {
$interact = $state->getInteractiveGroups();
$requested = $state->getRequestedGroups();

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Re-added KartographerStaticMapframe config var

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Re-added KartographerStaticMapframe config var
..


Re-added KartographerStaticMapframe config var

Bug: T148070
Change-Id: I0347d1c9bb47609f18f21d4a5d6139584e7661c0
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index a7498b0..34dbb5a 100644
--- a/extension.json
+++ b/extension.json
@@ -469,6 +469,7 @@
"tests/parserTests.txt"
],
"config": {
+   "KartographerStaticMapframe": false,
"KartographerWikivoyageMode": false,
"KartographerDfltStyle": "osm-intl",
"KartographerStyles": ["osm-intl", "osm"],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0347d1c9bb47609f18f21d4a5d6139584e7661c0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 
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] operations/mediawiki-config[master]: enwiki: Create 'patroller' group with 'patrol' permission.

[Lixxx235 (Code Review)]

Lixxx235 has uploaded a new change for review.

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

Change subject: enwiki: Create 'patroller' group with 'patrol' permission.
..

enwiki: Create 'patroller' group with 'patrol' permission.

In accordance with enwiki consensus, creates new 'patroller' user group, which 
is addable and
removable by sysops. Remove 'patrol' from autoconfirmed users and reviewers.

Bug: T149019
Change-Id: Ic0c303425a0573f7fe90c89ece0588d3cae94da3
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d321d8e..8a8637f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7755,7 +7755,6 @@
'collectionsaveasuserpage' => true, // T48944
'changetags' => false, // T97013
],
-   'autoconfirmed' => [ 'patrol' => true ], // T14007
'founder' => [ 'userrights' => true ],
'rollbacker' => [ 'rollback' => true ],
'accountcreator' => [
@@ -7765,7 +7764,6 @@
],
'autoreviewer' => [ 'autopatrol' => true ],
'researcher' => [ 'browsearchive' => true, 'deletedhistory' => 
true, 'apihighlimits' => true ],
-   'reviewer' => [ 'patrol' => true ],
'filemover' => [ 'movefile' => true ], // T29927
'bot' => [
'ipblock-exempt' => true, // T30914
@@ -7790,6 +7788,7 @@
'move-subpages' => true,
'move' => true,
],
+   ‘patroller’ => [ ‘patrol’ => true ], //T149019
],
'+enwikibooks' => [
// 'rollbacker' => array( 'rollback' => true ),
@@ -9302,7 +9301,7 @@
],
'+enwiki' => [
'bureaucrat' => [ 'accountcreator', 'flow-bot' ],
-   'sysop' => [ 'abusefilter', 'accountcreator', 'autoreviewer', 
'confirmed', 'filemover', 'reviewer', 'rollbacker', 'templateeditor', 
'massmessage-sender', 'extendedconfirmed', 'extendedmover' ], // T126607, 
T133981
+   'sysop' => [ 'abusefilter', 'accountcreator', 'autoreviewer', 
'confirmed', 'filemover', 'reviewer', 'rollbacker', 'templateeditor', 
'massmessage-sender', 'extendedconfirmed', 'extendedmover’, 'patroller' ], // 
T126607, T133981, T149019
],
'+enwikibooks' => [
'sysop' => [ 'transwiki', 'uploader' ],
@@ -9987,7 +9986,7 @@
],
'+enwiki' => [
'bureaucrat' => [ 'ipblock-exempt', 'accountcreator', 'sysop', 
'flow-bot' ],
-   'sysop' => [ 'rollbacker', 'accountcreator', 'abusefilter', 
'autoreviewer', 'confirmed', 'reviewer', 'filemover', 'templateeditor', 
'massmessage-sender', 'extendedconfirmed', 'extendedmover' ], // T126607, 
T133981
+   'sysop' => [ 'rollbacker', 'accountcreator', 'abusefilter', 
'autoreviewer', 'confirmed', 'reviewer', 'filemover', 'templateeditor', 
'massmessage-sender', 'extendedconfirmed', 'extendedmover’, 'patroller' ], // 
T126607, T133981, T149019
],
'+enwikibooks' => [
'sysop' => [ 'transwiki', 'uploader', ],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Re-added KartographerStaticMapframe config var

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Re-added KartographerStaticMapframe config var
..

Re-added KartographerStaticMapframe config var

Change-Id: I0347d1c9bb47609f18f21d4a5d6139584e7661c0
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index a7498b0..34dbb5a 100644
--- a/extension.json
+++ b/extension.json
@@ -469,6 +469,7 @@
"tests/parserTests.txt"
],
"config": {
+   "KartographerStaticMapframe": false,
"KartographerWikivoyageMode": false,
"KartographerDfltStyle": "osm-intl",
"KartographerStyles": ["osm-intl", "osm"],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Follow overhauled color palette

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: Follow overhauled color palette
..

Follow overhauled color palette

Replacing colors with ones from the overhauled WCAG 2.0 level AA
compliant color palette https://phabricator.wikimedia.org/M82
Applying Less variables where possible for better flexibility
in future design maintenance.
Also introducing some variables from WikimediaUI Base.

Bug: T147365
Depends-on: I16bdfbdada252ee27d5a0de11e0930347315b699
Change-Id: Ic05ed15b44d86752c686d80efc4f2ed2a1e71b41
---
M modules/echo.variables.less
M modules/nojs/mw.echo.notifications.less
M modules/nojs/mw.echo.special.less
M modules/styles/mw.echo.ui.CrossWikiNotificationItemWidget.less
M modules/styles/mw.echo.ui.DatedSubGroupListWidget.less
M modules/styles/mw.echo.ui.MenuItemWidget.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
M modules/styles/mw.echo.ui.NotificationsListWidget.less
M modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
M modules/styles/mw.echo.ui.ToggleReadCircleButtonWidget.less
10 files changed, 59 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/50/317750/1

diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index a24ba39..62b6b86 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -1,17 +1,36 @@
+// Taken from WikimediaUI base v0.6.1
+// Background Colors
+@background-color-base: #fff;
+
+// Foreground Colors
+@color-base: #222;
+@color-base-active: #000;
+@color-base-emphasized: @color-base-active;
+
+@color-primary: #36c;
+
+@color-destructive: #c33;
+
+@border-color-heading: #c8ccd1;
+
+// Echo's original variables
+@grey-light: #72777d;
+@grey-medium: #54595d;
+
 @badge-padding: 0.12em;
 @badge-icon-size: 1.1em;
 @badge-distance-adjustment: 1em;
 
 @notification-background-unseen: #dce8ff;
-@notification-background-unread: #fff;
-@notification-background-read: #f1f1f1;
+@notification-background-unread: @background-color-base;
+@notification-background-read: #eaecf0;
 
-@badge-counter-background-seen: #71777d;
-@badge-counter-background-unseen-alert: #c33;
-@badge-counter-background-unseen-message: #36c;
+@badge-counter-background-seen: #72777d;
+@badge-counter-background-unseen-alert: @color-destructive;
+@badge-counter-background-unseen-message: @color-primary;
 
-@notification-text-color: #111;
-@notification-body-color: #777;
+@notification-text-color: @color-base-emphasized;
+@notification-body-color: #72777d;
 
 @bundle-group-padding: 0.7em;
 @notification-popup-width: 500px;
@@ -26,9 +45,4 @@
 
 @specialpage-width: 1000px;
 
-@grey-light: #777;
-@grey-medium: #555;
-@grey-dark: #333;
-@grey-darkest: #000;
-
-@border-color: #ccc;
+@border-color: @border-color-heading;
diff --git a/modules/nojs/mw.echo.notifications.less 
b/modules/nojs/mw.echo.notifications.less
index 7c69be5..6702845 100644
--- a/modules/nojs/mw.echo.notifications.less
+++ b/modules/nojs/mw.echo.notifications.less
@@ -21,13 +21,13 @@
margin-left: 10px;
}
.mw-echo-notification {
+   background-color: @background-color-base;
+   color: #72777d;
clear: both;
display: block;
-   color: #6d6d6d;
line-height: 90%;
margin: 0;
min-height: 30px;
-   background-color: #fff;
position: relative;
padding-top: 15px;
padding-bottom: 10px;
@@ -42,7 +42,7 @@
}
 
.mw-echo-notifications {
-   background-color: #eee;
+   background-color: #eaecf0;
}
 
.mw-echo-content {
@@ -75,7 +75,7 @@
}
 
.mw-echo-notification-footer {
-   color: #6d6d6d;
+   color: #72777d;
font-size: 11px;
margin-top: 0.2em;
 
diff --git a/modules/nojs/mw.echo.special.less 
b/modules/nojs/mw.echo.special.less
index 0630fd7..ef999f5 100644
--- a/modules/nojs/mw.echo.special.less
+++ b/modules/nojs/mw.echo.special.less
@@ -43,9 +43,9 @@
 }
 
 .mw-echo-date-section {
-   border-bottom: 1px solid #c9c9c9;
+   border-bottom: 1px solid @border-color;
margin: 20px 0 5px 0;
-   color: #686868;
+   color: #72777d;
display: inline-block;
width: 100%;
padding-bottom: 0.5em;
@@ -77,7 +77,7 @@
 .mw-echo-special-navbar-bottom {
margin-top: 20px;
padding-top: 10px;
-   border-top: solid 1px #c9c9c9;
+   border-top: 1px solid @border-color;
 }
 
 .mw-echo-notification {
@@ -114,7 +114,7 @@
overflow-y: auto;
 
.mw-echo-notification {
-   background-color: #f1f1f1;
+   background-color: #f8f9fa;
 
&:hover {

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add annoying thing we don't check in

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Add annoying thing we don't check in
..

Add annoying thing we don't check in

Change-Id: I71c99e3b3150bfbd12304f4b32af2129014c855f
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index a13cb3f..9c5e053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 
 /multiversion/vendor/**/.git
 /multiversion/vendor/slim/slim/tests/templates/test.php
+/multiversion/vendor/composer/autoload_static.php

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Added a new commonly typed typo

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Added a new commonly typed typo
..


Added a new commonly typed typo

Change-Id: I0510ebf35929c59e2ffd2df995c27b3fadf3e0b4
---
M typos
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/typos b/typos
index f9c60c2..9b7542b 100644
--- a/typos
+++ b/typos
@@ -8,3 +8,4 @@
 [^2][[:digit:]]{3}\.codfw\.wmnet
 [^3][[:digit:]]{3}\.(esams|knams)\.wmnet
 [^4][[:digit:]]{3}\.ulsfo\.wmnet
+enlgish

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0510ebf35929c59e2ffd2df995c27b3fadf3e0b4
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Zppix 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Zppix 
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...crm[master]: Refund QC: fix missing 'use', better logging

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Refund QC: fix missing 'use', better logging
..


Refund QC: fix missing 'use', better logging

Bug: T148880
Change-Id: Ia5c82d1cbf41007e92cc2db585c49e180971f511
---
M sites/all/modules/queue2civicrm/refund/RefundQueueConsumer.php
1 file changed, 13 insertions(+), 5 deletions(-)

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



diff --git a/sites/all/modules/queue2civicrm/refund/RefundQueueConsumer.php 
b/sites/all/modules/queue2civicrm/refund/RefundQueueConsumer.php
index 1840b3e..9c242f8 100644
--- a/sites/all/modules/queue2civicrm/refund/RefundQueueConsumer.php
+++ b/sites/all/modules/queue2civicrm/refund/RefundQueueConsumer.php
@@ -1,5 +1,6 @@
 getMessage(), NULL, WATCHDOG_ERROR );
+   watchdog( 'refund', "$logId: Successfully 
marked as refunded", NULL, WATCHDOG_INFO );
+   } catch ( Exception $ex ) {
+   watchdog( 'refund', "$logId: Could not refund 
due to internal error: " . $ex->getMessage(), NULL, WATCHDOG_ERROR );
throw $ex;
}
} else {
-   watchdog( 'refund', "$refundTxn: Contribution not found 
for this transaction!", NULL, WATCHDOG_ERROR );
+   watchdog( 'refund', "$logId: Contribution not found for 
this transaction!", NULL, WATCHDOG_ERROR );
throw new WmfException( 'MISSING_PREDECESSOR', "Parent 
not found: $gateway $parentTxn" );
}
}
 
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5c82d1cbf41007e92cc2db585c49e180971f511
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
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...release[master]: Bump Wikidata branch to wmf/1.28.0-wmf.23

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Bump Wikidata branch to wmf/1.28.0-wmf.23
..


Bump Wikidata branch to wmf/1.28.0-wmf.23

Change-Id: Ifd8d494c8c39ee0710b9f519ed5671899d536b2e
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 8cbdc26..eeb9a77 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -169,7 +169,7 @@
"@": "Set a string for the specific commit, branch, or tag",
"special_extensions": {
"CentralNotice": "wmf_deploy",
-   "Wikidata": "wmf/1.28.0-wmf.21",
+   "Wikidata": "wmf/1.28.0-wmf.23",
"SemanticMediaWiki": "1.8.x",
"SemanticResultFormats": "1.8.x",
"Validator": "0.5.x"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd8d494c8c39ee0710b9f519ed5671899d536b2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Aude 
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...Wikidata[wmf/1.28.0-wmf.23]: New deployment build - wmf/1.28.0-wmf.23

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: New deployment build - wmf/1.28.0-wmf.23
..


New deployment build - wmf/1.28.0-wmf.23

Change-Id: I45928997eb5923c2dd5c8ac7d42c2b8a3ffb43a9
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.json
M composer.lock
M extensions/ArticlePlaceholder/.gitreview
M extensions/ArticlePlaceholder/i18n/fi.json
M extensions/ArticlePlaceholder/i18n/hu.json
M extensions/ArticlePlaceholder/i18n/lv.json
M extensions/ArticlePlaceholder/i18n/pl.json
M extensions/ArticlePlaceholder/i18n/pt.json
M extensions/ArticlePlaceholder/i18n/qqq.json
M extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
M extensions/Constraints/.gitreview
M extensions/Quality/.gitreview
M extensions/ValueView/RELEASE-NOTES.md
M extensions/ValueView/ValueView.php
M extensions/ValueView/i18n/en.json
M extensions/ValueView/i18n/fr.json
M extensions/ValueView/i18n/he.json
M extensions/ValueView/i18n/lt.json
A extensions/ValueView/i18n/mr.json
M extensions/ValueView/i18n/oc.json
M extensions/ValueView/i18n/qqq.json
M extensions/ValueView/i18n/ru.json
M extensions/ValueView/i18n/zh-hant.json
M extensions/ValueView/lib/jquery.ui/jquery.ui.commonssuggester.js
M extensions/ValueView/lib/jquery.ui/jquery.ui.unitsuggester.js
M extensions/ValueView/src/ExpertExtender/ExpertExtender.LanguageSelector.js
M extensions/ValueView/src/experts/GlobeCoordinateInput.js
M extensions/ValueView/src/experts/resources.php
M extensions/ValueView/src/jquery.valueview.valueview.js
A extensions/ValueView/tests/lib/jquery.ui/jquery.ui.commonssuggester.tests.js
M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.suggester.tests.js
M extensions/ValueView/tests/lib/resources.php
M 
extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.LanguageSelector.tests.js
M extensions/Wikibase/.gitreview
A extensions/Wikibase/Doxyfile
M extensions/Wikibase/client/WikibaseClient.datatypes.php
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/WikibaseClient.i18n.magic.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/config/WikibaseClient.default.php
M extensions/Wikibase/client/config/WikibaseClient.jenkins.php
M extensions/Wikibase/client/i18n/as.json
A extensions/Wikibase/client/i18n/bqi.json
M extensions/Wikibase/client/i18n/diq.json
M extensions/Wikibase/client/i18n/es.json
M extensions/Wikibase/client/i18n/et.json
M extensions/Wikibase/client/i18n/fa.json
M extensions/Wikibase/client/i18n/hak.json
M extensions/Wikibase/client/i18n/hr.json
M extensions/Wikibase/client/i18n/kn.json
M extensions/Wikibase/client/i18n/ko.json
M extensions/Wikibase/client/i18n/mhr.json
M extensions/Wikibase/client/i18n/mk.json
M extensions/Wikibase/client/i18n/myv.json
M extensions/Wikibase/client/i18n/nl.json
M extensions/Wikibase/client/i18n/or.json
M extensions/Wikibase/client/i18n/pl.json
M extensions/Wikibase/client/i18n/pt.json
M extensions/Wikibase/client/i18n/qqq.json
M extensions/Wikibase/client/i18n/sd.json
M extensions/Wikibase/client/i18n/tr.json
M extensions/Wikibase/client/i18n/tyv.json
M extensions/Wikibase/client/i18n/uk.json
M extensions/Wikibase/client/i18n/ur.json
M extensions/Wikibase/client/i18n/vro.json
M extensions/Wikibase/client/i18n/zh-hans.json
M extensions/Wikibase/client/i18n/zh-hant.json
M extensions/Wikibase/client/includes/Api/ApiListEntityUsage.php
R extensions/Wikibase/client/includes/ChangeNotificationJob.php
A 
extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/SnakSerializationRenderer.php
M 
extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php
M extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
A extensions/Wikibase/client/includes/Hooks/EditActionHookHandler.php
M extensions/Wikibase/client/includes/Hooks/ParserFunctionRegistrant.php
M extensions/Wikibase/client/includes/Hooks/SidebarHookHandlers.php
M 
extensions/Wikibase/client/includes/Hooks/SkinTemplateOutputPageBeforeExecHandler.php
M extensions/Wikibase/client/includes/Specials/SpecialEntityUsage.php
M extensions/Wikibase/client/includes/Usage/Sql/SqlSubscriptionManager.php
M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/resources/Resources.php
A 
extensions/Wikibase/client/resources/wikibase.client.action.edit.collapsibleFooter.js
A 

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Bump Wikidata branch to wmf/1.28.0-wmf.23

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Bump Wikidata branch to wmf/1.28.0-wmf.23
..

Bump Wikidata branch to wmf/1.28.0-wmf.23

Change-Id: Ifd8d494c8c39ee0710b9f519ed5671899d536b2e
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/48/317748/1

diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 8cbdc26..eeb9a77 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -169,7 +169,7 @@
"@": "Set a string for the specific commit, branch, or tag",
"special_extensions": {
"CentralNotice": "wmf_deploy",
-   "Wikidata": "wmf/1.28.0-wmf.21",
+   "Wikidata": "wmf/1.28.0-wmf.23",
"SemanticMediaWiki": "1.8.x",
"SemanticResultFormats": "1.8.x",
"Validator": "0.5.x"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd8d494c8c39ee0710b9f519ed5671899d536b2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.28.0-wmf.23]: New deployment build - wmf/1.28.0-wmf.23

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: New deployment build - wmf/1.28.0-wmf.23
..

New deployment build - wmf/1.28.0-wmf.23

Change-Id: I45928997eb5923c2dd5c8ac7d42c2b8a3ffb43a9
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.json
M composer.lock
M extensions/ArticlePlaceholder/.gitreview
M extensions/ArticlePlaceholder/i18n/fi.json
M extensions/ArticlePlaceholder/i18n/hu.json
M extensions/ArticlePlaceholder/i18n/lv.json
M extensions/ArticlePlaceholder/i18n/pl.json
M extensions/ArticlePlaceholder/i18n/pt.json
M extensions/ArticlePlaceholder/i18n/qqq.json
M extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
M extensions/Constraints/.gitreview
M extensions/Quality/.gitreview
M extensions/ValueView/RELEASE-NOTES.md
M extensions/ValueView/ValueView.php
M extensions/ValueView/i18n/en.json
M extensions/ValueView/i18n/fr.json
M extensions/ValueView/i18n/he.json
M extensions/ValueView/i18n/lt.json
A extensions/ValueView/i18n/mr.json
M extensions/ValueView/i18n/oc.json
M extensions/ValueView/i18n/qqq.json
M extensions/ValueView/i18n/ru.json
M extensions/ValueView/i18n/zh-hant.json
M extensions/ValueView/lib/jquery.ui/jquery.ui.commonssuggester.js
M extensions/ValueView/lib/jquery.ui/jquery.ui.unitsuggester.js
M extensions/ValueView/src/ExpertExtender/ExpertExtender.LanguageSelector.js
M extensions/ValueView/src/experts/GlobeCoordinateInput.js
M extensions/ValueView/src/experts/resources.php
M extensions/ValueView/src/jquery.valueview.valueview.js
A extensions/ValueView/tests/lib/jquery.ui/jquery.ui.commonssuggester.tests.js
M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.suggester.tests.js
M extensions/ValueView/tests/lib/resources.php
M 
extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.LanguageSelector.tests.js
M extensions/Wikibase/.gitreview
A extensions/Wikibase/Doxyfile
M extensions/Wikibase/client/WikibaseClient.datatypes.php
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/WikibaseClient.i18n.magic.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/config/WikibaseClient.default.php
M extensions/Wikibase/client/config/WikibaseClient.jenkins.php
M extensions/Wikibase/client/i18n/as.json
A extensions/Wikibase/client/i18n/bqi.json
M extensions/Wikibase/client/i18n/diq.json
M extensions/Wikibase/client/i18n/es.json
M extensions/Wikibase/client/i18n/et.json
M extensions/Wikibase/client/i18n/fa.json
M extensions/Wikibase/client/i18n/hak.json
M extensions/Wikibase/client/i18n/hr.json
M extensions/Wikibase/client/i18n/kn.json
M extensions/Wikibase/client/i18n/ko.json
M extensions/Wikibase/client/i18n/mhr.json
M extensions/Wikibase/client/i18n/mk.json
M extensions/Wikibase/client/i18n/myv.json
M extensions/Wikibase/client/i18n/nl.json
M extensions/Wikibase/client/i18n/or.json
M extensions/Wikibase/client/i18n/pl.json
M extensions/Wikibase/client/i18n/pt.json
M extensions/Wikibase/client/i18n/qqq.json
M extensions/Wikibase/client/i18n/sd.json
M extensions/Wikibase/client/i18n/tr.json
M extensions/Wikibase/client/i18n/tyv.json
M extensions/Wikibase/client/i18n/uk.json
M extensions/Wikibase/client/i18n/ur.json
M extensions/Wikibase/client/i18n/vro.json
M extensions/Wikibase/client/i18n/zh-hans.json
M extensions/Wikibase/client/i18n/zh-hant.json
M extensions/Wikibase/client/includes/Api/ApiListEntityUsage.php
R extensions/Wikibase/client/includes/ChangeNotificationJob.php
A 
extensions/Wikibase/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/SnakSerializationRenderer.php
M 
extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php
M extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php
A extensions/Wikibase/client/includes/Hooks/EditActionHookHandler.php
M extensions/Wikibase/client/includes/Hooks/ParserFunctionRegistrant.php
M extensions/Wikibase/client/includes/Hooks/SidebarHookHandlers.php
M 
extensions/Wikibase/client/includes/Hooks/SkinTemplateOutputPageBeforeExecHandler.php
M extensions/Wikibase/client/includes/Specials/SpecialEntityUsage.php
M extensions/Wikibase/client/includes/Usage/Sql/SqlSubscriptionManager.php
M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/resources/Resources.php
A 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Overhaul navigation drawer to better focus on navigation

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: Overhaul navigation drawer to better focus on navigation
..

Overhaul navigation drawer to better focus on navigation

Overhauling navigation drawer colors to give better focus on
navigation and also align to improved color palette.

Bug: T148108
Change-Id: Ia4b34a1efece98a4167e036901c5def1f73c4b05
---
M includes/skins/SkinMinerva.php
M minerva.less/minerva.variables.less
M resources/mobile.mainMenu/mainmenu.less
3 files changed, 27 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/46/317746/1

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 757225a..202251c 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -398,7 +398,7 @@
->addComponent(
$this->msg( 
'mobile-frontend-main-menu-contributions' )->escaped(),
SpecialPage::getTitleFor( 'Contributions', 
$user->getName() )->getLocalUrl(),
-   MobileUI::iconClass( 'mf-contributions-invert', 
'before' ),
+   MobileUI::iconClass( 'mf-contributions', 
'before' ),
[ 'data-event-name' => 'contributions' ]
);
}
@@ -433,7 +433,7 @@
'mobile-frontend-watchlist-purpose',
$watchlistQuery
),
-   MobileUI::iconClass( 'mf-watchlist-invert', 
'before' ),
+   MobileUI::iconClass( 'mf-watchlist', 'before' ),
[ 'data-event-name' => 'watchlist' ]
);
}
@@ -456,7 +456,7 @@
$this->msg( 
'mobile-frontend-main-menu-settings' )->escaped(),
SpecialPage::getTitleFor( 
'MobileOptions' )->
getLocalUrl( [ 'returnto' => 
$returnToTitle ] ),
-   MobileUI::iconClass( 
'mf-settings-invert', 'before' ),
+   MobileUI::iconClass( 'mf-settings', 
'before' ),
[ 'data-event-name' => 'settings' ]
);
 
@@ -557,7 +557,7 @@
->addComponent(
$this->msg( 'mobile-frontend-home-button' 
)->escaped(),
Title::newMainPage()->getLocalUrl(),
-   MobileUI::iconClass( 'mf-home-invert', 'before' 
),
+   MobileUI::iconClass( 'mf-home', 'before' ),
[ 'data-event-name' => 'home' ]
);
 
@@ -568,7 +568,7 @@
SpecialPage::getTitleFor( 'Randompage',
MWNamespace::getCanonicalName( 
$config->get( 'MFContentNamespace' ) ) )->getLocalUrl() .
'#/random',
-   MobileUI::iconClass( 'mf-random-invert', 
'before' ),
+   MobileUI::iconClass( 'mf-random', 'before' ),
[
'id' => 'randomButton',
'data-event-name' => 'random',
@@ -584,7 +584,7 @@
->addComponent(
$this->msg( 
'mobile-frontend-main-menu-nearby' )->escaped(),
SpecialPage::getTitleFor( 'Nearby' 
)->getLocalURL(),
-   MobileUI::iconClass( 
'mf-nearby-invert', 'before', 'nearby' ),
+   MobileUI::iconClass( 'mf-nearby', 
'before', 'nearby' ),
[ 'data-event-name' => 'nearby' ]
);
}
@@ -647,14 +647,14 @@
->addComponent(
$username,
Title::newFromText( $username, NS_USER 
)->getLocalUrl(),
-   MobileUI::iconClass( 
'mf-profile-invert', 'before', 'truncated-text primary-action' ),
+   MobileUI::iconClass( 'mf-profile', 
'before', 'truncated-text primary-action' ),
[ 'data-event-name' => 'profile' ]
)
->addComponent(
$this->msg( 
'mobile-frontend-main-menu-logout' )->escaped(),

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Put offline receipt into it's own file

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Put offline  receipt into it's own file
..

Put offline  receipt into it's own file

Also fix the currency not showing in the second case on the html receipt.

Bug: T137496

Change-Id: I02c40ff336e15c7eb56771843ca82a7cef439416
---
A sites/all/modules/wmf_civicrm/templates/offline_receipt.html
A sites/all/modules/wmf_civicrm/templates/offline_receipt.txt
A sites/all/modules/wmf_civicrm/update_receipt.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
4 files changed, 67 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/44/317744/1

diff --git a/sites/all/modules/wmf_civicrm/templates/offline_receipt.html 
b/sites/all/modules/wmf_civicrm/templates/offline_receipt.html
new file mode 100644
index 000..75f62c1
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/templates/offline_receipt.html
@@ -0,0 +1,26 @@
+
+Dear {contact.first_name},
+
+Thank you for your donation of 
{$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} to the Wikimedia 
Foundation. The Wikimedia Foundation is the non-profit organization that 
supports Wikipedia and other free knowledge projects. Our mission is to build 
the most accessible and comprehensive source of free knowledge in the world.
+
+We believe that knowledge is a fundamental human right. As humanity rushes 
into our digital future, we need open, accessible, public spaces to access 
knowledge online. Wikimedia is such a space. Wikipedia delivers free knowledge 
to people, by people, in hundreds of languages around our planet.
+
+Over the course of a year, Wikipedia is edited and read by people on every 
continent, including Antarctica. Nearly half a billion people visit Wikipedia 
every month for everything from preserving cultural heritage, to improving 
cancer detection, to researching homework. They come to learn. They stay and 
discover.
+
+Everyone is a potential Wikipedian. If you don\'t find what you\'re looking 
for on Wikipedia, you can https://en.wikipedia.org/wiki/Special:UserLogin?type=signupcampaign=lila2015\;>start
 creating it yourself. The articles, words, pictures and data are created 
by a diverse community of people who volunteer to share their knowledge with 
the world.
+
+Every day, we ask ourselves how we can increase our impact, and ensure 
Wikipedia and its sister projects are even more accurate, rich, and accessible 
tomorrow than they are today. Your donation will help us get there.
+
+Thank you for keeping us growing and impacting lives another year.
+
+Wikimedia Foundation
+
+Many employers will match employee contributions: please check with your 
company to see if they have a https://wikimediafoundation.org/wiki/Matching_Gifts/form\;>corporate 
matching gift program.
+
+For your records: Your donation, number CNT-{$contactID}, on 
{$receive_date|truncate:10:\'\'|crmDate}
+was {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}.
+
+
+This letter may serve as a record of your donation. No goods or services 
were provided, in whole or in part, for this contribution. The Wikimedia 
Foundation, Inc. is a non-profit charitable corporation with 501(c)(3) tax 
exempt status in the United States. Our address is 149 New Montgomery, 6th 
Floor, San Francisco, CA, 94105. U.S. tax-exempt number: 20-0049703
+
+
diff --git a/sites/all/modules/wmf_civicrm/templates/offline_receipt.txt 
b/sites/all/modules/wmf_civicrm/templates/offline_receipt.txt
new file mode 100644
index 000..a22078b
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/templates/offline_receipt.txt
@@ -0,0 +1,22 @@
+Dear {contact.first_name},
+
+Thank you for your donation of 
{$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} to the Wikimedia 
Foundation. The Wikimedia Foundation is the non-profit organization that 
supports Wikipedia and other free knowledge projects. Our mission is to build 
the most accessible and comprehensive source of free knowledge in the world.
+
+We believe that knowledge is a fundamental human right. As humanity rushes 
into our digital future, we need open, accessible, public spaces to access 
knowledge online. Wikimedia is such a space. Wikipedia delivers free knowledge 
to people, by people, in hundreds of languages around our planet.
+
+Over the course of a year, Wikipedia is edited and read by people on every 
continent, including Antarctica. Nearly half a billion people visit Wikipedia 
every month for everything from preserving cultural heritage, to improving 
cancer detection, to researching homework. They come to learn. They stay and 
discover.
+
+Everyone is a potential Wikipedian. If you don\'t find what you\'re looking 
for on Wikipedia, you can start creating it yourself. The articles, words, 
pictures and data are created by a diverse community of people who volunteer to 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Switch receipt to use original amount & currency if provided.

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Switch receipt to use original amount & currency if provided.
..

Switch receipt to use original amount & currency if provided.

I'm not loving this as it turns out the custom group label & custom field 
labels (not machine names)
are assigned to the template. This makes it a little brittle as we could change 
those. However,
it does resolve the immediate problem.

I am inclined to use it for now but raise a ticket to do a second round of this 
to make it more
robust (perhaps with a token, or review what is assigned to the template).

BUG: T137496

Change-Id: I22858e972d240fa58b3f3d30208bbc183a5f2406
---
M sites/all/modules/wmf_civicrm/templates/offline_receipt.html
M sites/all/modules/wmf_civicrm/templates/offline_receipt.txt
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
3 files changed, 64 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/45/317745/1

diff --git a/sites/all/modules/wmf_civicrm/templates/offline_receipt.html 
b/sites/all/modules/wmf_civicrm/templates/offline_receipt.html
index 75f62c1..b2b2eae 100644
--- a/sites/all/modules/wmf_civicrm/templates/offline_receipt.html
+++ b/sites/all/modules/wmf_civicrm/templates/offline_receipt.html
@@ -1,7 +1,22 @@
 
+
+{assign var="amount" value=$formValues.total_amount}
+{foreach from=$customGroup item=value key=customName}
+  {if $customName === "Contribution Extra"}
+{foreach from=$value item=v key=n}
+  {if $n == "Original Currency Received"}
+{assign var="currency" value=$v}
+  {/if}
+  {if $n == "Original Amount Received (unconverted)"}
+{assign var="amount" value=$v}
+  {/if}
+{/foreach}
+  {/if}
+{/foreach}
+
 Dear {contact.first_name},
 
-Thank you for your donation of 
{$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} to the Wikimedia 
Foundation. The Wikimedia Foundation is the non-profit organization that 
supports Wikipedia and other free knowledge projects. Our mission is to build 
the most accessible and comprehensive source of free knowledge in the world.
+Thank you for your donation of {$amount|crmMoney:$currency} to the 
Wikimedia Foundation. The Wikimedia Foundation is the non-profit organization 
that supports Wikipedia and other free knowledge projects. Our mission is to 
build the most accessible and comprehensive source of free knowledge in the 
world.
 
 We believe that knowledge is a fundamental human right. As humanity rushes 
into our digital future, we need open, accessible, public spaces to access 
knowledge online. Wikimedia is such a space. Wikipedia delivers free knowledge 
to people, by people, in hundreds of languages around our planet.
 
@@ -18,7 +33,7 @@
 Many employers will match employee contributions: please check with your 
company to see if they have a https://wikimediafoundation.org/wiki/Matching_Gifts/form\;>corporate 
matching gift program.
 
 For your records: Your donation, number CNT-{$contactID}, on 
{$receive_date|truncate:10:\'\'|crmDate}
-was {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}.
+was {$amount|crmMoney:$currency}.
 
 
 This letter may serve as a record of your donation. No goods or services 
were provided, in whole or in part, for this contribution. The Wikimedia 
Foundation, Inc. is a non-profit charitable corporation with 501(c)(3) tax 
exempt status in the United States. Our address is 149 New Montgomery, 6th 
Floor, San Francisco, CA, 94105. U.S. tax-exempt number: 20-0049703
diff --git a/sites/all/modules/wmf_civicrm/templates/offline_receipt.txt 
b/sites/all/modules/wmf_civicrm/templates/offline_receipt.txt
index a22078b..50fb7d9 100644
--- a/sites/all/modules/wmf_civicrm/templates/offline_receipt.txt
+++ b/sites/all/modules/wmf_civicrm/templates/offline_receipt.txt
@@ -1,6 +1,18 @@
 Dear {contact.first_name},
-
-Thank you for your donation of 
{$formValues.total_amount-$totalTaxAmount|crmMoney:$currency} to the Wikimedia 
Foundation. The Wikimedia Foundation is the non-profit organization that 
supports Wikipedia and other free knowledge projects. Our mission is to build 
the most accessible and comprehensive source of free knowledge in the world.
+{assign var="amount" value=$formValues.total_amount}
+{foreach from=$customGroup item=value key=customName}
+  {if $customName === "Contribution Extra"}
+{foreach from=$value item=v key=n}
+  {if $n == "Original Currency Received"}
+{assign var="currency" value=$v}
+  {/if}
+  {if $n == "Original Amount Received (unconverted)"}
+{assign var="amount" value=$v}
+  {/if}
+{/foreach}
+  {/if}
+{/foreach}
+Thank you for your donation of {$amount|crmMoney:$currency} to the Wikimedia 
Foundation. The Wikimedia Foundation is the non-profit organization that 
supports Wikipedia and other free 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix b/c in mw.wikibase.renderSnak(s)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix b/c in mw.wikibase.renderSnak(s)
..


Fix b/c in mw.wikibase.renderSnak(s)

By also switching it to using
DataAccessSnakFormatterFactory::newEscapedPlainTextSnakFormatter

I forgot to also change this to DataAccessSnakFormatterFactory
and later to FORMAT_PLAIN in 6c8e26b73070b26e3fcf1bac1b5cb1b99f394d7a
and in 628bc406eb8e8ec67e5b5d0710a257d7cdbea7b7 respectively.

This has one side effect: It enables language fallbacks for said
functions. This has apparently been forgotten in
9efbaaf23d23d202aa78df86b4d496f6d78f0bd7.

Change-Id: I9c055f0bd36e1ed309098538fc14f149f0431a45
---
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M 
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
2 files changed, 28 insertions(+), 13 deletions(-)

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



diff --git 
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php 
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index c8eb800..18c23e2 100644
--- a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -7,12 +7,10 @@
 use Language;
 use Scribunto_LuaLibraryBase;
 use ScribuntoException;
-use ValueFormatters\FormatterOptions;
 use Wikibase\Client\DataAccess\PropertyIdResolver;
 use Wikibase\Client\PropertyLabelNotResolvedException;
 use Wikibase\Client\RepoLinker;
 use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
-use Wikibase\Client\Usage\UsageTrackingSnakFormatter;
 use Wikibase\Client\Usage\UsageTrackingTermLookup;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\EntityIdParser;
@@ -20,7 +18,6 @@
 use Wikibase\DataModel\SerializerFactory;
 use Wikibase\DataModel\Services\Lookup\EntityAccessLimitException;
 use Wikibase\LanguageFallbackChain;
-use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
 use Wikibase\Lib\Store\PropertyOrderProvider;
 
@@ -223,16 +220,10 @@
private function newSnakSerializationRenderer() {
$wikibaseClient = WikibaseClient::getDefaultInstance();
 
-   $formatterOptions = new FormatterOptions( array(
-   SnakFormatter::OPT_LANG => 
$this->getLanguage()->getCode()
-   ) );
-
-   $snakFormatter = new UsageTrackingSnakFormatter(
-   
$wikibaseClient->getSnakFormatterFactory()->getSnakFormatter(
-   SnakFormatter::FORMAT_WIKI, $formatterOptions
-   ),
-   $this->getUsageAccumulator(),
-   
$this->getLanguageFallbackChain()->getFetchLanguageCodes()
+   $snakFormatterFactory = 
$wikibaseClient->getDataAccessSnakFormatterFactory();
+   $snakFormatter = 
$snakFormatterFactory->newEscapedPlainTextSnakFormatter(
+   $this->getLanguage(),
+   $this->getUsageAccumulator()
);
 
$snakDeserializer = 
$wikibaseClient->getExternalFormatDeserializerFactory()->newSnakDeserializer();
diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
 
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
index f9c829d..b3e3d72 100644
--- 
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
+++ 
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
@@ -281,6 +281,30 @@
$this->assertSame( $allowDataAccessInUserLanguage, $cacheSplit 
);
}
 
+   public function testRenderSnak_languageFallback() {
+   $this->setAllowDataAccessInUserLanguage( true );
+   $cacheSplit = false;
+   $lang = Language::factory( 'ku' );
+
+   $luaWikibaseLibrary = $this->newScribuntoLuaWikibaseLibrary( 
$cacheSplit, $lang );
+   $entityArr = $luaWikibaseLibrary->getEntity( 'Q32488' );
+
+   $snak = $entityArr[0]['claims']['P456'][1]['mainsnak'];
+   $this->assertSame(
+   [ 'Pisîk' ],
+   $luaWikibaseLibrary->renderSnak( $snak )
+   );
+
+   // All languages in the fallback chain for 'ku-arab' count as 
"used".
+   $usage = 
$luaWikibaseLibrary->getUsageAccumulator()->getUsages();
+   $this->assertArrayHasKey( 'Q885588#L.ku', $usage );
+   $this->assertArrayHasKey( 'Q885588#L.ku-arab', $usage );
+   $this->assertArrayHasKey( 'Q885588#L.ku-latn', $usage );
+   $this->assertArrayHasKey( 'Q885588#T', $usage );
+
+   $this->assertSame( true, $cacheSplit );
+   }
+
  

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.22]: mw.loader: Fix off-by-one error in splitModuleKey()

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: mw.loader: Fix off-by-one error in splitModuleKey()
..


mw.loader: Fix off-by-one error in splitModuleKey()

Follows-up 45bec76. This caused most localStorage cache entries from
mw.loader.store to be ignored because it'd store tje source code with
a version string that wrongly started with an "@".

As such, on the next page view, when comparing against the version
string from the startup manifest, it would mismatch and eventually
be pruned by mw.loader.store.

Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 6b23439..484930a 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1725,7 +1725,7 @@
}
return {
name: key.slice( 0, index ),
-   version: key.slice( index )
+   version: key.slice( index + 1 )
};
}
 
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index bfac513..7233a2e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -639,6 +639,8 @@
return mw.loader.using( 'test.stale' )
.then( function () {
assert.strictEqual( count, 1 );
+   // After implementing, registry contains 
version as implemented by the response.
+   assert.strictEqual( mw.loader.getVersion( 
'test.stale' ), 'v1', 'Override version' );
assert.strictEqual( mw.loader.getState( 
'test.stale' ), 'ready' );
assert.ok( mw.loader.store.get( 'test.stale' ), 
'In store' );
} )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
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]: mw.loader: Fix off-by-one error in splitModuleKey()

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: mw.loader: Fix off-by-one error in splitModuleKey()
..


mw.loader: Fix off-by-one error in splitModuleKey()

Follows-up 45bec76. This caused most localStorage cache entries from
mw.loader.store to be ignored because it'd store tje source code with
a version string that wrongly started with an "@".

As such, on the next page view, when comparing against the version
string from the startup manifest, it would mismatch and eventually
be pruned by mw.loader.store.

Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 6b23439..484930a 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1725,7 +1725,7 @@
}
return {
name: key.slice( 0, index ),
-   version: key.slice( index )
+   version: key.slice( index + 1 )
};
}
 
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index bfac513..7233a2e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -639,6 +639,8 @@
return mw.loader.using( 'test.stale' )
.then( function () {
assert.strictEqual( count, 1 );
+   // After implementing, registry contains 
version as implemented by the response.
+   assert.strictEqual( mw.loader.getVersion( 
'test.stale' ), 'v1', 'Override version' );
assert.strictEqual( mw.loader.getState( 
'test.stale' ), 'ready' );
assert.ok( mw.loader.store.get( 'test.stale' ), 
'In store' );
} )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.22]: mw.loader: Fix off-by-one error in splitModuleKey()

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: mw.loader: Fix off-by-one error in splitModuleKey()
..

mw.loader: Fix off-by-one error in splitModuleKey()

Follows-up 45bec76. This caused most localStorage cache entries from
mw.loader.store to be ignored because it'd store tje source code with
a version string that wrongly started with an "@".

As such, on the next page view, when comparing against the version
string from the startup manifest, it would mismatch and eventually
be pruned by mw.loader.store.

Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/317743/1

diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 6b23439..484930a 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1725,7 +1725,7 @@
}
return {
name: key.slice( 0, index ),
-   version: key.slice( index )
+   version: key.slice( index + 1 )
};
}
 
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index bfac513..7233a2e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -639,6 +639,8 @@
return mw.loader.using( 'test.stale' )
.then( function () {
assert.strictEqual( count, 1 );
+   // After implementing, registry contains 
version as implemented by the response.
+   assert.strictEqual( mw.loader.getVersion( 
'test.stale' ), 'v1', 'Override version' );
assert.strictEqual( mw.loader.getState( 
'test.stale' ), 'ready' );
assert.ok( mw.loader.store.get( 'test.stale' ), 
'In store' );
} )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Krinkle 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.loader: Fix off-by-one error in splitModuleKey()

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: mw.loader: Fix off-by-one error in splitModuleKey()
..

mw.loader: Fix off-by-one error in splitModuleKey()

Follows-up 45bec76. This caused most localStorage cache entries from
mw.loader.store to be ignored because it'd store tje source code with
a version string that wrongly started with an "@".

As such, on the next page view, when comparing against the version
string from the startup manifest, it would mismatch and eventually
be pruned by mw.loader.store.

Change-Id: If14c80989c0bb28b7b209abe89f83d585c563987
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/317742/1

diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 6b23439..484930a 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1725,7 +1725,7 @@
}
return {
name: key.slice( 0, index ),
-   version: key.slice( index )
+   version: key.slice( index + 1 )
};
}
 
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index bfac513..7233a2e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -639,6 +639,8 @@
return mw.loader.using( 'test.stale' )
.then( function () {
assert.strictEqual( count, 1 );
+   // After implementing, registry contains 
version as implemented by the response.
+   assert.strictEqual( mw.loader.getVersion( 
'test.stale' ), 'v1', 'Override version' );
assert.strictEqual( mw.loader.getState( 
'test.stale' ), 'ready' );
assert.ok( mw.loader.store.get( 'test.stale' ), 
'In store' );
} )

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phab/ex gitblit: Strip out branch HEAD in git.wikimedia.org ...

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: phab/ex gitblit: Strip out branch HEAD in git.wikimedia.org 
tree link
..


phab/ex gitblit: Strip out branch HEAD in git.wikimedia.org tree link

regex is by @Danny_B

Bug: T141965
Change-Id: I7f79a86bfd2d5b1f3168cc685b3aac3589fd1755
---
M modules/phabricator/templates/gitblit_vhost.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/phabricator/templates/gitblit_vhost.conf.erb 
b/modules/phabricator/templates/gitblit_vhost.conf.erb
index c317a1f..804499c 100644
--- a/modules/phabricator/templates/gitblit_vhost.conf.erb
+++ b/modules/phabricator/templates/gitblit_vhost.conf.erb
@@ -40,8 +40,8 @@
   RewriteCond %{QUERY_STRING} ^(.*&)?r=([0-9A-Za-z/_\.-]+).git(&.*)?$
   RewriteRule 
^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/$ 
/$1/%2.git [NE]
 
-  # remove "refs%2Fheads%2F" and "refs%2Fremotes%2Forigin%2F"
-  RewriteRule ^(.*)refs\%2[Ff](heads|remotes\%2[Ff]origin)\%2[Ff](.*)$ $1$3
+  # remove "HEAD/" and "refs%2Fheads%2F" and "refs%2Fremotes%2Forigin%2F"
+  RewriteRule ^(.*)(HEAD/|refs\%2[Ff](heads|remotes\%2[Ff]origin)\%2[Ff])(.*)$ 
$1$4
 
   #  -> 
   RewriteRule 
^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\%2[Ff](.*)\.git(.*)$
 /$1/$2/$3.git$4 [N]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f79a86bfd2d5b1f3168cc685b3aac3589fd1755
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Danny B. 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: General debugging

[Sophivorus (Code Review)]

Sophivorus has uploaded a new change for review.

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

Change subject: General debugging
..

General debugging

Also some code pretification.

Change-Id: I886588d935cedaa82ed605cbd98d3685f3bbcf16
---
M proveit.js
1 file changed, 22 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikipedia/gadgets/ProveIt 
refs/changes/41/317741/1

diff --git a/proveit.js b/proveit.js
index 7042f01..85f83ab 100755
--- a/proveit.js
+++ b/proveit.js
@@ -681,11 +681,14 @@
 *
 * @return {string} full template name
 */
-   this.getTemplateName = function () {
-   var formattedNamespaces = mw.config.get( 
'wgFormattedNamespaces' ),
-   templateNamespace = formattedNamespaces[10];
-   templateName = templateNamespace + ':' + 
this.template;
-   return templateName;
+   this.getTemplateTitle = function () {
+   var templateTitle = '';
+   if ( this.template ) {
+   var formattedNamespaces = mw.config.get( 
'wgFormattedNamespaces' ),
+   templateNamespace = 
formattedNamespaces[10];
+   templateTitle = templateNamespace + ':' + 
this.template;
+   }
+   return templateTitle;
};
 
/**
@@ -694,8 +697,11 @@
 * @return {object}
 */
this.getTemplateData = function () {
-   var templateName = this.getTemplateName();
-   templateData = proveit.templateData[ 
templateName ]
+   var templateData = {},
+   templateTitle = this.getTemplateTitle();
+   if ( templateTitle in proveit.templateData ) {
+   templateData = proveit.templateData[ 
templateTitle ];
+   }
return templateData;
};
 
@@ -705,9 +711,12 @@
 * @return {object} TemplateData of the registered parameters
 */
this.getRegisteredParams = function () {
-   var templateData = this.getTemplateData(),
-   paramsData = templateData.params;
-   return paramsData;
+   var registeredParams = {},
+   templateData = this.getTemplateData();
+   if ( 'params' in templateData ) {
+   registeredParams = templateData.params;
+   }
+   return registeredParams;
};
 
/**
@@ -802,7 +811,7 @@
this.getTemplateMap = function () {
var templateMap = {},
templateData = this.getTemplateData();
-   if ( 'maps' in templateData && 'proveit' in 
templateData.maps ) {
+   if ( templateData && 'maps' in templateData && 
'proveit' in templateData.maps ) {
templateMap = templateData.maps.proveit;
}
return templateMap;
@@ -921,8 +930,8 @@
templateOption = $( '' ).text( 
templateName ).val( '' );
templateSelect.append( templateOption );
templateRow.append( templateLabel, templateSelect );
-   for ( templateName in proveit.templateData ) {
-   templateName = templateName.substr( 
templateName.indexOf( ':' ) + 1 ); // Remove the namespace
+   for ( var templateTitle in proveit.templateData ) {
+   templateName = templateTitle.substr( 
templateTitle.indexOf( ':' ) + 1 ); // Remove the namespace
templateOption = $( '' ).text( 
templateName ).val( templateName );
if ( this.template === templateName ) {
templateOption.attr( 'selected', 
'selected' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I886588d935cedaa82ed605cbd98d3685f3bbcf16
Gerrit-PatchSet: 1
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus 

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

[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: General debugging

[Sophivorus (Code Review)]

Sophivorus has submitted this change and it was merged.

Change subject: General debugging
..


General debugging

Also some code pretification.

Change-Id: I886588d935cedaa82ed605cbd98d3685f3bbcf16
---
M proveit.js
1 file changed, 22 insertions(+), 13 deletions(-)

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



diff --git a/proveit.js b/proveit.js
index 7042f01..85f83ab 100755
--- a/proveit.js
+++ b/proveit.js
@@ -681,11 +681,14 @@
 *
 * @return {string} full template name
 */
-   this.getTemplateName = function () {
-   var formattedNamespaces = mw.config.get( 
'wgFormattedNamespaces' ),
-   templateNamespace = formattedNamespaces[10];
-   templateName = templateNamespace + ':' + 
this.template;
-   return templateName;
+   this.getTemplateTitle = function () {
+   var templateTitle = '';
+   if ( this.template ) {
+   var formattedNamespaces = mw.config.get( 
'wgFormattedNamespaces' ),
+   templateNamespace = 
formattedNamespaces[10];
+   templateTitle = templateNamespace + ':' + 
this.template;
+   }
+   return templateTitle;
};
 
/**
@@ -694,8 +697,11 @@
 * @return {object}
 */
this.getTemplateData = function () {
-   var templateName = this.getTemplateName();
-   templateData = proveit.templateData[ 
templateName ]
+   var templateData = {},
+   templateTitle = this.getTemplateTitle();
+   if ( templateTitle in proveit.templateData ) {
+   templateData = proveit.templateData[ 
templateTitle ];
+   }
return templateData;
};
 
@@ -705,9 +711,12 @@
 * @return {object} TemplateData of the registered parameters
 */
this.getRegisteredParams = function () {
-   var templateData = this.getTemplateData(),
-   paramsData = templateData.params;
-   return paramsData;
+   var registeredParams = {},
+   templateData = this.getTemplateData();
+   if ( 'params' in templateData ) {
+   registeredParams = templateData.params;
+   }
+   return registeredParams;
};
 
/**
@@ -802,7 +811,7 @@
this.getTemplateMap = function () {
var templateMap = {},
templateData = this.getTemplateData();
-   if ( 'maps' in templateData && 'proveit' in 
templateData.maps ) {
+   if ( templateData && 'maps' in templateData && 
'proveit' in templateData.maps ) {
templateMap = templateData.maps.proveit;
}
return templateMap;
@@ -921,8 +930,8 @@
templateOption = $( '' ).text( 
templateName ).val( '' );
templateSelect.append( templateOption );
templateRow.append( templateLabel, templateSelect );
-   for ( templateName in proveit.templateData ) {
-   templateName = templateName.substr( 
templateName.indexOf( ':' ) + 1 ); // Remove the namespace
+   for ( var templateTitle in proveit.templateData ) {
+   templateName = templateTitle.substr( 
templateTitle.indexOf( ':' ) + 1 ); // Remove the namespace
templateOption = $( '' ).text( 
templateName ).val( templateName );
if ( this.template === templateName ) {
templateOption.attr( 'selected', 
'selected' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I886588d935cedaa82ed605cbd98d3685f3bbcf16
Gerrit-PatchSet: 2
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus 
Gerrit-Reviewer: Sophivorus 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: also schedule host services downtime

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: icinga: also schedule host services downtime
..


icinga: also schedule host services downtime

In addition to host downtime also schedule downtime for service(s) on the host,
in case recovery of services takes longer than the host's.

Change-Id: I29e029932392b08e90527fffc761f72248e4bba2
---
M modules/icinga/files/icinga-downtime
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/icinga/files/icinga-downtime 
b/modules/icinga/files/icinga-downtime
index 05aab26..f4123a2 100755
--- a/modules/icinga/files/icinga-downtime
+++ b/modules/icinga/files/icinga-downtime
@@ -49,6 +49,7 @@
 end_time=$(( $start_time + $duration ))
 
 printf "[%lu] 
SCHEDULE_HOST_DOWNTIME;${hostname};${start_time};${end_time};1;0;${duration};${user};${reason}\n"
 $(date +%s) > $commandfile
+printf "[%lu] 
SCHEDULE_HOST_SVC_DOWNTIME;${hostname};${start_time};${end_time};1;0;${duration};${user};${reason}\n"
 $(date +%s) > $commandfile
 
 tail -f $logfile | grep -m2 $hostname
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I29e029932392b08e90527fffc761f72248e4bba2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
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]: icinga: default duration for icinga-downtime

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: icinga: default duration for icinga-downtime
..


icinga: default duration for icinga-downtime

Provide 2h default downtime, for convenience

Change-Id: I577b488764ca020d0fcfcb762ac1c7ecec950015
---
M modules/icinga/files/icinga-downtime
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/modules/icinga/files/icinga-downtime 
b/modules/icinga/files/icinga-downtime
index 0140a25..05aab26 100755
--- a/modules/icinga/files/icinga-downtime
+++ b/modules/icinga/files/icinga-downtime
@@ -6,7 +6,7 @@
 # example: ./icinga-downtime -h mw1021 -d 7200 -r "something happened"
 #
 # -h  should be the (short) name of a host as shown in the Icinga UI
-# -d  how long should the downtime last, in seconds (2 hrs = 7200)
+# -d  how long should the downtime last, in seconds (default 7200 
(2h))
 # -ra string with the reason for the downtime
 #
 
@@ -36,11 +36,15 @@
 esac
 done
 
-if [ -z $hostname ] || [ -z $duration ] || [ -z "$reason" ]; then
+if [ -z "$hostname" ] || [ -z "$reason" ]; then
 echo "usage: $0 -h  -d  -r "
 exit
 fi
 
+if [ -z "$duration" ]; then
+duration=7200
+fi
+
 start_time=$(date +%s) # now
 end_time=$(( $start_time + $duration ))
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I577b488764ca020d0fcfcb762ac1c7ecec950015
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: More fixes for string replacements

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: More fixes for string replacements
..


More fixes for string replacements

Change-Id: I9b9aa67a639c5c9510502007f717c7944697cbdc
---
M PageForms.php
1 file changed, 16 insertions(+), 16 deletions(-)

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



diff --git a/PageForms.php b/PageForms.php
index 6a1588a..e85e4d7 100644
--- a/PageForms.php
+++ b/PageForms.php
@@ -143,8 +143,8 @@
 $GLOBALS['wgActions']['formcreate'] = 'PFHelperFormAction';
 
 // API modules
-$GLOBALS['wgAPIModules']['PFautocomplete'] = 'PFAutocompleteAPI';
-$GLOBALS['wgAPIModules']['PFautoedit'] = 'PFAutoeditAPI';
+$GLOBALS['wgAPIModules']['pfautocomplete'] = 'PFAutocompleteAPI';
+$GLOBALS['wgAPIModules']['pfautoedit'] = 'PFAutoeditAPI';
 
 // register all special pages and other classes
 $GLOBALS['wgSpecialPages']['Forms'] = 'PFForms';
@@ -260,22 +260,22 @@
'jquery.ui.button',
'jquery.ui.sortable',
'jquery.ui.widget',
-   'ext.PageForms.fancybox',
-   'ext.PageForms.autogrow',
+   'ext.pageforms.fancybox',
+   'ext.pageforms.autogrow',
'mediawiki.util',
-   'ext.PageForms.select2',
+   'ext.pageforms.select2',
),
'messages' => array(
-   'PF_formerrors_header',
-   'PF_too_few_instances_error',
-   'PF_too_many_instances_error',
-   'PF_blank_error',
-   'PF_not_unique_error',
-   'PF_bad_url_error',
-   'PF_bad_email_error',
-   'PF_bad_number_error',
-   'PF_bad_date_error',
-   'PF_pipe_error',
+   'pf_formerrors_header',
+   'pf_too_few_instances_error',
+   'pf_too_many_instances_error',
+   'pf_blank_error',
+   'pf_not_unique_error',
+   'pf_bad_url_error',
+   'pf_bad_email_error',
+   'pf_bad_number_error',
+   'pf_bad_date_error',
+   'pf_pipe_error',
),
),
'ext.pageforms.browser' => $wgPageFormsResourceTemplate + array(
@@ -397,7 +397,7 @@
'libs/ext.pf.js',
),
),
-   'ext.PageForms.pf_CreateProperty' => $wgPageFormsResourceTemplate + 
array(
+   'ext.pageforms.pf_CreateProperty' => $wgPageFormsResourceTemplate + 
array(
'scripts' => array(
'libs/pf_CreateProperty.js',
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b9aa67a639c5c9510502007f717c7944697cbdc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[master]: More fixes for string replacements

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: More fixes for string replacements
..

More fixes for string replacements

Change-Id: I9b9aa67a639c5c9510502007f717c7944697cbdc
---
M PageForms.php
1 file changed, 16 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/40/317740/2

diff --git a/PageForms.php b/PageForms.php
index 6a1588a..e85e4d7 100644
--- a/PageForms.php
+++ b/PageForms.php
@@ -143,8 +143,8 @@
 $GLOBALS['wgActions']['formcreate'] = 'PFHelperFormAction';
 
 // API modules
-$GLOBALS['wgAPIModules']['PFautocomplete'] = 'PFAutocompleteAPI';
-$GLOBALS['wgAPIModules']['PFautoedit'] = 'PFAutoeditAPI';
+$GLOBALS['wgAPIModules']['pfautocomplete'] = 'PFAutocompleteAPI';
+$GLOBALS['wgAPIModules']['pfautoedit'] = 'PFAutoeditAPI';
 
 // register all special pages and other classes
 $GLOBALS['wgSpecialPages']['Forms'] = 'PFForms';
@@ -260,22 +260,22 @@
'jquery.ui.button',
'jquery.ui.sortable',
'jquery.ui.widget',
-   'ext.PageForms.fancybox',
-   'ext.PageForms.autogrow',
+   'ext.pageforms.fancybox',
+   'ext.pageforms.autogrow',
'mediawiki.util',
-   'ext.PageForms.select2',
+   'ext.pageforms.select2',
),
'messages' => array(
-   'PF_formerrors_header',
-   'PF_too_few_instances_error',
-   'PF_too_many_instances_error',
-   'PF_blank_error',
-   'PF_not_unique_error',
-   'PF_bad_url_error',
-   'PF_bad_email_error',
-   'PF_bad_number_error',
-   'PF_bad_date_error',
-   'PF_pipe_error',
+   'pf_formerrors_header',
+   'pf_too_few_instances_error',
+   'pf_too_many_instances_error',
+   'pf_blank_error',
+   'pf_not_unique_error',
+   'pf_bad_url_error',
+   'pf_bad_email_error',
+   'pf_bad_number_error',
+   'pf_bad_date_error',
+   'pf_pipe_error',
),
),
'ext.pageforms.browser' => $wgPageFormsResourceTemplate + array(
@@ -397,7 +397,7 @@
'libs/ext.pf.js',
),
),
-   'ext.PageForms.pf_CreateProperty' => $wgPageFormsResourceTemplate + 
array(
+   'ext.pageforms.pf_CreateProperty' => $wgPageFormsResourceTemplate + 
array(
'scripts' => array(
'libs/pf_CreateProperty.js',
),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b9aa67a639c5c9510502007f717c7944697cbdc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from e4c4f4e0b3041c4a3bfad11ab1f456c4484d2894:

[Smalyshev (Code Review)]

Smalyshev has submitted this change and it was merged.

Change subject: Merging from e4c4f4e0b3041c4a3bfad11ab1f456c4484d2894:
..


Merging from e4c4f4e0b3041c4a3bfad11ab1f456c4484d2894:

Fix for polestar & build

Change-Id: If291246baf9741a99e8f595a2457f4c7b2cb
---
M index.html
R js/wdqs.min.66c004f90cc173110d01.js
A polestar/LICENSE
A polestar/bower_components/zeroclipboard/dist/ZeroClipboard.swf
A polestar/embed.html
A polestar/scripts/app.js
A polestar/scripts/vendor.js
A polestar/styles/app.css
A polestar/styles/vendor.css
9 files changed, 396 insertions(+), 2 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: If291246baf9741a99e8f595a2457f4c7b2cb
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 

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

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from e4c4f4e0b3041c4a3bfad11ab1f456c4484d2894:

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Merging from e4c4f4e0b3041c4a3bfad11ab1f456c4484d2894:
..

Merging from e4c4f4e0b3041c4a3bfad11ab1f456c4484d2894:

Fix for polestar & build

Change-Id: If291246baf9741a99e8f595a2457f4c7b2cb
---
M index.html
R js/wdqs.min.66c004f90cc173110d01.js
A polestar/LICENSE
A polestar/bower_components/zeroclipboard/dist/ZeroClipboard.swf
A polestar/embed.html
A polestar/scripts/app.js
A polestar/scripts/vendor.js
A polestar/styles/app.css
A polestar/styles/vendor.css
9 files changed, 396 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy 
refs/changes/39/317739/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If291246baf9741a99e8f595a2457f4c7b2cb
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix for polestar & build

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix for polestar & build
..


Fix for polestar & build

Change-Id: If291246baf9741a99e8f595a2457f4c7b2cb
---
M Gruntfile.js
M wikibase/queryService/ui/App.js
2 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 517ea90..4c8489f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,7 +20,7 @@
},
jsonlint: {
all: [
-   '**/*.json', '!node_modules/**', 
'!vendor/**', '!dist/**'
+   '**/*.json', '!node_modules/**', 
'!vendor/**', '!dist/**', '!polestar/**'
]
},
qunit: {
@@ -98,6 +98,12 @@

'logo.svg', 'robots.txt'
],
dest: dist
+   },{
+   expand: true,
+   src: [
+   '**/polestar/**'
+   ],
+   dest: dist
}
]
}
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 4927059..9ef2e47 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -106,7 +106,7 @@
$element: null
},
Polestar: {
-   icon: 'stats',
+   icon: 'glyphicon-stats',
label: 'Graph it!',
class: 'PolestarResultBrowser',
object: null,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If291246baf9741a99e8f595a2457f4c7b2cb
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Clear content to avoid user page float issues

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Clear content to avoid user page float issues
..

Clear content to avoid user page float issues

Post content container should always be present
even if empty

Bug: T147891
Change-Id: I81bb7b2ce7195a5e77436ab76848379e07d363c4
---
M includes/skins/MinervaTemplate.php
1 file changed, 9 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/38/317738/1

diff --git a/includes/skins/MinervaTemplate.php 
b/includes/skins/MinervaTemplate.php
index 0cf9079..c1f6c4a 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -197,23 +197,22 @@
 * @return string
 */
protected function getSecondaryActionsHtml() {
-   // no secondary actions on the user page
-   if ( $this->getSkin()->isUserPage ) {
-   return '';
-   }
$baseClass = MobileUI::buttonClass( '', 'button' );
$html = Html::openElement( 'div', [
'class' => 'post-content',
'id' => 'page-secondary-actions'
] );
 
-   foreach ( $this->getSecondaryActions() as $el ) {
-   if ( isset( $el['attributes']['class'] ) ) {
-   $el['attributes']['class'] .= ' ' . $baseClass;
-   } else {
-   $el['attributes']['class'] = $baseClass;
+   // no secondary actions on the user page
+   if ( $this->getSkin()->isUserPage ) {
+   foreach ( $this->getSecondaryActions() as $el ) {
+   if ( isset( $el['attributes']['class'] ) ) {
+   $el['attributes']['class'] .= ' ' . 
$baseClass;
+   } else {
+   $el['attributes']['class'] = $baseClass;
+   }
+   $html .= Html::element( 'a', $el['attributes'], 
$el['label'] );
}
-   $html .= Html::element( 'a', $el['attributes'], 
$el['label'] );
}
 
return $html . Html::closeElement( 'div' );

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix for polestar & build

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Fix for polestar & build
..

Fix for polestar & build

Change-Id: If291246baf9741a99e8f595a2457f4c7b2cb
---
M Gruntfile.js
M wikibase/queryService/ui/App.js
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/37/317737/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 517ea90..4c8489f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,7 +20,7 @@
},
jsonlint: {
all: [
-   '**/*.json', '!node_modules/**', 
'!vendor/**', '!dist/**'
+   '**/*.json', '!node_modules/**', 
'!vendor/**', '!dist/**', '!polestar/**'
]
},
qunit: {
@@ -98,6 +98,12 @@

'logo.svg', 'robots.txt'
],
dest: dist
+   },{
+   expand: true,
+   src: [
+   '**/polestar/**'
+   ],
+   dest: dist
}
]
}
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 4927059..9ef2e47 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -106,7 +106,7 @@
$element: null
},
Polestar: {
-   icon: 'stats',
+   icon: 'glyphicon-stats',
label: 'Graph it!',
class: 'PolestarResultBrowser',
object: null,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If291246baf9741a99e8f595a2457f4c7b2cb
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...OAuth[REL1_26]: SECURITY: check stage and user blocked/locked status in /ide...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: SECURITY: check stage and user blocked/locked status in 
/identify
..


SECURITY: check stage and user blocked/locked status in /identify

Bug: T148600
Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
(cherry picked from commit 3f5875b23f5ff7eb43a740075e383ec816adbeed)
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 42dcad3..2dea5a3 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -30,7 +30,7 @@
}
 
public function execute( $subpage ) {
-   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly, 
$wgBlockDisablesLogin;
 
$this->setHeaders();
 
@@ -137,6 +137,8 @@
$oauthRequest = 
MWOAuthRequest::fromRequest( $request );
// verify_request throws an exception 
if anything isn't verified
list( $consumer, $token ) = 
$server->verify_request( $oauthRequest );
+   /** @var MWOAuthConsumer $consumer */
+   /** @var MWOAuthToken $token */
 
$wiki = wfWikiID();
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -147,10 +149,15 @@

'mwoauth-invalid-authorization-wrong-wiki',
array( $wiki )
);
+   } elseif ( !$consumer->isUsableBy( 
$user ) ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-not-approved',
+   $consumer->get( 'name' 
) );
}
$localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access->get( 'userId' ) );
if ( !$localUser || 
!$localUser->isLoggedIn() ) {
throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   } elseif ( $localUser->isLocked() || 
$wgBlockDisablesLogin && $localUser->isBlocked() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-blocked-user' );
}
 
// We know the identity of the user who 
granted the authorization

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: REL1_26
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
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...OAuth[REL1_27]: SECURITY: check stage and user blocked/locked status in /ide...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: SECURITY: check stage and user blocked/locked status in 
/identify
..


SECURITY: check stage and user blocked/locked status in /identify

Bug: T148600
Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
(cherry picked from commit 3f5875b23f5ff7eb43a740075e383ec816adbeed)
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 0b3ba0d..df993cf 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -38,7 +38,7 @@
}
 
public function execute( $subpage ) {
-   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly, 
$wgBlockDisablesLogin;
 
$this->setHeaders();
 
@@ -147,6 +147,8 @@
$oauthRequest = 
MWOAuthRequest::fromRequest( $request );
// verify_request throws an exception 
if anything isn't verified
list( $consumer, $token ) = 
$server->verify_request( $oauthRequest );
+   /** @var MWOAuthConsumer $consumer */
+   /** @var MWOAuthToken $token */
 
$wiki = wfWikiID();
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -157,10 +159,15 @@

'mwoauth-invalid-authorization-wrong-wiki',
array( $wiki )
);
+   } elseif ( !$consumer->isUsableBy( 
$user ) ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-not-approved',
+   $consumer->get( 'name' 
) );
}
$localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access->get( 'userId' ) );
if ( !$localUser || 
!$localUser->isLoggedIn() ) {
throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   } elseif ( $localUser->isLocked() || 
$wgBlockDisablesLogin && $localUser->isBlocked() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-blocked-user' );
}
 
// We know the identity of the user who 
granted the authorization

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: REL1_27
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
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...OAuth[REL1_23]: SECURITY: check stage and user blocked/locked status in /ide...

[Code Review]

Gergő Tisza has submitted this change and it was merged.

Change subject: SECURITY: check stage and user blocked/locked status in 
/identify
..


SECURITY: check stage and user blocked/locked status in /identify

Bug: T148600
Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
(cherry picked from commit 3f5875b23f5ff7eb43a740075e383ec816adbeed)
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Verified; Looks good to me, approved



diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 6e6eccf..dd46415 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -27,7 +27,7 @@
}
 
public function execute( $subpage ) {
-   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly, 
$wgBlockDisablesLogin;
 
$this->setHeaders();
 
@@ -131,6 +131,8 @@
$oauthRequest = 
MWOAuthRequest::fromRequest( $request );
// verify_request throws an exception 
if anything isn't verified
list( $consumer, $token ) = 
$server->verify_request( $oauthRequest );
+   /** @var MWOAuthConsumer $consumer */
+   /** @var MWOAuthToken $token */
 
$wiki = wfWikiID();
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -141,10 +143,15 @@

'mwoauth-invalid-authorization-wrong-wiki',
array( $wiki )
);
+   } elseif ( !$consumer->isUsableBy( 
$user ) ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-not-approved',
+   $consumer->get( 'name' 
) );
}
$localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access->get( 'userId' ) );
if ( !$localUser || 
!$localUser->isLoggedIn() ) {
throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   } elseif ( $localUser->isLocked() || 
$wgBlockDisablesLogin && $localUser->isBlocked() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-blocked-user' );
}
 
// We know the identity of the user who 
granted the authorization

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: REL1_23
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
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...OAuth[REL1_27]: SECURITY: check stage and user blocked/locked status in /ide...

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: SECURITY: check stage and user blocked/locked status in 
/identify
..

SECURITY: check stage and user blocked/locked status in /identify

Bug: T148600
Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
(cherry picked from commit 3f5875b23f5ff7eb43a740075e383ec816adbeed)
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/36/317736/1

diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 0b3ba0d..df993cf 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -38,7 +38,7 @@
}
 
public function execute( $subpage ) {
-   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly, 
$wgBlockDisablesLogin;
 
$this->setHeaders();
 
@@ -147,6 +147,8 @@
$oauthRequest = 
MWOAuthRequest::fromRequest( $request );
// verify_request throws an exception 
if anything isn't verified
list( $consumer, $token ) = 
$server->verify_request( $oauthRequest );
+   /** @var MWOAuthConsumer $consumer */
+   /** @var MWOAuthToken $token */
 
$wiki = wfWikiID();
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -157,10 +159,15 @@

'mwoauth-invalid-authorization-wrong-wiki',
array( $wiki )
);
+   } elseif ( !$consumer->isUsableBy( 
$user ) ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-not-approved',
+   $consumer->get( 'name' 
) );
}
$localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access->get( 'userId' ) );
if ( !$localUser || 
!$localUser->isLoggedIn() ) {
throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   } elseif ( $localUser->isLocked() || 
$wgBlockDisablesLogin && $localUser->isBlocked() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-blocked-user' );
}
 
// We know the identity of the user who 
granted the authorization

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: REL1_27
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...OAuth[REL1_26]: SECURITY: check stage and user blocked/locked status in /ide...

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: SECURITY: check stage and user blocked/locked status in 
/identify
..

SECURITY: check stage and user blocked/locked status in /identify

Bug: T148600
Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
(cherry picked from commit 3f5875b23f5ff7eb43a740075e383ec816adbeed)
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/35/317735/1

diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 42dcad3..2dea5a3 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -30,7 +30,7 @@
}
 
public function execute( $subpage ) {
-   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly, 
$wgBlockDisablesLogin;
 
$this->setHeaders();
 
@@ -137,6 +137,8 @@
$oauthRequest = 
MWOAuthRequest::fromRequest( $request );
// verify_request throws an exception 
if anything isn't verified
list( $consumer, $token ) = 
$server->verify_request( $oauthRequest );
+   /** @var MWOAuthConsumer $consumer */
+   /** @var MWOAuthToken $token */
 
$wiki = wfWikiID();
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -147,10 +149,15 @@

'mwoauth-invalid-authorization-wrong-wiki',
array( $wiki )
);
+   } elseif ( !$consumer->isUsableBy( 
$user ) ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-not-approved',
+   $consumer->get( 'name' 
) );
}
$localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access->get( 'userId' ) );
if ( !$localUser || 
!$localUser->isLoggedIn() ) {
throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   } elseif ( $localUser->isLocked() || 
$wgBlockDisablesLogin && $localUser->isBlocked() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-blocked-user' );
}
 
// We know the identity of the user who 
granted the authorization

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: REL1_26
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...OAuth[REL1_23]: SECURITY: check stage and user blocked/locked status in /ide...

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: SECURITY: check stage and user blocked/locked status in 
/identify
..

SECURITY: check stage and user blocked/locked status in /identify

Bug: T148600
Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
(cherry picked from commit 3f5875b23f5ff7eb43a740075e383ec816adbeed)
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/34/317734/1

diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 6e6eccf..dd46415 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -27,7 +27,7 @@
}
 
public function execute( $subpage ) {
-   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly, 
$wgBlockDisablesLogin;
 
$this->setHeaders();
 
@@ -131,6 +131,8 @@
$oauthRequest = 
MWOAuthRequest::fromRequest( $request );
// verify_request throws an exception 
if anything isn't verified
list( $consumer, $token ) = 
$server->verify_request( $oauthRequest );
+   /** @var MWOAuthConsumer $consumer */
+   /** @var MWOAuthToken $token */
 
$wiki = wfWikiID();
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -141,10 +143,15 @@

'mwoauth-invalid-authorization-wrong-wiki',
array( $wiki )
);
+   } elseif ( !$consumer->isUsableBy( 
$user ) ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-not-approved',
+   $consumer->get( 'name' 
) );
}
$localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access->get( 'userId' ) );
if ( !$localUser || 
!$localUser->isLoggedIn() ) {
throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   } elseif ( $localUser->isLocked() || 
$wgBlockDisablesLogin && $localUser->isBlocked() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-blocked-user' );
}
 
// We know the identity of the user who 
granted the authorization

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: REL1_23
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...OAuth[master]: SECURITY: check stage and user blocked/locked status in /ide...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: SECURITY: check stage and user blocked/locked status in 
/identify
..


SECURITY: check stage and user blocked/locked status in /identify

Bug: T148600
Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 8b39881..f6bbf7e 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -42,7 +42,7 @@
}
 
public function execute( $subpage ) {
-   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly, 
$wgBlockDisablesLogin;
 
$this->setHeaders();
 
@@ -151,6 +151,8 @@
$oauthRequest = 
MWOAuthRequest::fromRequest( $request );
// verify_request throws an exception 
if anything isn't verified
list( $consumer, $token ) = 
$server->verify_request( $oauthRequest );
+   /** @var MWOAuthConsumer $consumer */
+   /** @var MWOAuthToken $token */
 
$wiki = wfWikiID();
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -161,10 +163,15 @@

'mwoauth-invalid-authorization-wrong-wiki',
array( $wiki )
);
+   } elseif ( !$consumer->isUsableBy( 
$user ) ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-not-approved',
+   $consumer->get( 'name' 
) );
}
$localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access->get( 'userId' ) );
if ( !$localUser || 
!$localUser->isLoggedIn() ) {
throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   } elseif ( $localUser->isLocked() || 
$wgBlockDisablesLogin && $localUser->isBlocked() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-blocked-user' );
}
 
// We know the identity of the user who 
granted the authorization

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
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...OAuth[master]: SECURITY: check stage and user blocked/locked status in /ide...

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: SECURITY: check stage and user blocked/locked status in 
/identify
..

SECURITY: check stage and user blocked/locked status in /identify

Bug: T148600
Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
---
M frontend/specialpages/SpecialMWOAuth.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/33/317733/1

diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 8b39881..f6bbf7e 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -42,7 +42,7 @@
}
 
public function execute( $subpage ) {
-   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly;
+   global $wgMWOAuthSecureTokenTransfer, $wgMWOAuthReadOnly, 
$wgBlockDisablesLogin;
 
$this->setHeaders();
 
@@ -151,6 +151,8 @@
$oauthRequest = 
MWOAuthRequest::fromRequest( $request );
// verify_request throws an exception 
if anything isn't verified
list( $consumer, $token ) = 
$server->verify_request( $oauthRequest );
+   /** @var MWOAuthConsumer $consumer */
+   /** @var MWOAuthToken $token */
 
$wiki = wfWikiID();
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -161,10 +163,15 @@

'mwoauth-invalid-authorization-wrong-wiki',
array( $wiki )
);
+   } elseif ( !$consumer->isUsableBy( 
$user ) ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-not-approved',
+   $consumer->get( 'name' 
) );
}
$localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access->get( 'userId' ) );
if ( !$localUser || 
!$localUser->isLoggedIn() ) {
throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   } elseif ( $localUser->isLocked() || 
$wgBlockDisablesLogin && $localUser->isBlocked() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-blocked-user' );
}
 
// We know the identity of the user who 
granted the authorization

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81327a86890d99dfaef1b1a217a68b4404608394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
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...PageForms[master]: Add a namespace ID declaration

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add a namespace ID declaration
..


Add a namespace ID declaration

Change-Id: I7a8044ae9f2367c55ad0f7bf2b1bbef4da0c93fb
---
M includes/PF_Hooks.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/includes/PF_Hooks.php b/includes/PF_Hooks.php
index eaead29..63fc0a2 100644
--- a/includes/PF_Hooks.php
+++ b/includes/PF_Hooks.php
@@ -117,6 +117,11 @@
public static function registerNamespaces( array &$list ) {
global $wgNamespacesWithSubpages;
 
+   if ( !defined( 'PF_NS_FORM' ) ) {
+   define( 'PF_NS_FORM', 106 );
+   define( 'PF_NS_FORM_TALK', 107 );
+   }
+
$list[PF_NS_FORM] = 'Form';
$list[PF_NS_FORM_TALK] = 'Form_talk';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a8044ae9f2367c55ad0f7bf2b1bbef4da0c93fb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...release[master]: Stop mangling .gitreview pt 2

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Stop mangling .gitreview pt 2
..

Stop mangling .gitreview pt 2

Ideally we can do something even cleaner, but this is already
an improvement

Change-Id: I33fc5439e9fc97c869e134499eded0cade9b6b6d
---
M make-extension-branches/make-extension-branches
1 file changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/32/317732/1

diff --git a/make-extension-branches/make-extension-branches 
b/make-extension-branches/make-extension-branches
index 649db4f..99159d3 100755
--- a/make-extension-branches/make-extension-branches
+++ b/make-extension-branches/make-extension-branches
@@ -115,14 +115,9 @@
if ( $this->conf->verbose ) {
echo "... $extRepo: Branching $branchName at $commit\n";
}
-   $this->execCmd( 'git', 'checkout', '-q', '-b', $branchName, 
$commit );
-
-   # Intermediate commit & fixes
-   $this->fixGitReview( $branchName );
-   $this->execCmd( 'git', 'commit', '-a', '-q', '-m', "Creating 
new {$branchName} branch" );
 
# Final push to repo for this extension/skin
-   $this->execWriteCmd( 'git', 'push', 'origin', 
"$branchName:refs/heads/$branchName" );
+   $this->execWriteCmd( 'git', 'push', 'origin', 
"$commit:refs/heads/$branchName" );
}
 
protected function setupBuildDirectory() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33fc5439e9fc97c869e134499eded0cade9b6b6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Add a namespace ID declaration

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Add a namespace ID declaration
..

Add a namespace ID declaration

Change-Id: I7a8044ae9f2367c55ad0f7bf2b1bbef4da0c93fb
---
M includes/PF_Hooks.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/30/317730/2

diff --git a/includes/PF_Hooks.php b/includes/PF_Hooks.php
index eaead29..63fc0a2 100644
--- a/includes/PF_Hooks.php
+++ b/includes/PF_Hooks.php
@@ -117,6 +117,11 @@
public static function registerNamespaces( array &$list ) {
global $wgNamespacesWithSubpages;
 
+   if ( !defined( 'PF_NS_FORM' ) ) {
+   define( 'PF_NS_FORM', 106 );
+   define( 'PF_NS_FORM_TALK', 107 );
+   }
+
$list[PF_NS_FORM] = 'Form';
$list[PF_NS_FORM_TALK] = 'Form_talk';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a8044ae9f2367c55ad0f7bf2b1bbef4da0c93fb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
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...release[master]: Stop mangling .gitreview

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Stop mangling .gitreview
..

Stop mangling .gitreview

Avoids a pointless commit on extensions/skins/vendor branches.

Ideally we can rewrite this to use the Gerrit REST api to create
branches, but this is a good first step

Change-Id: I3ba2bb8ff3534c12dcb7c8d611693f34fa13c036
---
M make-wmf-branch/MakeWmfBranch.php
1 file changed, 0 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/31/317731/1

diff --git a/make-wmf-branch/MakeWmfBranch.php 
b/make-wmf-branch/MakeWmfBranch.php
index 1565391..2fe5118 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -161,8 +161,6 @@
function createBranch( $branchName, $doPush=true ) {
$this->runCmd( 'git', 'checkout', '-q', '-b', $branchName );
 
-   $this->fixGitReview();
-   $this->runWriteCmd( 'git', 'commit', '-a', '-q', '-m', 
"Creating new {$branchName} branch" );
if ( $doPush == true ) {
$this->runWriteCmd( 'git', 'push', 'origin', 
$branchName );
}
@@ -251,9 +249,6 @@
# Fix $wgVersion
$this->fixVersion( "includes/DefaultSettings.php" );
 
-   # Point gitreview defaultbranch at wmf/version
-   $this->fixGitReview();
-
# Do intermediate commit
$this->runCmd( 'git', 'commit', '-a', '-q', '-m', "Creating new 
WMF {$this->newVersion} branch" );
 
@@ -274,38 +269,5 @@
$s = preg_replace( '/^( \$wgVersion \s+ = \s+ )  [^;]*  ( ; \s* 
) $/xm',
"\\1'{$this->newVersion}'\\2", $s );
file_put_contents( $fileName, $s );
-   }
-
-   function fixGitReview() {
-   $lines = file( '.gitreview', FILE_IGNORE_NEW_LINES );
-   $outputFile = array();
-   $changed = false;
-
-   foreach ( $lines as $line ) {
-   $arr = explode( '=', $line );
-
-   if ( count( $arr ) < 2 ) {
-   $outputFile[] = $line;
-   continue;
-   }
-
-   list( $k, $v ) = $arr;
-
-   if ( trim( $k ) === 'defaultbranch' ) {
-   $v = "{$this->branchPrefix}{$this->newVersion}";
-   $changed = true;
-   }
-
-   $outputFile[] = implode( '=', array( $k, $v ) );
-   }
-
-   $final = implode( "\n", $outputFile );
-   $final .= "\n";
-
-   if ( !$changed ) {
-   $final .= '# Updated ' . date( 'c' ) . "\n";
-}
-
-   file_put_contents( '.gitreview', $final );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ba2bb8ff3534c12dcb7c8d611693f34fa13c036
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fixes dialog concurrent setup events, skip openFullScreen wh...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fixes dialog concurrent setup events, skip openFullScreen when 
updating hash
..


Fixes dialog concurrent setup events, skip openFullScreen when updating hash

Change-Id: I98e9e2067ab1ddb3222d51500c813483e98b3ee6
---
M modules/dialog/index.js
M modules/linkbox/Link.js
2 files changed, 28 insertions(+), 18 deletions(-)

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



diff --git a/modules/dialog/index.js b/modules/dialog/index.js
index 09d3a90..5c72936 100644
--- a/modules/dialog/index.js
+++ b/modules/dialog/index.js
@@ -85,10 +85,30 @@
dialog = getMapDialog(),
map;
 
-   if ( !window.opened ) {
+   function createAndRenderMap() {
+   mw.loader.using( 'ext.kartographer.box' ).then( 
function () {
+   map = mw.loader.require( 
'ext.kartographer.box' ).map( mapObject );
+
+   if ( map.useRouter && !routerEnabled ) {
+   router.route( '', function () {
+   close();
+   } );
+   }
+
+   dialog.setup.call( dialog, { map: map } 
);
+   dialog.ready.call( dialog, { map: map } 
);
+
+   mapCb( map );
+   } );
+   }
+
+   if ( window.opened ) {
+   createAndRenderMap();
+   } else {
getWindowManager()
.openWindow( dialog, {} )
.then( function ( opened ) {
+   createAndRenderMap();
return opened;
} )
.then( function ( closing ) {
@@ -105,20 +125,6 @@
} );
}
 
-   mw.loader.using( 'ext.kartographer.box' ).then( 
function () {
-   map = mw.loader.require( 'ext.kartographer.box' 
).map( mapObject );
-
-   if ( map.useRouter && !routerEnabled ) {
-   router.route( '', function () {
-   close();
-   } );
-   }
-
-   dialog.setup.call( dialog, { map: map } );
-   dialog.ready.call( dialog, { map: map } );
-
-   mapCb( map );
-   } );
},
 
/**
diff --git a/modules/linkbox/Link.js b/modules/linkbox/Link.js
index d4e2c35..7b79e51 100644
--- a/modules/linkbox/Link.js
+++ b/modules/linkbox/Link.js
@@ -82,7 +82,7 @@
Link.prototype.openFullScreen = function ( position ) {
 
var link = this,
-   map = link.map,
+   map = link.fullScreenMap,
mapObject,
el;
 
@@ -90,9 +90,13 @@
position.center = position.center || link.center;
position.zoom = typeof position.zoom === 'number' ? 
position.zoom : link.zoom;
 
-   if ( link.fullScreenMap && 
link.fullScreenMap._container._leaflet ) {
-   map = link.fullScreenMap;
+   if ( map && map._updatingHash ) {
+   // Skip - there is nothing to do.
+   map._updatingHash = false;
+   return;
+   }
 
+   if ( map && map._container._leaflet ) {
map.setView(
position.center,
position.zoom

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98e9e2067ab1ddb3222d51500c813483e98b3ee6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 
Gerrit-Reviewer: JGirault 
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] wikipedia...ProveIt[master]: Fix for long titles

[Sophivorus (Code Review)]

Sophivorus has submitted this change and it was merged.

Change subject: Fix for long titles
..


Fix for long titles

Also update the README

Bug: T149054

Change-Id: If6301cee13feb7160902dc47d1627ea3c83e0bea
---
M README.md
M proveit.css
M proveit.js
3 files changed, 4 insertions(+), 10 deletions(-)

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



diff --git a/README.md b/README.md
index acb1404..2b69537 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # ProveIt
 
-ProveIt is a powerful GUI tool to find, edit, add and cite references in any 
MediaWiki wiki.
+ProveIt is a Wikipedia gadget that makes it easy to find, edit, add and delete 
references when editing Wikipedia articles.
 
 Full documentation at https://commons.wikimedia.org/wiki/Help:Gadget-ProveIt
\ No newline at end of file
diff --git a/proveit.css b/proveit.css
index 00a30db..3689215 100755
--- a/proveit.css
+++ b/proveit.css
@@ -79,11 +79,6 @@
margin-right: 10px;
 }
 
-#proveit-reference-list .proveit-reference-item .proveit-main-value {
-   display: inline-block;
-   margin-right: 10px;
-}
-
 #proveit-reference-list .proveit-reference-item .proveit-citations {
float: right;
 }
diff --git a/proveit.js b/proveit.js
index 91beb20..7042f01 100755
--- a/proveit.js
+++ b/proveit.js
@@ -1,5 +1,5 @@
 /**
- * ProveIt is a powerful GUI tool to find, edit, add and cite references in 
any MediaWiki wiki
+ * ProveIt is a Wikipedia gadget that makes it easy to find, edit, add and 
delete references when editing Wikipedia articles.
  * Full documentation at https://commons.wikimedia.org/wiki/Help:Gadget-ProveIt
  *
  * Copyright 2008-2011 Georgia Tech Research Corporation, Atlanta, GA 
30332-0415, ALL RIGHTS RESERVED
@@ -857,9 +857,8 @@
item.html( templateSpan );
 
// Then add the main value of the reference 
(usually the title)
-   var mainValue = this.getMainValue(),
-   mainValueSpan = $( '' ).addClass( 
'proveit-main-value' ).text( mainValue );
-   item.append( mainValueSpan );
+   var mainValue = this.getMainValue();
+   item.append( mainValue );
 
} else {
item.text( this.content );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6301cee13feb7160902dc47d1627ea3c83e0bea
Gerrit-PatchSet: 2
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus 
Gerrit-Reviewer: Sophivorus 

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

[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Fix for long titles

[Sophivorus (Code Review)]

Sophivorus has uploaded a new change for review.

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

Change subject: Fix for long titles
..

Fix for long titles

Also update the README

Change-Id: If6301cee13feb7160902dc47d1627ea3c83e0bea
---
M README.md
M proveit.css
M proveit.js
3 files changed, 4 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikipedia/gadgets/ProveIt 
refs/changes/29/317729/1

diff --git a/README.md b/README.md
index acb1404..2b69537 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # ProveIt
 
-ProveIt is a powerful GUI tool to find, edit, add and cite references in any 
MediaWiki wiki.
+ProveIt is a Wikipedia gadget that makes it easy to find, edit, add and delete 
references when editing Wikipedia articles.
 
 Full documentation at https://commons.wikimedia.org/wiki/Help:Gadget-ProveIt
\ No newline at end of file
diff --git a/proveit.css b/proveit.css
index 00a30db..3689215 100755
--- a/proveit.css
+++ b/proveit.css
@@ -79,11 +79,6 @@
margin-right: 10px;
 }
 
-#proveit-reference-list .proveit-reference-item .proveit-main-value {
-   display: inline-block;
-   margin-right: 10px;
-}
-
 #proveit-reference-list .proveit-reference-item .proveit-citations {
float: right;
 }
diff --git a/proveit.js b/proveit.js
index 91beb20..7042f01 100755
--- a/proveit.js
+++ b/proveit.js
@@ -1,5 +1,5 @@
 /**
- * ProveIt is a powerful GUI tool to find, edit, add and cite references in 
any MediaWiki wiki
+ * ProveIt is a Wikipedia gadget that makes it easy to find, edit, add and 
delete references when editing Wikipedia articles.
  * Full documentation at https://commons.wikimedia.org/wiki/Help:Gadget-ProveIt
  *
  * Copyright 2008-2011 Georgia Tech Research Corporation, Atlanta, GA 
30332-0415, ALL RIGHTS RESERVED
@@ -857,9 +857,8 @@
item.html( templateSpan );
 
// Then add the main value of the reference 
(usually the title)
-   var mainValue = this.getMainValue(),
-   mainValueSpan = $( '' ).addClass( 
'proveit-main-value' ).text( mainValue );
-   item.append( mainValueSpan );
+   var mainValue = this.getMainValue();
+   item.append( mainValue );
 
} else {
item.text( this.content );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6301cee13feb7160902dc47d1627ea3c83e0bea
Gerrit-PatchSet: 1
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus 

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Swapping defaultbranch for track

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Swapping defaultbranch for track
..


Swapping defaultbranch for track

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: If3de24dec498daedc48c69e9bf29a0d934a4f5f0
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitreview b/.gitreview
index e4d6d34..24f82e9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/vendor.git
-defaultbranch=master
+track=1
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3de24dec498daedc48c69e9bf29a0d934a4f5f0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
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]: Swapping defaultbranch for track

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Swapping defaultbranch for track
..


Swapping defaultbranch for track

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Ic892c2f5778153f6e99107fe24dafc2c8797f86d
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitreview b/.gitreview
index 0ec44b8..148be02 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=master
+track=1
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic892c2f5778153f6e99107fe24dafc2c8797f86d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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/skins[master]: Swapping defaultbranch for track

[Chad (Code Review)]

Chad has submitted this change and it was merged.

Change subject: Swapping defaultbranch for track
..


Swapping defaultbranch for track

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I62f67440f47a7007fb0f6cf599b164886af6e2bf
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitreview b/.gitreview
index 11ffebf..c571d1b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins.git
-defaultbranch=master
+track=1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62f67440f47a7007fb0f6cf599b164886af6e2bf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Daniel Friesen 
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/extensions[master]: Swapping defaultbranch for track

[Chad (Code Review)]

Chad has submitted this change and it was merged.

Change subject: Swapping defaultbranch for track
..


Swapping defaultbranch for track

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Ie40b9f7baee3ae3d53c63390a75269134f01b42d
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitreview b/.gitreview
index 8a5d88c..71d23ee 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions.git
-defaultbranch=master
+track=1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie40b9f7baee3ae3d53c63390a75269134f01b42d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Log PayPal 'adjustments' as refunds

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Log PayPal 'adjustments' as refunds
..

Log PayPal 'adjustments' as refunds

This looks like the way we get notified of chargeback settlements.

Fix the test data keys to match IPN messages.

Bug: T147491
Change-Id: I65ca112ac8e1f1fa8c439a022ecc197ddca41df5
---
M PaymentProviders/PayPal/Job.php
M PaymentProviders/PayPal/Tests/Data/chargeback_settlement.json
M PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
M SmashPig.yaml
4 files changed, 18 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/28/317728/1

diff --git a/PaymentProviders/PayPal/Job.php b/PaymentProviders/PayPal/Job.php
index 6f83935..dcb33c0 100644
--- a/PaymentProviders/PayPal/Job.php
+++ b/PaymentProviders/PayPal/Job.php
@@ -90,6 +90,9 @@
if ( $msg_type === 'refund' ) {
$new_msg->gateway_refund_id = 
$request['txn_id'];
$new_msg->gross_currency = 
$request['mc_currency'];
+   if ( $new_msg->type === 'chargeback_settlement' 
) {
+   $new_msg->type = 'chargeback';
+   }
}
 
// FIXME once recurring uses normalized msg it needs 
this too
diff --git a/PaymentProviders/PayPal/Tests/Data/chargeback_settlement.json 
b/PaymentProviders/PayPal/Tests/Data/chargeback_settlement.json
index e59522e..d96bde3 100644
--- a/PaymentProviders/PayPal/Tests/Data/chargeback_settlement.json
+++ b/PaymentProviders/PayPal/Tests/Data/chargeback_settlement.json
@@ -1,13 +1,18 @@
 {
-   "date": "1476796761",
+   "payment_date": "11:55:22 Sep 28, 2016 PDT",
+   "payment_status": "Completed",
"txn_type": "adjustment",
-   "gateway_parent_id": "X",
-   "gateway_txn_id": "Y",
-   "currency": "USD",
-   "type": "chargeback_settlement",
+   "parent_txn_id": "X",
+   "txn_id": "Y",
+   "mc_currency": "USD",
+   "reason_code": "chargeback_settlement",
"email": "a...@wikimedia.org",
-   "gross": "-10.00",
+   "mc_gross": "-10.00",
"gateway": "paypal",
+   "notify_version": "3.8",
+   "payment_gross": "-10.00",
+   "payer_status": "verified",
+   "payment_fee": "-20.00",
"source_name": "SmashPig",
"source_type": "listener",
"source_host": "secrethost",
diff --git 
a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php 
b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
index c164f9e..51cd4e6 100644
--- a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
+++ b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
@@ -11,6 +11,7 @@
 
 /**
  * Test the IPN listener which receives messages, stores and processes them.
+ * @group PayPal
  */
 class CaptureIncomingMessageTest extends BaseSmashPigUnitTestCase {
 
@@ -27,8 +28,9 @@
'subscr_signup.json' => 'recurring',
'subscr_payment.json' => 'recurring',
'refund.json' => 'refund',
+   'chargeback_settlement.json' => 'refund',
// this should not actually get written to
-   'chargeback_settlement.json' => 'no-op'
+   // TODO 'new_case.json' => 'no-op',
);
 
static $messages = array();
diff --git a/SmashPig.yaml b/SmashPig.yaml
index 5f34c44..9350d5c 100644
--- a/SmashPig.yaml
+++ b/SmashPig.yaml
@@ -414,7 +414,6 @@
 
 rejects:
 txn_type: new_case
-type: chargeback_settlement
 
 messages:
 verified:
@@ -422,7 +421,6 @@
 - Completed
 - Reversed
 txn_types:
-- adjustment
 - cart
 - send_money
 - web_accept
@@ -443,6 +441,7 @@
 - subscr_payment
 refund:
 txn_types:
+- adjustment
 - refund
 # FIXME: if case_type=chargeback, then txn_type might be blank
 # and the message should go to the refund queue.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65ca112ac8e1f1fa8c439a022ecc197ddca41df5
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/mediawiki-config[master]: Nashville Architecture edit-a-thon (Vanderbilt library) thro...

[Dereckson (Code Review)]

Dereckson has uploaded a new change for review.

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

Change subject: Nashville Architecture edit-a-thon (Vanderbilt library) 
throttle rule
..

Nashville Architecture edit-a-thon (Vanderbilt library) throttle rule

New throttle rule:
* Event name  Nashville Architecture edit-a-thon (Vanderbilt library)
* Event start ... 2016-10-25 10:30 -5:00
* Event end . 2016-10-25 16:00 -5:00
* IP  129.59.151.133
* Projects .. enwiki, commonswiki
* Attendees . 20 to 30 (margin set at 50)

Cleaned former throttle rules.

Bug: T149063
Change-Id: I8cc8ebcc6e8f6e158984b7d780329c0b6e21354f
---
M wmf-config/throttle.php
1 file changed, 6 insertions(+), 34 deletions(-)


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

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index e01be79..84b1c2b 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -28,40 +28,12 @@
 # ];
 ## Add throttling definitions below.
 
-$wmgThrottlingExceptions[] = [ // T146654
-   'from' => '2016-10-11T13:00 -6:00',
-   'to' => '2016-10-11T18:30 -6:00',
-   'IP' => '97.107.199.77',
-   'dbname' => 'enwiki',
-   'value' => 25 //15 expected
-];
-
-$wmgThrottlingExceptions[] = [ // T147293
-   'from' => '2016-10-14T00:00 -0:00',
-   'to' => '2016-10-16T0:00 -0:00',
-   'IP' => '194.167.137.246',
-   'dbname' => ['frwiki', 'cawiki', 'wikidatawiki'],
-   'value' => 40
-];
-
-// Winona State University - T146600
-
-// October 10th
-$wmgThrottlingExceptions[] = [ // T146600
-   'from' => '2016-10-10T13:30 -6:00',
-   'to' => '2016-10-10T18:30 -6:00',
-   'range' => '199.17.0.0/16',
-   'dbname' => 'enwiki',
-   'value' => 40 //35 expected
-];
-
-// October 11th
-$wmgThrottlingExceptions[] = [ // T146600
-   'from' => '2016-10-11T15:30 -6:00',
-   'to' => '2016-10-11T18:30 -6:00',
-   'range' => '199.17.0.0/16',
-   'dbname' => 'enwiki',
-   'value' => 40 //35 expected
+$rule = [ // T149063 - Nashville Architecture edit-a-thon (Vanderbilt library)
+   'from'   => '2016-10-25T10:30 -5:00',
+   'to' => '2016-10-25T16:00 -5:00',
+   'IP' => '129.59.151.133',
+   'dbname' => [ 'enwiki', 'commonswiki' ],
+   'value'  => 50 // 20 to 30 expected
 ];
 
 $rule = [ // T148852 - Edit-a-thon BDA (Poitiers)

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix typo in ve.dm.LinearSelection

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix typo in ve.dm.LinearSelection
..


Fix typo in ve.dm.LinearSelection

Change-Id: Ia6bac1682038e108428c975395aa5cc89d18ce07
---
M src/dm/selections/ve.dm.LinearSelection.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/dm/selections/ve.dm.LinearSelection.js 
b/src/dm/selections/ve.dm.LinearSelection.js
index e97d81c..2d795b2 100644
--- a/src/dm/selections/ve.dm.LinearSelection.js
+++ b/src/dm/selections/ve.dm.LinearSelection.js
@@ -99,7 +99,7 @@
 /**
  * @inheritdoc
  */
-ve.dm.Selection.prototype.translateByTransaction = function ( tx, 
excludeInsertion ) {
+ve.dm.LinearSelection.prototype.translateByTransaction = function ( tx, 
excludeInsertion ) {
return new this.constructor( this.getDocument(), tx.translateRange( 
this.getRange(), excludeInsertion ) );
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6bac1682038e108428c975395aa5cc89d18ce07
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Divec 
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...Metrolook[master]: Swapping defaultbranch for trace

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Swapping defaultbranch for trace
..


Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I1a2d4141935473e3138be67d5ed48f056690830c
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitreview b/.gitreview
index db98503..49798ba 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Metrolook.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a2d4141935473e3138be67d5ed48f056690830c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Chad 
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] mediawiki...DonationInterface[master]: Make mailcheck more conservative

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Make mailcheck more conservative
..

Make mailcheck more conservative

Only suggest things that are really close to the typed domain.
Makes sense to do this as we expand the list and tailor it to our
donor population.

Bug: T148970
Change-Id: If7f5a6ade023deea7dd25b7aafba1e815c06f044
---
M modules/js/ext.donationInterface.validation.js
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/js/ext.donationInterface.validation.js 
b/modules/js/ext.donationInterface.validation.js
index fb64986..d8bd96e 100644
--- a/modules/js/ext.donationInterface.validation.js
+++ b/modules/js/ext.donationInterface.validation.js
@@ -52,6 +52,8 @@
 
// Set up email error detection and correction
$( document ).on( 'blur', '#email', function () {
+   // Be really conservative - only catch two letter errors
+   Mailcheck.domainThreshold = 2; // No way to set from opts!
$( this ).mailcheck( {
topLevelDomains: [],
domains: Mailcheck.defaultDomains.concat( [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7f5a6ade023deea7dd25b7aafba1e815c06f044
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: add fredge-db to fundraising config

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: add fredge-db to fundraising config
..


add fredge-db to fundraising config

Change-Id: I24568b5f9500779c16da278753ddc5e6600c9abf
---
M puppet/modules/smashpig/templates/SmashPig.yaml.erb
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/smashpig/templates/SmashPig.yaml.erb 
b/puppet/modules/smashpig/templates/SmashPig.yaml.erb
index 7a4b3e0..b2f88bd 100644
--- a/puppet/modules/smashpig/templates/SmashPig.yaml.erb
+++ b/puppet/modules/smashpig/templates/SmashPig.yaml.erb
@@ -20,6 +20,13 @@
 damaged-db:
 <<: *MYSQL
 
+fredge-db:
+class: PDO
+constructor-parameters:
+- mysql:host=127.0.0.1;dbname=fredge
+- root
+- "<%= scope.lookupvar('mysql::root_password') %>"
+
 banner-history:
 class: PHPQueue\Backend\Predis
 constructor-parameters:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24568b5f9500779c16da278753ddc5e6600c9abf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: QA: Search overlay gives false positives

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: QA: Search overlay gives false positives
..

QA: Search overlay gives false positives

Scenario "Closing search (overlay button)" will pass if the search
overlay never loads. Same goes for
"Closing search (browser button)"

To avoid this add a background check "I see the search overlay"
to ensure we've loaded it first.

Change-Id: Ib2d4883073adeb88028ac84277d691b321bafc39
---
M tests/browser/features/search.feature
1 file changed, 5 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/25/317725/1

diff --git a/tests/browser/features/search.feature 
b/tests/browser/features/search.feature
index 9fc5d4d..5a1b2b8 100644
--- a/tests/browser/features/search.feature
+++ b/tests/browser/features/search.feature
@@ -5,7 +5,8 @@
 Given I am using the mobile site
   And the page "Selenium search test" exists
   And I am on the "Main Page" page
-When I click the placeholder search box
+  And I click the placeholder search box
+  And I see the search overlay
 
   Scenario: Closing search (overlay button)
 When I click the search overlay close button
@@ -21,15 +22,13 @@
 Then search results should contain "Selenium search test"
 
   Scenario: Search with search in pages button
-  And I see the search overlay
-  And I type into search box "Test is used by Selenium web driver"
+When I type into search box "Test is used by Selenium web driver"
   And I see the search in pages button
   And I click the search in pages button
 Then I should see a list of search results
 
   Scenario: Search with enter key
-  And I see the search overlay
-  And I type into search box "Test is used by Selenium web driver"
+When I type into search box "Test is used by Selenium web driver"
   And I press the enter key
 Then I should see a list of search results
 
@@ -50,9 +49,6 @@
 
   @login
   Scenario: Clicking on a watchstar toggles the watchstar
-Given I am logged into the mobile website
-  And the page "Selenium search test" exists
-When I click the placeholder search box
-  And I type into search box "Selenium search tes"
+When I type into search box "Selenium search tes"
   And I click a search watch star
 Then I should see a toast

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role: add prometheus ipv6 ferm rules to varnish_exporter

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: role: add prometheus ipv6 ferm rules to varnish_exporter
..


role: add prometheus ipv6 ferm rules to varnish_exporter

Change-Id: Ib8d240aa7adc9422e7b46c341eb33aee94b28b5c
---
M modules/role/manifests/prometheus/varnish_exporter.pp
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/prometheus/varnish_exporter.pp 
b/modules/role/manifests/prometheus/varnish_exporter.pp
index c0c99a0..4905831 100644
--- a/modules/role/manifests/prometheus/varnish_exporter.pp
+++ b/modules/role/manifests/prometheus/varnish_exporter.pp
@@ -11,6 +11,7 @@
 $prometheus_nodes = hiera('prometheus_nodes')
 $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
 $ferm_srange = "@resolve((${prometheus_ferm_nodes}))"
+$ferm_srange_v6 = "@resolve((${prometheus_ferm_nodes}), )"
 }
 
 prometheus::varnish_exporter{ 'default': }
@@ -19,6 +20,12 @@
 proto  => 'tcp',
 port   => '9131',
 srange => $ferm_srange,
+}
+
+ferm::service { 'prometheus-varnish-exporter_v6':
+proto  => 'tcp',
+port   => '9131',
+srange => $ferm_srange_v6,
 }
 
 prometheus::varnish_exporter{ 'frontend':
@@ -31,4 +38,10 @@
 port   => '9331',
 srange => $ferm_srange,
 }
+
+ferm::service { 'prometheus-varnish-exporter-frontend_v6':
+proto  => 'tcp',
+port   => '9331',
+srange => $ferm_srange_v6,
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8d240aa7adc9422e7b46c341eb33aee94b28b5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
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]: Hygiene: suppress autoMirrored API level warnings

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: suppress autoMirrored API level warnings
..


Hygiene: suppress autoMirrored API level warnings

We should commit to ignoring these warnings or fixing them on API 18 and
19. From the docs[0]:

  On previous versions of Android, if your app includes images that
  should reverse their horizontal orientation for right-to-left layouts,
  you must include the mirrored image in a drawables-ldrtl/ resource
  directory.

This patch takes the ignore route because it's easy and uses less
space.

[0] 
https://developer.android.com/about/versions/android-4.4.html#DrawableMirroring

Change-Id: I09a0d8427bda1b4e4c1d2fa1e0df36d7aca57f09
---
M app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml
M app/src/main/res/drawable/ic_collections_bookmark_black_24dp.xml
M app/src/main/res/drawable/ic_file_download.xml
M app/src/main/res/drawable/ic_find_in_page.xml
M app/src/main/res/drawable/ic_flag_black_24dp.xml
M app/src/main/res/drawable/ic_image_gray_24dp.xml
M app/src/main/res/drawable/ic_list_white_24dp.xml
M app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
M app/src/main/res/drawable/ic_most_read.xml
M app/src/main/res/drawable/ic_restore_black_24dp.xml
M app/src/main/res/drawable/ic_share_black_24dp.xml
M app/src/main/res/drawable/ic_share_white_24dp.xml
M app/src/main/res/drawable/ic_sort_white_24dp.xml
M app/src/main/res/drawable/ic_subdirectory_arrow_right_black_24dp.xml
M app/src/main/res/drawable/ic_translate_white_24dp.xml
M app/src/main/res/drawable/icon_in_the_news.xml
16 files changed, 65 insertions(+), 33 deletions(-)

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



diff --git a/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml 
b/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml
index 0d8872d..7cda61b 100644
--- a/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml
@@ -1,5 +1,7 @@
-http://schemas.android.com/tools;
+android:autoMirrored="true" android:height="24dp"
 android:viewportHeight="24.0" android:viewportWidth="24.0"
-android:width="24dp" 
xmlns:android="http://schemas.android.com/apk/res/android;>
+android:width="24dp" 
xmlns:android="http://schemas.android.com/apk/res/android;
+tools:ignore="UnusedAttribute">
 
 
diff --git a/app/src/main/res/drawable/ic_collections_bookmark_black_24dp.xml 
b/app/src/main/res/drawable/ic_collections_bookmark_black_24dp.xml
index c89a4ed..5b78ab9 100644
--- a/app/src/main/res/drawable/ic_collections_bookmark_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_collections_bookmark_black_24dp.xml
@@ -1,9 +1,11 @@
 http://schemas.android.com/apk/res/android;
-android:autoMirrored="true"
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
+xmlns:tools="http://schemas.android.com/tools;
+android:autoMirrored="true"
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0"
+tools:ignore="UnusedAttribute">
 
diff --git a/app/src/main/res/drawable/ic_file_download.xml 
b/app/src/main/res/drawable/ic_file_download.xml
index da16642..87dad3f 100644
--- a/app/src/main/res/drawable/ic_file_download.xml
+++ b/app/src/main/res/drawable/ic_file_download.xml
@@ -1,6 +1,8 @@
-http://schemas.android.com/tools;
+android:autoMirrored="true" android:height="17dp"
 android:viewportHeight="17.0" android:viewportWidth="14.0"
-android:width="14dp" 
xmlns:android="http://schemas.android.com/apk/res/android;>
+android:width="14dp" 
xmlns:android="http://schemas.android.com/apk/res/android;
+tools:ignore="UnusedAttribute">
 
diff --git a/app/src/main/res/drawable/ic_find_in_page.xml 
b/app/src/main/res/drawable/ic_find_in_page.xml
index 77acb13..085a2bf 100644
--- a/app/src/main/res/drawable/ic_find_in_page.xml
+++ b/app/src/main/res/drawable/ic_find_in_page.xml
@@ -1,5 +1,7 @@
-http://schemas.android.com/tools;
+android:autoMirrored="true" android:height="24dp"
 android:viewportHeight="24.0" android:viewportWidth="24.0"
-android:width="24dp" 
xmlns:android="http://schemas.android.com/apk/res/android;>
+android:width="24dp" 
xmlns:android="http://schemas.android.com/apk/res/android;
+tools:ignore="UnusedAttribute">
 
 
diff --git a/app/src/main/res/drawable/ic_flag_black_24dp.xml 
b/app/src/main/res/drawable/ic_flag_black_24dp.xml
index 4b8a250..15a3a50 100644
--- a/app/src/main/res/drawable/ic_flag_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_flag_black_24dp.xml
@@ -1,5 +1,7 @@
-http://schemas.android.com/tools;
+android:autoMirrored="true" android:height="24dp"
 android:viewportHeight="24.0" 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix typo in ve.dm.LinearSelection

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Fix typo in ve.dm.LinearSelection
..

Fix typo in ve.dm.LinearSelection

Change-Id: Ia6bac1682038e108428c975395aa5cc89d18ce07
---
M src/dm/selections/ve.dm.LinearSelection.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/24/317724/1

diff --git a/src/dm/selections/ve.dm.LinearSelection.js 
b/src/dm/selections/ve.dm.LinearSelection.js
index e97d81c..2d795b2 100644
--- a/src/dm/selections/ve.dm.LinearSelection.js
+++ b/src/dm/selections/ve.dm.LinearSelection.js
@@ -99,7 +99,7 @@
 /**
  * @inheritdoc
  */
-ve.dm.Selection.prototype.translateByTransaction = function ( tx, 
excludeInsertion ) {
+ve.dm.LinearSelection.prototype.translateByTransaction = function ( tx, 
excludeInsertion ) {
return new this.constructor( this.getDocument(), tx.translateRange( 
this.getRange(), excludeInsertion ) );
 };
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6bac1682038e108428c975395aa5cc89d18ce07
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]: role: add prometheus ipv6 ferm rules to varnish_exporter

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: role: add prometheus ipv6 ferm rules to varnish_exporter
..

role: add prometheus ipv6 ferm rules to varnish_exporter

Change-Id: Ib8d240aa7adc9422e7b46c341eb33aee94b28b5c
---
M modules/role/manifests/prometheus/varnish_exporter.pp
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/317723/1

diff --git a/modules/role/manifests/prometheus/varnish_exporter.pp 
b/modules/role/manifests/prometheus/varnish_exporter.pp
index c0c99a0..4905831 100644
--- a/modules/role/manifests/prometheus/varnish_exporter.pp
+++ b/modules/role/manifests/prometheus/varnish_exporter.pp
@@ -11,6 +11,7 @@
 $prometheus_nodes = hiera('prometheus_nodes')
 $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
 $ferm_srange = "@resolve((${prometheus_ferm_nodes}))"
+$ferm_srange_v6 = "@resolve((${prometheus_ferm_nodes}), )"
 }
 
 prometheus::varnish_exporter{ 'default': }
@@ -19,6 +20,12 @@
 proto  => 'tcp',
 port   => '9131',
 srange => $ferm_srange,
+}
+
+ferm::service { 'prometheus-varnish-exporter_v6':
+proto  => 'tcp',
+port   => '9131',
+srange => $ferm_srange_v6,
 }
 
 prometheus::varnish_exporter{ 'frontend':
@@ -31,4 +38,10 @@
 port   => '9331',
 srange => $ferm_srange,
 }
+
+ferm::service { 'prometheus-varnish-exporter-frontend_v6':
+proto  => 'tcp',
+port   => '9331',
+srange => $ferm_srange_v6,
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8d240aa7adc9422e7b46c341eb33aee94b28b5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clean up newWANCacheFromParams() getInstance() calls

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Clean up newWANCacheFromParams() getInstance() calls
..


Clean up newWANCacheFromParams() getInstance() calls

Change-Id: I0daa2531708d0a110e8028c4a5641153a23c0a97
---
M includes/objectcache/ObjectCache.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/objectcache/ObjectCache.php 
b/includes/objectcache/ObjectCache.php
index 53a474b..0a4f0ed 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -326,9 +326,9 @@
 * @throws UnexpectedValueException
 */
public static function newWANCacheFromParams( array $params ) {
+   $erGroup = 
MediaWikiServices::getInstance()->getEventRelayerGroup();
foreach ( $params['channels'] as $action => $channel ) {
-   $params['relayers'][$action] = 
MediaWikiServices::getInstance()->getEventRelayerGroup()
-   ->getRelayer( $channel );
+   $params['relayers'][$action] = $erGroup->getRelayer( 
$channel );
$params['channels'][$action] = $channel;
}
$params['cache'] = self::newFromParams( $params['store'] );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0daa2531708d0a110e8028c4a5641153a23c0a97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Small DB classes IDEA warning fixes and cleanups

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Small DB classes IDEA warning fixes and cleanups
..


Small DB classes IDEA warning fixes and cleanups

Change-Id: I65b5f452a364b329bb671540f4115dbc4f40eebd
---
M includes/libs/rdbms/database/DatabasePostgres.php
M maintenance/Maintenance.php
M maintenance/update.php
3 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/includes/libs/rdbms/database/DatabasePostgres.php 
b/includes/libs/rdbms/database/DatabasePostgres.php
index 016b9cd..7acd8dc 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -1087,7 +1087,7 @@
if ( !is_array( $types ) ) {
$types = [ $types ];
}
-   if ( !$schema ) {
+   if ( $schema === false ) {
$schema = $this->getCoreSchema();
}
$table = $this->realTableName( $table, 'raw' );
@@ -1236,7 +1236,6 @@
 
function strencode( $s ) {
// Should not be called by us
-
return pg_escape_string( $this->getBindingHandle(), $s );
}
 
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 1cb5eef..208cf17 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -104,7 +104,7 @@
 
/**
 * Used by getDB() / setDB()
-* @var IDatabase
+* @var Database
 */
private $mDb = null;
 
@@ -726,6 +726,7 @@
 
if ( is_array( $wgProfiler ) && isset( $wgProfiler['class'] ) ) 
{
$class = $wgProfiler['class'];
+   /** @var Profiler $profiler */
$profiler = new $class(
[ 'sampling' => 1, 'output' => [ $output ] ]
+ $wgProfiler
@@ -1182,6 +1183,7 @@
$this->beginTransaction( $dbw, __METHOD__ );
 
# Get "active" text records from the revisions table
+   $cur = [];
$this->output( 'Searching for active text records in revisions 
table...' );
$res = $dbw->select( 'revision', 'rev_text_id', [], __METHOD__, 
[ 'DISTINCT' ] );
foreach ( $res as $row ) {
diff --git a/maintenance/update.php b/maintenance/update.php
index b96e7eb..a672e29 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -145,6 +145,7 @@
 
$this->output( "Going to run database updates for " . 
wfWikiID() . "\n" );
if ( $db->getType() === 'sqlite' ) {
+   /** @var Database|DatabaseSqlite $db */
$this->output( "Using SQLite file: 
'{$db->getDbFilePath()}'\n" );
}
$this->output( "Depending on the size of your database this may 
take a while!\n" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65b5f452a364b329bb671540f4115dbc4f40eebd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Ie40b9f7baee3ae3d53c63390a75269134f01b42d
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/22/317722/1

diff --git a/.gitreview b/.gitreview
index 8a5d88c..fd29354 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions.git
-defaultbranch=master
+trace=1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie40b9f7baee3ae3d53c63390a75269134f01b42d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: default duration for icinga-downtime

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: icinga: default duration for icinga-downtime
..

icinga: default duration for icinga-downtime

Provide 2h default downtime, for convenience

Change-Id: I577b488764ca020d0fcfcb762ac1c7ecec950015
---
M modules/icinga/files/icinga-downtime
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/317720/1

diff --git a/modules/icinga/files/icinga-downtime 
b/modules/icinga/files/icinga-downtime
index 0140a25..05aab26 100755
--- a/modules/icinga/files/icinga-downtime
+++ b/modules/icinga/files/icinga-downtime
@@ -6,7 +6,7 @@
 # example: ./icinga-downtime -h mw1021 -d 7200 -r "something happened"
 #
 # -h  should be the (short) name of a host as shown in the Icinga UI
-# -d  how long should the downtime last, in seconds (2 hrs = 7200)
+# -d  how long should the downtime last, in seconds (default 7200 
(2h))
 # -ra string with the reason for the downtime
 #
 
@@ -36,11 +36,15 @@
 esac
 done
 
-if [ -z $hostname ] || [ -z $duration ] || [ -z "$reason" ]; then
+if [ -z "$hostname" ] || [ -z "$reason" ]; then
 echo "usage: $0 -h  -d  -r "
 exit
 fi
 
+if [ -z "$duration" ]; then
+duration=7200
+fi
+
 start_time=$(date +%s) # now
 end_time=$(( $start_time + $duration ))
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I577b488764ca020d0fcfcb762ac1c7ecec950015
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from f9aa046adc240c943db7cfd6803659540de430e1:

[Smalyshev (Code Review)]

Smalyshev has submitted this change and it was merged.

Change subject: Merging from f9aa046adc240c943db7cfd6803659540de430e1:
..


Merging from f9aa046adc240c943db7cfd6803659540de430e1:

Merge "Polestar support"

Change-Id: Ifc79d9a56f6a2a187eee47e466b154009db2cff8
---
R css/embed.style.min.6c0a7cf13fd699317530.css
R css/style.min.c29b4c7f7fff75c32eef.css
M embed.html
M index.html
D js/wdqs.min.1dcf1cf128bcba03d2d0.js
A js/wdqs.min.a49374c44bbeb8f92b32.js
6 files changed, 8 insertions(+), 7 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc79d9a56f6a2a187eee47e466b154009db2cff8
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: also schedule host services downtime

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: icinga: also schedule host services downtime
..

icinga: also schedule host services downtime

In addition to host downtime also schedule downtime for service(s) on the host,
in case recovery of services takes longer than the host's.

Change-Id: I29e029932392b08e90527fffc761f72248e4bba2
---
M modules/icinga/files/icinga-downtime
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/317721/1

diff --git a/modules/icinga/files/icinga-downtime 
b/modules/icinga/files/icinga-downtime
index 05aab26..f4123a2 100755
--- a/modules/icinga/files/icinga-downtime
+++ b/modules/icinga/files/icinga-downtime
@@ -49,6 +49,7 @@
 end_time=$(( $start_time + $duration ))
 
 printf "[%lu] 
SCHEDULE_HOST_DOWNTIME;${hostname};${start_time};${end_time};1;0;${duration};${user};${reason}\n"
 $(date +%s) > $commandfile
+printf "[%lu] 
SCHEDULE_HOST_SVC_DOWNTIME;${hostname};${start_time};${end_time};1;0;${duration};${user};${reason}\n"
 $(date +%s) > $commandfile
 
 tail -f $logfile | grep -m2 $hostname
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29e029932392b08e90527fffc761f72248e4bba2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch Norwegian Wikipedia to uca-no-u-kn category collation

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Switch Norwegian Wikipedia to uca-no-u-kn category collation
..


Switch Norwegian Wikipedia to uca-no-u-kn category collation

Per request from Norwegian community, switching to UCA collation
with numeric sorting.

Bug: T146675
Change-Id: I4cfed3284d393efdbc5035bea91c6f6d4352d6e0
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 76e3e10..d321d8e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14146,6 +14146,7 @@
'lvwiki' => 'uca-lv', // T67003
'mkwiki' => 'uca-mk-u-kn', // T26953
'nlwiki' => 'uca-nl', // T125774
+   'nowiki' => 'uca-no-u-kn', // T146675, T148488
'plwiki' => 'uca-pl-u-kn', // T44413, T146675
'plwikisource' => 'uca-pl', // T86821
'plwikivoyage' => 'uca-pl', // T47968

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cfed3284d393efdbc5035bea91c6f6d4352d6e0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add ListCardViewTest

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Add ListCardViewTest
..

Add ListCardViewTest

Bug: T144399
Change-Id: I1e1b1285d2dab4c99fee9822d63199402f7479b6
---
A app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
M app/src/main/java/org/wikipedia/feed/view/ListCardView.java
2 files changed, 97 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
new file mode 100644
index 000..ad70cff
--- /dev/null
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/ListCardViewTest.java
@@ -0,0 +1,95 @@
+package org.wikipedia.feed.view;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.Adapter;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.theories.Theory;
+import org.junit.experimental.theories.suppliers.TestedOn;
+import org.wikipedia.feed.model.Card;
+import org.wikipedia.test.ViewTest;
+import org.wikipedia.theme.Theme;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.wikipedia.feed.view.FeedAdapter.Callback;
+import static org.wikipedia.test.ViewTest.LayoutDirection.LOCALE;
+
+public class ListCardViewTest extends ViewTest {
+private ListCardView subject;
+
+@Before public void setUp() {
+setUp(WIDTH_DP_S, LOCALE, FONT_SCALES[0], Theme.LIGHT);
+subject = new Subject(ctx());
+}
+
+@Theory public void testSetCallback(@TestedOn(ints = {0, 1}) int 
nonnullHeader,
+@TestedOn(ints = {0, 1}) int 
nonnullCallback) {
+CardHeaderView header = nonnullHeader == 0 ? null : 
mock(CardHeaderView.class);
+if (header != null) {
+subject.header(header);
+}
+
+Callback callback = nonnullCallback == 0 ? null : 
mock(FeedAdapter.Callback.class);
+subject.setCallback(callback);
+assertThat(subject.getCallback(), is(callback));
+if (header != null) {
+verify(header).setCallback(eq(callback));
+}
+}
+
+@Theory public void testSet(@TestedOn(ints = {0, 1}) int nonnull) {
+Adapter adapter = nonnull == 0 ? null : mock(Adapter.class);
+subject.set(adapter);
+//noinspection rawtypes
+assertThat(subject.recyclerView.getAdapter(), is((Adapter) adapter));
+}
+
+@Theory public void testUpdate(@TestedOn(ints = {0, 1}) int nonnull) {
+Adapter adapter = nonnull == 0 ? null : spy(new NullAdapter());
+subject.set(adapter);
+subject.update();
+if (adapter != null) {
+verify(adapter).notifyDataSetChanged();
+}
+}
+
+@Test public void testHeader() {
+View header = mock(View.class);
+subject.header(header);
+assertThat(subject.headerView, is(header));
+}
+
+@Test public void testLargeHeader() {
+View header = mock(View.class);
+subject.largeHeader(header);
+assertThat(subject.largeHeaderView, is(header));
+}
+
+public static class NullAdapter extends Adapter {
+@Override public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup 
parent, int viewType) {
+return null;
+}
+
+@Override public void onBindViewHolder(RecyclerView.ViewHolder holder, 
int position) {
+}
+
+@Override public int getItemCount() {
+return 0;
+}
+}
+
+private static class Subject extends ListCardView {
+Subject(Context context) {
+super(context);
+}
+}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardView.java 
b/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
index 0bfaf24..f2e7972 100644
--- a/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardView.java
@@ -56,6 +56,8 @@
 largeHeaderView = view;
 }
 
+/** Called by the constructor. Override to provide custom behavior but 
otherwise do not call
+directly. */
 protected void initRecycler(@NonNull RecyclerView recyclerView) {
 recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(),

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add DefaultFeedCardViewTest

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Add DefaultFeedCardViewTest
..

Add DefaultFeedCardViewTest

Bug: T144399
Change-Id: I664d051183df7ba7cd8a343c6ca4e50969e28e6b
---
A app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
M app/src/androidTest/java/org/wikipedia/test/ViewTest.java
M app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
3 files changed, 49 insertions(+), 5 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
new file mode 100644
index 000..b2f9d08
--- /dev/null
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/DefaultFeedCardViewTest.java
@@ -0,0 +1,44 @@
+package org.wikipedia.feed.view;
+
+import android.content.Context;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.theories.Theory;
+import org.junit.experimental.theories.suppliers.TestedOn;
+import org.wikipedia.feed.model.Card;
+import org.wikipedia.feed.view.FeedAdapter.Callback;
+import org.wikipedia.test.ViewTest;
+import org.wikipedia.theme.Theme;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.mock;
+import static org.wikipedia.test.ViewTest.LayoutDirection.LOCALE;
+
+public class DefaultFeedCardViewTest extends ViewTest {
+private DefaultFeedCardView subject;
+
+@Before public void setUp() {
+setUp(WIDTH_DP_S, LOCALE, FONT_SCALES[0], Theme.LIGHT);
+subject = new Subject(ctx());
+}
+
+@Test public void testSetGetCard() {
+Card card = mock(Card.class);
+subject.setCard(card);
+assertThat(subject.getCard(), is(card));
+}
+
+@Theory public void testSetGetCallback(@TestedOn(ints = {0, 1}) int 
nonnull) {
+Callback callback = nonnull == 0 ? null : mock(Callback.class);
+subject.setCallback(callback);
+assertThat(subject.getCallback(), is(callback));
+}
+
+private static class Subject extends DefaultFeedCardView {
+Subject(Context context) {
+super(context);
+}
+}
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/wikipedia/test/ViewTest.java 
b/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
index 56afd3eb..4bfe21e 100644
--- a/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/test/ViewTest.java
@@ -44,7 +44,7 @@
 protected static final int WIDTH_DP_S = 240;
 protected static final int WIDTH_DP_XS = 120;
 
-protected enum LayoutDirection { LOCALE, RTL }
+public enum LayoutDirection { LOCALE, RTL }
 
 private int widthDp;
 private Locale locale;
diff --git a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java 
b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
index 0e2434b..b81c019 100644
--- a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
@@ -19,14 +19,14 @@
 this.card = card;
 }
 
-@Override public void setCallback(@Nullable FeedAdapter.Callback callback) 
{
-this.callback = callback;
-}
-
 @Nullable protected T getCard() {
 return card;
 }
 
+@Override public void setCallback(@Nullable FeedAdapter.Callback callback) 
{
+this.callback = callback;
+}
+
 @Nullable protected FeedAdapter.Callback getCallback() {
 return callback;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I664d051183df7ba7cd8a343c6ca4e50969e28e6b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace hardcoded font scale with symbol

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Hygiene: replace hardcoded font scale with symbol
..

Hygiene: replace hardcoded font scale with symbol

Change-Id: Ib273e18ee5d53e1c35dc76b14bc01ff3beb6b87e
---
M app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
M app/src/androidTest/java/org/wikipedia/feed/view/CardLargeHeaderViewTest.java
M app/src/androidTest/java/org/wikipedia/navtab/NavTabViewTest.java
3 files changed, 22 insertions(+), 22 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java 
b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
index 54a757f..4ce5592 100644
--- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
+++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java
@@ -40,7 +40,7 @@
 }
 
 @Theory public void testLayoutDirection(@NonNull LayoutDirection 
direction) {
-setUp(WIDTH_DP_L, direction, 1, Theme.LIGHT, R.drawable.wmf_logo,
+setUp(WIDTH_DP_L, direction, FONT_SCALES[0], Theme.LIGHT, 
R.drawable.wmf_logo,
 R.string.reading_list_name_sample, 
R.string.reading_list_untitled,
 R.color.foundation_blue);
 snap(subject);
@@ -48,13 +48,13 @@
 
 @Theory public void testTheme(@NonNull Theme theme,
   @TestedOn(ints = {R.color.foundation_blue, 
R.color.foundation_green}) int circleColor) {
-setUp(WIDTH_DP_L, LayoutDirection.LOCALE, 1, theme, 
R.drawable.wmf_logo,
+setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FONT_SCALES[0], theme, 
R.drawable.wmf_logo,
 R.string.reading_list_name_sample, 
R.string.reading_list_untitled, circleColor);
 snap(subject, circleColor == R.color.foundation_blue ? "blue" : 
"green");
 }
 
 @Theory public void testFocus(@NonNull Theme theme) {
-setUp(WIDTH_DP_L, LayoutDirection.LOCALE, 1, theme, 
R.drawable.wmf_logo,
+setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FONT_SCALES[0], theme, 
R.drawable.wmf_logo,
 R.string.reading_list_name_sample, 
R.string.reading_list_untitled,
 R.color.foundation_blue);
 runOnMainSync(new Runnable() {
@@ -67,13 +67,13 @@
 
 // todo: how can we test popupmenu which requires an activity?
 //@Theory public void testMenu(@NonNull Theme theme) {
-//setUp(WIDTH_DP_L, LayoutDirection.LOCALE, 1, theme, 
R.drawable.wmf_logo,
+//setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FONT_SCALES[0], theme, 
R.drawable.wmf_logo,
 //R.string.reading_list_name_sample, 
R.string.reading_list_untitled);
 //clickMenu();
 //}
 
 @Test public void testSetCard() {
-setUp(WIDTH_DP_L, LayoutDirection.LOCALE, 1, Theme.LIGHT, 0, 0, 0, 
R.color.foundation_blue);
+setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FONT_SCALES[0], Theme.LIGHT, 
0, 0, 0, R.color.foundation_blue);
 Card card = mock(Card.class);
 subject.setCard(card);
 assertThat(subject.getCard(), is(card));
@@ -82,7 +82,7 @@
 // todo: how can we test popupmenu which requires an activity?
 //@Theory public void testSetCallback(@TestedOn(ints = {0, 1}) int 
nonnullListener,
 //@TestedOn(ints = {0, 1}) int 
nonnullCard) {
-//setUp(WIDTH_DP_L, LayoutDirection.LOCALE, 1, Theme.LIGHT, 
R.drawable.wmf_logo,
+//setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FONT_SCALES[0], 
Theme.LIGHT, R.drawable.wmf_logo,
 //R.string.reading_list_name_sample, 
R.string.reading_list_untitled);
 //
 //Card card = nonnullCard == 0 ? null : mock(Card.class);
@@ -98,7 +98,7 @@
 //}
 
 @Test public void testSetImage() {
-setUp(WIDTH_DP_L, LayoutDirection.LOCALE, 1, Theme.LIGHT, 
R.drawable.wmf_logo,
+setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FONT_SCALES[0], Theme.LIGHT, 
R.drawable.wmf_logo,
 R.string.reading_list_name_sample, 
R.string.reading_list_untitled,
 R.color.foundation_blue);
 ImageView imageView = findById(subject, R.id.view_card_header_image);
@@ -108,7 +108,7 @@
 }
 
 @Test public void testSetImageCircleColor() {
-setUp(WIDTH_DP_L, LayoutDirection.LOCALE, 1, Theme.LIGHT, 
R.drawable.wmf_logo,
+setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FONT_SCALES[0], Theme.LIGHT, 
R.drawable.wmf_logo,
 R.string.reading_list_name_sample, 
R.string.reading_list_untitled,
 R.color.foundation_blue);
 TintableBackgroundView imageView = findById(subject, 
R.id.view_card_header_image);
@@ -119,13 +119,13 @@
 
 @Theory public void testSetTitleStr(@TestedOn(ints = {0,
 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Cleanup unused LBFactory $domain arguments

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Cleanup unused LBFactory $domain arguments
..


Cleanup unused LBFactory $domain arguments

Change-Id: I17b409a71e263ff5e0175f6a35fb9c5288f00c11
---
M includes/libs/rdbms/lbfactory/ILBFactory.php
M includes/libs/rdbms/lbfactory/LBFactory.php
M includes/libs/rdbms/lbfactory/LBFactoryMulti.php
M includes/libs/rdbms/lbfactory/LBFactorySimple.php
M includes/libs/rdbms/lbfactory/LBFactorySingle.php
5 files changed, 21 insertions(+), 50 deletions(-)

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



diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php 
b/includes/libs/rdbms/lbfactory/ILBFactory.php
index 9c9f18d..ff1bd43 100644
--- a/includes/libs/rdbms/lbfactory/ILBFactory.php
+++ b/includes/libs/rdbms/lbfactory/ILBFactory.php
@@ -86,28 +86,25 @@
 
/**
 * Create a new load balancer for external storage. The resulting 
object will be
-* untracked, not chronology-protected, and the caller is responsible 
for
-* cleaning it up.
+* untracked, not chronology-protected, and the caller is responsible 
for cleaning it up.
 *
 * This method is for only advanced usage and callers should almost 
always use
 * getExternalLB() instead. This method can be useful when a table is 
used as a
 * key/value store. In that cases, one might want to query it in 
autocommit mode
 * (DBO_TRX off) but still use DBO_TRX transaction rounds on other 
tables.
 *
-* @param string $cluster External storage cluster, or false for core
-* @param bool|string $domain Domain ID, or false for the current domain
+* @param string $cluster External storage cluster name
 * @return ILoadBalancer
 */
-   public function newExternalLB( $cluster, $domain = false );
+   public function newExternalLB( $cluster );
 
/**
 * Get a cached (tracked) load balancer for external storage
 *
-* @param string $cluster External storage cluster, or false for core
-* @param bool|string $domain Domain ID, or false for the current domain
+* @param string $cluster External storage cluster name
 * @return ILoadBalancer
 */
-   public function getExternalLB( $cluster, $domain = false );
+   public function getExternalLB( $cluster );
 
/**
 * Execute a function for each tracked load balancer
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php 
b/includes/libs/rdbms/lbfactory/LBFactory.php
index f3a3275..d21289b 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -153,18 +153,16 @@
/**
 * @see ILBFactory::newExternalLB()
 * @param string $cluster
-* @param bool $domain
 * @return LoadBalancer
 */
-   abstract public function newExternalLB( $cluster, $domain = false );
+   abstract public function newExternalLB( $cluster );
 
/**
 * @see ILBFactory::getExternalLB()
 * @param string $cluster
-* @param bool $domain
 * @return LoadBalancer
 */
-   abstract public function getExternalLB( $cluster, $domain = false );
+   abstract public function getExternalLB( $cluster );
 
/**
 * Call a method of each tracked load balancer
diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php 
b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index 83ca650..a7cc16c 100644
--- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
+++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
@@ -255,13 +255,7 @@
return $this->mainLBs[$section];
}
 
-   /**
-* @param string $cluster
-* @param DatabaseDomain|string|bool $domain Domain ID, or false for 
the current domain
-* @throws InvalidArgumentException
-* @return LoadBalancer
-*/
-   public function newExternalLB( $cluster, $domain = false ) {
+   public function newExternalLB( $cluster ) {
if ( !isset( $this->externalLoads[$cluster] ) ) {
throw new InvalidArgumentException( __METHOD__ . ": 
Unknown cluster \"$cluster\"" );
}
@@ -281,14 +275,9 @@
);
}
 
-   /**
-* @param string $cluster External storage cluster, or false for core
-* @param DatabaseDomain|string|bool $domain Domain ID, or false for 
the current domain
-* @return LoadBalancer
-*/
-   public function getExternalLB( $cluster, $domain = false ) {
+   public function getExternalLB( $cluster ) {
if ( !isset( $this->extLBs[$cluster] ) ) {
-   $this->extLBs[$cluster] = $this->newExternalLB( 
$cluster, $domain );
+   $this->extLBs[$cluster] = $this->newExternalLB( 

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: If3de24dec498daedc48c69e9bf29a0d934a4f5f0
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/16/317716/1

diff --git a/.gitreview b/.gitreview
index e4d6d34..8eb6837 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/vendor.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3de24dec498daedc48c69e9bf29a0d934a4f5f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Ic892c2f5778153f6e99107fe24dafc2c8797f86d
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/317715/1

diff --git a/.gitreview b/.gitreview
index 0ec44b8..afd0a33 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove duplicated wmgCirrusSearchClusterOverrides entry

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove duplicated wmgCirrusSearchClusterOverrides entry
..


Remove duplicated wmgCirrusSearchClusterOverrides entry

Change-Id: I19709064d7f7f5ad6331398e1ddd1d4839051784
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7868e70..76e3e10 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16639,10 +16639,6 @@
'ptwiki' => ['completion' => 'eqiad'],
 ],
 
-'wmgCirrusSearchClusterOverrides' => [
-   'default' => [],
-],
-
 'wmgCirrusSearchWriteClusters' => [
'default' => [ 'eqiad', 'codfw' ],
 ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19709064d7f7f5ad6331398e1ddd1d4839051784
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/skins[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I62f67440f47a7007fb0f6cf599b164886af6e2bf
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins 
refs/changes/14/317714/1

diff --git a/.gitreview b/.gitreview
index 11ffebf..a832e57 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins.git
-defaultbranch=master
+trace=1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62f67440f47a7007fb0f6cf599b164886af6e2bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Event and hover events are logged but not recorded

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Event and hover events are logged but not recorded
..

Event and hover events are logged but not recorded

This adds two new events "display" and "hover" which are not
recorded back to the server. The benefits of having these events
is that they are important events in the lifecycle of a hovercard.

This allows us to debut trackSubscribe and ensure we see the behaviour
we expect to see.

Change-Id: I58eefc29444179fd245cfd722093dedea19455e8
---
M resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js
M resources/ext.popups.schemaPopups.utils/ext.popups.schemaPopups.utils.js
M resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js
M resources/ext.popups.targets.desktopTarget/desktopTarget.js
M tests/qunit/ext.popups.schemaPopups.utils.test.js
5 files changed, 28 insertions(+), 4 deletions(-)


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

diff --git a/resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js 
b/resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js
index 06604cd..ef1c280 100644
--- a/resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js
+++ b/resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js
@@ -222,6 +222,10 @@
namespaceIdHover: cache.settings.namespace,
perceivedWait: Math.round( mw.now() - 
logData.dwellStartTime )
} );
+   mw.track( 'ext.popups.schemaPopups', $.extend( {}, logData, {
+   action: 'displayed'
+   } )
+   );
 
cache.process( link, $.extend( {}, logData ) );
 
diff --git 
a/resources/ext.popups.schemaPopups.utils/ext.popups.schemaPopups.utils.js 
b/resources/ext.popups.schemaPopups.utils/ext.popups.schemaPopups.utils.js
index 7c9c9da..7487365 100644
--- a/resources/ext.popups.schemaPopups.utils/ext.popups.schemaPopups.utils.js
+++ b/resources/ext.popups.schemaPopups.utils/ext.popups.schemaPopups.utils.js
@@ -93,14 +93,19 @@
 * @return {Object}
 */
function getMassagedData( data, previousLogData ) {
+   // We don't log hover and display events as they are not 
compatible with the schema
+   // but they are useful for debugging
+   var action = data.action;
 
// Only one action is recorded per link interaction token...
if ( data.linkInteractionToken &&
data.linkInteractionToken === 
previousLogData.linkInteractionToken ) {
// however, the 'disabled' action takes two clicks by 
nature, so allow it
-   if ( data.action !== 'disabled' ) {
+   if ( action !== 'disabled' ) {
return false;
}
+   } else if ( action && [ 'hover', 'display' ].indexOf( action ) 
> -1 ) {
+   return false;
}
data.previewCountBucket = mw.popups.getPreviewCountBucket();
delete data.dwellStartTime;
diff --git a/resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js 
b/resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js
index c419660..a78db75 100644
--- a/resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js
+++ b/resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js
@@ -9,8 +9,6 @@
);
 
mw.trackSubscribe( 'ext.popups.event', function ( topic, data ) {
-   var shouldLog = true;
-
data = mw.popups.schemaPopups.getMassagedData( data, 
previousLogData );
 
if ( data ) {
diff --git a/resources/ext.popups.targets.desktopTarget/desktopTarget.js 
b/resources/ext.popups.targets.desktopTarget/desktopTarget.js
index 4b47d46..b7a6386 100644
--- a/resources/ext.popups.targets.desktopTarget/desktopTarget.js
+++ b/resources/ext.popups.targets.desktopTarget/desktopTarget.js
@@ -46,6 +46,10 @@
hovercardsSuppressedByGadget: 
isNavigationPopupsGadgetEnabled()
};
 
+   mw.track( 'ext.popups.schemaPopups', $.extend( {}, eventData, {
+   action: 'hover'
+   } )
+   );
// Only enable Popups when the Navigation popups gadget is not 
enabled
if ( !eventData.hovercardsSuppressedByGadget && 
mw.popups.enabled ) {
if ( mw.popups.scrolled ) {
diff --git a/tests/qunit/ext.popups.schemaPopups.utils.test.js 
b/tests/qunit/ext.popups.schemaPopups.utils.test.js
index 9a6b7d7..1ec7549 100644
--- a/tests/qunit/ext.popups.schemaPopups.utils.test.js
+++ b/tests/qunit/ext.popups.schemaPopups.utils.test.js
@@ -145,4 +145,17 @@

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.storage: Catch exceptions on window.localStorage p...

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: mediawiki.storage: Catch exceptions on window.localStorage 
property access
..

mediawiki.storage: Catch exceptions on window.localStorage property access

Follows-up 430a0d3984, which created a private property that stored a
reference to the localStorage object outside the get and set methods.

Where previously it was used directly, and as such, covered by
the try/catch around getItem and setItem calls.

Bug: T148998
Change-Id: Ibe75408913d4ffbf1791e1a6470296b29f809185
---
M resources/src/mediawiki/mediawiki.storage.js
1 file changed, 8 insertions(+), 1 deletion(-)


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

diff --git a/resources/src/mediawiki/mediawiki.storage.js 
b/resources/src/mediawiki/mediawiki.storage.js
index cb62fbf..a9d17ff 100644
--- a/resources/src/mediawiki/mediawiki.storage.js
+++ b/resources/src/mediawiki/mediawiki.storage.js
@@ -10,7 +10,14 @@
 */
mw.storage = {
 
-   localStorage: window.localStorage,
+   localStorage: ( function () {
+   // Catch exceptions to avoid fatal in Chrome's "Block 
data storage" mode
+   // which throws when accessing the localStorage 
property itself, as opposed
+   // to the standard behaviour of throwing on 
getItem/setItem. (T148998)
+   try {
+   return window.localStorage;
+   } catch ( e ) {}
+   }() ),
 
/**
 * Retrieve value from device storage.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...webplatform[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Idad8e896aed35d67e18a8a7a3fc0c3fc766592c7
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/webplatform 
refs/changes/11/317711/1

diff --git a/.gitreview b/.gitreview
index dec469b..b3f37e8 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/webplatform
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idad8e896aed35d67e18a8a7a3fc0c3fc766592c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/webplatform
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...mediawiki-strapping[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I6a3178ad7add0056ece575de38a57ded6b18a32e
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/mediawiki-strapping 
refs/changes/09/317709/1

diff --git a/.gitreview b/.gitreview
index ddb5be4..408040d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/mediawiki-strapping.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a3178ad7add0056ece575de38a57ded6b18a32e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/mediawiki-strapping
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...p2wiki[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Ie2be577cf12d5d58f90c2fd1671b9353e9e17877
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/p2wiki 
refs/changes/10/317710/1

diff --git a/.gitreview b/.gitreview
index 9134ccb..6646e8e 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/p2wiki.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2be577cf12d5d58f90c2fd1671b9353e9e17877
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/p2wiki
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...WPtouch[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I997df3777fbb2c77481735e1d96a6db8b928b6d2
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/WPtouch 
refs/changes/05/317705/1

diff --git a/.gitreview b/.gitreview
index dad7f17..89796b8 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/WPtouch.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I997df3777fbb2c77481735e1d96a6db8b928b6d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/WPtouch
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I726cd714f1ad24696edfcc9437f6d64a55a1c264
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/03/317703/1

diff --git a/.gitreview b/.gitreview
index fc24546..a4726e1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Vector.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I726cd714f1ad24696edfcc9437f6d64a55a1c264
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...VectorV2[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I8d7a39e4721452a919397ea050adc11234d2741d
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/VectorV2 
refs/changes/04/317704/1

diff --git a/.gitreview b/.gitreview
index 4332823..325e94a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/VectorV2.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d7a39e4721452a919397ea050adc11234d2741d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/VectorV2
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...erudite[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I1fcc7ce60d538e8867099212cc1dafd58d569e0f
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite 
refs/changes/08/317708/1

diff --git a/.gitreview b/.gitreview
index 022ac7c..0654aa6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/erudite.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fcc7ce60d538e8867099212cc1dafd58d569e0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...DuskToDawn[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I3186bdf678a23a9dab66fd8a94526be74c9607af
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DuskToDawn 
refs/changes/82/317682/1

diff --git a/.gitreview b/.gitreview
index 8f224a1..0cd63a4 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/DuskToDawn.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3186bdf678a23a9dab66fd8a94526be74c9607af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DuskToDawn
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Nostalgia[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Ifea1cb1ef90e5ba74c018df54723879906ed1e6e
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nostalgia 
refs/changes/94/317694/1

diff --git a/.gitreview b/.gitreview
index a180ec3..aea52d7 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Nostalgia.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifea1cb1ef90e5ba74c018df54723879906ed1e6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I9c26f6c922033d20ce118fad1eb73dcd3a31b387
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/07/317707/1

diff --git a/.gitreview b/.gitreview
index 43ceaf5..084e83a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/apex.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c26f6c922033d20ce118fad1eb73dcd3a31b387
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...WoOgLeShades[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I01b7429b41723eff020961e281c656f512c37863
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/WoOgLeShades 
refs/changes/06/317706/1

diff --git a/.gitreview b/.gitreview
index cf710a4..10de7f9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/WoOgLeShades.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01b7429b41723eff020961e281c656f512c37863
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/WoOgLeShades
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Splash[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I7083da9f88a94b6bfb769ab28920aa5da47f4326
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Splash 
refs/changes/97/317697/1

diff --git a/.gitreview b/.gitreview
index b7c1a6f..d797d24 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Splash.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7083da9f88a94b6bfb769ab28920aa5da47f4326
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Splash
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I006f4f8e8183480b6305ba3be200c77e56e18670
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/90/317690/1

diff --git a/.gitreview b/.gitreview
index 2dba64f..977ecef 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/MinervaNeue.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I006f4f8e8183480b6305ba3be200c77e56e18670
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Ib9613f4dca6e11c8df495d7936656db00653a0b4
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed 
refs/changes/95/317695/1

diff --git a/.gitreview b/.gitreview
index ab240ae..fb19d15 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Refreshed.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9613f4dca6e11c8df495d7936656db00653a0b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: Iab48c7123707b912d60c6a629400c80ed1a0ed95
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Truglass 
refs/changes/02/317702/1

diff --git a/.gitreview b/.gitreview
index f0ef2bd..e4320bc 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Truglass.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab48c7123707b912d60c6a629400c80ed1a0ed95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...GreyStuff[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: If401ef989d3979edadb4e0ff276b8e3062726063
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/GreyStuff 
refs/changes/86/317686/1

diff --git a/.gitreview b/.gitreview
index 030c729..a1defb8 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/GreyStuff.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If401ef989d3979edadb4e0ff276b8e3062726063
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I12779e53f0a0e05224b6f1cd52c7fc7bc98222f8
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/00/317700/1

diff --git a/.gitreview b/.gitreview
index 778252c..fe16641 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Timeless.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12779e53f0a0e05224b6f1cd52c7fc7bc98222f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Tempo[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I34ddf6a9cf1669cebc72c38018f326daca103e51
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Tempo 
refs/changes/99/317699/1

diff --git a/.gitreview b/.gitreview
index e46d5f0..24035b7 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Tempo.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34ddf6a9cf1669cebc72c38018f326daca103e51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Tempo
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Schulenburg[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I2682dcd81fa9a5fc7a27d9a566bf58dfc72c31fc
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Schulenburg 
refs/changes/96/317696/1

diff --git a/.gitreview b/.gitreview
index 6cc5b49..1dcdee1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Schulenburg.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2682dcd81fa9a5fc7a27d9a566bf58dfc72c31fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Schulenburg
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki...Modern[master]: Swapping defaultbranch for trace

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Swapping defaultbranch for trace
..

Swapping defaultbranch for trace

The former is a maintenance nightmare when branching.

Bug:T146293
Change-Id: I6ad48a4d65983d8f6959f2f3782f23f6104cf47b
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Modern 
refs/changes/91/317691/1

diff --git a/.gitreview b/.gitreview
index 5b5d4e9..3bdfc5b 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/skins/Modern.git
-defaultbranch=master
+trace=1
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ad48a4d65983d8f6959f2f3782f23f6104cf47b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Chad 

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