date:20160706

[MediaWiki-commits] [Gerrit] Remove 0 and O from the list of characters - change (mediawiki...UrlShortener)

2016-07-06 Thread Prtksxna (Code Review)

Prtksxna has uploaded a new change for review.

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

Change subject: Remove 0 and O from the list of characters
..

Remove 0 and O from the list of characters

Bug: T139511
Change-Id: Iacdeb7284eaa4b2c5bba1ada9adc5405af047cc5
---
M README
M extension.json
M tests/phpunit/UrlShortenerUtilsTest.php
3 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/README b/README
index d7dcb84..944c7ad 100644
--- a/README
+++ b/README
@@ -102,7 +102,7 @@
 destination.
 
 
-$wgUrlShortenerIdSet = 
'023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_';
+$wgUrlShortenerIdSet = 
'23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_';
 
 
 === Read-only mode ===
diff --git a/extension.json b/extension.json
index 07b3108..cb187e9 100644
--- a/extension.json
+++ b/extension.json
@@ -101,7 +101,7 @@
"UrlShortenerDBCluster": false,
"UrlShortenerDBName": false,
"UrlShortenerDomainsWhitelist": false,
-   "UrlShortenerIdSet": 
"023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_",
+   "UrlShortenerIdSet": 
"23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_",
"UrlShortenerServer": false,
"UrlShortenerTemplate": false,
"UrlShortenerAllowArbitraryPorts": false,
diff --git a/tests/phpunit/UrlShortenerUtilsTest.php 
b/tests/phpunit/UrlShortenerUtilsTest.php
index 91ff987..9b62af4 100644
--- a/tests/phpunit/UrlShortenerUtilsTest.php
+++ b/tests/phpunit/UrlShortenerUtilsTest.php
@@ -66,7 +66,7 @@
// Set default
$this->setMwGlobals(
'wgUrlShortenerIdSet',
-   
'023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_'
+   
'23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_'
);
for ( $i = 0; $i < 1000; $i++ ) {
$int = rand();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacdeb7284eaa4b2c5bba1ada9adc5405af047cc5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UrlShortener
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] Add English -> Polish Sfn->Odn template mapping - change (mediawiki...ContentTranslation)

2016-07-06 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Add English -> Polish Sfn->Odn template mapping
..

Add English -> Polish Sfn->Odn template mapping

See https://www.mediawiki.org/wiki/Topic:T794hy2laqs6knj8

Change-Id: I024ae2b8812cfa7f4d9c478c4456748c6dd3e587
---
A modules/source/conf/en-pl.json
1 file changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/modules/source/conf/en-pl.json b/modules/source/conf/en-pl.json
new file mode 100644
index 000..ce49a89
--- /dev/null
+++ b/modules/source/conf/en-pl.json
@@ -0,0 +1,11 @@
+{
+   "templates": {
+   "Sfn": {
+   "targetname": "Odn",
+   "editable": false,
+   "parameters": {
+   "p": "s"
+   }
+   }
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I024ae2b8812cfa7f4d9c478c4456748c6dd3e587
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] Remove ! and . and - from the list of allowed characters - change (mediawiki...UrlShortener)

2016-07-06 Thread Prtksxna (Code Review)

Prtksxna has uploaded a new change for review.

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

Change subject: Remove ! and . and - from the list of allowed characters
..

Remove ! and . and - from the list of allowed characters

Bug: T139515
Change-Id: Ic76e59711a64f128fb11ca7dc8886dabaaadc369
---
M README
M extension.json
M tests/phpunit/UrlShortenerUtilsTest.php
3 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/README b/README
index 1d00c67..d7dcb84 100644
--- a/README
+++ b/README
@@ -102,7 +102,7 @@
 destination.
 
 
-$wgUrlShortenerIdSet = 
'023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$-_.!';
+$wgUrlShortenerIdSet = 
'023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_';
 
 
 === Read-only mode ===
diff --git a/extension.json b/extension.json
index 655e901..07b3108 100644
--- a/extension.json
+++ b/extension.json
@@ -101,7 +101,7 @@
"UrlShortenerDBCluster": false,
"UrlShortenerDBName": false,
"UrlShortenerDomainsWhitelist": false,
-   "UrlShortenerIdSet": 
"023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$-_.!",
+   "UrlShortenerIdSet": 
"023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_",
"UrlShortenerServer": false,
"UrlShortenerTemplate": false,
"UrlShortenerAllowArbitraryPorts": false,
diff --git a/tests/phpunit/UrlShortenerUtilsTest.php 
b/tests/phpunit/UrlShortenerUtilsTest.php
index 6fd2453..91ff987 100644
--- a/tests/phpunit/UrlShortenerUtilsTest.php
+++ b/tests/phpunit/UrlShortenerUtilsTest.php
@@ -66,7 +66,7 @@
// Set default
$this->setMwGlobals(
'wgUrlShortenerIdSet',
-   
'023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$-_.!'
+   
'023456789ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz$_'
);
for ( $i = 0; $i < 1000; $i++ ) {
$int = rand();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic76e59711a64f128fb11ca7dc8886dabaaadc369
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UrlShortener
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] Drop language name from card title strings - change (apps...wikipedia)

2016-07-06 Thread BearND (Code Review)

BearND has uploaded a new change for review.

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

Change subject: Drop language name from card title strings
..

Drop language name from card title strings

"Today on English Wikipedia", with English is passed in as a parameter, is 
problematic for translations
to languages which have different suffixes for genders/declinations.
When I switched to German language and refreshed the explore feed, it said
"Today on Deutsch Wikipedia". When translated it would say
"Heute auf Deutsch Wikipedia", but it should say
"Heute auf der deutschen Wikipedia" instead. (It also requires an article.)
Even then it sounds weird.
When I got to German Wikipedia it just says
"Willkommen bei Wikipedia" and not
"Willkommen bei der deutschen Wikipedia". The language name is not used.

I grant that if you switch languages often and for testing it would be nice to 
see which
WP the feed is based on. It feels awkward for most people, and would be 
grammatically wrong.

Change-Id: Id5d832d03cc9e7af62442cac1575ab9d23ae29ce
---
M app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
M app/src/main/res/values/strings.xml
2 files changed, 3 insertions(+), 4 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java 
b/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
index 6e8c068..ab72356 100644
--- a/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
@@ -23,8 +23,7 @@
 
 public void set(@NonNull final RandomCard card) {
 setTitle(getString(R.string.view_random_card_title));
-
setSubtitle(String.format(getString(R.string.view_random_card_subtitle),
-
WikipediaApp.getInstance().getAppLanguageLocalizedName(card.site().languageCode(;
+setSubtitle(getString(R.string.view_random_card_subtitle));
 setIcon(R.drawable.icon_feed_random);
 setOnClickListener(new CallbackAdapter(card, callback));
 }
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index e283c20..4d1ee7c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -319,8 +319,8 @@
 Continue reading
 Because you read
 Randomizer
-Read a random article from %s 
Wikipedia
-Today on %s Wikipedia
+Read a random article from 
Wikipedia
+Today on Wikipedia
 Main page on %s
 Hide this card
 Card hidden.

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

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

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

[MediaWiki-commits] [Gerrit] Pass addModuleStyles an array instead of callind it multiple... - change (mediawiki/core)

2016-07-06 Thread Prtksxna (Code Review)

Prtksxna has uploaded a new change for review.

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

Change subject: Pass addModuleStyles an array instead of callind it multiple 
times
..

Pass addModuleStyles an array instead of callind it multiple times

Change-Id: Ia359c441714c039c505acd4bd37dd1b52c60b8ea
---
M includes/actions/HistoryAction.php
M includes/api/ApiHelp.php
M includes/page/ImagePage.php
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialContributions.php
5 files changed, 21 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/297741/1

diff --git a/includes/actions/HistoryAction.php 
b/includes/actions/HistoryAction.php
index 700e201..0df372e 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -116,8 +116,10 @@
// Setup page variables.
$out->setFeedAppendQuery( 'action=history' );
$out->addModules( 'mediawiki.action.history' );
-   $out->addModuleStyles( 'mediawiki.action.history.styles' );
-   $out->addModuleStyles( 'mediawiki.special.changeslist' );
+   $out->addModuleStyles( [
+   'mediawiki.action.history.styles',
+   'mediawiki.special.changeslist',
+   ] );
if ( $config->get( 'UseMediaWikiUIEverywhere' ) ) {
$out = $this->getOutput();
$out->addModuleStyles( [
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 0f0fbdc..a3bb6a2 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -100,8 +100,10 @@
}
 
$out = $context->getOutput();
-   $out->addModuleStyles( 'mediawiki.hlist' );
-   $out->addModuleStyles( 'mediawiki.apihelp' );
+   $out->addModuleStyles( [
+   'mediawiki.hlist',
+   'mediawiki.apihelp',
+   ] );
if ( !empty( $options['toc'] ) ) {
$out->addModules( 'mediawiki.toc' );
}
diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 106911c..1396685 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -222,11 +222,12 @@
$out->addStyle( $css );
}
}
-   // always show the local local Filepage.css, bug 29277
-   $out->addModuleStyles( 'filepage' );
 
-   // Add MediaWiki styles for a file page
-   $out->addModuleStyles( 'mediawiki.action.view.filepage' );
+   $out->addModuleStyles( [
+   'filepage', // always show the local local 
Filepage.css, bug 29277
+   'mediawiki.action.view.filepage', // Add MediaWiki 
styles for a file page
+   ] );
+
}
 
/**
diff --git a/includes/specialpage/ChangesListSpecialPage.php 
b/includes/specialpage/ChangesListSpecialPage.php
index 6c061b3..60f1dd8 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -475,9 +475,11 @@
protected function addModules() {
$out = $this->getOutput();
// Styles and behavior for the legend box (see makeLegend())
-   $out->addModuleStyles( 'mediawiki.special.changeslist.legend' );
+   $out->addModuleStyles( [
+   'mediawiki.special.changeslist.legend',
+   'mediawiki.special.changeslist',
+   ] );
$out->addModules( 'mediawiki.special.changeslist.legend.js' );
-   $out->addModuleStyles( 'mediawiki.special.changeslist' );
}
 
protected function getGroupName() {
diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index daf602b..cce88b9 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -37,8 +37,10 @@
$this->setHeaders();
$this->outputHeader();
$out = $this->getOutput();
-   $out->addModuleStyles( 'mediawiki.special' );
-   $out->addModuleStyles( 'mediawiki.special.changeslist' );
+   $out->addModuleStyles( [
+   'mediawiki.special',
+   'mediawiki.special.changeslist',
+   ] );
$this->addHelpLink( 'Help:User contributions' );
 
$this->opts = [];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia359c441714c039c505acd4bd37dd1b52c60b8ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core

[MediaWiki-commits] [Gerrit] Switched to 'Text' type for '__full' helper fields - change (mediawiki...Cargo)

2016-07-06 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Switched to 'Text' type for '__full' helper fields
..


Switched to 'Text' type for '__full' helper fields

Change-Id: Ia18ca465d4a5e9988f1fbc950e54923ea9278140
---
M CargoUtils.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/CargoUtils.php b/CargoUtils.php
index 3f8e2b5..78e4979 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -539,6 +539,7 @@
$dbType = $cdb->getType();
$intTypeString = self::fieldTypeToSQLType( 'Integer', $dbType );
$stringTypeString = self::fieldTypeToSQLType( 'String', $dbType 
);
+   $textTypeString = self::fieldTypeToSQLType( 'Text', $dbType );
 
$createSQL = "CREATE TABLE " .
$cdb->tableName( $tableName ) . ' ( ' .
@@ -561,8 +562,8 @@
// for holding each value.
$createSQL .= ', ' . $cdb->addIdentifierQuotes( 
$fieldName . '__full' ) . ' ';
// The field holding the full list will always
-   // just be text
-   $createSQL .= $stringTypeString;
+   // just be text - and it could be long.
+   $createSQL .= $textTypeString;
} else {
$createSQL .= ', ' . $cdb->addIdentifierQuotes( 
$fieldName ) . ' ';
$createSQL .= self::fieldTypeToSQLType( 
$fieldType, $dbType, $size );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia18ca465d4a5e9988f1fbc950e54923ea9278140
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wi... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment   
Submodule update
..


Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment
  Submodule update

8fe0710c6d955a921 Post upgrade logging tab isn't showing.

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I198c40dc7a61d508e9554dace3a5208e5cd79edd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wi... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment   
Submodule update
..

Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment
  Submodule update

8fe0710c6d955a921 Post upgrade logging tab isn't showing.

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/40/297740/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I198c40dc7a61d508e9554dace3a5208e5cd79edd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Submodule update - change (wikimedia...crm)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Submodule update
..


Submodule update

8fe0710c6d955a921 Post upgrade logging tab isn't showing.

Change-Id: I404f42b75fc88179b3e3111a47046591a81ec014
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/civicrm b/civicrm
index 91ed073..8fe0710 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 91ed0731daa4dd92f7158696f9478de7e1f9bace
+Subproject commit 8fe0710c6d955a921d2bb09861466eba8f49acf6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I404f42b75fc88179b3e3111a47046591a81ec014
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Switched to 'Text' type for '__full' helper fields - change (mediawiki...Cargo)

2016-07-06 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

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

Change subject: Switched to 'Text' type for '__full' helper fields
..

Switched to 'Text' type for '__full' helper fields

Change-Id: Ia18ca465d4a5e9988f1fbc950e54923ea9278140
---
M CargoUtils.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/39/297739/1

diff --git a/CargoUtils.php b/CargoUtils.php
index 3f8e2b5..78e4979 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -539,6 +539,7 @@
$dbType = $cdb->getType();
$intTypeString = self::fieldTypeToSQLType( 'Integer', $dbType );
$stringTypeString = self::fieldTypeToSQLType( 'String', $dbType 
);
+   $textTypeString = self::fieldTypeToSQLType( 'Text', $dbType );
 
$createSQL = "CREATE TABLE " .
$cdb->tableName( $tableName ) . ' ( ' .
@@ -561,8 +562,8 @@
// for holding each value.
$createSQL .= ', ' . $cdb->addIdentifierQuotes( 
$fieldName . '__full' ) . ' ';
// The field holding the full list will always
-   // just be text
-   $createSQL .= $stringTypeString;
+   // just be text - and it could be long.
+   $createSQL .= $textTypeString;
} else {
$createSQL .= ', ' . $cdb->addIdentifierQuotes( 
$fieldName ) . ' ';
$createSQL .= self::fieldTypeToSQLType( 
$fieldType, $dbType, $size );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia18ca465d4a5e9988f1fbc950e54923ea9278140
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] Submodule update - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Submodule update
..

Submodule update

8fe0710c6d955a921 Post upgrade logging tab isn't showing.

Change-Id: I404f42b75fc88179b3e3111a47046591a81ec014
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/38/297738/1

diff --git a/civicrm b/civicrm
index 91ed073..8fe0710 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 91ed0731daa4dd92f7158696f9478de7e1f9bace
+Subproject commit 8fe0710c6d955a921d2bb09861466eba8f49acf6

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I404f42b75fc88179b3e3111a47046591a81ec014
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] Post upgrade logging tab isn't showing. - change (wikimedia...civicrm)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Post upgrade logging tab isn't showing.
..


Post upgrade logging tab isn't showing.

I think the problem is the  method (now deprecated) for getting this info is 
not working well now

Change-Id: Iad3da7cd79f457d435406d04eb49590920d75eec
---
M CRM/Admin/Form/Setting/Localization.php
M CRM/Core/BAO/Log.php
M CRM/Logging/Schema.php
3 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/CRM/Admin/Form/Setting/Localization.php 
b/CRM/Admin/Form/Setting/Localization.php
index 5ad770b..26b72d0 100644
--- a/CRM/Admin/Form/Setting/Localization.php
+++ b/CRM/Admin/Form/Setting/Localization.php
@@ -88,7 +88,7 @@
   $validTriggerPermission = CRM_Core_DAO::checkTriggerViewPermission(TRUE);
 
   if ($validTriggerPermission &&
-!$config->logging
+!Civi::settings()->get('logging')
   ) {
 $this->addElement('checkbox', 'makeMultilingual', ts('Enable Multiple 
Languages'),
   NULL, array('onChange' => "if (this.checked) CRM.alert($warning, 
$warningTitle)")
diff --git a/CRM/Core/BAO/Log.php b/CRM/Core/BAO/Log.php
index 8e669e9..b1bd5a4 100644
--- a/CRM/Core/BAO/Log.php
+++ b/CRM/Core/BAO/Log.php
@@ -175,7 +175,7 @@
   public static function useLoggingReport() {
 // first check if logging is enabled
 $config = CRM_Core_Config::singleton();
-if (!$config->logging) {
+if (!Civi::settings()->get('logging')) {
   return FALSE;
 }
 
diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
index 402a77d..3abfdc5 100644
--- a/CRM/Logging/Schema.php
+++ b/CRM/Logging/Schema.php
@@ -806,6 +806,9 @@
   private function triggersExist() {
 // FIXME: probably should be a bit more thorough…
 // note that the LIKE parameter is TABLE NAME
+if (\Civi::settings()->get('logging_no_trigger_permission')) {
+  return TRUE;
+}
 return (bool) CRM_Core_DAO::singleValueQuery("SHOW TRIGGERS LIKE 
'civicrm_contact'");
   }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad3da7cd79f457d435406d04eb49590920d75eec
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't try to automatically get the version from the debian/c... - change (mediawiki...luasandbox)

2016-07-06 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Don't try to automatically get the version from the 
debian/changelog
..

Don't try to automatically get the version from the debian/changelog

The debian/ files are being moved to a separate branch to make it easier
for actual Debian packaging as recommended in
. Since
the debian/changelog file is no longer accessible, set
LUASANDBOX_VERSION to an alpha version. When a new version is released
and tagged, it should be updated as well.

Change-Id: I070266c9c2adbf78203c961d3226e477197c7a15
---
M .gitignore
M config.cmake
M config.m4
A luasandbox_version.h
4 files changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/37/297737/1

diff --git a/.gitignore b/.gitignore
index 8dae888..5e919f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,3 @@
 config.sub
 *.lo
 *.la
-luasandbox_version.h
diff --git a/config.cmake b/config.cmake
index ec50358..abd677a 100644
--- a/config.cmake
+++ b/config.cmake
@@ -9,11 +9,6 @@
   message(FATAL_ERROR "unable to find Lua 5.1")
 endif()
 
-# Parse version string from debian/changelog and use it to generate 
luasandbox_version.h
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/debian/changelog" CHANGELOG)
-string(REGEX REPLACE "\\s*php-luasandbox \\(([0-9._-]+).*" "\\1" 
LUASANDBOX_VERSION "${CHANGELOG}" )
-file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/luasandbox_version.h "\#define 
LUASANDBOX_VERSION \"${LUASANDBOX_VERSION}\"\n")
-
 HHVM_COMPAT_EXTENSION(luasandbox
   alloc.c
   data_conversion.c
diff --git a/config.m4 b/config.m4
index 5f9f941..1f32754 100644
--- a/config.m4
+++ b/config.m4
@@ -6,10 +6,6 @@
 PHP_ARG_WITH(luasandbox, for luasandbox support,
 [  --with-luasandbox Include luasandbox support])
 
-$GREP -m1 php-luasandbox $srcdir/debian/changelog \
-| $SED -e 's/.*(/#define LUASANDBOX_VERSION "/' -e 's/).*/"/' \
-> $srcdir/luasandbox_version.h
-
 if test "$PHP_LUASANDBOX" != "no"; then
dnl Include pkg-config macros definitions:
m4_include([m4/pkg.m4])
diff --git a/luasandbox_version.h b/luasandbox_version.h
new file mode 100644
index 000..8f1e6c8
--- /dev/null
+++ b/luasandbox_version.h
@@ -0,0 +1 @@
+#define LUASANDBOX_VERSION "2.0.13-alpha"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I070266c9c2adbf78203c961d3226e477197c7a15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
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] Post upgrade logging tab isn't showing. - change (wikimedia...civicrm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Post upgrade logging tab isn't showing.
..

Post upgrade logging tab isn't showing.

I think the problem is the  method (now deprecated) for getting this info is 
not working well now

Change-Id: Iad3da7cd79f457d435406d04eb49590920d75eec
---
M CRM/Core/BAO/Log.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/CRM/Core/BAO/Log.php b/CRM/Core/BAO/Log.php
index 8e669e9..b1bd5a4 100644
--- a/CRM/Core/BAO/Log.php
+++ b/CRM/Core/BAO/Log.php
@@ -175,7 +175,7 @@
   public static function useLoggingReport() {
 // first check if logging is enabled
 $config = CRM_Core_Config::singleton();
-if (!$config->logging) {
+if (!Civi::settings()->get('logging')) {
   return FALSE;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad3da7cd79f457d435406d04eb49590920d75eec
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] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

Merge the canary death

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b8732654a5fb00bfbaa7f0f5a2587458625f686
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

Merge the canary death

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/35/297735/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b8732654a5fb00bfbaa7f0f5a2587458625f686
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Kill the canary - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Kill the canary
..


Kill the canary

Change-Id: I673495142db7b6d41b017ec9ecb48d5cbf5ae69d
---
M sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
1 file changed, 3 insertions(+), 51 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql 
b/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
index 6195f7b..409a03a 100644
--- a/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
+++ b/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
@@ -1392,30 +1392,6 @@
 DELIMITER ;
 
 DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_before_insert //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_before_update //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_before_delete //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_insert //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_update //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_delete //
-DELIMITER ;
-
-DELIMITER //
 DROP TRIGGER IF EXISTS civicrm_job_before_insert //
 DELIMITER ;
 
@@ -3909,7 +3885,7 @@
 DELIMITER ;
 
 DELIMITER //
-CREATE TRIGGER civicrm_contact_before_insert before insert ON civicrm_contact 
FOR EACH ROW BEGIN  
+CREATE TRIGGER civicrm_contact_before_insert before insert ON civicrm_contact 
FOR EACH ROW BEGIN
 SET NEW.created_date = CURRENT_TIMESTAMP;
  END //
 DELIMITER ;
@@ -4933,30 +4909,6 @@
 DELIMITER ;
 
 DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_insert //
-DELIMITER ;
-
-DELIMITER //
-CREATE TRIGGER civicrm_install_canary_after_insert after insert ON 
civicrm_install_canary FOR EACH ROW BEGIN  IF ( @civicrm_disable_logging IS 
NULL OR @civicrm_disable_logging = 0 ) THEN INSERT INTO 
log_civicrm_install_canary (id, log_conn_id, log_user_id, log_action) VALUES ( 
NEW.id, COALESCE(@uniqueID, LEFT(CONCAT('c_', unix_timestamp()/3600, 
CONNECTION_ID()), 17)), @civicrm_user_id, 'insert'); END IF; END //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_update //
-DELIMITER ;
-
-DELIMITER //
-CREATE TRIGGER civicrm_install_canary_after_update after update ON 
civicrm_install_canary FOR EACH ROW BEGIN  IF ( (IFNULL(OLD.id,'') <> 
IFNULL(NEW.id,'')) AND ( @civicrm_disable_logging IS NULL OR 
@civicrm_disable_logging = 0 ) ) THEN INSERT INTO log_civicrm_install_canary 
(id, log_conn_id, log_user_id, log_action) VALUES (NEW.id, COALESCE(@uniqueID, 
LEFT(CONCAT('c_', unix_timestamp()/3600, CONNECTION_ID()), 17)), 
@civicrm_user_id, 'update'); END IF; END //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_delete //
-DELIMITER ;
-
-DELIMITER //
-CREATE TRIGGER civicrm_install_canary_after_delete after delete ON 
civicrm_install_canary FOR EACH ROW BEGIN  IF ( @civicrm_disable_logging IS 
NULL OR @civicrm_disable_logging = 0 ) THEN INSERT INTO 
log_civicrm_install_canary (id, log_conn_id, log_user_id, log_action) VALUES ( 
OLD.id, COALESCE(@uniqueID, LEFT(CONCAT('c_', unix_timestamp()/3600, 
CONNECTION_ID()), 17)), @civicrm_user_id, 'delete'); END IF; END //
-DELIMITER ;
-
-DELIMITER //
 DROP TRIGGER IF EXISTS civicrm_job_after_insert //
 DELIMITER ;
 
@@ -5860,7 +5812,7 @@
 DELIMITER ;
 
 DELIMITER //
-CREATE TRIGGER civicrm_phone_before_insert before insert ON civicrm_phone FOR 
EACH ROW BEGIN  
+CREATE TRIGGER civicrm_phone_before_insert before insert ON civicrm_phone FOR 
EACH ROW BEGIN
 SET NEW.phone_numeric = civicrm_strip_non_numeric(NEW.phone);
  END //
 DELIMITER ;
@@ -5881,7 +5833,7 @@
 DELIMITER ;
 
 DELIMITER //
-CREATE TRIGGER civicrm_phone_before_update before update ON civicrm_phone FOR 
EACH ROW BEGIN  
+CREATE TRIGGER civicrm_phone_before_update before update ON civicrm_phone FOR 
EACH ROW BEGIN
 SET NEW.phone_numeric = civicrm_strip_non_numeric(NEW.phone);
  END //
 DELIMITER ;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I673495142db7b6d41b017ec9ecb48d5cbf5ae69d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Kill the canary - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Kill the canary
..

Kill the canary

Change-Id: I673495142db7b6d41b017ec9ecb48d5cbf5ae69d
---
M sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
1 file changed, 3 insertions(+), 51 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/34/297734/1

diff --git a/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql 
b/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
index 6195f7b..409a03a 100644
--- a/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
+++ b/sites/all/modules/wmf_civicrm/scripts/4.7.trigger.mysql
@@ -1392,30 +1392,6 @@
 DELIMITER ;
 
 DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_before_insert //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_before_update //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_before_delete //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_insert //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_update //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_delete //
-DELIMITER ;
-
-DELIMITER //
 DROP TRIGGER IF EXISTS civicrm_job_before_insert //
 DELIMITER ;
 
@@ -3909,7 +3885,7 @@
 DELIMITER ;
 
 DELIMITER //
-CREATE TRIGGER civicrm_contact_before_insert before insert ON civicrm_contact 
FOR EACH ROW BEGIN  
+CREATE TRIGGER civicrm_contact_before_insert before insert ON civicrm_contact 
FOR EACH ROW BEGIN
 SET NEW.created_date = CURRENT_TIMESTAMP;
  END //
 DELIMITER ;
@@ -4933,30 +4909,6 @@
 DELIMITER ;
 
 DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_insert //
-DELIMITER ;
-
-DELIMITER //
-CREATE TRIGGER civicrm_install_canary_after_insert after insert ON 
civicrm_install_canary FOR EACH ROW BEGIN  IF ( @civicrm_disable_logging IS 
NULL OR @civicrm_disable_logging = 0 ) THEN INSERT INTO 
log_civicrm_install_canary (id, log_conn_id, log_user_id, log_action) VALUES ( 
NEW.id, COALESCE(@uniqueID, LEFT(CONCAT('c_', unix_timestamp()/3600, 
CONNECTION_ID()), 17)), @civicrm_user_id, 'insert'); END IF; END //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_update //
-DELIMITER ;
-
-DELIMITER //
-CREATE TRIGGER civicrm_install_canary_after_update after update ON 
civicrm_install_canary FOR EACH ROW BEGIN  IF ( (IFNULL(OLD.id,'') <> 
IFNULL(NEW.id,'')) AND ( @civicrm_disable_logging IS NULL OR 
@civicrm_disable_logging = 0 ) ) THEN INSERT INTO log_civicrm_install_canary 
(id, log_conn_id, log_user_id, log_action) VALUES (NEW.id, COALESCE(@uniqueID, 
LEFT(CONCAT('c_', unix_timestamp()/3600, CONNECTION_ID()), 17)), 
@civicrm_user_id, 'update'); END IF; END //
-DELIMITER ;
-
-DELIMITER //
-DROP TRIGGER IF EXISTS civicrm_install_canary_after_delete //
-DELIMITER ;
-
-DELIMITER //
-CREATE TRIGGER civicrm_install_canary_after_delete after delete ON 
civicrm_install_canary FOR EACH ROW BEGIN  IF ( @civicrm_disable_logging IS 
NULL OR @civicrm_disable_logging = 0 ) THEN INSERT INTO 
log_civicrm_install_canary (id, log_conn_id, log_user_id, log_action) VALUES ( 
OLD.id, COALESCE(@uniqueID, LEFT(CONCAT('c_', unix_timestamp()/3600, 
CONNECTION_ID()), 17)), @civicrm_user_id, 'delete'); END IF; END //
-DELIMITER ;
-
-DELIMITER //
 DROP TRIGGER IF EXISTS civicrm_job_after_insert //
 DELIMITER ;
 
@@ -5860,7 +5812,7 @@
 DELIMITER ;
 
 DELIMITER //
-CREATE TRIGGER civicrm_phone_before_insert before insert ON civicrm_phone FOR 
EACH ROW BEGIN  
+CREATE TRIGGER civicrm_phone_before_insert before insert ON civicrm_phone FOR 
EACH ROW BEGIN
 SET NEW.phone_numeric = civicrm_strip_non_numeric(NEW.phone);
  END //
 DELIMITER ;
@@ -5881,7 +5833,7 @@
 DELIMITER ;
 
 DELIMITER //
-CREATE TRIGGER civicrm_phone_before_update before update ON civicrm_phone FOR 
EACH ROW BEGIN  
+CREATE TRIGGER civicrm_phone_before_update before update ON civicrm_phone FOR 
EACH ROW BEGIN
 SET NEW.phone_numeric = civicrm_strip_non_numeric(NEW.phone);
  END //
 DELIMITER ;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I673495142db7b6d41b017ec9ecb48d5cbf5ae69d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] Set REPORT_EXIT_STATUS=1 so test failures fail the job in ph... - change (integration/config)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Set REPORT_EXIT_STATUS=1 so test failures fail the job in php 
exts
..


Set REPORT_EXIT_STATUS=1 so test failures fail the job in php exts

Unless the REPORT_EXIT_STATUS env variable is set, "make test" will
always return with an exit code of 0, regardless of whether the tests
are passing or not.

Change-Id: I456a40ebde1ea6d9751b94181449b4994cfc5bc1
---
M jjb/php-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jjb/php-extensions.yaml b/jjb/php-extensions.yaml
index 7f47034..9bf3bbf 100644
--- a/jjb/php-extensions.yaml
+++ b/jjb/php-extensions.yaml
@@ -10,7 +10,7 @@
 /usr/bin/phpize5
 ./configure
 make
-make test
+REPORT_EXIT_STATUS=1 make test
 
 - job-template:
 name: '{name}-compile-hhvm'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I456a40ebde1ea6d9751b94181449b4994cfc5bc1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Article actions should take up 100% width - change (mediawiki...MobileFrontend)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Article actions should take up 100% width
..


Article actions should take up 100% width

Move negative margin to language button itself so that it lines up
with left of title. The negative margin should not impact the edit
icon.

Bug: T137055
Change-Id: I71eddd9d500f613972acff0b6d7a29fe7f9679f1
---
M resources/skins.minerva.beta.styles/pageactions.less
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/resources/skins.minerva.beta.styles/pageactions.less 
b/resources/skins.minerva.beta.styles/pageactions.less
index e11beab..a285226 100644
--- a/resources/skins.minerva.beta.styles/pageactions.less
+++ b/resources/skins.minerva.beta.styles/pageactions.less
@@ -17,8 +17,6 @@
border-top: 1px solid @colorGray14;
border-bottom: 1px solid @colorGray12;
 
-   // align the left and right icons with the left and right borders 
respectively
-   margin: 0 -@iconGutterWidth;
padding: 0.5em 0;
 
li {
@@ -33,12 +31,17 @@
 
#language-switcher {
float: left;
+   margin-left: -@iconGutterWidth;
 
&.disabled {
cursor: default;
opacity: 0.25;
}
}
+
+   #ca-edit {
+   margin-right: -@iconGutterWidth;
+   }
 }
 
 @media all and ( min-width: @deviceWidthTablet ) {

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

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

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

[MediaWiki-commits] [Gerrit] Introduce new hook UploadVerifyUpload to allow preventing fi... - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Introduce new hook UploadVerifyUpload to allow preventing file 
uploads
..


Introduce new hook UploadVerifyUpload to allow preventing file uploads

The new hook runs at the beginning of UploadBase::performUpload().
Unlike the existing UploadVerifyFile hook, the new one provides the
information about the file description page being created, and the
user who is performing the upload. It also does not run for uploads
to stash.

The action=upload API and Special:Upload have been changed to treat
errors from UploadBase::performUpload() as recoverable, which means
that they will attempt to stash the file (previously they would require
the user to upload it again). This is mostly intended for errors from
the new hook, but I think it makes sense for the existing ones, which
are mostly transient filesystem erorrs.

Bug: T89302
Change-Id: Ie68801b307de8456e1753ba54a29c34c8063bc36
---
M docs/hooks.txt
M includes/api/ApiUpload.php
M includes/specials/SpecialUpload.php
M includes/upload/UploadBase.php
4 files changed, 38 insertions(+), 6 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  Jforrester: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/docs/hooks.txt b/docs/hooks.txt
index 1d11893..0e7c1c0 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3285,6 +3285,19 @@
   representing the problem with the file, where the first element is the 
message
   key and the remaining elements are used as parameters to the message.
 
+'UploadVerifyUpload': Upload verification, based on both file properties like
+MIME type (same as UploadVerifyFile) and the information entered by the user
+(upload comment, file page contents etc.).
+$upload: (object) An instance of UploadBase, with all info about the upload
+$user: (object) An instance of User, the user uploading this file
+$props: (array) File properties, as returned by FSFile::getPropsFromPath()
+$comment: (string) Upload log comment (also used as edit summary)
+$pageText: (string) File description page text (only used for new uploads)
+&$error: output: If the file upload should be prevented, set this to the reason
+  in the form of array( messagename, param1, param2, ... ) or a 
MessageSpecifier
+  instance (you might want to use ApiMessage to provide machine-readable 
details
+  for the API).
+
 'UserIsBot': when determining whether a user is a bot account
 $user: the user
 &$isBot: whether this is user a bot or not (boolean)
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 0a79aa4..3af0dff 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -350,9 +350,10 @@
 * @param array $error Error array suitable for passing to dieUsageMsg()
 * @param string $parameter Parameter that needs revising
 * @param array $data Optional extra data to pass to the user
+* @param string $code Error code to use if the error is unknown
 * @throws UsageException
 */
-   private function dieRecoverableError( $error, $parameter, $data = [] ) {
+   private function dieRecoverableError( $error, $parameter, $data = [], 
$code = 'unknownerror' ) {
try {
$data['filekey'] = $this->performStash();
$data['sessionkey'] = $data['filekey'];
@@ -364,6 +365,9 @@
$parsed = $this->parseMsg( $error );
if ( isset( $parsed['data'] ) ) {
$data = array_merge( $data, $parsed['data'] );
+   }
+   if ( $parsed['code'] === 'unknownerror' ) {
+   $parsed['code'] = $code;
}
 
$this->dieUsage( $parsed['info'], $parsed['code'], 0, $data );
@@ -754,9 +758,14 @@
$this->mParams['text'], $watch, 
$this->getUser(), $this->mParams['tags'] );
 
if ( !$status->isGood() ) {
-   $error = $status->getErrorsArray();
-   ApiResult::setIndexedTagName( $error, 'error' );
-   $this->dieUsage( 'An internal error occurred', 
'internal-error', 0, $error );
+   // Is there really no better way to do this?
+   $errors = $status->getErrorsByType( 'error' );
+   $msg = array_merge( [ $errors[0]['message'] ], 
$errors[0]['params'] );
+   $data = $status->getErrorsArray();
+   ApiResult::setIndexedTagName( $data, 'error' );
+   // For backwards-compatibility, we use the 
'internal-error' fallback key and merge $data
+   // into the root of the response (rather than 
something sane like [ 'details' => $data ]).
+

[MediaWiki-commits] [Gerrit] Remove unnecessary router.isSupported() check - change (mediawiki...Kartographer)

2016-07-06 Thread JGirault (Code Review)

JGirault has uploaded a new change for review.

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

Change subject: Remove unnecessary router.isSupported() check
..

Remove unnecessary router.isSupported() check

Bug: T139554
Change-Id: I2641e7f83c89c715b73e4aeb1d22bf0d4166d0a7
---
M modules/live/FullScreenControl.js
M modules/mapframe/mapframe.js
2 files changed, 1 insertion(+), 13 deletions(-)


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

diff --git a/modules/live/FullScreenControl.js 
b/modules/live/FullScreenControl.js
index 3137fd9..05dd4d0 100644
--- a/modules/live/FullScreenControl.js
+++ b/modules/live/FullScreenControl.js
@@ -15,9 +15,6 @@
this.map = map;
 
this.map.on( 'moveend', this.onMapMove, this );
-   if ( !router.isSupported() ) {
-   L.DomEvent.addListener( this.link, 'click', 
this.onShowFullScreen, this );
-   }
L.DomEvent.disableClickPropagation( container );
this.updateHash();
 
@@ -36,11 +33,6 @@
updateHash: function () {
var hash = mw.kartographer.getMapHash( 
this.options.mapData, this.map );
this.link.href = '#' + hash;
-   },
-
-   onShowFullScreen: function ( e ) {
-   L.DomEvent.stop( e );
-   mw.kartographer.openFullscreenMap( this.map, 
kartographer.getMapPosition( this.map ) );
}
} );
 } )( require( 'ext.kartographer.init' ), require( 'mediawiki.router' ) );
diff --git a/modules/mapframe/mapframe.js b/modules/mapframe/mapframe.js
index 0214d5d..c759ee5 100644
--- a/modules/mapframe/mapframe.js
+++ b/modules/mapframe/mapframe.js
@@ -110,11 +110,7 @@
mw.kartographer.maps[ index ] = map;
 
$container.on( 'dblclick', function () {
-   if ( router.isSupported() ) {
-   router.navigate( 
kartographer.getMapHash( mapData, map ) );
-   } else {
-   
kartographer.openFullscreenMap( map, kartographer.getMapPosition( map ) );
-   }
+   router.navigate( 
kartographer.getMapHash( mapData, map ) );
} );
 
// Special case for collapsible maps.

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

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

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

[MediaWiki-commits] [Gerrit] remove erbium, gadolinium from hiera - change (operations/puppet)

2016-07-06 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: remove erbium, gadolinium from hiera
..


remove erbium, gadolinium from hiera

These remnants should have been removed along with
I4e1dd35f7f4ea5. Thanks to Krenair for pointing them out.

Bug:T123029
Change-Id: Ibd51517478081d0d39cac8ecaa93309f7cecd609
---
D hieradata/hosts/erbium.yaml
D hieradata/hosts/gadolinium.yaml
2 files changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/hieradata/hosts/erbium.yaml b/hieradata/hosts/erbium.yaml
deleted file mode 100644
index b90e63a..000
--- a/hieradata/hosts/erbium.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-contactgroups: 'admins,analytics'
-admin::groups:
-  - restricted
diff --git a/hieradata/hosts/gadolinium.yaml b/hieradata/hosts/gadolinium.yaml
deleted file mode 100644
index 0530ce3..000
--- a/hieradata/hosts/gadolinium.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-contactgroups: 'admins,analytics'
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd51517478081d0d39cac8ecaa93309f7cecd609
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
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] Add disclaimer and title messages for steward contact form - change (mediawiki...WikimediaMessages)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Add disclaimer and title messages for steward contact form
..


Add disclaimer and title messages for steward contact form

Bug: T98625
Change-Id: I812d2840286d71285dc688c39ea391491636b874
---
M i18n/contactpage/en.json
M i18n/contactpage/qqq.json
2 files changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/i18n/contactpage/en.json b/i18n/contactpage/en.json
index b60ae2b..05289fc 100644
--- a/i18n/contactpage/en.json
+++ b/i18n/contactpage/en.json
@@ -59,5 +59,7 @@
"contactpage-affcom-user-group-terms-label": "I have read and agree to 
the above rules and to the [[Wikimedia user groups/Agreement and code of 
conduct|User group agreement and code of conduct]].",
"contactpage-affcom-user-group-logo-wm-logo": "''If you wish to use the 
'''Wikimedia logo''', you may [[Special:Contact/requestlicense|request a 
trademark license]].''",
"contactpage-affcom-user-group-logo-community": "Wikimedia community 
logo",
-   "contactpage-affcom-user-group-logo-affiliate": "Wikimedia affiliate 
logo"
+   "contactpage-affcom-user-group-logo-affiliate": "Wikimedia affiliate 
logo",
+   "contactpage-title-stewards": "Contact Stewards",
+   "contactpage-stewards-disclaimer-label": "Disclaimer: All information 
you include in this form is submitted to, processed by, and responded to by 
volunteer community members (specifically [[Special:MyLanguage/Stewards]]), not 
the Wikimedia Foundation. Please do not include any information that you are 
not comfortable sharing with Wikimedia volunteers. Responses and other 
correspondence related to processing your submitted information are not to be 
considered official statements of the Wikimedia Foundation. For official 
correspondence, please contact the Wikimedia Foundation through the methods 
listed on https://wikimediafoundation.org/wiki/Special:MyLanguage/Contact_us.;
 }
diff --git a/i18n/contactpage/qqq.json b/i18n/contactpage/qqq.json
index a654511..9699895 100644
--- a/i18n/contactpage/qqq.json
+++ b/i18n/contactpage/qqq.json
@@ -55,5 +55,7 @@
"contactpage-affcom-user-group-terms-label": "Label for the terms 
checkbox on [[meta:Special:Contact/affcomusergroup]].",
"contactpage-affcom-user-group-logo-wm-logo": "Text shown under the 
logo radio options on [[meta:Special:Contact/affcomusergroup]].",
"contactpage-affcom-user-group-logo-community": "Label for Wikimedia 
community logo radio option on [[meta:Special:Contact/affcomusergroup]].",
-   "contactpage-affcom-user-group-logo-affiliate": "Label for Wikimedia 
affiliate logo radio option on [[meta:Special:Contact/affcomusergroup]]."
+   "contactpage-affcom-user-group-logo-affiliate": "Label for Wikimedia 
affiliate logo radio option on [[meta:Special:Contact/affcomusergroup]].",
+   "contactpage-title-stewards": "Page title on 
[[meta:Special:Contact/stewards]].",
+   "contactpage-stewards-disclaimer-label": "Label for the disclaimer on 
[[meta:Special:Contact/stewards]]."
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I812d2840286d71285dc688c39ea391491636b874
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Ajraddatz 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
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 erbium, gadolinium from hiera - change (operations/puppet)

2016-07-06 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: remove erbium, gadolinium from hiera
..

remove erbium, gadolinium from hiera

These remnants should have been removed along with
I4e1dd35f7f4ea5. Thanks to Krenair for pointing them out.

Bug:T123029
Change-Id: Ibd51517478081d0d39cac8ecaa93309f7cecd609
---
D hieradata/hosts/erbium.yaml
D hieradata/hosts/gadolinium.yaml
2 files changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/297732/1

diff --git a/hieradata/hosts/erbium.yaml b/hieradata/hosts/erbium.yaml
deleted file mode 100644
index b90e63a..000
--- a/hieradata/hosts/erbium.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-contactgroups: 'admins,analytics'
-admin::groups:
-  - restricted
diff --git a/hieradata/hosts/gadolinium.yaml b/hieradata/hosts/gadolinium.yaml
deleted file mode 100644
index 0530ce3..000
--- a/hieradata/hosts/gadolinium.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-contactgroups: 'admins,analytics'
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd51517478081d0d39cac8ecaa93309f7cecd609
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] Make {name}-compile-(hhvm|php55) jobs generic - change (integration/config)

2016-07-06 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Make {name}-compile-(hhvm|php55) jobs generic
..

Make {name}-compile-(hhvm|php55) jobs generic

Change-Id: I20a93a3814d4b197525a9c481ca79e46d5a1997a
---
M jjb/php-extensions.yaml
M zuul/layout.yaml
2 files changed, 22 insertions(+), 61 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/31/297731/1

diff --git a/jjb/php-extensions.yaml b/jjb/php-extensions.yaml
index 9bf3bbf..23910ff 100644
--- a/jjb/php-extensions.yaml
+++ b/jjb/php-extensions.yaml
@@ -1,5 +1,5 @@
-- job-template:
-name: '{name}-compile-php55'
+- job:
+name: 'php-compile-php55'
 node: contintLabsSlave && UbuntuTrusty
 defaults: use-remoteonly-zuul
 triggers:
@@ -12,8 +12,8 @@
 make
 REPORT_EXIT_STATUS=1 make test
 
-- job-template:
-name: '{name}-compile-hhvm'
+- job:
+name: 'php-compile-hhvm'
 node: contintLabsSlave && UbuntuTrusty
 defaults: use-remoteonly-zuul
 triggers:
@@ -24,42 +24,3 @@
  hphpize
  cmake .
  make
-
-# FastStringSearch PHP extension
-- project:
-name: 'FastStringSearch'
-jobs:
- - '{name}-compile-php55'
- - '{name}-compile-hhvm'
-
-# NativePreprocessor PHP extension
-- project:
-name: 'NativePreprocessor'
-jobs:
- - '{name}-compile-php55'
-
-# luasandbox PHP extension
-- project:
-name: 'luasandbox'
-jobs:
- - '{name}-compile-php55'
- - '{name}-compile-hhvm'
-
-# wikidiff PHP extension
-- project:
-name: 'wikidiff'
-jobs:
- - '{name}-compile-php55'
-
-# wikidiff2 PHP extension
-- project:
-name: 'wikidiff2'
-jobs:
- - '{name}-compile-php55'
- - '{name}-compile-hhvm'
-
-# wmerrors PHP extension
-- project:
-name: 'wmerrors'
-jobs:
- - '{name}-compile-php55'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 77cd556..5957449 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7937,50 +7937,50 @@
   - name: mediawiki/php/FastStringSearch
 # no check pipeline since -build runs code :-)
 test:
-  - FastStringSearch-compile-hhvm
-  - FastStringSearch-compile-php55
+  - php-compile-hhvm
+  - php-compile-php55
 gate-and-submit:
-  - FastStringSearch-compile-hhvm
-  - FastStringSearch-compile-php55
+  - php-compile-hhvm
+  - php-compile-php55
 
   - name: mediawiki/php/luasandbox
 # no check pipeline since -build runs code :-)
 test:
-  - luasandbox-compile-hhvm
-  - luasandbox-compile-php55
+  - php-compile-hhvm
+  - php-compile-php55
 gate-and-submit:
-  - luasandbox-compile-hhvm
-  - luasandbox-compile-php55
+  - php-compile-hhvm
+  - php-compile-php55
 
   - name: mediawiki/php/NativePreprocessor
 # no check pipeline since -build runs code :-)
 test:
-  - NativePreprocessor-compile-php55
+  - php-compile-php55
 gate-and-submit:
-  - NativePreprocessor-compile-php55
+  - php-compile-php55
 
   - name: mediawiki/php/wikidiff
 # no check pipeline since -build runs code :-)
 test:
-  - wikidiff-compile-php55
+  - php-compile-php55
 gate-and-submit:
-  - wikidiff-compile-php55
+  - php-compile-php55
 
   - name: mediawiki/php/wikidiff2
 # no check pipeline since -build runs code :-)
 test:
-  - wikidiff2-compile-hhvm
-  - wikidiff2-compile-php55
+  - php-compile-hhvm
+  - php-compile-php55
 gate-and-submit:
-  - wikidiff2-compile-hhvm
-  - wikidiff2-compile-php55
+  - php-compile-hhvm
+  - php-compile-php55
 
   - name: mediawiki/php/wmerrors
 # no check pipeline since -build runs code :-)
 test:
-  - wmerrors-compile-php55
+  - php-compile-php55
 gate-and-submit:
-  - wmerrors-compile-php55
+  - php-compile-php55
 
   - name: mediawiki/oauthclient-php
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I20a93a3814d4b197525a9c481ca79e46d5a1997a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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] Set REPORT_EXIT_STATUS=1 so test failures fail the job in ph... - change (integration/config)

2016-07-06 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Set REPORT_EXIT_STATUS=1 so test failures fail the job in php 
exts
..

Set REPORT_EXIT_STATUS=1 so test failures fail the job in php exts

Unless the REPORT_EXIT_STATUS env variable is set, "make test" will
always return with an exit code of 0, regardless of whether the tests
are passing or not.

Change-Id: I456a40ebde1ea6d9751b94181449b4994cfc5bc1
---
M jjb/php-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/30/297730/1

diff --git a/jjb/php-extensions.yaml b/jjb/php-extensions.yaml
index 7f47034..9bf3bbf 100644
--- a/jjb/php-extensions.yaml
+++ b/jjb/php-extensions.yaml
@@ -10,7 +10,7 @@
 /usr/bin/phpize5
 ./configure
 make
-make test
+REPORT_EXIT_STATUS=1 make test
 
 - job-template:
 name: '{name}-compile-hhvm'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I456a40ebde1ea6d9751b94181449b4994cfc5bc1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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] Refactoring: remove underscore prefixes from identifiers - change (mediawiki...wikidiff2)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Refactoring: remove underscore prefixes from identifiers
..


Refactoring: remove underscore prefixes from identifiers

Change-Id: I8c76c32678efe2b6237b2df6122187cd3a7d754f
---
M DiffEngine.h
1 file changed, 21 insertions(+), 21 deletions(-)

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



diff --git a/DiffEngine.h b/DiffEngine.h
index 646bb08..1f92f9f 100644
--- a/DiffEngine.h
+++ b/DiffEngine.h
@@ -91,7 +91,7 @@
  */
 
 template
-class _DiffEngine
+class DiffEngine
 {
public:
// Vectors
@@ -116,16 +116,16 @@
typedef std::set ValueSet;
 #endif
 
-   _DiffEngine() : done(false) {}
+   DiffEngine() : done(false) {}
void clear();
void diff (const ValueVector & from_lines,
const ValueVector & to_lines, Diff & diff);
-   int _lcs_pos (int ypos);
-   void _compareseq (int xoff, int xlim, int yoff, int ylim);
-   void _shift_boundaries (const ValueVector & lines, BoolVector & 
changed,
+   int lcs_pos (int ypos);
+   void compareseq (int xoff, int xlim, int yoff, int ylim);
+   void shift_boundaries (const ValueVector & lines, BoolVector & 
changed,
const BoolVector & other_changed);
protected:
-   int _diag (int xoff, int xlim, int yoff, int ylim, int nchunks,
+   int diag (int xoff, int xlim, int yoff, int ylim, int nchunks,
IntPairVector & seps);
 
BoolVector xchanged, ychanged;
@@ -139,10 +139,10 @@
 };
 
 //-
-// _DiffEngine implementation
+// DiffEngine implementation
 //-
 template
-void _DiffEngine::clear()
+void DiffEngine::clear()
 {
xchanged.clear();
ychanged.clear();
@@ -156,7 +156,7 @@
 }
 
 template
-void _DiffEngine::diff (const ValueVector & from_lines,
+void DiffEngine::diff (const ValueVector & from_lines,
const ValueVector & to_lines, Diff & diff)
 {
int n_from = (int)from_lines.size();
@@ -208,11 +208,11 @@
}
 
// Find the LCS.
-   _compareseq(0, xv.size(), 0, yv.size());
+   compareseq(0, xv.size(), 0, yv.size());
 
// Merge edits when possible
-   _shift_boundaries(from_lines, xchanged, ychanged);
-   _shift_boundaries(to_lines, ychanged, xchanged);
+   shift_boundaries(from_lines, xchanged, ychanged);
+   shift_boundaries(to_lines, ychanged, xchanged);
 
// Compute the edit operations.
xi = yi = 0;
@@ -271,7 +271,7 @@
  * of the portions it is going to specify.
  */
 template 
-int _DiffEngine::_diag (int xoff, int xlim, int yoff, int ylim, int nchunks,
+int DiffEngine::diag (int xoff, int xlim, int yoff, int ylim, int nchunks,
IntPairVector & seps)
 {
using std::swap;
@@ -328,7 +328,7 @@
 
for (y = pMatches->begin(); y != pMatches->end(); ++y) {
if (!in_seq.count(*y)) {
-   k = _lcs_pos(*y);
+   k = lcs_pos(*y);
assert(k > 0);
copy(ymids.begin() + (k-1) * nchunks, 
ymids.begin() + k * nchunks,
ymids.begin() + k * 
nchunks);
@@ -345,7 +345,7 @@
seq[k] = *y;
in_seq.insert(*y);
} else if (!in_seq.count(*y)) {
-   k = _lcs_pos(*y);
+   k = lcs_pos(*y);
assert(k > 0);
copy(ymids.begin() + (k-1) * nchunks, 
ymids.begin() + k * nchunks,
ymids.begin() + k * 
nchunks);
@@ -369,7 +369,7 @@
 }
 
 template 
-int _DiffEngine::_lcs_pos (int ypos) {
+int DiffEngine::lcs_pos (int ypos) {
int end = lcs;
if (end == 0 || ypos > seq[end]) {
seq[++lcs] = ypos;
@@ -406,7 +406,7 @@
  * All line numbers are origin-0 and discarded lines are not counted.
  */
 template 
-void _DiffEngine::_compareseq (int xoff, int xlim, int yoff, int ylim) {
+void DiffEngine::compareseq (int xoff, int xlim, int yoff, int ylim) {
using std::pair;
 
IntPairVector seps;
@@ -431,7 +431,7 @@
//nchunks = sqrt(min(xlim - xoff, ylim - yoff) / 2.5);
//nchunks = max(2,min(8,(int)nchunks));
int

[MediaWiki-commits] [Gerrit] Add tables for PageAssessments extension - change (mediawiki...WikimediaMaintenance)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Add tables for PageAssessments extension
..


Add tables for PageAssessments extension

Change-Id: Ifd2fc3cdb00dc99e8531e60b38b31799986994b2
---
M createExtensionTables.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/createExtensionTables.php b/createExtensionTables.php
index 625f940..a585166 100644
--- a/createExtensionTables.php
+++ b/createExtensionTables.php
@@ -79,6 +79,14 @@
$path = "$IP/extensions/Translate/sql";
break;
 
+   case 'pageassessments':
+   $files = array(
+   'addProjectsTable.sql',
+   'addReviewsTable.sql',
+   );
+   $path = "$IP/extensions/PageAssessments/db";
+   break;
+
case 'wikilove':
$files = array( 'WikiLoveLog.sql' );
$path = "$IP/extensions/WikiLove/patches";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd2fc3cdb00dc99e8531e60b38b31799986994b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Jcrespo 
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] Use RL to make RapidHTML wait for document ready - change (mediawiki...DonationInterface)

2016-07-06 Thread Cdentinger (Code Review)

Cdentinger has uploaded a new change for review.

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

Change subject: Use RL to make RapidHTML wait for document ready
..

Use RL to make RapidHTML wait for document ready

This is probably an unacceptably bad user experience because at least on
vagrant there is a visual repaint as the js applies the new styles.

Bug: T139551
Change-Id: I724a033088e4ee0b0fb203ee0054dfc328b6c2bc
---
M gateway_forms/RapidHtml.php
1 file changed, 19 insertions(+), 0 deletions(-)


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

diff --git a/gateway_forms/RapidHtml.php b/gateway_forms/RapidHtml.php
index fed21b4..303da17 100644
--- a/gateway_forms/RapidHtml.php
+++ b/gateway_forms/RapidHtml.php
@@ -157,6 +157,25 @@
public function getForm() {
$html = $this->load_html();
$html = $this->replace_blocks( $html );
+
+   // Since 1.26 one can no longer count on mw being available
+   // before document ready. Need to wrap these calls with RL.
+   $dom = new DOMDocument();
+   $dom->loadHTML($html);
+   // Get the first script from the partial.
+   $oldnode = $dom->getElementsByTagName('script')->item(0);
+   // Get the script value (no tags).
+   $script = $oldnode->nodeValue;
+   // Add RLQ voodoo (also adds script tags).
+   $script = ResourceLoader::makeInlineScript( $script );
+   // Remove the tags as DomDoc won't print literals.
+   $script = substr( $script, 8 );
+   $script = substr( $script, 0, -9 );
+   // Make the new node and insert it.
+   $newnode = $dom->createElement( 'script', $script );
+   $oldnode->parentNode->replaceChild( $newnode, $oldnode );
+   $html = $dom->saveHTML();
+
return $this->add_data( $html );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wi... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment

Show triggers as permitted if the setting says to manage them offline

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I283dc8ec0cf059f15bb02f4cc6520bf4fad3b977
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wi... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment

Show triggers as permitted if the setting says to manage them offline

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/28/297728/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I283dc8ec0cf059f15bb02f4cc6520bf4fad3b977
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] Submodule update Show triggers as permitted if the setting s... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Submodule update Show triggers as permitted if the setting says 
to manage them offline
..


Submodule update Show triggers as permitted if the setting says to manage them 
offline

Change-Id: I9b539d339d0679017bb3c298d7c598062f47400e
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/civicrm b/civicrm
index 03db286..91ed073 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 03db28679749beeb5a91424f8ae67fb77a880cbf
+Subproject commit 91ed0731daa4dd92f7158696f9478de7e1f9bace

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b539d339d0679017bb3c298d7c598062f47400e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] icinga, tendril: remove duplicate NameVirtualHost *:80 - change (operations/puppet)

2016-07-06 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: icinga,tendril: remove duplicate NameVirtualHost *:80
..

icinga,tendril: remove duplicate NameVirtualHost *:80

Removing these lines here because the same line is already in
/etc/apache2/ports.conf from the default file as it comes from the
distro.

And if we have multiple of these, we are getting:

"[warn] NameVirtualHost *:80 has no VirtualHosts" on config check / reloads.

And, in combination with logrotate, this means cron spam as described on T132661

Both of these are on neon.

root@neon:/etc/apache2# grep -r NameVirtual *
ports.conf:NameVirtualHost *:80
ports.conf:# If you add NameVirtualHost *:443 here, you will also have to 
change
sites-available/50-tendril-wikimedia-org.conf:NameVirtualHost *:80
sites-available/50-tendril-wikimedia-org.conf:NameVirtualHost *:443
sites-available/50-icinga-wikimedia-org.conf:NameVirtualHost *:80
sites-available/50-icinga-wikimedia-org.conf:NameVirtualHost *:443
sites-available/50-ishmael-wikimedia-org.conf:NameVirtualHost *:80
sites-enabled/50-tendril-wikimedia-org.conf:NameVirtualHost *:80
sites-enabled/50-tendril-wikimedia-org.conf:NameVirtualHost *:443
sites-enabled/50-icinga-wikimedia-org.conf:NameVirtualHost *:80
sites-enabled/50-icinga-wikimedia-org.conf:NameVirtualHost *:443

Bug:T132661
Change-Id: I64681c5af825a975a5f5fcddf3734e0b51cdab97
---
M modules/icinga/templates/icinga.wikimedia.org.erb
M modules/tendril/templates/apache/tendril.wikimedia.org.erb
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/297727/1

diff --git a/modules/icinga/templates/icinga.wikimedia.org.erb 
b/modules/icinga/templates/icinga.wikimedia.org.erb
index 0a16b02..ad4c99d 100644
--- a/modules/icinga/templates/icinga.wikimedia.org.erb
+++ b/modules/icinga/templates/icinga.wikimedia.org.erb
@@ -1,6 +1,5 @@
 # vim: filetype=apache
 
-NameVirtualHost *:80
 NameVirtualHost *:443
 
 AddHandler cgi-script .cgi
diff --git a/modules/tendril/templates/apache/tendril.wikimedia.org.erb 
b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
index c1a6efa..d0be602 100644
--- a/modules/tendril/templates/apache/tendril.wikimedia.org.erb
+++ b/modules/tendril/templates/apache/tendril.wikimedia.org.erb
@@ -1,7 +1,6 @@
 # vim: filetype=apache
 # !! this file is managed by puppet !!
 
-NameVirtualHost *:80
 NameVirtualHost *:443
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64681c5af825a975a5f5fcddf3734e0b51cdab97
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] Submodule update Show triggers as permitted if the setting s... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Submodule update Show triggers as permitted if the setting says 
to manage them offline
..

Submodule update Show triggers as permitted if the setting says to manage them 
offline

Change-Id: I9b539d339d0679017bb3c298d7c598062f47400e
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/26/297726/1

diff --git a/civicrm b/civicrm
index 03db286..91ed073 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 03db28679749beeb5a91424f8ae67fb77a880cbf
+Subproject commit 91ed0731daa4dd92f7158696f9478de7e1f9bace

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b539d339d0679017bb3c298d7c598062f47400e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] WIP fix dependencies for legacy forms in 1.26 - change (mediawiki...DonationInterface)

2016-07-06 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: WIP fix dependencies for legacy forms in 1.26
..

WIP fix dependencies for legacy forms in 1.26

Change-Id: I33d5cf0060f193af9a442a7a6cc6a47c7c5c27d0
---
M DonationInterfaceFormSettings.php
M gateway_forms/RapidHtml.php
M globalcollect_gateway/forms/html/bt/bt.html
M globalcollect_gateway/forms/html/cash/boletos.html
M globalcollect_gateway/forms/html/cc/cc-a.html
M globalcollect_gateway/forms/html/cc/cc-jvma.html
M globalcollect_gateway/forms/html/cc/cc-vjma.html
M globalcollect_gateway/forms/html/cc/cc-vm.html
M globalcollect_gateway/forms/html/cc/cc-vma.html
M globalcollect_gateway/forms/html/cc/cc-vmad.html
M globalcollect_gateway/forms/html/cc/cc-vmaj.html
M globalcollect_gateway/forms/html/cc/cc-vmd.html
M globalcollect_gateway/forms/html/cc/cc-vmj.html
M globalcollect_gateway/forms/html/cc/cc.html
M globalcollect_gateway/forms/html/dd/dd-recurring.html
M globalcollect_gateway/forms/html/dd/dd.html
M globalcollect_gateway/forms/html/ew/ew-alipay.html
M globalcollect_gateway/forms/html/ew/ew-webmoney.html
M globalcollect_gateway/forms/html/ew/ew-yandex.html
M globalcollect_gateway/forms/html/obt/obt-bpay.html
M globalcollect_gateway/forms/html/rcc/rcc-vm.html
M globalcollect_gateway/forms/html/rcc/rcc-vma.html
M globalcollect_gateway/forms/html/rcc/rcc-vmad.html
M globalcollect_gateway/forms/html/rcc/rcc-vmaj.html
M globalcollect_gateway/forms/html/rcc/rcc-vmd.html
M globalcollect_gateway/forms/html/rcc/rcc-vmj.html
M globalcollect_gateway/forms/html/rcc/rcc.html
M globalcollect_gateway/forms/html/rtbt/rtbt-enets.html
M globalcollect_gateway/forms/html/rtbt/rtbt-eps.html
M globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html
M globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html
M globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html
M globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html
M globalcollect_gateway/forms/html/webitects2nd-AU.html
M globalcollect_gateway/forms/html/webitects2nd-US.html
M globalcollect_gateway/forms/html/webitects2nd-amex.html
M globalcollect_gateway/forms/html/webitects2nd.html
M globalcollect_gateway/forms/html/webitects2nd_green-US.html
M globalcollect_gateway/forms/html/webitects_2_3step-CA.html
M globalcollect_gateway/forms/html/webitects_2_3step.html
M globalcollect_gateway/forms/html/webitects_2_3stepB-US.html
41 files changed, 103 insertions(+), 72 deletions(-)


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

diff --git a/DonationInterfaceFormSettings.php 
b/DonationInterfaceFormSettings.php
index f79c7cd..2df336c 100644
--- a/DonationInterfaceFormSettings.php
+++ b/DonationInterfaceFormSettings.php
@@ -1,4 +1,5 @@
  $form_dirs['gc'] . '/bt/bt.html',
+   'dependencies' =>
+   array (
+   'gc.form.rapidhtml.webitects.bt',
+   'gc.form.rapidhtml.webitects.ie6',
+   ),
'gateway' => 'globalcollect',
'countries' => array(
'-' => 'VN',
@@ -67,6 +73,7 @@
 
 $forms_whitelist['ew-alipay'] = array(
'file' => $form_dirs['gc'] . '/ew/ew-alipay.html',
+   'dependencies' => 'gc.form.rapidhtml.ew',
'gateway' => 'globalcollect',
'payment_methods' => array('ew' => 'ew_alipay'),
'countries' => array( '+' => array( 'CN', 'HK', ), ),
@@ -80,6 +87,11 @@
 
 $forms_whitelist['rtbt-sofo'] = array(
'file' => $form_dirs['gc'] . '/rtbt/rtbt-sofo.html',
+   'dependencies' =>
+   array (
+   0 => 'gc.form.rapidhtml.webitects.bt',
+   1 => 'gc.form.rapidhtml.webitects.ie6',
+   ),
'gateway' => 'globalcollect',
'countries' => array(
'+' => array( 'AT', 'BE', 'CH', 'DE' ),
@@ -91,6 +103,11 @@
 
 $forms_whitelist['rtbt-sofo-GB'] = array(
'file' => $form_dirs['gc'] . '/rtbt/rtbt-sofo-GB.html',
+   'dependencies' =>
+   array (
+   0 => 'gc.form.rapidhtml.webitects.bt',
+   1 => 'gc.form.rapidhtml.webitects.ie6',
+   ),
'gateway' => 'globalcollect',
'countries' => array( '+' => 'GB' ),
'currencies' => array( '+' => 'GBP' ),
@@ -99,6 +116,11 @@
 
 $forms_whitelist['rtbt-ideal'] = array(
'file' => $form_dirs['gc'] . '/rtbt/rtbt-ideal.html',
+   'dependencies' =>
+   array (
+   0 => 'gc.form.rapidhtml.rtbt',
+   1 => 'gc.form.rapidhtml.webitects.ie6',
+   ),
'gateway' => 'globalcollect',
'payment_methods' => array('rtbt' => 'rtbt_ideal'),
'countries' => array( '+' => 'NL' ),
@@ -107,6 +129,11 @@
 
 $forms_whitelist['rtbt-enets'] = array(
'file' => $form_dirs['gc'] . '/rtbt/rtbt-enets.html',
+   'dependencies' =>
+

[MediaWiki-commits] [Gerrit] Show triggers as permitted if the setting says to manage the... - change (wikimedia...civicrm)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Show triggers as permitted if the setting says to manage them 
offline
..


Show triggers as permitted if the setting says to manage them offline

Change-Id: I6c134bbac83c45847d76b743ee35b38534e2776b
---
M CRM/Core/DAO.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 4e942b1..b9d87bd 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -1895,6 +1895,9 @@
* @return bool
*/
   public static function checkTriggerViewPermission($view = TRUE, $trigger = 
TRUE) {
+if (\Civi::settings()->get('logging_no_trigger_permission')) {
+  return TRUE;
+}
 // test for create view and trigger permissions and if allowed, add the 
option to go multilingual
 // and logging
 // I'm not sure why we use the getStaticProperty for an error, rather than 
checking for DB_Error

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c134bbac83c45847d76b743ee35b38534e2776b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Show triggers as permitted if the setting says to manage the... - change (wikimedia...civicrm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Show triggers as permitted if the setting says to manage them 
offline
..

Show triggers as permitted if the setting says to manage them offline

Change-Id: I6c134bbac83c45847d76b743ee35b38534e2776b
---
M CRM/Core/DAO.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 4e942b1..b9d87bd 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -1895,6 +1895,9 @@
* @return bool
*/
   public static function checkTriggerViewPermission($view = TRUE, $trigger = 
TRUE) {
+if (\Civi::settings()->get('logging_no_trigger_permission')) {
+  return TRUE;
+}
 // test for create view and trigger permissions and if allowed, add the 
option to go multilingual
 // and logging
 // I'm not sure why we use the getStaticProperty for an error, rather than 
checking for DB_Error

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c134bbac83c45847d76b743ee35b38534e2776b
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] gerrit: remove NameVirtualHost *:80 from Apache template - change (operations/puppet)

2016-07-06 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: gerrit: remove NameVirtualHost *:80 from Apache template
..

gerrit: remove NameVirtualHost *:80 from Apache template

Removing this here because it already comes per default from the
distro in /etc/apache2/ports.conf.

NameVirtualHost *:80

If we have it in both places, we are getting
" [warn] NameVirtualHost *:80 has no VirtualHosts" on config check / reload.

And this, in combination with logrotate crons, means cron spam mail as reported
on T132661.

Bug:T132661
Change-Id: I58c5a61295e0903a69a5c73c9d554a6efe4f981a
---
M modules/gerrit/templates/gerrit.wikimedia.org.erb
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb 
b/modules/gerrit/templates/gerrit.wikimedia.org.erb
index 50ca2bc..dbe728a 100644
--- a/modules/gerrit/templates/gerrit.wikimedia.org.erb
+++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb
@@ -8,7 +8,6 @@
 # Failed" Error messages, we limit connections already here.
 MaxClients 50
 
-NameVirtualHost *:80
 
 ServerAdmin n...@wikimedia.org
 ServerName <%= @host %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58c5a61295e0903a69a5c73c9d554a6efe4f981a
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] Syncronize VisualEditor: 9de8c61..07da2af - change (mediawiki/extensions)

2016-07-06 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 9de8c61..07da2af
..

Syncronize VisualEditor: 9de8c61..07da2af

Change-Id: Id4dcf21913f8989313f1cf3c375f45b50ec6c61a
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 9de8c61..07da2af 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 9de8c610b7166907c3a10bb2f13921dd44bf5433
+Subproject commit 07da2af53f9fedd61763366b29391d6519991afa

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4dcf21913f8989313f1cf3c375f45b50ec6c61a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9de8c61..07da2af - change (mediawiki/extensions)

2016-07-06 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 9de8c61..07da2af
..


Syncronize VisualEditor: 9de8c61..07da2af

Change-Id: Id4dcf21913f8989313f1cf3c375f45b50ec6c61a
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 9de8c61..07da2af 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 9de8c610b7166907c3a10bb2f13921dd44bf5433
+Subproject commit 07da2af53f9fedd61763366b29391d6519991afa

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4dcf21913f8989313f1cf3c375f45b50ec6c61a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Fix undefined variable - change (mediawiki...VisualEditor)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix undefined variable
..


Fix undefined variable

Change-Id: Iba39e0a26a04cad28179aacd4f25b9aef1cfa7fc
---
M ApiVisualEditorEdit.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index e65d371..32e2b1f 100644
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -221,7 +221,7 @@
}
 
$context = new RequestContext;
-   $context->setTitle( $page );
+   $context->setTitle( $title );
$tempOut = new OutputPage( $context );
$tempOut->setArticleFlag( true );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba39e0a26a04cad28179aacd4f25b9aef1cfa7fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Esanders 
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] Wikibase: Fix entityNamespaces setting - change (mediawiki/vagrant)

2016-07-06 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Wikibase: Fix entityNamespaces setting
..

Wikibase: Fix entityNamespaces setting

Change-Id: Ib69af753445910e7cd33d51f256fdfc3726dc0a6
---
M puppet/modules/role/templates/wikidata/shared.php.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/20/297720/1

diff --git a/puppet/modules/role/templates/wikidata/shared.php.erb 
b/puppet/modules/role/templates/wikidata/shared.php.erb
index a614d6c..e8e8931 100644
--- a/puppet/modules/role/templates/wikidata/shared.php.erb
+++ b/puppet/modules/role/templates/wikidata/shared.php.erb
@@ -4,10 +4,10 @@
$wgNamespaceAliases['Item_talk'] = NS_TALK;
 
// Tell Wikibase which namespace to use for which kind of entity
-   $wgWBRepoSettings['entityNamespaces']['wikibase-item'] = NS_MAIN;
+   $wgWBRepoSettings['entityNamespaces']['item'] = NS_MAIN;
define( 'WB_NS_PROPERTY', 122 );
define( 'WB_NS_PROPERTY_TALK', 123 );
-   $wgWBRepoSettings['entityNamespaces']['wikibase-property'] = 
WB_NS_PROPERTY;
+   $wgWBRepoSettings['entityNamespaces']['property'] = WB_NS_PROPERTY;
 
// Register extra namespaces.
$wgWBNamespaces[WB_NS_PROPERTY] = 'Property';

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

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

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

[MediaWiki-commits] [Gerrit] Create a separate Wikidata main page - change (mediawiki/vagrant)

2016-07-06 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Create a separate Wikidata main page
..

Create a separate Wikidata main page

Works around the default main page being in the main namespace,
which is supposed to be for Wikibase entities.

Bug: T128466
Change-Id: I9f618440b267733aa583296e123e171657c5d976
---
M puppet/hieradata/common.yaml
M puppet/modules/role/manifests/wikidata.pp
2 files changed, 22 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/21/297721/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index c462ff1..5983d5b 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -384,6 +384,8 @@
 
 role::sentry::dsn: "%{hiera('sentry::dsn_file')}"
 
+role::wikidata::main_page: "Wiki:Main Page"
+
 role::wikimetrics::dir: "%{hiera('mwv::services_dir')}/wikimetrics"
 
 scholarships::vhost_name: "scholarships%{hiera('mwv::tld')}"
diff --git a/puppet/modules/role/manifests/wikidata.pp 
b/puppet/modules/role/manifests/wikidata.pp
index 498921d..1bf7355 100644
--- a/puppet/modules/role/manifests/wikidata.pp
+++ b/puppet/modules/role/manifests/wikidata.pp
@@ -3,13 +3,32 @@
 # wikis clients to it. It uses the live composer managed wikidata modules from
 # gerrit.
 #
-class role::wikidata {
+# [*main_page*]
+#   Title of main page
+class role::wikidata(
+$main_page
+) {
 require ::role::mediawiki
 include ::role::sitematrix
 
 mediawiki::wiki { 'wikidata': }
 ensure_resource('mediawiki::wiki', 'en')
 
+# TODO: If you visit Main_Page in the main namespace (created by
+# the installer), it will still throw an error.  Could add an
+# option to installer to choose main page title.
+mediawiki::import::text { $main_page:
+content => 'Welcome to Wikidata',
+wiki=> 'wikidata',
+db_name => 'wikidatawiki',
+}
+
+mediawiki::import::text { 'MediaWiki:Mainpage':
+content => $main_page,
+wiki=> 'wikidata',
+db_name => 'wikidatawiki',
+}
+
 mediawiki::extension { 'WikidataBuildResources':
 remote   => 
'https://gerrit.wikimedia.org/r/wikidata/build-resources',
 entrypoint   => 'Wikidata.php',

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

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

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

[MediaWiki-commits] [Gerrit] import::text: Support page names with spaces - change (mediawiki/vagrant)

2016-07-06 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: import::text: Support page names with spaces
..

import::text: Support page names with spaces

Change-Id: Id7898afe033e0ebacef31fe1893dfc0de34af7ab
---
M puppet/modules/mediawiki/manifests/import/text.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/19/297719/1

diff --git a/puppet/modules/mediawiki/manifests/import/text.pp 
b/puppet/modules/mediawiki/manifests/import/text.pp
index 9582c41..01420eb 100644
--- a/puppet/modules/mediawiki/manifests/import/text.pp
+++ b/puppet/modules/mediawiki/manifests/import/text.pp
@@ -58,7 +58,7 @@
 }
 
 mediawiki::maintenance { "add page ${wiki}/${page_title}":
-command => "/usr/local/bin/mwscript edit.php --wiki=${db_name} 
--summary='Vagrant import' --no-rc '${page_title}' < ${path}",
+command => "/usr/local/bin/mwscript edit.php --wiki=${db_name} 
--summary='Vagrant import' --no-rc '${page_title}' < '${path}'",
 refreshonly => true,
 require => [
 Mediawiki::Wiki[$wiki],

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

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

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

[MediaWiki-commits] [Gerrit] Correct section (alert/message/all) - change (mediawiki...Echo)

2016-07-06 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Correct section (alert/message/all)
..

Correct section (alert/message/all)

Fix issue where it said 'View x messages' in the alerts popup.

Change-Id: I4b6d00f0ba704ec76c6b5068ab923e51d5804f07
---
M modules/controller/mw.echo.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/controller/mw.echo.Controller.js 
b/modules/controller/mw.echo.Controller.js
index 94b074d..a6a1041 100644
--- a/modules/controller/mw.echo.Controller.js
+++ b/modules/controller/mw.echo.Controller.js
@@ -323,7 +323,7 @@
var content = apiData[ '*' ] || {};
 
return {
-   // type: controller.type,
+   type: apiData.section,
foreign: false,
source: 'local',
count: apiData.count,

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

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

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

[MediaWiki-commits] [Gerrit] Use random/title endpoint instead of random/summary - change (apps...wikipedia)

2016-07-06 Thread BearND (Code Review)

BearND has uploaded a new change for review.

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

Change subject: Use random/title endpoint instead of random/summary
..

Use random/title endpoint instead of random/summary

Bug: T139424
Change-Id: I4ac0a5e15d9540d9e53a4766d88099a31f69bdf2
---
M app/src/main/java/org/wikipedia/random/RandomSummaryService.java
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/random/RandomSummaryService.java 
b/app/src/main/java/org/wikipedia/random/RandomSummaryService.java
index 18e6556..6df9e81 100644
--- a/app/src/main/java/org/wikipedia/random/RandomSummaryService.java
+++ b/app/src/main/java/org/wikipedia/random/RandomSummaryService.java
@@ -51,14 +51,14 @@
 
 @Override
 public void onFailure(Call call, Throwable t) {
-L.w("Failed to get random page title/summary", t);
+L.w("Failed to get random page title", t);
 cb.onError(t);
 }
 });
 }
 
 private interface RbRandomSummaryClient {
-@GET("page/random/summary")
+@GET("page/random/title")
 @NonNull Call get();
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Fix typo - change (mediawiki...ORES)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix typo
..


Fix typo

Change-Id: I88e75793f59555340e9bd4fdbdec1dabdf243062
---
M maintenance/PopulateDatabase.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/maintenance/PopulateDatabase.php b/maintenance/PopulateDatabase.php
index 0f9b57d..608f869 100644
--- a/maintenance/PopulateDatabase.php
+++ b/maintenance/PopulateDatabase.php
@@ -99,7 +99,7 @@
 */
private function processScores( array $revs, Scoring $scoring, Cache 
$cache ) {
$size = count( $revs );
-   $this->output( "Processing $size revsisions\n" );
+   $this->output( "Processing $size revisions\n" );
 
$scores = $scoring->getScores( $revs );
$cache->storeScores( $scores, true );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I88e75793f59555340e9bd4fdbdec1dabdf243062
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
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] mediawiki.api: Don't abort token requests in postWithToken() - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: mediawiki.api: Don't abort token requests in postWithToken()
..


mediawiki.api: Don't abort token requests in postWithToken()

Per Ie05d267f1.

Other requests can still make use of the token, even if this one won't, so
only abort the actual request if it is currently running, otherwise abort it
as soon as the token request finishes.

The only caveat with this method is an abort while a token request is running
isn't instantaneous, which perhaps isn't expected, but I doubt it matters.

Change-Id: Ib34e2e3a7f8ca5eb0832c4a6c1623a638381e6c8
---
M resources/src/mediawiki/api.js
1 file changed, 24 insertions(+), 5 deletions(-)

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



diff --git a/resources/src/mediawiki/api.js b/resources/src/mediawiki/api.js
index 3e010d0..a8ee4c7 100644
--- a/resources/src/mediawiki/api.js
+++ b/resources/src/mediawiki/api.js
@@ -289,10 +289,20 @@
 */
postWithToken: function ( tokenType, params, ajaxOptions ) {
var api = this,
-   abortable;
+   abortedPromise = $.Deferred().reject( 'http',
+   { textStatus: 'abort', exception: 
'abort' } ).promise(),
+   abortable,
+   aborted;
 
-   return ( abortable = api.getToken( tokenType, 
params.assert ) ).then( function ( token ) {
+   return api.getToken( tokenType, params.assert ).then( 
function ( token ) {
params.token = token;
+   // Request was aborted while token request was 
running, but we
+   // don't want to unnecessarily abort token 
requests, so abort
+   // a fake request instead
+   if ( aborted ) {
+   return abortedPromise;
+   }
+
return ( abortable = api.post( params, 
ajaxOptions ) ).then(
// If no error, return to caller as-is
null,
@@ -302,9 +312,14 @@
api.badToken( tokenType 
);
// Try again, once
params.token = 
undefined;
-   return ( abortable = 
api.getToken( tokenType, params.assert ) ).then( function ( token ) {
+   abortable = null;
+   return api.getToken( 
tokenType, params.assert ).then( function ( token ) {
params.token = 
token;
-   return ( 
abortable = api.post( params, ajaxOptions ) ).promise();
+   if ( aborted ) {
+   return 
abortedPromise;
+   }
+
+   return ( 
abortable = api.post( params, ajaxOptions ) );
} );
}
 
@@ -313,7 +328,11 @@
}
);
} ).promise( { abort: function () {
-   abortable.abort();
+   if ( abortable ) {
+   abortable.abort();
+   } else {
+   aborted = true;
+   }
} } );
},
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib34e2e3a7f8ca5eb0832c4a6c1623a638381e6c8
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Majr 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Majr 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Implement WrappedStringList - change (WrappedString)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Implement WrappedStringList
..


Implement WrappedStringList

This allows a caller to collect an array of WrappedString objects, join them.
And then hand it off in a string-compatible manner to another caller which can
then still extend that list further.

Use case is MediaWiki core where we collect wrapped strings as multiple layers.
Right now they can only be merged within a single method because it needs to
expose it as a string instead of an array. Which means the caller loses
information.

This new class would allow OutputPage::getInlineHeadScripts() and 
buildCssLinks()
to return WrappedStringList which will act as before if treated as a string.
But for the common case where OutputPage::headElement() calls these two methods
it can continue to merge compatible objects.

Change-Id: I19e80ce9a4c1414bd8339cae1254062c3d0d6975
---
M src/WrappedString.php
A src/WrappedStringList.php
A tests/WrappedStringListTest.php
M tests/WrappedStringTest.php
4 files changed, 211 insertions(+), 6 deletions(-)

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



diff --git a/src/WrappedString.php b/src/WrappedString.php
index 20ef6ce..5f69389 100644
--- a/src/WrappedString.php
+++ b/src/WrappedString.php
@@ -62,14 +62,16 @@
}
 
/**
-* Merge consecutive wrapped strings with the same before/after values.
+* Merge consecutive WrappedString objects with the same prefix and 
suffix.
 *
 * Does not modify the array or the WrappedString objects.
 *
+* NOTE: This is an internal method. Use join() or WrappedStringList 
instead.
+*
 * @param WrappedString[] $wraps
-* @return WrappedString[]
+* @return WrappedString[] Compacted list
 */
-   protected static function compact( array &$wraps ) {
+   public static function compact( array $wraps ) {
$consolidated = array();
$prev = current( $wraps );
while ( ( $wrap = next( $wraps ) ) !== false ) {
@@ -93,14 +95,18 @@
}
 
/**
-* Join a several wrapped strings with a separator between each.
+* Join several wrapped strings with a separator between each.
+*
+* This method is compatibile with native PHP implode(). The actual join
+* operation is deferred to WrappedStringList::__toString(). This allows
+* callers to collect multiple lists and compact them together.
 *
 * @param string $sep
 * @param WrappedString[] $wraps
-* @return string
+* @return WrappedStringList
 */
public static function join( $sep, array $wraps ) {
-   return implode( $sep, self::compact( $wraps ) );
+   return new WrappedStringList( $sep, $wraps );
}
 
/** @return string */
diff --git a/src/WrappedStringList.php b/src/WrappedStringList.php
new file mode 100644
index 000..f511c2d
--- /dev/null
+++ b/src/WrappedStringList.php
@@ -0,0 +1,108 @@
+
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @file
+ */
+
+namespace WrappedString;
+
+class WrappedStringList {
+   /** @var string */
+   protected $sep;
+
+   /** @var WrappedString[] */
+   protected $wraps;
+
+   /**
+* @param string $sep
+* @param WrappedString[] $wraps
+*/
+   public function __construct( $sep, array $wraps ) {
+   $this->sep = $sep;
+   $this->wraps = $wraps;
+   }
+
+   /**
+* @params WrappedString[] $wraps
+* @return WrappedStringList Combined list
+*/
+   protected function extend( array $wraps ) {
+   $list = clone $this;
+   $list->wraps = array_merge( $list->wraps, $wraps );
+

[MediaWiki-commits] [Gerrit] Fix undefined variable - change (mediawiki...VisualEditor)

2016-07-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Fix undefined variable
..

Fix undefined variable

Change-Id: Iba39e0a26a04cad28179aacd4f25b9aef1cfa7fc
---
M ApiVisualEditorEdit.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index e65d371..32e2b1f 100644
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -221,7 +221,7 @@
}
 
$context = new RequestContext;
-   $context->setTitle( $page );
+   $context->setTitle( $title );
$tempOut = new OutputPage( $context );
$tempOut->setArticleFlag( true );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba39e0a26a04cad28179aacd4f25b9aef1cfa7fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
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] Make LocalRename jobs run sequentially - change (mediawiki...CentralAuth)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Make LocalRename jobs run sequentially
..


Make LocalRename jobs run sequentially

Running the job parallel on each wiki caused problems for users with
many accounts due to DB errors when all jobs tried to change the
central user record at the same time. Run one wiki after the other instead,
with each job scheduling the next job when it is finished.

Bug: T137973
Change-Id: I00f2710080897030a3e44a8c8490d991d703bb21
(cherry picked from commit 053b4ce1e137d7bbade69bcf2f8c6dcd17e0651f)
---
M includes/GlobalRename/GlobalRenameUser.php
M includes/GlobalRename/GlobalRenameUserStatus.php
M includes/LocalRenameJob/LocalRenameJob.php
3 files changed, 59 insertions(+), 9 deletions(-)

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



diff --git a/includes/GlobalRename/GlobalRenameUser.php 
b/includes/GlobalRename/GlobalRenameUser.php
index 59b69b8..f3a6c8d 100644
--- a/includes/GlobalRename/GlobalRenameUser.php
+++ b/includes/GlobalRename/GlobalRenameUser.php
@@ -173,9 +173,12 @@
 */
private function injectLocalRenameUserJobs( array $wikis, array 
$options ) {
$job = $this->getJob( $options );
-   // Submit the jobs.
-   foreach( $wikis as $wiki ) {
-   call_user_func( $this->jobQueueGroupGenerator, $wiki 
)->push( $job );
+   $statuses = $this->renameuserStatus->getStatuses( 
GlobalRenameUserStatus::READ_LATEST );
+   foreach ( $statuses as $wiki => $status ) {
+   if ( $status === 'queued' ) {
+   call_user_func( $this->jobQueueGroupGenerator, 
$wiki )->push( $job );
+   break;
+   }
}
}
 
diff --git a/includes/GlobalRename/GlobalRenameUserStatus.php 
b/includes/GlobalRename/GlobalRenameUserStatus.php
index 1d2bb6e..ecb6101 100644
--- a/includes/GlobalRename/GlobalRenameUserStatus.php
+++ b/includes/GlobalRename/GlobalRenameUserStatus.php
@@ -9,7 +9,7 @@
  * @author Marius Hoch < h...@online.de >
  */
 
-class GlobalRenameUserStatus {
+class GlobalRenameUserStatus implements IDBAccessObject {
 
/**
 * Either old or new name of the user
@@ -96,16 +96,20 @@
 * Get a user's rename status for all wikis.
 * Returns an array ( wiki => status )
 *
+* @param integer $flags IDBAccessObject flags
+*
 * @return array
 */
-   public function getStatuses() {
-   $dbr = $this->getDB();
+   public function getStatuses( $flags = 0 ) {
+   list( $index, $options ) = DBAccessObjectUtils::getDBOptions( 
$flags );
+   $db = $this->getDB( $index );
 
-   $res = $dbr->select(
+   $res = $db->select(
'renameuser_status',
array( 'ru_wiki', 'ru_status' ),
-   array( $this->getNameWhereClause( $dbr ) ),
-   __METHOD__
+   array( $this->getNameWhereClause( $db ) ),
+   __METHOD__,
+   $options
);
 
$statuses = array();
@@ -117,6 +121,19 @@
}
 
/**
+* Get a user's rename status for the current wiki.
+*
+* @param integer $flags IDBAccessObject flags
+*
+* @return string|null Null means no rename pending for this user on 
the current wiki (possibly
+*   because it has finished already).
+*/
+   public function getStatus( $flags = 0 ) {
+   $statuses = $this->getStatuses( $flags );
+   return isset( $statuses[wfWikiID()] ) ? $statuses[wfWikiID()] : 
null;
+   }
+
+   /**
 * Set the rename status for a certain wiki
 *
 * @param string $wiki
diff --git a/includes/LocalRenameJob/LocalRenameJob.php 
b/includes/LocalRenameJob/LocalRenameJob.php
index c4285b6..d696338 100644
--- a/includes/LocalRenameJob/LocalRenameJob.php
+++ b/includes/LocalRenameJob/LocalRenameJob.php
@@ -1,5 +1,7 @@
 setRenameUserStatus( new GlobalRenameUserStatus( 
$this->params['to'] ) );
+
+   // bail if it's already done or in progress
+   $status = $this->renameuserStatus->getStatus( 
GlobalRenameUserStatus::READ_LATEST );
+   if ( $status !== 'queued' && $status !== 'failed' ) {
+   LoggerFactory::getInstance( 'rename' )->info( 'skipping 
duplicate rename from {user}', [
+   'user' => $this->params['from'],
+   'to' => $this->params['to'],
+   'status' => $status,
+   ] );
+   return true;
+   }
+
if ( isset( $this->params['session'] ) ) {

[MediaWiki-commits] [Gerrit] Make LocalRename jobs run sequentially - change (mediawiki...CentralAuth)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Make LocalRename jobs run sequentially
..


Make LocalRename jobs run sequentially

Running the job parallel on each wiki caused problems for users with
many accounts due to DB errors when all jobs tried to change the
central user record at the same time. Run one wiki after the other instead,
with each job scheduling the next job when it is finished.

Bug: T137973
Change-Id: I00f2710080897030a3e44a8c8490d991d703bb21
(cherry picked from commit 053b4ce1e137d7bbade69bcf2f8c6dcd17e0651f)
---
M includes/GlobalRename/GlobalRenameUser.php
M includes/GlobalRename/GlobalRenameUserStatus.php
M includes/LocalRenameJob/LocalRenameJob.php
3 files changed, 59 insertions(+), 9 deletions(-)

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



diff --git a/includes/GlobalRename/GlobalRenameUser.php 
b/includes/GlobalRename/GlobalRenameUser.php
index 59b69b8..f3a6c8d 100644
--- a/includes/GlobalRename/GlobalRenameUser.php
+++ b/includes/GlobalRename/GlobalRenameUser.php
@@ -173,9 +173,12 @@
 */
private function injectLocalRenameUserJobs( array $wikis, array 
$options ) {
$job = $this->getJob( $options );
-   // Submit the jobs.
-   foreach( $wikis as $wiki ) {
-   call_user_func( $this->jobQueueGroupGenerator, $wiki 
)->push( $job );
+   $statuses = $this->renameuserStatus->getStatuses( 
GlobalRenameUserStatus::READ_LATEST );
+   foreach ( $statuses as $wiki => $status ) {
+   if ( $status === 'queued' ) {
+   call_user_func( $this->jobQueueGroupGenerator, 
$wiki )->push( $job );
+   break;
+   }
}
}
 
diff --git a/includes/GlobalRename/GlobalRenameUserStatus.php 
b/includes/GlobalRename/GlobalRenameUserStatus.php
index 1d2bb6e..ecb6101 100644
--- a/includes/GlobalRename/GlobalRenameUserStatus.php
+++ b/includes/GlobalRename/GlobalRenameUserStatus.php
@@ -9,7 +9,7 @@
  * @author Marius Hoch < h...@online.de >
  */
 
-class GlobalRenameUserStatus {
+class GlobalRenameUserStatus implements IDBAccessObject {
 
/**
 * Either old or new name of the user
@@ -96,16 +96,20 @@
 * Get a user's rename status for all wikis.
 * Returns an array ( wiki => status )
 *
+* @param integer $flags IDBAccessObject flags
+*
 * @return array
 */
-   public function getStatuses() {
-   $dbr = $this->getDB();
+   public function getStatuses( $flags = 0 ) {
+   list( $index, $options ) = DBAccessObjectUtils::getDBOptions( 
$flags );
+   $db = $this->getDB( $index );
 
-   $res = $dbr->select(
+   $res = $db->select(
'renameuser_status',
array( 'ru_wiki', 'ru_status' ),
-   array( $this->getNameWhereClause( $dbr ) ),
-   __METHOD__
+   array( $this->getNameWhereClause( $db ) ),
+   __METHOD__,
+   $options
);
 
$statuses = array();
@@ -117,6 +121,19 @@
}
 
/**
+* Get a user's rename status for the current wiki.
+*
+* @param integer $flags IDBAccessObject flags
+*
+* @return string|null Null means no rename pending for this user on 
the current wiki (possibly
+*   because it has finished already).
+*/
+   public function getStatus( $flags = 0 ) {
+   $statuses = $this->getStatuses( $flags );
+   return isset( $statuses[wfWikiID()] ) ? $statuses[wfWikiID()] : 
null;
+   }
+
+   /**
 * Set the rename status for a certain wiki
 *
 * @param string $wiki
diff --git a/includes/LocalRenameJob/LocalRenameJob.php 
b/includes/LocalRenameJob/LocalRenameJob.php
index c4285b6..d696338 100644
--- a/includes/LocalRenameJob/LocalRenameJob.php
+++ b/includes/LocalRenameJob/LocalRenameJob.php
@@ -1,5 +1,7 @@
 setRenameUserStatus( new GlobalRenameUserStatus( 
$this->params['to'] ) );
+
+   // bail if it's already done or in progress
+   $status = $this->renameuserStatus->getStatus( 
GlobalRenameUserStatus::READ_LATEST );
+   if ( $status !== 'queued' && $status !== 'failed' ) {
+   LoggerFactory::getInstance( 'rename' )->info( 'skipping 
duplicate rename from {user}', [
+   'user' => $this->params['from'],
+   'to' => $this->params['to'],
+   'status' => $status,
+   ] );
+   return true;
+   }
+
if ( isset( $this->params['session'] ) ) {

[MediaWiki-commits] [Gerrit] Fix typo - change (mediawiki...ORES)

2016-07-06 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: Fix typo
..

Fix typo

Change-Id: I88e75793f59555340e9bd4fdbdec1dabdf243062
---
M maintenance/PopulateDatabase.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/maintenance/PopulateDatabase.php b/maintenance/PopulateDatabase.php
index 0f9b57d..608f869 100644
--- a/maintenance/PopulateDatabase.php
+++ b/maintenance/PopulateDatabase.php
@@ -99,7 +99,7 @@
 */
private function processScores( array $revs, Scoring $scoring, Cache 
$cache ) {
$size = count( $revs );
-   $this->output( "Processing $size revsisions\n" );
+   $this->output( "Processing $size revisions\n" );
 
$scores = $scoring->getScores( $revs );
$cache->storeScores( $scores, true );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88e75793f59555340e9bd4fdbdec1dabdf243062
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] Add tables for PageAssessments extension - change (mediawiki...WikimediaMaintenance)

2016-07-06 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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

Change subject: Add tables for PageAssessments extension
..

Add tables for PageAssessments extension

Change-Id: Ifd2fc3cdb00dc99e8531e60b38b31799986994b2
---
M createExtensionTables.php
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/14/297714/1

diff --git a/createExtensionTables.php b/createExtensionTables.php
index 625f940..a585166 100644
--- a/createExtensionTables.php
+++ b/createExtensionTables.php
@@ -79,6 +79,14 @@
$path = "$IP/extensions/Translate/sql";
break;
 
+   case 'pageassessments':
+   $files = array(
+   'addProjectsTable.sql',
+   'addReviewsTable.sql',
+   );
+   $path = "$IP/extensions/PageAssessments/db";
+   break;
+
case 'wikilove':
$files = array( 'WikiLoveLog.sql' );
$path = "$IP/extensions/WikiLove/patches";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd2fc3cdb00dc99e8531e60b38b31799986994b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

This includes the CiviCRM upgrade to 4.7.9 + drupal to 7.44

4e715d4 Drupal submodule update
5d42516 CiviCRM submodule update
69a432a Fix for regression in tests.
12c42a5 CiviCRM submodule update
787ff0c Add mysql to drop triggers to git and update trigger code for create.
747fdec Add prospecting custom fields
8b902db Remove unused merge function.
afd9d80 Temporarily remove line in test.
6eeddd1 Remove code to include our custom tables.
7d317c4 Update tests to ignore field revenue_recognition_date
314189b Per merge connection id
0b34d38 Fix merge hook to remove calculated fields from merge_conflicts
a322f7a Fix merge hook to remove calculated fields from merge_conflicts
81fbad6 Express Checkout is recorded as PayPal
769c905 Create civicrm_strip_non_numeric during test.
ca98b28 Import errors are logged and recoverable
d88af01 Send failmail and set no_thank_you on TY errors
346c9d3 Remove old email edit hook
758e75a Save sql to generate triggers against latest CiviCRM (4.7.8)
48bcdb8 Save sql to generate triggers against current CiviCRM (4.6.9)
a9c0142 Move test code to test support
38a961c We don't care to get failmail when banner history import fails

Change-Id: I674d45fbe344d2937872d240f98fc5411cfd4c65
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/includes/QueueConsumer.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
6 files changed, 0 insertions(+), 1,203 deletions(-)

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



diff --git a/sites/all/modules/queue2civicrm/tests/includes/Message.php 
b/sites/all/modules/queue2civicrm/tests/includes/Message.php
deleted file mode 100644
index dfe028a..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<<< HEAD   (bb9bf1 Revert "Express Checkout is recorded as PayPal")
-===
-data = $this->defaults;
-$this->headers = array();
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function setHeaders( $values ) {
-if ( is_array( $values ) ) {
-$this->headers = array_merge( $this->headers, $values );
-}
-}
-
-function getBody() {
-return $this->data;
-}
-
-function getHeaders() {
-return $this->headers;
-}
-
-function loadDefaults( $name ) {
-if ( !$this->defaults ) {
-$path = __DIR__ . "/../data/{$name}.json";
-$this->defaults = json_decode( file_get_contents( $path ), true );
-}
-}
-
-/**
- * Generates random data for queue and donation insertion testing
- */
-public static function generateRandom() {
-//language codes
-$lang = array( 'en', 'de', 'fr' );
-
-$currency_codes = array( 'USD', 'GBP', 'EUR', 'ILS' );
-shuffle( $currency_codes );
-$currency = ( mt_rand( 0, 1 ) ) ? 'USD' : $currency_codes[0];
-
-$message = array(
-'contribution_tracking_id' => '',
-'optout' => mt_rand( 0, 1 ),
-'anonymous' => mt_rand( 0, 1 ),
-'comment' => mt_rand(),
-'utm_source' => mt_rand(),
-'utm_medium' => mt_rand(),
-'utm_campaign' => mt_rand(),
-'language' => $lang[array_rand( $lang )],
-'referrer' => 'http://example.com/' . mt_rand(),
-'email' => mt_rand() . '@example.com',
-'first_name' => mt_rand(),
-'middle_name' => mt_rand(),
-'last_name' => mt_rand(),
-'street_address' => mt_rand(),
-'supplemental_address_1' => '',
-'city' => 'San Francisco',
-'state_province' => 'CA',
-'country' => 'USA',
-'countryID' => 'US',
-'postal_code' => mt_rand( 2801, 9 ),
-'gateway' => 'insert_test',
-'gateway_txn_id' => mt_rand(),
-'response' => mt_rand(),
-'currency' => $currency,
-'original_currency' => $currency_codes[0],
-'original_gross' => mt_rand( 0, 1 ) / 100,
-'fee' => '0',
-'gross' => mt_rand( 0, 1 ) / 100,
-'net' => mt_rand( 0, 1 ) / 100,
-'date' => date( 'r'

[MediaWiki-commits] [Gerrit] Add mediawiki.special.changeslist to SpecialContributions - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Add mediawiki.special.changeslist to SpecialContributions
..


Add mediawiki.special.changeslist to SpecialContributions

Bug: T139522
Change-Id: I7f93ec63b2e540c2f4cce4fe61b855207c156747
(cherry picked from commit a2ad530ed0921551b2b99024f6cb10de910bd533)
---
M includes/specials/SpecialContributions.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index ac7e62e..daf602b 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -38,6 +38,7 @@
$this->outputHeader();
$out = $this->getOutput();
$out->addModuleStyles( 'mediawiki.special' );
+   $out->addModuleStyles( 'mediawiki.special.changeslist' );
$this->addHelpLink( 'Help:User contributions' );
 
$this->opts = [];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f93ec63b2e540c2f4cce4fe61b855207c156747
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: BryanDavis 
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] Enable ORES review tool as a beta feature in ruwiki - change (operations/mediawiki-config)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Enable ORES review tool as a beta feature in ruwiki
..


Enable ORES review tool as a beta feature in ruwiki

After deploying these actions need to be done in the given order:
1- Create tables ores_model and ores_classification (see sql folder in the 
extension)
2- Run this maintenance script: 
extensions/ORES/maintenance/CheckModelVersions.php
It should take a second to finish
3- Run this maintenance script: extensions/ORES/maintenance/PopulateDatabase.php
This one may take a minute or two.

Bug: T139541
Change-Id: Ida9042f271fc40a83b3e2e2b7c2e4f18f5cd7493
---
M wmf-config/InitialiseSettings.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 12c2c04..916cba7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16821,6 +16821,7 @@
'fawiki' => true, // T130211
'wikidatawiki' => true, // T130212
'nlwiki' => true, // T139432
+   'ruwiki' => true, // T139541
 ],
 'wgOresModels' => [
'default' => [
@@ -16847,12 +16848,19 @@
'goodfaith' => false,
'wp10' => false,
], // T139432
+   'ruwiki' => [
+   'damaging' => true,
+   'reverted' => false,
+   'goodfaith' => false,
+   'wp10' => false,
+   ], // T139541
 ],
 'wgOresDamagingThresholds' => [
'default' => [ 'hard' => 0.5, 'soft' => 0.7 ],
'fawiki' => [ 'hard' => 0.12, 'soft' => 0.45 ], // T130211
'wikidatawiki' => [ 'hard' => 0.8, 'soft' => 0.96 ], // T130212
'nlwiki' => [ 'hard' => 0.3, 'soft' => 0.72 ], // T139432
+   'ruwiki' => [ 'hard' => 0.44, 'soft' => 0.69 ], // T139541
 ],
 ### End (roughly) of general extensions 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida9042f271fc40a83b3e2e2b7c2e4f18f5cd7493
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
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] Gerrit: A few minor tweaks to rsync replication - change (operations/puppet)

2016-07-06 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: A few minor tweaks to rsync replication
..


Gerrit: A few minor tweaks to rsync replication

- Only need the bare hostname, not the rsync:// protocol
- Put the contents in /srv/gerrit since we're copying the whole
  directory. Otherwise we're in /srv/gerrit/git/git

Bug: T125018
Change-Id: Ida5f66466b47c9fd766f13b658fb29e891a53524
---
M modules/gerrit/manifests/migration/destination.pp
M modules/gerrit/manifests/migration/source.pp
2 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/modules/gerrit/manifests/migration/destination.pp 
b/modules/gerrit/manifests/migration/destination.pp
index 38be725..b95f479 100644
--- a/modules/gerrit/manifests/migration/destination.pp
+++ b/modules/gerrit/manifests/migration/destination.pp
@@ -11,15 +11,14 @@
 
 include rsync::server
 
-file { [ '/srv/gerrit/', '/srv/gerrit/git' ]:
+file { '/srv/gerrit/':
 ensure => 'directory',
 }
 
 rsync::server::module { 'gerrit_git_data':
-path=> '/srv/gerrit/git',
+path=> '/srv/gerrit',
 read_only   => 'no',
 hosts_allow => $sourceip,
-require => File['/srv/gerrit/git'],
+require => File['/srv/gerrit'],
 }
 }
-
diff --git a/modules/gerrit/manifests/migration/source.pp 
b/modules/gerrit/manifests/migration/source.pp
index 02a813e..e68361c 100644
--- a/modules/gerrit/manifests/migration/source.pp
+++ b/modules/gerrit/manifests/migration/source.pp
@@ -1,5 +1,5 @@
 class gerrit::migration::source {
-$cmd = '/usr/bin/rsync -rlpt /var/lib/gerrit2/review_site/git 
rsync://lead::gerrit_git_data'
+$cmd = '/usr/bin/rsync -rlpt /var/lib/gerrit2/review_site/git 
lead::gerrit_git_data'
 cron { 'rsync_gerrit_data':
 command => $cmd,
 user=> 'root',

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

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

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

[MediaWiki-commits] [Gerrit] Replace symbolic link with partial - change (mediawiki...Flow)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace symbolic link with partial
..


Replace symbolic link with partial

Windows and ExtensionDistributor currently have problems with
the:

flow_post.handlebars -> flow_post.partial.handlebars

symbolic link, so replace it with a partial.

Backports I447075b07b6000b765d56807d0cc8e23e4472f2b

Bug: T103702
Change-Id: I3c9d74511aab3e0ce25cf0d5e1aa033d060b7778
---
M Resources.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_block_topic_moderate_post.handlebars
M handlebars/flow_block_topic_moderate_topic.handlebars
D handlebars/flow_post.handlebars
A handlebars/flow_post.handlebars
R handlebars/flow_post_partial.partial.handlebars
9 files changed, 22 insertions(+), 19 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index 1a86367..e700c27 100644
--- a/Resources.php
+++ b/Resources.php
@@ -75,6 +75,7 @@
'handlebars/flow_post_meta_actions.partial.handlebars',

'handlebars/flow_post_moderation_state.partial.handlebars',
'handlebars/flow_post_replies.partial.handlebars',
+   'handlebars/flow_post_partial.partial.handlebars',
'handlebars/flow_post.handlebars',
'handlebars/flow_reply_form.partial.handlebars',
'handlebars/flow_subscribed.partial.handlebars',
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php 
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 5e2869d..2d5794c 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -230,7 +230,7 @@
 '.$sp.''.LCRun3::sec($cx, ((isset($in['replies']) && is_array($in)) ? 
$in['replies'] : null), $in, true, function($cx, $in)use($sp){return 
''.LCRun3::hbch($cx, 'eachPost', 
array(array(((isset($cx['sp_vars']['root']['rootBlock']) && 
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] : 
null),$in),array()), $in, false, function($cx, $in)use($sp){return '
 
 '.$sp.''.LCRun3::ch($cx, 'post', 
array(array(((isset($cx['sp_vars']['root']['rootBlock']) && 
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] : 
null),$in),array()), 'encq').'
 '.$sp.'';}).'';}).''.LCRun3::hbch($cx, 'ifCond', 
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['postId']) 
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ? 
$cx['sp_vars']['root']['rootBlock']['submitted']['postId'] : 
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] : 
null)),array()), $in, false, function($cx, $in)use($sp){return 
''.LCRun3::hbch($cx, 'ifCond', 
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['action']) 
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ? 
$cx['sp_vars']['root']['rootBlock']['submitted']['action'] : 
null),'===','reply'),array()), $in, false, function($cx, $in)use($sp){return 
''.LCRun3::p($cx, 'flow_reply_form', array(array($in),array()), '   
').'';}).'';}).'
-';},'flow_post' => function ($cx, $in, $sp) {return ''.$sp.''.LCRun3::wi($cx, 
((isset($in['revision']) && is_array($in)) ? $in['revision'] : null), $in, 
function($cx, $in)use($sp){return 'function ($cx, $in, $sp) {return 
''.$sp.''.LCRun3::wi($cx, ((isset($in['revision']) && is_array($in)) ? 
$in['revision'] : null), $in, function($cx, $in)use($sp){return '   
@@ -248,7 +248,7 @@
 );
 
 return '
-'.LCRun3::sec($cx, ((isset($in['roots']) && is_array($in)) ? $in['roots'] : 
null), $in, true, function($cx, $in) {return ''.LCRun3::hbch($cx, 'eachPost', 
array(array(((isset($cx['sp_vars']['root']) && is_array($cx['sp_vars'])) ? 
$cx['sp_vars']['root'] : null),$in),array()), $in, false, function($cx, $in) 
{return ''.LCRun3::p($cx, 'flow_moderate_post', array(array($in),array()), '
 ').''.LCRun3::p($cx, 'flow_post', array(array($in),array()), ' 
 ').'';}).'';}).'
+'.LCRun3::sec($cx, ((isset($in['roots']) && is_array($in)) ? $in['roots'] : 
null), $in, true, function($cx, $in) {return ''.LCRun3::hbch($cx, 'eachPost', 
array(array(((isset($cx['sp_vars']['root']) && is_array($cx['sp_vars'])) ? 
$cx['sp_vars']['root'] : null),$in),array()), $in, false, function($cx, $in) 
{return ''.LCRun3::p($cx, 'flow_moderate_post', array(array($in),array()), '
 ').''.LCRun3::p($cx, 'flow_post_partial', 
array(array($in),array()), '  ').'';}).'';}).'
 ';
 }
 ?>
\ No newline at end of file
diff --git

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki... - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

This includes the CiviCRM upgrade to 4.7.9 + drupal to 7.44

4e715d4 Drupal submodule update
5d42516 CiviCRM submodule update
69a432a Fix for regression in tests.
12c42a5 CiviCRM submodule update
787ff0c Add mysql to drop triggers to git and update trigger code for create.
747fdec Add prospecting custom fields
8b902db Remove unused merge function.
afd9d80 Temporarily remove line in test.
6eeddd1 Remove code to include our custom tables.
7d317c4 Update tests to ignore field revenue_recognition_date
314189b Per merge connection id
0b34d38 Fix merge hook to remove calculated fields from merge_conflicts
a322f7a Fix merge hook to remove calculated fields from merge_conflicts
81fbad6 Express Checkout is recorded as PayPal
769c905 Create civicrm_strip_non_numeric during test.
ca98b28 Import errors are logged and recoverable
d88af01 Send failmail and set no_thank_you on TY errors
346c9d3 Remove old email edit hook
758e75a Save sql to generate triggers against latest CiviCRM (4.7.8)
48bcdb8 Save sql to generate triggers against current CiviCRM (4.6.9)
a9c0142 Move test code to test support
38a961c We don't care to get failmail when banner history import fails

Change-Id: I674d45fbe344d2937872d240f98fc5411cfd4c65
---
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/includes/QueueConsumer.php
D sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
D sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
6 files changed, 0 insertions(+), 1,203 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/12/297712/1

diff --git a/sites/all/modules/queue2civicrm/tests/includes/Message.php 
b/sites/all/modules/queue2civicrm/tests/includes/Message.php
deleted file mode 100644
index dfe028a..000
--- a/sites/all/modules/queue2civicrm/tests/includes/Message.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<<< HEAD   (bb9bf1 Revert "Express Checkout is recorded as PayPal")
-===
-data = $this->defaults;
-$this->headers = array();
-$this->set( $values );
-}
-
-function set( $values ) {
-if ( is_array( $values ) ) {
-$this->data = $values + $this->data;
-}
-
-$this->body = json_encode( $this->data );
-}
-
-function setHeaders( $values ) {
-if ( is_array( $values ) ) {
-$this->headers = array_merge( $this->headers, $values );
-}
-}
-
-function getBody() {
-return $this->data;
-}
-
-function getHeaders() {
-return $this->headers;
-}
-
-function loadDefaults( $name ) {
-if ( !$this->defaults ) {
-$path = __DIR__ . "/../data/{$name}.json";
-$this->defaults = json_decode( file_get_contents( $path ), true );
-}
-}
-
-/**
- * Generates random data for queue and donation insertion testing
- */
-public static function generateRandom() {
-//language codes
-$lang = array( 'en', 'de', 'fr' );
-
-$currency_codes = array( 'USD', 'GBP', 'EUR', 'ILS' );
-shuffle( $currency_codes );
-$currency = ( mt_rand( 0, 1 ) ) ? 'USD' : $currency_codes[0];
-
-$message = array(
-'contribution_tracking_id' => '',
-'optout' => mt_rand( 0, 1 ),
-'anonymous' => mt_rand( 0, 1 ),
-'comment' => mt_rand(),
-'utm_source' => mt_rand(),
-'utm_medium' => mt_rand(),
-'utm_campaign' => mt_rand(),
-'language' => $lang[array_rand( $lang )],
-'referrer' => 'http://example.com/' . mt_rand(),
-'email' => mt_rand() . '@example.com',
-'first_name' => mt_rand(),
-'middle_name' => mt_rand(),
-'last_name' => mt_rand(),
-'street_address' => mt_rand(),
-'supplemental_address_1' => '',
-'city' => 'San Francisco',
-'state_province' => 'CA',
-'country' => 'USA',
-'countryID' => 'US',
-'postal_code' => mt_rand( 2801, 9 ),
-'gateway' => 'insert_test',
-'gateway_txn_id' => mt_rand(),
-'response' => mt_rand(),
-'currency' => $currency,
-'original_currency' => $currency_codes[0],
-'original_gross' => mt_rand( 0, 1 ) / 100,
-'fee' => '0',
-'gross' => mt_rand( 0, 1 ) / 100,
-'net' =>

[MediaWiki-commits] [Gerrit] Keep bundled notification compact header on one line - change (mediawiki...Echo)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Keep bundled notification compact header on one line
..


Keep bundled notification compact header on one line

Bug: T139321
Change-Id: I4b0a7173bc06a0760efff544bcc28a59ba72ce7f
(cherry picked from commit db838e42ce7c81dcfe46a6c18b51332b2a680bb1)
---
M includes/formatters/EventPresentationModel.php
M modules/echo.variables.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
3 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/formatters/EventPresentationModel.php 
b/includes/formatters/EventPresentationModel.php
index 56b4d72..3afebc6 100644
--- a/includes/formatters/EventPresentationModel.php
+++ b/includes/formatters/EventPresentationModel.php
@@ -456,7 +456,7 @@
 
return array(
'header' => $this->getHeaderMessage()->parse(),
-   'compactHeader' => 
$this->getCompactHeaderMessage()->parse(),
+   'compactHeader' => 
$this->getCompactHeaderMessage()->escaped(),
'body' => $body ? $body->escaped() : '',
'icon' => $this->getIconType(),
'links' => array(
diff --git a/modules/echo.variables.less b/modules/echo.variables.less
index b962f77..f9eb60c 100644
--- a/modules/echo.variables.less
+++ b/modules/echo.variables.less
@@ -11,6 +11,7 @@
 
 @bundle-group-padding: 0.7em;
 @notification-popup-width: 500px;
+@bundled-notification-header-width: 350px;
 
 @opacity-low: 0.5;
 @opacity-mid: 0.8;
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index 1a8b648..23a67f2 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -134,6 +134,11 @@
display: table-cell;
padding-right: 0.5em;
width: 100%;
+
+   &-header {
+   
.mw-echo-ui-mixin-one-line-truncated;
+   width: 
@bundled-notification-header-width;
+   }
}
 
&-content-actions {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b0a7173bc06a0760efff544bcc28a59ba72ce7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Sbisson 
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 recognize unkown DB names just because they end in 'w... - change (mediawiki/vagrant)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Do not recognize unkown DB names just because they end in 'wiki'
..


Do not recognize unkown DB names just because they end in 'wiki'

MediaWiki tries to parse DB names based on the assumption that they
are composed of a language code plus a common suffix (*wiki,
*wiktionary etc) and there are too many language codes to easily
enumerate. Neither assumptions is true for vagrant so we can just
define a full list of accepted site names. That avoids problems
the would arise when a wiki is disabled and its name ends with
another wiki's name (so the disabled wiki would be considered to
exist and that would break WikiMap amongst other things).

Change-Id: I18701d9e812cb27b997664ed04a683cbda7cd456
---
M puppet/modules/mediawiki/templates/multiwiki/LoadWgConf.php.erb
1 file changed, 16 insertions(+), 15 deletions(-)

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



diff --git a/puppet/modules/mediawiki/templates/multiwiki/LoadWgConf.php.erb 
b/puppet/modules/mediawiki/templates/multiwiki/LoadWgConf.php.erb
index 1d5083a..3994fd3 100644
--- a/puppet/modules/mediawiki/templates/multiwiki/LoadWgConf.php.erb
+++ b/puppet/modules/mediawiki/templates/multiwiki/LoadWgConf.php.erb
@@ -17,30 +17,31 @@
 }
 
 $wgConf->wikis = $wgLocalDatabases;
-$wgConf->suffixes = $wgLocalDatabases;
+$wgConf->suffixes = [];
 
 /**
  * siteParamsCallback
  */
 function efGetSiteParams( $conf, $wiki ) {
-   $site = null;
-   $lang = null;
-   foreach( $conf->suffixes as $suffix ) {
-   if ( substr( $wiki, -strlen( $suffix ) ) == $suffix ) {
-   $site = $suffix;
-   $lang = substr( $wiki, 0, -strlen( $suffix ) );
-   break;
+   foreach( $conf->wikis as $knownWiki ) {
+   if ( $wiki === $knownWiki ) {
+   return array(
+   'suffix' => $wiki,
+   'lang' => '',
+   'params' => array(
+   'lang' => '',
+   'site' => $wiki,
+   'wiki' => $wiki,
+   ),
+   'tags' => array(),
+   );
}
}
return array(
-   'suffix' => $site,
-   'lang' => $lang,
-   'params' => array(
-   'lang' => $lang,
-   'site' => $site,
-   'wiki' => $wiki,
-   ),
+   'suffix' => null,
+   'lang' => null,
'tags' => array(),
+   'params' => array(),
);
 }
 $wgConf->siteParamsCallback = 'efGetSiteParams';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18701d9e812cb27b997664ed04a683cbda7cd456
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Notification count: don't assume 'all' - change (mediawiki...Echo)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Notification count: don't assume 'all'
..


Notification count: don't assume 'all'

Bug: T139323
Change-Id: I44ebdc600015bdfadc07e313689b8fad1d1c60c0
(cherry picked from commit 194b9c78a4202979b78cfee6eb7d354a24e41311)
---
M Echo.php
M includes/api/ApiEchoNotifications.php
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/Echo.php b/Echo.php
index 71f4f17..e656aac 100644
--- a/Echo.php
+++ b/Echo.php
@@ -546,7 +546,7 @@
 
 // Echo Configuration for EventLogging
 $wgEchoConfig = array(
-   'version' => '1.10',
+   'version' => '1.11',
'eventlogging' => array(
/**
 * Properties:
diff --git a/includes/api/ApiEchoNotifications.php 
b/includes/api/ApiEchoNotifications.php
index 187f1e1..2096881 100644
--- a/includes/api/ApiEchoNotifications.php
+++ b/includes/api/ApiEchoNotifications.php
@@ -285,18 +285,18 @@
$result = array();
$notifUser = MWEchoNotifUser::newFromUser( $user );
$global = $this->crossWikiSummary ? 'preference' : false;
-   // Always get total count
-   $rawCount = $notifUser->getNotificationCount( true, DB_SLAVE, 
EchoAttributeManager::ALL, $global );
-   $result['rawcount'] = $rawCount;
-   $result['count'] = 
EchoNotificationController::formatNotificationCount( $rawCount );
 
-   if ( $groupBySection ) {
-   foreach ( $sections as $section ) {
-   $rawCount = $notifUser->getNotificationCount( 
/* $tryCache = */true, DB_SLAVE, $section, $global );
+   $totalRawCount = 0;
+   foreach ( $sections as $section ) {
+   $rawCount = $notifUser->getNotificationCount( /* 
$tryCache = */true, DB_SLAVE, $section, $global );
+   if ( $groupBySection ) {
$result[$section]['rawcount'] = $rawCount;
$result[$section]['count'] = 
EchoNotificationController::formatNotificationCount( $rawCount );
}
+   $totalRawCount += $rawCount;
}
+   $result['rawcount'] = $totalRawCount;
+   $result['count'] = 
EchoNotificationController::formatNotificationCount( $totalRawCount );
 
return $result;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44ebdc600015bdfadc07e313689b8fad1d1c60c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor: Move the citation button out of the primary to... - change (operations/mediawiki-config)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: VisualEditor: Move the citation button out of the primary 
toolbar on Wikivoyages
..


VisualEditor: Move the citation button out of the primary toolbar on Wikivoyages

Bug: T133725
Change-Id: If4924f068927ce51cc3e760b55f05b8dd12c1c60
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0142b12..5ea5eeb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2247,6 +2247,11 @@
// Citoid
require_once "$IP/extensions/Citoid/Citoid.php";
$wgCitoidServiceUrl = 'https://citoid.wikimedia.org/api';
+
+   // Move the citation button from the primary toolbar into the "other" 
group
+   if ( $wmgCiteVisualEditorOtherGroup ) {
+   $wgCiteVisualEditorOtherGroup = true;
+   }
 }
 
 if ( $wmgUseTemplateData ) { // T61702 - 2015-07-20
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f2b1bfc..12c2c04 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13707,6 +13707,12 @@
'votewiki' => false,// No local Flow install, so won't work; 
also no editing on this wiki
 ],
 
+// Should the citation button be moved from the primary toolbar into the 
"other" group
+'wmgCiteVisualEditorOtherGroup' => [
+   'default' => false,
+   'wikivoyage' => true, // T133725
+],
+
 // Should 50% of new accounts be opted in to VisualEditor (A/B test)
 'wmgVisualEditorEnableSplitTest' => [
'default' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4924f068927ce51cc3e760b55f05b8dd12c1c60
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
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] Gerrit: A few minor tweaks to rsync replication - change (operations/puppet)

2016-07-06 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Gerrit: A few minor tweaks to rsync replication
..

Gerrit: A few minor tweaks to rsync replication

- Only need the bare hostname, not the rsync:// protocol
- Put the contents in /srv/gerrit since we're copying the whole
  directory. Otherwise we're in /srv/gerrit/git/git

Bug: T125018
Change-Id: Ida5f66466b47c9fd766f13b658fb29e891a53524
---
M modules/gerrit/manifests/migration/destination.pp
M modules/gerrit/manifests/migration/source.pp
2 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/297711/1

diff --git a/modules/gerrit/manifests/migration/destination.pp 
b/modules/gerrit/manifests/migration/destination.pp
index 38be725..b95f479 100644
--- a/modules/gerrit/manifests/migration/destination.pp
+++ b/modules/gerrit/manifests/migration/destination.pp
@@ -11,15 +11,14 @@
 
 include rsync::server
 
-file { [ '/srv/gerrit/', '/srv/gerrit/git' ]:
+file { '/srv/gerrit/':
 ensure => 'directory',
 }
 
 rsync::server::module { 'gerrit_git_data':
-path=> '/srv/gerrit/git',
+path=> '/srv/gerrit',
 read_only   => 'no',
 hosts_allow => $sourceip,
-require => File['/srv/gerrit/git'],
+require => File['/srv/gerrit'],
 }
 }
-
diff --git a/modules/gerrit/manifests/migration/source.pp 
b/modules/gerrit/manifests/migration/source.pp
index 02a813e..e68361c 100644
--- a/modules/gerrit/manifests/migration/source.pp
+++ b/modules/gerrit/manifests/migration/source.pp
@@ -1,5 +1,5 @@
 class gerrit::migration::source {
-$cmd = '/usr/bin/rsync -rlpt /var/lib/gerrit2/review_site/git 
rsync://lead::gerrit_git_data'
+$cmd = '/usr/bin/rsync -rlpt /var/lib/gerrit2/review_site/git 
lead::gerrit_git_data'
 cron { 'rsync_gerrit_data':
 command => $cmd,
 user=> 'root',

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

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

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

[MediaWiki-commits] [Gerrit] Test PageAssessments extension on test.wikipedia.org - change (operations/mediawiki-config)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Test PageAssessments extension on test.wikipedia.org
..


Test PageAssessments extension on test.wikipedia.org

Release Manager approval: T137918#2433282

Bug: T137918
Change-Id: I0c703499a050d69744874f91c627b70745038767
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index d9711be..0f5ba76 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -352,10 +352,6 @@
$wgGroupPermissions['*']['oathauth-enable'] = false;
 }
 
-if ( $wmgUsePageAssessments ) {
-   wfLoadExtension( 'PageAssessments' );
-}
-
 if ( $wmgUseUniversalLanguageSelector ) {
$wgDefaultUserOptions['compact-language-links'] = 0;
 }
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fb4274c..0142b12 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3051,6 +3051,10 @@
}
 }
 
+if ( $wmgUsePageAssessments ) {
+   wfLoadExtension( 'PageAssessments' );
+}
+
 if ( $wmgUsePageImages ) {
require_once( "$IP/extensions/PageImages/PageImages.php" );
$wgPageImagesExpandOpenSearchXml = $wmgPageImagesExpandOpenSearchXml;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c31eec3..f2b1bfc 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16197,6 +16197,11 @@
'votewiki' => false,
 ],
 
+'wmgUsePageAssessments' => [
+   'default' => false,
+   'testwiki' => true, // T137918
+],
+
 'wmgUsePageImages' => [
'default' => true,
'wikibooks' => false, // T68455

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c703499a050d69744874f91c627b70745038767
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
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] Log the session cache type along with other cache types - change (mediawiki/core)

2016-07-06 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: Log the session cache type along with other cache types
..

Log the session cache type along with other cache types

We already log the types of the main, WAN, stash, message, and parser
caches. For debugging, it would be useful to log the session cache too
instead of having to guess that it's probably the same as the main
cache.

Change-Id: I13e6c0f7f430f96be50d543a32c232f0c36dcd72
(cherry picked from commit c666d7403816f5b8cf334312faccd3c8a15aa9d7)
---
M includes/Setup.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/297710/1

diff --git a/includes/Setup.php b/includes/Setup.php
index 3cb72f5..580d29b 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -684,7 +684,9 @@
', WAN: ' . $wgMainWANCache .
', stash: ' . $wgMainStash .
', message: ' . get_class( $messageMemc ) .
-   ', parser: ' . get_class( $parserMemc ) );
+   ', parser: ' . get_class( $parserMemc ) .
+   ', session: ' . get_class( ObjectCache::getInstance( 
$wgSessionCacheType ) )
+);
 
 Profiler::instance()->scopedProfileOut( $ps_memcached );
 

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

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

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

[MediaWiki-commits] [Gerrit] Pad Feed cards not the RecyclerView - change (apps...wikipedia)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Pad Feed cards not the RecyclerView
..


Pad Feed cards not the RecyclerView

When swiped left or right, Feed cards are truncated by the padding of
the parent RecyclerView. Move the padding from the RecyclerView to the
card ItemDecoration. This gives a better full screen experience and
makes the cards feel like their falling on the ground.

Change-Id: Iec1bf40a4b18ba3b4b7d460c802a660823e424b2
---
M app/src/main/res/layout/fragment_feed.xml
M app/src/main/res/values/dimens.xml
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/app/src/main/res/layout/fragment_feed.xml 
b/app/src/main/res/layout/fragment_feed.xml
index 58f9d13..bd14c15 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -56,8 +56,6 @@
 android:layout_width="match_parent"
 android:layout_height="match_parent"
 android:scrollbars="vertical"
-android:paddingLeft="@dimen/view_list_card_margin_horizontal"
-android:paddingRight="@dimen/view_list_card_margin_horizontal"
 app:behavior_overlapTop="100dp"
 app:layout_behavior="@string/appbar_scrolling_view_behavior"
 app:minColumnWidth="@dimen/view_feed_min_column_width"/>
diff --git a/app/src/main/res/values/dimens.xml 
b/app/src/main/res/values/dimens.xml
index 7fc75a3..37db905 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -95,7 +95,7 @@
 260dp
 229.3dp
 8dp
-5.3dp
+10.6dp
 16dp
 4dp
 0dp

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

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

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

[MediaWiki-commits] [Gerrit] Updating wikipedia.org stats & dutch typo. - change (wikimedia/portals)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Updating wikipedia.org stats & dutch typo.
..


Updating wikipedia.org stats & dutch typo.

Bug: T137215
Change-Id: Ied20e2843d18a629645edaac2cb39fe467c796c2
---
M data/new-site-defs.json
M data/site-stats.json
M dev/wikipedia.org/assets/translations/ab.json
M dev/wikipedia.org/assets/translations/ace.json
M dev/wikipedia.org/assets/translations/af.json
M dev/wikipedia.org/assets/translations/ak.json
M dev/wikipedia.org/assets/translations/als.json
M dev/wikipedia.org/assets/translations/am.json
M dev/wikipedia.org/assets/translations/an.json
M dev/wikipedia.org/assets/translations/ang.json
M dev/wikipedia.org/assets/translations/ar.json
M dev/wikipedia.org/assets/translations/arc.json
M dev/wikipedia.org/assets/translations/arz.json
M dev/wikipedia.org/assets/translations/as.json
M dev/wikipedia.org/assets/translations/ast.json
M dev/wikipedia.org/assets/translations/av.json
M dev/wikipedia.org/assets/translations/ay.json
M dev/wikipedia.org/assets/translations/az.json
M dev/wikipedia.org/assets/translations/azb.json
M dev/wikipedia.org/assets/translations/ba.json
M dev/wikipedia.org/assets/translations/bar.json
M dev/wikipedia.org/assets/translations/bat-smg.json
M dev/wikipedia.org/assets/translations/bcl.json
M dev/wikipedia.org/assets/translations/be.json
M dev/wikipedia.org/assets/translations/bg.json
M dev/wikipedia.org/assets/translations/bh.json
M dev/wikipedia.org/assets/translations/bi.json
M dev/wikipedia.org/assets/translations/bjn.json
M dev/wikipedia.org/assets/translations/bm.json
M dev/wikipedia.org/assets/translations/bn.json
M dev/wikipedia.org/assets/translations/bo.json
M dev/wikipedia.org/assets/translations/bpy.json
M dev/wikipedia.org/assets/translations/br.json
M dev/wikipedia.org/assets/translations/bs.json
M dev/wikipedia.org/assets/translations/bug.json
M dev/wikipedia.org/assets/translations/bxr.json
M dev/wikipedia.org/assets/translations/ca.json
M dev/wikipedia.org/assets/translations/cbk-zam.json
M dev/wikipedia.org/assets/translations/cdo.json
M dev/wikipedia.org/assets/translations/ce.json
M dev/wikipedia.org/assets/translations/ceb.json
M dev/wikipedia.org/assets/translations/ch.json
M dev/wikipedia.org/assets/translations/chr.json
M dev/wikipedia.org/assets/translations/chy.json
M dev/wikipedia.org/assets/translations/ckb.json
M dev/wikipedia.org/assets/translations/co.json
M dev/wikipedia.org/assets/translations/cr.json
M dev/wikipedia.org/assets/translations/crh.json
M dev/wikipedia.org/assets/translations/cs.json
M dev/wikipedia.org/assets/translations/csb.json
M dev/wikipedia.org/assets/translations/cu.json
M dev/wikipedia.org/assets/translations/cv.json
M dev/wikipedia.org/assets/translations/cy.json
M dev/wikipedia.org/assets/translations/da.json
M dev/wikipedia.org/assets/translations/de.json
M dev/wikipedia.org/assets/translations/diq.json
M dev/wikipedia.org/assets/translations/dsb.json
M dev/wikipedia.org/assets/translations/dv.json
M dev/wikipedia.org/assets/translations/dz.json
M dev/wikipedia.org/assets/translations/ee.json
M dev/wikipedia.org/assets/translations/el.json
M dev/wikipedia.org/assets/translations/eml.json
M dev/wikipedia.org/assets/translations/en.json
M dev/wikipedia.org/assets/translations/eo.json
M dev/wikipedia.org/assets/translations/es.json
M dev/wikipedia.org/assets/translations/et.json
M dev/wikipedia.org/assets/translations/eu.json
M dev/wikipedia.org/assets/translations/ext.json
M dev/wikipedia.org/assets/translations/fa.json
M dev/wikipedia.org/assets/translations/ff.json
M dev/wikipedia.org/assets/translations/fi.json
M dev/wikipedia.org/assets/translations/fiu-vro.json
M dev/wikipedia.org/assets/translations/fj.json
M dev/wikipedia.org/assets/translations/fo.json
M dev/wikipedia.org/assets/translations/fr.json
M dev/wikipedia.org/assets/translations/frp.json
M dev/wikipedia.org/assets/translations/frr.json
M dev/wikipedia.org/assets/translations/fur.json
M dev/wikipedia.org/assets/translations/fy.json
M dev/wikipedia.org/assets/translations/ga.json
M dev/wikipedia.org/assets/translations/gag.json
M dev/wikipedia.org/assets/translations/gan.json
M dev/wikipedia.org/assets/translations/gd.json
M dev/wikipedia.org/assets/translations/gl.json
M dev/wikipedia.org/assets/translations/glk.json
M dev/wikipedia.org/assets/translations/gn.json
M dev/wikipedia.org/assets/translations/gom.json
M dev/wikipedia.org/assets/translations/got.json
M dev/wikipedia.org/assets/translations/gu.json
M dev/wikipedia.org/assets/translations/gv.json
M dev/wikipedia.org/assets/translations/ha.json
M dev/wikipedia.org/assets/translations/hak.json
M dev/wikipedia.org/assets/translations/haw.json
M dev/wikipedia.org/assets/translations/he.json
M dev/wikipedia.org/assets/translations/hi.json
M dev/wikipedia.org/assets/translations/hif.json
M dev/wikipedia.org/assets/translations/hr.json
M

[MediaWiki-commits] [Gerrit] Gerrit: Setup rsync between old and new machines - change (operations/puppet)

2016-07-06 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Gerrit: Setup rsync between old and new machines
..


Gerrit: Setup rsync between old and new machines

Setup rsyncd on the new server, lead, to copy from the
old server, ytterbium, and push gerrit data.

Note how i changed the actual rsync command in the cron,
switched the order of source and destination, since we are
pushing.

Bug:T125018
Change-Id: Id9d3020a3be0f848e9a39b878664758a5a2b6cfd
---
M manifests/site.pp
A modules/gerrit/manifests/migration/destination.pp
A modules/gerrit/manifests/migration/source.pp
3 files changed, 36 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index bf9ddef..84dd807 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1542,6 +1542,7 @@
 node 'lead.wikimedia.org' {
 # Note: whenever moving Gerrit out of ytterbium, you will need
 # to update the role::zuul::configuration variable 'gerrit_server'
+include gerrit::migration::destination
 include standard
 include base::firewall
 }
@@ -2908,6 +2909,8 @@
 # Note: whenever moving Gerrit out of ytterbium, you will need
 # to update the role::zuul::configuration variable 'gerrit_server'
 role gerrit::server
+
+include gerrit::migration::source
 include standard
 
 interface::add_ip6_mapped { 'main': }
diff --git a/modules/gerrit/manifests/migration/destination.pp 
b/modules/gerrit/manifests/migration/destination.pp
new file mode 100644
index 000..38be725
--- /dev/null
+++ b/modules/gerrit/manifests/migration/destination.pp
@@ -0,0 +1,25 @@
+# sets up rsync for a migration of gerrit's git data to a new server
+class gerrit::migration::destination {
+
+$sourceip='208.80.154.80'
+
+ferm::service { 'gerrit-migration-rsync':
+proto  => 'tcp',
+port   => '873',
+srange => "${sourceip}/32",
+}
+
+include rsync::server
+
+file { [ '/srv/gerrit/', '/srv/gerrit/git' ]:
+ensure => 'directory',
+}
+
+rsync::server::module { 'gerrit_git_data':
+path=> '/srv/gerrit/git',
+read_only   => 'no',
+hosts_allow => $sourceip,
+require => File['/srv/gerrit/git'],
+}
+}
+
diff --git a/modules/gerrit/manifests/migration/source.pp 
b/modules/gerrit/manifests/migration/source.pp
new file mode 100644
index 000..02a813e
--- /dev/null
+++ b/modules/gerrit/manifests/migration/source.pp
@@ -0,0 +1,8 @@
+class gerrit::migration::source {
+$cmd = '/usr/bin/rsync -rlpt /var/lib/gerrit2/review_site/git 
rsync://lead::gerrit_git_data'
+cron { 'rsync_gerrit_data':
+command => $cmd,
+user=> 'root',
+hour=> [0, 6, 12, 18]
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9d3020a3be0f848e9a39b878664758a5a2b6cfd
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable ORES review tool as a beta feature in ruwiki - change (operations/mediawiki-config)

2016-07-06 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: Enable ORES review tool as a beta feature in ruwiki
..

Enable ORES review tool as a beta feature in ruwiki

After deploying these actions need to be done in the given order:
1- Create tables ores_model and ores_classification (see sql folder in the 
extension)
2- Run this maintenance script: 
extensions/ORES/maintenance/CheckModelVersions.php
It should take a second to finish
3- Run this maintenance script: extensions/ORES/maintenance/PopulateDatabase.php
This one may take a minute or two.

Bug: T139541
Change-Id: Ida9042f271fc40a83b3e2e2b7c2e4f18f5cd7493
---
M wmf-config/InitialiseSettings.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c31eec3..6fccc74 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16810,6 +16810,7 @@
'fawiki' => true, // T130211
'wikidatawiki' => true, // T130212
'nlwiki' => true, // T139432
+   'ruwiki' => true, // T139541
 ],
 'wgOresModels' => [
'default' => [
@@ -16836,12 +16837,19 @@
'goodfaith' => false,
'wp10' => false,
], // T139432
+   'ruwiki' => [
+   'damaging' => true,
+   'reverted' => false,
+   'goodfaith' => false,
+   'wp10' => false,
+   ], // T139541
 ],
 'wgOresDamagingThresholds' => [
'default' => [ 'hard' => 0.5, 'soft' => 0.7 ],
'fawiki' => [ 'hard' => 0.12, 'soft' => 0.45 ], // T130211
'wikidatawiki' => [ 'hard' => 0.8, 'soft' => 0.96 ], // T130212
'nlwiki' => [ 'hard' => 0.3, 'soft' => 0.72 ], // T139432
+   'ruwiki' => [ 'hard' => 0.44, 'soft' => 0.69 ], // T139541
 ],
 ### End (roughly) of general extensions 
 

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

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

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

[MediaWiki-commits] [Gerrit] Bump Gemfile.lock versions - change (mediawiki/vagrant)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Bump Gemfile.lock versions
..


Bump Gemfile.lock versions

Ran `bundle update`

Change-Id: I4a36412d5231454de4be21a5ad5019b55c8e1a66
---
M Gemfile.lock
1 file changed, 36 insertions(+), 41 deletions(-)

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



diff --git a/Gemfile.lock b/Gemfile.lock
index 8dbf549..bb8848a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,34 +29,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-ast (2.1.0)
+ast (2.3.0)
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
-byebug (3.5.1)
-  columnize (~> 0.8)
-  debugger-linecache (~> 1.2)
-  slop (~> 3.6)
+byebug (9.0.5)
 childprocess (0.5.9)
   ffi (~> 1.0, >= 1.0.11)
-coderay (1.1.0)
-columnize (0.9.0)
-cucumber (2.0.0.rc.4)
+coderay (1.1.1)
+cucumber (2.0.2)
   builder (>= 2.1.2)
-  cucumber-core (~> 1.1.0)
+  cucumber-core (~> 1.2.0)
   diff-lcs (>= 1.1.3)
   gherkin (~> 2.12)
   multi_json (>= 1.7.5, < 2.0)
   multi_test (>= 0.1.2)
-cucumber-core (1.1.1)
+cucumber-core (1.2.0)
   gherkin (~> 2.12.0)
-debugger-linecache (1.2.0)
 diff-lcs (1.2.5)
-domain_name (0.5.20160128)
+domain_name (0.5.20160615)
   unf (>= 0.0.5, < 1.0.0)
 erubis (2.7.0)
-fakefs (0.6.5)
-ffi (1.9.10)
+fakefs (0.6.7)
+ffi (1.9.12)
 gherkin (2.12.2)
   multi_json (~> 1.3)
 gssapi (1.2.0)
@@ -66,20 +61,20 @@
 hashicorp-checkpoint (0.1.4)
 http-cookie (1.0.2)
   domain_name (~> 0.5)
-httpclient (2.7.1)
+httpclient (2.8.0)
 i18n (0.7.0)
-listen (3.0.5)
-  rb-fsevent (>= 0.9.3)
-  rb-inotify (>= 0.9)
+listen (3.0.8)
+  rb-fsevent (~> 0.9, >= 0.9.4)
+  rb-inotify (~> 0.9, >= 0.9.7)
 little-plugger (1.1.4)
 log4r (1.1.10)
 logging (1.8.2)
   little-plugger (>= 1.1.3)
   multi_json (>= 1.8.4)
 method_source (0.8.2)
-mime-types (2.99)
+mime-types (2.99.2)
 mini_portile (0.6.0)
-multi_json (1.11.0)
+multi_json (1.12.1)
 multi_test (0.1.2)
 net-scp (1.1.2)
   net-ssh (>= 2.6.5)
@@ -90,21 +85,21 @@
 nokogiri (1.6.3.1)
   mini_portile (= 0.6.0)
 nori (2.6.0)
-parser (2.2.3.0)
-  ast (>= 1.1, < 3.0)
+parser (2.3.1.2)
+  ast (~> 2.2)
 powerpack (0.1.1)
-pry (0.10.1)
+pry (0.10.3)
   coderay (~> 1.1.0)
   method_source (~> 0.8.1)
   slop (~> 3.4)
-pry-byebug (2.0.0)
-  byebug (~> 3.4)
+pry-byebug (3.4.0)
+  byebug (~> 9.0)
   pry (~> 0.10)
 puppet-lint (1.1.0)
-rainbow (2.0.0)
+rainbow (2.1.0)
 rake (10.4.2)
 rb-fsevent (0.9.7)
-rb-inotify (0.9.5)
+rb-inotify (0.9.7)
   ffi (>= 0.5.0)
 rb-kqueue (0.2.4)
   ffi (>= 0.5.0)
@@ -112,19 +107,19 @@
   http-cookie (>= 1.0.2, < 2.0)
   mime-types (>= 1.16, < 3.0)
   netrc (~> 0.7)
-rspec (3.2.0)
-  rspec-core (~> 3.2.0)
-  rspec-expectations (~> 3.2.0)
-  rspec-mocks (~> 3.2.0)
-rspec-core (3.2.0)
-  rspec-support (~> 3.2.0)
-rspec-expectations (3.2.0)
+rspec (3.5.0)
+  rspec-core (~> 3.5.0)
+  rspec-expectations (~> 3.5.0)
+  rspec-mocks (~> 3.5.0)
+rspec-core (3.5.0)
+  rspec-support (~> 3.5.0)
+rspec-expectations (3.5.0)
   diff-lcs (>= 1.2.0, < 2.0)
-  rspec-support (~> 3.2.0)
-rspec-mocks (3.2.0)
+  rspec-support (~> 3.5.0)
+rspec-mocks (3.5.0)
   diff-lcs (>= 1.2.0, < 2.0)
-  rspec-support (~> 3.2.0)
-rspec-support (3.2.0)
+  rspec-support (~> 3.5.0)
+rspec-support (3.5.0)
 rubocop (0.35.1)
   astrolabe (~> 1.3)
   parser (>= 2.2.3.0, < 3.0)
@@ -132,9 +127,9 @@
   rainbow (>= 1.99.1, < 3.0)
   ruby-progressbar (~> 1.7)
   tins (<= 1.6.0)
-ruby-progressbar (1.7.5)
+ruby-progressbar (1.8.1)
 rubyntlm (0.4.0)
-rubyzip (1.1.7)
+rubyzip (1.2.0)
 slop (3.6.0)
 tins (1.6.0)
 unf (0.1.4)
@@ -156,7 +151,7 @@
   logging (~> 1.6, >= 1.6.1)
   rubyzip (~> 1.1)
   winrm (~> 1.3.0)
-yard (0.8.7.6)
+yard (0.9.0)
 
 PLATFORMS
   ruby

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a36412d5231454de4be21a5ad5019b55c8e1a66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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 setting nfs_force_v3 to force NFS 3 - change (mediawiki/vagrant)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Add setting nfs_force_v3 to force NFS 3
..


Add setting nfs_force_v3 to force NFS 3

Change-Id: Ie6a28e128ee06a3b2a02d0b8c83dff2b62050e26
---
M Gemfile.lock
M Vagrantfile
M features/config.feature
M lib/mediawiki-vagrant/settings/definitions.rb
M lib/mediawiki-vagrant/version.rb
M spec/mediawiki_vagrant/settings/definitions_spec.rb
6 files changed, 32 insertions(+), 2 deletions(-)

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



diff --git a/Gemfile.lock b/Gemfile.lock
index 0d70589..8dbf549 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,7 +24,7 @@
 PATH
   remote: .
   specs:
-mediawiki-vagrant (0.13.2)
+mediawiki-vagrant (0.14.0)
 
 GEM
   remote: https://rubygems.org/
diff --git a/Vagrantfile b/Vagrantfile
index b0bd298..afc19a0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -145,6 +145,7 @@
 root_share_options[:type] = :nfs
 root_share_options[:mount_options] = ['noatime', 'rsize=32767', 
'wsize=32767', 'async']
 root_share_options[:mount_options] << 'fsc' if settings[:nfs_cache]
+root_share_options[:mount_options] << 'vers=3' if settings[:nfs_force_v3]
 config.nfs.map_uid = Process.uid
 config.nfs.map_gid = Process.gid
   else
diff --git a/features/config.feature b/features/config.feature
index 2d002aa..2231923 100644
--- a/features/config.feature
+++ b/features/config.feature
@@ -29,6 +29,7 @@
   | http_port |
   | https_port|
   | nfs_shares|
+  | nfs_force_v3  |
   | forward_agent |
   | forward_x11   |
 
@@ -77,6 +78,7 @@
   | https_port| 4433|
   | host_ip   | 0.0.0.0 |
   | nfs_shares| no  |
+  | nfs_force_v3  | no  |
   | nfs_cache | yes |
   | forward_agent | yes |
   | forward_x11   | no  |
@@ -90,6 +92,7 @@
   | https_port| 4433|
   | host_ip   | 0.0.0.0 |
   | nfs_shares| no  |
+  | nfs_force_v3  | no  |
   | nfs_cache | yes |
   | forward_agent | yes |
   | forward_x11   | no  |
diff --git a/lib/mediawiki-vagrant/settings/definitions.rb 
b/lib/mediawiki-vagrant/settings/definitions.rb
index 38917c4..b2952e5 100644
--- a/lib/mediawiki-vagrant/settings/definitions.rb
+++ b/lib/mediawiki-vagrant/settings/definitions.rb
@@ -47,6 +47,12 @@
   default: defined?(Vagrant::Util::Platform) ? 
!Vagrant::Util::Platform.windows? : true,
   coercion: ->(_setting, new) { !!(new.to_s =~ /^(true|t|yes|y|1)$/i) }
 
+setting :nfs_force_v3,
+  description: 'Use NFS version 3',
+  help: "Enter 'yes' or 'no'.",
+  default: false,
+  coercion: ->(_setting, new) { !!(new.to_s =~ /^(true|t|yes|y|1)$/i) }
+
 setting :nfs_cache,
   description: 'Use cachefilesd to speed up NFS file access 
(EXPERIMENTAL)',
   help: "Enter 'yes' or 'no'. If your VM is currently running, reload it 
after changing this setting.",
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index 248cebe..f401f2b 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
 module MediaWikiVagrant
-  VERSION = '0.13.3'
+  VERSION = '0.14.0'
 end
diff --git a/spec/mediawiki_vagrant/settings/definitions_spec.rb 
b/spec/mediawiki_vagrant/settings/definitions_spec.rb
index c4232be..cfa59a0 100644
--- a/spec/mediawiki_vagrant/settings/definitions_spec.rb
+++ b/spec/mediawiki_vagrant/settings/definitions_spec.rb
@@ -127,6 +127,26 @@
 end
   end
 
+  describe 'nfs_force_v3' do
+subject { definitions[:nfs_force_v3] }
+
+context 'when a new value is set' do
+  it 'considers values "true", "t", "yes", "y", "1" all to be true' do
+%w(true t yes y 1).each do |value|
+  subject.value = value
+  expect(subject.value).to be(true), "expected #{value} to be 
considered true"
+end
+  end
+
+  it 'considers values "false", "f", "no", "n", "0" to be false' do
+%w(false f no n 0).each do |value|
+  subject.value = value
+  expect(subject.value).to be(false), "expected #{value} to be 
considered false"
+end
+  end
+end
+  end
+
   describe 'forward_agent' do
 subject { definitions[:forward_agent] }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6a28e128ee06a3b2a02d0b8c83dff2b62050e26
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] Drupal submodule update - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: Drupal submodule update
..


Drupal submodule update

Upgrade core from 7.43 to 7.44

b4567f5 Check in custom hack to register namespaced classes
b41c23a Drupal core udpate.

Change-Id: I5fa0d47d479719358ba00b16a9936b360e0a03f5
---
M drupal
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/drupal b/drupal
index dc70013..b4567f5 16
--- a/drupal
+++ b/drupal
-Subproject commit dc700133f3308339b3543f9bc5eb5eda58b67a6c
+Subproject commit b4567f5222103fef9a5a17f7dbde91e635b3a792

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5fa0d47d479719358ba00b16a9936b360e0a03f5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Drupal submodule update - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: Drupal submodule update
..

Drupal submodule update

Upgrade core from 7.43 to 7.44

b4567f5 Check in custom hack to register namespaced classes
b41c23a Drupal core udpate.

Change-Id: I5fa0d47d479719358ba00b16a9936b360e0a03f5
---
M drupal
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/08/297708/1

diff --git a/drupal b/drupal
index dc70013..b4567f5 16
--- a/drupal
+++ b/drupal
-Subproject commit dc700133f3308339b3543f9bc5eb5eda58b67a6c
+Subproject commit b4567f5222103fef9a5a17f7dbde91e635b3a792

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fa0d47d479719358ba00b16a9936b360e0a03f5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] Remove oresc_is_predicted = 1 in db queries - change (mediawiki...ORES)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Remove oresc_is_predicted = 1 in db queries
..


Remove oresc_is_predicted = 1 in db queries

It doesn't serve any meaningful purpose in this case

Change-Id: Ie1a7321c2075c1c6fa5b302af52c3ca2569cb8e2
---
M includes/Hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index 5f593bc..9f194b0 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -123,7 +123,7 @@
 
$join_conds['ores_classification'] = [ 'LEFT JOIN',
'rc_this_oldid = oresc_rev ' .
-   'AND oresc_is_predicted = 1 AND oresc_class = 1' ];
+   'AND oresc_class = 1' ];
 
$join_conds['ores_model'] = [ 'LEFT JOIN',
'oresc_model = oresm_id ' .
@@ -134,7 +134,7 @@
// Override the join conditions.
$join_conds['ores_classification'] = [ 'INNER JOIN',
'rc_this_oldid = oresc_rev ' .
-   'AND oresc_is_predicted = 1 AND oresc_class = 
1' ];
+   'AND oresc_class = 1' ];
 
// Filter out non-damaging edits.
$conds[] = 'oresc_probability > '

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1a7321c2075c1c6fa5b302af52c3ca2569cb8e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
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] admin: replace ssh key for andyrussg - change (operations/puppet)

2016-07-06 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: admin: replace ssh key for andyrussg
..


admin: replace ssh key for andyrussg

Replacing the SSH key for user andyrussg as
requested on T139213.

New key from P pasted by
https://phabricator.wikimedia.org/p/AndyRussG/

linked to https://www.mediawiki.org/wiki/User:AGreen_%28WMF%29

confirmed via:
https://office.wikimedia.org/w/index.php?title=User:AGreen_%28WMF%29=191337

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

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 6511d89..aee84e8 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1529,7 +1529,7 @@
 gid: 500
 name: andyrussg
 realname: Andrew Green
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAAEAQD46lk/Jc4xkSRKu8z4Go5zzYuA0HRwyd9RqbtMGfC61EVY17oYx/lIEikVLBzhyL7PCCA/mBvElTeUr4S9gvmxqtOwczj2FTwIIEFE7nbvF6NJdf2n3f/kRAKOtc9FaOJJ7sbje6rrnJdxiMcUtf9MEo0m3k7Dw5CYU68xVJnowiWE0KBqMps4xkOfdBmk1L8bOfmC+pfe7LIVoX5MxU+sJ2f+QGErtPq/inIppsifW4aw2Lvamc11X/uyUBwzcQzgrE0nViOdSobW9hB56GnMHLN3OrjUbhbM2iDtvsEo00bcVSsUfsHPjiqf95Ugm3NFLLhY7odnWlo6tTvj0NJiU1PvxMRN4b+bgzuw/Angr6IdnpNDclAc8cAY5bkSnXacgzuCkBTz6vNKdFS8XfCEOAZaWSYf9Hc/u8rJzt9Lz4LieJXx5sB3ncQmRmUZNEHopYzZLF4KSNjGM+d5N4a8sJlAyCqeGCaE579yS+Q1ZnvtIIwakdNiuwiOYA0j+X+EzLp+0eYuRn9ZPGSbgarjWY/RsrAai93RVxFHq4+zHrPZ1eFw2g0WydEGNuHh+6JQdZfK6hUwCoOYjxX06xdjbbaFWNgeT3p1LrUH1sQ+Iht+zJp7cg5Hv8h2Xvq5Z8GA/hP9dU7h2esqErpu1Vk1Yyld0sdC/oYxW8JPsXuR55G++qGtyfBJNdVJo2f4+w6gjcuiaE7KrenuzxcC4IyKwiqwknqv1FiWINCjDADxol2YTEP8Ia7ZzDACwCoJ9YZMksX26lHLCC+UiTMoSDrAvtEUM930ZwnkxUAzu4m90qt4YaXZlrEeOiUru/ydaZ9dDHdqtCf6yT6QpNCQmJ/cQfqJ/E7fV7GmSt5VAbBfl0BuVJlirZQtZ9/FXG/z3UDqBkYaSnxuKsh9iB/tgr0Y9xXMK7AcSPQiR84SqDAn+0zYKoLP1ZO+2Zh7D2FNHmKDj7XQFVFdKp6i0kMDAT2Ro/7Z3W671t8+0lKua1zi7vm10ey4K4FS8/1gHuhhB/S7imncehsvWMdvakFhWoaA9gJc0HrTSibY4/A1HLV0KK+4CCN08R/Zei9DXJeIwbCD3i9VzXKoWTUqBmZAAV2IcXGswoHA4UJ/q7zJp5MRuvziKbXNgbBMJUsiezAERqZ35xMkcnTHjFS0DpnNXlDts0nPfsHUVUpW6wAvsSg+ZieGrSjkua8/d0WMgxlVlKICRb5XhDWAGMu+tEfhYjFD/c5UkzaHU4L49W4h7C16PRwJdfRRb8ULb7YBFcrEzOnyYAi0DQmpJPsBJ9tfhAZXMqXQ8hhNLHuCi7MuEwU9sHO7wk+/Pq9F5AD/pdi7pZ2/bZg6c5+2BigynwHy4z3l
 home@lap]
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAACAQC0s1xlbcCS1VrAzJNqS+dzOWtBhZtD5hlCzt9SyS0dkjsmrpoO90dUtpYM/nfkkXcXcwfRc71YV2d/MPz2RlwJdIi+EoIQO5eGvrBH7bVo83S80moQ/SpwRFy9eGn855tKVxwMbWmRG0mVVX9lodbmK6AqaKnu7/q8zikb6aHOBOK2rRI9y/rhTc03pqTuZVJuTibxv+hZXKORtBh41bkRXSlMXExOcHALCpUNzGRQm/uVzrdN8qcgSNm/i90eN4L8SIOv2s2PmMIENtsPgF/ELIB/IM3EArfp+4IqcSE02CKGrFMax9ZL4O8oVS9/ML6wlRkVxrj1+bobMH3kr7ANzM5Trw6cg5JU811dOhTFsv09iHmHuo7znn+6siLj0y88Wg+ppzSf/N5x8oevSlobLwuN0YujTPuTutIMUKcPQ4P/2TfcicAF5mKUd5fYhf1LPjZXj8Ks7Jb6QKoKiNkXYylxH3hGy0ckA0xDOBtowXV9mUeWmMVSANNs9Lm/4OxpOgNwBJdXr9XQakFMird6N/chxeoyD3gccbEA5JRHiP3XNPmmPKFYBoOpBt28DEU88k554ZEpnJEZ14z7R+Iy8rQZyxRLmfVMpw6KN+DYm89R4fycNn2BfAqOetA1FctdGuBnFgJtKGWXjg94Mfehje+S8JJBY62SJKff0xZD0Q==
 lap@debian]
 uid: 3609
   mobrovac:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2a735d570e4cf23a8479195ce569db9a9e3ce5b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Awight 
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] Check in custom hack to register namespaced classes - change (wikimedia...drupal)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Check in custom hack to register namespaced classes
..


Check in custom hack to register namespaced classes

Change-Id: Iaa68b831b51822600c6359b97069d36fd764ec2e
---
A patches/wmf-namespaced-classes.patch
1 file changed, 79 insertions(+), 0 deletions(-)

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



diff --git a/patches/wmf-namespaced-classes.patch 
b/patches/wmf-namespaced-classes.patch
new file mode 100644
index 000..505c7cd
--- /dev/null
+++ b/patches/wmf-namespaced-classes.patch
@@ -0,0 +1,79 @@
+commit 98f9e6bffeb2b1819f10ea9e4688ec007b6990c9
+Author: Adam Roses Wight 
+Date:   Mon Sep 2 10:23:03 2013 -0700
+
+(FR #1070) Drupal registry supports namespaces
+
+Change-Id: Ibcdaec331293588986813768789705abc31a5b3d
+
+diff --git a/includes/registry.inc b/includes/registry.inc
+index f6c81eb..16385f1 100644
+--- a/includes/registry.inc
 b/includes/registry.inc
+@@ -161,8 +161,14 @@ function _registry_parse_files($files) {
+  *   (optional) Weight of the module.
+  */
+ function _registry_parse_file($filename, $contents, $module = '', $weight = 
0) {
++  $namespace = '';
++  // We support one namespace per file
++  if 
(preg_match('/^<\?(?:php)?\s*(?:declare[^;]+;\s*)?namespace\s+?([a-zA-Z0-9_]+)/ms',
 $contents, $matches)) {
++$namespace = $matches[1] . '\\';
++  }
+   if 
(preg_match_all('/^\s*(?:abstract|final)?\s*(class|interface)\s+([a-zA-Z0-9_]+)/m',
 $contents, $matches)) {
+-foreach ($matches[2] as $key => $name) {
++foreach ($matches[2] as $key => &$name) {
++  $name = $namespace . $name;
+   db_merge('registry')
+ ->key(array(
+   'name' => $name,
+diff --git a/modules/system/system.info b/modules/system/system.info
+index eb9b96c..083839e 100644
+--- a/modules/system/system.info
 b/modules/system/system.info
+@@ -9,6 +9,7 @@ files[] = system.queue.inc
+ files[] = system.tar.inc
+ files[] = system.updater.inc
+ files[] = system.test
++files[] = tests/NamespacedClass.php
+ required = TRUE
+ configure = admin/config/system
+ 
+diff --git a/modules/system/system.test b/modules/system/system.test
+index 99e0cbe..79c9b2f 100644
+--- a/modules/system/system.test
 b/modules/system/system.test
+@@ -2712,3 +2712,24 @@ class TokenScanTest extends DrupalWebTestCase {
+   }
+ }
+ 
++/**
++ * Test registry autoloader
++ */
++class AutoloadTest extends DrupalWebTestCase {
++
++  public static function getInfo() {
++return array(
++  'name' => 'Autoloader and registry',
++  'description' => 'Check that classes are correctly inserted into the 
registry and are discoverable by the autoloader.',
++  'group' => 'System',
++);
++  }
++
++  function testGlobalNamespace() {
++$this->assertTrue(class_exists('EntityFieldQuery'), 'Class with global 
namespace can be autoloaded.');
++  }
++
++  function testNamespacedClass() {
++$this->assertTrue(class_exists('foo\bar\NamespacedClass'), 'Namespaced 
class can be autoloaded.');
++  }
++}
+diff --git a/modules/system/tests/NamespacedClass.php 
b/modules/system/tests/NamespacedClass.php
+new file mode 100644
+index 000..b27aedb
+--- /dev/null
 b/modules/system/tests/NamespacedClass.php
+@@ -0,0 +1,4 @@
++https://gerrit.wikimedia.org/r/297521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa68b831b51822600c6359b97069d36fd764ec2e
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/drupal
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Notification count: don't assume 'all' - change (mediawiki...Echo)

2016-07-06 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Notification count: don't assume 'all'
..

Notification count: don't assume 'all'

Bug: T139323
Change-Id: I44ebdc600015bdfadc07e313689b8fad1d1c60c0
(cherry picked from commit 194b9c78a4202979b78cfee6eb7d354a24e41311)
---
M Echo.php
M includes/api/ApiEchoNotifications.php
2 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/Echo.php b/Echo.php
index 71f4f17..e656aac 100644
--- a/Echo.php
+++ b/Echo.php
@@ -546,7 +546,7 @@
 
 // Echo Configuration for EventLogging
 $wgEchoConfig = array(
-   'version' => '1.10',
+   'version' => '1.11',
'eventlogging' => array(
/**
 * Properties:
diff --git a/includes/api/ApiEchoNotifications.php 
b/includes/api/ApiEchoNotifications.php
index 187f1e1..2096881 100644
--- a/includes/api/ApiEchoNotifications.php
+++ b/includes/api/ApiEchoNotifications.php
@@ -285,18 +285,18 @@
$result = array();
$notifUser = MWEchoNotifUser::newFromUser( $user );
$global = $this->crossWikiSummary ? 'preference' : false;
-   // Always get total count
-   $rawCount = $notifUser->getNotificationCount( true, DB_SLAVE, 
EchoAttributeManager::ALL, $global );
-   $result['rawcount'] = $rawCount;
-   $result['count'] = 
EchoNotificationController::formatNotificationCount( $rawCount );
 
-   if ( $groupBySection ) {
-   foreach ( $sections as $section ) {
-   $rawCount = $notifUser->getNotificationCount( 
/* $tryCache = */true, DB_SLAVE, $section, $global );
+   $totalRawCount = 0;
+   foreach ( $sections as $section ) {
+   $rawCount = $notifUser->getNotificationCount( /* 
$tryCache = */true, DB_SLAVE, $section, $global );
+   if ( $groupBySection ) {
$result[$section]['rawcount'] = $rawCount;
$result[$section]['count'] = 
EchoNotificationController::formatNotificationCount( $rawCount );
}
+   $totalRawCount += $rawCount;
}
+   $result['rawcount'] = $totalRawCount;
+   $result['count'] = 
EchoNotificationController::formatNotificationCount( $totalRawCount );
 
return $result;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44ebdc600015bdfadc07e313689b8fad1d1c60c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Sbisson 

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

[MediaWiki-commits] [Gerrit] Notification count: don't assume 'all' - change (mediawiki...Echo)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Notification count: don't assume 'all'
..


Notification count: don't assume 'all'

Bug: T139323
Change-Id: I44ebdc600015bdfadc07e313689b8fad1d1c60c0
---
M Echo.php
M includes/api/ApiEchoNotifications.php
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/Echo.php b/Echo.php
index 71f4f17..e656aac 100644
--- a/Echo.php
+++ b/Echo.php
@@ -546,7 +546,7 @@
 
 // Echo Configuration for EventLogging
 $wgEchoConfig = array(
-   'version' => '1.10',
+   'version' => '1.11',
'eventlogging' => array(
/**
 * Properties:
diff --git a/includes/api/ApiEchoNotifications.php 
b/includes/api/ApiEchoNotifications.php
index 187f1e1..2096881 100644
--- a/includes/api/ApiEchoNotifications.php
+++ b/includes/api/ApiEchoNotifications.php
@@ -285,18 +285,18 @@
$result = array();
$notifUser = MWEchoNotifUser::newFromUser( $user );
$global = $this->crossWikiSummary ? 'preference' : false;
-   // Always get total count
-   $rawCount = $notifUser->getNotificationCount( true, DB_SLAVE, 
EchoAttributeManager::ALL, $global );
-   $result['rawcount'] = $rawCount;
-   $result['count'] = 
EchoNotificationController::formatNotificationCount( $rawCount );
 
-   if ( $groupBySection ) {
-   foreach ( $sections as $section ) {
-   $rawCount = $notifUser->getNotificationCount( 
/* $tryCache = */true, DB_SLAVE, $section, $global );
+   $totalRawCount = 0;
+   foreach ( $sections as $section ) {
+   $rawCount = $notifUser->getNotificationCount( /* 
$tryCache = */true, DB_SLAVE, $section, $global );
+   if ( $groupBySection ) {
$result[$section]['rawcount'] = $rawCount;
$result[$section]['count'] = 
EchoNotificationController::formatNotificationCount( $rawCount );
}
+   $totalRawCount += $rawCount;
}
+   $result['rawcount'] = $totalRawCount;
+   $result['count'] = 
EchoNotificationController::formatNotificationCount( $totalRawCount );
 
return $result;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44ebdc600015bdfadc07e313689b8fad1d1c60c0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Adding a bunch of hooks from wikiHow into Difference... - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Adding a bunch of hooks from wikiHow into 
DifferenceEngine"
..


Revert "Adding a bunch of hooks from wikiHow into DifferenceEngine"

Causes fatals.

This reverts commit b02bfac06b04fd0284faa785f932792ce9bb93ae.

Bug: T139526
Change-Id: I4c77b4d51408540a9238d38e8324028879b1bbf2
(cherry picked from commit 3f5717cac84199d4118a0e2b497f7e11d6d5320a)
---
M docs/hooks.txt
M includes/diff/DifferenceEngine.php
2 files changed, 6 insertions(+), 117 deletions(-)

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



diff --git a/docs/hooks.txt b/docs/hooks.txt
index f9f8333..8640228 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1136,85 +1136,6 @@
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
 
-'DifferenceEngineMarkPatrolledLink': Allows extensions to change the "mark as 
patrolled" link
-which is shown both on the diff header as well as on the bottom of a page, 
usually
-wrapped in a span element which has class="patrollink".
-$differenceEngine: DifferenceEngine object
-&$markAsPatrolledLink: The "mark as patrolled" link HTML (string)
-$rcid: Recent change ID (rc_id) for this change (int)
-$token: Patrol token; $rcid is used in generating this variable
-
-'DifferenceEngineMarkPatrolledRCID': Allows extensions to possibly change the 
rcid parameter.
-For example the rcid might be set to zero due to the user being the same as the
-performer of the change but an extension might still want to show it under 
certain
-conditions.
-&$rcid: rc_id (int) of the change or 0
-$differenceEngine: DifferenceEngine object
-$change: RecentChange object
-$user: User object representing the current user
-
-'DifferenceEngineNewHeader': Allows extensions to change the $newHeader 
variable, which
-contains information about the new revision, such as the revision's author, 
whether
-the revision was marked as a minor edit or not, etc.
-$differenceEngine: DifferenceEngine object
-&$newHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
-include things like revision author info, revision comment, RevisionDelete 
link and more
-$formattedRevisionTools: Array containing revision tools, some of which may 
have
-been injected with the DiffRevisionTools hook
-$nextlink: String containing the link to the next revision (if any); also 
included in $newHeader
-$rollback: Rollback link (string) to roll this revision back to the previous 
one, if any
-$newminor: String indicating if the new revision was marked as a minor edit
-$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
-whether we should show just the diff; passed in as a query string parameter to 
the
-various URLs constructed here (i.e. $nextlink)
-$rdel: RevisionDelete link for the new revision, if the current user is allowed
-to use the RevisionDelete feature
-$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
-
-'DifferenceEngineOldHeader': Allows extensions to change the $oldHeader 
variable, which
-contains information about the old revision, such as the revision's author, 
whether
-the revision was marked as a minor edit or not, etc.
-$differenceEngine: DifferenceEngine object
-&$oldHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
-include things like revision author info, revision comment, RevisionDelete 
link and more
-$prevlink: String containing the link to the previous revision (if any); also 
included in $oldHeader
-$oldminor: String indicating if the old revision was marked as a minor edit
-$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
-whether we should show just the diff; passed in as a query string parameter to 
the
-various URLs constructed here (i.e. $prevlink)
-$ldel: RevisionDelete link for the old revision, if the current user is allowed
-to use the RevisionDelete feature
-$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
-
-'DifferenceEngineOldHeaderNoOldRev': Change the $oldHeader variable in cases 
when
-there is no old revision
-&$oldHeader: empty string by default
-
-'DifferenceEngineRenderRevisionAddParserOutput': Allows extensions to change 
the parser output.
-Return false to not add parser output via OutputPage's addParserOutput method.
-$differenceEngine: DifferenceEngine object
-$out: OutputPage object
-$parserOutput: ParserOutput object
-$wikiPage: WikiPage object
-
-'DifferenceEngineRenderRevisionShowFinalPatrolLink': An extension can hook 
into this hook
-point and return false to not show the final "mark as patrolled" link on the 
bottom
-of a page.
-This hook has no arguments.
-
-'DifferenceEngineShowDiff': Allows extensions to affect the diff text which
-eventually gets sent to the OutputPage object.
-$differenceEngine: DifferenceEngine object
-

[MediaWiki-commits] [Gerrit] Bump Gemfile.lock versions - change (mediawiki/vagrant)

2016-07-06 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: Bump Gemfile.lock versions
..

Bump Gemfile.lock versions

Ran `bundle update`

Change-Id: I4a36412d5231454de4be21a5ad5019b55c8e1a66
---
M Gemfile.lock
1 file changed, 36 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/06/297706/1

diff --git a/Gemfile.lock b/Gemfile.lock
index 8dbf549..bb8848a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,34 +29,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-ast (2.1.0)
+ast (2.3.0)
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
-byebug (3.5.1)
-  columnize (~> 0.8)
-  debugger-linecache (~> 1.2)
-  slop (~> 3.6)
+byebug (9.0.5)
 childprocess (0.5.9)
   ffi (~> 1.0, >= 1.0.11)
-coderay (1.1.0)
-columnize (0.9.0)
-cucumber (2.0.0.rc.4)
+coderay (1.1.1)
+cucumber (2.0.2)
   builder (>= 2.1.2)
-  cucumber-core (~> 1.1.0)
+  cucumber-core (~> 1.2.0)
   diff-lcs (>= 1.1.3)
   gherkin (~> 2.12)
   multi_json (>= 1.7.5, < 2.0)
   multi_test (>= 0.1.2)
-cucumber-core (1.1.1)
+cucumber-core (1.2.0)
   gherkin (~> 2.12.0)
-debugger-linecache (1.2.0)
 diff-lcs (1.2.5)
-domain_name (0.5.20160128)
+domain_name (0.5.20160615)
   unf (>= 0.0.5, < 1.0.0)
 erubis (2.7.0)
-fakefs (0.6.5)
-ffi (1.9.10)
+fakefs (0.6.7)
+ffi (1.9.12)
 gherkin (2.12.2)
   multi_json (~> 1.3)
 gssapi (1.2.0)
@@ -66,20 +61,20 @@
 hashicorp-checkpoint (0.1.4)
 http-cookie (1.0.2)
   domain_name (~> 0.5)
-httpclient (2.7.1)
+httpclient (2.8.0)
 i18n (0.7.0)
-listen (3.0.5)
-  rb-fsevent (>= 0.9.3)
-  rb-inotify (>= 0.9)
+listen (3.0.8)
+  rb-fsevent (~> 0.9, >= 0.9.4)
+  rb-inotify (~> 0.9, >= 0.9.7)
 little-plugger (1.1.4)
 log4r (1.1.10)
 logging (1.8.2)
   little-plugger (>= 1.1.3)
   multi_json (>= 1.8.4)
 method_source (0.8.2)
-mime-types (2.99)
+mime-types (2.99.2)
 mini_portile (0.6.0)
-multi_json (1.11.0)
+multi_json (1.12.1)
 multi_test (0.1.2)
 net-scp (1.1.2)
   net-ssh (>= 2.6.5)
@@ -90,21 +85,21 @@
 nokogiri (1.6.3.1)
   mini_portile (= 0.6.0)
 nori (2.6.0)
-parser (2.2.3.0)
-  ast (>= 1.1, < 3.0)
+parser (2.3.1.2)
+  ast (~> 2.2)
 powerpack (0.1.1)
-pry (0.10.1)
+pry (0.10.3)
   coderay (~> 1.1.0)
   method_source (~> 0.8.1)
   slop (~> 3.4)
-pry-byebug (2.0.0)
-  byebug (~> 3.4)
+pry-byebug (3.4.0)
+  byebug (~> 9.0)
   pry (~> 0.10)
 puppet-lint (1.1.0)
-rainbow (2.0.0)
+rainbow (2.1.0)
 rake (10.4.2)
 rb-fsevent (0.9.7)
-rb-inotify (0.9.5)
+rb-inotify (0.9.7)
   ffi (>= 0.5.0)
 rb-kqueue (0.2.4)
   ffi (>= 0.5.0)
@@ -112,19 +107,19 @@
   http-cookie (>= 1.0.2, < 2.0)
   mime-types (>= 1.16, < 3.0)
   netrc (~> 0.7)
-rspec (3.2.0)
-  rspec-core (~> 3.2.0)
-  rspec-expectations (~> 3.2.0)
-  rspec-mocks (~> 3.2.0)
-rspec-core (3.2.0)
-  rspec-support (~> 3.2.0)
-rspec-expectations (3.2.0)
+rspec (3.5.0)
+  rspec-core (~> 3.5.0)
+  rspec-expectations (~> 3.5.0)
+  rspec-mocks (~> 3.5.0)
+rspec-core (3.5.0)
+  rspec-support (~> 3.5.0)
+rspec-expectations (3.5.0)
   diff-lcs (>= 1.2.0, < 2.0)
-  rspec-support (~> 3.2.0)
-rspec-mocks (3.2.0)
+  rspec-support (~> 3.5.0)
+rspec-mocks (3.5.0)
   diff-lcs (>= 1.2.0, < 2.0)
-  rspec-support (~> 3.2.0)
-rspec-support (3.2.0)
+  rspec-support (~> 3.5.0)
+rspec-support (3.5.0)
 rubocop (0.35.1)
   astrolabe (~> 1.3)
   parser (>= 2.2.3.0, < 3.0)
@@ -132,9 +127,9 @@
   rainbow (>= 1.99.1, < 3.0)
   ruby-progressbar (~> 1.7)
   tins (<= 1.6.0)
-ruby-progressbar (1.7.5)
+ruby-progressbar (1.8.1)
 rubyntlm (0.4.0)
-rubyzip (1.1.7)
+rubyzip (1.2.0)
 slop (3.6.0)
 tins (1.6.0)
 unf (0.1.4)
@@ -156,7 +151,7 @@
   logging (~> 1.6, >= 1.6.1)
   rubyzip (~> 1.1)
   winrm (~> 1.3.0)
-yard (0.8.7.6)
+yard (0.9.0)
 
 PLATFORMS
   ruby

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a36412d5231454de4be21a5ad5019b55c8e1a66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
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] Revert "Adding a bunch of hooks from wikiHow into Difference... - change (mediawiki/core)

2016-07-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Revert "Adding a bunch of hooks from wikiHow into 
DifferenceEngine"
..

Revert "Adding a bunch of hooks from wikiHow into DifferenceEngine"

Causes fatals.

This reverts commit b02bfac06b04fd0284faa785f932792ce9bb93ae.

Bug: T139526
Change-Id: I4c77b4d51408540a9238d38e8324028879b1bbf2
(cherry picked from commit 3f5717cac84199d4118a0e2b497f7e11d6d5320a)
---
M docs/hooks.txt
M includes/diff/DifferenceEngine.php
2 files changed, 6 insertions(+), 117 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/297705/1

diff --git a/docs/hooks.txt b/docs/hooks.txt
index f9f8333..8640228 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1136,85 +1136,6 @@
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
 
-'DifferenceEngineMarkPatrolledLink': Allows extensions to change the "mark as 
patrolled" link
-which is shown both on the diff header as well as on the bottom of a page, 
usually
-wrapped in a span element which has class="patrollink".
-$differenceEngine: DifferenceEngine object
-&$markAsPatrolledLink: The "mark as patrolled" link HTML (string)
-$rcid: Recent change ID (rc_id) for this change (int)
-$token: Patrol token; $rcid is used in generating this variable
-
-'DifferenceEngineMarkPatrolledRCID': Allows extensions to possibly change the 
rcid parameter.
-For example the rcid might be set to zero due to the user being the same as the
-performer of the change but an extension might still want to show it under 
certain
-conditions.
-&$rcid: rc_id (int) of the change or 0
-$differenceEngine: DifferenceEngine object
-$change: RecentChange object
-$user: User object representing the current user
-
-'DifferenceEngineNewHeader': Allows extensions to change the $newHeader 
variable, which
-contains information about the new revision, such as the revision's author, 
whether
-the revision was marked as a minor edit or not, etc.
-$differenceEngine: DifferenceEngine object
-&$newHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
-include things like revision author info, revision comment, RevisionDelete 
link and more
-$formattedRevisionTools: Array containing revision tools, some of which may 
have
-been injected with the DiffRevisionTools hook
-$nextlink: String containing the link to the next revision (if any); also 
included in $newHeader
-$rollback: Rollback link (string) to roll this revision back to the previous 
one, if any
-$newminor: String indicating if the new revision was marked as a minor edit
-$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
-whether we should show just the diff; passed in as a query string parameter to 
the
-various URLs constructed here (i.e. $nextlink)
-$rdel: RevisionDelete link for the new revision, if the current user is allowed
-to use the RevisionDelete feature
-$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
-
-'DifferenceEngineOldHeader': Allows extensions to change the $oldHeader 
variable, which
-contains information about the old revision, such as the revision's author, 
whether
-the revision was marked as a minor edit or not, etc.
-$differenceEngine: DifferenceEngine object
-&$oldHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
-include things like revision author info, revision comment, RevisionDelete 
link and more
-$prevlink: String containing the link to the previous revision (if any); also 
included in $oldHeader
-$oldminor: String indicating if the old revision was marked as a minor edit
-$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
-whether we should show just the diff; passed in as a query string parameter to 
the
-various URLs constructed here (i.e. $prevlink)
-$ldel: RevisionDelete link for the old revision, if the current user is allowed
-to use the RevisionDelete feature
-$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
-
-'DifferenceEngineOldHeaderNoOldRev': Change the $oldHeader variable in cases 
when
-there is no old revision
-&$oldHeader: empty string by default
-
-'DifferenceEngineRenderRevisionAddParserOutput': Allows extensions to change 
the parser output.
-Return false to not add parser output via OutputPage's addParserOutput method.
-$differenceEngine: DifferenceEngine object
-$out: OutputPage object
-$parserOutput: ParserOutput object
-$wikiPage: WikiPage object
-
-'DifferenceEngineRenderRevisionShowFinalPatrolLink': An extension can hook 
into this hook
-point and return false to not show the final "mark as patrolled" link on the 
bottom
-of a page.
-This hook has no arguments.
-
-'DifferenceEngineShowDiff': Allows extensions to affect the diff text which
-eventually gets sent to the OutputPage object.
-$differenceEngine:

[MediaWiki-commits] [Gerrit] Revert "Show parser output for diffs unless extension aborts" - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Show parser output for diffs unless extension aborts"
..


Revert "Show parser output for diffs unless extension aborts"

Reverting the underlying change.

This reverts commit 3354e8d550e6d650a0b1681fcad427559aea25ce.

Bug: T139526
Change-Id: I2e0f2098981bda411f360eea89e5fac3b644f043
(cherry picked from commit be3c147bde55210e9ef34ae7456f4af7b470731e)
---
M includes/diff/DifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index deeb405..c5e94c5 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -638,7 +638,7 @@
# WikiPage::getParserOutput() should not return 
false, but just in case
if ( $parserOutput ) {
// Allow extensions to change parser 
output here
-   if ( Hooks::run( 
'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, 
$wikiPage ] ) ) {
+   if ( !Hooks::run( 
'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, 
$wikiPage ] ) ) {
$out->addParserOutput( 
$parserOutput );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e0f2098981bda411f360eea89e5fac3b644f043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update .gitreview for new branch - change (mediawiki...wikidiff2)

2016-07-06 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Update .gitreview for new branch
..


Update .gitreview for new branch

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

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



diff --git a/.gitreview b/.gitreview
index 3311ca4..686c355 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/php/wikidiff2.git
-defaultbranch=master
+defaultbranch=debian

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ec0bcb539e43af69a36761599ca17136fb82f01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/wikidiff2
Gerrit-Branch: debian
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Giuseppe Lavagetto 
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 debian/ from master, now in debian branch - change (mediawiki...wikidiff2)

2016-07-06 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Remove debian/ from master, now in debian branch
..


Remove debian/ from master, now in debian branch

Change-Id: I45390b014206d08819ada12f5c645e8118d16398
---
D debian/changelog
D debian/compat
D debian/control
D debian/copyright
D debian/php-wikidiff2.install
D debian/php-wikidiff2.postinst
D debian/php-wikidiff2.prerm
D debian/rules
D debian/source/format
9 files changed, 0 insertions(+), 224 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 23653bb..000
--- a/debian/changelog
+++ /dev/null
@@ -1,96 +0,0 @@
-php-wikidiff2 (1.3.5-1) trusty-wikimedia; urgency=medium
-
-  * Fixed debian/control to work correctly under pbuilder
-
- -- Giuseppe Lavagetto   Tue, 05 Apr 2016 12:06:04 
+0200
-
-php-wikidiff2 (1.3.5) unstable; urgency=medium
-
-  * New version for HHVM 3.12; debian/rules changes
-
- -- Giuseppe Lavagetto   Wed, 02 Mar 2016 17:51:48 
+0100
-
-php-wikidiff2 (1.3.4) trusty-wikimedia; urgency=medium
-
-  * Version bump for HHVM 3.6 
-
- -- Giuseppe Lavagetto   Fri, 17 Apr 2015 10:38:15 
+0200
-
-php-wikidiff2 (1.3-3.1) trusty-wikimedia; urgency=medium
-
-  * Corrected the path of the ini file.
-
- -- Giuseppe Lavagetto   Mon, 16 Feb 2015 11:48:03 
+0100
-
-php-wikidiff2 (1.3-3) trusty-wikimedia; urgency=medium
-
-  * Now this package correctly depends from the hhvm version
-
- -- Giuseppe Lavagetto   Wed, 23 Jul 2014 15:50:10 
+
-
-php-wikidiff2 (1.3-2) trusty-wikimedia; urgency=medium
-
-  * Version bump reflecting the change in ABI interface from hhvm
-
- -- Giuseppe Lavagetto   Wed, 23 Jul 2014 15:50:10 
+
-
-php-wikidiff2 (1.3-1) unstable; urgency=medium
-
-  * Various Debian packaging fixes
-- Bump to debhelper compatibility level 9
-- Update Standards-Version to 3.9.5
-- Move custom install statements under dh_auto_install to an install file.
-- Add to CXXFLAGS but don't override them (+= instead of =).
-- Drop libthai0 explicit dependency; shlibs:Depends does this
-  automatically.
-- Adjust short and long description based on Debian's description of the
-  package.
-- Add a Homepage field.
-  * Add an hhvm-wikidiff2 package and add hacks to build the source twice,
-once for PHP and once for HHVM.
-
- -- Faidon Liambotis   Fri, 27 Jun 2014 15:29:50 +
-
-php-wikidiff2 (1.2-1) precise-wikimedia; urgency=low
-
-  * Added new function, wikidiff2_inline_diff(), for one-column diffs
-
- -- Max Semenik   Mon, 09 Dec 2013 21:56:00 +
-
-php-wikidiff2 (1.1.2-2) precise-wikimedia; urgency=low
-
-  * Fixed incorrect path in wikidiff2.ini
-
- -- Tim Starling   Tue, 08 Jan 2013 14:30:53 +1100
-
-php-wikidiff2 (1.1.2-1) lucid-wikimedia; urgency=low
-
-  * Fixed bug 26354 (added class to dummy cells containing )
-  * Fixed bug 25697 (empty context lines not showing)
-
- -- Roan Kattouw   Tue, 03 Jan 2012 14:15:41 +0100
-
-php5-wikidiff2 (1.1.1-1) lucid; urgency=low
-
-  * Fixed bug 1 (word breaking around punctuation)
-
- -- Tim Starling   Fri, 23 Dec 2011 15:33:40 +1100
-
-php5-wikidiff2 (1.1.0-2) lucid; urgency=low
-
-  * Include a config file so the extension loads
-
- -- Mark Bergsma   Tue, 08 Feb 2011 12:50:21 +
-
-php5-wikidiff2 (1.1.0-1) lucid; urgency=low
-
-  * New non-swig version
-
- -- Tim Starling   Sun, 20 Jun 2010 17:45:37 +1000
-
-php5-wikidiff2 (1.0.2-1) unstable; urgency=low
-
-  * Initial release as deb package
-
- -- Brion Vibber   Tue, 21 Aug 2007 18:03:07 +
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 204ce70..000
--- a/debian/control
+++ /dev/null
@@ -1,31 +0,0 @@
-Source: php-wikidiff2
-Section: web
-Priority: optional
-Maintainer: Tim Starling 
-Build-Depends: debhelper (>= 9), libthai-dev, pkg-config,
-  php5-dev, hhvm, hhvm-dev, cmake, libtbb-dev, libboost-dev,
-  libgoogle-glog-dev, libdouble-conversion-dev, libjemalloc-dev
-Homepage: http://www.mediawiki.org/wiki/Extension:Wikidiff2
-Standards-Version: 3.9.5
-
-Package: php-wikidiff2
-Architecture: any
-Depends: php5 | php5-cli, ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
-Description: external diff engine for MediaWiki (PHP extension)
- Wikidiff2 is PHP 5 module providing external diff engine for MediaWiki. It
- performs word-level

[MediaWiki-commits] [Gerrit] Revert "Adding a bunch of hooks from wikiHow into Difference... - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Adding a bunch of hooks from wikiHow into 
DifferenceEngine"
..


Revert "Adding a bunch of hooks from wikiHow into DifferenceEngine"

Causes fatals.

This reverts commit b02bfac06b04fd0284faa785f932792ce9bb93ae.

Bug: T139526
Change-Id: I4c77b4d51408540a9238d38e8324028879b1bbf2
---
M docs/hooks.txt
M includes/diff/DifferenceEngine.php
2 files changed, 6 insertions(+), 117 deletions(-)

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



diff --git a/docs/hooks.txt b/docs/hooks.txt
index f9f8333..8640228 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1136,85 +1136,6 @@
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
 
-'DifferenceEngineMarkPatrolledLink': Allows extensions to change the "mark as 
patrolled" link
-which is shown both on the diff header as well as on the bottom of a page, 
usually
-wrapped in a span element which has class="patrollink".
-$differenceEngine: DifferenceEngine object
-&$markAsPatrolledLink: The "mark as patrolled" link HTML (string)
-$rcid: Recent change ID (rc_id) for this change (int)
-$token: Patrol token; $rcid is used in generating this variable
-
-'DifferenceEngineMarkPatrolledRCID': Allows extensions to possibly change the 
rcid parameter.
-For example the rcid might be set to zero due to the user being the same as the
-performer of the change but an extension might still want to show it under 
certain
-conditions.
-&$rcid: rc_id (int) of the change or 0
-$differenceEngine: DifferenceEngine object
-$change: RecentChange object
-$user: User object representing the current user
-
-'DifferenceEngineNewHeader': Allows extensions to change the $newHeader 
variable, which
-contains information about the new revision, such as the revision's author, 
whether
-the revision was marked as a minor edit or not, etc.
-$differenceEngine: DifferenceEngine object
-&$newHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
-include things like revision author info, revision comment, RevisionDelete 
link and more
-$formattedRevisionTools: Array containing revision tools, some of which may 
have
-been injected with the DiffRevisionTools hook
-$nextlink: String containing the link to the next revision (if any); also 
included in $newHeader
-$rollback: Rollback link (string) to roll this revision back to the previous 
one, if any
-$newminor: String indicating if the new revision was marked as a minor edit
-$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
-whether we should show just the diff; passed in as a query string parameter to 
the
-various URLs constructed here (i.e. $nextlink)
-$rdel: RevisionDelete link for the new revision, if the current user is allowed
-to use the RevisionDelete feature
-$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
-
-'DifferenceEngineOldHeader': Allows extensions to change the $oldHeader 
variable, which
-contains information about the old revision, such as the revision's author, 
whether
-the revision was marked as a minor edit or not, etc.
-$differenceEngine: DifferenceEngine object
-&$oldHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
-include things like revision author info, revision comment, RevisionDelete 
link and more
-$prevlink: String containing the link to the previous revision (if any); also 
included in $oldHeader
-$oldminor: String indicating if the old revision was marked as a minor edit
-$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
-whether we should show just the diff; passed in as a query string parameter to 
the
-various URLs constructed here (i.e. $prevlink)
-$ldel: RevisionDelete link for the old revision, if the current user is allowed
-to use the RevisionDelete feature
-$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
-
-'DifferenceEngineOldHeaderNoOldRev': Change the $oldHeader variable in cases 
when
-there is no old revision
-&$oldHeader: empty string by default
-
-'DifferenceEngineRenderRevisionAddParserOutput': Allows extensions to change 
the parser output.
-Return false to not add parser output via OutputPage's addParserOutput method.
-$differenceEngine: DifferenceEngine object
-$out: OutputPage object
-$parserOutput: ParserOutput object
-$wikiPage: WikiPage object
-
-'DifferenceEngineRenderRevisionShowFinalPatrolLink': An extension can hook 
into this hook
-point and return false to not show the final "mark as patrolled" link on the 
bottom
-of a page.
-This hook has no arguments.
-
-'DifferenceEngineShowDiff': Allows extensions to affect the diff text which
-eventually gets sent to the OutputPage object.
-$differenceEngine: DifferenceEngine object
-
-'DifferenceEngineShowEmptyOldContent': Allows extensions to change the diff 
table

[MediaWiki-commits] [Gerrit] Revert "Show parser output for diffs unless extension aborts" - change (mediawiki/core)

2016-07-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Revert "Show parser output for diffs unless extension aborts"
..

Revert "Show parser output for diffs unless extension aborts"

Reverting the underlying change.

This reverts commit 3354e8d550e6d650a0b1681fcad427559aea25ce.

Bug: T139526
Change-Id: I2e0f2098981bda411f360eea89e5fac3b644f043
(cherry picked from commit be3c147bde55210e9ef34ae7456f4af7b470731e)
---
M includes/diff/DifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/297704/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index deeb405..c5e94c5 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -638,7 +638,7 @@
# WikiPage::getParserOutput() should not return 
false, but just in case
if ( $parserOutput ) {
// Allow extensions to change parser 
output here
-   if ( Hooks::run( 
'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, 
$wikiPage ] ) ) {
+   if ( !Hooks::run( 
'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, 
$wikiPage ] ) ) {
$out->addParserOutput( 
$parserOutput );
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e0f2098981bda411f360eea89e5fac3b644f043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.9
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Correct scoping issues in role::osm::master - change (operations/puppet)

2016-07-06 Thread Gehel (Code Review)

Gehel has uploaded a new change for review.

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

Change subject: Correct scoping issues in role::osm::master
..

Correct scoping issues in role::osm::master

On labsdb1006, augeas fails as slave IP address is empty.

Variables are referenced as top scope, when in this case they are defined in
node scope. We could discuss if declaring variables in node scope is a good
idea, but in the meantime, let's make it work.

Change-Id: Ide5770b0bff3f48636b5719056b8d275599c7aa5
---
M modules/role/manifests/osm/master.pp
1 file changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/297703/1

diff --git a/modules/role/manifests/osm/master.pp 
b/modules/role/manifests/osm/master.pp
index b817c15..eef4a4a 100644
--- a/modules/role/manifests/osm/master.pp
+++ b/modules/role/manifests/osm/master.pp
@@ -52,14 +52,17 @@
 }
 
 # FIXME - top-scope var without namespace ($osm_slave_v4), will break in 
puppet 2.8
+# $osm_slave_v4 and $osm_slave are node scope variables and not top scope
 # lint:ignore:variable_scope
 if $osm_slave_v4 {
-# lint:endignore
-postgresql::user { "replication@${::osm_slave}-v4":
+postgresql::user { "replication@${osm_slave}-v4":
+# lint:endignore
 ensure   => 'present',
 user => 'replication',
 password => $passwords::osm::replication_pass,
-cidr => "${::osm_slave_v4}/32",
+# lint:ignore:variable_scope
+cidr => "${osm_slave_v4}/32",
+# lint:endignore
 type => 'host',
 method   => 'md5',
 attrs=> 'REPLICATION',
@@ -67,14 +70,17 @@
 }
 }
 # FIXME - top-scope var without namespace ($osm_slave_v6), will break in 
puppet 2.8
+# $osm_slave_v6 and $osm_slave are node scope variables and not top scope
 # lint:ignore:variable_scope
 if $osm_slave_v6 {
-# lint:endignore
-postgresql::user { "replication@${::osm_slave}-v6":
+postgresql::user { "replication@${osm_slave}-v6":
+# lint:endignore
 ensure   => 'present',
 user => 'replication',
 password => $passwords::osm::replication_pass,
-cidr => "${::osm_slave_v6}/128",
+# lint:ignore:variable_scope
+cidr => "${osm_slave_v6}/128",
+# lint:endignore
 type => 'host',
 method   => 'md5',
 attrs=> 'REPLICATION',

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Show parser output for diffs unless extension aborts" - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Show parser output for diffs unless extension aborts"
..


Revert "Show parser output for diffs unless extension aborts"

Reverting the underlying change.

This reverts commit 3354e8d550e6d650a0b1681fcad427559aea25ce.

Bug: T139526
Change-Id: I2e0f2098981bda411f360eea89e5fac3b644f043
---
M includes/diff/DifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index deeb405..c5e94c5 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -638,7 +638,7 @@
# WikiPage::getParserOutput() should not return 
false, but just in case
if ( $parserOutput ) {
// Allow extensions to change parser 
output here
-   if ( Hooks::run( 
'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, 
$wikiPage ] ) ) {
+   if ( !Hooks::run( 
'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, 
$wikiPage ] ) ) {
$out->addParserOutput( 
$parserOutput );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e0f2098981bda411f360eea89e5fac3b644f043
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Drupal core udpate. - change (wikimedia...drupal)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Drupal core udpate.
..


Drupal core udpate.

re-applied (FR #1070) Drupal registry supports namespaces

Bug: T138890

Change-Id: I69b741e939bd4f279da919f84537bc4f6c279ddc
---
M CHANGELOG.txt
M includes/bootstrap.inc
M includes/form.inc
M modules/aggregator/aggregator.info
M modules/aggregator/tests/aggregator_test.info
M modules/block/block.info
M modules/block/tests/block_test.info
M modules/block/tests/themes/block_test_theme/block_test_theme.info
M modules/blog/blog.info
M modules/book/book.info
M modules/color/color.info
M modules/comment/comment.info
M modules/contact/contact.info
M modules/contextual/contextual.info
M modules/dashboard/dashboard.info
M modules/dblog/dblog.info
M modules/field/field.info
M modules/field/modules/field_sql_storage/field_sql_storage.info
M modules/field/modules/list/list.info
M modules/field/modules/list/tests/list_test.info
M modules/field/modules/number/number.info
M modules/field/modules/options/options.info
M modules/field/modules/text/text.info
M modules/field/tests/field_test.info
M modules/field_ui/field_ui.info
M modules/file/file.info
M modules/file/tests/file_module_test.info
M modules/filter/filter.info
M modules/forum/forum.info
M modules/help/help.info
M modules/image/image.info
M modules/image/tests/image_module_test.info
M modules/locale/locale.info
M modules/locale/tests/locale_test.info
M modules/menu/menu.info
M modules/node/node.info
M modules/node/tests/node_access_test.info
M modules/node/tests/node_test.info
M modules/node/tests/node_test_exception.info
M modules/openid/openid.info
M modules/openid/tests/openid_test.info
M modules/overlay/overlay.info
M modules/path/path.info
M modules/php/php.info
M modules/poll/poll.info
M modules/profile/profile.info
M modules/rdf/rdf.info
M modules/rdf/tests/rdf_test.info
M modules/search/search.info
M modules/search/tests/search_embedded_form.info
M modules/search/tests/search_extra_type.info
M modules/search/tests/search_node_tags.info
M modules/shortcut/shortcut.info
M modules/simpletest/simpletest.info
M modules/simpletest/tests/actions_loop_test.info
M modules/simpletest/tests/ajax_forms_test.info
M modules/simpletest/tests/ajax_test.info
M modules/simpletest/tests/batch_test.info
M modules/simpletest/tests/boot_test_1.info
M modules/simpletest/tests/boot_test_2.info
M modules/simpletest/tests/common_test.info
M modules/simpletest/tests/common_test_cron_helper.info
M modules/simpletest/tests/database_test.info
M modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.info
M 
modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
M 
modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
M modules/simpletest/tests/entity_cache_test.info
M modules/simpletest/tests/entity_cache_test_dependency.info
M modules/simpletest/tests/entity_crud_hook_test.info
M modules/simpletest/tests/entity_query_access_test.info
M modules/simpletest/tests/error_test.info
M modules/simpletest/tests/file_test.info
M modules/simpletest/tests/filter_test.info
M modules/simpletest/tests/form_test.info
M modules/simpletest/tests/image_test.info
M modules/simpletest/tests/menu_test.info
M modules/simpletest/tests/module_test.info
M modules/simpletest/tests/path_test.info
M modules/simpletest/tests/psr_0_test/psr_0_test.info
M modules/simpletest/tests/psr_4_test/psr_4_test.info
M modules/simpletest/tests/requirements1_test.info
M modules/simpletest/tests/requirements2_test.info
M modules/simpletest/tests/session_test.info
M modules/simpletest/tests/system_dependencies_test.info
M 
modules/simpletest/tests/system_incompatible_core_version_dependencies_test.info
M modules/simpletest/tests/system_incompatible_core_version_test.info
M 
modules/simpletest/tests/system_incompatible_module_version_dependencies_test.info
M modules/simpletest/tests/system_incompatible_module_version_test.info
M modules/simpletest/tests/system_project_namespace_test.info
M modules/simpletest/tests/system_test.info
M modules/simpletest/tests/taxonomy_test.info
M modules/simpletest/tests/theme_test.info
M modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
M modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
M modules/simpletest/tests/themes/test_theme/test_theme.info
M modules/simpletest/tests/update_script_test.info
M modules/simpletest/tests/update_test_1.info
M modules/simpletest/tests/update_test_2.info
M modules/simpletest/tests/update_test_3.info
M modules/simpletest/tests/url_alter_test.info
M modules/simpletest/tests/xmlrpc_test.info
M modules/statistics/statistics.info
M modules/syslog/syslog.info
M modules/system/system.info
M modules/system/system.test
M modules/system/tests/cron_queue_test.info
M modules/system/tests/system_cron_test.info
M modules/taxonomy/taxonomy.info

[MediaWiki-commits] [Gerrit] Log the session cache type along with other cache types - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: Log the session cache type along with other cache types
..


Log the session cache type along with other cache types

We already log the types of the main, WAN, stash, message, and parser
caches. For debugging, it would be useful to log the session cache too
instead of having to guess that it's probably the same as the main
cache.

Change-Id: I13e6c0f7f430f96be50d543a32c232f0c36dcd72
---
M includes/Setup.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index 5877932..cb1bd71 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -690,7 +690,9 @@
', WAN: ' . $wgMainWANCache .
', stash: ' . $wgMainStash .
', message: ' . get_class( $messageMemc ) .
-   ', parser: ' . get_class( $parserMemc ) );
+   ', parser: ' . get_class( $parserMemc ) .
+   ', session: ' . get_class( ObjectCache::getInstance( 
$wgSessionCacheType ) )
+);
 
 Profiler::instance()->scopedProfileOut( $ps_memcached );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13e6c0f7f430f96be50d543a32c232f0c36dcd72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Chad 
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] Revert "Show parser output for diffs unless extension aborts" - change (mediawiki/core)

2016-07-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Revert "Show parser output for diffs unless extension aborts"
..

Revert "Show parser output for diffs unless extension aborts"

Reverting the underlying change.

This reverts commit 3354e8d550e6d650a0b1681fcad427559aea25ce.

Change-Id: I2e0f2098981bda411f360eea89e5fac3b644f043
---
M includes/diff/DifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/297702/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index deeb405..c5e94c5 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -638,7 +638,7 @@
# WikiPage::getParserOutput() should not return 
false, but just in case
if ( $parserOutput ) {
// Allow extensions to change parser 
output here
-   if ( Hooks::run( 
'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, 
$wikiPage ] ) ) {
+   if ( !Hooks::run( 
'DifferenceEngineRenderRevisionAddParserOutput', [ $this, $out, $parserOutput, 
$wikiPage ] ) ) {
$out->addParserOutput( 
$parserOutput );
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e0f2098981bda411f360eea89e5fac3b644f043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Revert "Adding a bunch of hooks from wikiHow into Difference... - change (mediawiki/core)

2016-07-06 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Revert "Adding a bunch of hooks from wikiHow into 
DifferenceEngine"
..

Revert "Adding a bunch of hooks from wikiHow into DifferenceEngine"

Causes fatals.

This reverts commit b02bfac06b04fd0284faa785f932792ce9bb93ae.

Change-Id: I4c77b4d51408540a9238d38e8324028879b1bbf2
---
M docs/hooks.txt
M includes/diff/DifferenceEngine.php
2 files changed, 6 insertions(+), 117 deletions(-)


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

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 2e7a299..fa664c3 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1135,85 +1135,6 @@
 $row: the DB row for this line
 &$classes: the classes to add to the surrounding 
 
-'DifferenceEngineMarkPatrolledLink': Allows extensions to change the "mark as 
patrolled" link
-which is shown both on the diff header as well as on the bottom of a page, 
usually
-wrapped in a span element which has class="patrollink".
-$differenceEngine: DifferenceEngine object
-&$markAsPatrolledLink: The "mark as patrolled" link HTML (string)
-$rcid: Recent change ID (rc_id) for this change (int)
-$token: Patrol token; $rcid is used in generating this variable
-
-'DifferenceEngineMarkPatrolledRCID': Allows extensions to possibly change the 
rcid parameter.
-For example the rcid might be set to zero due to the user being the same as the
-performer of the change but an extension might still want to show it under 
certain
-conditions.
-&$rcid: rc_id (int) of the change or 0
-$differenceEngine: DifferenceEngine object
-$change: RecentChange object
-$user: User object representing the current user
-
-'DifferenceEngineNewHeader': Allows extensions to change the $newHeader 
variable, which
-contains information about the new revision, such as the revision's author, 
whether
-the revision was marked as a minor edit or not, etc.
-$differenceEngine: DifferenceEngine object
-&$newHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
-include things like revision author info, revision comment, RevisionDelete 
link and more
-$formattedRevisionTools: Array containing revision tools, some of which may 
have
-been injected with the DiffRevisionTools hook
-$nextlink: String containing the link to the next revision (if any); also 
included in $newHeader
-$rollback: Rollback link (string) to roll this revision back to the previous 
one, if any
-$newminor: String indicating if the new revision was marked as a minor edit
-$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
-whether we should show just the diff; passed in as a query string parameter to 
the
-various URLs constructed here (i.e. $nextlink)
-$rdel: RevisionDelete link for the new revision, if the current user is allowed
-to use the RevisionDelete feature
-$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
-
-'DifferenceEngineOldHeader': Allows extensions to change the $oldHeader 
variable, which
-contains information about the old revision, such as the revision's author, 
whether
-the revision was marked as a minor edit or not, etc.
-$differenceEngine: DifferenceEngine object
-&$oldHeader: The string containing the various #mw-diff-otitle[1-5] divs, which
-include things like revision author info, revision comment, RevisionDelete 
link and more
-$prevlink: String containing the link to the previous revision (if any); also 
included in $oldHeader
-$oldminor: String indicating if the old revision was marked as a minor edit
-$diffOnly: Boolean parameter passed to DifferenceEngine#showDiffPage, 
indicating
-whether we should show just the diff; passed in as a query string parameter to 
the
-various URLs constructed here (i.e. $prevlink)
-$ldel: RevisionDelete link for the old revision, if the current user is allowed
-to use the RevisionDelete feature
-$unhide: Boolean parameter indicating whether to show RevisionDeleted revisions
-
-'DifferenceEngineOldHeaderNoOldRev': Change the $oldHeader variable in cases 
when
-there is no old revision
-&$oldHeader: empty string by default
-
-'DifferenceEngineRenderRevisionAddParserOutput': Allows extensions to change 
the parser output.
-Return false to not add parser output via OutputPage's addParserOutput method.
-$differenceEngine: DifferenceEngine object
-$out: OutputPage object
-$parserOutput: ParserOutput object
-$wikiPage: WikiPage object
-
-'DifferenceEngineRenderRevisionShowFinalPatrolLink': An extension can hook 
into this hook
-point and return false to not show the final "mark as patrolled" link on the 
bottom
-of a page.
-This hook has no arguments.
-
-'DifferenceEngineShowDiff': Allows extensions to affect the diff text which
-eventually gets sent to the OutputPage object.
-$differenceEngine: DifferenceEngine object
-
-'DifferenceEngineShowEmptyOldContent': Allows extensions to

[MediaWiki-commits] [Gerrit] CiviCRM submodule update - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has submitted this change and it was merged.

Change subject: CiviCRM submodule update
..


CiviCRM submodule update

f430327 CRM-19015 Merge data loss on zero fields (batch mode)
930cb7d CRM-18692 issue warning about empty smart group cache rather than crash 
the server
03db286 CRM-17123 remove damaging OR from smart group query

Bug T139006

Change-Id: I136207936b89845701e55e12d2fdf3f3db769d93
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/civicrm b/civicrm
index 823fdc3..03db286 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 823fdc337099736bed2d430d443af91944c0ca7d
+Subproject commit 03db28679749beeb5a91424f8ae67fb77a880cbf

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I136207936b89845701e55e12d2fdf3f3db769d93
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] DifferenceEngine: Autodetect if wikidiff2 is installed - change (mediawiki/core)

2016-07-06 Thread jenkins-bot (Code Review)

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

Change subject: DifferenceEngine: Autodetect if wikidiff2 is installed
..


DifferenceEngine: Autodetect if wikidiff2 is installed

If wikidiff2 is installed, use it for diffing without requiring
$wgExternalDiffEngine to be set to 'wikidiff2'.

Also add some extra sanity-checking by coercing all non-string values to
false and make sure the custom diff executable passes `is_executable()`.

Change-Id: I32b670ebf613be9f1c034d65d006829a215614da
---
M includes/DefaultSettings.php
M includes/diff/DifferenceEngine.php
2 files changed, 17 insertions(+), 13 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4e6f6fb..6664fe0 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8049,10 +8049,9 @@
 
 /**
  * Name of the external diff engine to use. Supported values:
- * * false: default PHP implementation
- * * 'wikidiff2': Wikimedia's fast difference engine implemented as a PHP/HHVM 
module
- * * 'wikidiff' and 'wikidiff3' are treated as false for backwards 
compatibility
- * * any other string is treated as a path to external diff executable
+ * * string: path to an external diff executable
+ * * false: wikidiff2 PHP/HHVM module if installed, otherwise the default PHP 
implementation
+ * * 'wikidiff', 'wikidiff2', and 'wikidiff3' are treated as false for 
backwards compatibility
  */
 $wgExternalDiffEngine = false;
 
diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index f35356c..6bb8874 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -891,18 +891,23 @@
if ( $wgExternalDiffEngine == 'wikidiff' || 
$wgExternalDiffEngine == 'wikidiff3' ) {
wfDeprecated( "\$wgExternalDiffEngine = 
'{$wgExternalDiffEngine}'", '1.27' );
$wgExternalDiffEngine = false;
+   } elseif ( $wgExternalDiffEngine == 'wikidiff2' ) {
+   // Same as above, but with no deprecation warnings
+   $wgExternalDiffEngine = false;
+   } elseif ( !is_string( $wgExternalDiffEngine ) ) {
+   // And prevent people from shooting themselves in the 
foot...
+   wfWarn( '$wgExternalDiffEngine is set to a non-string 
value, forcing it to false' );
+   $wgExternalDiffEngine = false;
}
 
-   if ( $wgExternalDiffEngine == 'wikidiff2' ) {
-   if ( function_exists( 'wikidiff2_do_diff' ) ) {
-   # Better external diff engine, the 2 may some 
day be dropped
-   # This one does the escaping and segmenting 
itself
-   $text = wikidiff2_do_diff( $otext, $ntext, 2 );
-   $text .= $this->debug( 'wikidiff2' );
+   if ( function_exists( 'wikidiff2_do_diff' ) && 
$wgExternalDiffEngine === false ) {
+   # Better external diff engine, the 2 may some day be 
dropped
+   # This one does the escaping and segmenting itself
+   $text = wikidiff2_do_diff( $otext, $ntext, 2 );
+   $text .= $this->debug( 'wikidiff2' );
 
-   return $text;
-   }
-   } elseif ( $wgExternalDiffEngine !== false ) {
+   return $text;
+   } elseif ( $wgExternalDiffEngine !== false && is_executable( 
$wgExternalDiffEngine ) ) {
# Diff via the shell
$tmpDir = wfTempDir();
$tempName1 = tempnam( $tmpDir, 'diff_' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32b670ebf613be9f1c034d65d006829a215614da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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] CiviCRM submodule update - change (wikimedia...crm)

2016-07-06 Thread Eileen (Code Review)

Eileen has uploaded a new change for review.

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

Change subject: CiviCRM submodule update
..

CiviCRM submodule update

f430327 CRM-19015 Merge data loss on zero fields (batch mode)
930cb7d CRM-18692 issue warning about empty smart group cache rather than crash 
the server
03db286 CRM-17123 remove damaging OR from smart group query

Bug T139006

Change-Id: I136207936b89845701e55e12d2fdf3f3db769d93
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/00/297700/1

diff --git a/civicrm b/civicrm
index 823fdc3..03db286 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 823fdc337099736bed2d430d443af91944c0ca7d
+Subproject commit 03db28679749beeb5a91424f8ae67fb77a880cbf

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I136207936b89845701e55e12d2fdf3f3db769d93
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] Log the session cache type along with other cache types - change (mediawiki/core)

2016-07-06 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: Log the session cache type along with other cache types
..

Log the session cache type along with other cache types

We already log the types of the main, WAN, stash, message, and parser
caches. For debugging, it would be useful to log the session cache too
instead of having to guess that it's probably the same as the main
cache.

Change-Id: I13e6c0f7f430f96be50d543a32c232f0c36dcd72
---
M includes/Setup.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/Setup.php b/includes/Setup.php
index 5877932..cb1bd71 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -690,7 +690,9 @@
', WAN: ' . $wgMainWANCache .
', stash: ' . $wgMainStash .
', message: ' . get_class( $messageMemc ) .
-   ', parser: ' . get_class( $parserMemc ) );
+   ', parser: ' . get_class( $parserMemc ) .
+   ', session: ' . get_class( ObjectCache::getInstance( 
$wgSessionCacheType ) )
+);
 
 Profiler::instance()->scopedProfileOut( $ps_memcached );
 

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

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

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

[MediaWiki-commits] [Gerrit] Make LocalRename jobs run sequentially - change (mediawiki...CentralAuth)

2016-07-06 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Make LocalRename jobs run sequentially
..

Make LocalRename jobs run sequentially

Running the job parallel on each wiki caused problems for users with
many accounts due to DB errors when all jobs tried to change the
central user record at the same time. Run one wiki after the other instead,
with each job scheduling the next job when it is finished.

Bug: T137973
Change-Id: I00f2710080897030a3e44a8c8490d991d703bb21
(cherry picked from commit 053b4ce1e137d7bbade69bcf2f8c6dcd17e0651f)
---
M includes/GlobalRename/GlobalRenameUser.php
M includes/GlobalRename/GlobalRenameUserStatus.php
M includes/LocalRenameJob/LocalRenameJob.php
3 files changed, 59 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/98/297698/1

diff --git a/includes/GlobalRename/GlobalRenameUser.php 
b/includes/GlobalRename/GlobalRenameUser.php
index 59b69b8..f3a6c8d 100644
--- a/includes/GlobalRename/GlobalRenameUser.php
+++ b/includes/GlobalRename/GlobalRenameUser.php
@@ -173,9 +173,12 @@
 */
private function injectLocalRenameUserJobs( array $wikis, array 
$options ) {
$job = $this->getJob( $options );
-   // Submit the jobs.
-   foreach( $wikis as $wiki ) {
-   call_user_func( $this->jobQueueGroupGenerator, $wiki 
)->push( $job );
+   $statuses = $this->renameuserStatus->getStatuses( 
GlobalRenameUserStatus::READ_LATEST );
+   foreach ( $statuses as $wiki => $status ) {
+   if ( $status === 'queued' ) {
+   call_user_func( $this->jobQueueGroupGenerator, 
$wiki )->push( $job );
+   break;
+   }
}
}
 
diff --git a/includes/GlobalRename/GlobalRenameUserStatus.php 
b/includes/GlobalRename/GlobalRenameUserStatus.php
index 1d2bb6e..ecb6101 100644
--- a/includes/GlobalRename/GlobalRenameUserStatus.php
+++ b/includes/GlobalRename/GlobalRenameUserStatus.php
@@ -9,7 +9,7 @@
  * @author Marius Hoch < h...@online.de >
  */
 
-class GlobalRenameUserStatus {
+class GlobalRenameUserStatus implements IDBAccessObject {
 
/**
 * Either old or new name of the user
@@ -96,16 +96,20 @@
 * Get a user's rename status for all wikis.
 * Returns an array ( wiki => status )
 *
+* @param integer $flags IDBAccessObject flags
+*
 * @return array
 */
-   public function getStatuses() {
-   $dbr = $this->getDB();
+   public function getStatuses( $flags = 0 ) {
+   list( $index, $options ) = DBAccessObjectUtils::getDBOptions( 
$flags );
+   $db = $this->getDB( $index );
 
-   $res = $dbr->select(
+   $res = $db->select(
'renameuser_status',
array( 'ru_wiki', 'ru_status' ),
-   array( $this->getNameWhereClause( $dbr ) ),
-   __METHOD__
+   array( $this->getNameWhereClause( $db ) ),
+   __METHOD__,
+   $options
);
 
$statuses = array();
@@ -117,6 +121,19 @@
}
 
/**
+* Get a user's rename status for the current wiki.
+*
+* @param integer $flags IDBAccessObject flags
+*
+* @return string|null Null means no rename pending for this user on 
the current wiki (possibly
+*   because it has finished already).
+*/
+   public function getStatus( $flags = 0 ) {
+   $statuses = $this->getStatuses( $flags );
+   return isset( $statuses[wfWikiID()] ) ? $statuses[wfWikiID()] : 
null;
+   }
+
+   /**
 * Set the rename status for a certain wiki
 *
 * @param string $wiki
diff --git a/includes/LocalRenameJob/LocalRenameJob.php 
b/includes/LocalRenameJob/LocalRenameJob.php
index c4285b6..d696338 100644
--- a/includes/LocalRenameJob/LocalRenameJob.php
+++ b/includes/LocalRenameJob/LocalRenameJob.php
@@ -1,5 +1,7 @@
 setRenameUserStatus( new GlobalRenameUserStatus( 
$this->params['to'] ) );
+
+   // bail if it's already done or in progress
+   $status = $this->renameuserStatus->getStatus( 
GlobalRenameUserStatus::READ_LATEST );
+   if ( $status !== 'queued' && $status !== 'failed' ) {
+   LoggerFactory::getInstance( 'rename' )->info( 'skipping 
duplicate rename from {user}', [
+   'user' => $this->params['from'],
+   'to' => $this->params['to'],
+   'status' => $status,
+   ] );
+   return true;
+   }
+

1 2 3 4 >

1 - 100 of 338 matches

Mail list logo