[MediaWiki-commits] [Gerrit] Add autocomplete hints to personal info form - change (mediawiki...DonationInterface)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Add autocomplete hints to personal info form
..

Add autocomplete hints to personal info form

Should let some browsers fill in the whole thing for donors if they want
it to.

Change-Id: I47aae5e88576bfb811a5156176323d69488c9639
---
M gateway_forms/mustache/personal_info.html.mustache
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/gateway_forms/mustache/personal_info.html.mustache 
b/gateway_forms/mustache/personal_info.html.mustache
index 828a899..0fca03d 100644
--- a/gateway_forms/mustache/personal_info.html.mustache
+++ b/gateway_forms/mustache/personal_info.html.mustache
@@ -1,7 +1,7 @@
 {{# fname_required }}{{! if we don't need the fname, hide the whole name cell 
}}


-   
+   


 {{{ fieldError "fname" }}}
@@ -11,7 +11,7 @@
 {{# street_required }}


-   
+   


 {{{ fieldError "street" }}}
@@ -19,11 +19,11 @@


 {{# city_required }}
-   
+   
 {{/ city_required }}
 {{> state_dropdown }}{{! only renders if required }}
 {{# zip_required }}
-   
+   
 {{/ zip_required }}


@@ -49,7 +49,7 @@
 {{# email_required }}


-   
+   


 {{{ fieldError "email" }}}

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

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

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

[MediaWiki-commits] [Gerrit] DHCP: Add MAC address for mw2218 and mw2239 to mw2250 Bug:T1... - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: DHCP: Add MAC address for mw2218 and mw2239 to mw2250 
Bug:T135466
..


DHCP: Add MAC address for mw2218 and mw2239 to mw2250
Bug:T135466

Change-Id: I2c78a6727cfb500c457737512b3dbbfb92fbc64e
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 61 insertions(+), 0 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index e096545..b1ee4d8 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5849,6 +5849,11 @@
 fixed-address mw2217.codfw.wmnet;
 }
 
+host mw2218 {
+hardware ethernet 14:18:77:69:C6:81;
+fixed-address mw2218.codfw.wmnet;
+}
+
 host mw2219 {
 hardware ethernet 14:18:77:6A:1C:51;
 fixed-address mw2219.codfw.wmnet;
@@ -5949,6 +5954,62 @@
 fixed-address mw2238.codfw.wmnet;
 }
 
+host mw2239 {
+hardware ethernet 14:18:77:6A:0B:66;
+fixed-address mw2239.codfw.wmnet;
+}
+
+host mw2240 {
+hardware ethernet 14:18:77:6A:23:80;
+fixed-address mw2240.codfw.wmnet;
+}
+
+host mw2241 {
+hardware ethernet 14:18:77:69:FE:0B;
+fixed-address mw2241.codfw.wmnet;
+}
+
+host mw2242 {
+hardware ethernet 14:18:77:6A:38:0C;
+fixed-address mw2242.codfw.wmnet;
+}
+
+host mw2244 {
+hardware ethernet 14:18:77:66:7D:CD;
+fixed-address mw2244.codfw.wmnet;
+}
+
+host mw2245 {
+hardware ethernet 14:18:77:66:B2:0C;
+fixed-address mw2245.codfw.wmnet;
+}
+
+host mw2246 {
+hardware ethernet 14:18:77:66:78:1E;
+fixed-address mw2246.codfw.wmnet;
+}
+
+host mw2247 {
+hardware ethernet 14:18:77:66:79:E6;
+fixed-address mw2247.codfw.wmnet;
+}
+
+host mw2248 {
+hardware ethernet 14:18:77:66:55:40;
+fixed-address mw2248.codfw.wmnet;
+}
+
+host mw2249 {
+hardware ethernet 14:18:77:66:69:51;
+fixed-address mw2249.codfw.wmnet;
+}
+
+host mw2250 {
+hardware ethernet 14:18:77:6A:55:BB;
+fixed-address mw2250.codfw.wmnet;
+}
+
+
 host neodymium {
 hardware ethernet 90:B1:1C:2D:79:8C;
 fixed-address neodymium.eqiad.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c78a6727cfb500c457737512b3dbbfb92fbc64e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Papaul 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Avoid setting vary-revision for "revisionsize" - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid setting vary-revision for "revisionsize"
..

Avoid setting vary-revision for "revisionsize"

Just always use the input size for new revisions. If they are
saved, then that should be the revision size. If they are just
null edits, then the size must have matched the current revision.

This also enables edit stashing for this case.

Change-Id: I428c0cc87750eeddd1d7dcebd1a2b03817cec441
---
M includes/parser/Parser.php
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/80/293680/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 116b274..dcc35bd 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2656,8 +2656,6 @@
case 'revisionsize':
# Let the edit saving system know we should 
parse the page
# *after* a revision ID has been assigned. This 
is for null edits.
-   $this->mOutput->setFlag( 'vary-revision' );
-   wfDebug( __METHOD__ . ": {{REVISIONSIZE}} used, 
setting vary-revision...\n" );
$value = $this->getRevisionSize();
break;
case 'namespace':
@@ -5637,7 +5635,7 @@
# will change the size.
if ( $revObject ) {
$this->mRevisionSize = $revObject->getSize();
-   } elseif ( $this->ot['wiki'] || 
$this->mOptions->getIsPreview() ) {
+   } else {
$this->mRevisionSize = $this->mInputSize;
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I428c0cc87750eeddd1d7dcebd1a2b03817cec441
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Reduce the z-index of the translation list action trigger - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Reduce the z-index of the translation list action trigger
..

Reduce the z-index of the translation list action trigger

I don't remember why we need that z-index, but a small value
looks harmless

Bug: T124873
Change-Id: I9c5b2c35a37f445f81b7f5fc4189a8e7ecf81b23
---
M modules/dashboard/styles/ext.cx.translationlist.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/79/293679/1

diff --git a/modules/dashboard/styles/ext.cx.translationlist.less 
b/modules/dashboard/styles/ext.cx.translationlist.less
index 8437d01..0729d46 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -14,7 +14,7 @@
position: relative;
width: auto;
float: right;
-   z-index: 100;
+   z-index: 10;
 
.cx-tlitem__actions__trigger {
cursor: pointer;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c5b2c35a37f445f81b7f5fc4189a8e7ecf81b23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] Add more logging info to parseAndStash() for uncacheable con... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add more logging info to parseAndStash() for uncacheable content
..


Add more logging info to parseAndStash() for uncacheable content

Change-Id: I2409f0db518d366a747aa01ba5593dccdb34e68c
---
M includes/api/ApiStashEdit.php
1 file changed, 16 insertions(+), 14 deletions(-)

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



diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index 814a111..dd911d0 100644
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -154,7 +154,7 @@
// Let extensions add ParserOutput metadata or warm 
other caches
Hooks::run( 'ParserOutputStashForEdit', [ $page, 
$content, $editInfo->output ] );
 
-   list( $stashInfo, $ttl ) = self::buildStashValue(
+   list( $stashInfo, $ttl, $code ) = self::buildStashValue(
$editInfo->pstContent,
$editInfo->output,
$editInfo->timestamp,
@@ -171,7 +171,7 @@
return self::ERROR_CACHE;
}
} else {
-   $logger->info( "Uncacheable parser output for 
key '$key' ('$title')." );
+   $logger->info( "Uncacheable parser output for 
key '$key' ('$title') [$code]." );
return self::ERROR_UNCACHEABLE;
}
}
@@ -376,7 +376,7 @@
 * @param ParserOutput $parserOutput
 * @param string $timestamp TS_MW
 * @param User $user
-* @return array (stash info array, TTL in seconds) or (null, 0)
+* @return array (stash info array, TTL in seconds, info code) or 
(null, 0, info code)
 */
private static function buildStashValue(
Content $pstContent, ParserOutput $parserOutput, $timestamp, 
User $user
@@ -385,19 +385,21 @@
// Put an upper limit on the TTL for sanity to avoid extreme 
template/file staleness.
$since = time() - wfTimestamp( TS_UNIX, 
$parserOutput->getTimestamp() );
$ttl = min( $parserOutput->getCacheExpiry() - $since, 
self::MAX_CACHE_TTL );
-
-   if ( $ttl > 0 && !$parserOutput->getFlag( 'vary-revision' ) ) {
-   // Only store what is actually needed
-   $stashInfo = (object)[
-   'pstContent' => $pstContent,
-   'output' => $parserOutput,
-   'timestamp'  => $timestamp,
-   'edits'  => $user->getEditCount()
-   ];
-   return [ $stashInfo, $ttl ];
+   if ( $ttl <= 0 ) {
+   return [ null, 0, 'no_ttl' ];
+   } elseif ( $parserOutput->getFlag( 'vary-revision' ) ) {
+   return [ null, 0, 'vary_revision' ];
}
 
-   return [ null, 0 ];
+   // Only store what is actually needed
+   $stashInfo = (object)[
+   'pstContent' => $pstContent,
+   'output' => $parserOutput,
+   'timestamp'  => $timestamp,
+   'edits'  => $user->getEditCount()
+   ];
+
+   return [ $stashInfo, $ttl, 'ok' ];
}
 
public function getAllowedParams() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2409f0db518d366a747aa01ba5593dccdb34e68c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Define backup for contint - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Define backup for contint
..


Define backup for contint

Bug: T80385
Change-Id: Iec88d1139f27e15a7856bca59c637bbb42895aaf
---
M modules/role/manifests/backup/director.pp
M modules/role/manifests/ci/master.pp
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/backup/director.pp 
b/modules/role/manifests/backup/director.pp
index 574bfa3..bcb8c1d 100644
--- a/modules/role/manifests/backup/director.pp
+++ b/modules/role/manifests/backup/director.pp
@@ -206,6 +206,10 @@
 bacula::director::fileset { 'openldap':
 includes => [ '/var/run/openldap-backup' ],
 }
+bacula::director::fileset { 'contint':
+includes => [ '/srv', '/var/lib/zuul', '/var/lib/jenkins' ],
+excludes => [ '/srv/ssd', ],
+}
 
 # The console should be on the director
 class { 'bacula::console':
diff --git a/modules/role/manifests/ci/master.pp 
b/modules/role/manifests/ci/master.pp
index 0bbd5e3..e6a20a7 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -19,6 +19,8 @@
 include ::jenkins,
 contint::proxy_jenkins
 
+backup::set { 'contint' : }
+
 nrpe::monitor_service { 'jenkins_zmq_publisher':
 description   => 'jenkins_zmq_publisher',
 contact_group => 'contint',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec88d1139f27e15a7856bca59c637bbb42895aaf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] DHCP: Add MAC address for mw2218 and mw2239 to mw2250 Bug:T1... - change (operations/puppet)

[Papaul (Code Review)]

Papaul has uploaded a new change for review.

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

Change subject: DHCP: Add MAC address for mw2218 and mw2239 to mw2250 
Bug:T135466
..

DHCP: Add MAC address for mw2218 and mw2239 to mw2250
Bug:T135466

Change-Id: I2c78a6727cfb500c457737512b3dbbfb92fbc64e
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 61 insertions(+), 0 deletions(-)


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

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index e096545..b1ee4d8 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5849,6 +5849,11 @@
 fixed-address mw2217.codfw.wmnet;
 }
 
+host mw2218 {
+hardware ethernet 14:18:77:69:C6:81;
+fixed-address mw2218.codfw.wmnet;
+}
+
 host mw2219 {
 hardware ethernet 14:18:77:6A:1C:51;
 fixed-address mw2219.codfw.wmnet;
@@ -5949,6 +5954,62 @@
 fixed-address mw2238.codfw.wmnet;
 }
 
+host mw2239 {
+hardware ethernet 14:18:77:6A:0B:66;
+fixed-address mw2239.codfw.wmnet;
+}
+
+host mw2240 {
+hardware ethernet 14:18:77:6A:23:80;
+fixed-address mw2240.codfw.wmnet;
+}
+
+host mw2241 {
+hardware ethernet 14:18:77:69:FE:0B;
+fixed-address mw2241.codfw.wmnet;
+}
+
+host mw2242 {
+hardware ethernet 14:18:77:6A:38:0C;
+fixed-address mw2242.codfw.wmnet;
+}
+
+host mw2244 {
+hardware ethernet 14:18:77:66:7D:CD;
+fixed-address mw2244.codfw.wmnet;
+}
+
+host mw2245 {
+hardware ethernet 14:18:77:66:B2:0C;
+fixed-address mw2245.codfw.wmnet;
+}
+
+host mw2246 {
+hardware ethernet 14:18:77:66:78:1E;
+fixed-address mw2246.codfw.wmnet;
+}
+
+host mw2247 {
+hardware ethernet 14:18:77:66:79:E6;
+fixed-address mw2247.codfw.wmnet;
+}
+
+host mw2248 {
+hardware ethernet 14:18:77:66:55:40;
+fixed-address mw2248.codfw.wmnet;
+}
+
+host mw2249 {
+hardware ethernet 14:18:77:66:69:51;
+fixed-address mw2249.codfw.wmnet;
+}
+
+host mw2250 {
+hardware ethernet 14:18:77:6A:55:BB;
+fixed-address mw2250.codfw.wmnet;
+}
+
+
 host neodymium {
 hardware ethernet 90:B1:1C:2D:79:8C;
 fixed-address neodymium.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] Add more logging info to parseAndStash() for uncacheable con... - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Add more logging info to parseAndStash() for uncacheable content
..

Add more logging info to parseAndStash() for uncacheable content

Change-Id: I2409f0db518d366a747aa01ba5593dccdb34e68c
---
M includes/api/ApiStashEdit.php
1 file changed, 16 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/293677/1

diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index 814a111..dd911d0 100644
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -154,7 +154,7 @@
// Let extensions add ParserOutput metadata or warm 
other caches
Hooks::run( 'ParserOutputStashForEdit', [ $page, 
$content, $editInfo->output ] );
 
-   list( $stashInfo, $ttl ) = self::buildStashValue(
+   list( $stashInfo, $ttl, $code ) = self::buildStashValue(
$editInfo->pstContent,
$editInfo->output,
$editInfo->timestamp,
@@ -171,7 +171,7 @@
return self::ERROR_CACHE;
}
} else {
-   $logger->info( "Uncacheable parser output for 
key '$key' ('$title')." );
+   $logger->info( "Uncacheable parser output for 
key '$key' ('$title') [$code]." );
return self::ERROR_UNCACHEABLE;
}
}
@@ -376,7 +376,7 @@
 * @param ParserOutput $parserOutput
 * @param string $timestamp TS_MW
 * @param User $user
-* @return array (stash info array, TTL in seconds) or (null, 0)
+* @return array (stash info array, TTL in seconds, info code) or 
(null, 0, info code)
 */
private static function buildStashValue(
Content $pstContent, ParserOutput $parserOutput, $timestamp, 
User $user
@@ -385,19 +385,21 @@
// Put an upper limit on the TTL for sanity to avoid extreme 
template/file staleness.
$since = time() - wfTimestamp( TS_UNIX, 
$parserOutput->getTimestamp() );
$ttl = min( $parserOutput->getCacheExpiry() - $since, 
self::MAX_CACHE_TTL );
-
-   if ( $ttl > 0 && !$parserOutput->getFlag( 'vary-revision' ) ) {
-   // Only store what is actually needed
-   $stashInfo = (object)[
-   'pstContent' => $pstContent,
-   'output' => $parserOutput,
-   'timestamp'  => $timestamp,
-   'edits'  => $user->getEditCount()
-   ];
-   return [ $stashInfo, $ttl ];
+   if ( $ttl <= 0 ) {
+   return [ null, 0, 'no_ttl' ];
+   } elseif ( $parserOutput->getFlag( 'vary-revision' ) ) {
+   return [ null, 0, 'vary_revision' ];
}
 
-   return [ null, 0 ];
+   // Only store what is actually needed
+   $stashInfo = (object)[
+   'pstContent' => $pstContent,
+   'output' => $parserOutput,
+   'timestamp'  => $timestamp,
+   'edits'  => $user->getEditCount()
+   ];
+
+   return [ $stashInfo, $ttl, 'ok' ];
}
 
public function getAllowedParams() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2409f0db518d366a747aa01ba5593dccdb34e68c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] travis-ci: Fix operation ordering - change (cdb)

[jenkins-bot (Code Review)]

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

Change subject: travis-ci: Fix operation ordering
..


travis-ci: Fix operation ordering

The change in f8dfa29 was largely a copy-n-paste from similar changes
needed by composer-merge-plugin. I neglected to adjust for the order of
operations used in this travis.yml script. Specifically the
"before_script" hook runs after "install" and not before.
"before_install" is the proper hook to use in this case.

Bug: T137507
Change-Id: Iab07ef86be268d39a8dac8c0705f79d4f6b9dbfe
---
M .travis.yml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.travis.yml b/.travis.yml
index d61c055..5b4fcc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@
 env:
   global:
 - COMPOSER_DISABLE_XDEBUG_WARN=1
-before_script:
+before_install:
   - if [ "$TRAVIS_PHP_VERSION" = "5.3.3" ]; then composer config disable-tls 
true; composer config secure-http false; fi
 install:
   - composer install

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab07ef86be268d39a8dac8c0705f79d4f6b9dbfe
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] travis-ci: Fix operation ordering - change (cdb)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: travis-ci: Fix operation ordering
..

travis-ci: Fix operation ordering

The change in f8dfa29 was largely a copy-n-paste from similar changes
needed by composer-merge-plugin. I neglected to adjust for the order of
operations used in this travis.yml script. Specifically the
"before_script" hook runs after "install" and not before.
"before_install" is the proper hook to use in this case.

Bug: T137507
Change-Id: Iab07ef86be268d39a8dac8c0705f79d4f6b9dbfe
---
M .travis.yml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/cdb refs/changes/76/293676/1

diff --git a/.travis.yml b/.travis.yml
index d61c055..5b4fcc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@
 env:
   global:
 - COMPOSER_DISABLE_XDEBUG_WARN=1
-before_script:
+before_install:
   - if [ "$TRAVIS_PHP_VERSION" = "5.3.3" ]; then composer config disable-tls 
true; composer config secure-http false; fi
 install:
   - composer install

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab07ef86be268d39a8dac8c0705f79d4f6b9dbfe
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] Set doesWrites() for FlowAction - change (mediawiki...Flow)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Set doesWrites() for FlowAction
..

Set doesWrites() for FlowAction

This avoids bogus warnings on POST in the DBPerformance log

Change-Id: Ib6049d867ee87235b6b76bd883c108809fb00cad
---
M includes/Actions/Action.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/includes/Actions/Action.php b/includes/Actions/Action.php
index 516fca8..ae81034 100644
--- a/includes/Actions/Action.php
+++ b/includes/Actions/Action.php
@@ -35,6 +35,10 @@
$this->actionName = $actionName;
}
 
+   public function doesWrites() {
+   return true;
+   }
+
/**
 * @return string
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6049d867ee87235b6b76bd883c108809fb00cad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Lower $wgAPIMaxLagThreshold to 5 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Lower $wgAPIMaxLagThreshold to 5
..


Lower $wgAPIMaxLagThreshold to 5

Bug: T95501
Change-Id: I080c60eb2997cea4d25a492f8b2dba20490ba1a9
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7082fea..b90d0fd 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -224,7 +224,7 @@
 $wgMaxUserDBWriteDuration = 5;
 # Activate read-only mode for bots when lag is getting high.
 # This should be lower than 'max lag' in the LBFactory conf.
-$wgAPIMaxLagThreshold = 6;
+$wgAPIMaxLagThreshold = 5;
 
 ini_set( 'memory_limit', $wmgMemoryLimit );
 

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

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

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

[MediaWiki-commits] [Gerrit] Lower $wgAPIMaxLagThreshold to 5 - change (operations/mediawiki-config)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Lower $wgAPIMaxLagThreshold to 5
..

Lower $wgAPIMaxLagThreshold to 5

Bug: T95501
Change-Id: I080c60eb2997cea4d25a492f8b2dba20490ba1a9
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7082fea..b90d0fd 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -224,7 +224,7 @@
 $wgMaxUserDBWriteDuration = 5;
 # Activate read-only mode for bots when lag is getting high.
 # This should be lower than 'max lag' in the LBFactory conf.
-$wgAPIMaxLagThreshold = 6;
+$wgAPIMaxLagThreshold = 5;
 
 ini_set( 'memory_limit', $wmgMemoryLimit );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I080c60eb2997cea4d25a492f8b2dba20490ba1a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Updating credits - change (mediawiki...CollaborationKit)

[Harej (Code Review)]

Harej has uploaded a new change for review.

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

Change subject: Updating credits
..

Updating credits

Change-Id: I3a4962059f63bf0edefb215af521079e1c6f3248
---
M extension.json
M i18n/en.json
2 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/extension.json b/extension.json
index d382336..48b80c0 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
-   "name": "Collaboration Kit",
+   "name": "CollaborationKit",
"version": "0.1",
-   "author": "Calimonius the Estrange",
+   "author": [ "Kim Schoonover", "Brian Wolff" ],
"url": "https://www.mediawiki.org/wiki/Extension:CollaborationKit;,
"descriptionmsg": "colaborationkit-desc",
"type": "other",
diff --git a/i18n/en.json b/i18n/en.json
index 2a17571..34dbabb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,8 +1,8 @@
 {
"@metadata": {
-   "authors": [ "Isarra" ]
+   "authors": [ "Isarra", "Harej" ]
},
-   "colaborationkit-desc": "Extension for making form-based json hub 
things with automated workflows and stuff. More on this later when it exists.",
+   "colaborationkit-desc": "Next-generation WikiProjects and collaborative 
workspaces for wikis",
"collaborationkit-edit-invalidtitle": "Invalid title or incorrect 
content model of target",
"editcollaborationhub": "Edit Collaboration Hub page",
"editcollaborationhub-legend": "Edit Collaboration Hub",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a4962059f63bf0edefb215af521079e1c6f3248
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 

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

[MediaWiki-commits] [Gerrit] fix puppet-lint warnings. - change (integration/config)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: fix puppet-lint warnings.
..

fix puppet-lint warnings.

Change-Id: I4b94eca3ca71507ab72c04734b1472c3da4b2e34
---
M dib/puppet/ciimage.pp
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/72/293672/1

diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 589cc71..a523fcc 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -52,15 +52,16 @@
 # Install from gem
 if os_version('debian >= jessie') {
 package { 'jsduck':
-ensure  => present,
-provider=> 'gem',
-require => [
+ensure   => present,
+provider => 'gem',
+require  => [
 Class['::contint::packages::ruby'],
 Package['build-essential'],
 ],
 }
 }
 
+# allow apache2 execution
 class apache2_allow_execution {
   exec { 'allow apache2 execution':
   command => '/bin/chmod +x /usr/sbin/apache2',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b94eca3ca71507ab72c04734b1472c3da4b2e34
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] Install arcanist on contintcloud slaves - change (integration/config)

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: Install arcanist on contintcloud slaves
..

Install arcanist on contintcloud slaves

Arcanist is needed for lint/unit test integration with differential.

Change-Id: I561075a0bf04ee82c13e9c2083b0721146f4a11e
---
M dib/puppet/ciimage.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/71/293671/1

diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index 37e4f81..589cc71 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -29,6 +29,8 @@
 
 include contint::packages::javascript
 include contint::packages::php
+include phabricator::arcanist
+
 require_package('php5-xhprof')
 exec { 'Enable PHP module xhprof':
 command => '/usr/sbin/php5enmod -s ALL xhprof',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I561075a0bf04ee82c13e9c2083b0721146f4a11e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] travis-ci: bypass Composer ssl on PHP 5.3.3 - change (cdb)

[jenkins-bot (Code Review)]

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

Change subject: travis-ci: bypass Composer ssl on PHP 5.3.3
..


travis-ci: bypass Composer ssl on PHP 5.3.3

The PHP 5.3.3 builds provided by Travis-CI do not include SSL support.
This in turn causes modern versions of Composer to fail with default
configuration. When testing under PHP 5.3.3, configure Composer to use
non-tls connections.

Also tell Composer to shut up about the XDebug warning because it is
noise (and probably FUD).

Bug: T137507
Change-Id: Ib678a12031cf16a2dbaa26aff3be1ccbea13c340
---
M .travis.yml
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 3d4019f..d61c055 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,11 @@
   - "5.6"
   - "hhvm"
 sudo: false
+env:
+  global:
+- COMPOSER_DISABLE_XDEBUG_WARN=1
+before_script:
+  - if [ "$TRAVIS_PHP_VERSION" = "5.3.3" ]; then composer config disable-tls 
true; composer config secure-http false; fi
 install:
   - composer install
 script:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib678a12031cf16a2dbaa26aff3be1ccbea13c340
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Changing list styling - change (mediawiki...CollaborationKit)

[jenkins-bot (Code Review)]

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

Change subject: Changing list styling
..


Changing list styling

Change-Id: Ia130d9f32eab2c3b89cd7d5781d4dcbf48d04ec2
---
M includes/content/CollaborationListContent.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 2ddb1b8..9bc0096 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -340,12 +340,12 @@
 
if ( $image ) {
$text .= '';
-   $text .= '[[File:' . $image->getName() . 
"|left|64x64px|alt=]]\n";
+   $text .= '[[File:' . $image->getName() . 
"|left|64px|alt=]]\n";
$text .= '';
}
 
$text .= '';
-   $text .= '';
+   $text .= '';
if ( $titleForItem ) {
// FIXME kill inline css somehow.
$text .= "[[" . 
$titleForItem->getPrefixedDBkey() . "|"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia130d9f32eab2c3b89cd7d5781d4dcbf48d04ec2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 
Gerrit-Reviewer: Harej 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Changing list styling - change (mediawiki...CollaborationKit)

[Harej (Code Review)]

Harej has uploaded a new change for review.

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

Change subject: Changing list styling
..

Changing list styling

Change-Id: Ia130d9f32eab2c3b89cd7d5781d4dcbf48d04ec2
---
M includes/content/CollaborationListContent.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 2ddb1b8..9bc0096 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -340,12 +340,12 @@
 
if ( $image ) {
$text .= '';
-   $text .= '[[File:' . $image->getName() . 
"|left|64x64px|alt=]]\n";
+   $text .= '[[File:' . $image->getName() . 
"|left|64px|alt=]]\n";
$text .= '';
}
 
$text .= '';
-   $text .= '';
+   $text .= '';
if ( $titleForItem ) {
// FIXME kill inline css somehow.
$text .= "[[" . 
$titleForItem->getPrefixedDBkey() . "|"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia130d9f32eab2c3b89cd7d5781d4dcbf48d04ec2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 

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

[MediaWiki-commits] [Gerrit] decom cp1043, cp1044 from site.pp, installserver - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: decom cp1043,cp1044 from site.pp, installserver
..

decom cp1043,cp1044 from site.pp, installserver

Bug:T133614
Change-Id: I71c398ee2595321bef392a45cbc03f81db2513be
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/293669/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2ddf00b..1b1c197 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -321,12 +321,6 @@
 interface::add_ip6_mapped { 'main': }
 }
 
-# to be decommed shortly!
-node /^cp104[34]\.eqiad\.wmnet$/ {
-interface::add_ip6_mapped { 'main': }
-role spare # to be decommed (T133614)
-}
-
 node /^cp10(45|5[18]|61)\.eqiad\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
 role cache::misc, ipsec
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index e096545..cd8b0fc 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -418,16 +418,6 @@
 fixed-address cp1008.wikimedia.org;
 }
 
-host cp1043 {
-hardware ethernet 84:2b:2b:fd:c0:2f;
-fixed-address cp1043.eqiad.wmnet;
-}
-
-host cp1044 {
-hardware ethernet 84:2b:2b:fd:bd:f8;
-fixed-address cp1044.eqiad.wmnet;
-}
-
 host cp1045 {
 hardware ethernet 90:B1:1C:42:E8:15;
 fixed-address cp1045.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] add lint:ignore's for remaining files outside modules - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: add lint:ignore's for remaining files outside modules
..


add lint:ignore's for remaining files outside modules

These are all the remaining files that are not in modules
that don't already have lint-ignores or have been moved.

Yea, that's all.

Bug:T93645
Change-Id: I504b3f7bfccd2ddc12bf69fc9e36680f00cd3be7
---
M manifests/role/db.pp
M manifests/role/grafana.pp
M manifests/role/jsbench.pp
M manifests/role/logging.pp
M manifests/role/logstash.pp
M manifests/role/mariadb.pp
M manifests/role/ve.pp
M modules/role/manifests/mha/manager.pp
M modules/role/manifests/postgres/common.pp
M modules/udp2log/manifests/monitoring.pp
10 files changed, 35 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 8cc717c..769ad8d 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -100,12 +100,15 @@
 class role::labsdb::manager {
 require_package(['python-mysqldb', 'python-yaml'])
 
+# move file to module?
+# lint:ignore:puppet_url_without_modules 
 file { '/usr/local/sbin/skrillex.py':
 owner  => 'root',
 group  => 'wikidev',
 mode   => '0550',
 source => 'puppet:///files/mysql/skrillex.py',
 }
+# lint:endignore
 
 file { '/etc/skrillex.yaml':
 owner   => 'root',
diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp
index 1dd4dab..e917a4d 100644
--- a/manifests/role/grafana.pp
+++ b/manifests/role/grafana.pp
@@ -122,6 +122,8 @@
 notify  => Service['grafana-server'],
 }
 
+# move file to module?
+# lint:ignore:puppet_url_without_modules
 file { '/usr/share/grafana/public/img/grafana_icon.svg':
 source  => 'puppet:///files/misc/wikimedia-logo.svg',
 owner   => 'root',
@@ -129,6 +131,7 @@
 mode=> '0444',
 require => Package['grafana'],
 }
+# lint:endignore
 
 # We disable account creation, because accounts are created
 # automagically based on the X-WEBAUTH-USER, which is either set
diff --git a/manifests/role/jsbench.pp b/manifests/role/jsbench.pp
index b62610c..f44c7a6 100644
--- a/manifests/role/jsbench.pp
+++ b/manifests/role/jsbench.pp
@@ -36,6 +36,8 @@
 require=> File['/srv/profile'],
 }
 
+# move files to module?
+# lint:ignore:puppet_url_without_modules
 file { '/usr/local/bin/jsbench':
 source => 'puppet:///files/jsbench/jsbench',
 owner  => 'root',
@@ -53,4 +55,5 @@
 source  => 'puppet:///files/jsbench/benchmarks',
 recurse => true,
 }
+# lint:endignore
 }
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index ad58ade..bad611e 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -87,6 +87,8 @@
 minute  => 0
 }
 
+# move files to module?
+# lint:ignore:puppet_url_without_modules
 file { '/usr/local/bin/mw-log-cleanup':
 owner  => 'root',
 group  => 'root',
@@ -107,6 +109,7 @@
 mode   => '0555',
 source => 'puppet:///files/misc/scripts/fatalmonitor',
 }
+# lint:endignore
 
 }
 
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index f0f61d0..0030ea7 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -72,6 +72,8 @@
 
 ## Global pre-processing (15)
 
+# move files into module?
+# lint:ignore:puppet_url_without_modules
 logstash::conf { 'filter_strip_ansi_color':
 source   => 'puppet:///files/logstash/filter-strip-ansi-color.conf',
 priority => 15,
@@ -127,6 +129,7 @@
 group  => 'root',
 mode   => '0444',
 }
+# lint:endignore
 
 logstash::output::elasticsearch { 'logstash':
 host=> '127.0.0.1',
@@ -223,10 +226,12 @@
 srange => '$ALL_NETWORKS',
 }
 
+# lint:ignore:puppet_url_without_modules
 logstash::conf { 'filter_puppet':
 source   => 'puppet:///files/logstash/filter-puppet.conf',
 priority => 50,
 }
+# lint:endignore
 }
 
 
@@ -245,6 +250,7 @@
 }
 
 # Template for Elasticsearch index creation
+# lint:ignore:puppet_url_without_modules
 file { '/etc/logstash/apifeatureusage-template.json':
 ensure => present,
 source => 'puppet:///files/logstash/apifeatureusage-template.json',
@@ -259,6 +265,7 @@
 source   => 'puppet:///files/logstash/filter-apifeatureusage.conf',
 priority => 55,
 }
+# lint:endignore
 
 # Output destined for separate Elasticsearch cluster from Logstash cluster
 logstash::output::elasticsearch { 'apifeatureusage':
@@ -286,9 +293,10 @@
 type   => 'eventlogging',
 zk_connect => $kafka_config['zookeeper']['url'],
 }
-
+# lint:ignore:puppet_url_without_modules
 

[MediaWiki-commits] [Gerrit] Fix "Undefined index: type" warning on LoginSignupSpecialPage - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix "Undefined index: type" warning on LoginSignupSpecialPage
..


Fix "Undefined index: type" warning on LoginSignupSpecialPage

When discarding form descriptors that do not have an equivalent
AuthenticationRequest field, do not assume the descriptor always
has a type.

Th warning was probably caused by I2a8cd4850.

Change-Id: Id1daee1e4954199fcb2077178e8f08d1ad3ae916
(cherry picked from commit 4d226cbeb914f01d37a28b0ff78b60fef1cd653e)
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index d8f5e66..3099a9b 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -854,7 +854,7 @@
!isset( $coreField['baseField'] )
|| !isset( 
$fieldInfo[$coreField['baseField']] )
) && !in_array( $fieldName, $specialFields, 
true )
-   && $coreField['type'] !== 'submit'
+   && ( !isset( $coreField['type'] ) || 
$coreField['type'] !== 'submit' )
) {
$coreFieldDescriptors[$fieldName] = null;
continue;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1daee1e4954199fcb2077178e8f08d1ad3ae916
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix auth event log channel name - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix auth event log channel name
..


Fix auth event log channel name

Change-Id: I05daab1166ffee31453692c53533efb09b7ad2ed
(cherry picked from commit 2744c09e8d43e7304e02436c084733b87c6b9589)
---
M includes/specials/SpecialCreateAccount.php
M includes/specials/SpecialUserLogin.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/specials/SpecialCreateAccount.php 
b/includes/specials/SpecialCreateAccount.php
index b046bf9..9f3e5f0 100644
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -160,7 +160,7 @@
}
 
protected function logAuthResult( $success, $status = null ) {
-   LoggerFactory::getInstance( 'authmanager-stats' )->info( 
'Account creation attempt', [
+   LoggerFactory::getInstance( 'authevents' )->info( 'Account 
creation attempt', [
'event' => 'accountcreation',
'successful' => $success,
'status' => $status,
diff --git a/includes/specials/SpecialUserLogin.php 
b/includes/specials/SpecialUserLogin.php
index 28c68aa..493ae2a 100644
--- a/includes/specials/SpecialUserLogin.php
+++ b/includes/specials/SpecialUserLogin.php
@@ -154,7 +154,7 @@
}
 
protected function logAuthResult( $success, $status = null ) {
-   LoggerFactory::getInstance( 'authmanager-stats' )->info( 'Login 
attempt', [
+   LoggerFactory::getInstance( 'authevents' )->info( 'Login 
attempt', [
'event' => 'login',
'successful' => $success,
'status' => $status,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05daab1166ffee31453692c53533efb09b7ad2ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix "Undefined index: type" warning on LoginSignupSpecialPage - change (mediawiki/core)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix "Undefined index: type" warning on LoginSignupSpecialPage
..

Fix "Undefined index: type" warning on LoginSignupSpecialPage

When discarding form descriptors that do not have an equivalent
AuthenticationRequest field, do not assume the descriptor always
has a type.

Th warning was probably caused by I2a8cd4850.

Change-Id: Id1daee1e4954199fcb2077178e8f08d1ad3ae916
(cherry picked from commit 4d226cbeb914f01d37a28b0ff78b60fef1cd653e)
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/293668/1

diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index d8f5e66..3099a9b 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -854,7 +854,7 @@
!isset( $coreField['baseField'] )
|| !isset( 
$fieldInfo[$coreField['baseField']] )
) && !in_array( $fieldName, $specialFields, 
true )
-   && $coreField['type'] !== 'submit'
+   && ( !isset( $coreField['type'] ) || 
$coreField['type'] !== 'submit' )
) {
$coreFieldDescriptors[$fieldName] = null;
continue;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1daee1e4954199fcb2077178e8f08d1ad3ae916
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Fix "Undefined index: type" warning on LoginSignupSpecialPage - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix "Undefined index: type" warning on LoginSignupSpecialPage
..


Fix "Undefined index: type" warning on LoginSignupSpecialPage

When discarding form descriptors that do not have an equivalent
AuthenticationRequest field, do not assume the descriptor always
has a type.

Th warning was probably caused by I2a8cd4850.

Change-Id: Id1daee1e4954199fcb2077178e8f08d1ad3ae916
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index d8f5e66..3099a9b 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -854,7 +854,7 @@
!isset( $coreField['baseField'] )
|| !isset( 
$fieldInfo[$coreField['baseField']] )
) && !in_array( $fieldName, $specialFields, 
true )
-   && $coreField['type'] !== 'submit'
+   && ( !isset( $coreField['type'] ) || 
$coreField['type'] !== 'submit' )
) {
$coreFieldDescriptors[$fieldName] = null;
continue;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1daee1e4954199fcb2077178e8f08d1ad3ae916
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix auth event log channel name - change (mediawiki/core)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix auth event log channel name
..

Fix auth event log channel name

Change-Id: I05daab1166ffee31453692c53533efb09b7ad2ed
(cherry picked from commit 2744c09e8d43e7304e02436c084733b87c6b9589)
---
M includes/specials/SpecialCreateAccount.php
M includes/specials/SpecialUserLogin.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/67/293667/1

diff --git a/includes/specials/SpecialCreateAccount.php 
b/includes/specials/SpecialCreateAccount.php
index b046bf9..9f3e5f0 100644
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -160,7 +160,7 @@
}
 
protected function logAuthResult( $success, $status = null ) {
-   LoggerFactory::getInstance( 'authmanager-stats' )->info( 
'Account creation attempt', [
+   LoggerFactory::getInstance( 'authevents' )->info( 'Account 
creation attempt', [
'event' => 'accountcreation',
'successful' => $success,
'status' => $status,
diff --git a/includes/specials/SpecialUserLogin.php 
b/includes/specials/SpecialUserLogin.php
index 28c68aa..493ae2a 100644
--- a/includes/specials/SpecialUserLogin.php
+++ b/includes/specials/SpecialUserLogin.php
@@ -154,7 +154,7 @@
}
 
protected function logAuthResult( $success, $status = null ) {
-   LoggerFactory::getInstance( 'authmanager-stats' )->info( 'Login 
attempt', [
+   LoggerFactory::getInstance( 'authevents' )->info( 'Login 
attempt', [
'event' => 'login',
'successful' => $success,
'status' => $status,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05daab1166ffee31453692c53533efb09b7ad2ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Fix auth event log channel name - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix auth event log channel name
..


Fix auth event log channel name

Change-Id: I05daab1166ffee31453692c53533efb09b7ad2ed
---
M includes/specials/SpecialCreateAccount.php
M includes/specials/SpecialUserLogin.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/specials/SpecialCreateAccount.php 
b/includes/specials/SpecialCreateAccount.php
index b046bf9..9f3e5f0 100644
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -160,7 +160,7 @@
}
 
protected function logAuthResult( $success, $status = null ) {
-   LoggerFactory::getInstance( 'authmanager-stats' )->info( 
'Account creation attempt', [
+   LoggerFactory::getInstance( 'authevents' )->info( 'Account 
creation attempt', [
'event' => 'accountcreation',
'successful' => $success,
'status' => $status,
diff --git a/includes/specials/SpecialUserLogin.php 
b/includes/specials/SpecialUserLogin.php
index 28c68aa..493ae2a 100644
--- a/includes/specials/SpecialUserLogin.php
+++ b/includes/specials/SpecialUserLogin.php
@@ -154,7 +154,7 @@
}
 
protected function logAuthResult( $success, $status = null ) {
-   LoggerFactory::getInstance( 'authmanager-stats' )->info( 'Login 
attempt', [
+   LoggerFactory::getInstance( 'authevents' )->info( 'Login 
attempt', [
'event' => 'login',
'successful' => $success,
'status' => $status,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05daab1166ffee31453692c53533efb09b7ad2ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] travis-ci: bypass Composer ssl on PHP 5.3.3 - change (cdb)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: travis-ci: bypass Composer ssl on PHP 5.3.3
..

travis-ci: bypass Composer ssl on PHP 5.3.3

The PHP 5.3.3 builds provided by Travis-CI do not include SSL support.
This in turn causes modern versions of Composer to fail with default
configuration. When testing under PHP 5.3.3, configure Composer to use
non-tls connections.

Also tell Composer to shut up about the XDebug warning because it is
noise (and probably FUD).

Bug: T137507
Change-Id: Ib678a12031cf16a2dbaa26aff3be1ccbea13c340
---
M .travis.yml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/cdb refs/changes/66/293666/1

diff --git a/.travis.yml b/.travis.yml
index 3d4019f..d61c055 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,11 @@
   - "5.6"
   - "hhvm"
 sudo: false
+env:
+  global:
+- COMPOSER_DISABLE_XDEBUG_WARN=1
+before_script:
+  - if [ "$TRAVIS_PHP_VERSION" = "5.3.3" ]; then composer config disable-tls 
true; composer config secure-http false; fi
 install:
   - composer install
 script:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib678a12031cf16a2dbaa26aff3be1ccbea13c340
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] Fix auth event log channel name - change (mediawiki/core)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix auth event log channel name
..

Fix auth event log channel name

Change-Id: I05daab1166ffee31453692c53533efb09b7ad2ed
---
M includes/specials/SpecialCreateAccount.php
M includes/specials/SpecialUserLogin.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/293665/1

diff --git a/includes/specials/SpecialCreateAccount.php 
b/includes/specials/SpecialCreateAccount.php
index b046bf9..9f3e5f0 100644
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -160,7 +160,7 @@
}
 
protected function logAuthResult( $success, $status = null ) {
-   LoggerFactory::getInstance( 'authmanager-stats' )->info( 
'Account creation attempt', [
+   LoggerFactory::getInstance( 'authevents' )->info( 'Account 
creation attempt', [
'event' => 'accountcreation',
'successful' => $success,
'status' => $status,
diff --git a/includes/specials/SpecialUserLogin.php 
b/includes/specials/SpecialUserLogin.php
index 28c68aa..493ae2a 100644
--- a/includes/specials/SpecialUserLogin.php
+++ b/includes/specials/SpecialUserLogin.php
@@ -154,7 +154,7 @@
}
 
protected function logAuthResult( $success, $status = null ) {
-   LoggerFactory::getInstance( 'authmanager-stats' )->info( 'Login 
attempt', [
+   LoggerFactory::getInstance( 'authevents' )->info( 'Login 
attempt', [
'event' => 'login',
'successful' => $success,
'status' => $status,

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

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

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

[MediaWiki-commits] [Gerrit] admin: move manybubbles to absented users - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: admin: move manybubbles to absented users
..


admin: move manybubbles to absented users

follow-up after blanking the key on I1b71f7d274689ec

Bug:T130113
Change-Id: I4bdcda7e3a202cfe4d9266b1cff345109a96d3f1
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 7e67e82..cc50a6d 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -4,7 +4,8 @@
 members: [ananthrk, avar, bsitu, cmcmahon, csalvia, diederik, edenhill, 
erik, gage,
   handrade, howief, jdouglas, jgonera, jsahleen, mah, maryana, 
mglaser, mvolz,
   mwalker, nimishg, rainman, ssmith, swalling, sumanah, werdna, 
rmoen,
-  johnflewis, marc, jkrauska, akumar, mnoushad, spage, tnegrin, 
msyed, kleduc]
+  johnflewis, marc, jkrauska, akumar, mnoushad, spage, tnegrin, 
msyed, kleduc,
+  manybubbles]
   wikidev:
 gid: 500
 description: container group for primary user groups.
@@ -882,7 +883,7 @@
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAACAQC4VTfdeTSboPh/af2zT6ov13A7kSygXEspRgq3/d2BWcNFvwIIpgtpCnHzA6YPvuhrjksw34jk3OvuuQoTyWYfuwql8Wu8O9f32WD4dhrKhB8Rchxj6rrncBrGS5k0HeLr+HMrknVSSXGH60GAFNRGYLCGA+zBXLAja+xROTipIRHOF0SLlsfpY04HTrEtKcKdj8n9BnGpbT7vFp+AmXeSHg9DwRn6yvem3x1ghBFdfg+XwmIqsV4wR2b7GLX2Y6+ei53657v2VxVsORdfn4yV7FcjeVYnwNxMOVMfYcFCz+1LU9ROPDw5sCqyDPMtyQPxExiprKNT9UHkUj7aqE61o4AF1vSb9AEdUpjGgiMl+Dr8Sd+T2sNOq5uFxtWSfuNqgGHY+nOYPmSHsxthwXc7CH7x/eBDefUZwTdwX8Vf/FYOAyiviknCzwLoAbkQwRjOwFZVqJMwRwRyMToKODTTgOM0s3g/5P8n5AYwTLt1I6dLeC3nju3lywyeWb6DkFOB48mg561AU1soTnSKffse7AtJ5Ye3GFEBKxBCRJUpc7EVesOhjTdcmBWYeSSmwxHCjiCact4tyk8ZiLuRqd3EZ0KFT/6W5d4csrJUwBDNWo+7M69gVIMn/zDCy3ZViGMsqPFfXSrpKw8k0WtPBTKdHFPJ0KoLERctzkrNkfBTVw==
 Ladsgroup @ prod]
 uid: 3182
   manybubbles:
-ensure: present
+ensure: absent
 gid: 500
 name: manybubbles
 realname: Nik Everett

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4bdcda7e3a202cfe4d9266b1cff345109a96d3f1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: Manybubbles 
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 "Undefined index: type" warning on LoginSignupSpecialPage - change (mediawiki/core)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix "Undefined index: type" warning on LoginSignupSpecialPage
..

Fix "Undefined index: type" warning on LoginSignupSpecialPage

When discarding form descriptors that do not have an equivalent
AuthenticationRequest field, do not assume the descriptor always
has a type.

Th warning was probably caused by I2a8cd4850.

Change-Id: Id1daee1e4954199fcb2077178e8f08d1ad3ae916
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/293664/1

diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index d8f5e66..3099a9b 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -854,7 +854,7 @@
!isset( $coreField['baseField'] )
|| !isset( 
$fieldInfo[$coreField['baseField']] )
) && !in_array( $fieldName, $specialFields, 
true )
-   && $coreField['type'] !== 'submit'
+   && ( !isset( $coreField['type'] ) || 
$coreField['type'] !== 'submit' )
) {
$coreFieldDescriptors[$fieldName] = null;
continue;

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

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

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

[MediaWiki-commits] [Gerrit] Add role for QuestyCaptcha - change (mediawiki/vagrant)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Add role for QuestyCaptcha
..

Add role for QuestyCaptcha

Add a role::questycaptcha that configures ConfirmEdit to use
QuestyCaptcha instead of FancyCaptcha.

Bug: T131459
Change-Id: Ia5e4708fa7702bcde12c2e51b1bf5b32d0d9029c
---
A puppet/modules/role/manifests/questycaptcha.pp
A puppet/modules/role/templates/questycaptcha/VagrantRoleQuestyCaptcha.wiki.erb
A puppet/modules/role/templates/questycaptcha/settings.php.erb
3 files changed, 80 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/62/293662/1

diff --git a/puppet/modules/role/manifests/questycaptcha.pp 
b/puppet/modules/role/manifests/questycaptcha.pp
new file mode 100644
index 000..50831a1
--- /dev/null
+++ b/puppet/modules/role/manifests/questycaptcha.pp
@@ -0,0 +1,17 @@
+# == Class: role::questycaptcha
+#
+# Provision ConfirmEdit and enable the QuestyCaptcha plugin.
+#
+class role::questycaptcha {
+require ::role::confirmedit
+include ::role::mediawiki
+
+mediawiki::settings { 'QuestyCaptcha':
+values   => template('role/questycaptcha/settings.php.erb'),
+priority => $::LOAD_LATER,
+}
+
+mediawiki::import::text { 'VagrantRoleQuestyCaptcha':
+content => 
template('role/questycaptcha/VagrantRoleQuestyCaptcha.wiki.erb'),
+}
+}
diff --git 
a/puppet/modules/role/templates/questycaptcha/VagrantRoleQuestyCaptcha.wiki.erb 
b/puppet/modules/role/templates/questycaptcha/VagrantRoleQuestyCaptcha.wiki.erb
new file mode 100644
index 000..ace4996
--- /dev/null
+++ 
b/puppet/modules/role/templates/questycaptcha/VagrantRoleQuestyCaptcha.wiki.erb
@@ -0,0 +1,3 @@
+'''QuestyCaptcha''' is a plugin for ConfirmEdit that presents questions from 
the LocalSettings configuration to protect certain actions on-wiki.
+
+See [https://www.mediawiki.org/wiki/Extension:QuestyCaptcha 
Extension:QuestyCaptcha] for more information.
diff --git a/puppet/modules/role/templates/questycaptcha/settings.php.erb 
b/puppet/modules/role/templates/questycaptcha/settings.php.erb
new file mode 100644
index 000..54674e2
--- /dev/null
+++ b/puppet/modules/role/templates/questycaptcha/settings.php.erb
@@ -0,0 +1,60 @@
+// Load QuestyCaptcha plugin
+wfLoadExtension( 'ConfirmEdit/QuestyCaptcha' );
+$wmvActiveExtensions[] = 'QuestyCaptcha';
+
+// Enable captcha for urls, account creations, and login failures
+$wgCaptchaTriggers['edit']  = false;
+$wgCaptchaTriggers['create']= false;
+$wgCaptchaTriggers['createtalk']= false;
+$wgCaptchaTriggers['addurl']= true;
+$wgCaptchaTriggers['createaccount'] = true;
+$wgCaptchaTriggers['badlogin']  = true;
+
+// Skip captcha for users with confirmed emails
+$wgGroupPermissions['emailconfirmed']['skipcaptcha'] = true;
+$ceAllowConfirmedEmail = true;
+
+// Set QuestyCaptcha as the active captcha
+$wgCaptchaClass = 'QuestyCaptcha';
+
+$wgCaptchaQuestions = array();
+$wgCaptchaQuestions[] = array(
+   'question' => 'What month is it at Greenwich Mean Time (GMT) right now? 
(https://tools.wmflabs.org/gmt/)',
+   'answer' => gmdate( 'F' ),
+);
+$wgCaptchaQuestions[] = array(
+   'question' => 'What day of the week is it at Greenwich Mean Time (GMT) 
right now? (https://tools.wmflabs.org/gmt/)',
+   'answer' => gmdate( 'l' ),
+);
+$wgCaptchaQuestions[] = array(
+   'question' => 'What week of the year is it at Greenwich Mean Time (GMT) 
right now? (https://tools.wmflabs.org/gmt/)',
+   'answer' => gmdate( 'W' ),
+);
+$wgCaptchaQuestions[] = array(
+   'question' => 'What day of the year is it at Greenwich Mean Time (GMT) 
right now? (https://tools.wmflabs.org/gmt/)',
+   'answer' => gmdate( 'z' ),
+);
+$wgCaptchaQuestions[] = array(
+   'question' => 'What hour in 24-hour format is it at Greenwich Mean Time 
(GMT) right now? (https://tools.wmflabs.org/gmt/)',
+   'answer' => gmdate( 'G' ),
+);
+
+$qcg = array(
+   'n' => array(
+   'zero', 'one', 'two', 'three', 'four',
+   'five', 'six', 'seven', 'eight', 'nine',
+   ),
+   'min' => array( mt_rand( 0, 9 ), mt_rand( 0, 9 ) ),
+   'max' => array( mt_rand( 0, 9 ), mt_rand( 0, 9 ) ),
+);
+$qcg['min'][] = min( $qcg['min'][0], $qcg['min'][1] );
+$qcg['max'][] = max( $qcg['max'][0], $qcg['max'][1] );
+
+$wgCaptchaQuestions[] = array(
+   'question' => "Which is smaller, {$qcg['n'][$qcg['min'][0]]} or 
{$qcg['n'][$qcg['min'][1]]}?",
+   'answer' => $qcg['n'][$qcg['min'][2]],
+);
+$wgCaptchaQuestions[] = array(
+   'question' => "Which is larger, {$qcg['n'][$qcg['max'][0]]} or 
{$qcg['n'][$qcg['max'][1]]}?",
+   'answer' => $qcg['n'][$qcg['max'][2]],
+);

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] Add langauge 'zgh' Standard Moroccan Amazigh - change (mediawiki/core)

[Ebe123 (Code Review)]

Ebe123 has uploaded a new change for review.

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

Change subject: Add langauge 'zgh' Standard Moroccan Amazigh
..

Add langauge 'zgh' Standard Moroccan Amazigh

This change adds the Standard Moroccan Amazigh language with ISO
639-3 code 'zgh' with 'kab' (Kabyle) fallback.

Bug: T137491
Change-Id: Idd13f92d7ae05cd47267558c8ff4fa368b701e24
---
M RELEASE-NOTES-1.28
M languages/data/Names.php
A languages/messages/MessagesZgh.php
3 files changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/293661/1

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 0e423d2..ad48e52 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -39,6 +39,9 @@
 regularly. Below only new and removed languages are listed, as well as
 changes to languages because of Phabricator reports.
 
+* Languages added:
+** (T137491) zgh (Standard Moroccan Amazigh)
+
 === Other changes in 1.28 ===
 * (T128697) Improved handling of large diffs.
 
diff --git a/languages/data/Names.php b/languages/data/Names.php
index a7de1f9..7e1b61a 100644
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -451,6 +451,7 @@
'yue' => '粵語', # Cantonese
'za' => 'Vahcuengh', # Zhuang
'zea' => 'Zeêuws', # Zeeuws/Zeaws
+   'zgh' => 'ⵜⴰⵎⴰⵣⵉⵖⵜ ⵜⴰⵏⴰⵡⴰⵢⵜ/tamaziɣt tanawayt', # Standard 
Moroccan Amazigh (multiple scripts - defaults to Neo-Tifinagh)
'zh' => '中文', # (Zhōng Wén) - Chinese
'zh-classical' => '文言', # Classical Chinese/Literary Chinese -- 
(see bug 8217)
'zh-cn' => "中文（中国大陆）\xE2\x80\x8E", # Chinese (PRC)
diff --git a/languages/messages/MessagesZgh.php 
b/languages/messages/MessagesZgh.php
new file mode 100644
index 000..720b591
--- /dev/null
+++ b/languages/messages/MessagesZgh.php
@@ -0,0 +1,11 @@
+https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$fallback = 'kab';

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

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

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

[MediaWiki-commits] [Gerrit] ores.wikimedia.org instead of ores.wmflabs.org - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: ores.wikimedia.org instead of ores.wmflabs.org
..


ores.wikimedia.org instead of ores.wmflabs.org

Change-Id: I56638742be6f1555da648470d02c3ee259f52853
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index a178681..0492de3 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -333,7 +333,7 @@
 if ( $wmgUseORES ) {
wfLoadExtension( 'ORES' );
$wgOresWikiId = 'testwiki';
-   $wgOresBaseUrl = 'https://ores.wmflabs.org/';
+   $wgOresBaseUrl = 'https://ores.wikimedia.org/';
 }
 
 if ( $wmgUseNewsletter ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56638742be6f1555da648470d02c3ee259f52853
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wmf-sunset-patch alter exception behaviour - change (wikimedia...civicrm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: wmf-sunset-patch alter exception behaviour
..

wmf-sunset-patch alter exception behaviour

This patch only partially applied & needs re-testing under 4.6.

Comments:

(FR #1238) Always throw an exception, do not display the fatal error page
Handle recursive data during exception handling  print_r is causing 
out-of-memory under PHP 5.4.4 when debug dumping data with recursive content,
so fall back to existing var_dump print variant, which can handle the 
recursion. Both code paths partially emulate var_export, sigh.:

Change-Id: I554ca3c5cbcd56a7552076b6bc6c82f87d8245f5
---
M CRM/Core/Error.php
M CRM/Core/TemporaryErrorScope.php
2 files changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/60/293660/1

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index 7d488ee..bea5d08 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -95,7 +95,7 @@
   /**
* If modeException == true, errors are raised as exception instead of 
returning civicrm_errors
*/
-  public static $modeException = NULL;
+  public static $modeException = true;
 
   /**
* Singleton function used to manage this object.
@@ -540,7 +540,7 @@
   public static function debug_var(
 $variable_name,
 $variable,
-$print = TRUE,
+$print = FALSE,
 $log = TRUE,
 $comp = ''
   ) {
diff --git a/CRM/Core/TemporaryErrorScope.php b/CRM/Core/TemporaryErrorScope.php
index 7f78496..e60965c 100644
--- a/CRM/Core/TemporaryErrorScope.php
+++ b/CRM/Core/TemporaryErrorScope.php
@@ -70,6 +70,13 @@
* Read the active error-handler settings
*/
   public static function getActive() {
+if ( !isset( $GLOBALS['_PEAR_default_error_mode'] ) ) {
+  return array(
+'_PEAR_default_error_mode' => null,
+'_PEAR_default_error_options' => null,
+'modeException' => CRM_Core_Error::$modeException,
+  );
+}
 return array(
   '_PEAR_default_error_mode' => $GLOBALS['_PEAR_default_error_mode'],
   '_PEAR_default_error_options' => $GLOBALS['_PEAR_default_error_options'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I554ca3c5cbcd56a7552076b6bc6c82f87d8245f5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] MediaWiki UI: Set `max-width` on `.mw-ui-input-inline` elements - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: MediaWiki UI: Set `max-width` on `.mw-ui-input-inline` elements
..


MediaWiki UI: Set `max-width` on `.mw-ui-input-inline` elements

Make sure that MediaWiki UI `.mw-ui-input-inline` elements are not
overflowing `width` of parent element. Useful for
input textfields on narrow screens.

Bug: T137108
Change-Id: I69f50ea5d57bd24ff6999b50297a276ca4f99ec2
---
M resources/src/mediawiki.ui/components/inputs.less
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki.ui/components/inputs.less 
b/resources/src/mediawiki.ui/components/inputs.less
index 579bd5f..f8d283a 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -108,6 +108,9 @@
 .mw-ui-input-inline {
display: inline-block;
width: auto;
+   // Make sure we limit `width` to parent element because
+   // in case of text `input` fields, `width: auto;` equals `size` 
attribute.
+   max-width: 100%;
 }
 
 // mw-ui-input-large

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69f50ea5d57bd24ff6999b50297a276ca4f99ec2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mw_rc_irc: flake8 - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: mw_rc_irc: flake8
..


mw_rc_irc: flake8

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

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




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

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

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

[MediaWiki-commits] [Gerrit] WMF adjustments over 4.7.8 branch - change (wikimedia...civicrm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: WMF adjustments over 4.7.8 branch
..

WMF adjustments over 4.7.8 branch

Includes patches due to be in 4.7.9 +
wmf: CRM-17157 allow more than 2 decimal places in currency
wmf: CRM-10700 use DELETE FROM instead of TRUNCATE
wmf: CRM-17158 block empty searches unless deliberate
wmf-sunset patch add extra columns to contribution recur tab
wmf-sunset patch skip process greetings on contact create
Merge from master :Include custom fields in default export
Don't create SQL function at runtime
Return more rows per query and use unbuffered query to manage the memory
Increase time out while doing exports
needs review CRM-17154 wmf-gr report actions improvement
quick hack to group safety
fix for dodgey date revert
To be upstreamed - further custom data perms issue
Revert 'add smartGroup title in select clause'

Change-Id: If961ca34f76135936db54c882a6999daff4a1931
---
M CRM/ACL/BAO/Cache.php
M CRM/ACL/Page/ACL.php
M CRM/ACL/Page/ACLBasic.php
M CRM/Activity/Form/Activity.php
M CRM/Activity/Form/Task/SearchTaskHookSample.php
M CRM/Admin/Form/LocationType.php
M CRM/Admin/Form/PaymentProcessor.php
M CRM/Admin/Form/PaymentProcessorType.php
M CRM/Admin/Form/Setting/Date.php
M CRM/Admin/Form/Setting/Miscellaneous.php
M CRM/Badge/BAO/Layout.php
M CRM/Campaign/BAO/Survey.php
M CRM/Case/BAO/Case.php
M CRM/Case/Form/Activity.php
M CRM/Case/Form/Task/SearchTaskHookSample.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/Contact/Utils.php
M CRM/Contact/BAO/GroupContactCache.php
M CRM/Contact/BAO/Query.php
M CRM/Contact/BAO/Relationship.php
M CRM/Contact/Form/Contact.php
M CRM/Contact/Form/Edit/Address.php
M CRM/Contact/Form/Search/Custom/ActivitySearch.php
M CRM/Contact/Form/Task/PDFLetterCommon.php
M CRM/Contact/Form/Task/SMSCommon.php
M CRM/Contact/Import/Parser/Contact.php
M CRM/Contact/Page/AJAX.php
M CRM/Contribute/BAO/Contribution.php
M CRM/Contribute/BAO/ContributionRecur.php
M CRM/Contribute/Form/CancelSubscription.php
M CRM/Contribute/Form/Contribution/Main.php
M CRM/Contribute/Form/Search.php
M CRM/Core/BAO/CustomField.php
M CRM/Core/BAO/CustomGroup.php
M CRM/Core/BAO/Dashboard.php
M CRM/Core/BAO/LabelFormat.php
M CRM/Core/BAO/LocationType.php
M CRM/Core/BAO/Navigation.php
M CRM/Core/BAO/PaperSize.php
M CRM/Core/BAO/PdfFormat.php
M CRM/Core/BAO/PrevNextCache.php
M CRM/Core/BAO/SchemaHandler.php
M CRM/Core/BAO/Tag.php
M CRM/Core/Config.php
M CRM/Core/Config/MagicMerge.php
M CRM/Core/DAO.php
M CRM/Core/Form.php
M CRM/Core/Menu.php
M CRM/Core/OptionValue.php
M CRM/Core/Payment.php
M CRM/Core/Payment/AuthorizeNet.php
M CRM/Core/Payment/Elavon.php
M CRM/Core/SelectValues.php
M CRM/Core/Session.php
M CRM/Core/TableHierarchy.php
M CRM/Core/xml/Menu/Admin.xml
M CRM/Custom/Form/CustomDataByType.php
M CRM/Custom/Form/Field.php
M CRM/Custom/Import/Form/DataSource.php
M CRM/Dedupe/BAO/Rule.php
M CRM/Dedupe/BAO/RuleGroup.php
M CRM/Dedupe/Finder.php
M CRM/Dedupe/Merger.php
M CRM/Event/BAO/Event.php
M CRM/Event/BAO/Participant.php
M CRM/Event/Form/Participant.php
M CRM/Event/Form/Registration/Confirm.php
M CRM/Event/Form/SelfSvcTransfer.php
M CRM/Event/Form/SelfSvcUpdate.php
M CRM/Event/Form/Task/Batch.php
M CRM/Event/Form/Task/ParticipantStatus.php
M CRM/Event/Form/Task/SearchTaskHookSample.php
M CRM/Export/BAO/Export.php
M CRM/Financial/BAO/ExportFormat/IIF.php
M CRM/Grant/BAO/Grant.php
M CRM/Grant/Form/Task/SearchTaskHookSample.php
M CRM/Import/Form/DataSource.php
M CRM/Logging/Reverter.php
M CRM/Mailing/Event/BAO/Queue.php
M CRM/Mailing/Event/BAO/TrackableURLOpen.php
M CRM/Mailing/Event/BAO/Unsubscribe.php
M CRM/Mailing/Form/Component.php
M CRM/Mailing/Form/Subscribe.php
M CRM/Member/BAO/MembershipPayment.php
M CRM/Member/BAO/MembershipStatus.php
M CRM/Member/BAO/Query.php
M CRM/Price/BAO/LineItem.php
M CRM/Price/BAO/PriceSet.php
M CRM/Report/BAO/ReportInstance.php
M CRM/Report/Form.php
M CRM/Report/Form/Contribute/Detail.php
M CRM/Report/Form/Contribute/Recur.php
M CRM/Report/Form/Instance.php
M CRM/Report/Info.php
M CRM/Report/Page/InstanceList.php
M CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
M CRM/Utils/ReCAPTCHA.php
M CRM/Utils/Recent.php
M CRM/Utils/Rule.php
M ang/crmMailing.css
M ang/crmMailing/BlockReview.html
M ang/crmMailing/BlockReview.js
M ang/crmMailing/EditMailingCtrl/2step.html
M ang/crmMailing/EditMailingCtrl/wizard.html
M ang/crmMailing/EditMailingCtrl/workflow.html
M ang/crmMailingAB/BlockMailing.html
M api/v3/Job.php
M api/v3/utils.php
M bin/ContributionProcessor.php
M bin/regen.sh
M bin/setup.conf
M bin/setup.lib.sh
M composer.json
M composer.lock
M css/civicrm.css
M css/civicrmNavigation.css
D drupal/TESTING.md
D drupal/modules/civicrm_member_roles/TESTING.md
D drupal/modules/civicrm_member_roles/phpunit.xml.dist
D 
drupal/modules/civicrm_member_roles/tests/phpunit/CiviDrupalMemberRoles/CronTest.php
M 

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...SpamBlacklist)

[jenkins-bot (Code Review)]

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

Change subject: Fix file permissions
..


Fix file permissions

Change-Id: I19de3ded6b17cdde7edce45ba3dee4dccfd29725
(cherry picked from commit 0d9494cc452444b4d3d0d80638d9e8ee06cfff5d)
---
M BaseBlacklist.php
M EmailBlacklist.php
M SpamBlacklistHooks.php
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/BaseBlacklist.php b/BaseBlacklist.php
old mode 100755
new mode 100644
diff --git a/EmailBlacklist.php b/EmailBlacklist.php
old mode 100755
new mode 100644
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19de3ded6b17cdde7edce45ba3dee4dccfd29725
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
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 Wikidata - Fix uncaught exception in ArticlePlaceholder - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: Update Wikidata - Fix uncaught exception in ArticlePlaceholder
..


Update Wikidata - Fix uncaught exception in ArticlePlaceholder

Bug: T137500
Change-Id: Ie552c0f844592325511db6caee82dddaaca3d87f
---
M composer.lock
M extensions/ArticlePlaceholder/includes/SearchHookHandler.php
M vendor/composer/installed.json
3 files changed, 77 insertions(+), 66 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 28f8356..3c1721d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -780,7 +780,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/ArticlePlaceholder;,
-"reference": "6d5bdfccfb669b682d94b0705d346877a59fe42b"
+"reference": "8bc848e7c0a20a92e3b9be53dfef91347e3563c1"
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.2",
@@ -815,7 +815,7 @@
 "issues": "https://phabricator.wikimedia.org/;,
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2016-06-09 19:19:59"
+"time": "2016-06-09 23:18:58"
 },
 {
 "name": "propertysuggester/property-suggester",
diff --git a/extensions/ArticlePlaceholder/includes/SearchHookHandler.php 
b/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
index bc673d4..acb8a27 100644
--- a/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
+++ b/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
@@ -140,42 +140,53 @@
 * @param string $term
 */
public function addToSearch( SpecialSearch $specialSearch, OutputPage 
$output, $term ) {
-   $searchResult = $this->getSearchResults( $term );
+   $termSearchResults = $this->getTermSearchResults( $term );
 
-   if ( $searchResult !== '' ) {
-   $output->addWikiText(
-   '==' .
-   $output->msg( 
'articleplaceholder-search-header' )->text() .
-   '=='
-   );
+   if ( !empty( $termSearchResults ) ) {
+   $renderedTermSearchResults = 
$this->renderTermSearchResults( $termSearchResults );
 
-   $output->addWikiText( $searchResult );
+   if ( $renderedTermSearchResults !== '' ) {
+   $output->addWikiText(
+   '==' .
+   $output->msg( 
'articleplaceholder-search-header' )->text() .
+   '=='
+   );
+
+   $output->addWikiText( 
$renderedTermSearchResults );
+   }
}
}
 
/**
 * @param string $term
 *
-* @return string Wikitext
+* @return TermSearchResult[]
 */
-   private function getSearchResults( $term ) {
-   $wikitext = '';
-   $entityIdSearchResult = [];
+   private function getTermSearchResults( $term ) {
+   $termSearchResults = [];
 
foreach ( $this->searchEntities( $term ) as $searchResult ) {
$entityId = 
$searchResult->getEntityId()->getSerialization();
 
-   $entityIdSearchResult[ $entityId ] = $searchResult;
+   $termSearchResults[ $entityId ] = $searchResult;
}
 
-   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$entityIdSearchResult ) );
+   return $termSearchResults;
+   }
 
-   if ( $notableEntityIds === null ) {
-   return '';
-   }
+   /**
+* Render search results, filtered for notability.
+*
+* @param TermSearchResult[] $termSearchResults
+*
+* @return string Wikitext
+*/
+   private function renderTermSearchResults( array $termSearchResults ) {
+   $wikitext = '';
+   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$termSearchResults ) );
 
foreach ( $notableEntityIds as $entityId ) {
-   $result = $this->renderTermSearchResult( 
$entityIdSearchResult[ $entityId ] );
+   $result = $this->renderTermSearchResult( 
$termSearchResults[ $entityId ] );
 
$wikitext .= ''
. $result
@@ -228,7 +239,7 @@
 * TODO: instead of api request database?
 * @param string[] $entityIds
 *
-* @return string[]|null $notableEntityIds
+* 

[MediaWiki-commits] [Gerrit] Fix file permissions on SearchInputWidget.php - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix file permissions on SearchInputWidget.php
..


Fix file permissions on SearchInputWidget.php

Change-Id: I0c7b149a0c62f02b655e53c255ba01a92fc6c4a8
(cherry picked from commit 63b562b3f5021b139754c1b2b052dd9bbc71a7ae)
---
M includes/widget/SearchInputWidget.php
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/includes/widget/SearchInputWidget.php 
b/includes/widget/SearchInputWidget.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c7b149a0c62f02b655e53c255ba01a92fc6c4a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Roundtrip 2.0.0 content - change (mediawiki...parsoid)

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review.

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

Change subject: Roundtrip 2.0.0 content
..

Roundtrip 2.0.0 content

 * This is a follow up to b692ba97.

 * Applies data-mw passed in a pagebundle, in a backwards compatible
   way.

 * Adds a mocha test that could have been part of 06e08a00, to emphasize
   when data-mw isn't being applied.

Change-Id: I834a6640eb982d760cdbba0c64d9ce48025bc65d
---
M bin/parse.js
M bin/roundtrip-test.js
M lib/api/apiUtils.js
M lib/api/routes.js
M tests/mocha/api.js
M tests/rttest.localsettings.js
6 files changed, 112 insertions(+), 20 deletions(-)


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

diff --git a/bin/parse.js b/bin/parse.js
index a326223..852cecd 100755
--- a/bin/parse.js
+++ b/bin/parse.js
@@ -102,7 +102,7 @@
'boolean': false,
'default': false,
},
-   'contentversion': {
+   'contentVersion': {
description: 'The acceptable content version.',
'boolean': false,
'default': ParserEnv.prototype.contentVersion,
@@ -219,8 +219,8 @@
env.pageBundle = argv.pagebundle;
 
// The content version to output
-   if (argv.contentversion) {
-   env.setContentVersion(argv.contentversion);
+   if (argv.contentVersion) {
+   env.setContentVersion(argv.contentVersion);
}
 
if (!argv.wt2html) {
diff --git a/bin/roundtrip-test.js b/bin/roundtrip-test.js
index 28c1d91..cc1aca2 100755
--- a/bin/roundtrip-test.js
+++ b/bin/roundtrip-test.js
@@ -8,10 +8,13 @@
 var Promise = require('../lib/utils/promise.js');
 var Util = require('../lib/utils/Util.js').Util;
 var DU = require('../lib/utils/DOMUtils.js').DOMUtils;
+var apiUtils = require('../lib/api/apiUtils');
 var ParsoidConfig = require('../lib/config/ParsoidConfig.js').ParsoidConfig;
 var Diff = require('../lib/utils/Diff.js').Diff;
 
 var gzip = Promise.promisify(require('zlib').gzip, false);
+
+var defaultContentVersion = '1.2.1';
 
 
 function displayDiff(type, count) {
@@ -382,8 +385,14 @@
var newBody = domino.createDocument(data.newHTML.body).body;
 
// Merge pagebundles so that HTML nodes can be compared and diff'ed.
-   DU.applyPageBundle(oldBody.ownerDocument, { parsoid: data.oldDp.body });
-   DU.applyPageBundle(newBody.ownerDocument, { parsoid: data.newDp.body });
+   DU.applyPageBundle(oldBody.ownerDocument, {
+   parsoid: data.oldDp.body,
+   mw: data.oldMw && data.oldMw.body,
+   });
+   DU.applyPageBundle(newBody.ownerDocument, {
+   parsoid: data.newDp.body,
+   mw: data.newMw && data.newMw.body,
+   });
 
// Strip 'mw..' ids from the DOMs. This matters for 2 scenarios:
// * reduces noise in visual diffs
@@ -477,6 +486,9 @@
httpOptions.body.scrub_wikitext = true;
} else {  // wt2html
uri += 'wikitext/to/pagebundle/' + options.title;
+   httpOptions.headers = {
+   Accept: apiUtils.pagebundleContentType(null, 
options.contentVersion),
+   };
}
httpOptions.uri = uri;
 
@@ -520,6 +532,7 @@
return parsoidPost(profile, options).then(function(body) {
data.newHTML = body.html;
data.newDp = body['data-parsoid'];
+   data.newMw = body['data-mw'];
return checkIfSignificant(offsets, data);
});
 }
@@ -573,6 +586,7 @@
var parsoidOptions = {
uri: uri + domain + '/v3/',
title: encodeURIComponent(title),
+   contentVersion: options.contentVersion || defaultContentVersion,
};
 
var data = {};
@@ -597,6 +611,7 @@
}).then(function(body) {
data.oldHTML = body.html;
data.oldDp = body['data-parsoid'];
+   data.oldMw = body['data-mw'];
// Now, request the wikitext for the obtained HTML
var opts = Object.assign({
html2wt: true,
@@ -605,6 +620,7 @@
html: data.oldHTML,
original: {
'data-parsoid': data.oldDp,
+   'data-mw': data.oldMw,
wikitext: { body: data.oldWt, },
},
},
@@ -630,6 +646,7 @@
html: newDocument.outerHTML,
original: {
'data-parsoid': data.oldDp,
+   'data-mw': data.oldMw,
wikitext: { body: data.oldWt 

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...Renameuser)

[jenkins-bot (Code Review)]

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

Change subject: Fix file permissions
..


Fix file permissions

Change-Id: Ib4dc25aa9604f441a657de9764e8dfec5e0455bd
(cherry picked from commit c979bd8f3c294781d4994713fc7066efd3d1)
---
M Renameuser.php
M RenameuserSQL.php
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/Renameuser.php b/Renameuser.php
old mode 100755
new mode 100644
diff --git a/RenameuserSQL.php b/RenameuserSQL.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4dc25aa9604f441a657de9764e8dfec5e0455bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
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 file permissions - change (mediawiki...ConfirmEdit)

[jenkins-bot (Code Review)]

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

Change subject: Fix file permissions
..


Fix file permissions

Change-Id: If4855e3a6d7d35dd94093108f4da3bd1362f6827
(cherry picked from commit 0ebe3f7a28b4b3b94ae13cc378ace04b1e827c2c)
---
M ConfirmEdit.php
M SimpleCaptcha/Captcha.php
M includes/CaptchaStore.php
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/ConfirmEdit.php b/ConfirmEdit.php
old mode 100755
new mode 100644
diff --git a/SimpleCaptcha/Captcha.php b/SimpleCaptcha/Captcha.php
old mode 100755
new mode 100644
diff --git a/includes/CaptchaStore.php b/includes/CaptchaStore.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4855e3a6d7d35dd94093108f4da3bd1362f6827
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
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 file permissions on SearchInputWidget.php - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix file permissions on SearchInputWidget.php
..

Fix file permissions on SearchInputWidget.php

Change-Id: I0c7b149a0c62f02b655e53c255ba01a92fc6c4a8
(cherry picked from commit 63b562b3f5021b139754c1b2b052dd9bbc71a7ae)
---
M includes/widget/SearchInputWidget.php
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/293657/1

diff --git a/includes/widget/SearchInputWidget.php 
b/includes/widget/SearchInputWidget.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c7b149a0c62f02b655e53c255ba01a92fc6c4a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Revert "Revert "Set Tamil projects to use uca-ta collation"" - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Revert "Revert "Set Tamil projects to use uca-ta collation""
..


Revert "Revert "Set Tamil projects to use uca-ta collation""

This reverts commit c70f9852f151a3b1e2b7dcfee0b986ca02a2312c.

2f61ae1b set uca-ta collation for Tamil projects, but MediaWiki core
didn't support this collation at integration time. We so needed to
temporarily revert it to fix a fatal error on ta.* categories.

Bug: T75453
Depends-On: Ic9bb3658868917790aa770c99f8f280f2dd3eace
Change-Id: I3636acd8522f3c1f710037cd08457e5a6cb277f6
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 81d9876..4b1b4b3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13798,6 +13798,12 @@
'skwiki' => 'uca-sk', // [[w:sk:Special:PermaLink/5785371]]
'svwiki' => 'uca-sv', // T47446
'svwikisource' => 'uca-sv@collation=standard', // T48058
+   'tawiki' => 'uca-ta', // T75453
+   'tawikibooks' => 'uca-ta', // T75453
+   'tawikinews' => 'uca-ta', // T75453
+   'tawikiquote' => 'uca-ta', // T75453
+   'tawikisource' => 'uca-ta', // T75453
+   'tawiktionary' => 'uca-ta', // T75453
'thwikibooks' => 'uca-default', // T50097
'thwikinews' => 'uca-default', // T50097
'thwiki' => 'uca-default', // T50097

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3636acd8522f3c1f710037cd08457e5a6cb277f6
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Kaldari 
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 error out on show="" - change (mediawiki...Kartographer)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Don't error out on show=""
..

Don't error out on show=""

Bug: T137430
Change-Id: I91d5ea565c497873ba045f107e3f6569eea4bbe7
---
M includes/Tag/TagHandler.php
M tests/parserTests.txt
2 files changed, 23 insertions(+), 1 deletion(-)


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

diff --git a/includes/Tag/TagHandler.php b/includes/Tag/TagHandler.php
index e7134e9..033db3a 100644
--- a/includes/Tag/TagHandler.php
+++ b/includes/Tag/TagHandler.php
@@ -173,7 +173,7 @@
 
$this->groupName = $this->getText( 'group', null, 
'/^[a-zA-Z0-9]+$/' );
 
-   $text = $this->getText( 'show', null, 
'/^[a-zA-Z0-9]+(\s*,\s*[a-zA-Z0-9]+)*$/' );
+   $text = $this->getText( 'show', null, 
'/^(|[a-zA-Z0-9]+(\s*,\s*[a-zA-Z0-9]+)*)$/' );
if ( $text !== null ) {
$this->showGroups = array_map( 'trim', explode( ',', 
$text ) );
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 784e766..8600ea6 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -253,3 +253,25 @@
 A
 
 !! end
+
+!! test
+Groups
+!! config
+wgKartographerWikivoyageMode=true
+!! input
+
+
+
+
+
+
+!! result
+0°0′0″N 0°0′0″E
+0°0′0″N 0°0′0″E
+0°0′0″N 0°0′0″E
+0°0′0″N 
0°0′0″E
+0°0′0″N 
0°0′0″E
+
+maplink: Attribute "show" has an 
invalid value
+
+!! end

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

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

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

[MediaWiki-commits] [Gerrit] admin: move manybubbles to absented users - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: admin: move manybubbles to absented users
..

admin: move manybubbles to absented users

follow-up after blanking the key on I1b71f7d274689ec

Bug:T130113
Change-Id: I4bdcda7e3a202cfe4d9266b1cff345109a96d3f1
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/293656/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index e5130b7..d452b24 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -4,7 +4,8 @@
 members: [ananthrk, avar, bsitu, cmcmahon, csalvia, diederik, edenhill, 
erik, gage,
   handrade, howief, jdouglas, jgonera, jsahleen, mah, maryana, 
mglaser, mvolz,
   mwalker, nimishg, rainman, ssmith, swalling, sumanah, werdna, 
rmoen,
-  johnflewis, marc, jkrauska, akumar, mnoushad, spage, tnegrin, 
msyed, kleduc]
+  johnflewis, marc, jkrauska, akumar, mnoushad, spage, tnegrin, 
msyed, kleduc,
+  manybubbles]
   wikidev:
 gid: 500
 description: container group for primary user groups.
@@ -867,7 +868,7 @@
 krinkle @ krinkle-mbp003]
 uid: 2008
   manybubbles:
-ensure: present
+ensure: absent
 gid: 500
 name: manybubbles
 realname: Nik Everett

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

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

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

[MediaWiki-commits] [Gerrit] Remove Nik Everett's production access - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Remove Nik Everett's production access
..


Remove Nik Everett's production access

Per private email, see:
https://phabricator.wikimedia.org/T130131#2332303

Bug: T130113
Change-Id: I1b71f7d274689ec637dfb1fb3623105b0de201d8
---
M modules/admin/data/data.yaml
1 file changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 1135b07..7e67e82 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -48,7 +48,7 @@
 description: replaces 'mortals' for software deployment
 members: [aaron, dr0ptp4kt, anomie, aude, awight, awjrichards, bd808,
   brion, cscott, csteipp, demon, ebernhardson, esanders, gilles,
-  gjg, gwicke, halfak, hashar, hoo, kaldari, kartik, khorn, 
krinkle, manybubbles,
+  gjg, gwicke, halfak, hashar, hoo, kaldari, kartik, khorn, 
krinkle,
   maxsem, mattflaschen, marktraceur, milimetric, mlitn, andyrussg,
   nikerabbit, reedy, robla, ssastry, tomasz, yurik,
   tgr, phuedx, bsimmers, ejegg, twentyafterfour, legoktm, catrope, 
krenair,
@@ -90,7 +90,7 @@
   elasticsearch-roots:
 gid: 709
 description: manage elasticsearch nodes
-members: [manybubbles, demon, ebernhardson, dcausse, tomasz, gehel]
+members: [demon, ebernhardson, dcausse, tomasz, gehel]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   dataset-admins:
 gid: 710
@@ -173,7 +173,7 @@
   logstash-roots:
 gid: 722
 description: users with root access on logstash nodes (rt 6366, 6896)
-members: [aaron, bd808, manybubbles, demon, reedy]
+members: [aaron, bd808, demon, reedy]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   statistics-web-users:
 gid: 724
@@ -886,8 +886,7 @@
 gid: 500
 name: manybubbles
 realname: Nik Everett
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCvG6VYTnUwHQyLYFUv0g1EUfp+OByn2agzc6Y3oSj9JhjYT2zbzpfquCB5aL8mLv4A1J8iKVwWHGeib44QY8uggX/66xdRrvEZ6QaM3GkVehDS4MpKl8m61rnVfITSxmPg0n83pBDhKfXPzE6vzchBA7ZhonccObwpcr4jvpUrvFcgWDrhjbC+YeJ1YKz5lm6IPW0yeY6Ni/0LRNbIUkv0Bj1epsFqBPORO9GoWc9ydV3rDLJJGJJ5YhOlbFSjc6nblUDMwBToxov+5icnT22wNdlHizGPUafluw6Wf790Bls3Znoje0qY5KgC7zOoQWWR+3k1kZVpuOIVQU6U3/uP
-manybubbles@manybubbles-laptop]
+ssh_keys: []
 uid: 3304
   maxsem:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b71f7d274689ec637dfb1fb3623105b0de201d8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Greg Grossmeier 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Greg Grossmeier 
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 file permissions on SearchInputWidget.php - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix file permissions on SearchInputWidget.php
..


Fix file permissions on SearchInputWidget.php

Change-Id: I0c7b149a0c62f02b655e53c255ba01a92fc6c4a8
---
M includes/widget/SearchInputWidget.php
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/includes/widget/SearchInputWidget.php 
b/includes/widget/SearchInputWidget.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c7b149a0c62f02b655e53c255ba01a92fc6c4a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable Flow beta feature on frwiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Enable Flow beta feature on frwiki
..


Enable Flow beta feature on frwiki

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 758180c..81d9876 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15657,6 +15657,7 @@
'mediawikiwiki' => true,
'bswiki' => true,
'cawiki' => true, // T120829
+   'frwiki' => true, // T136684
'frwikisource' => true, // T132914
'frwikivoyage' => true, // T135702
'nowiki' => true, // T132693

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcb3ed86900fd65c8dc374351538b0281da740dc
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...Renameuser)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix file permissions
..

Fix file permissions

Change-Id: Ib4dc25aa9604f441a657de9764e8dfec5e0455bd
(cherry picked from commit c979bd8f3c294781d4994713fc7066efd3d1)
---
M Renameuser.php
M RenameuserSQL.php
2 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/Renameuser.php b/Renameuser.php
old mode 100755
new mode 100644
diff --git a/RenameuserSQL.php b/RenameuserSQL.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4dc25aa9604f441a657de9764e8dfec5e0455bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...SpamBlacklist)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix file permissions
..

Fix file permissions

Change-Id: I19de3ded6b17cdde7edce45ba3dee4dccfd29725
(cherry picked from commit 0d9494cc452444b4d3d0d80638d9e8ee06cfff5d)
---
M BaseBlacklist.php
M EmailBlacklist.php
M SpamBlacklistHooks.php
3 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist 
refs/changes/54/293654/1

diff --git a/BaseBlacklist.php b/BaseBlacklist.php
old mode 100755
new mode 100644
diff --git a/EmailBlacklist.php b/EmailBlacklist.php
old mode 100755
new mode 100644
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19de3ded6b17cdde7edce45ba3dee4dccfd29725
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...ConfirmEdit)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix file permissions
..

Fix file permissions

Change-Id: If4855e3a6d7d35dd94093108f4da3bd1362f6827
(cherry picked from commit 0ebe3f7a28b4b3b94ae13cc378ace04b1e827c2c)
---
M ConfirmEdit.php
M SimpleCaptcha/Captcha.php
M includes/CaptchaStore.php
3 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
old mode 100755
new mode 100644
diff --git a/SimpleCaptcha/Captcha.php b/SimpleCaptcha/Captcha.php
old mode 100755
new mode 100644
diff --git a/includes/CaptchaStore.php b/includes/CaptchaStore.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4855e3a6d7d35dd94093108f4da3bd1362f6827
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Consume pending queue to database - change (wikimedia...SmashPig)

[jenkins-bot (Code Review)]

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

Change subject: Consume pending queue to database
..


Consume pending queue to database

Writes messages from an AtomicReadBuffer to a PDO backend, lightly
validating on the way in.

Uses QueueConsumer to handle dequeue loop and damaged queue.

Bug: T133197
Change-Id: I4209d8ed96ef476f9031a7f266740292447418a7
---
M Core/UtcDate.php
A Maintenance/ConsumePendingQueue.php
M SmashPig.yaml
3 files changed, 161 insertions(+), 4 deletions(-)

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



diff --git a/Core/UtcDate.php b/Core/UtcDate.php
index ad18e80..85184a2 100644
--- a/Core/UtcDate.php
+++ b/Core/UtcDate.php
@@ -6,13 +6,27 @@
 use SmashPig\Core\Logging\Logger;
 
 class UtcDate {
+   // FIXME: Should probably let the exception bubble up instead of setting
+   // dates to null.
public static function getUtcTimestamp( $dateString, $timeZone = 'UTC' 
) {
try {
$obj = new DateTime( $dateString, new DateTimeZone( 
$timeZone ) );
return $obj->getTimestamp();
} catch ( Exception $ex ) {
-   Logger::warning( 'Caught date exception: ' . 
$ex->getMessage(), $dateString );
+   Logger::warning( 'Could not get timestamp from string', 
$dateString, $ex );
return null;
}
}
+
+   /**
+* Format a UTC timestamp for database insertion
+* @param int $timestamp
+* @param string $format optional time format
+* @return string
+* @throws Exception
+*/
+   public static function getUtcDatabaseString( $timestamp, $format = 
'YmdHis') {
+   $obj = new DateTime( '@' . $timestamp, new DateTimeZone( 'UTC' 
) );
+   return $obj->format( $format );
+   }
 }
diff --git a/Maintenance/ConsumePendingQueue.php 
b/Maintenance/ConsumePendingQueue.php
new file mode 100644
index 000..2e54dcb
--- /dev/null
+++ b/Maintenance/ConsumePendingQueue.php
@@ -0,0 +1,118 @@
+addOption( 'queue', 'queue name to consume from', 
'pending-atomic' );
+   $this->addOption( 'time-limit', 'Try to keep execution under 
 seconds', 60, 't' );
+   $this->addOption( 'max-messages', 'At most consume  
messages', 0, 'm' );
+   }
+
+   /**
+* Do the actual work of the script.
+*/
+   public function execute() {
+   $config = Context::get()->getConfiguration();
+   $this->pendingDatabase = $config->object( 
'data-store/pending-db' );
+
+   $basePath = 'maintenance/consume-pending/';
+   $consumer = new QueueConsumer(
+   $this->getOption( 'queue' ),
+   array( $this, 'storeMessage' ),
+   $this->getOptionOrConfig( 'time-limit', $basePath . 
'time-limit' ),
+   $this->getOptionOrConfig( 'max-messages', $basePath . 
'message-limit' ),
+   'pending-damaged'
+   );
+
+   $startTime = time();
+   $messageCount = $consumer->dequeueMessages();
+
+   $elapsedTime = time() - $startTime;
+   Logger::info(
+   "Processed $messageCount pending messages in 
$elapsedTime seconds."
+   );
+   }
+
+   /**
+* Build and insert a database record from a pending queue message
+*
+* @param array $message
+* @throws SmashPigException
+*/
+   public function storeMessage( $message ) {
+   $this->validateMessage( $message );
+
+   $dbRecord = array();
+
+   // These fields (and date) have their own columns in the 
database
+   // Copy the values from the message to the record
+   $indexedFields = array(
+   'gateway', 'gateway_account', 'gateway_txn_id', 
'order_id'
+   );
+
+   foreach ( $indexedFields as $fieldName ) {
+   if ( isset( $message[$fieldName] ) ) {
+   $dbRecord[$fieldName] = $message[$fieldName];
+   }
+   }
+
+   $dbRecord['date'] = UtcDate::getUtcDatabaseString( 
$message['date'] );
+   // Dump the whole message into a text column
+   $dbRecord['message'] = json_encode( $message );
+
+   $fieldList = implode( ',', array_keys( $dbRecord ) );
+
+   // Build a list of parameter names for safe db insert
+   // Same as the field list, but each parameter is prefixed with 
a colon
+   $paramList = ':' . implode( ', :', array_keys( $dbRecord ) );
+
+   $insert = "INSERT INTO pending ( $fieldList ) values ( 
$paramList );";
+   $prepared = 

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...SpamBlacklist)

[jenkins-bot (Code Review)]

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

Change subject: Fix file permissions
..


Fix file permissions

Change-Id: I19de3ded6b17cdde7edce45ba3dee4dccfd29725
---
M BaseBlacklist.php
M EmailBlacklist.php
M SpamBlacklistHooks.php
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/BaseBlacklist.php b/BaseBlacklist.php
old mode 100755
new mode 100644
diff --git a/EmailBlacklist.php b/EmailBlacklist.php
old mode 100755
new mode 100644
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19de3ded6b17cdde7edce45ba3dee4dccfd29725
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...ConfirmEdit)

[jenkins-bot (Code Review)]

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

Change subject: Fix file permissions
..


Fix file permissions

Change-Id: If4855e3a6d7d35dd94093108f4da3bd1362f6827
---
M ConfirmEdit.php
M SimpleCaptcha/Captcha.php
M includes/CaptchaStore.php
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/ConfirmEdit.php b/ConfirmEdit.php
old mode 100755
new mode 100644
diff --git a/SimpleCaptcha/Captcha.php b/SimpleCaptcha/Captcha.php
old mode 100755
new mode 100644
diff --git a/includes/CaptchaStore.php b/includes/CaptchaStore.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4855e3a6d7d35dd94093108f4da3bd1362f6827
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...Renameuser)

[jenkins-bot (Code Review)]

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

Change subject: Fix file permissions
..


Fix file permissions

Change-Id: Ib4dc25aa9604f441a657de9764e8dfec5e0455bd
---
M Renameuser.php
M RenameuserSQL.php
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/Renameuser.php b/Renameuser.php
old mode 100755
new mode 100644
diff --git a/RenameuserSQL.php b/RenameuserSQL.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4dc25aa9604f441a657de9764e8dfec5e0455bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove HiddenPrefs hack for turning off cross-wiki notificat... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Remove HiddenPrefs hack for turning off cross-wiki notifications
..


Remove HiddenPrefs hack for turning off cross-wiki notifications

Obsolete after I6208a12d4.

Bug: T135266
Change-Id: I56d9e9e558eb1c51f305dcc5bbc575a5c3bab763
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b945456..7082fea 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2692,11 +2692,6 @@
if ( $wmgEchoCrossWikiByDefault ) {
$wgDefaultUserOptions['echo-cross-wiki-notifications'] 
= 1;
}
-   } else {
-   // Neither Beta nor normal.  Hide preference and force to false.
-   $wgEchoUseCrossWikiBetaFeature = false;
-   $wgDefaultUserOptions['echo-cross-wiki-notifications'] = 0;
-   $wgHiddenPrefs[] = 'echo-cross-wiki-notifications';
}
 
// Whether to show the footer notice

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56d9e9e558eb1c51f305dcc5bbc575a5c3bab763
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Do not import Intuition from toolbox PHP files - change (labs...heritage)

[Code Review]

Jean-Frédéric has uploaded a new change for review.

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

Change subject: Do not import Intuition from toolbox PHP files
..

Do not import Intuition from toolbox PHP files

The Toolbox files were failing because they could not load Intuition.

Easiest solution is to have them include the api/common.php file
which correctly imports Intution, database, etc.

Also replace some old references to Toolserver,
and remove trailing spaces throughout.

Note: index.php is actually a nice page ; we could deprecate
  the temporary html/index.html

Change-Id: I9356febc4800989626bcab7493f45d811140da84
---
M toolbox/index.php
M toolbox/search.php
M toolbox/statistics.php
3 files changed, 39 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/51/293651/1

diff --git a/toolbox/index.php b/toolbox/index.php
index df3813e..0f251b0 100644
--- a/toolbox/index.php
+++ b/toolbox/index.php
@@ -1,13 +1,6 @@
  'MonumentsAPI', // name of your main text-domain here
-'globalfunctions' => true, // defines _(), _e() and _g() as shortcut for 
$I18N->msg( .. )
-);
-$I18N = new TsIntuition( $opts );
+require_once( dirname( dirname( __FILE__ ) ) . '/api/common.php' );
 
 ?>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>
 
@@ -23,8 +16,8 @@


Wlm Toolbox
-   A set of tools related to Wiki Loves 
Monuments  
-
+   A set of tools related to Wiki Loves 
Monuments
+   



@@ -35,12 +28,12 @@



-
+   

Home
this is only a starting point
-
-   
+   
+   

  
 
diff --git a/toolbox/search.php b/toolbox/search.php
index ef8fcb5..8294226 100644
--- a/toolbox/search.php
+++ b/toolbox/search.php
@@ -7,29 +7,29 @@
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
 
 Wiki Loves Monuments Toolbox
-   
-
+
+
 
 
-   
+
 
 
 

 

-   
+
 

  Wlm Toolbox
-   A set of tools related to Wiki Loves 
Monuments  
- 
-
+   A set of tools related to Wiki Loves 
Monuments
+
+   
 

 
 
- 
+
 
   
Home
@@ -38,15 +38,15 @@
Search Form

   
-   
-
- 
+ 
+
+
 
 
 
 
 Search Monuments
-http://toolserver.org/~erfgoed/api/api.php;>
+https://tools.wmflabs.org/heritage/api/api.php;>


 
@@ -93,7 +93,7 @@
 ?>


-   
+



@@ -186,39 +186,39 @@



-   
+
 
 
 
- 
+
 
 
 
  function displayVals() {
- /* get and convert values for on-the-fly query string */ 
+ /* get and convert values for on-the-fly query string */
   var format = "&format=" + $("#format").val();
   var props =  "&props="+ ($("#props-filler").val() || []).join('|');
-   var countries = ($("#country-filler").val() || 
[]).join('|').toLowerCase(); 
+   var countries = ($("#country-filler").val() || 
[]).join('|').toLowerCase();
   var srcountry = "&srcountry=" + countries;
   var srname = ($("#srname").val() != "") ? "&srname=" + 
$("#srname").val() : "";
   var srid = ($("#srid").val() != "") ? "&srid=" + $("#srid").val() : "";
   var sraddress = ($("#sraddress").val() != "") ? "&sraddress=" + 
$("#sraddress").val() : "";
   var srmunicipality = ($("#srmunicipality").val() != "") ? 
"&srmunicipality=" + $("#srmunicipality").val() : "";
   var srwithoutimage = ($("#srwithoutimage:checked").val() == 1) ?  
"&srwithoutimage=" + $("#srwithoutimage:checked").val() : "";
-  var url = 
encodeURI("http://toolserver.org/~erfgoed/api/api.php?action=search&limit=100"; 
+ format + srname + srid + sraddress + srmunicipality + srcountry + props + 
srwithoutimage);
+  var url = 
encodeURI("https://tools.wmflabs.org/heritage/api/api.php?action=search&limit=100";
 + format + srname + srid + sraddress + srmunicipality + srcountry + props + 
srwithoutimage);
$('#url').val(url);
-   
-/* set hidden fields values for proper GET request */  
+
+/* set hidden fields values for proper GET request */
 $('#props').val(($("#props-filler").val() || []).join('|'));
 

[MediaWiki-commits] [Gerrit] Update Wikidata - Fix uncaught exception in ArticlePlaceholder - change (mediawiki...Wikidata)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Update Wikidata - Fix uncaught exception in ArticlePlaceholder
..

Update Wikidata - Fix uncaught exception in ArticlePlaceholder

Bug: T137500
Change-Id: Ie552c0f844592325511db6caee82dddaaca3d87f
---
M composer.lock
M extensions/ArticlePlaceholder/includes/SearchHookHandler.php
M vendor/composer/installed.json
3 files changed, 77 insertions(+), 66 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 28f8356..3c1721d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -780,7 +780,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/ArticlePlaceholder;,
-"reference": "6d5bdfccfb669b682d94b0705d346877a59fe42b"
+"reference": "8bc848e7c0a20a92e3b9be53dfef91347e3563c1"
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.2",
@@ -815,7 +815,7 @@
 "issues": "https://phabricator.wikimedia.org/;,
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2016-06-09 19:19:59"
+"time": "2016-06-09 23:18:58"
 },
 {
 "name": "propertysuggester/property-suggester",
diff --git a/extensions/ArticlePlaceholder/includes/SearchHookHandler.php 
b/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
index bc673d4..acb8a27 100644
--- a/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
+++ b/extensions/ArticlePlaceholder/includes/SearchHookHandler.php
@@ -140,42 +140,53 @@
 * @param string $term
 */
public function addToSearch( SpecialSearch $specialSearch, OutputPage 
$output, $term ) {
-   $searchResult = $this->getSearchResults( $term );
+   $termSearchResults = $this->getTermSearchResults( $term );
 
-   if ( $searchResult !== '' ) {
-   $output->addWikiText(
-   '==' .
-   $output->msg( 
'articleplaceholder-search-header' )->text() .
-   '=='
-   );
+   if ( !empty( $termSearchResults ) ) {
+   $renderedTermSearchResults = 
$this->renderTermSearchResults( $termSearchResults );
 
-   $output->addWikiText( $searchResult );
+   if ( $renderedTermSearchResults !== '' ) {
+   $output->addWikiText(
+   '==' .
+   $output->msg( 
'articleplaceholder-search-header' )->text() .
+   '=='
+   );
+
+   $output->addWikiText( 
$renderedTermSearchResults );
+   }
}
}
 
/**
 * @param string $term
 *
-* @return string Wikitext
+* @return TermSearchResult[]
 */
-   private function getSearchResults( $term ) {
-   $wikitext = '';
-   $entityIdSearchResult = [];
+   private function getTermSearchResults( $term ) {
+   $termSearchResults = [];
 
foreach ( $this->searchEntities( $term ) as $searchResult ) {
$entityId = 
$searchResult->getEntityId()->getSerialization();
 
-   $entityIdSearchResult[ $entityId ] = $searchResult;
+   $termSearchResults[ $entityId ] = $searchResult;
}
 
-   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$entityIdSearchResult ) );
+   return $termSearchResults;
+   }
 
-   if ( $notableEntityIds === null ) {
-   return '';
-   }
+   /**
+* Render search results, filtered for notability.
+*
+* @param TermSearchResult[] $termSearchResults
+*
+* @return string Wikitext
+*/
+   private function renderTermSearchResults( array $termSearchResults ) {
+   $wikitext = '';
+   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$termSearchResults ) );
 
foreach ( $notableEntityIds as $entityId ) {
-   $result = $this->renderTermSearchResult( 
$entityIdSearchResult[ $entityId ] );
+   $result = $this->renderTermSearchResult( 
$termSearchResults[ $entityId ] );
 
$wikitext .= ''
. $result
@@ -228,7 +239,7 @@
 * TODO: instead of api request database?
 * @param string[] $entityIds
 *
-* 

[MediaWiki-commits] [Gerrit] Fix uncaught exception when no repo search results found - change (mediawiki...ArticlePlaceholder)

[Aude (Code Review)]

Aude has submitted this change and it was merged.

Change subject: Fix uncaught exception when no repo search results found
..


Fix uncaught exception when no repo search results found

Cleaned up some of the naming to make the code more
clear and avoid querying page props when there are
no entity ids given empty search results from the repo.

Bug: T137500
Change-Id: Ie59ce32402f9f2dfa87446f0006f6f48f4cdf850
(cherry picked from commit bf119ed81aa69836cb3ba5e682f9ba3c2f48e90a)
---
M includes/SearchHookHandler.php
1 file changed, 30 insertions(+), 19 deletions(-)

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



diff --git a/includes/SearchHookHandler.php b/includes/SearchHookHandler.php
index bc673d4..acb8a27 100644
--- a/includes/SearchHookHandler.php
+++ b/includes/SearchHookHandler.php
@@ -140,42 +140,53 @@
 * @param string $term
 */
public function addToSearch( SpecialSearch $specialSearch, OutputPage 
$output, $term ) {
-   $searchResult = $this->getSearchResults( $term );
+   $termSearchResults = $this->getTermSearchResults( $term );
 
-   if ( $searchResult !== '' ) {
-   $output->addWikiText(
-   '==' .
-   $output->msg( 
'articleplaceholder-search-header' )->text() .
-   '=='
-   );
+   if ( !empty( $termSearchResults ) ) {
+   $renderedTermSearchResults = 
$this->renderTermSearchResults( $termSearchResults );
 
-   $output->addWikiText( $searchResult );
+   if ( $renderedTermSearchResults !== '' ) {
+   $output->addWikiText(
+   '==' .
+   $output->msg( 
'articleplaceholder-search-header' )->text() .
+   '=='
+   );
+
+   $output->addWikiText( 
$renderedTermSearchResults );
+   }
}
}
 
/**
 * @param string $term
 *
-* @return string Wikitext
+* @return TermSearchResult[]
 */
-   private function getSearchResults( $term ) {
-   $wikitext = '';
-   $entityIdSearchResult = [];
+   private function getTermSearchResults( $term ) {
+   $termSearchResults = [];
 
foreach ( $this->searchEntities( $term ) as $searchResult ) {
$entityId = 
$searchResult->getEntityId()->getSerialization();
 
-   $entityIdSearchResult[ $entityId ] = $searchResult;
+   $termSearchResults[ $entityId ] = $searchResult;
}
 
-   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$entityIdSearchResult ) );
+   return $termSearchResults;
+   }
 
-   if ( $notableEntityIds === null ) {
-   return '';
-   }
+   /**
+* Render search results, filtered for notability.
+*
+* @param TermSearchResult[] $termSearchResults
+*
+* @return string Wikitext
+*/
+   private function renderTermSearchResults( array $termSearchResults ) {
+   $wikitext = '';
+   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$termSearchResults ) );
 
foreach ( $notableEntityIds as $entityId ) {
-   $result = $this->renderTermSearchResult( 
$entityIdSearchResult[ $entityId ] );
+   $result = $this->renderTermSearchResult( 
$termSearchResults[ $entityId ] );
 
$wikitext .= ''
. $result
@@ -228,7 +239,7 @@
 * TODO: instead of api request database?
 * @param string[] $entityIds
 *
-* @return string[]|null $notableEntityIds
+* @return string[] $notableEntityIds
 */
private function getNotableEntityIds( $entityIds ) {
$notableEntityIds = [];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie59ce32402f9f2dfa87446f0006f6f48f4cdf850
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: Aude 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable AuthManager on group2 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Enable AuthManager on group2
..


Enable AuthManager on group2

Bug: T135504
Change-Id: Ia462a58b5a6ae1a2a40ca270c4889b38053a4d4a
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 453ffdc..758180c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -86,8 +86,6 @@
 
 'wgDisableAuthManager' => [
'default' => false,
-   'wikipedia' => true,
-   'group1-wikipedia' => false,
 ],
 
 # wgLanguageCode @{

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia462a58b5a6ae1a2a40ca270c4889b38053a4d4a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Jforrester 
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 tags for group1 and group2 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Add tags for group1 and group2
..


Add tags for group1 and group2

We ran into issues when trying to deploy AuthManager to group0 and
group1 wikis: Setting enabled for "group1" didn't work since that tag
doesn't exist, and setting the default enabled and disabling for
"wikipedia" (as a proxy for the missing "group2") didn't quite work
right either since testwiki and test2wiki are in that group. To avoid
similar confusion in the future, let's just make "group1" and "group2"
be valid configuration tags.

This also adds a group2.dblist, so it can be loaded to define the tag.

Change-Id: I8ff64b8b497dcf354e6bff4d4d81a5e13678df0b
---
A dblists/group2.dblist
M wmf-config/CommonSettings.php
2 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/dblists/group2.dblist b/dblists/group2.dblist
new file mode 100644
index 000..a2995f1
--- /dev/null
+++ b/dblists/group2.dblist
@@ -0,0 +1 @@
+%% all.dblist - group0.dblist - group1.dblist
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 6e171af..b945456 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -165,7 +165,8 @@
$wikiTags = [];
foreach ( [ 'private', 'fishbowl', 'special', 'closed', 'flow', 
'flaggedrevs', 'small', 'medium',
'large', 'wikimania', 'wikidata', 'wikidataclient', 
'visualeditor-default',
-   'commonsuploads', 'nonbetafeatures', 'group0', 
'wikipedia', 'nonglobal', 'wikitech'
+   'commonsuploads', 'nonbetafeatures', 'group0', 
'group1', 'group2', 'wikipedia', 'nonglobal',
+   'wikitech'
] as $tag ) {
$dblist = MWWikiversions::readDbListFile( $tag );
if ( in_array( $wgDBname, $dblist ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ff64b8b497dcf354e6bff4d4d81a5e13678df0b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...ConfirmEdit)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix file permissions
..

Fix file permissions

Change-Id: If4855e3a6d7d35dd94093108f4da3bd1362f6827
---
M ConfirmEdit.php
M SimpleCaptcha/Captcha.php
M includes/CaptchaStore.php
3 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/ConfirmEdit.php b/ConfirmEdit.php
old mode 100755
new mode 100644
diff --git a/SimpleCaptcha/Captcha.php b/SimpleCaptcha/Captcha.php
old mode 100755
new mode 100644
diff --git a/includes/CaptchaStore.php b/includes/CaptchaStore.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4855e3a6d7d35dd94093108f4da3bd1362f6827
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...Renameuser)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix file permissions
..

Fix file permissions

Change-Id: Ib4dc25aa9604f441a657de9764e8dfec5e0455bd
---
M Renameuser.php
M RenameuserSQL.php
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Renameuser 
refs/changes/47/293647/1

diff --git a/Renameuser.php b/Renameuser.php
old mode 100755
new mode 100644
diff --git a/RenameuserSQL.php b/RenameuserSQL.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4dc25aa9604f441a657de9764e8dfec5e0455bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Fix uncaught exception when no repo search results found - change (mediawiki...ArticlePlaceholder)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Fix uncaught exception when no repo search results found
..

Fix uncaught exception when no repo search results found

Cleaned up some of the naming to make the code more
clear and avoid querying page props when there are
no entity ids given empty search results from the repo.

Bug: T137500
Change-Id: Ie59ce32402f9f2dfa87446f0006f6f48f4cdf850
(cherry picked from commit bf119ed81aa69836cb3ba5e682f9ba3c2f48e90a)
---
M includes/SearchHookHandler.php
1 file changed, 30 insertions(+), 19 deletions(-)


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

diff --git a/includes/SearchHookHandler.php b/includes/SearchHookHandler.php
index bc673d4..acb8a27 100644
--- a/includes/SearchHookHandler.php
+++ b/includes/SearchHookHandler.php
@@ -140,42 +140,53 @@
 * @param string $term
 */
public function addToSearch( SpecialSearch $specialSearch, OutputPage 
$output, $term ) {
-   $searchResult = $this->getSearchResults( $term );
+   $termSearchResults = $this->getTermSearchResults( $term );
 
-   if ( $searchResult !== '' ) {
-   $output->addWikiText(
-   '==' .
-   $output->msg( 
'articleplaceholder-search-header' )->text() .
-   '=='
-   );
+   if ( !empty( $termSearchResults ) ) {
+   $renderedTermSearchResults = 
$this->renderTermSearchResults( $termSearchResults );
 
-   $output->addWikiText( $searchResult );
+   if ( $renderedTermSearchResults !== '' ) {
+   $output->addWikiText(
+   '==' .
+   $output->msg( 
'articleplaceholder-search-header' )->text() .
+   '=='
+   );
+
+   $output->addWikiText( 
$renderedTermSearchResults );
+   }
}
}
 
/**
 * @param string $term
 *
-* @return string Wikitext
+* @return TermSearchResult[]
 */
-   private function getSearchResults( $term ) {
-   $wikitext = '';
-   $entityIdSearchResult = [];
+   private function getTermSearchResults( $term ) {
+   $termSearchResults = [];
 
foreach ( $this->searchEntities( $term ) as $searchResult ) {
$entityId = 
$searchResult->getEntityId()->getSerialization();
 
-   $entityIdSearchResult[ $entityId ] = $searchResult;
+   $termSearchResults[ $entityId ] = $searchResult;
}
 
-   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$entityIdSearchResult ) );
+   return $termSearchResults;
+   }
 
-   if ( $notableEntityIds === null ) {
-   return '';
-   }
+   /**
+* Render search results, filtered for notability.
+*
+* @param TermSearchResult[] $termSearchResults
+*
+* @return string Wikitext
+*/
+   private function renderTermSearchResults( array $termSearchResults ) {
+   $wikitext = '';
+   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$termSearchResults ) );
 
foreach ( $notableEntityIds as $entityId ) {
-   $result = $this->renderTermSearchResult( 
$entityIdSearchResult[ $entityId ] );
+   $result = $this->renderTermSearchResult( 
$termSearchResults[ $entityId ] );
 
$wikitext .= ''
. $result
@@ -228,7 +239,7 @@
 * TODO: instead of api request database?
 * @param string[] $entityIds
 *
-* @return string[]|null $notableEntityIds
+* @return string[] $notableEntityIds
 */
private function getNotableEntityIds( $entityIds ) {
$notableEntityIds = [];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie59ce32402f9f2dfa87446f0006f6f48f4cdf850
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] Fix file permissions - change (mediawiki...SpamBlacklist)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix file permissions
..

Fix file permissions

Change-Id: I19de3ded6b17cdde7edce45ba3dee4dccfd29725
---
M BaseBlacklist.php
M EmailBlacklist.php
M SpamBlacklistHooks.php
3 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist 
refs/changes/45/293645/1

diff --git a/BaseBlacklist.php b/BaseBlacklist.php
old mode 100755
new mode 100644
diff --git a/EmailBlacklist.php b/EmailBlacklist.php
old mode 100755
new mode 100644
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19de3ded6b17cdde7edce45ba3dee4dccfd29725
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] bower_components - change (wikimedia...civicrm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: bower_components
..

bower_components

Change-Id: I445e7c33c726220065bdd9a9bd0cb37bf2f62b1a
---
M bower_components/ckeditor/.bower.json
M bower_components/ckeditor/CHANGES.md
M bower_components/ckeditor/LICENSE.md
M bower_components/ckeditor/README.md
M bower_components/ckeditor/adapters/jquery.js
M bower_components/ckeditor/bower.json
M bower_components/ckeditor/ckeditor.js
M bower_components/ckeditor/contents.css
M bower_components/ckeditor/lang/_translationstatus.txt
M bower_components/ckeditor/lang/af.js
M bower_components/ckeditor/lang/ar.js
M bower_components/ckeditor/lang/bg.js
M bower_components/ckeditor/lang/bn.js
M bower_components/ckeditor/lang/bs.js
M bower_components/ckeditor/lang/ca.js
M bower_components/ckeditor/lang/cs.js
M bower_components/ckeditor/lang/cy.js
M bower_components/ckeditor/lang/da.js
A bower_components/ckeditor/lang/de-ch.js
M bower_components/ckeditor/lang/de.js
M bower_components/ckeditor/lang/el.js
M bower_components/ckeditor/lang/en-au.js
M bower_components/ckeditor/lang/en-ca.js
M bower_components/ckeditor/lang/en-gb.js
M bower_components/ckeditor/lang/en.js
M bower_components/ckeditor/lang/eo.js
M bower_components/ckeditor/lang/es.js
M bower_components/ckeditor/lang/et.js
M bower_components/ckeditor/lang/eu.js
M bower_components/ckeditor/lang/fa.js
M bower_components/ckeditor/lang/fi.js
M bower_components/ckeditor/lang/fo.js
M bower_components/ckeditor/lang/fr-ca.js
M bower_components/ckeditor/lang/fr.js
M bower_components/ckeditor/lang/gl.js
M bower_components/ckeditor/lang/gu.js
M bower_components/ckeditor/lang/he.js
M bower_components/ckeditor/lang/hi.js
M bower_components/ckeditor/lang/hr.js
M bower_components/ckeditor/lang/hu.js
M bower_components/ckeditor/lang/id.js
M bower_components/ckeditor/lang/is.js
M bower_components/ckeditor/lang/it.js
M bower_components/ckeditor/lang/ja.js
M bower_components/ckeditor/lang/ka.js
M bower_components/ckeditor/lang/km.js
M bower_components/ckeditor/lang/ko.js
M bower_components/ckeditor/lang/ku.js
M bower_components/ckeditor/lang/lt.js
M bower_components/ckeditor/lang/lv.js
M bower_components/ckeditor/lang/mk.js
M bower_components/ckeditor/lang/mn.js
M bower_components/ckeditor/lang/ms.js
M bower_components/ckeditor/lang/nb.js
M bower_components/ckeditor/lang/nl.js
M bower_components/ckeditor/lang/no.js
M bower_components/ckeditor/lang/pl.js
M bower_components/ckeditor/lang/pt-br.js
M bower_components/ckeditor/lang/pt.js
M bower_components/ckeditor/lang/ro.js
M bower_components/ckeditor/lang/ru.js
M bower_components/ckeditor/lang/si.js
M bower_components/ckeditor/lang/sk.js
M bower_components/ckeditor/lang/sl.js
M bower_components/ckeditor/lang/sq.js
M bower_components/ckeditor/lang/sr-latn.js
M bower_components/ckeditor/lang/sr.js
M bower_components/ckeditor/lang/sv.js
M bower_components/ckeditor/lang/th.js
M bower_components/ckeditor/lang/tr.js
M bower_components/ckeditor/lang/tt.js
M bower_components/ckeditor/lang/ug.js
M bower_components/ckeditor/lang/uk.js
M bower_components/ckeditor/lang/vi.js
M bower_components/ckeditor/lang/zh-cn.js
M bower_components/ckeditor/lang/zh.js
A bower_components/ckeditor/package.json
M bower_components/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
A bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
A bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
M bower_components/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
M 

[MediaWiki-commits] [Gerrit] Do not remove bottom border of fields in signup form - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Do not remove bottom border of fields in signup form
..


Do not remove bottom border of fields in signup form

On a narrow screen, the signup form gets a "stacked" look with the
fields sharing horizontal borders. This used to include removing the
bottom border, which doesn't work so well with the new HTMLForm-based
signup where error messages can appear under the fields. The patch
restores the border; the fields have margin-top: -1px anyway so
the borders will still overlap.

Bug: T135775
Change-Id: I8a4732cf54c47112baade02126d8c81738bb1403
(cherry picked from commit 11037f518bddcdd16b2b6293051bf6166930315d)
---
M resources/skins.minerva.special.userlogin.styles/userlogin.less
1 file changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less 
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
index 8f8137a..66e1780 100644
--- a/resources/skins.minerva.special.userlogin.styles/userlogin.less
+++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less
@@ -158,10 +158,6 @@
 
// account creation
#userlogin2 {
-   .loginPassword {
-   border-bottom: 0;
-   }
-
.mw-ui-checkbox {
margin: @margin 0;
}
@@ -198,7 +194,7 @@
.mw-ui-input {
border: solid 1px @colorGrayLight;
 
-   #wpEmail,
+   

[MediaWiki-commits] [Gerrit] Fix uncaught exception when no repo search results found - change (mediawiki...ArticlePlaceholder)

[jenkins-bot (Code Review)]

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

Change subject: Fix uncaught exception when no repo search results found
..


Fix uncaught exception when no repo search results found

Cleaned up some of the naming to make the code more
clear and avoid querying page props when there are
no entity ids given empty search results from the repo.

Bug: T137500
Change-Id: Ie59ce32402f9f2dfa87446f0006f6f48f4cdf850
---
M includes/SearchHookHandler.php
1 file changed, 30 insertions(+), 19 deletions(-)

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



diff --git a/includes/SearchHookHandler.php b/includes/SearchHookHandler.php
index fdb072c..72dd3e0 100644
--- a/includes/SearchHookHandler.php
+++ b/includes/SearchHookHandler.php
@@ -140,42 +140,53 @@
 * @param string $term
 */
public function addToSearch( SpecialSearch $specialSearch, OutputPage 
$output, $term ) {
-   $searchResult = $this->getSearchResults( $term );
+   $termSearchResults = $this->getTermSearchResults( $term );
 
-   if ( $searchResult !== '' ) {
-   $output->addWikiText(
-   '==' .
-   $output->msg( 
'articleplaceholder-search-header' )->text() .
-   '=='
-   );
+   if ( !empty( $termSearchResults ) ) {
+   $renderedTermSearchResults = 
$this->renderTermSearchResults( $termSearchResults );
 
-   $output->addWikiText( $searchResult );
+   if ( $renderedTermSearchResults !== '' ) {
+   $output->addWikiText(
+   '==' .
+   $output->msg( 
'articleplaceholder-search-header' )->text() .
+   '=='
+   );
+
+   $output->addWikiText( 
$renderedTermSearchResults );
+   }
}
}
 
/**
 * @param string $term
 *
-* @return string Wikitext
+* @return TermSearchResult[]
 */
-   private function getSearchResults( $term ) {
-   $wikitext = '';
-   $entityIdSearchResult = [];
+   private function getTermSearchResults( $term ) {
+   $termSearchResults = [];
 
foreach ( $this->searchEntities( $term ) as $searchResult ) {
$entityId = 
$searchResult->getEntityId()->getSerialization();
 
-   $entityIdSearchResult[ $entityId ] = $searchResult;
+   $termSearchResults[ $entityId ] = $searchResult;
}
 
-   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$entityIdSearchResult ) );
+   return $termSearchResults;
+   }
 
-   if ( $notableEntityIds === null ) {
-   return '';
-   }
+   /**
+* Render search results, filtered for notability.
+*
+* @param TermSearchResult[] $termSearchResults
+*
+* @return string Wikitext
+*/
+   private function renderTermSearchResults( array $termSearchResults ) {
+   $wikitext = '';
+   $notableEntityIds = $this->getNotableEntityIds( array_keys( 
$termSearchResults ) );
 
foreach ( $notableEntityIds as $entityId ) {
-   $result = $this->renderTermSearchResult( 
$entityIdSearchResult[ $entityId ] );
+   $result = $this->renderTermSearchResult( 
$termSearchResults[ $entityId ] );
 
$wikitext .= ''
. $result
@@ -228,7 +239,7 @@
 * TODO: instead of api request database?
 * @param string[] $entityIds
 *
-* @return string[]|null $notableEntityIds
+* @return string[] $notableEntityIds
 */
private function getNotableEntityIds( $entityIds ) {
$notableEntityIds = [];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie59ce32402f9f2dfa87446f0006f6f48f4cdf850
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Hoo man 
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 file permissions on SearchInputWidget.php - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix file permissions on SearchInputWidget.php
..

Fix file permissions on SearchInputWidget.php

Change-Id: I0c7b149a0c62f02b655e53c255ba01a92fc6c4a8
---
M includes/widget/SearchInputWidget.php
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/includes/widget/SearchInputWidget.php 
b/includes/widget/SearchInputWidget.php
old mode 100755
new mode 100644

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

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

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

[MediaWiki-commits] [Gerrit] "Because you read" feed card - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: "Because you read" feed card
..


"Because you read" feed card

This card displays up to three results from a morelike API search based
on a title from the user's recent browsing history (retrieved by a
subclass of our existing MainPageReadMoreTopicTask).

I implemented the search API call with Retrofit.  The existing "read
more" section still calls the API with an AsyncTask as before, but moving
all API searches to Retrofit could be a follow-up task.

I deferred on enforcing a minimum browsing time limit as specified in the
card for now, but in the future maybe this could be implemented by creating
a PageTimer and storing the page the user has most recently spent 30+
seconds on (or a queue of such pages) in a SharedPreference.

I also deferred on creating the "FeedManager" control logic since that will
likely be a substantial task in its own right.

Bug: T129080
Change-Id: I11ef1f59ee2530f116e7c02d2a238898210eb2ee
---
M app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
M app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
M app/src/main/java/org/wikipedia/Constants.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
A app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCard.java
A 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
A app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
A 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadItemCard.java
A 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadTopicTask.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
A app/src/main/java/org/wikipedia/page/MwApiResultPage.java
M app/src/main/java/org/wikipedia/page/SuggestionsTask.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/search/SearchResult.java
M app/src/main/java/org/wikipedia/search/SearchResults.java
M app/src/main/java/org/wikipedia/search/SearchResultsFragment.java
M app/src/main/res/values/strings_no_translate.xml
17 files changed, 504 insertions(+), 78 deletions(-)

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



diff --git 
a/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java 
b/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
index 65f2f86..cc014e3 100644
--- a/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -39,8 +39,8 @@
 assertNotNull(results.getContinueOffset());
 
 for (SearchResult result : results.getResults()) {
-if 
(result.getTitle().getPrefixedText().equals("Test")) {
-
assertEquals(result.getTitle().getDescription(), "Wikipedia disambiguation 
page");
+if 
(result.getPageTitle().getPrefixedText().equals("Test")) {
+
assertEquals(result.getPageTitle().getDescription(), "Wikipedia disambiguation 
page");
 }
 }
 completionLatch.countDown();
diff --git 
a/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java 
b/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
index 22e706b..faf6ff0 100644
--- a/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
+++ b/app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
@@ -2,6 +2,7 @@
 
 import android.test.ActivityUnitTestCase;
 
+import org.wikipedia.Constants;
 import org.wikipedia.Site;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.page.PageTitle;
@@ -19,7 +20,6 @@
  */
 public class SuggestionsTaskTests extends 
ActivityUnitTestCase {
 private static final int TASK_COMPLETION_TIMEOUT = 20;
-private static final int BATCH_SIZE = 3;
 private static final Site SITE = new Site("en.wikipedia.org"); // 
suggestions don't seem to work on testwiki
 
 private WikipediaApp app = WikipediaApp.getInstance();
@@ -33,15 +33,14 @@
 runTestOnUiThread(new Runnable() {
 @Override
 public void run() {
-new SuggestionsTask(app.getAPIForSite(SITE), SITE, "test",
-BATCH_SIZE + 1, BATCH_SIZE, false) {
+new SuggestionsTask(app.getAPIForSite(SITE), SITE, "test", 
false) {
 @Override
 public void onFinish(SearchResults results) {
 assertNotNull(results);
-assertEquals(results.getResults().size(), BATCH_SIZE);
+assertEquals(results.getResults().size(), 
Constants.MAX_SUGGESTION_RESULTS);
 
 

[MediaWiki-commits] [Gerrit] WMF customisations & as yet unmerged improvements (on top of... - change (wikimedia...civicrm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: WMF customisations & as yet unmerged improvements (on top of 
4.7.8)
..

WMF customisations & as yet unmerged improvements (on top of 4.7.8)

Change-Id: Ideedaa5530fb6f35d8b632bacef70cbe702aa8bd
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
M CRM/Contribute/BAO/ContributionRecur.php
M CRM/Contribute/Form/Search.php
M CRM/Core/BAO/PrevNextCache.php
M CRM/Core/Config.php
M CRM/Core/DAO.php
M CRM/Core/Form.php
M CRM/Core/Menu.php
M CRM/Core/OptionValue.php
M CRM/Core/Session.php
M CRM/Dedupe/Finder.php
M CRM/Dedupe/Merger.php
M CRM/Export/BAO/Export.php
M CRM/Logging/Reverter.php
M CRM/Report/Form.php
M CRM/Report/Form/Contribute/Detail.php
M CRM/Report/Form/Instance.php
M CRM/Utils/Rule.php
M api/v3/Job.php
A settings_location.php
M templates/CRM/Report/Form.tpl
M templates/CRM/Report/Form/Actions.tpl
A templates/CRM/common/tasks.tpl
25 files changed, 236 insertions(+), 93 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/42/293642/1

diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index 11ac3d3..1cc0ea1 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -158,11 +158,11 @@
 // CRM_Core_DAO::singleValueQuery("DELETE FROM 
civicrm_acl_contact_cache"); // Transaction-safe
 if (CRM_Core_Transaction::isActive()) {
   
CRM_Core_Transaction::addCallback(CRM_Core_Transaction::PHASE_POST_COMMIT, 
function () {
-CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE 
civicrm_acl_contact_cache");
+CRM_Core_DAO::singleValueQuery("DELETE FROM 
civicrm_acl_contact_cache");
   });
 }
 else {
-  CRM_Core_DAO::singleValueQuery("TRUNCATE TABLE 
civicrm_acl_contact_cache");
+  CRM_Core_DAO::singleValueQuery("DELETE FROM civicrm_acl_contact_cache");
 }
   }
 
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 6266a44..d0be3f5 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -450,7 +450,7 @@
 }
 
 // process greetings CRM-4575, cache greetings
-self::processGreetings($contact);
+// NOT: self::processGreetings($contact);
 
 return $contact;
   }
@@ -3285,8 +3285,11 @@
 // Update phone table to populate phone_numeric field
 if (!$tableName || $tableName == 'civicrm_phone') {
   // Define stored sql function needed for phones
-  CRM_Core_DAO::executeQuery(self::DROP_STRIP_FUNCTION_43);
-  CRM_Core_DAO::executeQuery(self::CREATE_STRIP_FUNCTION_43);
+  //
+  // FIXME: WMF bug T117044, we can't create this function at runtime 
(unknown why not).
+  // CRM_Core_DAO::executeQuery(self::DROP_STRIP_FUNCTION_43);
+  // CRM_Core_DAO::executeQuery(self::CREATE_STRIP_FUNCTION_43);
+
   $info[] = array(
 'table' => array('civicrm_phone'),
 'when' => 'BEFORE',
diff --git a/CRM/Contact/BAO/GroupContactCache.php 
b/CRM/Contact/BAO/GroupContactCache.php
index cdb781d..dba6976 100644
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -354,7 +354,7 @@
 if (!isset($groupID)) {
   if ($smartGroupCacheTimeout == 0) {
 $query = "
-TRUNCATE civicrm_group_contact_cache
+DELETE FROM civicrm_group_contact_cache
 ";
 $update = "
 UPDATE civicrm_group g
diff --git a/CRM/Contribute/BAO/ContributionRecur.php 
b/CRM/Contribute/BAO/ContributionRecur.php
index 0221486..e434736 100644
--- a/CRM/Contribute/BAO/ContributionRecur.php
+++ b/CRM/Contribute/BAO/ContributionRecur.php
@@ -351,6 +351,8 @@
   $params[$recurDAO->id]['next_sched_contribution_date'] = 
$recurDAO->next_sched_contribution_date;
   $params[$recurDAO->id]['amount'] = $recurDAO->amount;
   $params[$recurDAO->id]['currency'] = $recurDAO->currency;
+  $params[$recurDAO->id]['failure_count'] = $recurDAO->failure_count;
+  $params[$recurDAO->id]['failure_retry_date'] = 
$recurDAO->failure_retry_date;
   $params[$recurDAO->id]['frequency_unit'] = $recurDAO->frequency_unit;
   $params[$recurDAO->id]['frequency_interval'] = 
$recurDAO->frequency_interval;
   $params[$recurDAO->id]['installments'] = $recurDAO->installments;
diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
index 866c736..4954884 100644
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@ -85,6 +85,13 @@
 $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this);
 $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, 
FALSE, 'search');
 
+/*
+ * WMF HACK: "force" causes a search with null criteria.  Disable until 
this is fixed.
+ */
+if ( $this->_context === "search" && CRM_Utils_Request::retrieve('qfKey', 
'String') === NULL ) {
+  $this->_force = false;
+}

[MediaWiki-commits] [Gerrit] Fix FancyCaptcha reload JS - change (mediawiki...ConfirmEdit)

[jenkins-bot (Code Review)]

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

Change subject: Fix FancyCaptcha reload JS
..


Fix FancyCaptcha reload JS

I0da671a5 broke the FancyCaptcha reload script for the old auth
forms, and didn't get it quite right for AuthManager forms either
(that one mostly works but the textfield is not refocused).
This patch fixes both.

Change-Id: I78300a4f6998e63e71e4516331f4f3408b86864b
(cherry picked from commit 69d75246740ef459803d77a287c15b89b9ef95a6)
---
M FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js 
b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
index 2c22d4a..c010db8 100644
--- a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
+++ b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
@@ -29,7 +29,11 @@
 
// replace index key with a new one for hidden 
tag
$( '#mw-input-captchaId' ).val( captchaIndex );
-   $( '#mw-input-wpcaptchaWord' ).val( '' 
).focus();
+   $( '#mw-input-captchaWord' ).val( '' ).focus();
+
+   // now do the same with a selector that works 
for pre-1.27 login forms
+   $root.find( '[name="wpCaptchaId"]' ).val( 
captchaIndex );
+   $root.find( '[name="wpCaptchaWord"]' ).val( '' 
).focus();
}
} )
.always( function () {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78300a4f6998e63e71e4516331f4f3408b86864b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add npm template to labs/tools/heritage - change (integration/config)

[Code Review]

Jean-Frédéric has uploaded a new change for review.

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

Change subject: Add npm template to labs/tools/heritage
..

Add npm template to labs/tools/heritage

The necessary bits were introduced in I2562c4

Change-Id: Ife197b790af5680829d1a797a3f9a5d7fe623f41
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/293640/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 888c9d2..34e9005 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1545,6 +1545,7 @@
 template:
   - name: tox-jessie
   - name: jsonlint
+  - name: npm
 check:
   - php55lint
   - composer-validate

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife197b790af5680829d1a797a3f9a5d7fe623f41
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 

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

[MediaWiki-commits] [Gerrit] Add default properties for the password reset form skip button - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add default properties for the password reset form skip button
..


Add default properties for the password reset form skip button

Make "skip" the last option (so it's not the default action when
the user presses enter in a text field) and do not mark it as
primary/constructive as there shouldn't be multiple such buttons.

Bug: T136894
Change-Id: I2a8cd4850f740240520732b1b54d7876f25a00b8
(cherry picked from commit e7945edb0f07c7ce38d3e092615d5c093fd740e9)
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index 8dff163..d8f5e66 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -1050,6 +1050,11 @@
], $this->msg( 'userlogin-helplink2' 
)->text() ),
'weight' => 200,
],
+   // button for 
ResetPasswordSecondaryAuthenticationProvider
+   'skipReset' => [
+   'weight' => 110,
+   'flags' => [],
+   ],
];
}
$fieldDefinitions['username'] += [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a8cd4850f740240520732b1b54d7876f25a00b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Do not remove bottom border of fields in signup form - change (mediawiki...MobileFrontend)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Do not remove bottom border of fields in signup form
..

Do not remove bottom border of fields in signup form

On a narrow screen, the signup form gets a "stacked" look with the
fields sharing horizontal borders. This used to include removing the
bottom border, which doesn't work so well with the new HTMLForm-based
signup where error messages can appear under the fields. The patch
restores the border; the fields have margin-top: -1px anyway so
the borders will still overlap.

Bug: T135775
Change-Id: I8a4732cf54c47112baade02126d8c81738bb1403
(cherry picked from commit 11037f518bddcdd16b2b6293051bf6166930315d)
---
M resources/skins.minerva.special.userlogin.styles/userlogin.less
1 file changed, 1 insertion(+), 5 deletions(-)


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

diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less 
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
index 8f8137a..66e1780 100644
--- a/resources/skins.minerva.special.userlogin.styles/userlogin.less
+++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less
@@ -158,10 +158,6 @@
 
// account creation
#userlogin2 {
-   .loginPassword {
-   border-bottom: 0;
-   }
-
.mw-ui-checkbox {
margin: @margin 0;
}
@@ -198,7 +194,7 @@
.mw-ui-input {
border: solid 1px @colorGrayLight;
 
-   #wpEmail,
+   

[MediaWiki-commits] [Gerrit] Fix FancyCaptcha reload JS - change (mediawiki...ConfirmEdit)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Fix FancyCaptcha reload JS
..

Fix FancyCaptcha reload JS

I0da671a5 broke the FancyCaptcha reload script for the old auth
forms, and didn't get it quite right for AuthManager forms either
(that one mostly works but the textfield is not refocused).
This patch fixes both.

Change-Id: I78300a4f6998e63e71e4516331f4f3408b86864b
(cherry picked from commit 69d75246740ef459803d77a287c15b89b9ef95a6)
---
M FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js 
b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
index 2c22d4a..c010db8 100644
--- a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
+++ b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
@@ -29,7 +29,11 @@
 
// replace index key with a new one for hidden 
tag
$( '#mw-input-captchaId' ).val( captchaIndex );
-   $( '#mw-input-wpcaptchaWord' ).val( '' 
).focus();
+   $( '#mw-input-captchaWord' ).val( '' ).focus();
+
+   // now do the same with a selector that works 
for pre-1.27 login forms
+   $root.find( '[name="wpCaptchaId"]' ).val( 
captchaIndex );
+   $root.find( '[name="wpCaptchaWord"]' ).val( '' 
).focus();
}
} )
.always( function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78300a4f6998e63e71e4516331f4f3408b86864b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Add default properties for the password reset form skip button - change (mediawiki/core)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Add default properties for the password reset form skip button
..

Add default properties for the password reset form skip button

Make "skip" the last option (so it's not the default action when
the user presses enter in a text field) and do not mark it as
primary/constructive as there shouldn't be multiple such buttons.

Bug: T136894
Change-Id: I2a8cd4850f740240520732b1b54d7876f25a00b8
(cherry picked from commit e7945edb0f07c7ce38d3e092615d5c093fd740e9)
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/293636/1

diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index 8dff163..d8f5e66 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -1050,6 +1050,11 @@
], $this->msg( 'userlogin-helplink2' 
)->text() ),
'weight' => 200,
],
+   // button for 
ResetPasswordSecondaryAuthenticationProvider
+   'skipReset' => [
+   'weight' => 110,
+   'flags' => [],
+   ],
];
}
$fieldDefinitions['username'] += [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a8cd4850f740240520732b1b54d7876f25a00b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Add CSS linting via stylelint - change (labs...heritage)

[Code Review]

Jean-Frédéric has uploaded a new change for review.

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

Change subject: Add CSS linting via stylelint
..

Add CSS linting via stylelint

- Add stylelint to both package.json and Gruntfile
  but only applying to api/* files
- Use stylelint-config-standard
- Reformat api/jscss/style.css using stylefmt

Change-Id: If13a68aa0ff03fb00dd28f84814bb659a52fe942
---
A .stylelintrc
M Gruntfile.js
M api/jscss/style.css
M package.json
4 files changed, 112 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/35/293635/1

diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 000..40db42c
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+  "extends": "stylelint-config-standard"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 2db4e92..cf876eb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,6 +1,7 @@
 module.exports = function ( grunt ) {
 
grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-stylelint' );
 
grunt.initConfig( {
 
@@ -10,9 +11,19 @@
'!node_modules/**',
'!vendor/**'
]
+   },
+
+   stylelint: {
+   options: {
+   syntax: 'css'
+   },
+   src: [
+   'api/jscss/*.css',
+   ]
}
+
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint' ] );
+   grunt.registerTask( 'test', [ 'stylelint', 'jsonlint' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/api/jscss/style.css b/api/jscss/style.css
index a66bb37..556c25c 100644
--- a/api/jscss/style.css
+++ b/api/jscss/style.css
@@ -1,54 +1,111 @@
+td,
+th,
+table {
+  border: 1px solid gray;
+  border-collapse: collapse;
+  font-family: Helvetica, Arial, sans-serif;
+}
 
-td, th,table { border: 1px solid gray; border-collapse: collapse; font-family: 
Helvetica, Arial, sans-serif;}
-th { background:steelblue; }
-tr{ background:lightsteelblue; opacity:0.8; }
-tr:hover { opacity:0.99; }
-tr#header { opacity:0.99; }
-td.ht0 { background-color: #f00; }
-td.ht1 { background-color: #f30; }
-td.ht2 { background-color: #f60; }
-td.ht3 { background-color: #f90; }
-td.ht4 { background-color: #fc0; }
-td.ht5 { background-color: #ff0; }
-td.ht6 { background-color: #cf0; }
-td.ht7 { background-color: #9f0; }
-td.ht8 { background-color: #6f0; }
-td.ht9 { background-color: #3f0; }
-td.ht10 { background-color: #0f0; }
-img { 
-border: medium none;
-vertical-align: middle;
+th {
+  background: steelblue;
+}
+
+tr {
+  background: lightsteelblue;
+  opacity: 0.8;
+}
+
+tr:hover {
+  opacity: 0.99;
+}
+
+tr#header {
+  opacity: 0.99;
+}
+
+td.ht0 {
+  background-color: #f00;
+}
+
+td.ht1 {
+  background-color: #f30;
+}
+
+td.ht2 {
+  background-color: #f60;
+}
+
+td.ht3 {
+  background-color: #f90;
+}
+
+td.ht4 {
+  background-color: #fc0;
+}
+
+td.ht5 {
+  background-color: #ff0;
+}
+
+td.ht6 {
+  background-color: #cf0;
+}
+
+td.ht7 {
+  background-color: #9f0;
+}
+
+td.ht8 {
+  background-color: #6f0;
+}
+
+td.ht9 {
+  background-color: #3f0;
+}
+
+td.ht10 {
+  background-color: #0f0;
+}
+
+img {
+  border: medium none;
+  vertical-align: middle;
 }
 
 /* some overrides for the toolbox search result, keep above selectors, maybe 
needed at other place */
-
 table.wlm-result {
- font-size:12px;
- background-color:#efefef;
- border-collapse:collapse;
+  font-size: 12px;
+  background-color: #efefef;
+  border-collapse: collapse;
 }
+
 table.wlm-result tr {
- opacity:1;
+  opacity: 1;
 }
+
 table.wlm-result th {
- background-color:#A9;
- white-space:nowrap;
- color:#fff;
+  background-color: #a9;
+  white-space: nowrap;
+  color: #fff;
 }
+
 table.wlm-result td {
- color:#333;
- border:2px solid #fff;
- padding:2px;
- background-color:#efefef;
- opacity:1;
+  color: #333;
+  border: 2px solid #fff;
+  padding: 2px;
+  background-color: #efefef;
+  opacity: 1;
 }
+
 table.wlm-result tr:hover td {
- background-color:#fff;
-  opacity:1;
+  background-color: #fff;
+  opacity: 1;
 }
+
 table.wlm-result td img {
- margin:-2px;
+  margin: -2px;
 }
+
 table.wlm-result th a.sortheader {
- margin-left:2px;
-}
\ No newline at end of file
+  margin-left: 2px;
+}
diff --git a/package.json b/package.json
index 67d99ed..898e509 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,8 @@
   "devDependencies": {
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
-"grunt-jsonlint": "^1.0.8"
+"grunt-jsonlint": "^1.0.8",
+"grunt-stylelint": "^0.4.0",
+"stylelint-config-standard": "^8.0.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] Fix generateLocalAutload.php - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix generateLocalAutload.php
..


Fix generateLocalAutload.php

Installer overrides rework in I2661ba2036b2887d31ab356751d731cc8b499f26
made this exception uneeded, remove.

Change-Id: I952a1237ebe3d2ac86182488f1c0e297c7c6e304
---
M maintenance/generateLocalAutoload.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/maintenance/generateLocalAutoload.php 
b/maintenance/generateLocalAutoload.php
index 0d04c41..8b1d86d 100644
--- a/maintenance/generateLocalAutoload.php
+++ b/maintenance/generateLocalAutoload.php
@@ -17,8 +17,5 @@
$generator->readFile( $file );
 }
 
-// This class is not defined, but might be added by the installer
-$generator->forceClassPath( 'MyLocalSettingsGenerator', 
"$base/mw-config/overrides.php" );
-
 // Write out the autoload
 $generator->generateAutoload( 'maintenance/generateLocalAutoload.php' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I952a1237ebe3d2ac86182488f1c0e297c7c6e304
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] all wikis to 1.28.0-wmf.5 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: all wikis to 1.28.0-wmf.5
..


all wikis to 1.28.0-wmf.5

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

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



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

[MediaWiki-commits] [Gerrit] Change the way installer overrides work - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Change the way installer overrides work
..


Change the way installer overrides work

Instead of "don't edit this file, edit that file", do it settings.d
style where packagers can drop their stuff in mw-config/overrides.

I propose to backport it to 1.27 because LTS.

Bug: T135695
Change-Id: I2661ba2036b2887d31ab356751d731cc8b499f26
(cherry picked from commit d1effacdb1b8fdba8757276d85eb63593c01fd57)
---
M RELEASE-NOTES-1.27
M autoload.php
M includes/installer/Installer.php
R includes/installer/InstallerOverrides.php
A mw-config/overrides/README
5 files changed, 53 insertions(+), 32 deletions(-)

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



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 9a3ced5..89e23fb 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -537,6 +537,8 @@
 * User::isPasswordReminderThrottled() was deprecated.
 * Bot-oriented parameters to Special:UserLogin (wpCookieCheck, 
wpSkipCookieCheck)
   were removed.
+* Installer can now be customized without patching MediaWiki code, see
+  mw-config/overrides/README for details.
 
 == Compatibility ==
 
diff --git a/autoload.php b/autoload.php
index edaa2ff..91834af 100644
--- a/autoload.php
+++ b/autoload.php
@@ -600,7 +600,7 @@
'InitSiteStats' => __DIR__ . '/maintenance/initSiteStats.php',
'InstallDocFormatter' => __DIR__ . 
'/includes/installer/InstallDocFormatter.php',
'Installer' => __DIR__ . '/includes/installer/Installer.php',
-   'InstallerOverrides' => __DIR__ . '/mw-config/overrides.php',
+   'InstallerOverrides' => __DIR__ . 
'/includes/installer/InstallerOverrides.php',
'InstallerSessionProvider' => __DIR__ . 
'/includes/installer/InstallerSessionProvider.php',
'Interwiki' => __DIR__ . '/includes/interwiki/Interwiki.php',
'InvalidPassword' => __DIR__ . '/includes/password/InvalidPassword.php',
@@ -920,7 +920,6 @@
'MutableConfig' => __DIR__ . '/includes/config/MutableConfig.php',
'MutableContext' => __DIR__ . '/includes/context/MutableContext.php',
'MwSql' => __DIR__ . '/maintenance/sql.php',
-   'MyLocalSettingsGenerator' => __DIR__ . '/mw-config/overrides.php',
'MySQLField' => __DIR__ . '/includes/db/DatabaseMysqlBase.php',
'MySQLMasterPos' => __DIR__ . '/includes/db/DatabaseMysqlBase.php',
'MySqlLockManager' => __DIR__ . 
'/includes/filebackend/lockmanager/DBLockManager.php',
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index d747707..4c8e7e9 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -2,6 +2,9 @@
 /**
  * Base code for MediaWiki installer.
  *
+ * DO NOT PATCH THIS FILE IF YOU NEED TO CHANGE INSTALLER BEHAVIOR IN YOUR 
PACKAGE!
+ * See mw-config/overrides/README for details.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/mw-config/overrides.php b/includes/installer/InstallerOverrides.php
similarity index 63%
rename from mw-config/overrides.php
rename to includes/installer/InstallerOverrides.php
index 3dfecaa..eba3a20 100644
--- a/mw-config/overrides.php
+++ b/includes/installer/InstallerOverrides.php
@@ -1,11 +1,6 @@
 values['wgDefaultSkin'] = 'vector';
-   // add a new setting
-   $ls = parent::getText();
-   return $ls . "\n\$wgUseTex = true;\n";
-   }
-}
-*/
-
 /**
  * @since 1.20
  */
 class InstallerOverrides {
+   private static function getOverrides() {
+   global $IP;
+   static $overrides;
+
+   if ( !$overrides ) {
+   $overrides = [
+   'LocalSettingsGenerator' => 
'LocalSettingsGenerator',
+   'WebInstaller' => 'WebInstaller',
+   'CliInstaller' => 'CliInstaller',
+   ];
+   foreach ( glob( "$IP/mw-config/overrides/*.php" ) as 
$file ) {
+   require $file;
+   }
+   }
+
+   return $overrides;
+   }
+
/**
 * Instantiates and returns an instance of LocalSettingsGenerator or 
its descendant classes
 * @param Installer $installer
 * @return LocalSettingsGenerator
 */
public static function getLocalSettingsGenerator( Installer $installer 
) {
-   return new LocalSettingsGenerator( $installer );
+   $className = self::getOverrides()['LocalSettingsGenerator'];
+   return new $className( $installer );
}
 
/**
@@ -65,7 +58,8 @@
 * @return WebInstaller
 */

[MediaWiki-commits] [Gerrit] all wikis to 1.28.0-wmf.5 - change (operations/mediawiki-config)

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: all wikis to 1.28.0-wmf.5
..

all wikis to 1.28.0-wmf.5

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


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

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

[MediaWiki-commits] [Gerrit] Add "PostSend" limits to $wgTrxProfilerLimits - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add "PostSend" limits to $wgTrxProfilerLimits
..


Add "PostSend" limits to $wgTrxProfilerLimits

This makes post-send updates subject to logging, like other
updates in POST requests. Previously, slow queries were ignored.

Bug: T137326
Change-Id: Ia08f51a10b7b1fae3350f5c5215fab234edefada
---
M includes/DefaultSettings.php
M includes/MediaWiki.php
2 files changed, 13 insertions(+), 3 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0fe3388..7892a98 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5978,6 +5978,12 @@
'writes' => 0,
'readQueryTime' => 5
],
+   // Deferred updates that run after HTTP response is sent
+   'PostSend' => [
+   'readQueryTime' => 5,
+   'writeQueryTime' => 1,
+   'maxAffected' => 500
+   ],
// Background job runner
'JobRunner' => [
'readQueryTime' => 30,
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index ee03f02..21857b9 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -764,9 +764,13 @@
// Assure deferred updates are not in the main transaction
wfGetLBFactory()->commitMasterChanges( __METHOD__ );
 
-   // Ignore things like master queries/connections on GET requests
-   // as long as they are in deferred updates (which catch errors).
-   
Profiler::instance()->getTransactionProfiler()->resetExpectations();
+   // Loosen DB query expectations since the HTTP client is 
unblocked
+   $trxProfiler = Profiler::instance()->getTransactionProfiler();
+   $trxProfiler->resetExpectations();
+   $trxProfiler->setExpectations(
+   $this->config->get( 'TrxProfilerLimits' )['PostSend'],
+   __METHOD__
+   );
 
// Do any deferred jobs
DeferredUpdates::doUpdates( 'enqueue' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia08f51a10b7b1fae3350f5c5215fab234edefada
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Legoktm 
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 testing infrastructure with npm/grunt - change (labs...heritage)

[Code Review]

Jean-Frédéric has uploaded a new change for review.

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

Change subject: Add testing infrastructure with npm/grunt
..

Add testing infrastructure with npm/grunt

This paves the way to add all sorts of linting.

Change-Id: I2562c4a39b58d95df915daa87d2cb564ce5a9876
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/33/293633/1

diff --git a/.gitignore b/.gitignore
index 3f464f5..f398311 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,11 @@
 erfgoedbot/sql/create_table_monuments*
 erfgoedbot/sql/create_table_wlpa*
+
 .coverage
 .tox
 *.pyc
+
+composer.lock
+vendor
+
+node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..77e3e6f
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,5 @@
+module.exports = function ( grunt ) {
+
+   grunt.registerTask( 'test', [ ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..c356a3c
--- /dev/null
+++ b/package.json
@@ -0,0 +1,10 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2562c4a39b58d95df915daa87d2cb564ce5a9876
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 

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

[MediaWiki-commits] [Gerrit] Revert "Map dummy language codes in sites" - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Revert "Map dummy language codes in sites"
..


Revert "Map dummy language codes in sites"

This is causing duplicate English Wikipedia interwiki links.
The second link is supposed to be for Simple English, but
instead is linked to English Wikipedia.

This reverts commit 1c1c74adef8a2f5597472e8c049010ff4d42ff64.

Bug: T137404
Change-Id: Ibc1c53ec1b8e643b47ad52f38a8496acfb399d65
---
M includes/ServiceWiring.php
M includes/site/DBSiteStore.php
M includes/site/FileBasedSiteLookup.php
M tests/phpunit/includes/site/DBSiteStoreTest.php
M tests/phpunit/includes/site/FileBasedSiteLookupTest.php
5 files changed, 5 insertions(+), 68 deletions(-)

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



diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 338f306..b076d07 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -61,9 +61,6 @@
 
'SiteStore' => function( MediaWikiServices $services ) {
$rawSiteStore = new DBSiteStore( $services->getDBLoadBalancer() 
);
-   $rawSiteStore->setLanguageCodeMapping(
-   $services->getMainConfig()->get( 'DummyLanguageCodes' ) 
?: []
-   );
 
// TODO: replace wfGetCache with a CacheFactory service.
// TODO: replace wfIsHHVM with a capabilities service.
diff --git a/includes/site/DBSiteStore.php b/includes/site/DBSiteStore.php
index c1c10c2..974789f 100644
--- a/includes/site/DBSiteStore.php
+++ b/includes/site/DBSiteStore.php
@@ -41,11 +41,6 @@
private $dbLoadBalancer;
 
/**
-* @var string[]
-*/
-   private $languageCodeMapping = [];
-
-   /**
 * @since 1.27
 *
 * @todo: inject some kind of connection manager that is aware of the 
target wiki,
@@ -101,17 +96,15 @@
);
 
foreach ( $res as $row ) {
-   $languageCode = $row->site_language === '' ? null : 
$row->site_language;
-   if ( isset( $this->languageCodeMapping[ $languageCode ] 
) ) {
-   $languageCode = $this->languageCodeMapping[ 
$languageCode ];
-   }
-
$site = Site::newForType( $row->site_type );
$site->setGlobalId( $row->site_global_key );
$site->setInternalId( (int)$row->site_id );
$site->setForward( (bool)$row->site_forward );
$site->setGroup( $row->site_group );
-   $site->setLanguageCode( $languageCode );
+   $site->setLanguageCode( $row->site_language === ''
+   ? null
+   : $row->site_language
+   );
$site->setSource( $row->site_source );
$site->setExtraData( unserialize( $row->site_data ) );
$site->setExtraConfig( unserialize( $row->site_config ) 
);
@@ -292,15 +285,6 @@
$this->reset();
 
return $ok;
-   }
-
-   /**
-* Provide an array that maps language codes
-*
-* @param string[] $newMapping
-*/
-   public function setLanguageCodeMapping( array $newMapping ) {
-   $this->languageCodeMapping = $newMapping;
}
 
 }
diff --git a/includes/site/FileBasedSiteLookup.php 
b/includes/site/FileBasedSiteLookup.php
index 424d8e6..9654440 100644
--- a/includes/site/FileBasedSiteLookup.php
+++ b/includes/site/FileBasedSiteLookup.php
@@ -43,11 +43,6 @@
private $cacheFile;
 
/**
-* @var string[]
-*/
-   private $languageCodeMapping = [];
-
-   /**
 * @param string $cacheFile
 */
public function __construct( $cacheFile ) {
@@ -123,18 +118,13 @@
 * @return Site
 */
private function newSiteFromArray( array $data ) {
-   $languageCode = $data['language'];
-   if ( isset( $this->languageCodeMapping[ $languageCode ] ) ) {
-   $languageCode = $this->languageCodeMapping[ 
$languageCode ];
-   }
-
$siteType = array_key_exists( 'type', $data ) ? $data['type'] : 
Site::TYPE_UNKNOWN;
$site = Site::newForType( $siteType );
 
$site->setGlobalId( $data['globalid'] );
$site->setForward( $data['forward'] );
$site->setGroup( $data['group'] );
-   $site->setLanguageCode( $languageCode );
+   $site->setLanguageCode( $data['language'] );
$site->setSource( $data['source'] );
$site->setExtraData( $data['data'] );
$site->setExtraConfig( $data['config'] );
@@ -144,15 +134,6 @@
  

[MediaWiki-commits] [Gerrit] Fix FancyCaptcha reload JS - change (mediawiki...ConfirmEdit)

[jenkins-bot (Code Review)]

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

Change subject: Fix FancyCaptcha reload JS
..


Fix FancyCaptcha reload JS

I0da671a5 broke the FancyCaptcha reload script for the old auth
forms, and didn't get it quite right for AuthManager forms either
(that one mostly works but the textfield is not refocused).
This patch fixes both.

Change-Id: I78300a4f6998e63e71e4516331f4f3408b86864b
---
M FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js 
b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
index 2c22d4a..c010db8 100644
--- a/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
+++ b/FancyCaptcha/resources/ext.confirmEdit.fancyCaptcha.js
@@ -29,7 +29,11 @@
 
// replace index key with a new one for hidden 
tag
$( '#mw-input-captchaId' ).val( captchaIndex );
-   $( '#mw-input-wpcaptchaWord' ).val( '' 
).focus();
+   $( '#mw-input-captchaWord' ).val( '' ).focus();
+
+   // now do the same with a selector that works 
for pre-1.27 login forms
+   $root.find( '[name="wpCaptchaId"]' ).val( 
captchaIndex );
+   $root.find( '[name="wpCaptchaWord"]' ).val( '' 
).focus();
}
} )
.always( function () {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78300a4f6998e63e71e4516331f4f3408b86864b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
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 ?markasread=NNN to primary links in emails too - change (mediawiki...Echo)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Add ?markasread=NNN to primary links in emails too
..

Add ?markasread=NNN to primary links in emails too

This ensures that following the link in the email
marks the notification as read.

Bug: T137488
Change-Id: Id365650239c032f224a86c49691faef772cdc62d
---
M includes/formatters/EchoHtmlEmailFormatter.php
M includes/formatters/EchoPlainTextEmailFormatter.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/formatters/EchoHtmlEmailFormatter.php 
b/includes/formatters/EchoHtmlEmailFormatter.php
index ef622ad..2792a38 100644
--- a/includes/formatters/EchoHtmlEmailFormatter.php
+++ b/includes/formatters/EchoHtmlEmailFormatter.php
@@ -16,7 +16,7 @@
 
$actions = array();
 
-   $primaryLink = $model->getPrimaryLink();
+   $primaryLink = $model->getPrimaryLinkWithMarkAsRead();
if ( $primaryLink ) {
$actions[] = $this->renderLink( $primaryLink, 
self::PRIMARY_LINK_STYLE );
}
diff --git a/includes/formatters/EchoPlainTextEmailFormatter.php 
b/includes/formatters/EchoPlainTextEmailFormatter.php
index 9d7d819..b877881 100644
--- a/includes/formatters/EchoPlainTextEmailFormatter.php
+++ b/includes/formatters/EchoPlainTextEmailFormatter.php
@@ -14,7 +14,7 @@
$text .= EchoDiscussionParser::htmlToText( 
$bodyMsg->parse() );
}
 
-   $primaryLink = $model->getPrimaryLink();
+   $primaryLink = $model->getPrimaryLinkWithMarkAsRead();
 
$primaryUrl = wfExpandUrl( $primaryLink['url'], PROTO_CANONICAL 
);
$colon = $this->msg( 'colon-separator' )->text();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id365650239c032f224a86c49691faef772cdc62d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Revert "Map dummy language codes in sites" - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Revert "Map dummy language codes in sites"
..


Revert "Map dummy language codes in sites"

This is causing duplicate English Wikipedia interwiki links.
The second link is supposed to be for Simple English, but
instead is linked to English Wikipedia.

This reverts commit 1c1c74adef8a2f5597472e8c049010ff4d42ff64.

Bug: T137404
Change-Id: Ibc1c53ec1b8e643b47ad52f38a8496acfb399d65
---
M includes/ServiceWiring.php
M includes/site/DBSiteStore.php
M includes/site/FileBasedSiteLookup.php
M tests/phpunit/includes/site/DBSiteStoreTest.php
M tests/phpunit/includes/site/FileBasedSiteLookupTest.php
5 files changed, 5 insertions(+), 68 deletions(-)

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



diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index e53b9ed..293e6eb 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -59,9 +59,6 @@
 
'SiteStore' => function( MediaWikiServices $services ) {
$rawSiteStore = new DBSiteStore( $services->getDBLoadBalancer() 
);
-   $rawSiteStore->setLanguageCodeMapping(
-   $services->getMainConfig()->get( 'DummyLanguageCodes' ) 
?: []
-   );
 
// TODO: replace wfGetCache with a CacheFactory service.
// TODO: replace wfIsHHVM with a capabilities service.
diff --git a/includes/site/DBSiteStore.php b/includes/site/DBSiteStore.php
index c1c10c2..974789f 100644
--- a/includes/site/DBSiteStore.php
+++ b/includes/site/DBSiteStore.php
@@ -41,11 +41,6 @@
private $dbLoadBalancer;
 
/**
-* @var string[]
-*/
-   private $languageCodeMapping = [];
-
-   /**
 * @since 1.27
 *
 * @todo: inject some kind of connection manager that is aware of the 
target wiki,
@@ -101,17 +96,15 @@
);
 
foreach ( $res as $row ) {
-   $languageCode = $row->site_language === '' ? null : 
$row->site_language;
-   if ( isset( $this->languageCodeMapping[ $languageCode ] 
) ) {
-   $languageCode = $this->languageCodeMapping[ 
$languageCode ];
-   }
-
$site = Site::newForType( $row->site_type );
$site->setGlobalId( $row->site_global_key );
$site->setInternalId( (int)$row->site_id );
$site->setForward( (bool)$row->site_forward );
$site->setGroup( $row->site_group );
-   $site->setLanguageCode( $languageCode );
+   $site->setLanguageCode( $row->site_language === ''
+   ? null
+   : $row->site_language
+   );
$site->setSource( $row->site_source );
$site->setExtraData( unserialize( $row->site_data ) );
$site->setExtraConfig( unserialize( $row->site_config ) 
);
@@ -292,15 +285,6 @@
$this->reset();
 
return $ok;
-   }
-
-   /**
-* Provide an array that maps language codes
-*
-* @param string[] $newMapping
-*/
-   public function setLanguageCodeMapping( array $newMapping ) {
-   $this->languageCodeMapping = $newMapping;
}
 
 }
diff --git a/includes/site/FileBasedSiteLookup.php 
b/includes/site/FileBasedSiteLookup.php
index 424d8e6..9654440 100644
--- a/includes/site/FileBasedSiteLookup.php
+++ b/includes/site/FileBasedSiteLookup.php
@@ -43,11 +43,6 @@
private $cacheFile;
 
/**
-* @var string[]
-*/
-   private $languageCodeMapping = [];
-
-   /**
 * @param string $cacheFile
 */
public function __construct( $cacheFile ) {
@@ -123,18 +118,13 @@
 * @return Site
 */
private function newSiteFromArray( array $data ) {
-   $languageCode = $data['language'];
-   if ( isset( $this->languageCodeMapping[ $languageCode ] ) ) {
-   $languageCode = $this->languageCodeMapping[ 
$languageCode ];
-   }
-
$siteType = array_key_exists( 'type', $data ) ? $data['type'] : 
Site::TYPE_UNKNOWN;
$site = Site::newForType( $siteType );
 
$site->setGlobalId( $data['globalid'] );
$site->setForward( $data['forward'] );
$site->setGroup( $data['group'] );
-   $site->setLanguageCode( $languageCode );
+   $site->setLanguageCode( $data['language'] );
$site->setSource( $data['source'] );
$site->setExtraData( $data['data'] );
$site->setExtraConfig( $data['config'] );
@@ -144,15 +134,6 @@
 

[MediaWiki-commits] [Gerrit] Revert "Map dummy language codes in sites" - change (mediawiki/core)

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Revert "Map dummy language codes in sites"
..

Revert "Map dummy language codes in sites"

This is causing duplicate English Wikipedia interwiki links.
The second link is supposed to be for Simple English, but
instead is linked to English Wikipedia.

This reverts commit 1c1c74adef8a2f5597472e8c049010ff4d42ff64.

Bug: T137404
Change-Id: Ibc1c53ec1b8e643b47ad52f38a8496acfb399d65
---
M includes/ServiceWiring.php
M includes/site/DBSiteStore.php
M includes/site/FileBasedSiteLookup.php
M tests/phpunit/includes/site/DBSiteStoreTest.php
M tests/phpunit/includes/site/FileBasedSiteLookupTest.php
5 files changed, 5 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/293631/1

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 338f306..b076d07 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -61,9 +61,6 @@
 
'SiteStore' => function( MediaWikiServices $services ) {
$rawSiteStore = new DBSiteStore( $services->getDBLoadBalancer() 
);
-   $rawSiteStore->setLanguageCodeMapping(
-   $services->getMainConfig()->get( 'DummyLanguageCodes' ) 
?: []
-   );
 
// TODO: replace wfGetCache with a CacheFactory service.
// TODO: replace wfIsHHVM with a capabilities service.
diff --git a/includes/site/DBSiteStore.php b/includes/site/DBSiteStore.php
index c1c10c2..974789f 100644
--- a/includes/site/DBSiteStore.php
+++ b/includes/site/DBSiteStore.php
@@ -41,11 +41,6 @@
private $dbLoadBalancer;
 
/**
-* @var string[]
-*/
-   private $languageCodeMapping = [];
-
-   /**
 * @since 1.27
 *
 * @todo: inject some kind of connection manager that is aware of the 
target wiki,
@@ -101,17 +96,15 @@
);
 
foreach ( $res as $row ) {
-   $languageCode = $row->site_language === '' ? null : 
$row->site_language;
-   if ( isset( $this->languageCodeMapping[ $languageCode ] 
) ) {
-   $languageCode = $this->languageCodeMapping[ 
$languageCode ];
-   }
-
$site = Site::newForType( $row->site_type );
$site->setGlobalId( $row->site_global_key );
$site->setInternalId( (int)$row->site_id );
$site->setForward( (bool)$row->site_forward );
$site->setGroup( $row->site_group );
-   $site->setLanguageCode( $languageCode );
+   $site->setLanguageCode( $row->site_language === ''
+   ? null
+   : $row->site_language
+   );
$site->setSource( $row->site_source );
$site->setExtraData( unserialize( $row->site_data ) );
$site->setExtraConfig( unserialize( $row->site_config ) 
);
@@ -292,15 +285,6 @@
$this->reset();
 
return $ok;
-   }
-
-   /**
-* Provide an array that maps language codes
-*
-* @param string[] $newMapping
-*/
-   public function setLanguageCodeMapping( array $newMapping ) {
-   $this->languageCodeMapping = $newMapping;
}
 
 }
diff --git a/includes/site/FileBasedSiteLookup.php 
b/includes/site/FileBasedSiteLookup.php
index 424d8e6..9654440 100644
--- a/includes/site/FileBasedSiteLookup.php
+++ b/includes/site/FileBasedSiteLookup.php
@@ -43,11 +43,6 @@
private $cacheFile;
 
/**
-* @var string[]
-*/
-   private $languageCodeMapping = [];
-
-   /**
 * @param string $cacheFile
 */
public function __construct( $cacheFile ) {
@@ -123,18 +118,13 @@
 * @return Site
 */
private function newSiteFromArray( array $data ) {
-   $languageCode = $data['language'];
-   if ( isset( $this->languageCodeMapping[ $languageCode ] ) ) {
-   $languageCode = $this->languageCodeMapping[ 
$languageCode ];
-   }
-
$siteType = array_key_exists( 'type', $data ) ? $data['type'] : 
Site::TYPE_UNKNOWN;
$site = Site::newForType( $siteType );
 
$site->setGlobalId( $data['globalid'] );
$site->setForward( $data['forward'] );
$site->setGroup( $data['group'] );
-   $site->setLanguageCode( $languageCode );
+   $site->setLanguageCode( $data['language'] );
$site->setSource( $data['source'] );
$site->setExtraData( $data['data'] );
$site->setExtraConfig( 

[MediaWiki-commits] [Gerrit] Get rid of version number - change (mediawiki...MultimediaViewer)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Get rid of version number
..

Get rid of version number

Remove useless and misleading version number. It was last updated
in 2013 or so, when MediaViewer was still a beta feature,
and ther was a year of intensive development after that.

Bug: T137477
Change-Id: I4a7cb40852ec55d26260febd446c3d0c4bce9e3f
---
M extension.json
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/30/293630/1

diff --git a/extension.json b/extension.json
index bfbfdbd..f4b1b20 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,5 @@
 {
"name": "MultimediaViewer",
-   "version": "0.3.0",
"author": [
"MarkTraceur (Mark Holmquist)",
"Gilles Dubuc",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a7cb40852ec55d26260febd446c3d0c4bce9e3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] build: Bump devDependencies to latest and make pass - change (oojs/ui)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: build: Bump devDependencies to latest and make pass
..

build: Bump devDependencies to latest and make pass

 grunt-image  1.5.1  →  1.5.2
 grunt-jscs   2.8.0  →  3.0.0
 grunt-jsonlint   1.0.7  →  1.0.8
 grunt-karma  1.0.0  →  2.0.0
 grunt-stylelint  0.3.0  →  0.4.0
 stylelint-config-wikimedia   0.2.0  →  0.2.2

Change-Id: I7b6b15edbec8fa70f374e8ae3cd9a30b8098c2e6
---
M package.json
M src/layouts/BookletLayout.js
M src/layouts/IndexLayout.js
3 files changed, 14 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/29/293629/1

diff --git a/package.json b/package.json
index 4ad0d6c..2e5f4fa 100644
--- a/package.json
+++ b/package.json
@@ -40,12 +40,12 @@
 "grunt-cssjanus": "0.3.2",
 "grunt-exec": "0.4.7",
 "grunt-file-exists": "0.1.4",
-"grunt-image": "1.5.1",
-"grunt-jscs": "2.8.0",
-"grunt-jsonlint": "1.0.7",
-"grunt-karma": "1.0.0",
+"grunt-image": "1.5.2",
+"grunt-jscs": "3.0.0",
+"grunt-jsonlint": "1.0.8",
+"grunt-karma": "2.0.0",
 "grunt-promise-q": 
"git://github.com/jdforrester/grunt-promise-q.git#v0.1.1-wmf.1",
-"grunt-stylelint": "0.3.0",
+"grunt-stylelint": "0.4.0",
 "grunt-svg2png": 
"git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1",
 "grunt-tyops": "0.1.0",
 "karma": "0.13.22",
@@ -55,6 +55,6 @@
 "karma-qunit": "1.0.0",
 "q": "1.4.1",
 "qunitjs": "1.22.0",
-"stylelint-config-wikimedia": "0.2.0"
+"stylelint-config-wikimedia": "0.2.2"
   }
 }
diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index 22446d0..80b6e7b 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -182,10 +182,10 @@
var layout = this;
if ( !this.scrolling && page ) {
page.scrollElementIntoView( { complete: function () {
-   if ( layout.autoFocus ) {
-   layout.focus();
-   }
-   } } );
+   if ( layout.autoFocus ) {
+   layout.focus();
+   }
+   } } );
}
 };
 
diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js
index a639413..5125bf2 100644
--- a/src/layouts/IndexLayout.js
+++ b/src/layouts/IndexLayout.js
@@ -138,10 +138,10 @@
var layout = this;
if ( card ) {
card.scrollElementIntoView( { complete: function () {
-   if ( layout.autoFocus ) {
-   layout.focus();
-   }
-   } } );
+   if ( layout.autoFocus ) {
+   layout.focus();
+   }
+   } } );
}
 };
 

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

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

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

[MediaWiki-commits] [Gerrit] Add any prior block to BlockIpComplete hook - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Add any prior block to BlockIpComplete hook
..

Add any prior block to BlockIpComplete hook

Also fixed some $user IDEA warnings.

Bug: T137287
Change-Id: I7c31e71e99dad0296244ced72b1e8949b8a8fa3d
---
M docs/hooks.txt
M includes/specials/SpecialBlock.php
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/293628/1

diff --git a/docs/hooks.txt b/docs/hooks.txt
index c91354d..8189075 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -885,6 +885,7 @@
 'BlockIpComplete': After an IP address or user is blocked.
 $block: the Block object that was saved
 $user: the user who did the block (not the one being blocked)
+$currentBlock: the Block object for the prior block or null if there was none
 
 'BookInformation': Before information output on Special:Booksources.
 $isbn: ISBN to show information for
diff --git a/includes/specials/SpecialBlock.php 
b/includes/specials/SpecialBlock.php
index fcadede..f0f71b6 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -645,8 +645,10 @@
return [ 'ipb-blockingself', 
'ipb-confirmaction' ];
}
} elseif ( $type == Block::TYPE_RANGE ) {
+   $user = null;
$userId = 0;
} elseif ( $type == Block::TYPE_IP ) {
+   $user = null;
$target = $target->getName();
$userId = 0;
} else {
@@ -729,6 +731,7 @@
return $reason;
}
 
+   $currentBlock = null;
# Try to insert block. Is there a conflicting block?
$status = $block->insert();
if ( !$status ) {
@@ -786,7 +789,7 @@
$logaction = 'block';
}
 
-   Hooks::run( 'BlockIpComplete', [ $block, $performer ] );
+   Hooks::run( 'BlockIpComplete', [ $block, $performer, 
$currentBlock ] );
 
# Set *_deleted fields if requested
if ( $data['HideUser'] ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c31e71e99dad0296244ced72b1e8949b8a8fa3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Revert "Map dummy language codes in sites" - change (mediawiki/core)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Revert "Map dummy language codes in sites"
..

Revert "Map dummy language codes in sites"

This is causing duplicate English Wikipedia interwiki links. The second link is 
supposed to be for Simple English, but instead is linked to English Wikipedia.

Bug: T137404
This reverts commit 1c1c74adef8a2f5597472e8c049010ff4d42ff64.

Change-Id: Ibc1c53ec1b8e643b47ad52f38a8496acfb399d65
---
M includes/ServiceWiring.php
M includes/site/DBSiteStore.php
M includes/site/FileBasedSiteLookup.php
M tests/phpunit/includes/site/DBSiteStoreTest.php
M tests/phpunit/includes/site/FileBasedSiteLookupTest.php
5 files changed, 5 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/27/293627/1

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index e53b9ed..293e6eb 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -59,9 +59,6 @@
 
'SiteStore' => function( MediaWikiServices $services ) {
$rawSiteStore = new DBSiteStore( $services->getDBLoadBalancer() 
);
-   $rawSiteStore->setLanguageCodeMapping(
-   $services->getMainConfig()->get( 'DummyLanguageCodes' ) 
?: []
-   );
 
// TODO: replace wfGetCache with a CacheFactory service.
// TODO: replace wfIsHHVM with a capabilities service.
diff --git a/includes/site/DBSiteStore.php b/includes/site/DBSiteStore.php
index c1c10c2..974789f 100644
--- a/includes/site/DBSiteStore.php
+++ b/includes/site/DBSiteStore.php
@@ -41,11 +41,6 @@
private $dbLoadBalancer;
 
/**
-* @var string[]
-*/
-   private $languageCodeMapping = [];
-
-   /**
 * @since 1.27
 *
 * @todo: inject some kind of connection manager that is aware of the 
target wiki,
@@ -101,17 +96,15 @@
);
 
foreach ( $res as $row ) {
-   $languageCode = $row->site_language === '' ? null : 
$row->site_language;
-   if ( isset( $this->languageCodeMapping[ $languageCode ] 
) ) {
-   $languageCode = $this->languageCodeMapping[ 
$languageCode ];
-   }
-
$site = Site::newForType( $row->site_type );
$site->setGlobalId( $row->site_global_key );
$site->setInternalId( (int)$row->site_id );
$site->setForward( (bool)$row->site_forward );
$site->setGroup( $row->site_group );
-   $site->setLanguageCode( $languageCode );
+   $site->setLanguageCode( $row->site_language === ''
+   ? null
+   : $row->site_language
+   );
$site->setSource( $row->site_source );
$site->setExtraData( unserialize( $row->site_data ) );
$site->setExtraConfig( unserialize( $row->site_config ) 
);
@@ -292,15 +285,6 @@
$this->reset();
 
return $ok;
-   }
-
-   /**
-* Provide an array that maps language codes
-*
-* @param string[] $newMapping
-*/
-   public function setLanguageCodeMapping( array $newMapping ) {
-   $this->languageCodeMapping = $newMapping;
}
 
 }
diff --git a/includes/site/FileBasedSiteLookup.php 
b/includes/site/FileBasedSiteLookup.php
index 424d8e6..9654440 100644
--- a/includes/site/FileBasedSiteLookup.php
+++ b/includes/site/FileBasedSiteLookup.php
@@ -43,11 +43,6 @@
private $cacheFile;
 
/**
-* @var string[]
-*/
-   private $languageCodeMapping = [];
-
-   /**
 * @param string $cacheFile
 */
public function __construct( $cacheFile ) {
@@ -123,18 +118,13 @@
 * @return Site
 */
private function newSiteFromArray( array $data ) {
-   $languageCode = $data['language'];
-   if ( isset( $this->languageCodeMapping[ $languageCode ] ) ) {
-   $languageCode = $this->languageCodeMapping[ 
$languageCode ];
-   }
-
$siteType = array_key_exists( 'type', $data ) ? $data['type'] : 
Site::TYPE_UNKNOWN;
$site = Site::newForType( $siteType );
 
$site->setGlobalId( $data['globalid'] );
$site->setForward( $data['forward'] );
$site->setGroup( $data['group'] );
-   $site->setLanguageCode( $languageCode );
+   $site->setLanguageCode( $data['language'] );
$site->setSource( $data['source'] );
$site->setExtraData( $data['data'] );
$site->setExtraConfig( 

[MediaWiki-commits] [Gerrit] Add missing result page aliases - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Add missing result page aliases
..


Add missing result page aliases

Quiets some warnings

Change-Id: I4e78ae03c710b2041b477a82cdcedfd21d160294
---
M adyen_gateway/adyen_gateway.alias.php
M astropay_gateway/astropay_gateway.alias.php
M globalcollect_gateway/globalcollect_gateway.alias.php
M worldpay_gateway/worldpay_gateway.alias.php
4 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/adyen_gateway/adyen_gateway.alias.php 
b/adyen_gateway/adyen_gateway.alias.php
index 6be737e..137cedd 100644
--- a/adyen_gateway/adyen_gateway.alias.php
+++ b/adyen_gateway/adyen_gateway.alias.php
@@ -5,4 +5,5 @@
 /** English */
 $specialPageAliases['en'] = array(
'AdyenGateway' => array( 'AdyenGateway' ),
+   'AdyenGatewayResult' => array( 'AdyenGatewayResult' ),
 );
diff --git a/astropay_gateway/astropay_gateway.alias.php 
b/astropay_gateway/astropay_gateway.alias.php
index 4db46c0..f21c355 100644
--- a/astropay_gateway/astropay_gateway.alias.php
+++ b/astropay_gateway/astropay_gateway.alias.php
@@ -5,4 +5,5 @@
 /** English */
 $specialPageAliases['en'] = array(
'AstroPayGateway' => array( 'AstroPayGateway' ),
+   'AstroPayGatewayResult' => array( 'AstroPayGatewayResult' ),
 );
diff --git a/globalcollect_gateway/globalcollect_gateway.alias.php 
b/globalcollect_gateway/globalcollect_gateway.alias.php
index e59d33a..1357187 100644
--- a/globalcollect_gateway/globalcollect_gateway.alias.php
+++ b/globalcollect_gateway/globalcollect_gateway.alias.php
@@ -5,4 +5,5 @@
 /** English */
 $specialPageAliases['en'] = array(
'GlobalCollectGateway' => array( 'GlobalCollectGateway' ),
+   'GlobalCollectGatewayResult' => array( 'GlobalCollectGatewayResult' ),
 );
diff --git a/worldpay_gateway/worldpay_gateway.alias.php 
b/worldpay_gateway/worldpay_gateway.alias.php
index 80311ae..66ab2fd 100644
--- a/worldpay_gateway/worldpay_gateway.alias.php
+++ b/worldpay_gateway/worldpay_gateway.alias.php
@@ -5,4 +5,5 @@
 /** English */
 $specialPageAliases['en'] = array(
'WorldpayGateway' => array( 'WorldpayGateway' ),
+   'WorldpayGatewayResult' => array( 'WorldpayGatewayResult' ),
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e78ae03c710b2041b477a82cdcedfd21d160294
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
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 thumburl informations to FileInfo - change (pywikibot/core)

[Mpaa (Code Review)]

Mpaa has uploaded a new change for review.

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

Change subject: Add thumburl informations to FileInfo
..

Add thumburl informations to FileInfo

Add get_file_thumburl_info() to retreive and generate thumburl
information.

It relies directly on the API implementation and makes a call per each
generation.

Might not be efficient if several thumburls.

A proposal for further comments.

Bug: T137011
Change-Id: I3054cd96292f8976f60f3a3f470339305f223efe
---
M pywikibot/page.py
M pywikibot/site.py
M tests/file_tests.py
3 files changed, 74 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/26/293626/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index a59d379..1276e4d 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2280,6 +2280,37 @@
 file_revision = FileInfo(file_rev)
 self._file_revisions[file_revision.timestamp] = file_revision
 
+def get_file_thumburl_info(self, width=-1, height=-1, param=''):
+"""
+
+Retrieve and store information of latest Image rev. of FilePage.
+
+Thumburl information is included.
+
+At the same time, the cached self._file_revisions is cleaned and 
recreated,
+in order to include the thumburl information.
+
+Once reterieved, thumburl information will be accessible as 
latest_file_info
+attributes, named as in [1]: thumburl, thumbwidth and thumbheight
+
+Parameters correspond to iiprops in:
+[1] ../w/api.php?action=help=query+imageinfo
+
+Parameters validation and error handling left to the API call.
+
+@param width: see iiurlwidth in [1]
+@param height: see iiurlheigth in [1]
+@param param: see iiurlparam in [1]
+
+@return: latest file info
+@rtpe: FileInfo()
+"""
+self._file_revisions = {}
+self.site.loadimageinfo(self, history=True,
+url_width=width, url_height=height,
+url_param=param)
+return self.latest_file_info
+
 @property
 def latest_file_info(self):
 """
diff --git a/pywikibot/site.py b/pywikibot/site.py
index ce7f628..3edd8eb 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2906,15 +2906,27 @@
 )
 self._update_page(page, query, 'loadpageprops')
 
-def loadimageinfo(self, page, history=False):
+def loadimageinfo(self, page, history=False, url_width=-1, url_height=-1, 
url_param=''):
 """Load image info from api and save in page attributes.
 
+Parameters correspond to iiprops in:
+[1] ../w/api.php?action=help=query+imageinfo
+
+Parameters validation and error handling left to the API call.
+
 @param history: if true, return the image's version history
+@param url_width: see iiurlwidth in [1]
+@param url_height: see iiurlheigth in [1]
+@param url_param: see iiurlparam in [1]
+
 """
 title = page.title(withSection=False)
 args = {"titles": title}
 if not history:
 args["total"] = 1
+args.setdefault('iiurlwidth', url_width)
+args.setdefault('iiurlheight', url_height)
+args.setdefault('iiurlparam', url_param)
 query = self._generator(api.PropertyGenerator,
 type_arg="imageinfo",
 iiprop=["timestamp", "user", "comment",
diff --git a/tests/file_tests.py b/tests/file_tests.py
index d75cfd1..319746e 100644
--- a/tests/file_tests.py
+++ b/tests/file_tests.py
@@ -180,6 +180,36 @@
 self.assertIsInstance(latest[1], unicode)
 
 
+class TestFilePageThumbUrl(TestCase):
+
+"""Test FilePage.latest_revision_info.
+
+These tests cover generation of thumburls.
+
+"""
+
+family = 'commons'
+code = 'commons'
+
+cached = True
+
+def test_file_info_with_no_page(self):
+"""FilePage:latest_file_info raises NoPage for non existing pages."""
+site = self.get_site()
+image = pywikibot.FilePage(site, u'File:NoPage')
+self.assertFalse(image.exists())
+with self.assertRaises(pywikibot.NoPage):
+image = image.latest_file_info
+
+def test_file_info_with_no_file(self):
+"""FilePage:latest_file_info raises PagerelatedError if no file is 
present."""
+site = self.get_site()
+image = pywikibot.FilePage(site, u'File:Test with no image')
+self.assertTrue(image.exists())
+with self.assertRaises(pywikibot.PageRelatedError):
+image = image.latest_file_info
+
+
 if __name__ == '__main__':  # pragma: no cover
 try:
 unittest.main()

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] Shut up a warning, remove test code from prod - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Shut up a warning, remove test code from prod
..


Shut up a warning, remove test code from prod

There's no reason to check for test, given that testform is only
consulted in ( data.result.formaction || data.result.testform ),
to run some code that depends on formaction being set

Change-Id: I22ca7ce1f6560186e7c0934769fe8df822a178bb
---
M gateway_common/donation.api.php
M globalcollect_gateway/forms/js/gc.js
2 files changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/gateway_common/donation.api.php b/gateway_common/donation.api.php
index add7494..8daf499 100644
--- a/gateway_common/donation.api.php
+++ b/gateway_common/donation.api.php
@@ -64,9 +64,6 @@
if ( array_key_exists( 'gateway_params', $data ) ) {
$outputResult['gateway_params'] = 
$data['gateway_params'];
}
-   if ( $gatewayObj->getMerchantID() === 'test' ) {
-   $outputResult['testform'] = true;
-   }
if ( array_key_exists( 'RESPMSG', $data ) ) {
$outputResult['responsemsg'] = $data['RESPMSG'];
}
diff --git a/globalcollect_gateway/forms/js/gc.js 
b/globalcollect_gateway/forms/js/gc.js
index 608ae5c..94a3c16 100644
--- a/globalcollect_gateway/forms/js/gc.js
+++ b/globalcollect_gateway/forms/js/gc.js
@@ -80,7 +80,7 @@
$( '#payment' ).empty(); // Hide spinner

mediaWiki.donationInterface.validation.showErrors( data.result.errors );
$( '#paymentContinue' ).show(); // Show 
continue button in 2nd section
-   } else if ( data.result.formaction || 
data.result.testform ) {
+   } else if ( data.result.formaction ) {
mediaWiki.generatePaymentForm( data );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22ca7ce1f6560186e7c0934769fe8df822a178bb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
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 Capture IPN logging like Auth IPN logging - change (wikimedia...SmashPig)

[jenkins-bot (Code Review)]

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

Change subject: Make Capture IPN logging like Auth IPN logging
..


Make Capture IPN logging like Auth IPN logging

Add an info message saying we're queueing up a job, so ppl tailing the logs
expecting similar output to the Auth message don't think something's wrong.

Change-Id: Ic50fdb2d24029736557cbe1c7f91b4893461549b
---
M PaymentProviders/Adyen/Actions/CaptureResponseAction.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/PaymentProviders/Adyen/Actions/CaptureResponseAction.php 
b/PaymentProviders/Adyen/Actions/CaptureResponseAction.php
index 404d6b4..2fbc024 100644
--- a/PaymentProviders/Adyen/Actions/CaptureResponseAction.php
+++ b/PaymentProviders/Adyen/Actions/CaptureResponseAction.php
@@ -18,6 +18,9 @@
 
if ( $msg instanceof Capture ) {
if ( $msg->success ) {
+   $tl->info(
+   "Adding record capture job for 
{$msg->currency} {$msg->amount} with id {$msg->correlationId} and psp reference 
{$msg->pspReference}."
+   );
$recordJob = RecordCaptureJob::factory( $msg );
$jobQueue = 
Configuration::getDefaultConfig()->object( 'data-store/jobs' );
$jobQueue->addObject( $recordJob );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic50fdb2d24029736557cbe1c7f91b4893461549b
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

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