[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Modern)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I9354611b09d9341f59dbe86570feac1a0154fc1f
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 10e562c..c287c0a 100644
--- a/skin.json
+++ b/skin.json
@@ -37,5 +37,6 @@
AutoloadClasses: {
SkinModern: SkinModern.php,
ModernTemplate: SkinModern.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9354611b09d9341f59dbe86570feac1a0154fc1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...MonoBook)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: Ib2d5a91c6a2db1533fbf6d9b767b1dacb3207658
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 406f7c9..d2d51c7 100644
--- a/skin.json
+++ b/skin.json
@@ -34,5 +34,6 @@
AutoloadClasses: {
SkinMonoBook: SkinMonoBook.php,
MonoBookTemplate: MonoBookTemplate.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2d5a91c6a2db1533fbf6d9b767b1dacb3207658
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Improve doc of maxage and s-maxage API parameters - change (mediawiki/core)

[Spage (Code Review)]

Spage has uploaded a new change for review.

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

Change subject: Improve doc of maxage and s-maxage API parameters
..

Improve doc of maxage and s-maxage API parameters

They set HTTP cache control headers.  i18-only change.

Change-Id: I9eefdd51d6937388326ceb7b6baa72288221c2f7
---
M includes/api/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index d905dea..f3faf48 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -10,8 +10,8 @@
apihelp-main-param-action: Which action to perform.,
apihelp-main-param-format: The format of the output.,
apihelp-main-param-maxlag: Maximum lag can be used when MediaWiki is 
installed on a database replicated cluster. To save actions causing any more 
site replication lag, this parameter can make the client wait until the 
replication lag is less than the specified value. In case of excessive lag, 
error code sampmaxlag/samp is returned with a message like sampWaiting 
for $host: $lag seconds lagged/samp.br /See 
[[mw:Manual:Maxlag_parameter|Manual: Maxlag parameter]] for more information.,
-   apihelp-main-param-smaxage: Set the codes-maxage/code header to 
this many seconds. Errors are never cached.,
-   apihelp-main-param-maxage: Set the codemax-age/code header to 
this many seconds. Errors are never cached.,
+   apihelp-main-param-smaxage: Set the codes-maxage/code HTTP cache 
control header to this many seconds. Errors are never cached.,
+   apihelp-main-param-maxage: Set the codemax-age/code HTTP cache 
control header to this many seconds. Errors are never cached.,
apihelp-main-param-assert: Verify the user is logged in if set to 
kbduser/kbd, or has the bot userright if kbdbot/kbd.,
apihelp-main-param-requestid: Any value given here will be included 
in the response. May be used to distinguish requests.,
apihelp-main-param-servedby: Include the hostname that served the 
request in the results.,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9eefdd51d6937388326ceb7b6baa72288221c2f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Spage sp...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...GreyStuff)

[Isarra (Code Review)]

Isarra has submitted this change and it was merged.

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I9940924c08d854297a48651c9e89b6c3a8962d41
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 153760e..e5fef20 100755
--- a/skin.json
+++ b/skin.json
@@ -45,5 +45,6 @@
class: ResourceLoaderSkinModule,
position: top
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9940924c08d854297a48651c9e89b6c3a8962d41
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Add permission check for mark as exception - change (mediawiki...WikidataQuality)

[Dominic.sauer (Code Review)]

Dominic.sauer has uploaded a new change for review.

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

Change subject: Add permission check for mark as exception
..

Add permission check for mark as exception

Change-Id: I210f16346f51f7e806ef009c01627ff104bcc721
---
M api/GetViolations.php
M includes/Violations/DispatchingViolationContext.php
M includes/Violations/ViolationContext.php
3 files changed, 48 insertions(+), 6 deletions(-)


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

diff --git a/api/GetViolations.php b/api/GetViolations.php
index 8563686..71192a6 100755
--- a/api/GetViolations.php
+++ b/api/GetViolations.php
@@ -6,8 +6,12 @@
 use DataValues\Serializers;
 use Doctrine\Instantiator\Exception\UnexpectedValueException;
 use Wikibase\Api\ApiWikibase;
+use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\Lib\Store\EntityRevisionLookup;
+use Wikibase\Lib\Store\StorageException;
 use Wikibase\Repo\WikibaseRepo;
+use Wikibase\Repo\Store\EntityPermissionChecker;
 use WikibaseQuality\Violations\DispatchingViolationContext;
 use WikibaseQuality\Violations\Violation;
 use WikibaseQuality\Violations\ViolationQuery;
@@ -47,6 +51,11 @@
  */
 private $violationContext;
 
+/**
+ * @var EntityPermissionChecker
+ */
+private $permissionChecker;
+
/**
 * @param ApiMain $main
 * @param string $name
@@ -59,6 +68,7 @@
$this-violationSerializer = 
WikibaseQualityFactory::getDefaultInstance()-getViolationSerializer();
 $this-entityIdParser = 
WikibaseRepo::getDefaultInstance()-getEntityIdParser();
 $this-violationContext = 
WikibaseQualityFactory::getDefaultInstance()-getDispatchingViolationContext();
+$this-permissionChecker = 
WikibaseRepo::getDefaultInstance()-getEntityPermissionChecker();
}
 
/**
@@ -72,7 +82,10 @@
 
 $entityId = $this-entityIdParser-parse( $params['entityId'] );
$violations = $this-getViolationsOfEntity( $entityId );
-   $this-writeResultOutput( $violations );
+
+$permissionStatus = $this-checkExceptionPermission( $entityId );
+
+   $this-writeResultOutput( $violations, $permissionStatus );
}
 
/**
@@ -91,14 +104,15 @@
 
 /**
  * @param Violation[] $violations
+ * @param bool $permissionStatus
  */
-   private function writeResultOutput( array $violations ) {
+   private function writeResultOutput( array $violations, 
$permissionStatus ) {
$output = array();
if ( count( $violations )  0 ) {
foreach ( $violations as $violation ) {
 try {
 $shortMessage = $this-violationContext-getShortMessage( 
$violation );
-$longMessage = $this-violationContext-getLongMessage( 
$violation );
+$longMessage = $this-violationContext-getLongMessage( 
$violation, $permissionStatus );
 $iconPath = $this-violationContext-getIconPath( 
$violation );
 }
 catch( UnexpectedValueException $e ) {
@@ -151,4 +165,30 @@
'action=wdqagetviolationsentityId=Q76' = 
'apihelp-wdqagetviolations-examples-1'
);
}
+
+
+/**
+ * Checks the permission for marking an violation as exception
+ *
+ * @param EntityId $entityId
+ *
+ * @return bool
+ * @codeCoverageIgnore
+ */
+private function checkExceptionPermission( EntityId $entityId ) {
+$user = \RequestContext::getMain()-getUser();
+$baseRevisionId = EntityRevisionLookup::LATEST_FROM_MASTER;
+$status = false;
+try {
+$entityRev = $this-getEntityRevisionLookup()-getEntityRevision( 
$entityId, $baseRevisionId );
+$entity = $entityRev-getEntity();
+// At this point only change/edit rights should be checked
+$status = $this-permissionChecker-getPermissionStatusForEntity( 
$user, 'wikibase-violation-exception', $entity );
+} catch ( StorageException $ex ) {
+$this-dieException( $ex, 'no-such-entity' );
+}
+
+return $status-isOK();
+}
+
 }
\ No newline at end of file
diff --git a/includes/Violations/DispatchingViolationContext.php 
b/includes/Violations/DispatchingViolationContext.php
index b01f167..e8c5f87 100755
--- a/includes/Violations/DispatchingViolationContext.php
+++ b/includes/Violations/DispatchingViolationContext.php
@@ -86,11 +86,12 @@
  * Returns human readable message for given violation of this context.
  *
  * @param Violation $violation
+ * @param bool $permissionStatus
  * @return string
  */
-public function getLongMessage( Violation $violation ) {
+public function getLongMessage( Violation 

[MediaWiki-commits] [Gerrit] Add logo image to banner - change (mediawiki...GreyStuff)

[jenkins-bot (Code Review)]

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

Change subject: Add logo image to banner
..


Add logo image to banner

Includes a backwards compatibility module that doesn't seem to work?

Change-Id: Id79688a4eb4bf7f813e0c5af1d89556c488b0bde
---
M GreyStuff.skin.php
M GreyStuffTemplate.php
M resources/main.less
M skin.json
4 files changed, 26 insertions(+), 0 deletions(-)

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



diff --git a/GreyStuff.skin.php b/GreyStuff.skin.php
index 6a62b7d..095073b 100755
--- a/GreyStuff.skin.php
+++ b/GreyStuff.skin.php
@@ -27,6 +27,8 @@
 * @param $out OutputPage
 */
function setupSkinUserCss( OutputPage $out ) {
+   global $wgVersion;
+
parent::setupSkinUserCss( $out );
 
# Add css
@@ -34,5 +36,10 @@
'mediawiki.skinning.content.externallinks',
'skins.greystuff'
) );
+   if ( $out-getResourceLoader()-isModuleRegistered( 
'mediawiki.skining.logo' ) ) {
+   $out-addModuleStyles( 'mediawiki.skinning.logo' );
+   } else {
+   $out-addModuleStyles( 'skins.greystuff.logo' );
+   }
}
 }
diff --git a/GreyStuffTemplate.php b/GreyStuffTemplate.php
index 115e6ab..c9e81ce 100755
--- a/GreyStuffTemplate.php
+++ b/GreyStuffTemplate.php
@@ -43,6 +43,13 @@
div id=header-container?php $this-html( 
'userlangattributes' ); ?
div id=header-top-container
div id=header-top
+   div id=p-logo role=banner
+   a class=mw-wiki-logo href=?php
+   echo htmlspecialchars( 
$this-data['nav_urls']['mainpage']['href'] )
+   ? ?php
+   echo Xml::expandAttributes( 
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
+   ?/a
+   /div
div class=mw-portlet id=p-banner
div id=sitetitle role=banner
a href=?php echo 
htmlspecialchars( $this-data['nav_urls']['mainpage']['href'] ) ?
diff --git a/resources/main.less b/resources/main.less
index b70b735..d0cd55d 100755
--- a/resources/main.less
+++ b/resources/main.less
@@ -78,6 +78,14 @@
}
 
/* Banner stuff */
+   .mw-wiki-logo {
+   display: block;
+   width: 66px;
+   height: 66px;
+   float: left;
+   background-size: contain;
+   margin-right: 1em;
+   }
#p-banner {
float: left;
 
diff --git a/skin.json b/skin.json
index 5b89841..153760e 100755
--- a/skin.json
+++ b/skin.json
@@ -40,6 +40,10 @@
},
scripts: ,
position: top
+   },
+   skins.greystuff.logo: {
+   class: ResourceLoaderSkinModule,
+   position: top
}
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id79688a4eb4bf7f813e0c5af1d89556c488b0bde
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: Isarra zhoris...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Mobile stuff? - change (mediawiki...GreyStuff)

[jenkins-bot (Code Review)]

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

Change subject: Mobile stuff?
..


Mobile stuff?

Change-Id: I73438cebd7d82681e5d05dc430ca4da7c7a61717
---
M GreyStuffTemplate.php
M resources/main.less
M resources/screen-mobile.less
M resources/variables.less
M skin.json
5 files changed, 77 insertions(+), 34 deletions(-)

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



diff --git a/GreyStuffTemplate.php b/GreyStuffTemplate.php
index 60210fb..115e6ab 100755
--- a/GreyStuffTemplate.php
+++ b/GreyStuffTemplate.php
@@ -9,6 +9,8 @@
  * @author Jack Phoenix
  * @authors Whoever wrote monobook
  * @date 2014
+ *
+ * The DOM here is an utter trainwreck.
  */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
@@ -41,11 +43,7 @@
div id=header-container?php $this-html( 
'userlangattributes' ); ?
div id=header-top-container
div id=header-top
-   ?php
-   $this-outputPersonalNavigation();
-   $this-outputSearch();
-   ?
-   div class=mw-portlet id=p-header
+   div class=mw-portlet id=p-banner
div id=sitetitle role=banner
a href=?php echo 
htmlspecialchars( $this-data['nav_urls']['mainpage']['href'] ) ?
?php echo wfMessage( 
'sitetitle' )-escaped() ?
@@ -55,9 +53,15 @@
?php echo wfMessage( 
'sitesubtitle' )-escaped() ?
/div
/div
+   ?php
+   $this-outputPersonalNavigation();
+   $this-outputSearch();
+   ?
+   div class=visualClear/div
/div
/div
/div
+   div class=visualClear/div
div id=train-wreck
div id=plane-wreck
div id=header-navigation-container
@@ -261,7 +265,11 @@
form action=?php $this-text( 'wgScript' ) ? 
id=searchform
h3label for=searchInput?php $this-msg( 'search' 
) ?/label/h3
div id=simpleSearch
-   ?php echo $this-makeSearchInput( array( 'id' 
= 'searchInput', 'type' = 'text' ) ); ?
+   div id=searchInput-container-container
+   div id=searchInput-container
+   ?php echo $this-makeSearchInput( 
array( 'id' = 'searchInput', 'type' = 'text' ) ); ?
+   /div
+   /div
?php echo $this-makeSearchButton( 'go', 
array( 'id' = 'searchGoButton', 'class' = 'searchButton' ) ); ?
?php # echo $this-makeSearchButton( 
'fulltext', array( 'id' = 'mw-searchButton', 'class' = 'searchButton' ) ); ?
input type='hidden' name=title value=?php 
$this-text( 'searchtitle' ) ?/
diff --git a/resources/main.less b/resources/main.less
index e77cfd0..b70b735 100755
--- a/resources/main.less
+++ b/resources/main.less
@@ -44,9 +44,7 @@
 /* Set up appearance */
 #train-wreck {
background: #fff;
-}
-#header-top-container {
-   border-bottom: solid 1px @bold-border;
+   border-top: solid 1px @bold-border;
 }
 
 #header-top,
@@ -70,60 +68,69 @@
  */
 
 #header-container {
-   font-size: 95%;
 
+   #header-top-container {
+   padding: .5em 1.5em;
+   }
#header-top {
-   padding: 1em 1.5em;
+   padding: 0;
+   font-size: 95%;
}
 
/* Banner stuff */
-   #sitetitle {
-   padding-top: .25em;
+   #p-banner {
+   float: left;
 
-   a {
-   font-size: 210%;
-   font-weight: bold;
-   line-height: 140%;
-   color: #999;
-   /* @noflip */
-   text-shadow:  0 -1px 0 #333, 0 2px 1px #fff;
+   #sitetitle {
+   padding-top: .25em;
 
-   :hover {
-   text-decoration: none;
+   a {
+   font-size: 210%;
+   font-weight: bold;
+   line-height: 140%;
+   color: #999;
+   /* @noflip */
+   text-shadow:  0 -1px 0 #333, 0 2px 1px #fff;
+
+   

[MediaWiki-commits] [Gerrit] Move GreyStuffTemplate class into its own file - change (mediawiki...GreyStuff)

[jenkins-bot (Code Review)]

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

Change subject: Move GreyStuffTemplate class into its own file
..


Move GreyStuffTemplate class into its own file

Apparently this is how it's done. No idea why. Okay.

Change-Id: I89007b0c65e0d9374509f60c19af24ed95d54354
---
M GreyStuff.skin.php
A GreyStuffTemplate.php
M skin.json
3 files changed, 393 insertions(+), 376 deletions(-)

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



diff --git a/GreyStuff.skin.php b/GreyStuff.skin.php
index 215aae4..6a62b7d 100755
--- a/GreyStuff.skin.php
+++ b/GreyStuff.skin.php
@@ -36,378 +36,3 @@
) );
}
 }
-
-/**
- * Main skin class
- * @ingroup Skins
- */
-class GreyStuffTemplate extends BaseTemplate {
-
-   /**
-* Template filter callback for GreyStuff skin.
-* Takes an associative array of data set from a SkinTemplate-based
-* class, and a wrapper for MediaWiki's localization database, and
-* outputs a formatted page.
-*
-* @access private
-*/
-   function execute() {
-   global $wgHostLink, $wgDefaultSkin;
-
-   // Suppress warnings to prevent notices about missing indexes 
in $this-data
-   wfSuppressWarnings();
-
-   $this-html( 'headelement' );
-   ?
-   div id=globalWrapper
-   div id=header-container?php $this-html( 
'userlangattributes' ); ?
-   div id=header-top-container
-   div id=header-top
-   ?php
-   $this-outputPersonalNavigation();
-   $this-outputSearch();
-   ?
-   div class=mw-portlet id=p-header
-   div id=sitetitle role=banner
-   a href=?php echo 
htmlspecialchars( $this-data['nav_urls']['mainpage']['href'] ) ?
-   ?php echo wfMessage( 
'sitetitle' )-escaped() ?
-   /a
-   /div
-   div id=sitesubtitle
-   ?php echo wfMessage( 
'sitesubtitle' )-escaped() ?
-   /div
-   /div
-   /div
-   /div
-   /div
-   div id=train-wreck
-   div id=plane-wreck
-   div id=header-navigation-container
-   div id=header-navigation
-   ?php
-   $this-outputMainNavigation();
-   ?
-   /div
-   /div
-   div id=content-container
-   div id=content class=mw-body-primary role=main
-   a id=top/a
-   ?php
-   if ( $this-data['sitenotice'] ) {
-   ?
-   div id=siteNotice
-   ?php
-   $this-html( 'sitenotice' )
-   ?
-   /div
-   ?php
-   }
-   if ( $this-data['subtitle'] || 
$this-data['undelete'] || $this-data['newtalk'] ) {
-   ?
-   div id=content-top-stuff
-   div id=contentSub?php 
$this-html( 'userlangattributes' ) ?
-   ?php $this-html( 
'subtitle' ) ?
-   /div
-   ?php
-   if ( $this-data['undelete'] ) {
-   ?
-   div 
id=contentSub2?php $this-html( 'undelete' ) ?/div
-   ?php
-   }
-   if ( $this-data['newtalk'] ) {
-   ?
-   div 
class=usermessage?php $this-html( 'newtalk' ) ?/div
-   ?php
-   }
-   ?
-   /div
-   ?php
-   }
-  

[MediaWiki-commits] [Gerrit] Make skin sort of responsive, other random stuff - change (mediawiki...GreyStuff)

[jenkins-bot (Code Review)]

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

Change subject: Make skin sort of responsive, other random stuff
..


Make skin sort of responsive, other random stuff

Split out less into main and three sizes: large, small, mobile

Small design is basically as was. Mobile will extend upon that. Large
currently has a sidebar actually on the side, but it looks stupid as
arse.

Other random things were also done, largely out of frustration and
needing a break from the css stuff.

Change-Id: I33567f3230ee660e1dc30ca4d3fbb88984820281
---
M GreyStuff.skin.php
M i18n/en.json
M i18n/qqq.json
M resources/main.less
A resources/screen-large.less
A resources/screen-mobile.less
A resources/screen-small.less
A resources/variables.less
M skin.json
9 files changed, 320 insertions(+), 123 deletions(-)

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



diff --git a/GreyStuff.skin.php b/GreyStuff.skin.php
index bff1ca9..36a9282 100755
--- a/GreyStuff.skin.php
+++ b/GreyStuff.skin.php
@@ -64,7 +64,7 @@
div id=header-top-container
div id=header-top
?php
-   $this-outputPersonalMenu();
+   $this-outputPersonalNavigation();
$this-outputSearch();
?
div class=mw-portlet id=p-header
@@ -79,24 +79,14 @@
/div
/div
/div
-   div id=header-navigation-container
-   div id=header-navigation
-   div id=header-tools
-   ?php
-   $this-outputPortlet( array(
-   'id' = 'p-variants',
-   'headerMessage' = 
'variants',
-   'content' = 
$this-data['content_navigation']['variants'],
-   ) );
-   $this-outputToolbox();
-   ?
-   /div
-   div id=navigation
-   ?php
-   $this-outputSidebar();
-   ?
-   /div
-   /div
+   /div
+   div id=train-wreck
+   div id=plane-wreck
+   div id=header-navigation-container
+   div id=header-navigation
+   ?php
+   $this-outputMainNavigation();
+   ?
/div
/div
div id=content-container
@@ -153,15 +143,25 @@
?
/div
div id =page-tools
+
?php
-   $ptools = array_merge(
-   
$this-data['content_navigation']['views'],
-   
$this-data['content_navigation']['actions']
-   );
+   if ( isset( 
$this-data['content_navigation']['actions']['watch'] ) ) {
+   
$this-data['content_navigation']['views']['watch'] = 
$this-data['content_navigation']['actions']['watch'];
+   unset( 
$this-data['content_navigation']['actions']['watch'] );
+   }
+   if ( isset( 
$this-data['content_navigation']['actions']['unwatch'] ) ) {
+   
$this-data['content_navigation']['views']['unwatch'] = 
$this-data['content_navigation']['actions']['unwatch'];
+   unset( 
$this-data['content_navigation']['actions']['unwatch'] );
+   }
$this-outputPortlet( array(
'id' = 'p-views',
'headerMessage' = 
'views',
-   'content' = $ptools
+   

[MediaWiki-commits] [Gerrit] Content style tweaks - change (mediawiki...GreyStuff)

[jenkins-bot (Code Review)]

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

Change subject: Content style tweaks
..


Content style tweaks

Change-Id: I50c480ce96478974d3c06d8449e03da4515d09f9
---
M GreyStuff.skin.php
M resources/main.less
2 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/GreyStuff.skin.php b/GreyStuff.skin.php
index 36a9282..215aae4 100755
--- a/GreyStuff.skin.php
+++ b/GreyStuff.skin.php
@@ -166,6 +166,7 @@
?
/div
/div
+   div class=visualClear/div
div id=bodyContent class=mw-body
div id=siteSub?php $this-msg( 
'tagline' ) ?/div
 
diff --git a/resources/main.less b/resources/main.less
index d5f9a4a..e77cfd0 100755
--- a/resources/main.less
+++ b/resources/main.less
@@ -304,8 +304,9 @@
line-height: 1.3em;
 }
 div.editOptions {
-   background: @soft-bkg;
-   border-color: @soft-border;
+   background: #fff;
+   border-bottom: solid 1px @soft-border;
+   padding-bottom: 1em;
 }
 td.mw-input,
 td.mw-label {
@@ -417,6 +418,10 @@
 #train-wreck {
border-bottom: solid 1px @bold-border;
 }
+#mw-content-text {
+   padding-bottom: 1.5em;
+   font-size: 95%;
+}
 
 #siteSub {
display: none;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50c480ce96478974d3c06d8449e03da4515d09f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: Isarra zhoris...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Make mediawiki/tools/codesniffer pass phpcs - change (mediawiki...codesniffer)

[jenkins-bot (Code Review)]

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

Change subject: Make mediawiki/tools/codesniffer pass phpcs
..


Make mediawiki/tools/codesniffer pass phpcs

Bug: T92754
Change-Id: I0612f4392ab61323c44032a0b30ca7765ed72070
---
M MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php
M MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
M MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
M MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php
M MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php
M MediaWiki/Sniffs/VariableAnalysis/UnusedGlobalVariablesSniff.php
M MediaWiki/Sniffs/WhiteSpace/SpaceAfterControlStructureSniff.php
M MediaWiki/Tests/MediaWikiStandardTest.php
M MediaWiki/Tests/files/NamingConventions/case_global_name_fail.php
M 
MediaWiki/Tests/files/VariableAnalysis/used_global_variables_regression_pass.php
M TestHelper.php
M composer.json
M phpunit.bootstrap.php
13 files changed, 80 insertions(+), 58 deletions(-)

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



diff --git a/MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php 
b/MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php
index 43b6e9f..592aa1d 100644
--- a/MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php
+++ b/MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php
@@ -2,9 +2,13 @@
 /**
  * Verify alternative syntax is not being used
  */
-class MediaWiki_Sniffs_AlternativeSyntax_AlternativeSyntaxSniff implements 
PHP_CodeSniffer_Sniff {
+// @codingStandardsIgnoreStart
+class MediaWiki_Sniffs_AlternativeSyntax_AlternativeSyntaxSniff
+   implements PHP_CodeSniffer_Sniff {
+   // @codingStandardsIgnoreEnd
public function register() {
-   // Per 
https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP#Alternative_syntax_for_control_structures
+   // Per 
https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP
+   // section on alternative syntax.
return array(
T_ENDDECLARE,
T_ENDFOR,
diff --git 
a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php 
b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
index 4d436a2..b252e65 100644
--- a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
+++ b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
@@ -2,13 +2,16 @@
 /**
  * Check to see if there's any character before php open tag ? or ?php
  */
-class MediaWiki_Sniffs_ExtraCharacters_CharacterBeforePHPOpeningTagSniff 
implements PHP_CodeSniffer_Sniff {
+// @codingStandardsIgnoreStart
+class MediaWiki_Sniffs_ExtraCharacters_CharacterBeforePHPOpeningTagSniff
+   implements PHP_CodeSniffer_Sniff {
+   // @codingStandardsIgnoreEnd
public function register() {
return array( T_OPEN_TAG );
}
public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
// do nothing if opening tag is the first character
-   if( $stackPtr == 0) {
+   if ( $stackPtr == 0 ) {
return;
}
$tokens = $phpcsFile-getTokens();
diff --git a/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php 
b/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
index dd566e5..371a689 100644
--- a/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
+++ b/MediaWiki/Sniffs/GotoUsage/GotoUsageSniff.php
@@ -2,7 +2,9 @@
 /**
  * Report error when `goto` is used
  */
+// @codingStandardsIgnoreStart
 class MediaWiki_Sniffs_GotoUsage_GotoUsageSniff implements 
PHP_CodeSniffer_Sniff {
+   // @codingStandardsIgnoreEnd
public function register() {
// As per 
https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP#Other
return array(
diff --git 
a/MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php 
b/MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php
index 0e12a8c..e207c1a 100644
--- a/MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php
+++ b/MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php
@@ -4,7 +4,10 @@
  * A global function's name must be prefixed with 'wf' or 'ef'.
  * Per https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP#Naming
  */
-class MediaWiki_Sniffs_NamingConventions_PrefixedGlobalFunctionsSniff 
implements PHP_CodeSniffer_Sniff {
+// @codingStandardsIgnoreStart
+class MediaWiki_Sniffs_NamingConventions_PrefixedGlobalFunctionsSniff
+   implements PHP_CodeSniffer_Sniff {
+   // @codingStandardsIgnoreEnd
public function register() {
return array( T_FUNCTION );
}
diff --git a/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php 
b/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php
index 

[MediaWiki-commits] [Gerrit] Add async_request test - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: Add async_request test
..

Add async_request test

Use Queue.mark_done so that tests can use Queue.join.

Bug: T98439
Change-Id: I8e80d26e8a8a09cddbf26b47c27ffb61a8b0d7e4
---
M pywikibot/__init__.py
M tests/api_tests.py
A tests/edit_tests.py
M tests/site_tests.py
M tox.ini
5 files changed, 76 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/02/215302/1

diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 615589e..ea8304a 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -721,6 +721,7 @@
 if request is None:
 break
 request(*args, **kwargs)
+page_put_queue.task_done()
 
 
 def async_request(request, *args, **kwargs):
diff --git a/tests/api_tests.py b/tests/api_tests.py
index 46319f1..dde46f5 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -16,6 +16,7 @@
 import pywikibot.family
 import pywikibot.login
 import pywikibot.site
+
 from pywikibot.tools import MediaWikiVersion
 
 from tests.aspects import (
diff --git a/tests/edit_tests.py b/tests/edit_tests.py
new file mode 100644
index 000..6778a53
--- /dev/null
+++ b/tests/edit_tests.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8  -*-
+Tests for editing pages.
+#
+# (C) Pywikibot team, 2015
+#
+# Distributed under the terms of the MIT license.
+#
+from __future__ import unicode_literals
+
+__version__ = '$Id$'
+#
+
+import time
+
+import pywikibot
+
+from pywikibot import page_put_queue
+
+from tests.aspects import unittest, TestCase
+
+called_back = False
+
+
+class TestGeneralWrite(TestCase):
+
+Run general write tests.
+
+family = 'test'
+code = 'test'
+
+user = True
+write = True
+
+def test_async(self):
+Test writing to a page.
+global called_back
+def callback(page, err):
+global called_back
+self.assertEqual(page, p)
+self.assertIsNone(err)
+called_back = True
+
+called_back = False
+ts = str(time.time())
+p = pywikibot.Page(self.site, 'User:John Vandenberg/async test write')
+p.text = ts
+p.save(async=True, callback=callback)
+
+page_put_queue.join()
+
+p = pywikibot.Page(self.site, 'User:John Vandenberg/async test write')
+self.assertEqual(p.text, ts)
+self.assertTrue(called_back)
+
+if __name__ == '__main__':
+try:
+unittest.main()
+except SystemExit:
+pass
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 0810f95..953a3d4 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -17,7 +17,9 @@
 import re
 
 import pywikibot
+
 from pywikibot import config
+from pywikibot import async_request, page_put_queue
 from pywikibot.comms import http
 from pywikibot.tools import MediaWikiVersion
 from pywikibot.data import api
@@ -1637,6 +1639,18 @@
 self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).keys()))
 
 
+
+class TestSiteinfoAsync(DefaultSiteTestCase):
+
+Test asyncronous siteinfo fetch.
+
+def test_async_request(self):
+assert('statistics' not in self.site.siteinfo)
+async_request(self.site.siteinfo.get, 'statistics')
+page_put_queue.join()
+self.assertIn('statistics', self.site.siteinfo)
+
+
 class TestSiteLoadRevisions(TestCase):
 
 Test cases for Site.loadrevision() method.
diff --git a/tox.ini b/tox.ini
index 67e1655..cb3ca7e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -111,6 +111,7 @@
 tests/cache_tests.py \
 tests/cosmetic_changes_tests.py \
 tests/date_tests.py \
+tests/edit_tests.py \
 tests/edit_failure_tests.py \
 tests/exceptions_tests.py \
 tests/family_tests.py \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e80d26e8a8a09cddbf26b47c27ffb61a8b0d7e4
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com

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

[MediaWiki-commits] [Gerrit] Use official spdx identifier for CC0 license - change (mediawiki...Example)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Use official spdx identifier for CC0 license
..

Use official spdx identifier for CC0 license

See http://spdx.org/licenses/

Change-Id: I2334658ea18582958bb888448e986e1160aad4a8
---
M skin.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/skin.json b/skin.json
index 91292eb..741d4e5 100644
--- a/skin.json
+++ b/skin.json
@@ -5,7 +5,7 @@
url: https://www.mediawiki.org/wiki/Skin:Example;,
descriptionmsg: example-desc,
namemsg: skinname-example,
-   license-name: CC0,
+   license-name: CC0-1.0,
type: skin,
ValidSkinNames: {
example: Example

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2334658ea18582958bb888448e986e1160aad4a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Example
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Dusk)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I4054ac749f22f345d88ab4c3717fcf60055abbdc
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 68422e0..b307707 100644
--- a/skin.json
+++ b/skin.json
@@ -32,5 +32,6 @@
},
position: top
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4054ac749f22f345d88ab4c3717fcf60055abbdc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Dusk
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...DeskMessMirrored)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I7ea4424e58e249ff312a783cad048d8a1b2b4047
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 08cb23d..00c3016 100644
--- a/skin.json
+++ b/skin.json
@@ -28,5 +28,6 @@
},
position: top
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ea4424e58e249ff312a783cad048d8a1b2b4047
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeskMessMirrored
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...CologneBlue)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I8a00ffaa7490814d2bc3b3e67d2419ce510321f2
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 620c2f4..806de59 100644
--- a/skin.json
+++ b/skin.json
@@ -42,5 +42,6 @@
AutoloadClasses: {
SkinCologneBlue: SkinCologneBlue.php,
CologneBlueTemplate: SkinCologneBlue.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a00ffaa7490814d2bc3b3e67d2419ce510321f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/CologneBlue
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Nostalgia)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: Icc7aa5adb2a8e4526b6ba516d65f7ef8edcbe979
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index a215fa9..88edbef 100644
--- a/skin.json
+++ b/skin.json
@@ -31,5 +31,6 @@
AutoloadClasses: {
SkinNostalgia: Nostalgia_body.php,
NostalgiaTemplate: Nostalgia_body.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc7aa5adb2a8e4526b6ba516d65f7ef8edcbe979
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use proper spdx license identifier for GPL 2.0 or later - change (mediawiki...Nostalgia)

[jenkins-bot (Code Review)]

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

Change subject: Use proper spdx license identifier for GPL 2.0 or later
..


Use proper spdx license identifier for GPL 2.0 or later

See http://spdx.org/licenses/

Change-Id: I3c40c1e57e2236d2d0a5dbab2021031fa957a371
---
M skin.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 7255a23..a215fa9 100644
--- a/skin.json
+++ b/skin.json
@@ -3,7 +3,7 @@
url: https://www.mediawiki.org/wiki/Skin:Nostalgia;,
descriptionmsg: nostalgia-desc,
namemsg: skinname-nostalgia,
-   license-name: GPLv2+,
+   license-name: GPL-2.0+,
type: skin,
ValidSkinNames: {
nostalgia: Nostalgia

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c40c1e57e2236d2d0a5dbab2021031fa957a371
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Example)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: Ifff2d8bab634b5a8affb7a92cf0712ff068ad297
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 741d4e5..f027b5f 100644
--- a/skin.json
+++ b/skin.json
@@ -30,5 +30,6 @@
},
AutoloadClasses: {
SkinExample: Example.skin.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifff2d8bab634b5a8affb7a92cf0712ff068ad297
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Example
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use official spdx identifier for CC0 license - change (mediawiki...Example)

[jenkins-bot (Code Review)]

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

Change subject: Use official spdx identifier for CC0 license
..


Use official spdx identifier for CC0 license

See http://spdx.org/licenses/

Change-Id: I2334658ea18582958bb888448e986e1160aad4a8
---
M skin.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 91292eb..741d4e5 100644
--- a/skin.json
+++ b/skin.json
@@ -5,7 +5,7 @@
url: https://www.mediawiki.org/wiki/Skin:Example;,
descriptionmsg: example-desc,
namemsg: skinname-example,
-   license-name: CC0,
+   license-name: CC0-1.0,
type: skin,
ValidSkinNames: {
example: Example

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2334658ea18582958bb888448e986e1160aad4a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Example
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Another fix for php 5.3. - change (mediawiki...WikidataQuality)

[Soeren.oldag (Code Review)]

Soeren.oldag has uploaded a new change for review.

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

Change subject: Another fix for php 5.3.
..

Another fix for php 5.3.

Change-Id: Ie1e6eb3cebb1df87c1d5c32815ddd0063507870d
---
M tests/phpunit/WikibaseQualityFactoryTest.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality 
refs/changes/00/215300/1

diff --git a/tests/phpunit/WikibaseQualityFactoryTest.php 
b/tests/phpunit/WikibaseQualityFactoryTest.php
index fc3dbb6..a1010f6 100644
--- a/tests/phpunit/WikibaseQualityFactoryTest.php
+++ b/tests/phpunit/WikibaseQualityFactoryTest.php
@@ -41,8 +41,9 @@
 }
 
 public function testGetDispatchingViolationContext() {
-$GLOBALS['wbqViolationContexts'][] = function() {
-return $this-getMockForAbstractClass( 
'WikibaseQuality\Violations\ViolationContext' );
+$mock = $this-getMockForAbstractClass( 
'WikibaseQuality\Violations\ViolationContext' );
+$GLOBALS['wbqViolationContexts'][] = function() use ( $mock ) {
+return $mock;
 };
 $violationFormatter = 
$this-getFactory()-getDispatchingViolationContext();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1e6eb3cebb1df87c1d5c32815ddd0063507870d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...CologneBlue)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I8a00ffaa7490814d2bc3b3e67d2419ce510321f2
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/skin.json b/skin.json
index 620c2f4..806de59 100644
--- a/skin.json
+++ b/skin.json
@@ -42,5 +42,6 @@
AutoloadClasses: {
SkinCologneBlue: SkinCologneBlue.php,
CologneBlueTemplate: SkinCologneBlue.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a00ffaa7490814d2bc3b3e67d2419ce510321f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/CologneBlue
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...MonoBook)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: Ib2d5a91c6a2db1533fbf6d9b767b1dacb3207658
---
M skin.json
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook 
refs/changes/89/215289/1

diff --git a/skin.json b/skin.json
index 406f7c9..c25ca51 100644
--- a/skin.json
+++ b/skin.json
@@ -9,6 +9,7 @@
namemsg: skinname-monobook,
license-name: GPL-2.0+,
type: skin,
+   supports: =1.26alpha,
ValidSkinNames: {
monobook: MonoBook
},
@@ -34,5 +35,6 @@
AutoloadClasses: {
SkinMonoBook: SkinMonoBook.php,
MonoBookTemplate: MonoBookTemplate.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2d5a91c6a2db1533fbf6d9b767b1dacb3207658
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Gamepress)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I883be8a1499f35c5f9b1cfe13adbd620df6c1846
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress 
refs/changes/93/215293/1

diff --git a/skin.json b/skin.json
index 858ec45..eddaacd 100644
--- a/skin.json
+++ b/skin.json
@@ -61,5 +61,6 @@
}
}
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I883be8a1499f35c5f9b1cfe13adbd620df6c1846
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...GreyStuff)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I9940924c08d854297a48651c9e89b6c3a8962d41
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/skin.json b/skin.json
index edad7ae..0dd9cf1 100644
--- a/skin.json
+++ b/skin.json
@@ -27,5 +27,6 @@
scripts: ,
position: top
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9940924c08d854297a48651c9e89b6c3a8962d41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...DuskToDawn)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I8695fcb1a504761f006a4420ee4d65c617107f42
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/skin.json b/skin.json
index 68b796f..fd28e8c 100644
--- a/skin.json
+++ b/skin.json
@@ -31,5 +31,6 @@
],
position: top
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8695fcb1a504761f006a4420ee4d65c617107f42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DuskToDawn
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Dusk)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I4054ac749f22f345d88ab4c3717fcf60055abbdc
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Dusk 
refs/changes/85/215285/1

diff --git a/skin.json b/skin.json
index 68422e0..b307707 100644
--- a/skin.json
+++ b/skin.json
@@ -32,5 +32,6 @@
},
position: top
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4054ac749f22f345d88ab4c3717fcf60055abbdc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Dusk
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Mask)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I925aaba0b5f875a525f76bd1b891b8bcfb29a001
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Mask 
refs/changes/84/215284/1

diff --git a/skin.json b/skin.json
index 7268824..e965637 100644
--- a/skin.json
+++ b/skin.json
@@ -46,5 +46,6 @@
mediawiki.ui.icon: [],
mediawiki.ui.text: []
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I925aaba0b5f875a525f76bd1b891b8bcfb29a001
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Mask
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...DeskMessMirrored)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I7ea4424e58e249ff312a783cad048d8a1b2b4047
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeskMessMirrored 
refs/changes/87/215287/1

diff --git a/skin.json b/skin.json
index 08cb23d..00c3016 100644
--- a/skin.json
+++ b/skin.json
@@ -28,5 +28,6 @@
},
position: top
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ea4424e58e249ff312a783cad048d8a1b2b4047
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeskMessMirrored
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Modern)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I9354611b09d9341f59dbe86570feac1a0154fc1f
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/skin.json b/skin.json
index 10e562c..c287c0a 100644
--- a/skin.json
+++ b/skin.json
@@ -37,5 +37,6 @@
AutoloadClasses: {
SkinModern: SkinModern.php,
ModernTemplate: SkinModern.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9354611b09d9341f59dbe86570feac1a0154fc1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Metrolook)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: I32f033fdc7f54e291867b01220641ba1395c5923
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/92/215292/1

diff --git a/skin.json b/skin.json
index 526204b..173feb9 100644
--- a/skin.json
+++ b/skin.json
@@ -131,5 +131,6 @@
MetrolookTile2: true,
MetrolookTile3: true,
MetrolookTile4: true
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32f033fdc7f54e291867b01220641ba1395c5923
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Quit setting default email in form - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Quit setting default email in form
..


Quit setting default email in form

Old forms relied on a special case to keep the default value out of
the placeholder.  Let's set the default in staging instead.
Also update mustache form to use newer 'email' name, not 'emailAdd'

Change-Id: Iaf742da324c372842e41e5458390f2df38d0967e
---
M DonationInterface.php
M gateway_common/DonationData.php
M gateway_common/gateway.adapter.php
M gateway_forms/mustache/personal_info.html.mustache
M tests/DonationDataTest.php
M tests/DonationInterfaceTestCase.php
6 files changed, 14 insertions(+), 8 deletions(-)

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



diff --git a/DonationInterface.php b/DonationInterface.php
index 435b062..6f435d1 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -141,6 +141,9 @@
  */
 $wgDonationInterfaceAppealWikiTemplate = 
'LanguageSwitch|2011FR/$appeal/text|$language';
 
+// Email address used when donor enters nothing
+$wgDonationInterfaceDefaultEmail = 'nob...@wikimedia.org';
+
 //all of the following variables make sense to override directly,
 //or change DonationInterface to the gateway's id to override just for that 
gateway.
 //for instance: To override $wgDonationInterfaceUseSyslog just for 
GlobalCollect, add
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 669f08c..84cce42 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -674,18 +674,12 @@
 * Normalize email
 * Check regular name, and horrible old name for values (preferring the
 * reasonable name over the legacy version)
-* Set the value to 'nob...@wikimedia.org' if nothing has been entered.
 */
protected function setEmail() {
// Look at the old style value (because that's canonical if 
populated first)
$email = $this-getVal( 'emailAdd' );
if ( is_null( $email ) ) {
$email = $this-getVal( 'email' );
-   }
-
-   if ( is_null( $email ) ) {
-   // We still have nothing, populate with default
-   $email = 'nob...@wikimedia.org';
}
 
$this-setVal( 'email', $email );
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 81e64fc..eedcc25 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1992,6 +1992,9 @@
// This allows transactions to each stage different data.
$this-defineStagedVars();
 
+   // Always stage email address
+   $this-staged_vars[] = 'email';
+
foreach ( $this-staged_vars as $field ) {
$function_name = 'stage_' . $field;
$this-executeIfFunctionExists( $function_name );
@@ -2141,6 +2144,12 @@
}
}
 
+   protected function stage_email() {
+   if ( empty( $this-staged_data['email'] ) ) {
+   $this-staged_data['email'] = $this-getGlobal( 
'DefaultEmail' );
+   }
+   }
+
protected function buildRequestParams() {
// Look up the request structure for our current transaction 
type in the transactions array
$structure = $this-getTransactionRequestStructure();
diff --git a/gateway_forms/mustache/personal_info.html.mustache 
b/gateway_forms/mustache/personal_info.html.mustache
index f3c691b..4622774 100644
--- a/gateway_forms/mustache/personal_info.html.mustache
+++ b/gateway_forms/mustache/personal_info.html.mustache
@@ -5,7 +5,7 @@
/tr
tr
td
-   input 
class=fullwidth name=emailAdd value={{ email }} type=email title={{ 
l10n donate_interface-donor-email }} placeholder={{ l10n 
donate_interface-donor-email }} id=emailAdd required
+   input 
class=fullwidth name=email value={{ email }} type=email title={{ l10n 
donate_interface-donor-email }} placeholder={{ l10n 
donate_interface-donor-email }} id=email required
/td
/tr
 {{# fiscal_number_required }}
diff --git a/tests/DonationDataTest.php b/tests/DonationDataTest.php
index 2a0dbd4..f8e43d3 100644
--- a/tests/DonationDataTest.php
+++ b/tests/DonationDataTest.php
@@ -88,7 +88,6 @@
$returned = $ddObj-getDataEscaped();
$expected = array(  'posted' = '',
'amount' = '0.00',
-   

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-4 - change (mediawiki/core)

[Chiefwei (Code Review)]

Chiefwei has uploaded a new change for review.

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

Change subject: Chinese Conversion Table Update 2015-4
..

Chinese Conversion Table Update 2015-4

Update the Chinese conversion table routinely to fix bugs reported from
https://zh.wikipedia.org/wiki/Wikipedia:%E5%AD%97%E8%AF%8D%E8%BD%AC%E6%8D%A2/%E4%BF%AE%E5%A4%8D%E8%AF%B7%E6%B1%82.

It is only data changes and only works for Chinese WikiProjects.

Change-Id: Ic1355c98e8e18217c73461239d4754f9d117999d
---
M includes/ZhConversion.php
M maintenance/language/zhtable/simp2trad_noconvert.manual
M maintenance/language/zhtable/simpphrases.manual
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toSimp.manual
M maintenance/language/zhtable/toTW.manual
M maintenance/language/zhtable/trad2simp.manual
M maintenance/language/zhtable/trad2simp_noconvert.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
11 files changed, 127 insertions(+), 14 deletions(-)


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

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 32f69d9..b59be8c 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -1474,7 +1474,6 @@
 '虑' = '慮',
 '虚' = '虛',
 '虫' = '蟲',
-'虬' = '虯',
 '虮' = '蟣',
 '虽' = '雖',
 '虾' = '蝦',
@@ -3075,6 +3074,7 @@
 '9余' = '9餘',
 '·范' = '·范',
 '’s ' = '’s',
+'、面点' = '、麵點',
 '。个中' = '。箇中',
 '〇周后' = '〇周後',
 '〇年' = '〇年',
@@ -5803,6 +5803,7 @@
 '支干' = '支幹',
 '支配欲' = '支配慾',
 '收获' = '收穫',
+'改制成' = '改制成',
 '改征' = '改徵',
 '改采' = '改採',
 '放懞挣' = '放懞掙',
@@ -5874,25 +5875,40 @@
 '方志' = '方誌',
 '于0' = '於0',
 '于1' = '於1',
+'于1天' = '於1天',
 '于2' = '於2',
+'于2天' = '於2天',
 '于3' = '於3',
+'于3天' = '於3天',
 '于4' = '於4',
+'于4天' = '於4天',
 '于5' = '於5',
+'于5天' = '於5天',
 '于6' = '於6',
+'于6天' = '於6天',
 '于7' = '於7',
+'于7天' = '於7天',
 '于8' = '於8',
+'于8天' = '於8天',
 '于9' = '於9',
+'于9天' = '於9天',
 '于一' = '於一',
+'于一天' = '於一天',
 '于一役' = '於一役',
 '于七' = '於七',
+'于七天' = '於七天',
 '于三' = '於三',
+'于三天' = '於三天',
 '于世' = '於世',
 '于之' = '於之',
 '于乎' = '於乎',
 '于九' = '於九',
+'于九天' = '於九天',
 '于事' = '於事',
 '于二' = '於二',
+'于二天' = '於二天',
 '于五' = '於五',
+'于五天' = '於五天',
 '于人' = '於人',
 '于今' = '於今',
 '于他' = '於他',
@@ -5900,14 +5916,18 @@
 '于何' = '於何',
 '于你' = '於你',
 '于八' = '於八',
+'于八天' = '於八天',
 '于六' = '於六',
+'于六天' = '於六天',
 '于前' = '於前',
 '于劣' = '於劣',
 '于勤' = '於勤',
 '于十' = '於十',
+'于十天' = '於十天',
 '于半' = '於半',
 '于呼哀哉' = '於呼哀哉',
 '于四' = '於四',
+'于四天' = '於四天',
 '于国' = '於國',
 '于坏' = '於坏',
 '于垂' = '於垂',
@@ -6161,6 +6181,7 @@
 '柜上' = '柜上',
 '柜子' = '柜子',
 '柜柳' = '柜柳',
+'查封后' = '查封後',
 '柱梁' = '柱樑',
 '柳斌杰' = '柳斌杰',
 '柳诒征' = '柳詒徵',
@@ -6186,6 +6207,7 @@
 '杆秤' = '桿秤',
 '杆菌' = '桿菌',
 '梁上君子' = '梁上君子',
+'梁启超' = '梁啓超',
 '条干' = '條幹',
 '梨干' = '梨乾',
 '梯冲' = '梯衝',
@@ -6435,6 +6457,7 @@
 '涂长望' = '涂長望',
 '涂鴻欽' = '涂鴻欽',
 '涂鸿钦' = '涂鴻欽',
+'涌水塘' = '涌水塘',
 '涳蒙' = '涳濛',
 '涸干' = '涸乾',
 '凉席' = '涼蓆',
@@ -6472,6 +6495,7 @@
 '涌入' = '湧入',
 '涌出' = '湧出',
 '涌向' = '湧向',
+'涌水' = '湧水',
 '涌泉' = '湧泉',
 '涌现' = '湧現',
 '涌起' = '湧起',
@@ -7133,6 +7157,7 @@
 '节欲' = '節慾',
 '节目里' = '節目裡',
 '节余' = '節餘',
+'范亭' = '範亭',
 '范例' = '範例',
 '范围' = '範圍',
 '范字' = '範字',
@@ -7330,7 +7355,6 @@
 '羁系' = '羈繫',
 '美容美发' = '美容美髮',
 '美于' = '美於',
-'美制' = '美製',
 '美丑' = '美醜',
 '美发学' = '美髮學',
 '美发师' = '美髮師',
@@ -7885,6 +7909,7 @@
 '角落里' = '角落裡',
 '觚棱' = '觚稜',
 '解雇' = '解僱',
+'解封后' = '解封後',
 '解铃仍须系铃人' = '解鈴仍須繫鈴人',
 '解铃还须系铃人' = '解鈴還須繫鈴人',
 '解发佯狂' = '解髮佯狂',
@@ -7927,7 +7952,6 @@
 '托附' = '託附',
 '许愿起经' = '許愿起經',
 '許聖杰' = '許聖杰',
-'许虬' = '許虬',
 '注上' = '註上',
 '注册' = '註冊',
 '注失' = '註失',
@@ -8739,6 +8763,7 @@
 '雪里蕻' = '雪裡蕻',
 '云吞' = '雲吞',
 '云笈七签' = '雲笈七籤',
+'云里雾里' = '雲裡霧裡',
 '云游' = '雲遊',
 '云须' = '雲鬚',
 '零个' = '零個',
@@ -9359,6 +9384,8 @@
 '面饺' = '麵餃',
 '面饼' = '麵餅',
 '面馆' = '麵館',
+'面点、' = '麵點、',
+'面点师' = '麵點師',
 '麻将席' = '麻將蓆',
 '麻酱面' = '麻醬麵',
 '黄干黑瘦' = '黃乾黑瘦',
@@ -12098,6 +12125,7 @@
 '鈿' = '钿',
 '鉀' = '钾',
 '鉁' = '豅',
+'鉄' = '铁',
 '鉅' = '钜',
 '鉆' = '钻',
 '鉈' = '铊',
@@ -13722,6 +13750,7 @@
 '穀旦' = '穀旦',
 '穀梁' = '穀梁',
 '穀水' = '穀水',
+'穀阳' = '穀阳',
 '穀陽' = '穀阳',
 '穿著者' = '穿着者',
 '竹昇' = '竹升',
@@ -13757,6 +13786,7 @@
 '著者' = '著者',
 '著身' = '著身',
 '著述' = '著述',
+'蔡孝乾' = '蔡孝乾',
 '蔡絛' = '蔡絛',
 '行餘' = '行馀',
 '覆蓋' = '覆盖',
@@ -13971,7 +14001,7 @@
 '叱咤叱' = '叱咤叱',
 '叱咤咤' = '叱咤咤',
 '叱咤樂壇' = '叱咤樂壇',
-'斯坦福' = '史丹福',
+'斯坦福大学' = '史丹福大學',
 '斯皮尔伯格' = '史匹柏',
 '斯特劳斯' = '史特勞斯',
 '斯威士兰' = '史瓦濟蘭',
@@ -14179,7 +14209,8 @@
 '东盟' = '東協',
 '亚细安' = '東協',
 '東盟' = '東協',
-'东南亚国家联盟' = '東南亞國協',
+'东南亚国家联盟' = '東南亞國家協會',
+'東南亞國家聯盟' = '東南亞國家協會',
 '柏林墙' = '柏林圍牆',
 '柏林牆' = '柏林圍牆',
 '乍得' = '查德',
@@ -14253,7 +14284,9 @@
 '铁托' = '狄托',
 '塞拉利昂' = '獅子山',
 '独联体' = '獨立國協',
+'獨聯體' = '獨立國協',
 '独立国家联合体' = '獨立國家國協',
+'獨立國家聯合體' = '獨立國家國協',
 '波利尼西亚' = '玻里尼西亞',
 '波利尼西亞' = '玻里尼西亞',
 '本傑明' = '班傑明',
@@ -14482,6 +14515,7 @@
 '集装箱' = '貨櫃',
 '数据库' = '資料庫',
 '數據庫' = '資料庫',
+'信息时代' = '資訊時代',
 '信息论' = '資訊理論',
 '乔布斯' = '賈伯斯',
 '宾西法尼亚' = '賓夕法尼亞',
@@ 

[MediaWiki-commits] [Gerrit] UserStats: skip blocked and nonexistent users in the various... - change (mediawiki...SocialProfile)

[jenkins-bot (Code Review)]

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

Change subject: UserStats: skip blocked and nonexistent users in the various 
Special:Top* pages
..


UserStats: skip blocked and nonexistent users in the various Special:Top* pages

This is partially r48744 for the other two special pages as well as the
topusers parser hook.

Thanks to:
* George Barnick -- for reporting the bug where nonexistent (merged) users were 
showing up on Special:TopUsers
* legoktm -- for suggesting a better way to check for the existence of a user

Change-Id: Ie57f03fdeeb7df3d1cdb4408b007d32b21dfdaba
---
M UserStats/TopFansByStat.php
M UserStats/TopFansRecent.php
M UserStats/TopUsers.php
M UserStats/UserStatsClass.php
4 files changed, 81 insertions(+), 19 deletions(-)

Approvals:
  UltrasonicNXT: Looks good to me, but someone else must approve
  Lewis Cawte: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UserStats/TopFansByStat.php b/UserStats/TopFansByStat.php
index 37eb7af..c6e70a6 100644
--- a/UserStats/TopFansByStat.php
+++ b/UserStats/TopFansByStat.php
@@ -54,13 +54,14 @@
$out-setPageTitle( $this-msg( 'top-fans-by-category-title-' . 
$fixedStatistic )-plain() );
 
$count = 50;
+   $realCount = 100;
 
$user_list = array();
 
// Get the list of users
 
// Try cache
-   $key = wfMemcKey( 'user_stats', 'top', $statistic, $count );
+   $key = wfMemcKey( 'user_stats', 'top', $statistic, $realCount );
$data = $wgMemc-get( $key );
 
if ( $data != '' ) {
@@ -80,12 +81,29 @@
$params
);
 
+   $loop = 0;
+
foreach ( $res as $row ) {
-   $user_list[] = array(
-   'user_id' = $row-stats_user_id,
-   'user_name' = $row-stats_user_name,
-   'stat' = $row-$column
-   );
+   $u = User::newFromId( $row-stats_user_id );
+   // Ensure that the user exists for real.
+   // Otherwise we'll be happily displaying 
entries for users that
+   // once existed by no longer do (account 
merging is a thing,
+   // sadly), since user_stats entries for users 
are *not* purged
+   // and/or merged during the account merge 
process (which is a
+   // different bug with a different extension).
+   $exists = $u-loadFromId();
+
+   if ( !$u-isBlocked()  $exists ) {
+   $user_list[] = array(
+   'user_id' = 
$row-stats_user_id,
+   'user_name' = 
$row-stats_user_name,
+   'stat' = $row-$column
+   );
+   }
+
+   if ( $loop = $realCount ) {
+   break;
+   }
}
 
$wgMemc-set( $key, $user_list, 60 * 5 );
diff --git a/UserStats/TopFansRecent.php b/UserStats/TopFansRecent.php
index 729d7df..67d2b56 100644
--- a/UserStats/TopFansRecent.php
+++ b/UserStats/TopFansRecent.php
@@ -45,12 +45,13 @@
}
$out-setPageTitle( $this-msg( $pageTitle )-plain() );
 
-   $count = 50;
+   $count = 100;
+   $realCount = 50;
 
$user_list = array();
 
// Try cache
-   $key = wfMemcKey( 'user_stats', $period, 'points', $count );
+   $key = wfMemcKey( 'user_stats', $period, 'points', $realCount );
$data = $wgMemc-get( $key );
 
if ( $data != '' ) {
@@ -71,12 +72,30 @@
$params
);
 
+   $loop = 0;
+
foreach ( $res as $row ) {
-   $user_list[] = array(
-   'user_id' = $row-up_user_id,
-   'user_name' = $row-up_user_name,
-   'points' = $row-up_points
-   );
+   $u = User::newFromId( $row-up_user_id );
+   // Ensure that the user exists for real.
+   // Otherwise we'll be happily displaying 
entries for users that
+   // once existed by no longer do (account 

[MediaWiki-commits] [Gerrit] Add changes caused by permission check interface changes - change (mediawiki...WikidataQualityConstraints)

[Dominic.sauer (Code Review)]

Dominic.sauer has uploaded a new change for review.

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

Change subject: Add changes caused by permission check interface changes
..

Add changes caused by permission check interface changes

Change-Id: Id3921361c59bed1767f7b99960badbb4bae049c1
---
M includes/Violations/ConstraintViolationContext.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
 refs/changes/06/215306/1

diff --git a/includes/Violations/ConstraintViolationContext.php 
b/includes/Violations/ConstraintViolationContext.php
index e7f7038..a21934b 100755
--- a/includes/Violations/ConstraintViolationContext.php
+++ b/includes/Violations/ConstraintViolationContext.php
@@ -128,9 +128,10 @@
 
 /**
  * @param Violation $violation
+ * @param bool $permissionStatus
  * @return string
  */
-public function getLongMessage( Violation $violation ) {
+public function getLongMessage( Violation $violation, $permissionStatus ) {
 //TODO: Implement message system depending on constraint type
 return wfMessage( 'wbqc-violation-message' )-text();
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3921361c59bed1767f7b99960badbb4bae049c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Dominic.sauer dominic.sa...@yahoo.de

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Gamepress)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I883be8a1499f35c5f9b1cfe13adbd620df6c1846
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 858ec45..eddaacd 100644
--- a/skin.json
+++ b/skin.json
@@ -61,5 +61,6 @@
}
}
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I883be8a1499f35c5f9b1cfe13adbd620df6c1846
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] CX: Fix typo fiu_vro - fiu_vrowiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: CX: Fix typo fiu_vro - fiu_vrowiki
..


CX: Fix typo fiu_vro - fiu_vrowiki

Change-Id: I168de73e96b2ba7fcf987274e09610891e4553bc
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ae815a7..24279bf 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14671,7 +14671,7 @@
'euwiki' = true,
'extwiki' = true,
'ffwiki' = true,
-   'fiu_vro' = true,
+   'fiu_vrowiki' = true,
'fiwiki' = true,
'frwiki' = true,
'fywiki' = true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I168de73e96b2ba7fcf987274e09610891e4553bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Only show mark as exception link if user has permission to d... - change (mediawiki...WikidataQualityExternalValidation)

[Dominic.sauer (Code Review)]

Dominic.sauer has uploaded a new change for review.

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

Change subject: Only show mark as exception link if user has permission to do 
that
..

Only show mark as exception link if user has permission to do that

Conflicts:
includes/Violations/CrossCheckViolationContext.php

Change-Id: Ic2a3b6d8bd379c154e8d6fffe414c7e2adb49af5
---
M includes/Violations/CrossCheckViolationContext.php
1 file changed, 11 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
 refs/changes/04/215304/1

diff --git a/includes/Violations/CrossCheckViolationContext.php 
b/includes/Violations/CrossCheckViolationContext.php
index b6a0e93..70d182a 100755
--- a/includes/Violations/CrossCheckViolationContext.php
+++ b/includes/Violations/CrossCheckViolationContext.php
@@ -230,10 +230,11 @@
 
 /**
  * @param Violation $violation
+ * @param bool $permissionStatus
  * @throws InvalidArgumentException
  * @return string
  */
-public function getLongMessage( Violation $violation ) {
+public function getLongMessage( Violation $violation, $permissionStatus ) {
 if ( !$this-isContextFor( $violation ) ) {
 throw new InvalidArgumentException( 'The given violation is not 
supported by this context.' );
 }
@@ -243,7 +244,7 @@
 $additionalInfo = $violation-getAdditionalInfo();
 $externalValues = $this-formatExternalValues( $additionalInfo );
 
-return $this-buildLongMessage( $additionalInfo, $dataSource, 
$externalValues );
+return $this-buildLongMessage( $additionalInfo, $dataSource, 
$externalValues, $permissionStatus );
 }
 
 /**
@@ -252,9 +253,10 @@
  * @param array $additionalInfo
  * @param string $dataSource
  * @param string $externalValues
+ * @param bool $canMarkAsException
  * @return string
  */
-private function buildLongMessage( array $additionalInfo, $dataSource, 
$externalValues ) {
+private function buildLongMessage( array $additionalInfo, $dataSource, 
$externalValues, $canMarkAsException ) {
 
 $message =
 'span class=wbq-long-message-headline'
@@ -262,7 +264,6 @@
 -params( $dataSource )
 -text()
 . '/span';
-
 if( $externalValues ) {
 $message .= Html::element( 'br' );
 $message .= wfMessage( 
'wbqev-violation-long-message-external-values' )
@@ -274,11 +275,12 @@
 $message .= wfMessage( 'wbqev-violation-long-message-solve-issue' 
)-text();
 $message .= Html::element( 'br' );
 
-$message .=
-'div class=wbq-container-mark-as-exceptiona href= 
class=wbq-mark-as-exception'
-. wfMessage( 'wbq-violations-mark-as-exception' )-text()
-. '/a/div';
-
+if ( $canMarkAsException ) {
+$message .=
+'div class=wbq-container-mark-as-exceptiona href= 
class=wbq-mark-as-exception'
+. wfMessage('wbq-violations-mark-as-exception')-text()
+. '/a/div';
+}
 return $message;
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2a3b6d8bd379c154e8d6fffe414c7e2adb49af5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Dominic.sauer dominic.sa...@yahoo.de

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

[MediaWiki-commits] [Gerrit] Use proper spdx license identifier for GPL 2.0 or later - change (mediawiki...Nostalgia)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Use proper spdx license identifier for GPL 2.0 or later
..

Use proper spdx license identifier for GPL 2.0 or later

See http://spdx.org/licenses/

Change-Id: I3c40c1e57e2236d2d0a5dbab2021031fa957a371
---
M skin.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/skin.json b/skin.json
index 7255a23..a215fa9 100644
--- a/skin.json
+++ b/skin.json
@@ -3,7 +3,7 @@
url: https://www.mediawiki.org/wiki/Skin:Nostalgia;,
descriptionmsg: nostalgia-desc,
namemsg: skinname-nostalgia,
-   license-name: GPLv2+,
+   license-name: GPL-2.0+,
type: skin,
ValidSkinNames: {
nostalgia: Nostalgia

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c40c1e57e2236d2d0a5dbab2021031fa957a371
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Example)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: Ifff2d8bab634b5a8affb7a92cf0712ff068ad297
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Example 
refs/changes/98/215298/1

diff --git a/skin.json b/skin.json
index 741d4e5..f027b5f 100644
--- a/skin.json
+++ b/skin.json
@@ -30,5 +30,6 @@
},
AutoloadClasses: {
SkinExample: Example.skin.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifff2d8bab634b5a8affb7a92cf0712ff068ad297
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Example
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Nostalgia)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Set manifest_version in skin.json
..

Set manifest_version in skin.json

Bug: T100745
Change-Id: Icc7aa5adb2a8e4526b6ba516d65f7ef8edcbe979
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/skin.json b/skin.json
index a215fa9..88edbef 100644
--- a/skin.json
+++ b/skin.json
@@ -31,5 +31,6 @@
AutoloadClasses: {
SkinNostalgia: Nostalgia_body.php,
NostalgiaTemplate: Nostalgia_body.php
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc7aa5adb2a8e4526b6ba516d65f7ef8edcbe979
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...DuskToDawn)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I8695fcb1a504761f006a4420ee4d65c617107f42
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 68b796f..fd28e8c 100644
--- a/skin.json
+++ b/skin.json
@@ -31,5 +31,6 @@
],
position: top
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8695fcb1a504761f006a4420ee4d65c617107f42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DuskToDawn
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Metrolook)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I32f033fdc7f54e291867b01220641ba1395c5923
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 526204b..173feb9 100644
--- a/skin.json
+++ b/skin.json
@@ -131,5 +131,6 @@
MetrolookTile2: true,
MetrolookTile3: true,
MetrolookTile4: true
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32f033fdc7f54e291867b01220641ba1395c5923
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Mask)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I925aaba0b5f875a525f76bd1b891b8bcfb29a001
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index 7268824..e965637 100644
--- a/skin.json
+++ b/skin.json
@@ -46,5 +46,6 @@
mediawiki.ui.icon: [],
mediawiki.ui.text: []
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I925aaba0b5f875a525f76bd1b891b8bcfb29a001
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Mask
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set manifest_version in skin.json - change (mediawiki...Bouquet)

[jenkins-bot (Code Review)]

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

Change subject: Set manifest_version in skin.json
..


Set manifest_version in skin.json

Bug: T100745
Change-Id: I8cd62c2bb8e7e4ec9af42c7c555c439ad17da704
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/skin.json b/skin.json
index f9d472e..5f1071b 100644
--- a/skin.json
+++ b/skin.json
@@ -55,5 +55,6 @@
}
}
}
-   }
+   },
+   manifest_version: 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8cd62c2bb8e7e4ec9af42c7c555c439ad17da704
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Bouquet
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] New WPI package for MW 1.25.1 - change (mediawiki...WPI)

[Mglaser (Code Review)]

Mglaser has uploaded a new change for review.

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

Change subject: New WPI package for MW 1.25.1
..

New WPI package for MW 1.25.1

The WPI package was updated for MW 1.25.1.

Change-Id: I4b9d188b4323cf479b50a68b3f017bfe0957be69
---
A configuration-1.25.1/TBEX.xml
A configuration-1.25.1/WpiSettings.php
A configuration-1.25.1/install.sql
A configuration-1.25.1/manifest.xml
A configuration-1.25.1/mediawiki/mw-config/config-cc.css
A configuration-1.25.1/mediawiki/mw-config/config.css
A configuration-1.25.1/mediawiki/mw-config/config.js
A configuration-1.25.1/mediawiki/mw-config/images/ajax-loader.gif
A configuration-1.25.1/mediawiki/mw-config/images/bullet.gif
A configuration-1.25.1/mediawiki/mw-config/images/critical-32.png
A configuration-1.25.1/mediawiki/mw-config/images/download-32.png
A configuration-1.25.1/mediawiki/mw-config/images/info-32.png
A configuration-1.25.1/mediawiki/mw-config/images/installer-logo.png
A configuration-1.25.1/mediawiki/mw-config/images/tick-32.png
A configuration-1.25.1/mediawiki/mw-config/images/warning-32.png
A configuration-1.25.1/mediawiki/mw-config/index.php
A configuration-1.25.1/mediawiki/mw-config/index.php5
A configuration-1.25.1/mediawiki/mw-config/index_web.php
A configuration-1.25.1/mediawiki/mw-config/overrides.php
A configuration-1.25.1/parameters.xml
A mediawiki-1.25.1-IIS.zip
21 files changed, 1,298 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/packages/WPI 
refs/changes/03/215303/1

diff --git a/configuration-1.25.1/TBEX.xml b/configuration-1.25.1/TBEX.xml
new file mode 100644
index 000..f0270ed
--- /dev/null
+++ b/configuration-1.25.1/TBEX.xml
@@ -0,0 +1,95 @@
+?xml version=1.0 encoding=utf-8?
+WebPlatform
+  Links
+AddLink InDashboard=True
+  TitleStart Here/Title
+  DescriptionComplete MediaWiki Installation./Description
+  Uri/index.php/Uri
+  
ImageUrihttp://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png/ImageUri
+/AddLink
+AddLink InDashboard=True InLearn=True
+  TitleAbout MediaWiki/Title
+  DescriptionMediaWiki is a free software open source wiki package 
written in PHP, originally for use on Wikipedia. It is now used by several 
other projects of the non-profit Wikimedia Foundation and by many other wikis, 
including this website./Description
+  Urihttp://www.mediawiki.org/wiki/MediaWiki/Uri
+  
ImageUrihttp://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png/ImageUri
+/AddLink
+AddLink InDashboard=True InLearn=True
+  TitleSystem admin hub - Everything for the system 
administrator./Title
+  DescriptionThis is a place for system administrators to get help 
installing, upgrading, configuring or maintaining the MediaWiki software on a 
third-party wiki../Description
+  Urihttp://www.mediawiki.org/wiki/Sysadmin_hub/Uri
+  
ImageUrihttp://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/MediaWiki-sysadmins-icon.svg/175px-MediaWiki-sysadmins-icon.svg.png/ImageUri
+/AddLink
+AddLink InDashboard=True
+  TitleCommunity/Title
+  DescriptionFind: Forums, Documentation, FAQ's and Help/Description
+  Urihttp://www.mediawiki.org/wiki/Project:Help/Uri
+  
ImageUrihttp://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png/ImageUri
+/AddLink
+AddLink InDashboard=True
+  TitleDevelopmer hub/Title
+  DescriptionThis is an overview of MediaWiki development, including 
links to the key documents, resources and tools available to 
developers./Description
+  Urihttp://www.mediawiki.org/wiki/Developer_hub/Uri
+  
ImageUrihttp://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png/ImageUri
+/AddLink
+AddLink InDashboard=True
+  TitleWindows Azure Storage/Title
+  DescriptionThis is a documentation about how to store files in the 
Windows Azure cloud, using the Windows Azure Storage Service./Description
+  Urihttp://www.mediawiki.org/wiki/WPI/WindowsAzureStorage/Uri
+  
ImageUrihttp://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png/ImageUri
+/AddLink
+   /Links
+  Ribbon
+AddRibbonButton
+  LabelSite Admin/Label
+  Uri/index.php?title=Special%3ASpecialPages/Uri
+  
ImageUrihttp://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png/ImageUri
+/AddRibbonButton
+  /Ribbon
+
+  PathProtection
+AllowPath AllowNested=False
+  RelativePathweb.config/RelativePath
+/AllowPath
+ProtectPath
+  RelativePathbin/RelativePath
+/ProtectPath
+ProtectPath
+  RelativePathdocs/RelativePath
+/ProtectPath
+ProtectPath
+  RelativePathextensions/RelativePath
+

[MediaWiki-commits] [Gerrit] icinga.wikimedia.org cert sha1 to sha256 - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: icinga.wikimedia.org cert sha1 to sha256
..


icinga.wikimedia.org cert sha1 to sha256

DO NOT MERGE THIS PATCHSET without updating it with the associated
configuration changes for icinga's use, or you will break icinga https.

(dzahn) - changed intermediate cert to RapidSSL_SHA256_CA_-_G3.pem per Robh
(dzahn) - do _not_ set the intermediate anymore since now this happens 
automagically

Bug:T100830
Change-Id: Ic8baf0f715da4793ef64525edca2e5fe893f3f14
---
M files/ssl/icinga.wikimedia.org.crt
M modules/icinga/manifests/web.pp
2 files changed, 27 insertions(+), 30 deletions(-)

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



diff --git a/files/ssl/icinga.wikimedia.org.crt 
b/files/ssl/icinga.wikimedia.org.crt
index 4db40ba..a07769d 100644
--- a/files/ssl/icinga.wikimedia.org.crt
+++ b/files/ssl/icinga.wikimedia.org.crt
@@ -1,30 +1,27 @@
--BEGIN CERTIFICATE-
-MIIFLjCCBBagAwIBAgIDD+z/MA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwMTA1MDQyMjAyWhcNMTYwMTA4MTI1ODU3WjCBwzEpMCcGA1UEBRMgdUtn
-Y1ZVekU3dzNQam5lOUZUekdwVTRsUlMzY3N0OFcxEzARBgNVBAsTCkdUMjE4MTYw
-MzMxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-U1NMKFIpMR0wGwYDVQQDExRpY2luZ2Eud2lraW1lZGlhLm9yZzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAON1lpcwbZRCxXEesLZg1tSuO5VTwz96opZ0
-Bs6SIU2HiMqOjQZIXNzhok+GgYrFo9GREucSd7W7z66ZNdNaeVLX0+smcnU5WThx
-pVmX3IERI7sgCL71x8Lh2/cfyHgPfXeQfbSEbt5ud23BqOYtIwmtIXgltexaj1t2
-auqWVogmrHwXMbPSOMEBOA2Gm7U4Djj6sw47O1m+uqNVYK44CRSbP5PDNtq8noqg
-t8XJeTcCkQpmrBT1HvaVG+y4sifBMUBXmXolmL0hZoN8rBlcakkW4Md0TVzc6sKz
-R5pzxPuoFJiz+ySPI19uVV7HL87kO0C5ieFIVTdgqjBhdXWN+30CAwEAAaOCAa8w
-ggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQE
-AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIU
-aWNpbmdhLndpa2ltZWRpYS5vcmcwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3Jh
-cGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0O
-BBYEFKU/muhYBV42hRNII2b+J77vcvnEMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUH
-AQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVz
-dC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3Qu
-Y29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggr
-BgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczAN
-BgkqhkiG9w0BAQUFAAOCAQEAZv0SKGl5iVJhKUaShnqGvc8+EHKgil6lhIvm0Q9T
-XXUsL/cUcqLxWBr51BfEV3WBsG6WN/n8QIkLhu9+JvlXz3Yt3lfJoEYY6D1eAOkh
-qe9VhPa71LTBVPn8WjFzuQPS728gMcN2jArjlT5nrZ3ZZuXwndNMWauSY+DjXvOK
-pxWd/eUIUTJTF5gVQMUe56zHqz00Y3CO8VVvRG7qF9BkoqL4r2CGQOb5CLLJ/u3F
-HeSBdaLtJcMTGZs3XkQmmk0terT/6gzhAglqNMBrcP8FsFKfyaqfdITNdgbAFsKh
-eYh25bMOLeW9w7XsN/9JuwT21L4R6R3OuHJFmodNIzUyUg==
+ -BEGIN CERTIFICATE-
+MIIEqzCCA5OgAwIBAgIDBLaQMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
+NTYgQ0EgLSBHMzAeFw0xNTA1MjgwMDM3MDRaFw0xNjAxMDgwMzAwNDZaMIGYMRMw
+EQYDVQQLEwpHVDIxODE2MDMzMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
+bS9yZXNvdXJjZXMvY3BzIChjKTE0MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
+YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEdMBsGA1UEAxMUaWNpbmdhLndpa2ltZWRp
+YS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjdZaXMG2UQsVx
+HrC2YNbUrjuVU8M/eqKWdAbOkiFNh4jKjo0GSFzc4aJPhoGKxaPRkRLnEne1u8+u
+mTXTWnlS19PrJnJ1OVk4caVZl9yBESO7IAi+9cfC4dv3H8h4D313kH20hG7ebndt
+wajmLSMJrSF4JbXsWo9bdmrqllaIJqx8FzGz0jjBATgNhpu1OA44+rMOOztZvrqj
+VWCuOAkUmz+TwzbavJ6KoLfFyXk3ApEKZqwU9R72lRvsuLInwTFAV5l6JZi9IWaD
+fKwZXGpJFuDHdE1c3OrCs0eac8T7qBSYs/skjyNfblVexy/O5DtAuYnhSFU3YKow
+YXV1jft9AgMBAAGjggFMMIIBSDAfBgNVHSMEGDAWgBTDnPP800YINLvORn+gfFvz
+4gjLWTBXBggrBgEFBQcBAQRLMEkwHwYIKwYBBQUHMAGGE2h0dHA6Ly9ndi5zeW1j
+ZC5jb20wJgYIKwYBBQUHMAKGGmh0dHA6Ly9ndi5zeW1jYi5jb20vZ3YuY3J0MA4G
+A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
+VR0RBBgwFoIUaWNpbmdhLndpa2ltZWRpYS5vcmcwKwYDVR0fBCQwIjAgoB6gHIYa
+aHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcmwwDAYDVR0TAQH/BAIwADBBBgNVHSAE
+OjA4MDYGBmeBDAECATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5yYXBpZHNz
+bC5jb20vbGVnYWwwDQYJKoZIhvcNAQELBQADggEBACTTk1OrnMVfcChW52Ll1NR3
+Jt8YUSsXH2tuBg0Mlsgyr7PUhP6FDppXTwa/BvvxHTUh80zPAopTG9znnYvqyUPi
+KEJ7+PiHHodP7z4FwyLhOcR7rVYO77DfOqFi1HiZfw/B01h3498q1J5Ixb8KrM9s
+eghPwknMO52YzZiii8RDbC/zJ7/kwzRjJuiKeTf5YJ+w99Yq5DtLzf4sYM+7t5du
+HfkIEkGVdUiQSTV8+1qQ28i6KBxTP1dzDpBdDccYRdoO9eayUmts79xIwzSc41Ue
+bOVcWjLK3qIOPlw8FefS1ez9kDMEYvIrKhWWwNzHzAXfYubPvgFzE6oiTZ9tPWk=
 -END CERTIFICATE-
diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index 3096aaf..87d0101 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -45,6 +45,6 @@
 ensure = absent,
 }
 
-install_certificate{ 'icinga.wikimedia.org':   ca = 'RapidSSL_CA.pem' 
}
+install_certificate{ 'icinga.wikimedia.org': }
 
 }

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] [jscs] Enforce disallowMixedSpacesAndTabs - change (mediawiki...parsoid)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

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

Change subject: [jscs] Enforce disallowMixedSpacesAndTabs
..

[jscs] Enforce disallowMixedSpacesAndTabs

Change-Id: I6d0700964657b8ed63cf845f7de25d6729efd882
---
M .jscsrc
M api/routes.js
M lib/dom.markFosteredContent.js
M lib/dom.migrateTrailingNLs.js
M lib/dom.t.TableFixups.js
M lib/dom.t.handleLIHack.js
M lib/dom.wrapTemplates.js
M lib/ext.core.ListHandler.js
M lib/ext.core.ParserFunctions.js
M lib/ext.core.QuoteTransformer.js
M lib/ext.core.Sanitizer.js
M lib/ext.core.TemplateHandler.js
M lib/mediawiki.DOMPostProcessor.js
M lib/mediawiki.DOMUtils.js
M lib/mediawiki.TokenTransformManager.js
M lib/mediawiki.Util.js
M lib/mediawiki.WikiConfig.js
M lib/mediawiki.WikitextSerializer.js
M lib/mediawiki.parser.defines.js
M lib/mediawiki.parser.js
M lib/mediawiki.tokenizer.utils.js
M lib/pegTokenizer.pegjs.txt
M lib/wts.ConstrainedText.js
M lib/wts.LinkHandler.js
M lib/wts.TagHandlers.js
M lib/wts.escapeWikitext.js
M lib/wts.separators.js
M tests/fetch-parserTests.txt.js
M tests/parserTests.js
M tests/server/server.js
30 files changed, 242 insertions(+), 247 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/71/215371/1

diff --git a/.jscsrc b/.jscsrc
index 83cadc6..d0a2106 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -14,7 +14,6 @@
validateIndentation: \t,
 
// We'd like to eliminate these at some point, to conform with the 
preset.
-   disallowMixedSpacesAndTabs: null,
disallowQuotedKeysInObjects: null,
disallowSpacesInsideParentheses: null,
maximumLineLength: null,
diff --git a/api/routes.js b/api/routes.js
index 6d21457..c475b4d 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -811,8 +811,8 @@
 
var v2 = Object.assign({ format: req.params.format }, req.body);
 
-   if ( !supportedFormats.has( v2.format ) ||
-( req.method === GET  !wt2htmlFormats.has( 
v2.format ) ) ) {
+   if (!supportedFormats.has(v2.format) ||
+   (req.method === GET  
!wt2htmlFormats.has(v2.format))) {
return errOut(Invalid format.);
}
 
diff --git a/lib/dom.markFosteredContent.js b/lib/dom.markFosteredContent.js
index b7e1a60..abf69a5 100644
--- a/lib/dom.markFosteredContent.js
+++ b/lib/dom.markFosteredContent.js
@@ -66,16 +66,16 @@
// skip pass the table end mw:shadow and any transclusions that
// start inside the table. there may be newlines and comments in
// between so keep track of that, and backtrack when necessary.
-   while ( sibling ) {
-   if ( !DU.isTplStartMarkerMeta( sibling )  (
-DU.isTplOrExtToplevelNode( sibling ) ||
-DU.isMarkerMeta( sibling, mw:EndTag ) ||
-DU.isMarkerMeta( sibling, mw:TransclusionShadow )
+   while (sibling) {
+   if (!DU.isTplStartMarkerMeta(sibling)  (
+   DU.isTplOrExtToplevelNode(sibling) ||
+   DU.isMarkerMeta(sibling, mw:EndTag) ||
+   DU.isMarkerMeta(sibling, mw:TransclusionShadow)
)) {
sibling = sibling.nextSibling;
beforeText = null;
-   } else if ( DU.isComment( sibling ) || DU.isText( sibling ) ) {
-   if ( !beforeText ) {
+   } else if (DU.isComment(sibling) || DU.isText(sibling)) {
+   if (!beforeText) {
beforeText = sibling;
}
sibling = sibling.nextSibling;
diff --git a/lib/dom.migrateTrailingNLs.js b/lib/dom.migrateTrailingNLs.js
index 3b536b5..91ae50c 100644
--- a/lib/dom.migrateTrailingNLs.js
+++ b/lib/dom.migrateTrailingNLs.js
@@ -29,9 +29,9 @@
return node  (node.nodeName !== HTML)  (
nodeEndsLineInWT(node) ||
(DU.isElt(node) 
-DU.getDataParsoid(node).autoInsertedEnd 
-!DU.getDataParsoid(node).fostered) ||
-   (!node.nextSibling  
canMigrateNLOutOfNode(node.parentNode))
+   DU.getDataParsoid(node).autoInsertedEnd 
+   !DU.getDataParsoid(node).fostered) ||
+   (!node.nextSibling  
canMigrateNLOutOfNode(node.parentNode))
);
}
 
diff --git a/lib/dom.t.TableFixups.js b/lib/dom.t.TableFixups.js
index 279e920..ada9134 100644
--- a/lib/dom.t.TableFixups.js
+++ b/lib/dom.t.TableFixups.js
@@ -262,7 +262,7 @@
if (!transclusionNode
// Check for the pipe character in the attributish text.
|| !/^[^|]+\|([^|].*)?$/.test(attributishContent.txt)
-  ) {
+  

[MediaWiki-commits] [Gerrit] Fix alpha builds - use jenkins number for build number until... - change (apps...wikipedia)

[Bgerstle (Code Review)]

Bgerstle has submitted this change and it was merged.

Change subject: Fix alpha builds - use jenkins number for build number until we 
have the ability to push changes to gerrit.
..


Fix alpha builds - use jenkins number for build number until we have the 
ability to push changes to gerrit.

Change-Id: I6b1bd2bec3b6a1e9e7ccc8febd61448414e9d2df
---
M fastlane/Fastfile
M fastlane/lib/utils.rb
2 files changed, 12 insertions(+), 10 deletions(-)

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



diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0bf2195..b58b73a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -50,6 +50,9 @@
 force: true,
 filename: 'build/alpha.mobileprovision'
   )
+
+  increment_build_number ENV[BUILD_NUMBER].to_i
+
   # uncomment when CI is able to push tags
   ipa(
 configuration: Alpha,
diff --git a/fastlane/lib/utils.rb b/fastlane/lib/utils.rb
index e5fb350..50ce4cc 100644
--- a/fastlane/lib/utils.rb
+++ b/fastlane/lib/utils.rb
@@ -53,14 +53,13 @@
 
 # commit version bump, call a block, then push the bump to git
 def with_bump
-  if ENV['WMF_BUMP']
-increment_build_number
-commit_version_bump
-plist_version = get_version_short_string 
File.expand_path(File.join(ENV['PWD'], 'Wikipedia/Wikipedia-Info.plist'))
-# tag must be added after the version bump is committed
-add_git_tag(tag: 
#{plist_version}.#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::BUILD_NUMBER]})
-  end
-  yield if block_given?
-  push_to_git_remote if ENV['WMF_BUMP']
+  # if ENV['WMF_BUMP']
+  #   increment_build_number
+  #   commit_version_bump
+  #   plist_version = get_version_short_string 
File.expand_path(File.join(ENV['PWD'], 'Wikipedia/Wikipedia-Info.plist'))
+  #   # tag must be added after the version bump is committed
+  #   add_git_tag(tag: 
#{plist_version}.#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::BUILD_NUMBER]})
+  # end
+  # yield if block_given?
+  # push_to_git_remote if ENV['WMF_BUMP']
 end
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b1bd2bec3b6a1e9e7ccc8febd61448414e9d2df
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno cfl...@wikimedia.org
Gerrit-Reviewer: Bgerstle bgers...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Group1 wikis to 1.26wmf8 - change (operations/mediawiki-config)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: Group1 wikis to 1.26wmf8
..

Group1 wikis to 1.26wmf8

Change-Id: Ia9dfc547a8f8bd9eafb70febc439cabd925a2f77
---
M wikiversions.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index 4bf505b..d74e208 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1 +1 @@

[MediaWiki-commits] [Gerrit] The job queue does not run against multiple wikis at once - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: The job queue does not run against multiple wikis at once
..


The job queue does not run against multiple wikis at once

...because that would be crazy.

Also fix return documentation.

Change-Id: I38c06767f4e53bafff19b4f0819158939ef264c0
---
M includes/cache/RevisionLocalCache.php
M includes/cache/TitleLocalCache.php
2 files changed, 1 insertion(+), 25 deletions(-)

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



diff --git a/includes/cache/RevisionLocalCache.php 
b/includes/cache/RevisionLocalCache.php
index 6ef5003..3e1f81c 100644
--- a/includes/cache/RevisionLocalCache.php
+++ b/includes/cache/RevisionLocalCache.php
@@ -11,22 +11,10 @@
private static $instance;
 
/**
-* The current wiki id
-* @var string|null
-*/
-   private static $wiki;
-
-   /**
 * Create a EchoRevisionLocalCache object
 * @return EchoRevisionLocalCache
 */
public static function create() {
-   // A job queue may run against multiple wikis,
-   // initialize a new one for the current wiki
-   if ( wfWikiId() != self::$wiki ) {
-   self::$instance = null;
-   self::$wiki = wfWikiId();
-   }
if ( !self::$instance ) {
self::$instance = new EchoRevisionLocalCache();
}
diff --git a/includes/cache/TitleLocalCache.php 
b/includes/cache/TitleLocalCache.php
index 1ca5c5d..42e2be9 100644
--- a/includes/cache/TitleLocalCache.php
+++ b/includes/cache/TitleLocalCache.php
@@ -11,22 +11,10 @@
private static $instance;
 
/**
-* The current wiki id
-* @var string|null
-*/
-   private static $wiki;
-
-   /**
 * Create a TitleLocalCache object
-* @return TitleLocalCache
+* @return EchoTitleLocalCache
 */
public static function create() {
-   // A job queue may run against multiple wikis,
-   // initialize a new one for the current wiki
-   if ( wfWikiId() != self::$wiki ) {
-   self::$instance = null;
-   self::$wiki = wfWikiId();
-   }
if ( !self::$instance ) {
self::$instance = new EchoTitleLocalCache();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38c06767f4e53bafff19b4f0819158939ef264c0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] wgMaxCredits to 0 - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: wgMaxCredits to 0
..


wgMaxCredits to 0

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

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 83b6bcc..271a634 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14797,7 +14797,6 @@
 
 'wgMaxCredits' = array(
'default' = 0,
-   'wikivoyage' = 10,
 ),
 
 'wmgUseListings' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e2ae7b549f5935d896dab5ba1960fdf754ab9cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Revert wgMaxCredits to 0 - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Revert wgMaxCredits to 0
..


Revert wgMaxCredits to 0

Should be fine with I35255f357 in place

This reverts commit b0706310aef8ccadcafb7bc44ee7ad29b58f88f3.

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

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 271a634..83b6bcc 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14797,6 +14797,7 @@
 
 'wgMaxCredits' = array(
'default' = 0,
+   'wikivoyage' = 10,
 ),
 
 'wmgUseListings' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I026dfdbf6884b31d9b92e7d31031e3e8a92e41b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Revert wgMaxCredits to 0 - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Revert wgMaxCredits to 0
..

Revert wgMaxCredits to 0

Should be fine with I35255f357 in place

This reverts commit b0706310aef8ccadcafb7bc44ee7ad29b58f88f3.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 271a634..83b6bcc 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14797,6 +14797,7 @@
 
 'wgMaxCredits' = array(
'default' = 0,
+   'wikivoyage' = 10,
 ),
 
 'wmgUseListings' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I026dfdbf6884b31d9b92e7d31031e3e8a92e41b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Sample profiling data at 1:10, 000 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Sample profiling data at 1:10,000
..


Sample profiling data at 1:10,000

Log profiling data for 1:10,000 requests vs. the current 1:1,000, to relieve
pressure on Graphite.

Bug: T101141
Change-Id: I7810b72d5ca4b1f6b8779cdbebcc39bc64a65d32
---
M wmf-config/StartProfiler.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  Filippo Giunchedi: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index d480175..1b2da81 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -59,7 +59,7 @@
'flags'= ( XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY 
| XHPROF_FLAGS_NO_BUILTINS ),
'output'   = 'stats',
'prefix'   = 'xhprof',
-   'sampling' = 1000,
+   'sampling' = 1,
);
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7810b72d5ca4b1f6b8779cdbebcc39bc64a65d32
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Add job ack rates to gdash - change (operations/puppet)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Add job ack rates to gdash
..

Add job ack rates to gdash

Change-Id: I20127750019e5b1cfc788ff786c31ad37bb201c3
---
M files/gdash/dashboards/jobq/1.jq-1h.graph
M files/gdash/dashboards/jobq/2.jq-day.graph
M files/gdash/dashboards/jobq/3.jq-week.graph
M files/gdash/dashboards/jobq/4.jq-month1.graph
M files/gdash/dashboards/jobq/5.jq-year1.graph
5 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/215406/1

diff --git a/files/gdash/dashboards/jobq/1.jq-1h.graph 
b/files/gdash/dashboards/jobq/1.jq-1h.graph
index 6b952d7..d6ca7ad 100644
--- a/files/gdash/dashboards/jobq/1.jq-1h.graph
+++ b/files/gdash/dashboards/jobq/1.jq-1h.graph
@@ -27,3 +27,7 @@
 field :abandon, :color = brown,
:alias = none,
:data  = 'cactiStyle(alias(MediaWiki.job-abandon.rate,Jobs 
abandoned/s))'
+
+field :ack, :color = teal,
+   :alias = none,
+   :data  = 'cactiStyle(alias(MediaWiki.job-ack.rate,Jobs 
aknowledged/s))'
diff --git a/files/gdash/dashboards/jobq/2.jq-day.graph 
b/files/gdash/dashboards/jobq/2.jq-day.graph
index ebd4b27..1dda6ba 100644
--- a/files/gdash/dashboards/jobq/2.jq-day.graph
+++ b/files/gdash/dashboards/jobq/2.jq-day.graph
@@ -27,3 +27,7 @@
 field :abandon, :color = brown,
:alias = none,
:data  = 'cactiStyle(alias(MediaWiki.job-abandon.rate,Jobs 
abandoned/s))'
+
+field :ack, :color = teal,
+   :alias = none,
+   :data  = 'cactiStyle(alias(MediaWiki.job-ack.rate,Jobs 
aknowledged/s))'
diff --git a/files/gdash/dashboards/jobq/3.jq-week.graph 
b/files/gdash/dashboards/jobq/3.jq-week.graph
index 5956331..1548142 100644
--- a/files/gdash/dashboards/jobq/3.jq-week.graph
+++ b/files/gdash/dashboards/jobq/3.jq-week.graph
@@ -27,3 +27,7 @@
 field :abandon, :color = brown,
:alias = none,
:data  = 'cactiStyle(alias(MediaWiki.job-abandon.rate,Jobs 
abandoned/s))'
+
+field :ack, :color = teal,
+   :alias = none,
+   :data  = 'cactiStyle(alias(MediaWiki.job-ack.rate,Jobs 
aknowledged/s))'
diff --git a/files/gdash/dashboards/jobq/4.jq-month1.graph 
b/files/gdash/dashboards/jobq/4.jq-month1.graph
index ebd167a..2f03fb5 100644
--- a/files/gdash/dashboards/jobq/4.jq-month1.graph
+++ b/files/gdash/dashboards/jobq/4.jq-month1.graph
@@ -28,3 +28,7 @@
 field :abandon, :color = brown,
:alias = none,
:data  = 
'cactiStyle(alias(summarize(MediaWiki.job-abandon.rate, 1day),Jobs 
abandoned/day))'
+
+field :ack, :color = teal,
+   :alias = none,
+   :data  = 'cactiStyle(alias(summarize(MediaWiki.job-ack.rate, 
1day),Jobs aknowledged/day))'
diff --git a/files/gdash/dashboards/jobq/5.jq-year1.graph 
b/files/gdash/dashboards/jobq/5.jq-year1.graph
index e00b4f1..e0797af 100644
--- a/files/gdash/dashboards/jobq/5.jq-year1.graph
+++ b/files/gdash/dashboards/jobq/5.jq-year1.graph
@@ -28,3 +28,7 @@
 field :abandon, :color = brown,
:alias = none,
:data  = 
'cactiStyle(alias(summarize(MediaWiki.job-abandon.rate, 1week),Jobs 
abandoned/week))'
+
+field :ack, :color = teal,
+   :alias = none,
+   :data  = 'cactiStyle(alias(summarize(MediaWiki.job-ack.rate, 
1week),Jobs aknowledged/week))'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20127750019e5b1cfc788ff786c31ad37bb201c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix SpecialMobileDiffTest#testNames test - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Fix SpecialMobileDiffTest#testNames test
..


Fix SpecialMobileDiffTest#testNames test

To generate the diff, SpecialMobileDiff#showDiff defers to
DifferenceEngine#generateContentDiffBody. This method loads the prev and
next revisions from the DB by ID directly rather than accepting them as
parameters. This behaviour is non-trivial to isolate in a test.

The SpecialMobileDiffTest#testNames test exercises how
SpecialMobileDiff#executeWhenAvailable handles parameter validation. In
doing so, however, it invokes #showDiff. Therefore, depending on the
current state of the DB, a revision may be loaded from the DB
inadvertently.

Because the #showDiff method doesn't affect the return result of
 #executeWhenAvailable we can safely stub it and re-enable the test.

Bug: T100716
Change-Id: I19df8acd50bc32f594ad10b6e33a2dd66825f176
---
M tests/phpunit/specials/SpecialMobileDiffTest.php
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/tests/phpunit/specials/SpecialMobileDiffTest.php 
b/tests/phpunit/specials/SpecialMobileDiffTest.php
index aad1d45..747eb99 100644
--- a/tests/phpunit/specials/SpecialMobileDiffTest.php
+++ b/tests/phpunit/specials/SpecialMobileDiffTest.php
@@ -15,10 +15,7 @@
parent::tearDown();
}
/**
-* Broken per T100716
-*
 * @dataProvider providerTestNames
-* @group Broken
 */
public function testNames( $par, $expected ) {
$page = new MockSpecialMobileDiff();
@@ -125,6 +122,8 @@
public function executeBadQuery() {
return false;
}
+   public function showDiff() {
+   }
 }
 
 class MFMockRevision extends Revision {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19df8acd50bc32f594ad10b6e33a2dd66825f176
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] varnishstatsd: don't report stats for bogus HTTP status codes - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: varnishstatsd: don't report stats for bogus HTTP status codes
..

varnishstatsd: don't report stats for bogus HTTP status codes

Change-Id: Icbdf0d499e352cbacb16d1894769cf4c5670cd4d
---
M modules/varnish/files/varnishstatsd
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/215370/1

diff --git a/modules/varnish/files/varnishstatsd 
b/modules/varnish/files/varnishstatsd
index da2a512..68156f3 100755
--- a/modules/varnish/files/varnishstatsd
+++ b/modules/varnish/files/varnishstatsd
@@ -113,7 +113,8 @@
 
 elif tag == 'RxStatus' and remote_party == 'backend':
 # Associate the transaction ID with the response status code.
-statuses[transaction_id] = record[0] + 'xx'
+if record[0] in '12345':
+statuses[transaction_id] = record[0] + 'xx'
 if len(statuses)  MAX_BACKLOG:
 statuses.popitem(last=False)
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbdf0d499e352cbacb16d1894769cf4c5670cd4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Repool es1010 - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Repool es1010
..


Repool es1010

Change-Id: I60eb8c76b7510ec08dbb47966fa0925e518680c4
References: T101084
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jcrespo: Looks good to me, approved



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 69b328c..8efcddc 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -489,7 +489,7 @@
'cluster25' = array(
'10.64.32.19' = 1, # es1009, master
'10.64.32.18' = 3, # es1008
-#  '10.64.32.20' = 3, # es1010 (down for maintenance)
+   '10.64.32.20' = 3, # es1010
),
# ExtensionStore shard1 - initially for AFTv5
'extension1' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60eb8c76b7510ec08dbb47966fa0925e518680c4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo jcre...@wikimedia.org
Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix headers on desktop when editing a collection - change (mediawiki...Gather)

[Jhernandez (Code Review)]

Jhernandez has uploaded a new change for review.

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

Change subject: Fix headers on desktop when editing a collection
..

Fix headers on desktop when editing a collection

Bug: T97679
Change-Id: I36e0bee2f74778d32c704c065f3084ed6397cd55
---
M resources/ext.gather.collection.editor/editOverlay.less
M resources/ext.gather.collection.editor/header.hogan
2 files changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/68/215368/1

diff --git a/resources/ext.gather.collection.editor/editOverlay.less 
b/resources/ext.gather.collection.editor/editOverlay.less
index fb39e8e..74b9830 100644
--- a/resources/ext.gather.collection.editor/editOverlay.less
+++ b/resources/ext.gather.collection.editor/editOverlay.less
@@ -2,6 +2,12 @@
 @import minerva.mixins;
 
 .overlay.collection-editor-overlay {
+
+   .overlay-subheader* {
+   display: table-cell;
+   vertical-align: middle;
+   }
+
.content {
.actions {
padding-top: 2em;
diff --git a/resources/ext.gather.collection.editor/header.hogan 
b/resources/ext.gather.collection.editor/header.hogan
index 4edcb93..ad3b561 100644
--- a/resources/ext.gather.collection.editor/header.hogan
+++ b/resources/ext.gather.collection.editor/header.hogan
@@ -1,4 +1,4 @@
-div class=overlay-header save-header hideable
+div class=overlay-subheader save-header hideable
ul
li{{#cancelArrowIcon}}{{icon}}{{/cancelArrowIcon}}/li
/ul
@@ -9,7 +9,7 @@
button class=submit save{{saveMsg}}/button
/div
 /div
-div class=overlay-header continue-header hideable hidden
+div class=overlay-subheader continue-header hideable hidden
ul
li{{{backButton}}}/li
/ul
@@ -18,7 +18,7 @@
/div
div class=overlay-actionbutton class=submit 
save-description{{saveMsg}}/button/div
 /div
-div class=overlay-header search-header hideable hidden
+div class=overlay-subheader search-header hideable hidden
ul
li{{{backButton}}}/li
/ul

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36e0bee2f74778d32c704c065f3084ed6397cd55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Move xml_free_parser out of destructor. - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Move xml_free_parser out of destructor.
..


Move xml_free_parser out of destructor.

Attempt to reduce error log spam. I'm not sure about the exact
cause of this error, nor have I really reproduced locally, so
I don't know if this will help, but getting it out of destructor
seems like a good idea.

I also do not know if calling xml_free_parser is really needed
(Would php automatically destroy parser during garbage collection?)

Bug: T89532
Change-Id: I5709b6cf26cf4a9032a79d2b5f48ed3b4238eaee
---
M includes/media/XMP.php
1 file changed, 24 insertions(+), 16 deletions(-)

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



diff --git a/includes/media/XMP.php b/includes/media/XMP.php
index 042f749..6b36e37 100644
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@ -156,15 +156,26 @@
}
 
/**
+* free the XML parser.
+*
+* @note It is unclear to me if we really need to do this ourselves
+*  or if php garbage collection will automatically free the xmlParser
+*  when it is no longer needed.
+*/
+   private function destroyXMLParser() {
+   if ( $this-xmlParser ) {
+   xml_parser_free( $this-xmlParser );
+   $this-xmlParser = null;
+   }
+   }
+
+   /**
 * Main use is if a single item has multiple xmp documents describing 
it.
 * For example in jpeg's with extendedXMP
 */
private function resetXMLParser() {
 
-   if ( $this-xmlParser ) {
-   //is this needed?
-   xml_parser_free( $this-xmlParser );
-   }
+   $this-destroyXMLParser();
 
$this-xmlParser = xml_parser_create_ns( 'UTF-8', ' ' );
xml_parser_set_option( $this-xmlParser, 
XML_OPTION_CASE_FOLDING, 0 );
@@ -178,15 +189,6 @@
 
$this-parsable = self::PARSABLE_UNKNOWN;
$this-xmlParsableBuffer = '';
-   }
-
-   /** Destroy the xml parser
-*
-* Not sure if this is actually needed.
-*/
-   function __destruct() {
-   // not sure if this is needed.
-   xml_parser_free( $this-xmlParser );
}
 
/**
@@ -294,12 +296,11 @@
 *
 * @param string $content XMP data
 * @param bool $allOfIt If this is all the data (true) or if its split 
up (false). Default true
-* @param bool $reset Does xml parser need to be reset. Default false
 * @throws RuntimeException
 * @return bool Success.
 */
-   public function parse( $content, $allOfIt = true, $reset = false ) {
-   if ( $reset ) {
+   public function parse( $content, $allOfIt = true ) {
+   if ( !$this-xmlParser ) {
$this-resetXMLParser();
}
try {
@@ -373,14 +374,21 @@
 
$this-logger-info( XMPReader::parse : Error 
reading XMP content: $error ($where) );
$this-results = array(); // blank if error.
+   $this-destroyXMLParser();
return false;
}
} catch ( Exception $e ) {
$this-logger-info( 'XMP parse error: ' . $e );
$this-results = array();
 
+   if ( $allOfIt ) {
+   $this-destroyXMLParser();
+   }
return false;
}
+   if ( $allOfIt ) {
+   $this-destroyXMLParser();
+   }
 
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5709b6cf26cf4a9032a79d2b5f48ed3b4238eaee
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Edit icon goes in title when description is empty. - change (mediawiki...Gather)

[Jhernandez (Code Review)]

Jhernandez has uploaded a new change for review.

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

Change subject: Edit icon goes in title when description is empty.
..

Edit icon goes in title when description is empty.

When editing name/desc, it'll move the icon to the appropiate place depending
on the description.

Bug: T97679
Change-Id: I6c549bd0596542766c9c4ff5e639182b7da3d0aa
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.collection.editor/content.hogan
2 files changed, 17 insertions(+), 4 deletions(-)


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

diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js 
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index 640102b..50283cf 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -116,10 +116,16 @@
 * Update title and description on the overlay
 */
_populateTitleAndDescription: function () {
-   var collection = this.options.collection;
-   this.$( '.collection-header h1' ).text( 
collection.title );
+   var collection = this.options.collection,
+   editIcon = this.$( '.edit-action' ),
+   iconPlacement = collection.description ?
+   '.collection-header 
.collection-description' : '.collection-header h1';
+   // Populate the text
+   this.$( '.collection-header h1 span' ).text( 
collection.title );
this.$( '.collection-header .collection-description 
span' )
.text( collection.description );
+   // Put the edit icon in desc or in title if desc is 
empty
+   this.$( iconPlacement ).append( editIcon );
},
/**
 * Set up collection search panel with existing members
diff --git a/resources/ext.gather.collection.editor/content.hogan 
b/resources/ext.gather.collection.editor/content.hogan
index 52523ad..350175d 100644
--- a/resources/ext.gather.collection.editor/content.hogan
+++ b/resources/ext.gather.collection.editor/content.hogan
@@ -1,9 +1,16 @@
 div class=manage-members-pane hidden collection
div class=collection-header
-   h1{{collection.title}}/h1
+   h1
+   span{{collection.title}}/span
+   {{^collection.description}}
+   {{#editIcon}}{{icon}}{{/editIcon}}
+   {{/collection.description}}
+   /h1
div class='collection-description'
span{{collection.description}}/span
-   {{#editIcon}}{{icon}}{{/editIcon}}
+   {{#collection.description}}
+   {{#editIcon}}{{icon}}{{/editIcon}}
+   {{/collection.description}}
/div
/div
div class=panel{{{spinner}}}/div

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c549bd0596542766c9c4ff5e639182b7da3d0aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revert icinga.wikimedia.org cert sha1 to sha256 - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Revert icinga.wikimedia.org cert sha1 to sha256
..


Revert icinga.wikimedia.org cert sha1 to sha256

This reverts commit cce614853a30daae1e3645cc72277784439d9604.

Change-Id: I2879531513fe7f22abee8eff9526389024859a24
---
M files/ssl/icinga.wikimedia.org.crt
M modules/icinga/manifests/web.pp
2 files changed, 30 insertions(+), 27 deletions(-)

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



diff --git a/files/ssl/icinga.wikimedia.org.crt 
b/files/ssl/icinga.wikimedia.org.crt
index a07769d..4db40ba 100644
--- a/files/ssl/icinga.wikimedia.org.crt
+++ b/files/ssl/icinga.wikimedia.org.crt
@@ -1,27 +1,30 @@
- -BEGIN CERTIFICATE-
-MIIEqzCCA5OgAwIBAgIDBLaQMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
-NTYgQ0EgLSBHMzAeFw0xNTA1MjgwMDM3MDRaFw0xNjAxMDgwMzAwNDZaMIGYMRMw
-EQYDVQQLEwpHVDIxODE2MDMzMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-bS9yZXNvdXJjZXMvY3BzIChjKTE0MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEdMBsGA1UEAxMUaWNpbmdhLndpa2ltZWRp
-YS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjdZaXMG2UQsVx
-HrC2YNbUrjuVU8M/eqKWdAbOkiFNh4jKjo0GSFzc4aJPhoGKxaPRkRLnEne1u8+u
-mTXTWnlS19PrJnJ1OVk4caVZl9yBESO7IAi+9cfC4dv3H8h4D313kH20hG7ebndt
-wajmLSMJrSF4JbXsWo9bdmrqllaIJqx8FzGz0jjBATgNhpu1OA44+rMOOztZvrqj
-VWCuOAkUmz+TwzbavJ6KoLfFyXk3ApEKZqwU9R72lRvsuLInwTFAV5l6JZi9IWaD
-fKwZXGpJFuDHdE1c3OrCs0eac8T7qBSYs/skjyNfblVexy/O5DtAuYnhSFU3YKow
-YXV1jft9AgMBAAGjggFMMIIBSDAfBgNVHSMEGDAWgBTDnPP800YINLvORn+gfFvz
-4gjLWTBXBggrBgEFBQcBAQRLMEkwHwYIKwYBBQUHMAGGE2h0dHA6Ly9ndi5zeW1j
-ZC5jb20wJgYIKwYBBQUHMAKGGmh0dHA6Ly9ndi5zeW1jYi5jb20vZ3YuY3J0MA4G
-A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
-VR0RBBgwFoIUaWNpbmdhLndpa2ltZWRpYS5vcmcwKwYDVR0fBCQwIjAgoB6gHIYa
-aHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcmwwDAYDVR0TAQH/BAIwADBBBgNVHSAE
-OjA4MDYGBmeBDAECATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5yYXBpZHNz
-bC5jb20vbGVnYWwwDQYJKoZIhvcNAQELBQADggEBACTTk1OrnMVfcChW52Ll1NR3
-Jt8YUSsXH2tuBg0Mlsgyr7PUhP6FDppXTwa/BvvxHTUh80zPAopTG9znnYvqyUPi
-KEJ7+PiHHodP7z4FwyLhOcR7rVYO77DfOqFi1HiZfw/B01h3498q1J5Ixb8KrM9s
-eghPwknMO52YzZiii8RDbC/zJ7/kwzRjJuiKeTf5YJ+w99Yq5DtLzf4sYM+7t5du
-HfkIEkGVdUiQSTV8+1qQ28i6KBxTP1dzDpBdDccYRdoO9eayUmts79xIwzSc41Ue
-bOVcWjLK3qIOPlw8FefS1ez9kDMEYvIrKhWWwNzHzAXfYubPvgFzE6oiTZ9tPWk=
+-BEGIN CERTIFICATE-
+MIIFLjCCBBagAwIBAgIDD+z/MA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTQwMTA1MDQyMjAyWhcNMTYwMTA4MTI1ODU3WjCBwzEpMCcGA1UEBRMgdUtn
+Y1ZVekU3dzNQam5lOUZUekdwVTRsUlMzY3N0OFcxEzARBgNVBAsTCkdUMjE4MTYw
+MzMxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMR0wGwYDVQQDExRpY2luZ2Eud2lraW1lZGlhLm9yZzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAON1lpcwbZRCxXEesLZg1tSuO5VTwz96opZ0
+Bs6SIU2HiMqOjQZIXNzhok+GgYrFo9GREucSd7W7z66ZNdNaeVLX0+smcnU5WThx
+pVmX3IERI7sgCL71x8Lh2/cfyHgPfXeQfbSEbt5ud23BqOYtIwmtIXgltexaj1t2
+auqWVogmrHwXMbPSOMEBOA2Gm7U4Djj6sw47O1m+uqNVYK44CRSbP5PDNtq8noqg
+t8XJeTcCkQpmrBT1HvaVG+y4sifBMUBXmXolmL0hZoN8rBlcakkW4Md0TVzc6sKz
+R5pzxPuoFJiz+ySPI19uVV7HL87kO0C5ieFIVTdgqjBhdXWN+30CAwEAAaOCAa8w
+ggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQE
+AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIU
+aWNpbmdhLndpa2ltZWRpYS5vcmcwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3Jh
+cGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0O
+BBYEFKU/muhYBV42hRNII2b+J77vcvnEMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUH
+AQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVz
+dC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3Qu
+Y29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggr
+BgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczAN
+BgkqhkiG9w0BAQUFAAOCAQEAZv0SKGl5iVJhKUaShnqGvc8+EHKgil6lhIvm0Q9T
+XXUsL/cUcqLxWBr51BfEV3WBsG6WN/n8QIkLhu9+JvlXz3Yt3lfJoEYY6D1eAOkh
+qe9VhPa71LTBVPn8WjFzuQPS728gMcN2jArjlT5nrZ3ZZuXwndNMWauSY+DjXvOK
+pxWd/eUIUTJTF5gVQMUe56zHqz00Y3CO8VVvRG7qF9BkoqL4r2CGQOb5CLLJ/u3F
+HeSBdaLtJcMTGZs3XkQmmk0terT/6gzhAglqNMBrcP8FsFKfyaqfdITNdgbAFsKh
+eYh25bMOLeW9w7XsN/9JuwT21L4R6R3OuHJFmodNIzUyUg==
 -END CERTIFICATE-
diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index 87d0101..3096aaf 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -45,6 +45,6 @@
 ensure = absent,
 }
 
-install_certificate{ 'icinga.wikimedia.org': }
+install_certificate{ 'icinga.wikimedia.org':   ca = 'RapidSSL_CA.pem' 
}
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2879531513fe7f22abee8eff9526389024859a24
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: 

[MediaWiki-commits] [Gerrit] do not set ca parameter with install_certificate - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: do not set ca parameter with install_certificate
..

do not set ca parameter with install_certificate

Change-Id: Ibcde3b9b9c6ee6cb8b1437bb8f9f3d15e8704f66
---
M modules/icinga/manifests/web.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/215378/1

diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index 3096aaf..87d0101 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -45,6 +45,6 @@
 ensure = absent,
 }
 
-install_certificate{ 'icinga.wikimedia.org':   ca = 'RapidSSL_CA.pem' 
}
+install_certificate{ 'icinga.wikimedia.org': }
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcde3b9b9c6ee6cb8b1437bb8f9f3d15e8704f66
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] do not set ca parameter with install_certificate - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: do not set ca parameter with install_certificate
..


do not set ca parameter with install_certificate

Change-Id: Ibcde3b9b9c6ee6cb8b1437bb8f9f3d15e8704f66
---
M modules/icinga/manifests/web.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index 3096aaf..87d0101 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -45,6 +45,6 @@
 ensure = absent,
 }
 
-install_certificate{ 'icinga.wikimedia.org':   ca = 'RapidSSL_CA.pem' 
}
+install_certificate{ 'icinga.wikimedia.org': }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcde3b9b9c6ee6cb8b1437bb8f9f3d15e8704f66
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Abort early if already converted - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Abort early if already converted
..


Abort early if already converted

It doesn't make sense to even check if we're allowed to
convert a page, if it's already been completed (in which
case we can just skip everything entirely).

There's also no need for an additional check inside
isAllowed, which I assume may be a leftover from before
there was a dedicated isConversionFinished?

Also added some more logging to more easily figure out
why a page was skipped.

Change-Id: I924569daac8c289f8f39f8d2e925d7cb6447cf56
---
M includes/Import/Converter.php
M maintenance/convertNamespaceFromWikitext.php
2 files changed, 15 insertions(+), 12 deletions(-)

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



diff --git a/includes/Import/Converter.php b/includes/Import/Converter.php
index 2d57921..893d3da 100644
--- a/includes/Import/Converter.php
+++ b/includes/Import/Converter.php
@@ -118,24 +118,32 @@
 * Converts a page into a Flow board
 *
 * @param Title $title
+* @throws FlowException
 */
public function convert( Title $title ) {
-   $movedFrom = $this-getPageMovedFrom( $title );
-   if ( ! $this-isAllowed( $title, $movedFrom ) ) {
-   throw new FlowException( Not allowed to convert: 
{$title} );
-   }
-
// conversion is already done
+   $movedFrom = $this-getPageMovedFrom( $title );
if ( $this-strategy-isConversionFinished( $title, $movedFrom 
) ) {
return;
+   }
+
+   if ( !$this-isAllowed( $title ) ) {
+   throw new FlowException( Not allowed to convert: 
{$title} );
}
 
$this-doConversion( $title, $movedFrom );
}
 
-   protected function isAllowed( Title $title, Title $movedFrom = null ) {
+   /**
+* Returns a boolean indicating if we're allowed to import $title.
+*
+* @param Title $title
+* @return bool
+*/
+   protected function isAllowed( Title $title ) {
// Only make changes to wikitext pages
if ( $title-getContentModel() !== CONTENT_MODEL_WIKITEXT ) {
+   $this-logger-warning( WARNING: The title ' . 
$title-getPrefixedDBkey() . ' is being skipped because it has content model 
' . $title-getContentModel() . ''. );
return false;
}
 
@@ -147,12 +155,8 @@
// At some point we may want to handle these, but for now just
// let them be
if ( $title-isRedirect() ) {
+   $this-logger-warning( WARNING: The title ' . 
$title-getPrefixedDBkey() . ' is being skipped because it is a redirect. );
return false;
-   }
-
-   // If we previously moved this page, continue the import
-   if ( $movedFrom !== null ) {
-   return true;
}
 
// Finally, check strategy-specific logic
diff --git a/maintenance/convertNamespaceFromWikitext.php 
b/maintenance/convertNamespaceFromWikitext.php
index b83be2f..72ab1ba 100644
--- a/maintenance/convertNamespaceFromWikitext.php
+++ b/maintenance/convertNamespaceFromWikitext.php
@@ -54,7 +54,6 @@
// so we can wrap that.
$it = $it-getIterator();
 
-
$converter-convertAll( $it );
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I924569daac8c289f8f39f8d2e925d7cb6447cf56
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] resourceloader: Remove redundant getModifiedTime implementat... - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: resourceloader: Remove redundant getModifiedTime implementations
..

resourceloader: Remove redundant getModifiedTime implementations

Follows-up f37cee996e which replaced the getHashMtime() and
getDefinitionMtime() methods with dummies that always return 1.

These getModifiedTime() implementations were only tracking the
definition summary or custom hash, which is already tracked
by getVersionHash().

Notes:
* SpecialCharacterDataModule: This one was odd as it was tracking
  both the mtime *and* the file contents.

* UserCSSPrefsModule/UserOptionsModule: Remove redundant caching.
  Already taken care of by getVersionHash() as of f37cee996e.

Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
---
M includes/resourceloader/ResourceLoaderImageModule.php
M includes/resourceloader/ResourceLoaderLanguageDataModule.php
M includes/resourceloader/ResourceLoaderLanguageNamesModule.php
M includes/resourceloader/ResourceLoaderSkinModule.php
M includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
M includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
M includes/resourceloader/ResourceLoaderUserDefaultsModule.php
M includes/resourceloader/ResourceLoaderUserOptionsModule.php
M includes/resourceloader/ResourceLoaderWikiModule.php
9 files changed, 4 insertions(+), 71 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/215381/1

diff --git a/includes/resourceloader/ResourceLoaderImageModule.php 
b/includes/resourceloader/ResourceLoaderImageModule.php
index f695b11..eb06a69 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -409,10 +409,7 @@
$files = array_values( array_unique( $files ) );
$filesMtime = max( array_map( array( __CLASS__, 'safeFilemtime' 
), $files ) );
 
-   return max(
-   $filesMtime,
-   $this-getDefinitionMtime( $context )
-   );
+   return $filesMtime;
}
 
/**
diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php 
b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index 1239453..ebaf366 100644
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -64,14 +64,6 @@
 
/**
 * @param ResourceLoaderContext $context
-* @return int UNIX timestamp
-*/
-   public function getModifiedTime( ResourceLoaderContext $context ) {
-   return max( 1, $this-getHashMtime( $context ) );
-   }
-
-   /**
-* @param ResourceLoaderContext $context
 * @return string Hash
 */
public function getModifiedHash( ResourceLoaderContext $context ) {
diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php 
b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
index 55b1f4b..3111050 100644
--- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
@@ -66,14 +66,6 @@
 
/**
 * @param ResourceLoaderContext $context
-* @return int UNIX timestamp
-*/
-   public function getModifiedTime( ResourceLoaderContext $context ) {
-   return max( 1, $this-getHashMtime( $context ) );
-   }
-
-   /**
-* @param ResourceLoaderContext $context
 * @return string Hash
 */
public function getModifiedHash( ResourceLoaderContext $context ) {
diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php 
b/includes/resourceloader/ResourceLoaderSkinModule.php
index 3ba63e6..980b7fe 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -73,15 +73,6 @@
 
/**
 * @param $context ResourceLoaderContext
-* @return int|mixed
-*/
-   public function getModifiedTime( ResourceLoaderContext $context ) {
-   $parentMTime = parent::getModifiedTime( $context );
-   return max( $parentMTime, $this-getHashMtime( $context ) );
-   }
-
-   /**
-* @param $context ResourceLoaderContext
 * @return string: Hash
 */
public function getModifiedHash( ResourceLoaderContext $context ) {
diff --git 
a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php 
b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
index bbc59ac..5eb4e3a 100644
--- a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
+++ b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
@@ -55,14 +55,6 @@
 
/**
 * @param ResourceLoaderContext $context
- 

[MediaWiki-commits] [Gerrit] Fixed $flags bit operation precedence fail in User::loadFrom... - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fixed $flags bit operation precedence fail in 
User::loadFromDatabase()
..

Fixed $flags bit operation precedence fail in User::loadFromDatabase()

* The made READ_LATEST also be READ_LOCKING

T100577
T100869
T98706

Change-Id: I85092970c236fc4482371216b9f6592c49a27942
---
M includes/User.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/215379/1

diff --git a/includes/User.php b/includes/User.php
index eb2a2dc..fc07b6d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1229,7 +1229,7 @@
self::selectFields(),
array( 'user_id' = $this-mId ),
__METHOD__,
-   ( $flags  self::READ_LOCKING == self::READ_LOCKING )
+   ( ( $flags  self::READ_LOCKING ) == self::READ_LOCKING 
)
? array( 'LOCK IN SHARE MODE' )
: array()
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85092970c236fc4482371216b9f6592c49a27942
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Create classes (with UUIDs) for Flow boards, topics, and posts - change (pywikibot/core)

[Happy5214 (Code Review)]

Happy5214 has uploaded a new change for review.

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

Change subject: Create classes (with UUIDs) for Flow boards, topics, and posts
..

Create classes (with UUIDs) for Flow boards, topics, and posts

This change will create four new classes representing Flow entities:

* FlowPage: a superclass for page-like Flow objects
* Board: Flow boards
* Topic: Flow topics
* Post: Flow posts

These classes implement UUID-related functionality, including properties
and private methods to load object data. This entails creating new API
hooks to perform calls for loading data from boards, topics, and posts.
Three tests have been added to test the proper working of this UUID
functionality.

Bug: T101146
Change-Id: I37691cd209b4ee9cc6aa03358bdc5d13fa9f1362
---
M pywikibot/page.py
M pywikibot/site.py
M tests/page_tests.py
3 files changed, 211 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/92/215392/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 90efda1..555f1a7 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -76,7 +76,7 @@
 reading from or writing to the wiki.  All other methods are delegated
 to the Site object.
 
-Will be subclassed by Page and WikibasePage.
+Will be subclassed by Page, WikibasePage, and FlowPage.
 
 
 
@@ -4333,6 +4333,168 @@
 'type': self.value_types.get(self.type, self.type)
 }
 
+class FlowPage(BasePage):
+
+
+The base page for the Flow extension.
+
+There should be no need to instantiate this directly.
+
+
+def __init__(self, site, title=u, **kwargs):
+Constructor.
+
+@param site: Flow-enabled site
+@type site: Site
+@param title: normalized title of the page
+@type title: unicode
+
+@raise TypeError: incorrect use of parameters
+@raise ValueError: use of non-Flow-enabled Site
+
+if not isinstance(site, pywikibot.site.BaseSite):
+raise TypeError(site must be a Site object)
+
+if not site.has_extension('Flow'):
+raise ValueError(site is not Flow-enabled)
+
+super(FlowPage, self).__init__(site, title, **kwargs)
+
+@property
+def uuid(self):
+Return the UUID of the page.
+
+@return: UUID of the page
+@rtype: unicode
+
+if not hasattr(self, '_uuid'):
+self._load_uuid()
+return self._uuid
+
+class Board(FlowPage):
+
+A Flow discussion board.
+
+def __init__(self, site, title=u, **kwargs):
+Constructor.
+
+@param site: Flow-enabled site
+@type site: Site
+@param title: normalized title of the page
+@type title: unicode
+
+@raise TypeError: incorrect use of parameters
+@raise ValueError: use of non-Flow-enabled Site
+
+super(Board, self).__init__(site, title, **kwargs)
+
+def _load(self):
+Load and cache the Board's data, derived from its topic list.
+if not hasattr(self, '_data'):
+self._data = self.site.topiclist(self)
+
+def _load_uuid(self):
+Load and save the UUID of the page.
+
+The UUID of the Board is derived from the workflowId field in the
+data returned by view-topiclist.
+
+if not hasattr(self, '_data'):
+self._load()
+self._uuid = self._data['workflowId']
+
+class Topic(FlowPage):
+
+A Flow discussion topic.
+
+def __init__(self, site, title=u, **kwargs):
+Constructor.
+
+@param site: Flow-enabled site
+@type site: Site
+@param title: normalized title of the page
+@type title: unicode
+
+@raise TypeError: incorrect use of parameters
+@raise ValueError: use of non-Flow-enabled Site
+
+super(Topic, self).__init__(site, title, **kwargs)
+
+def _load(self):
+Load and cache the Topic's data.
+if not hasattr(self, '_data'):
+self._data = self.site.topic(self)
+
+def _load_uuid(self):
+Load and save the UUID of the page.
+
+The UUID of the Topic is derived from the workflowId field in the
+data returned by view-topic.
+
+if not hasattr(self, '_data'):
+self._load()
+self._uuid = self._data['workflowId']
+
+class Post():
+
+A post to a Flow discussion topic.
+
+def __init__(self, site, page, uuid=u, **kwargs):
+
+Constructor
+
+@param site: Flow-enabled site
+@type site: Site
+@param page: Flow topic or board
+@type page: FlowPage
+@param uuid: UUID of a Flow post
+@type uuid: unicode
+
+@raise TypeError: incorrect types of parameters
+@raise ValueError: use of non-Flow-enabled Site or invalid UUID
+
+if not isinstance(site, 

[MediaWiki-commits] [Gerrit] icinga apache config: Add back missing SSLCertificateFile - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: icinga apache config: Add back missing SSLCertificateFile
..

icinga apache config: Add back missing SSLCertificateFile

4fb3420cce caused this: you don't remove the certfile directive
when adding the chained directive, apparently.

Change-Id: I3cd452c984c7007d4cb0d3c6138672e1ce24423f
---
M modules/icinga/templates/icinga.wikimedia.org.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/215404/1

diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb 
b/modules/icinga/templates/icinga.wikimedia.org.erb
index db29beb..267b2a2 100644
--- a/modules/icinga/templates/icinga.wikimedia.org.erb
+++ b/modules/icinga/templates/icinga.wikimedia.org.erb
@@ -20,6 +20,7 @@
 ServerAlias neon.wikimedia.org
 ServerAdmin n...@wikimedia.org
 SSLEngine On
+SSLCertificateFile /etc/ssl/localcerts/icinga.wikimedia.org.crt
 SSLCertificateChainFile 
/etc/ssl/localcerts/icinga.wikimedia.org.chained.crt
 SSLCertificateKeyFile /etc/ssl/private/icinga.wikimedia.org.key
 %= @ssl_settings.join(\n) %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cd452c984c7007d4cb0d3c6138672e1ce24423f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] HHVM APC: enable item expiration - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: HHVM APC: enable item expiration
..


HHVM APC: enable item expiration

HHVM won't ever purge expired keys from APC unless
Server.APC.ExpireOnSets=true. It is set to false by default.
When true, HHVM will iterate on expired keys and evict them from
APC once every 4096 APC writes by default.

Change-Id: I87047dac97cb3bed0dfffd714b18be2b941f4de3
---
M modules/hhvm/manifests/init.pp
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  Aaron Schulz: Looks good to me, but someone else must approve
  Rush: Looks good to me, but someone else must approve



diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 9d64589..c070bb3 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -112,6 +112,9 @@
 pid_file = '',  # PID file managed by 
start-stop-daemon(8)
 resource_limit   = { core_file_size = to_bytes('8 Gb') },
 timeouts_use_wall_time   = true,
+apc  = {
+expire_on_sets = true,  # Purge on expiration
+},
 log  = {
 header = true,
 use_syslog = true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87047dac97cb3bed0dfffd714b18be2b941f4de3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] HHVM canaries: set light_process_count to 5 - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: HHVM canaries: set light_process_count to 5
..


HHVM canaries: set light_process_count to 5

HHVM's LightProcess feature makes it faster to fork subprocesses (when shelling
out). This patch sets hhvm.server.light_process_count to 5 on the canary app
servers.

Change-Id: Iba76a84c2a60f36a6d063d6c803ecc4d0bcee39a
---
M hieradata/role/common/mediawiki/appserver/canary_api.yaml
M hieradata/role/common/mediawiki/canary_appserver.yaml
2 files changed, 12 insertions(+), 8 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  Dzahn: Looks good to me, but someone else must approve



diff --git a/hieradata/role/common/mediawiki/appserver/canary_api.yaml 
b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
index bd86a28..3218e6f 100644
--- a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
+++ b/hieradata/role/common/mediawiki/appserver/canary_api.yaml
@@ -7,9 +7,11 @@
 mediawiki::users::web: www-data
 hhvm::extra::fcgi:
   hhvm:
-mysql:
-  connect_timeout: 3000
+server:
+  light_process_count: 5
+  light_process_file_prefix: /tmp/hhvm
 hhvm::extra::cli:
   hhvm:
-mysql:
-  connect_timeout: 3000
+server:
+  light_process_count: 5
+  light_process_file_prefix: /tmp/hhvm
diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml 
b/hieradata/role/common/mediawiki/canary_appserver.yaml
index 4fd8cc9..5f335be 100644
--- a/hieradata/role/common/mediawiki/canary_appserver.yaml
+++ b/hieradata/role/common/mediawiki/canary_appserver.yaml
@@ -7,9 +7,11 @@
   - deployment
 hhvm::extra::fcgi:
   hhvm:
-mysql:
-  connect_timeout: 3000
+server:
+  light_process_count: 5
+  light_process_file_prefix: /tmp/hhvm
 hhvm::extra::cli:
   hhvm:
-mysql:
-  connect_timeout: 3000
+server:
+  light_process_count: 5
+  light_process_file_prefix: /tmp/hhvm

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba76a84c2a60f36a6d063d6c803ecc4d0bcee39a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [jscs] Enforce disallowMixedSpacesAndTabs - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: [jscs] Enforce disallowMixedSpacesAndTabs
..


[jscs] Enforce disallowMixedSpacesAndTabs

Change-Id: I6d0700964657b8ed63cf845f7de25d6729efd882
---
M .jscsrc
M api/routes.js
M lib/dom.markFosteredContent.js
M lib/dom.migrateTrailingNLs.js
M lib/dom.t.TableFixups.js
M lib/dom.t.handleLIHack.js
M lib/dom.wrapTemplates.js
M lib/ext.core.ListHandler.js
M lib/ext.core.ParserFunctions.js
M lib/ext.core.QuoteTransformer.js
M lib/ext.core.Sanitizer.js
M lib/ext.core.TemplateHandler.js
M lib/mediawiki.DOMPostProcessor.js
M lib/mediawiki.DOMUtils.js
M lib/mediawiki.TokenTransformManager.js
M lib/mediawiki.Util.js
M lib/mediawiki.WikiConfig.js
M lib/mediawiki.WikitextSerializer.js
M lib/mediawiki.parser.defines.js
M lib/mediawiki.parser.js
M lib/mediawiki.tokenizer.utils.js
M lib/pegTokenizer.pegjs.txt
M lib/wts.ConstrainedText.js
M lib/wts.LinkHandler.js
M lib/wts.TagHandlers.js
M lib/wts.escapeWikitext.js
M lib/wts.separators.js
M tests/fetch-parserTests.txt.js
M tests/parserTests.js
M tests/server/server.js
30 files changed, 242 insertions(+), 247 deletions(-)

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



diff --git a/.jscsrc b/.jscsrc
index 83cadc6..d0a2106 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -14,7 +14,6 @@
validateIndentation: \t,
 
// We'd like to eliminate these at some point, to conform with the 
preset.
-   disallowMixedSpacesAndTabs: null,
disallowQuotedKeysInObjects: null,
disallowSpacesInsideParentheses: null,
maximumLineLength: null,
diff --git a/api/routes.js b/api/routes.js
index 6d21457..c475b4d 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -811,8 +811,8 @@
 
var v2 = Object.assign({ format: req.params.format }, req.body);
 
-   if ( !supportedFormats.has( v2.format ) ||
-( req.method === GET  !wt2htmlFormats.has( 
v2.format ) ) ) {
+   if (!supportedFormats.has(v2.format) ||
+   (req.method === GET  
!wt2htmlFormats.has(v2.format))) {
return errOut(Invalid format.);
}
 
diff --git a/lib/dom.markFosteredContent.js b/lib/dom.markFosteredContent.js
index b7e1a60..abf69a5 100644
--- a/lib/dom.markFosteredContent.js
+++ b/lib/dom.markFosteredContent.js
@@ -66,16 +66,16 @@
// skip pass the table end mw:shadow and any transclusions that
// start inside the table. there may be newlines and comments in
// between so keep track of that, and backtrack when necessary.
-   while ( sibling ) {
-   if ( !DU.isTplStartMarkerMeta( sibling )  (
-DU.isTplOrExtToplevelNode( sibling ) ||
-DU.isMarkerMeta( sibling, mw:EndTag ) ||
-DU.isMarkerMeta( sibling, mw:TransclusionShadow )
+   while (sibling) {
+   if (!DU.isTplStartMarkerMeta(sibling)  (
+   DU.isTplOrExtToplevelNode(sibling) ||
+   DU.isMarkerMeta(sibling, mw:EndTag) ||
+   DU.isMarkerMeta(sibling, mw:TransclusionShadow)
)) {
sibling = sibling.nextSibling;
beforeText = null;
-   } else if ( DU.isComment( sibling ) || DU.isText( sibling ) ) {
-   if ( !beforeText ) {
+   } else if (DU.isComment(sibling) || DU.isText(sibling)) {
+   if (!beforeText) {
beforeText = sibling;
}
sibling = sibling.nextSibling;
diff --git a/lib/dom.migrateTrailingNLs.js b/lib/dom.migrateTrailingNLs.js
index 3b536b5..91ae50c 100644
--- a/lib/dom.migrateTrailingNLs.js
+++ b/lib/dom.migrateTrailingNLs.js
@@ -29,9 +29,9 @@
return node  (node.nodeName !== HTML)  (
nodeEndsLineInWT(node) ||
(DU.isElt(node) 
-DU.getDataParsoid(node).autoInsertedEnd 
-!DU.getDataParsoid(node).fostered) ||
-   (!node.nextSibling  
canMigrateNLOutOfNode(node.parentNode))
+   DU.getDataParsoid(node).autoInsertedEnd 
+   !DU.getDataParsoid(node).fostered) ||
+   (!node.nextSibling  
canMigrateNLOutOfNode(node.parentNode))
);
}
 
diff --git a/lib/dom.t.TableFixups.js b/lib/dom.t.TableFixups.js
index 279e920..ada9134 100644
--- a/lib/dom.t.TableFixups.js
+++ b/lib/dom.t.TableFixups.js
@@ -262,7 +262,7 @@
if (!transclusionNode
// Check for the pipe character in the attributish text.
|| !/^[^|]+\|([^|].*)?$/.test(attributishContent.txt)
-  ) {
+   ) {
return;
}
 

[MediaWiki-commits] [Gerrit] Group1 wikis to 1.26wmf8 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Group1 wikis to 1.26wmf8
..


Group1 wikis to 1.26wmf8

Change-Id: Ia9dfc547a8f8bd9eafb70febc439cabd925a2f77
---
M wikiversions.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index 4bf505b..d74e208 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1 +1 @@

[MediaWiki-commits] [Gerrit] Store side rail state in user preferences - change (mediawiki...Flow)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: Store side rail state in user preferences
..

Store side rail state in user preferences

* Store side rail state on expand and collapse.

* Read preferences on load and collapse side railif needed.

* It only applies for logged in users.

Bug: T97367
Change-Id: I4231383346a4b03ee744ad7d467ab54e71267c85
---
M Hooks.php
M handlebars/compiled/flow_block_header.handlebars.php
M handlebars/flow_block_header.handlebars
M modules/engine/components/board/features/flow-board-side-rail.js
4 files changed, 31 insertions(+), 3 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index c43014d..0253654 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1007,6 +1007,10 @@
'type' = 'api'
);
 
+   $preferences['side-rail-collapsed'] = array(
+   'type' = 'api'
+   );
+
return true;
}
 
diff --git a/handlebars/compiled/flow_block_header.handlebars.php 
b/handlebars/compiled/flow_block_header.handlebars.php
index b84c647..3ed362f 100644
--- a/handlebars/compiled/flow_block_header.handlebars.php
+++ b/handlebars/compiled/flow_block_header.handlebars.php
@@ -58,7 +58,7 @@
 
 );
 
-return 'div class=flow-board-header
+return 'div class=flow-board-header flow-load-interactive 
data-flow-load-handler=loadSideRail
 '.LCRun3::p($cx, 'flow_header_title', array(array($in),array()), ' 
').''.LCRun3::p($cx, 'flow_errors', array(array($in),array()), '
').''.LCRun3::p($cx, 'flow_header_detail', array(array($in),array()), ' 
').'/div
 ';
 }
diff --git a/handlebars/flow_block_header.handlebars 
b/handlebars/flow_block_header.handlebars
index 60c5f77..9db751c 100644
--- a/handlebars/flow_block_header.handlebars
+++ b/handlebars/flow_block_header.handlebars
@@ -1,4 +1,4 @@
-div class=flow-board-header
+div class=flow-board-header flow-load-interactive 
data-flow-load-handler=loadSideRail
{{ flow_header_title}}
{{ flow_errors}}
{{ flow_header_detail}}
diff --git a/modules/engine/components/board/features/flow-board-side-rail.js 
b/modules/engine/components/board/features/flow-board-side-rail.js
index be4ada3..b0d1c3c 100644
--- a/modules/engine/components/board/features/flow-board-side-rail.js
+++ b/modules/engine/components/board/features/flow-board-side-rail.js
@@ -25,6 +25,23 @@
};
 
//
+   // Load handlers
+   //
+
+   /**
+*
+* @param {Event} event
+*/
+   function FlowBoardComponentSideRailFeatureMixinLoadCallback( event ) {
+   if ( !mw.user.isAnon() ) {
+   if ( mw.user.options.get( 'side-rail-collapsed' ) ) {
+   $( '.flow-component' ).addClass( 'expanded' );
+   }
+   }
+   }
+   
FlowBoardComponentSideRailFeatureMixin.UI.events.loadHandlers.loadSideRail = 
FlowBoardComponentSideRailFeatureMixinLoadCallback;
+
+   //
// On element-click handlers
//
 
@@ -33,7 +50,14 @@
 * @param {Event} event
 */
function FlowBoardComponentSideRailFeatureMixinToggleCallback( event ) {
-   $( '.flow-component' ).toggleClass( 'expanded' );
+   var sideRailCollapsed = $( '.flow-component' ).toggleClass( 
'expanded' ).hasClass( 'expanded' );
+
+   if ( !mw.user.isAnon() ) {
+   // update the user preferences; no preferences for anons
+   new mw.Api().saveOption( 'side-rail-collapsed', 
sideRailCollapsed );
+   // ensure we also see that preference in the current 
page
+   mw.user.options.set( 'side-rail-collapsed', 
sideRailCollapsed );
+   }
}

FlowBoardComponentSideRailFeatureMixin.UI.events.interactiveHandlers.toggleSideRail
 = FlowBoardComponentSideRailFeatureMixinToggleCallback;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4231383346a4b03ee744ad7d467ab54e71267c85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson sbis...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix SpecialMobileDiffTest#testNames test - change (mediawiki...MobileFrontend)

[Phuedx (Code Review)]

Phuedx has uploaded a new change for review.

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

Change subject: Fix SpecialMobileDiffTest#testNames test
..

Fix SpecialMobileDiffTest#testNames test

To generate the diff, SpecialMobileDiff#showDiff defers to
DifferenceEngine#generateContentDiffBody. This method loads the prev and
next revisions from the DB by ID directly rather than accepting them as
parameters. This behaviour is non-trivial to isolate in a test.

The SpecialMobileDiffTest#testNames test exercises how
SpecialMobileDiff#executeWhenAvailable handles parameter validation. In
doing so, however, it invokes #showDiff. Therefore, depending on the
current state of the DB, a revision may be loaded from the DB
inadvertently.

Because the #showDiff method doesn't affect the return result of
 #executeWhenAvailable we can safely stub it and re-enable the test.

Bug: T100716
Change-Id: I19df8acd50bc32f594ad10b6e33a2dd66825f176
---
M tests/phpunit/specials/SpecialMobileDiffTest.php
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/tests/phpunit/specials/SpecialMobileDiffTest.php 
b/tests/phpunit/specials/SpecialMobileDiffTest.php
index aad1d45..4bade3b 100644
--- a/tests/phpunit/specials/SpecialMobileDiffTest.php
+++ b/tests/phpunit/specials/SpecialMobileDiffTest.php
@@ -15,10 +15,7 @@
parent::tearDown();
}
/**
-* Broken per T100716
-*
 * @dataProvider providerTestNames
-* @group Broken
 */
public function testNames( $par, $expected ) {
$page = new MockSpecialMobileDiff();
@@ -125,6 +122,7 @@
public function executeBadQuery() {
return false;
}
+   public function showDiff() {}
 }
 
 class MFMockRevision extends Revision {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19df8acd50bc32f594ad10b6e33a2dd66825f176
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io

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

[MediaWiki-commits] [Gerrit] Fixed $flags bit operation precedence fail in User::loadFrom... - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fixed $flags bit operation precedence fail in 
User::loadFromDatabase()
..

Fixed $flags bit operation precedence fail in User::loadFromDatabase()

* The bug made READ_LATEST also act as READ_LOCKING

Bug: T100577
Bug: T100869
Bug: T98706
Change-Id: I85092970c236fc4482371216b9f6592c49a27942
(cherry picked from commit 833bdbab37cda3fabe8b69067bf1637a301c6af5)
---
M includes/User.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/215388/1

diff --git a/includes/User.php b/includes/User.php
index eb2a2dc..fc07b6d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1229,7 +1229,7 @@
self::selectFields(),
array( 'user_id' = $this-mId ),
__METHOD__,
-   ( $flags  self::READ_LOCKING == self::READ_LOCKING )
+   ( ( $flags  self::READ_LOCKING ) == self::READ_LOCKING 
)
? array( 'LOCK IN SHARE MODE' )
: array()
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85092970c236fc4482371216b9f6592c49a27942
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Only set $wgActions['credits'] to false if $wgMaxCredits is 0 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Only set $wgActions['credits'] to false if $wgMaxCredits is 0
..


Only set $wgActions['credits'] to false if $wgMaxCredits is 0

Change-Id: I35255f35749183ff32853ac5f924afd994074f4f
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3eda5fa..e826582 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -994,7 +994,9 @@
$wgRSSUrlWhitelist = $wmgRSSUrlWhitelist;
 }
 
-$wgActions['credits'] = false;
+if ( $wgMaxCredits === 0 ) {
+   $wgActions['credits'] = false;
+}
 
 # Process group overrides
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35255f35749183ff32853ac5f924afd994074f4f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update ExtraCharacters Sniff to allow shebang - change (mediawiki...codesniffer)

[jenkins-bot (Code Review)]

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

Change subject: Update ExtraCharacters Sniff to allow shebang
..


Update ExtraCharacters Sniff to allow shebang

A shebang at the start of file, just before the opening php
tag, should be allowed.

Bug: T94141
Change-Id: I32dafaa6dfedbea84d1ad4dd514a14ffbb42f0b7
---
M MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
A 
MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_fail.php
A 
MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_pass.php
3 files changed, 30 insertions(+), 2 deletions(-)

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



diff --git 
a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php 
b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
index b252e65..a27df2b 100644
--- a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
+++ b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
@@ -23,8 +23,23 @@
);
// some other character beginning file
if ( $isNotFirstOpenTag === false ) {
-   $error = 'Extra character found before first ?';
-   $phpcsFile-addError( $error, $stackPtr, 'Found' );
+   $validShebang = false;
+   // a shebang is allowed on first line only if
+   // it is followed by a php open tag on next line
+   if ( $stackPtr == 1  $tokens[1]['line'] == 2 ) {
+   // the php tag is the second token and it is on 
second line
+   // so the first token is on the first line
+
+   // check if it is valid shebang
+   if ( $tokens[0]['type'] == 'T_INLINE_HTML'
+substr( $tokens[0]['content'], 0, 2 
) == '#!' ) {
+   $validShebang = true;
+   }
+   }
+   if ( !$validShebang ) {
+   $error = 'Extra character found before first 
?';
+   $phpcsFile-addError( $error, $stackPtr, 
'Found' );
+   }
}
}
 }
diff --git 
a/MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_fail.php
 
b/MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_fail.php
new file mode 100644
index 000..9370829
--- /dev/null
+++ 
b/MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_fail.php
@@ -0,0 +1,7 @@
+
+#!/usr/bin/php
+?php
+// invalid shebang
+function wfFoo() {
+
+}
diff --git 
a/MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_pass.php
 
b/MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_pass.php
new file mode 100644
index 000..22f5a0a
--- /dev/null
+++ 
b/MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_pass.php
@@ -0,0 +1,6 @@
+#!/usr/bin/php
+?php
+// Valid shebang before php open tag
+function wfFoo() {
+
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32dafaa6dfedbea84d1ad4dd514a14ffbb42f0b7
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Hharchani hharch...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Polybuildr v.a.ghai...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use a fixed comment placeholder string in CSSMin - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Use a fixed comment placeholder string in CSSMin
..


Use a fixed comment placeholder string in CSSMin

Both the problem and solution are nearly identical to the ones presented in
I31d4556bb. Use a constant string as a comment placeholder, and differentiate
it from possible user input using \x7f, which is not valid CSS anyway[1].

  [1]: http://www.w3.org/TR/CSS21/grammar.html

Change-Id: I3d3c2578d5e9c1fe52c02e87901cb08d03847ea7
---
M includes/libs/CSSMin.php
1 file changed, 12 insertions(+), 6 deletions(-)

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



diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index ffe26a9..f415c9b 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -31,6 +31,9 @@
 
/* Constants */
 
+   /** @var string Strip marker for comments. **/
+   const PLACEHOLDER = \x7fPLACEHOLDER\x7f;
+
/**
 * Internet Explorer data URI length limit. See encodeImageAsDataURI().
 */
@@ -232,19 +235,22 @@
$remote = substr( $remote, 0, -1 );
}
 
+   // Disallow U+007F DELETE, which is illegal anyway, and which
+   // we use for comment placeholders.
+   $source = str_replace( \x7f, ?, $source );
+
// Replace all comments by a placeholder so they will not 
interfere with the remapping.
// Warning: This will also catch on anything looking like the 
start of a comment between
// quotation marks (e.g. foo /* bar).
$comments = array();
-   $placeholder = uniqid( '', true );
 
$pattern = '/(?!' . CSSMin::EMBED_REGEX . ')(' . 
CSSMin::COMMENT_REGEX . ')/s';
 
$source = preg_replace_callback(
$pattern,
-   function ( $match ) use ( $comments, $placeholder ) {
+   function ( $match ) use ( $comments ) {
$comments[] = $match[ 0 ];
-   return $placeholder . ( count( $comments ) - 1 
) . 'x';
+   return CSSMin::PLACEHOLDER . ( count( $comments 
) - 1 ) . 'x';
},
$source
);
@@ -257,13 +263,13 @@
 
$source = preg_replace_callback(
$pattern,
-   function ( $matchOuter ) use ( $local, $remote, 
$embedData, $placeholder ) {
+   function ( $matchOuter ) use ( $local, $remote, 
$embedData ) {
$rule = $matchOuter[0];
 
// Check for global @embed comment and remove 
it. Allow other comments to be present
// before @embed (they have been replaced with 
placeholders at this point).
$embedAll = false;
-   $rule = preg_replace( '/^((?:\s+|' . 
$placeholder . '(\d+)x)*)' . CSSMin::EMBED_REGEX . '\s*/', '$1', $rule, 1, 
$embedAll );
+   $rule = preg_replace( '/^((?:\s+|' . 
CSSMin::PLACEHOLDER . '(\d+)x)*)' . CSSMin::EMBED_REGEX . '\s*/', '$1', $rule, 
1, $embedAll );
 
// Build two versions of current rule: with 
remapped URLs
// and with embedded data: URIs (where 
possible).
@@ -328,7 +334,7 @@
}, $source );
 
// Re-insert comments
-   $pattern = '/' . $placeholder . '(\d+)x/';
+   $pattern = '/' . CSSMin::PLACEHOLDER . '(\d+)x/';
$source = preg_replace_callback( $pattern, function( $match ) 
use ( $comments ) {
return $comments[ $match[1] ];
}, $source );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d3c2578d5e9c1fe52c02e87901cb08d03847ea7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use a fixed comment placeholder string in CSSMin - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Use a fixed comment placeholder string in CSSMin
..


Use a fixed comment placeholder string in CSSMin

Both the problem and solution are nearly identical to the ones presented in
I31d4556bb. Use a constant string as a comment placeholder, and differentiate
it from possible user input using \x7f, which is not valid CSS anyway[1].

  [1]: http://www.w3.org/TR/CSS21/grammar.html

Change-Id: I3d3c2578d5e9c1fe52c02e87901cb08d03847ea7
---
M includes/libs/CSSMin.php
1 file changed, 12 insertions(+), 6 deletions(-)

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



diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index ffe26a9..f415c9b 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -31,6 +31,9 @@
 
/* Constants */
 
+   /** @var string Strip marker for comments. **/
+   const PLACEHOLDER = \x7fPLACEHOLDER\x7f;
+
/**
 * Internet Explorer data URI length limit. See encodeImageAsDataURI().
 */
@@ -232,19 +235,22 @@
$remote = substr( $remote, 0, -1 );
}
 
+   // Disallow U+007F DELETE, which is illegal anyway, and which
+   // we use for comment placeholders.
+   $source = str_replace( \x7f, ?, $source );
+
// Replace all comments by a placeholder so they will not 
interfere with the remapping.
// Warning: This will also catch on anything looking like the 
start of a comment between
// quotation marks (e.g. foo /* bar).
$comments = array();
-   $placeholder = uniqid( '', true );
 
$pattern = '/(?!' . CSSMin::EMBED_REGEX . ')(' . 
CSSMin::COMMENT_REGEX . ')/s';
 
$source = preg_replace_callback(
$pattern,
-   function ( $match ) use ( $comments, $placeholder ) {
+   function ( $match ) use ( $comments ) {
$comments[] = $match[ 0 ];
-   return $placeholder . ( count( $comments ) - 1 
) . 'x';
+   return CSSMin::PLACEHOLDER . ( count( $comments 
) - 1 ) . 'x';
},
$source
);
@@ -257,13 +263,13 @@
 
$source = preg_replace_callback(
$pattern,
-   function ( $matchOuter ) use ( $local, $remote, 
$embedData, $placeholder ) {
+   function ( $matchOuter ) use ( $local, $remote, 
$embedData ) {
$rule = $matchOuter[0];
 
// Check for global @embed comment and remove 
it. Allow other comments to be present
// before @embed (they have been replaced with 
placeholders at this point).
$embedAll = false;
-   $rule = preg_replace( '/^((?:\s+|' . 
$placeholder . '(\d+)x)*)' . CSSMin::EMBED_REGEX . '\s*/', '$1', $rule, 1, 
$embedAll );
+   $rule = preg_replace( '/^((?:\s+|' . 
CSSMin::PLACEHOLDER . '(\d+)x)*)' . CSSMin::EMBED_REGEX . '\s*/', '$1', $rule, 
1, $embedAll );
 
// Build two versions of current rule: with 
remapped URLs
// and with embedded data: URIs (where 
possible).
@@ -328,7 +334,7 @@
}, $source );
 
// Re-insert comments
-   $pattern = '/' . $placeholder . '(\d+)x/';
+   $pattern = '/' . CSSMin::PLACEHOLDER . '(\d+)x/';
$source = preg_replace_callback( $pattern, function( $match ) 
use ( $comments ) {
return $comments[ $match[1] ];
}, $source );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d3c2578d5e9c1fe52c02e87901cb08d03847ea7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix alpha builds - use jenkins number for build number until... - change (apps...wikipedia)

[Fjalapeno (Code Review)]

Fjalapeno has uploaded a new change for review.

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

Change subject: Fix alpha builds - use jenkins number for build number until we 
have the ability to push changes to gerrit.
..

Fix alpha builds - use jenkins number for build number until we have the 
ability to push changes to gerrit.

Change-Id: I6b1bd2bec3b6a1e9e7ccc8febd61448414e9d2df
---
M fastlane/Fastfile
M fastlane/lib/utils.rb
2 files changed, 12 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/67/215367/1

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0bf2195..b58b73a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -50,6 +50,9 @@
 force: true,
 filename: 'build/alpha.mobileprovision'
   )
+
+  increment_build_number ENV[BUILD_NUMBER].to_i
+
   # uncomment when CI is able to push tags
   ipa(
 configuration: Alpha,
diff --git a/fastlane/lib/utils.rb b/fastlane/lib/utils.rb
index e5fb350..50ce4cc 100644
--- a/fastlane/lib/utils.rb
+++ b/fastlane/lib/utils.rb
@@ -53,14 +53,13 @@
 
 # commit version bump, call a block, then push the bump to git
 def with_bump
-  if ENV['WMF_BUMP']
-increment_build_number
-commit_version_bump
-plist_version = get_version_short_string 
File.expand_path(File.join(ENV['PWD'], 'Wikipedia/Wikipedia-Info.plist'))
-# tag must be added after the version bump is committed
-add_git_tag(tag: 
#{plist_version}.#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::BUILD_NUMBER]})
-  end
-  yield if block_given?
-  push_to_git_remote if ENV['WMF_BUMP']
+  # if ENV['WMF_BUMP']
+  #   increment_build_number
+  #   commit_version_bump
+  #   plist_version = get_version_short_string 
File.expand_path(File.join(ENV['PWD'], 'Wikipedia/Wikipedia-Info.plist'))
+  #   # tag must be added after the version bump is committed
+  #   add_git_tag(tag: 
#{plist_version}.#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::BUILD_NUMBER]})
+  # end
+  # yield if block_given?
+  # push_to_git_remote if ENV['WMF_BUMP']
 end
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b1bd2bec3b6a1e9e7ccc8febd61448414e9d2df
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno cfl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] varnishstatsd: don't report stats for bogus HTTP status codes - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: varnishstatsd: don't report stats for bogus HTTP status codes
..


varnishstatsd: don't report stats for bogus HTTP status codes

Change-Id: Icbdf0d499e352cbacb16d1894769cf4c5670cd4d
---
M modules/varnish/files/varnishstatsd
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  Filippo Giunchedi: Looks good to me, but someone else must approve



diff --git a/modules/varnish/files/varnishstatsd 
b/modules/varnish/files/varnishstatsd
index da2a512..68156f3 100755
--- a/modules/varnish/files/varnishstatsd
+++ b/modules/varnish/files/varnishstatsd
@@ -113,7 +113,8 @@
 
 elif tag == 'RxStatus' and remote_party == 'backend':
 # Associate the transaction ID with the response status code.
-statuses[transaction_id] = record[0] + 'xx'
+if record[0] in '12345':
+statuses[transaction_id] = record[0] + 'xx'
 if len(statuses)  MAX_BACKLOG:
 statuses.popitem(last=False)
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbdf0d499e352cbacb16d1894769cf4c5670cd4d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] resourceloader: Remove redundant getModifiedTime implementation - change (mediawiki...EventLogging)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: resourceloader: Remove redundant getModifiedTime implementation
..

resourceloader: Remove redundant getModifiedTime implementation

Follows-up f37cee996e which replaced the getHashMtime() and
getDefinitionMtime() methods with dummies that always return 1.

These getModifiedTime() implementation was only tracking the
definition, which is already tracked by getVersionHash().

Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
---
M includes/ResourceLoaderSchemaModule.php
1 file changed, 2 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging 
refs/changes/84/215384/1

diff --git a/includes/ResourceLoaderSchemaModule.php 
b/includes/ResourceLoaderSchemaModule.php
index 29025d8..29d06cf 100644
--- a/includes/ResourceLoaderSchemaModule.php
+++ b/includes/ResourceLoaderSchemaModule.php
@@ -19,7 +19,6 @@
/** @var RemoteSchema $schema **/
public $schema;
 
-
/**
 * Constructor; invoked by ResourceLoader.
 * Ensures that the 'schema' and 'revision' keys were set on the
@@ -55,33 +54,13 @@
$this-targets = array( 'desktop', 'mobile' );
}
 
-
/**
 * Part of the ResourceLoader module interface.
 * Declares the core ext.eventLogging module as a dependency.
 * @return array: Module names.
 */
-   function getDependencies() {
+   public function getDependencies() {
return array( 'ext.eventLogging' );
-   }
-
-
-   /**
-* Get the last modified timestamp of this module.
-*
-* The last modified timestamp controls caching. Because revisions are
-* immutable, we don't need to fetch the RemoteSchema, nor get the 
revision's
-* timestamp. We simply hash our module definition.
-*
-* @param ResourceLoaderContext $context
-* @return integer: Unix timestamp.
-*/
-   function getModifiedTime( ResourceLoaderContext $context ) {
-   if ( !$this-schema-get() ) {
-   // If we failed to fetch, hold off on rolling over 
definition timestamp
-   return 1;
-   }
-   return $this-getDefinitionMtime( $context );
}
 
/**
@@ -98,7 +77,6 @@
return $summary;
}
 
-
/**
 * Generates JavaScript module code from schema.
 * Retrieves a schema and generates a JavaScript expression which,
@@ -107,7 +85,7 @@
 * @param ResourceLoaderContext $context
 * @return string: JavaScript code.
 */
-   function getScript( ResourceLoaderContext $context ) {
+   public function getScript( ResourceLoaderContext $context ) {
$schema = $this-schema-jsonSerialize();
efStripKeyRecursive( $schema, 'description' );
$params = array( $this-schema-title, $schema );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] Sample profiling data at 1:10, 000 - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Sample profiling data at 1:10,000
..

Sample profiling data at 1:10,000

Log profiling data for 1:10,000 requests vs. the current 1:1,000, to relieve
pressure on Graphite.

Change-Id: I7810b72d5ca4b1f6b8779cdbebcc39bc64a65d32
---
M wmf-config/StartProfiler.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index d480175..1b2da81 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -59,7 +59,7 @@
'flags'= ( XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY 
| XHPROF_FLAGS_NO_BUILTINS ),
'output'   = 'stats',
'prefix'   = 'xhprof',
-   'sampling' = 1000,
+   'sampling' = 1,
);
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7810b72d5ca4b1f6b8779cdbebcc39bc64a65d32
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] resourceloader: Remove redundant getModifiedTime implementation - change (mediawiki...CentralNotice)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: resourceloader: Remove redundant getModifiedTime implementation
..

resourceloader: Remove redundant getModifiedTime implementation

Follows-up f37cee996e which replaced the getHashMtime() and
getDefinitionMtime() methods with dummies that always return 1.

These getModifiedTime() implementation was only tracking the
hash, which is already tracked by getVersionHash().

Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
---
M includes/CNBannerChoiceDataResourceLoaderModule.php
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/82/215382/1

diff --git a/includes/CNBannerChoiceDataResourceLoaderModule.php 
b/includes/CNBannerChoiceDataResourceLoaderModule.php
index 6cb8a70..b9ce987 100644
--- a/includes/CNBannerChoiceDataResourceLoaderModule.php
+++ b/includes/CNBannerChoiceDataResourceLoaderModule.php
@@ -126,13 +126,6 @@
}
 
/**
-* @see ResourceLoaderModule::getModifiedTime()
-*/
-   public function getModifiedTime( ResourceLoaderContext $context ) {
-   return max( 1, $this-getHashMtime( $context ) );
-   }
-
-   /**
 * @see ResourceLoaderModule::getModifiedHash()
 */
public function getModifiedHash( ResourceLoaderContext $context ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] Bump cache epoch for Wikidata - change (operations/mediawiki-config)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Bump cache epoch for Wikidata
..

Bump cache epoch for Wikidata

needed due to Ibf22aa50

Change-Id: I1add205fd41fb59f2c243c3792cde6613a4ef1bb
---
M wmf-config/Wikibase.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 56d30ca..c8a5236 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -90,7 +90,7 @@
// Bug T53637 and T48953
$wgGroupPermissions['*']['property-create'] = ( $wgDBname === 
'testwikidatawiki' );
 
-   $wgCacheEpoch = '2015022423';
+   $wgCacheEpoch = '20150602190200';
 
$wgWBRepoSettings['dataSquidMaxage'] = 1 * 60 * 60;
$wgWBRepoSettings['sharedCacheDuration'] = 60 * 60 * 24;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1add205fd41fb59f2c243c3792cde6613a4ef1bb
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] wgMaxCredits to 0 - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: wgMaxCredits to 0
..

wgMaxCredits to 0

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 83b6bcc..271a634 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14797,7 +14797,6 @@
 
 'wgMaxCredits' = array(
'default' = 0,
-   'wikivoyage' = 10,
 ),
 
 'wmgUseListings' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e2ae7b549f5935d896dab5ba1960fdf754ab9cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] resourceloader: Remove redundant getModifiedTime implementation - change (mediawiki...SyntaxHighlight_GeSHi)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: resourceloader: Remove redundant getModifiedTime implementation
..

resourceloader: Remove redundant getModifiedTime implementation

Follows-up f37cee996e which replaced the getHashMtime() and
getDefinitionMtime() methods with dummies that always return 1.

These getModifiedTime() implementation was only tracking the
definition, which is already tracked by getVersionHash().

Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
---
M ResourceLoaderGeSHiModule.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi 
refs/changes/91/215391/1

diff --git a/ResourceLoaderGeSHiModule.php b/ResourceLoaderGeSHiModule.php
index 047ce6b..97b181c 100644
--- a/ResourceLoaderGeSHiModule.php
+++ b/ResourceLoaderGeSHiModule.php
@@ -71,7 +71,6 @@
}
 
return max( array(
-   $this-getDefinitionMtime( $context ),
$selfmtime,
self::safeFilemtime( GESHI_LANG_ROOT . 
/{$this-lang}.php ),
) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] icinga.wikimedia.org cert sha1 to sha256 + chained file usage - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: icinga.wikimedia.org cert sha1 to sha256 + chained file usage
..


icinga.wikimedia.org cert sha1 to sha256 + chained file usage

Change-Id: I1c873cab17838103c61428b8995fef770d5efb22
---
M files/ssl/icinga.wikimedia.org.crt
M modules/icinga/templates/icinga.wikimedia.org.erb
2 files changed, 26 insertions(+), 30 deletions(-)

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



diff --git a/files/ssl/icinga.wikimedia.org.crt 
b/files/ssl/icinga.wikimedia.org.crt
index 4db40ba..3a61123 100644
--- a/files/ssl/icinga.wikimedia.org.crt
+++ b/files/ssl/icinga.wikimedia.org.crt
@@ -1,30 +1,27 @@
 -BEGIN CERTIFICATE-
-MIIFLjCCBBagAwIBAgIDD+z/MA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwMTA1MDQyMjAyWhcNMTYwMTA4MTI1ODU3WjCBwzEpMCcGA1UEBRMgdUtn
-Y1ZVekU3dzNQam5lOUZUekdwVTRsUlMzY3N0OFcxEzARBgNVBAsTCkdUMjE4MTYw
-MzMxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-U1NMKFIpMR0wGwYDVQQDExRpY2luZ2Eud2lraW1lZGlhLm9yZzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAON1lpcwbZRCxXEesLZg1tSuO5VTwz96opZ0
-Bs6SIU2HiMqOjQZIXNzhok+GgYrFo9GREucSd7W7z66ZNdNaeVLX0+smcnU5WThx
-pVmX3IERI7sgCL71x8Lh2/cfyHgPfXeQfbSEbt5ud23BqOYtIwmtIXgltexaj1t2
-auqWVogmrHwXMbPSOMEBOA2Gm7U4Djj6sw47O1m+uqNVYK44CRSbP5PDNtq8noqg
-t8XJeTcCkQpmrBT1HvaVG+y4sifBMUBXmXolmL0hZoN8rBlcakkW4Md0TVzc6sKz
-R5pzxPuoFJiz+ySPI19uVV7HL87kO0C5ieFIVTdgqjBhdXWN+30CAwEAAaOCAa8w
-ggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQE
-AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIU
-aWNpbmdhLndpa2ltZWRpYS5vcmcwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3Jh
-cGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0O
-BBYEFKU/muhYBV42hRNII2b+J77vcvnEMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUH
-AQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVz
-dC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3Qu
-Y29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggr
-BgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczAN
-BgkqhkiG9w0BAQUFAAOCAQEAZv0SKGl5iVJhKUaShnqGvc8+EHKgil6lhIvm0Q9T
-XXUsL/cUcqLxWBr51BfEV3WBsG6WN/n8QIkLhu9+JvlXz3Yt3lfJoEYY6D1eAOkh
-qe9VhPa71LTBVPn8WjFzuQPS728gMcN2jArjlT5nrZ3ZZuXwndNMWauSY+DjXvOK
-pxWd/eUIUTJTF5gVQMUe56zHqz00Y3CO8VVvRG7qF9BkoqL4r2CGQOb5CLLJ/u3F
-HeSBdaLtJcMTGZs3XkQmmk0terT/6gzhAglqNMBrcP8FsFKfyaqfdITNdgbAFsKh
-eYh25bMOLeW9w7XsN/9JuwT21L4R6R3OuHJFmodNIzUyUg==
+MIIEqzCCA5OgAwIBAgIDBLaQMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
+NTYgQ0EgLSBHMzAeFw0xNTA1MjgwMDM3MDRaFw0xNjAxMDgwMzAwNDZaMIGYMRMw
+EQYDVQQLEwpHVDIxODE2MDMzMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
+bS9yZXNvdXJjZXMvY3BzIChjKTE0MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
+YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEdMBsGA1UEAxMUaWNpbmdhLndpa2ltZWRp
+YS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjdZaXMG2UQsVx
+HrC2YNbUrjuVU8M/eqKWdAbOkiFNh4jKjo0GSFzc4aJPhoGKxaPRkRLnEne1u8+u
+mTXTWnlS19PrJnJ1OVk4caVZl9yBESO7IAi+9cfC4dv3H8h4D313kH20hG7ebndt
+wajmLSMJrSF4JbXsWo9bdmrqllaIJqx8FzGz0jjBATgNhpu1OA44+rMOOztZvrqj
+VWCuOAkUmz+TwzbavJ6KoLfFyXk3ApEKZqwU9R72lRvsuLInwTFAV5l6JZi9IWaD
+fKwZXGpJFuDHdE1c3OrCs0eac8T7qBSYs/skjyNfblVexy/O5DtAuYnhSFU3YKow
+YXV1jft9AgMBAAGjggFMMIIBSDAfBgNVHSMEGDAWgBTDnPP800YINLvORn+gfFvz
+4gjLWTBXBggrBgEFBQcBAQRLMEkwHwYIKwYBBQUHMAGGE2h0dHA6Ly9ndi5zeW1j
+ZC5jb20wJgYIKwYBBQUHMAKGGmh0dHA6Ly9ndi5zeW1jYi5jb20vZ3YuY3J0MA4G
+A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
+VR0RBBgwFoIUaWNpbmdhLndpa2ltZWRpYS5vcmcwKwYDVR0fBCQwIjAgoB6gHIYa
+aHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcmwwDAYDVR0TAQH/BAIwADBBBgNVHSAE
+OjA4MDYGBmeBDAECATAsMCoGCCsGAQUFBwIBFh5odHRwczovL3d3dy5yYXBpZHNz
+bC5jb20vbGVnYWwwDQYJKoZIhvcNAQELBQADggEBACTTk1OrnMVfcChW52Ll1NR3
+Jt8YUSsXH2tuBg0Mlsgyr7PUhP6FDppXTwa/BvvxHTUh80zPAopTG9znnYvqyUPi
+KEJ7+PiHHodP7z4FwyLhOcR7rVYO77DfOqFi1HiZfw/B01h3498q1J5Ixb8KrM9s
+eghPwknMO52YzZiii8RDbC/zJ7/kwzRjJuiKeTf5YJ+w99Yq5DtLzf4sYM+7t5du
+HfkIEkGVdUiQSTV8+1qQ28i6KBxTP1dzDpBdDccYRdoO9eayUmts79xIwzSc41Ue
+bOVcWjLK3qIOPlw8FefS1ez9kDMEYvIrKhWWwNzHzAXfYubPvgFzE6oiTZ9tPWk=
 -END CERTIFICATE-
diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb 
b/modules/icinga/templates/icinga.wikimedia.org.erb
index d404b0c..db29beb 100644
--- a/modules/icinga/templates/icinga.wikimedia.org.erb
+++ b/modules/icinga/templates/icinga.wikimedia.org.erb
@@ -20,9 +20,8 @@
 ServerAlias neon.wikimedia.org
 ServerAdmin n...@wikimedia.org
 SSLEngine On
-SSLCertificateFile /etc/ssl/localcerts/icinga.wikimedia.org.crt
+SSLCertificateChainFile 
/etc/ssl/localcerts/icinga.wikimedia.org.chained.crt
 SSLCertificateKeyFile /etc/ssl/private/icinga.wikimedia.org.key
-SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem

[MediaWiki-commits] [Gerrit] Make side rail text bigger - change (mediawiki...Flow)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: Make side rail text bigger
..

Make side rail text bigger

Bug: T99856
Change-Id: Ica876b9206bf1b302feaf64b661be1ab0e17bd33
---
M modules/styles/board/header.less
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/95/215395/1

diff --git a/modules/styles/board/header.less b/modules/styles/board/header.less
index 2ef5405..586df78 100644
--- a/modules/styles/board/header.less
+++ b/modules/styles/board/header.less
@@ -5,7 +5,6 @@
 
 .flow-board-header {
word-break: break-word;
-   font-size: .875em;
width: 100%;
max-width: 700px;
padding-top: 10px;
@@ -17,7 +16,6 @@
 
 // Top board header
 .flow-board-header-nav {
-   font-size: 1.15em;
margin-bottom: 10px;
.mw-ui-button {
padding: 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica876b9206bf1b302feaf64b661be1ab0e17bd33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson sbis...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Removed numbered params option for #formlink and related fun... - change (mediawiki...SemanticForms)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Removed numbered params option for #formlink and related 
functions
..

Removed numbered params option for #formlink and related functions

A long-deprecated feature that can finally be killed.

Change-Id: I5d8d52d600d6ed1ac97f7fcc97705f2cb434c38d
---
M includes/SF_Utils.php
1 file changed, 2 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/74/215374/1

diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 5fc6d32..e0d96f1 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -986,8 +986,6 @@
$inQueryArr = array();
$targetWindow = '_self';
 
-   $positionalParameters = false;
-
// assign params
// - support unlabelled params, for backwards compatibility
// - parse and sanitize all parameter values
@@ -996,7 +994,7 @@
$elements = explode( '=', $param, 2 );
 
// set param_name and value
-   if ( count( $elements )  1  !$positionalParameters ) 
{
+   if ( count( $elements )  1 ) {
$param_name = trim( $elements[0] );
 
// parse (and sanitize) parameter values
@@ -1031,24 +1029,9 @@
$classStr = 'popupformlink';
} elseif ( $param_name == null  $value == 'new 
window' ) {
$targetWindow = '_blank';
-   } elseif ( $param_name !== null  
!$positionalParameters ) {
+   } elseif ( $param_name !== null ) {
$value = urlencode( $value );
parse_str( $param_name=$value, $arr );
-   $inQueryArr = 
self::array_merge_recursive_distinct( $inQueryArr, $arr );
-   } elseif ( $i == 0 ) {
-   $inFormName = $value;
-   $positionalParameters = true;
-   } elseif ( $i == 1 ) {
-   $inLinkStr = $value;
-   } elseif ( $i == 2 ) {
-   $inLinkType = $value;
-   } elseif ( $i == 3 ) {
-   // Change HTML-encoded ampersands directly to
-   // URL-encoded ampersands, so that the string
-   // doesn't get split up on the ''.
-   $inQueryStr = str_replace( 'amp;', '%26', 
$value );
-
-   parse_str( $inQueryStr, $arr );
$inQueryArr = 
self::array_merge_recursive_distinct( $inQueryArr, $arr );
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d8d52d600d6ed1ac97f7fcc97705f2cb434c38d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix Bug: T99123 - was removing an object for a nil key, now ... - change (apps...wikipedia)

[Fjalapeno (Code Review)]

Fjalapeno has uploaded a new change for review.

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

Change subject: Fix Bug: T99123 - was removing an object for a nil key, now 
checking for nil.
..

Fix Bug: T99123 - was removing an object for a nil key, now checking for nil.

Also, casts the fetcher object to make sure it is retained and checking by 
pointer address instead of using isEqual, which isn't implemented in fetchers.

Change-Id: I26fe018d479e30eeabb1eeec4237176a89de18fd
---
M Wikipedia/Networking/Fetchers/SavedArticlesFetcher.m
1 file changed, 20 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/72/215372/1

diff --git a/Wikipedia/Networking/Fetchers/SavedArticlesFetcher.m 
b/Wikipedia/Networking/Fetchers/SavedArticlesFetcher.m
index e2f4a77..def23de 100644
--- a/Wikipedia/Networking/Fetchers/SavedArticlesFetcher.m
+++ b/Wikipedia/Networking/Fetchers/SavedArticlesFetcher.m
@@ -90,38 +90,42 @@
 }
 
 - (void)fetchFinished:(id)sender fetchedData:(id)fetchedData 
status:(FetchFinalStatus)status error:(NSError*)error {
+ArticleFetcher* fetcher = sender;
+
 dispatch_async(self.accessQueue, ^{
 __block id completedFetcherKey;
 
 [self.fetchersByArticleTitle enumerateKeysAndObjectsUsingBlock:^(id 
key, id obj, BOOL* stop) {
-if ([sender isEqual:obj]) {
+if (fetcher == obj) {
 completedFetcherKey = key;
 *stop = YES;
 }
 }];
 
-if (error) {
-self.errorsByArticleTitle[completedFetcherKey] = error;
-}
+if (completedFetcherKey) {
+if (error) {
+self.errorsByArticleTitle[completedFetcherKey] = error;
+}
 
-[self.fetchersByArticleTitle removeObjectForKey:completedFetcherKey];
+[self.fetchersByArticleTitle 
removeObjectForKey:completedFetcherKey];
 
-MWKArticle* article = [self.dataStore 
articleWithTitle:completedFetcherKey];
+MWKArticle* article = [self.dataStore 
articleWithTitle:completedFetcherKey];
 
-[self.fetchedArticles addObject:article];
+[self.fetchedArticles addObject:article];
 
-CGFloat progress = [self progress];
+CGFloat progress = [self progress];
 
-dispatch_async(dispatch_get_main_queue(), ^{
-[self.fetchFinishedDelegate savedArticlesFetcher:self 
didFetchArticle:article progress:progress status:status error:error];
+dispatch_async(dispatch_get_main_queue(), ^{
+[self.fetchFinishedDelegate savedArticlesFetcher:self 
didFetchArticle:article progress:progress status:status error:error];
 
-dispatch_async(self.accessQueue, ^{
-if ([self.fetchersByArticleTitle count] == 0) {
-[self notifyDelegate];
-[[self class] setSharedInstance:nil];
-}
+dispatch_async(self.accessQueue, ^{
+if ([self.fetchersByArticleTitle count] == 0) {
+[self notifyDelegate];
+[[self class] setSharedInstance:nil];
+}
+});
 });
-});
+}
 });
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26fe018d479e30eeabb1eeec4237176a89de18fd
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno cfl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix Bug: T99121 - no longer trying to append a nil string - change (apps...wikipedia)

[Fjalapeno (Code Review)]

Fjalapeno has uploaded a new change for review.

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

Change subject: Fix Bug: T99121 - no longer trying to append a nil string
..

Fix Bug: T99121 - no longer trying to append a nil string

Change-Id: Ia45184898b45054b8becf4b8d2ba68ebb5fbf911
---
M MediaWikiKit/MediaWikiKit/MWKTitle.m
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/73/215373/1

diff --git a/MediaWikiKit/MediaWikiKit/MWKTitle.m 
b/MediaWikiKit/MediaWikiKit/MWKTitle.m
index 6e05c71..0e69a55 100644
--- a/MediaWikiKit/MediaWikiKit/MWKTitle.m
+++ b/MediaWikiKit/MediaWikiKit/MWKTitle.m
@@ -61,7 +61,7 @@
 }
 
 - (NSString*)prefixedText {
-return [[self _prefix] stringByAppendingString:self.text];
+return [[self _prefix] stringByAppendingString:self.text ? self.text : 
@];
 }
 
 - (NSString*)prefixedDBKey {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia45184898b45054b8becf4b8d2ba68ebb5fbf911
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno cfl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] gdash: fix graphite dashboard colors - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: gdash: fix graphite dashboard colors
..

gdash: fix graphite dashboard colors

Change-Id: I84a4f636f1c021d853e8336d74580078b51f1a28
---
M files/gdash/dashboards/graphite.codfw/network_err.graph
M files/gdash/dashboards/graphite.codfw/network_io.graph
M files/gdash/dashboards/graphite.eqiad/network_err.graph
M files/gdash/dashboards/graphite.eqiad/network_io.graph
4 files changed, 6 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/215375/1

diff --git a/files/gdash/dashboards/graphite.codfw/network_err.graph 
b/files/gdash/dashboards/graphite.codfw/network_err.graph
index 4cfe5e6..138e8c3 100644
--- a/files/gdash/dashboards/graphite.codfw/network_err.graph
+++ b/files/gdash/dashboards/graphite.codfw/network_err.graph
@@ -1,7 +1,7 @@
 title   udp errors/drops, all interfaces
 vtitle  packets/s
 
-field :rx_dgram, :color = green,
+field :rx_dgram,
:alias = rx datagrams,
:data  = servers.graphite2001.udp.InDatagrams
 
diff --git a/files/gdash/dashboards/graphite.codfw/network_io.graph 
b/files/gdash/dashboards/graphite.codfw/network_io.graph
index b572280..4c056e3 100644
--- a/files/gdash/dashboards/graphite.codfw/network_io.graph
+++ b/files/gdash/dashboards/graphite.codfw/network_io.graph
@@ -1,11 +1,10 @@
 title   network IO, all interfaces
 vtitle  bytes/s
-area:first
 
-field :tx, :color = green,
+field :tx,
:alias = tx,
:data  = sumSeries(servers.graphite2001.network.*.tx_byte)
 
-field :rx, :color = blue,
+field :rx,
:alias = rx,
:data  = sumSeries(servers.graphite2001.network.*.rx_byte)
diff --git a/files/gdash/dashboards/graphite.eqiad/network_err.graph 
b/files/gdash/dashboards/graphite.eqiad/network_err.graph
index 9d738f9..52a5ecf 100644
--- a/files/gdash/dashboards/graphite.eqiad/network_err.graph
+++ b/files/gdash/dashboards/graphite.eqiad/network_err.graph
@@ -1,7 +1,7 @@
 title   udp errors/drops, all interfaces
 vtitle  packets/s
 
-field :rx_dgram, :color = green,
+field :rx_dgram,
:alias = rx datagrams,
:data  = servers.graphite1001.udp.InDatagrams
 
diff --git a/files/gdash/dashboards/graphite.eqiad/network_io.graph 
b/files/gdash/dashboards/graphite.eqiad/network_io.graph
index 3bcb56e..b38a909 100644
--- a/files/gdash/dashboards/graphite.eqiad/network_io.graph
+++ b/files/gdash/dashboards/graphite.eqiad/network_io.graph
@@ -1,11 +1,10 @@
 title   network IO, all interfaces
 vtitle  bytes/s
-area:first
 
-field :tx, :color = green,
+field :tx,
:alias = tx,
:data  = sumSeries(servers.graphite1001.network.*.tx_byte)
 
-field :rx, :color = blue,
+field :rx,
:alias = rx,
:data  = sumSeries(servers.graphite1001.network.*.rx_byte)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84a4f636f1c021d853e8336d74580078b51f1a28
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Removed numbered params option for #formlink and related fun... - change (mediawiki...SemanticForms)

[jenkins-bot (Code Review)]

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

Change subject: Removed numbered params option for #formlink and related 
functions
..


Removed numbered params option for #formlink and related functions

A long-deprecated feature that can finally be killed.

Change-Id: I5d8d52d600d6ed1ac97f7fcc97705f2cb434c38d
---
M includes/SF_Utils.php
1 file changed, 2 insertions(+), 19 deletions(-)

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



diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 5fc6d32..e0d96f1 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -986,8 +986,6 @@
$inQueryArr = array();
$targetWindow = '_self';
 
-   $positionalParameters = false;
-
// assign params
// - support unlabelled params, for backwards compatibility
// - parse and sanitize all parameter values
@@ -996,7 +994,7 @@
$elements = explode( '=', $param, 2 );
 
// set param_name and value
-   if ( count( $elements )  1  !$positionalParameters ) 
{
+   if ( count( $elements )  1 ) {
$param_name = trim( $elements[0] );
 
// parse (and sanitize) parameter values
@@ -1031,24 +1029,9 @@
$classStr = 'popupformlink';
} elseif ( $param_name == null  $value == 'new 
window' ) {
$targetWindow = '_blank';
-   } elseif ( $param_name !== null  
!$positionalParameters ) {
+   } elseif ( $param_name !== null ) {
$value = urlencode( $value );
parse_str( $param_name=$value, $arr );
-   $inQueryArr = 
self::array_merge_recursive_distinct( $inQueryArr, $arr );
-   } elseif ( $i == 0 ) {
-   $inFormName = $value;
-   $positionalParameters = true;
-   } elseif ( $i == 1 ) {
-   $inLinkStr = $value;
-   } elseif ( $i == 2 ) {
-   $inLinkType = $value;
-   } elseif ( $i == 3 ) {
-   // Change HTML-encoded ampersands directly to
-   // URL-encoded ampersands, so that the string
-   // doesn't get split up on the ''.
-   $inQueryStr = str_replace( 'amp;', '%26', 
$value );
-
-   parse_str( $inQueryStr, $arr );
$inQueryArr = 
self::array_merge_recursive_distinct( $inQueryArr, $arr );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d8d52d600d6ed1ac97f7fcc97705f2cb434c38d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Don't attempt to convert pages that have just been converted - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Don't attempt to convert pages that have just been converted
..


Don't attempt to convert pages that have just been converted

Even though maintenance/convertNamespaceFromWikitext.php convertes
an entire namespace at once, there's no guarantee all pages are
wikitext:
* previous import runs can have converted some pages already
* or even in the same run, because conversion creates new (flow)
  pages in the process of importing
* or there may already have been some (test) pages

Whatever the reason, it makes no sense to error out when flow-board
pages are encountered. While it didn't really fail the script (all
it does is log an exception and move on with the next one), it can
get really confusing to see exceptions for valid cases like this.

Change-Id: I1300909ee4bbe7aae7a21ceeb7b73520a362c3cf
---
M includes/Import/Converter.php
M includes/Import/Wikitext/ConversionStrategy.php
2 files changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/includes/Import/Converter.php b/includes/Import/Converter.php
index 893d3da..a925a0f 100644
--- a/includes/Import/Converter.php
+++ b/includes/Import/Converter.php
@@ -121,7 +121,12 @@
 * @throws FlowException
 */
public function convert( Title $title ) {
-   // conversion is already done
+   /*
+* $title is the title we're currently considering to import.
+* It could be a page we need to import, but could also e.g.
+* be an archive page of a previous import run (in which case
+* $movedFrom will be the Title object of that original page)
+*/
$movedFrom = $this-getPageMovedFrom( $title );
if ( $this-strategy-isConversionFinished( $title, $movedFrom 
) ) {
return;
diff --git a/includes/Import/Wikitext/ConversionStrategy.php 
b/includes/Import/Wikitext/ConversionStrategy.php
index 43eb6c8..6b62022 100644
--- a/includes/Import/Wikitext/ConversionStrategy.php
+++ b/includes/Import/Wikitext/ConversionStrategy.php
@@ -106,8 +106,11 @@
 * @{inheritDoc}
 */
public function isConversionFinished( Title $title, Title $movedFrom = 
null ) {
-   if ( $movedFrom ) {
-   // no good way to pick up where we left off
+   if ( $title-getContentModel() === CONTENT_MODEL_FLOW_BOARD ) {
+   // page is a flow board already
+   return true;
+   } elseif ( $movedFrom ) {
+   // page was moved out of the way by import - leave it 
alone
return true;
} else {
return false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1300909ee4bbe7aae7a21ceeb7b73520a362c3cf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Improve README, add HISTORY with changelog for 0.2.0 release - change (mediawiki...codesniffer)

[jenkins-bot (Code Review)]

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

Change subject: Improve README, add HISTORY with changelog for 0.2.0 release
..


Improve README, add HISTORY with changelog for 0.2.0 release

Change-Id: I17e7df5e06d4c7d73fa099a4ecb6e55173711f2a
---
A HISTORY.md
M README.md
2 files changed, 47 insertions(+), 43 deletions(-)

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



diff --git a/HISTORY.md b/HISTORY.md
new file mode 100644
index 000..ad51231
--- /dev/null
+++ b/HISTORY.md
@@ -0,0 +1,21 @@
+# MediaWiki-Codesniffer release history #
+
+## 0.2.0 / 2015-06-02 ##
+* Fixed sniff that checks globals have a wg prefix (Divya)
+* New sniff to detect unused global variables (Divya)
+* New sniff to detect text before first opening php tag (Sumit Asthana)
+* New sniff to detect alternative syntax such as endif (Vivek Ghaisas)
+* New sniff to detect unprefixed global functions (Vivek Ghaisas)
+* New sniff to detect goto usage (Harshit Harchani)
+* Update ignore with some emacs files. (Mark A. Hershberger)
+* Use upstream codesniffer 2.3.0 (Kunal Mehta)
+* Make mediawiki/tools/codesniffer pass phpcs (Vivek Ghaisas)
+* New sniff to check for spacey use of parentheses (Kunal Mehta)
+* Modify generic pass test with a case of not-spacey parentheses (Vivek 
Ghaisas)
+* Make failing tests fail only for specific respective reasons (Vivek Ghaisas)
+* Change certain errors to warnings (Vivek Ghaisas)
+* Update ExtraCharacters Sniff to allow shebang (Harshit Harchani)
+
+## 0.1.0 / 2015-01-05 ##
+
+* Initial tagged release
diff --git a/README.md b/README.md
index 0f55ef2..734dda8 100644
--- a/README.md
+++ b/README.md
@@ -1,49 +1,32 @@
-# MediaWiki coding conventions
+# MediaWiki coding conventions #
 
-## Abstract
+## Abstract ##
+This project implements a set of rules for use with [PHP 
CodeSniffer](https://pear.php.net/package/PHP_CodeSniffer).
 
-This project implements a set of rules for use with [PHP CodeSniffer]
-
-See [MediaWiki conventions] on our wiki :-)
-
-## How to install
-
-1. Install PHP Code Sniffer:
-
-```
-pear install PHP_CodeSniffer
-```
-
-2. Clone this repository in /some/path
-
-```
-git clone ... /some/path
-```
-
-3. Set up an alias to load the new standard
-
-```
-alias phpcsmw='phpcs --standard=/some/path/MediaWiki'
-```
-
-You might want to add the alias in your shell startup file (ex: ~/.bashrc).
-
-4. Run
-
-```
-$ cd /path/to/mediawiki-core
-$ phpcsmw includes/Title.php
-warnings and errors are shown
-$
-```
-
-Fix  commit
+See [MediaWiki 
conventions](https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP) on 
our wiki. :-)
 
 
-## TODO
+## How to install ##
+1. Create a composer.json which adds this project as a dependency:
+   {
+   require-dev: {
+   mediawiki/mediawiki-codesniffer: 0.2.0
+   },
+   scripts: {
+   test: [
+   phpcs 
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki 
--extensions=php,php5,inc --ignore=vendor -p .
+   ]
+   }
+   }
 
-* Actually implements the various conventions
+2. Install: `composer update`
+
+3. Run: `composer test`
+
+4. Fix  commit!
+
+Note that for most MediaWiki projects, we'd also recommend adding a PHP linter 
to your `composer.json` – see the [full 
documentation](https://www.mediawiki.org/wiki/Continuous_integration/Entry_points#PHP)
 for more details.
+
+
+## TODO ##
 * Migrate the old code-utils/check-vars.php
-
-[PHP CodeSniffer]: https://pear.php.net/package/PHP_CodeSniffer
-[MediaWiki conventions]: 
http://www.mediawiki.org/wiki/Manual:Coding_conventions

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17e7df5e06d4c7d73fa099a4ecb6e55173711f2a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Polybuildr v.a.ghai...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fixed $flags bit operation precedence fail in User::loadFrom... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fixed $flags bit operation precedence fail in 
User::loadFromDatabase()
..


Fixed $flags bit operation precedence fail in User::loadFromDatabase()

* The bug made READ_LATEST also act as READ_LOCKING

Bug: T100577
Bug: T100869
Bug: T98706
Change-Id: I85092970c236fc4482371216b9f6592c49a27942
---
M includes/User.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/User.php b/includes/User.php
index eb2a2dc..fc07b6d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1229,7 +1229,7 @@
self::selectFields(),
array( 'user_id' = $this-mId ),
__METHOD__,
-   ( $flags  self::READ_LOCKING == self::READ_LOCKING )
+   ( ( $flags  self::READ_LOCKING ) == self::READ_LOCKING 
)
? array( 'LOCK IN SHARE MODE' )
: array()
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85092970c236fc4482371216b9f6592c49a27942
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use a fixed comment placeholder string in CSSMin - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Use a fixed comment placeholder string in CSSMin
..


Use a fixed comment placeholder string in CSSMin

Both the problem and solution are nearly identical to the ones presented in
I31d4556bb. Use a constant string as a comment placeholder, and differentiate
it from possible user input using \x7f, which is not valid CSS anyway[1].

  [1]: http://www.w3.org/TR/CSS21/grammar.html

Change-Id: I3d3c2578d5e9c1fe52c02e87901cb08d03847ea7
---
M includes/libs/CSSMin.php
1 file changed, 12 insertions(+), 6 deletions(-)

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



diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index ffe26a9..f415c9b 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -31,6 +31,9 @@
 
/* Constants */
 
+   /** @var string Strip marker for comments. **/
+   const PLACEHOLDER = \x7fPLACEHOLDER\x7f;
+
/**
 * Internet Explorer data URI length limit. See encodeImageAsDataURI().
 */
@@ -232,19 +235,22 @@
$remote = substr( $remote, 0, -1 );
}
 
+   // Disallow U+007F DELETE, which is illegal anyway, and which
+   // we use for comment placeholders.
+   $source = str_replace( \x7f, ?, $source );
+
// Replace all comments by a placeholder so they will not 
interfere with the remapping.
// Warning: This will also catch on anything looking like the 
start of a comment between
// quotation marks (e.g. foo /* bar).
$comments = array();
-   $placeholder = uniqid( '', true );
 
$pattern = '/(?!' . CSSMin::EMBED_REGEX . ')(' . 
CSSMin::COMMENT_REGEX . ')/s';
 
$source = preg_replace_callback(
$pattern,
-   function ( $match ) use ( $comments, $placeholder ) {
+   function ( $match ) use ( $comments ) {
$comments[] = $match[ 0 ];
-   return $placeholder . ( count( $comments ) - 1 
) . 'x';
+   return CSSMin::PLACEHOLDER . ( count( $comments 
) - 1 ) . 'x';
},
$source
);
@@ -257,13 +263,13 @@
 
$source = preg_replace_callback(
$pattern,
-   function ( $matchOuter ) use ( $local, $remote, 
$embedData, $placeholder ) {
+   function ( $matchOuter ) use ( $local, $remote, 
$embedData ) {
$rule = $matchOuter[0];
 
// Check for global @embed comment and remove 
it. Allow other comments to be present
// before @embed (they have been replaced with 
placeholders at this point).
$embedAll = false;
-   $rule = preg_replace( '/^((?:\s+|' . 
$placeholder . '(\d+)x)*)' . CSSMin::EMBED_REGEX . '\s*/', '$1', $rule, 1, 
$embedAll );
+   $rule = preg_replace( '/^((?:\s+|' . 
CSSMin::PLACEHOLDER . '(\d+)x)*)' . CSSMin::EMBED_REGEX . '\s*/', '$1', $rule, 
1, $embedAll );
 
// Build two versions of current rule: with 
remapped URLs
// and with embedded data: URIs (where 
possible).
@@ -328,7 +334,7 @@
}, $source );
 
// Re-insert comments
-   $pattern = '/' . $placeholder . '(\d+)x/';
+   $pattern = '/' . CSSMin::PLACEHOLDER . '(\d+)x/';
$source = preg_replace_callback( $pattern, function( $match ) 
use ( $comments ) {
return $comments[ $match[1] ];
}, $source );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d3c2578d5e9c1fe52c02e87901cb08d03847ea7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf7
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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