date:20161018

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src to ede4353 for domino@1.0.27

2016-10-18 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Bump src to ede4353 for domino@1.0.27
..

Bump src to ede4353 for domino@1.0.27

Change-Id: Iea8f903443b6d28552148a8625dbfbca4b896bf4
---
M node_modules/domino/CHANGELOG.md
M node_modules/domino/lib/Document.js
M node_modules/domino/lib/HTMLParser.js
M node_modules/domino/lib/Node.js
A node_modules/domino/lib/defineElement.js
M node_modules/domino/lib/htmlelts.js
M node_modules/domino/lib/impl.js
A node_modules/domino/lib/svg.js
M node_modules/domino/package.json
M node_modules/domino/test/.npmignore
M node_modules/domino/test/domino.js
M node_modules/domino/test/html5lib-tests.json
D node_modules/domino/test/htmlwg/README.md
D node_modules/domino/test/htmlwg/harness/index.js
D node_modules/domino/test/htmlwg/harness/testharness.js
D node_modules/domino/test/htmlwg/index.js
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/apis-in-html-documents/Document.getElementsByTagName-foreign-01.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/apis-in-html-documents/Document.getElementsByTagName-foreign-02.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/apis-in-html-documents/Element.getElementsByTagName-foreign-01.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/apis-in-html-documents/Element.getElementsByTagName-foreign-02.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/browsing-the-web/load-text-plain.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/Document.getElementsByClassName-null-undef.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/Element.getElementsByClassName-null-undef.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.body-getter-foreign-frameset.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.body-getter-frameset-and-body.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.body-setter-01.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.embeds-document.plugins-01.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByClassName-same.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.head-01.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.head-02.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.title-01.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.title-02.xhtml
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.title-03.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.title-04.xhtml
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.title-05.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.title-06.html
D 
node_modules/domino/test/htmlwg/submission/Ms2ger/dom-tree-accessors/document.title-07.html
D

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: move news templates to separate file

2016-10-18 Thread BearND (Code Review)

BearND has uploaded a new change for review.

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

Change subject: Hygiene: move news templates to separate file
..

Hygiene: move news templates to separate file

so we can also use it for the tests.

This is a follow-up of a comment in
Iac6c156a242b1cb545ed671338bf525a07e105b4.

Change-Id: I1c3c85f44e914be8e48a179a40609c8ef9ea5289
---
A etc/feed/news-sites.js
M lib/feed/news.js
M test/features/news/news.js
3 files changed, 39 insertions(+), 25 deletions(-)


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

diff --git a/etc/feed/news-sites.js b/etc/feed/news-sites.js
new file mode 100644
index 000..0cc07f9
--- /dev/null
+++ b/etc/feed/news-sites.js
@@ -0,0 +1,32 @@
+/**
+ * A hash map of (Wikipedia site) languages codes to objects with
+ * information to control how to get news items for this particular
+ * Wikipedia site.
+ * The object consists of a title and a selector.
+ * 1) The title is the page title used to scrape the news items from.
+ * 2) The selector is used to find a parent HTML element for  elements.
+ *In most cases simply the first 'ul' suffices but there are exceptions,
+ *often because the first  contains template instructions instead
+ *of the actual news items, or instead of a  Parsoid uses a .
+ */
+const NEWS_TEMPLATES = {
+en: {title: 'Template:In_the_news', selector: 'ul[id^=mw]'},
+
+da: {title: 'Skabelon:Forside_aktuelle_begivenheder', selector: 'div'},
+de: {title: 'Wikipedia:Hauptseite/Aktuelles', selector: 'ul'},
+el: {title: 'Πύλη:Τρέχοντα_γεγονότα/Επικεφαλίδες', selector: 'ul'},
+es: {title: 'Portal:Actualidad', selector: 'ul'},
+fi: {title: 'Malline:Uutisissa', selector: 'ul'},
+fr: {title: 'Modèle:Accueil_actualité', selector: 'ul[id^=mw]'},
+he: {title: 'תבנית:חדשות_ואקטואליה', selector: 'ul'},
+ko: {title: '틀:새로_들어온_소식', selector: 'ul'},
+no: {title: 'Mal:Aktuelt', selector: 'ul'},
+pl: {title: 'Szablon:Aktualności', selector: 'ul:last-of-type'},
+pt: {title: 'Portal:Eventos_atuais', selector: 'ul'},
+ru: {title: 'Шаблон:Актуальные_события', selector: 'ul'},
+sv: {title: 'Portal:Huvudsida/Aktuella händelser', selector: 'ul'},
+vi: {title: 'Bản_mẫu:Tin_tức', selector: 'ul'},
+zh: {title: 'Portal:新聞動態', selector: 'ul'}
+};
+
+module.exports = NEWS_TEMPLATES;
diff --git a/lib/feed/news.js b/lib/feed/news.js
index 55e9c5d..95ac537 100644
--- a/lib/feed/news.js
+++ b/lib/feed/news.js
@@ -7,26 +7,7 @@
 var mwapi = require('../mwapi');
 var parsoid = require('../parsoid-access');
 var HTTPError = require('../util').HTTPError;
-
-var newsTemplates = {
-en: {title: 'Template:In_the_news', selector: 'ul[id^=mw]'},
-
-da: {title: 'Skabelon:Forside_aktuelle_begivenheder', selector: 'div'},
-de: {title: 'Wikipedia:Hauptseite/Aktuelles', selector: 'ul'},
-el: {title: 'Πύλη:Τρέχοντα_γεγονότα/Επικεφαλίδες', selector: 'ul'},
-es: {title: 'Portal:Actualidad', selector: 'ul'},
-fi: {title: 'Malline:Uutisissa', selector: 'ul'},
-fr: {title: 'Modèle:Accueil_actualité', selector: 'ul[id^=mw]'},
-he: {title: 'תבנית:חדשות_ואקטואליה', selector: 'ul'},
-ko: {title: '틀:새로_들어온_소식', selector: 'ul'},
-no: {title: 'Mal:Aktuelt', selector: 'ul'},
-pl: {title: 'Szablon:Aktualności', selector: 'ul:last-of-type'},
-pt: {title: 'Portal:Eventos_atuais', selector: 'ul'},
-ru: {title: 'Шаблон:Актуальные_события', selector: 'ul'},
-sv: {title: 'Portal:Huvudsida/Aktuella händelser', selector: 'ul'},
-vi: {title: 'Bản_mẫu:Tin_tức', selector: 'ul'},
-zh: {title: 'Portal:新聞動態', selector: 'ul'}
-};
+var NEWS_TEMPLATES = require('../../etc/feed/news-sites');
 
 function removeFragment(href) {
 if (href.indexOf('#') > -1) {
@@ -49,7 +30,7 @@
 function promise(app, req) {
 var lang = req.params.domain.split('.')[0];
 var aggregated = !!req.query.aggregated;
-if (!newsTemplates[lang]) {
+if (!NEWS_TEMPLATES[lang]) {
 if (aggregated) {
 return BBPromise.resolve({ payload: undefined, meta: undefined });
 }
@@ -65,14 +46,14 @@
 payload: [],
 meta: {}
 };
-req.params.title = newsTemplates[lang].title;
+req.params.title = NEWS_TEMPLATES[lang].title;
 return parsoid.getParsoidHtml(app, req)
 .then(function (response) {
 result.meta.etag = parsoid.getRevisionFromEtag(response.headers);
 
 var linkTitles = [];
 var doc = domino.createDocument(response.body);
-var newsList = doc.querySelector(newsTemplates[lang].selector);
+var newsList = doc.querySelector(NEWS_TEMPLATES[lang].selector);
 var stories = newsList.getElementsByTagName('li');
 
 for (var j = 0, m = stories.length; j < m; j++) {
diff --git a/test/features/news/news.js b/test/features/news/news.js
index f2478fc..1f13982 100644
---

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make updateCategoryCounts() lag checks better

2016-10-18 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Make updateCategoryCounts() lag checks better
..

Make updateCategoryCounts() lag checks better

* Add the lag checks to LinksUpdate. Previously, only
  LinksDeletionUpdate had any such checks.
* Remove the transaction hook usage, since the only two callers are
  already lag/contention aware. Deferring them just makes the wait
  checks pointless and they might end up happening all at once.
* Also set the visibility on some neigboring methods.

Bug: T95501
Change-Id: I43e3af17399417cbf0ab4e5e7d1f2bd518fa7e90
---
M includes/deferred/LinksUpdate.php
M includes/page/WikiPage.php
2 files changed, 111 insertions(+), 101 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/316733/1

diff --git a/includes/deferred/LinksUpdate.php 
b/includes/deferred/LinksUpdate.php
index c7d378e..6899c19 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -246,12 +246,6 @@
$this->incrTableUpdate( 'categorylinks', 'cl', $categoryDeletes,
$this->getCategoryInsertions( $existing ) );
 
-   # Invalidate all categories which were added, deleted or 
changed (set symmetric difference)
-   $categoryInserts = array_diff_assoc( $this->mCategories, 
$existing );
-   $categoryUpdates = $categoryInserts + $categoryDeletes;
-   $this->invalidateCategories( $categoryUpdates );
-   $this->updateCategoryCounts( $categoryInserts, $categoryDeletes 
);
-
# Page properties
$existing = $this->getExistingProperties();
$this->propertyDeletions = $this->getPropertyDeletions( 
$existing );
@@ -262,6 +256,12 @@
$this->propertyInsertions = array_diff_assoc( 
$this->mProperties, $existing );
$changed = $this->propertyDeletions + $this->propertyInsertions;
$this->invalidateProperties( $changed );
+
+   # Invalidate all categories which were added, deleted or 
changed (set symmetric difference)
+   $categoryInserts = array_diff_assoc( $this->mCategories, 
$existing );
+   $categoryUpdates = $categoryInserts + $categoryDeletes;
+   $this->invalidateCategories( $categoryUpdates );
+   $this->updateCategoryCounts( $categoryInserts, $categoryDeletes 
);
 
# Refresh links of all pages including this page
# This will be in a separate transaction
@@ -324,7 +324,7 @@
/**
 * @param array $cats
 */
-   function invalidateCategories( $cats ) {
+   private function invalidateCategories( $cats ) {
PurgeJobUtils::invalidatePages( $this->getDB(), NS_CATEGORY, 
array_keys( $cats ) );
}
 
@@ -333,17 +333,31 @@
 * @param array $added Associative array of category name => sort key
 * @param array $deleted Associative array of category name => sort key
 */
-   function updateCategoryCounts( $added, $deleted ) {
-   $a = WikiPage::factory( $this->mTitle );
-   $a->updateCategoryCounts(
-   array_keys( $added ), array_keys( $deleted )
-   );
+   private function updateCategoryCounts( array $added, array $deleted ) {
+   global $wgUpdateRowsPerQuery;
+
+   $wp = WikiPage::factory( $this->mTitle );
+   $factory = 
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+
+   foreach ( array_chunk( array_keys( $added ), 
$wgUpdateRowsPerQuery ) as $addBatch ) {
+   $wp->updateCategoryCounts( $addBatch, [], $this->mId );
+   $factory->commitAndWaitForReplication(
+   __METHOD__, $this->ticket, [ 'wiki' => 
$this->getDB()->getWikiID() ]
+   );
+   }
+
+   foreach ( array_chunk( array_keys( $deleted ), 
$wgUpdateRowsPerQuery ) as $deleteBatch ) {
+   $wp->updateCategoryCounts( [], $deleteBatch, $this->mId 
);
+   $factory->commitAndWaitForReplication(
+   __METHOD__, $this->ticket, [ 'wiki' => 
$this->getDB()->getWikiID() ]
+   );
+   }
}
 
/**
 * @param array $images
 */
-   function invalidateImageDescriptions( $images ) {
+   private function invalidateImageDescriptions( $images ) {
PurgeJobUtils::invalidatePages( $this->getDB(), NS_FILE, 
array_keys( $images ) );
}
 
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 3dc41fb..9aa8503 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -3547,107 +3547,103 @@
 * Update all the

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MessageCache: Use checkKeys for large messages

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: MessageCache: Use checkKeys for large messages
..


MessageCache: Use checkKeys for large messages

Also make use of the cache set options and use
Revision::newKnownCurrent() to avoid excessive
revision table queries during miss periods.

Bug: T144952
Change-Id: Ic1c649478b0f87420052d8c99b2962920f8b5c96
---
M includes/cache/MessageCache.php
1 file changed, 29 insertions(+), 10 deletions(-)

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



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 6834ac0..ca6e28d 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -946,28 +946,47 @@
return false;
}
 
-   # Try the individual message cache
+   // Try the individual message cache
$titleKey = wfMemcKey( 'messages', 'individual', $title );
-   $entry = $this->wanCache->get( $titleKey );
+
+   $curTTL = null;
+   $entry = $this->wanCache->get(
+   $titleKey,
+   $curTTL,
+   [ wfMemcKey( 'messages', $code ) ]
+   );
+   $entry = ( $curTTL >= 0 ) ? $entry : false;
+
if ( $entry ) {
if ( substr( $entry, 0, 1 ) === ' ' ) {
$this->mCache[$code][$title] = $entry;
-
-   // The message exists, so make sure a string
-   // is returned.
+   // The message exists, so make sure a string is 
returned
return (string)substr( $entry, 1 );
} elseif ( $entry === '!NONEXISTENT' ) {
$this->mCache[$code][$title] = '!NONEXISTENT';
 
return false;
} else {
-   # Corrupt/obsolete entry, delete it
+   // Corrupt/obsolete entry, delete it
$this->wanCache->delete( $titleKey );
}
}
 
-   # Try loading it from the database
-   $revision = Revision::newFromTitle( Title::makeTitle( 
NS_MEDIAWIKI, $title ) );
+   // Try loading it from the database
+   $dbr = wfGetDB( DB_REPLICA );
+   $cacheOpts = Database::getCacheSetOptions( $dbr );
+   // Use newKnownCurrent() to avoid querying revision/user tables
+   $titleObj = Title::makeTitle( NS_MEDIAWIKI, $title );
+   if ( $titleObj->getLatestRevID() ) {
+   $revision = Revision::newKnownCurrent(
+   $dbr,
+   $titleObj->getArticleID(),
+   $titleObj->getLatestRevID()
+   );
+   } else {
+   $revision = false;
+   }
+
if ( $revision ) {
$content = $revision->getContent();
if ( !$content ) {
@@ -994,7 +1013,7 @@
$message = false; // negative caching
} else {
$this->mCache[$code][$title] = ' ' . 
$message;
-   $this->wanCache->set( $titleKey, ' ' . 
$message, $this->mExpiry );
+   $this->wanCache->set( $titleKey, ' ' . 
$message, $this->mExpiry, $cacheOpts );
}
}
} else {
@@ -1003,7 +1022,7 @@
 
if ( $message === false ) { // negative caching
$this->mCache[$code][$title] = '!NONEXISTENT';
-   $this->wanCache->set( $titleKey, '!NONEXISTENT', 
$this->mExpiry );
+   $this->wanCache->set( $titleKey, '!NONEXISTENT', 
$this->mExpiry, $cacheOpts );
}
 
return $message;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1c649478b0f87420052d8c99b2962920f8b5c96
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove dire config-dbsupport-postgres warning

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Remove dire config-dbsupport-postgres warning
..


Remove dire config-dbsupport-postgres warning

The other DBs (even oracle and mssql) do not have this. Postgres
support is far better than some of those and tends to break most
when using master (and fixes are backported if bug slip into
releases). This is one of the three decently supported DB types.

Change-Id: I5da74d5f9f0ea055529456eddb47ca0be380cbe4
---
M includes/installer/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index 6a6c0ff..1f7333a 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -112,7 +112,7 @@
"config-type-mssql": "Microsoft SQL Server",
"config-support-info": "MediaWiki supports the following database 
systems:\n\n$1\n\nIf you do not see the database system you are trying to use 
listed below, then follow the instructions linked above to enable support.",
"config-dbsupport-mysql": "* [{{int:version-db-mysql-url}} MySQL] is 
the primary target for MediaWiki and is best supported. MediaWiki also works 
with [{{int:version-db-mariadb-url}} MariaDB] and 
[{{int:version-db-percona-url}} Percona Server], which are MySQL compatible. 
([http://www.php.net/manual/en/mysqli.installation.php How to compile PHP with 
MySQL support])",
-   "config-dbsupport-postgres": "* [{{int:version-db-postgres-url}} 
PostgreSQL] is a popular open source database system as an alternative to 
MySQL. There may be some minor outstanding bugs, and it is not recommended for 
use in a production environment. 
([http://www.php.net/manual/en/pgsql.installation.php How to compile PHP with 
PostgreSQL support])",
+   "config-dbsupport-postgres": "* [{{int:version-db-postgres-url}} 
PostgreSQL] is a popular open source database system as an alternative to 
MySQL. ([http://www.php.net/manual/en/pgsql.installation.php How to compile PHP 
with PostgreSQL support])",
"config-dbsupport-sqlite": "* [{{int:version-db-sqlite-url}} SQLite] is 
a lightweight database system that is very well supported. 
([http://www.php.net/manual/en/pdo.installation.php How to compile PHP with 
SQLite support], uses PDO)",
"config-dbsupport-oracle": "* [{{int:version-db-oracle-url}} Oracle] is 
a commercial enterprise database. 
([http://www.php.net/manual/en/oci8.installation.php How to compile PHP with 
OCI8 support])",
"config-dbsupport-mssql": "* [{{int:version-db-mssql-url}} Microsoft 
SQL Server] is a commercial enterprise database for Windows. 
([http://www.php.net/manual/en/sqlsrv.installation.php How to compile PHP with 
SQLSRV support])",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5da74d5f9f0ea055529456eddb47ca0be380cbe4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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] mediawiki/core[master]: ApiPurge: Remove setTriggeringUser call.

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: ApiPurge: Remove setTriggeringUser call.
..


ApiPurge: Remove setTriggeringUser call.

This is a revert of 84ffa5d1242. At that point we've been implementing
page-properties-change event for the EventBus extension and thought
adding this call would be a good idea. However, it was discovered
afterwards that there's much more extensions that don't set the
triggering user. Since that call is deprecated and plans are to
remove it - revert the change.

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

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



diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index 8be523e..8bbd88d 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -103,11 +103,6 @@
$updates = 
$content->getSecondaryDataUpdates(
$title, null, 
$forceRecursiveLinkUpdate, $p_result );
foreach ( $updates as $update ) 
{
-   # Some extensions, like 
EventBus, need to know the user
-   # that performed the 
purge action, so set it here
-   if ( $update instanceof 
LinksUpdate ) {
-   
$update->setTriggeringUser( $user );
-   }

DeferredUpdates::addUpdate( $update, DeferredUpdates::PRESEND );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9891da628f968970247edc37cccd4a666950273b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch to LoadMonitorMySQL instead of the generic one

2016-10-18 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Switch to LoadMonitorMySQL instead of the generic one
..

Switch to LoadMonitorMySQL instead of the generic one

Change-Id: I3b236a603e4e3cbe276ca011dfcf903b8723d97f
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 9a36bad..eea48e1 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -23,6 +23,8 @@
 
 'class' => 'LBFactoryMulti',
 
+'loadMonitorClass' => 'LoadMonitorMySQL',
+
 'sectionsByDB' => [
'enwiki' => 's1',
 
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 25884f9..187b9d3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -23,6 +23,8 @@
 
 'class' => 'LBFactoryMulti',
 
+'loadMonitorClass' => 'LoadMonitorMySQL',
+
 'sectionsByDB' => [
'enwiki' => 's1',
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make MessageCache::load() require a language code

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Make MessageCache::load() require a language code
..


Make MessageCache::load() require a language code

Also make it protected; no outside callers exist.

Change-Id: I9f35d05a5e031d1c536a44b19b108803db068677
---
M includes/cache/MessageCache.php
M languages/LanguageConverter.php
2 files changed, 11 insertions(+), 9 deletions(-)

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



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index f393acd..b746fde 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -227,17 +227,14 @@
 * or false if populating empty cache fails. Also returns true if 
MessageCache
 * is disabled.
 *
-* @param bool|string $code Language to which load messages
-* @param integer $mode Use MessageCache::FOR_UPDATE to skip process 
cache
+* @param string $code Language to which load messages
+* @param integer $mode Use MessageCache::FOR_UPDATE to skip process 
cache [optional]
 * @throws MWException
 * @return bool
 */
-   function load( $code = false, $mode = null ) {
+   protected function load( $code, $mode = null ) {
if ( !is_string( $code ) ) {
-   # This isn't really nice, so at least make a note about 
it and try to
-   # fall back
-   wfDebug( __METHOD__ . " called without providing a 
language code\n" );
-   $code = 'en';
+   throw new InvalidArgumentException( "Missing language 
code" );
}
 
# Don't do double loading...
@@ -864,6 +861,8 @@
}
$alreadyTried[ $langcode ] = true;
}
+   } else {
+   $uckey = null;
}
 
// Check the CDB cache
@@ -881,7 +880,8 @@
continue;
}
 
-   $message = $this->getMsgFromNamespace( 
$this->getMessagePageName( $code, $uckey ), $code );
+   $message = $this->getMsgFromNamespace(
+   $this->getMessagePageName( $code, 
$uckey ), $code );
 
if ( $message !== false ) {
return $message;
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1c003ad..5a9f652 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -48,7 +48,9 @@
];
 
public $mMainLanguageCode;
-   public $mVariants, $mVariantFallbacks, $mVariantNames;
+   public $mVariants;
+   public $mVariantFallbacks;
+   public $mVariantNames;
public $mTablesLoaded = false;
public $mTables;
// 'bidirectional' 'unidirectional' 'disable' for each variant

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove dire config-dbsupport-postgres warning

2016-10-18 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove dire config-dbsupport-postgres warning
..

Remove dire config-dbsupport-postgres warning

The other DBs (even oracle and mssql) do not have this. Postgres
support is far better than some of those and tends to break most
when using master (and fixes are backported if bug slip into
releases). This is one of the three decently supported DB types.

Change-Id: I5da74d5f9f0ea055529456eddb47ca0be380cbe4
---
M includes/installer/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index 6a6c0ff..1f7333a 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -112,7 +112,7 @@
"config-type-mssql": "Microsoft SQL Server",
"config-support-info": "MediaWiki supports the following database 
systems:\n\n$1\n\nIf you do not see the database system you are trying to use 
listed below, then follow the instructions linked above to enable support.",
"config-dbsupport-mysql": "* [{{int:version-db-mysql-url}} MySQL] is 
the primary target for MediaWiki and is best supported. MediaWiki also works 
with [{{int:version-db-mariadb-url}} MariaDB] and 
[{{int:version-db-percona-url}} Percona Server], which are MySQL compatible. 
([http://www.php.net/manual/en/mysqli.installation.php How to compile PHP with 
MySQL support])",
-   "config-dbsupport-postgres": "* [{{int:version-db-postgres-url}} 
PostgreSQL] is a popular open source database system as an alternative to 
MySQL. There may be some minor outstanding bugs, and it is not recommended for 
use in a production environment. 
([http://www.php.net/manual/en/pgsql.installation.php How to compile PHP with 
PostgreSQL support])",
+   "config-dbsupport-postgres": "* [{{int:version-db-postgres-url}} 
PostgreSQL] is a popular open source database system as an alternative to 
MySQL. ([http://www.php.net/manual/en/pgsql.installation.php How to compile PHP 
with PostgreSQL support])",
"config-dbsupport-sqlite": "* [{{int:version-db-sqlite-url}} SQLite] is 
a lightweight database system that is very well supported. 
([http://www.php.net/manual/en/pdo.installation.php How to compile PHP with 
SQLite support], uses PDO)",
"config-dbsupport-oracle": "* [{{int:version-db-oracle-url}} Oracle] is 
a commercial enterprise database. 
([http://www.php.net/manual/en/oci8.installation.php How to compile PHP with 
OCI8 support])",
"config-dbsupport-mssql": "* [{{int:version-db-mssql-url}} Microsoft 
SQL Server] is a commercial enterprise database for Windows. 
([http://www.php.net/manual/en/sqlsrv.installation.php How to compile PHP with 
SQLSRV support])",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Force User::__toString() return value to be string

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Force User::__toString() return value to be string
..


Force User::__toString() return value to be string

Bug: T148486
Change-Id: I19f483b16c99d05f4d1626ee89ba1cfb7a78d52b
(cherry picked from commit c21f49aec738fcdc4bc6d5779accd8f2f53c49fe)
---
M includes/user/User.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/user/User.php b/includes/user/User.php
index 240b8ce..75d5581 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -325,7 +325,7 @@
 * @return string
 */
public function __toString() {
-   return $this->getName();
+   return (string)$this->getName();
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clean up postgres connection handling

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Clean up postgres connection handling
..


Clean up postgres connection handling

* Remove non-connection magic case when no DB $user
  is given. This was removed from the base class.
* Use PGSQL_CONNECT_FORCE_NEW to let LoadBalancer
  handle connection reuse. This makes it work like
  the mysql classes.
* Make postgres connection error messages actually
  be useful by using the PHP error when possible.
  This makes it clear if the problem is authentication
  or something else and so on.

Change-Id: I3fd76c1e2db8d6008074f5347b201554579b549a
---
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/DatabasePostgres.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
3 files changed, 19 insertions(+), 13 deletions(-)

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



diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index f33e244..4266912 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -651,14 +651,22 @@
if ( $this->htmlErrors !== false ) {
ini_set( 'html_errors', $this->htmlErrors );
}
+
+   return $this->getLastPHPError();
+   }
+
+   /**
+* @return string|bool Last PHP error for this DB (typically connection 
errors)
+*/
+   protected function getLastPHPError() {
if ( $this->mPHPError ) {
$error = preg_replace( '!\[mPHPError );
$error = preg_replace( '!^.*?:\s?(.*)$!', '$1', $error 
);
 
return $error;
-   } else {
-   return false;
}
+
+   return false;
}
 
/**
diff --git a/includes/libs/rdbms/database/DatabasePostgres.php 
b/includes/libs/rdbms/database/DatabasePostgres.php
index 84021a0..016b9cd 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -92,10 +92,6 @@
);
}
 
-   if ( !strlen( $user ) ) { # e.g. the class is being loaded
-   return null;
-   }
-
$this->mServer = $server;
$this->mUser = $user;
$this->mPassword = $password;
@@ -121,7 +117,8 @@
$this->installErrorHandler();
 
try {
-   $this->mConn = pg_connect( $this->connectString );
+   // Use new connections to let LoadBalancer/LBFactory 
handle reuse
+   $this->mConn = pg_connect( $this->connectString, 
PGSQL_CONNECT_FORCE_NEW );
} catch ( Exception $ex ) {
$this->restoreErrorHandler();
throw $ex;
@@ -130,10 +127,11 @@
$phpError = $this->restoreErrorHandler();
 
if ( !$this->mConn ) {
-   $this->queryLogger->debug( "DB connection error\n" );
$this->queryLogger->debug(
+   "DB connection error\n" .
"Server: $server, Database: $dbName, User: 
$user, Password: " .
-   substr( $password, 0, 3 ) . "...\n" );
+   substr( $password, 0, 3 ) . "...\n"
+   );
$this->queryLogger->debug( $this->lastError() . "\n" );
throw new DBConnectionError( $this, str_replace( "\n", 
' ', $phpError ) );
}
@@ -380,9 +378,9 @@
} else {
return pg_last_error();
}
-   } else {
-   return 'No database connection';
}
+
+   return $this->getLastPHPError() ?: 'No database connection';
}
 
function lastErrno() {
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 682698d..8a51fe2 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -552,7 +552,7 @@
if ( $i == self::DB_REPLICA ) {
$this->mLastError = 'Unknown error'; // reset error 
string
# Try the general server pool if $groups are 
unavailable.
-   $i = in_array( false, $groups, true )
+   $i = ( $groups === [ false ] )
? false // don't bother with this if that is 
what was tried above
: $this->getReaderIndex( false, $domain );
# Couldn't find a

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Add timezone column to export

2016-10-18 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Add timezone column to export
..

Add timezone column to export

Getting directly from civicrm_address table. Depends on crm change
I03f00c016ee15f to populate that field on save, at least for US
addresses with zip codes.

Bug: T148578
Change-Id: I13927a205222fcce8de10ec9741c7dc82299fee2
---
M silverpop_export/update_table.sql
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/30/316730/1

diff --git a/silverpop_export/update_table.sql 
b/silverpop_export/update_table.sql
index 9773cd4..befbcb4 100755
--- a/silverpop_export/update_table.sql
+++ b/silverpop_export/update_table.sql
@@ -40,6 +40,7 @@
   country varchar(2),
   state varchar(64),
   postal_code varchar(128),
+  timezone varchar(5),
 
   INDEX spex_contact_id (contact_id),
   INDEX spex_email (email),
@@ -222,7 +223,8 @@
 ex.city = addr.city,
 ex.country = ctry.iso_code,
 ex.postal_code = addr.postal_code,
-ex.state = st.name
+ex.state = st.name,
+ex.timezone = addr.timezone
   WHERE
 ex.country IS NULL AND
 ex.opted_out = 0;
@@ -334,6 +336,7 @@
   country varchar(2),
   state varchar(64),
   postal_code varchar(128),
+  timezone varchar(5),
 
   INDEX rspex_contact_id (contact_id),
   INDEX rspex_email (email),
@@ -349,11 +352,11 @@
   id,contact_id,first_name,last_name,preferred_language,email,
   has_recurred_donation,highest_usd_amount,lifetime_usd_total,donation_count,
   latest_currency,latest_native_amount,latest_usd_amount,latest_donation,
-  city,country,state,postal_code )
+  city,country,state,postal_code,timezone )
 SELECT id,contact_id,first_name,last_name,preferred_language,email,
   has_recurred_donation,highest_usd_amount,lifetime_usd_total,donation_count,
   latest_currency,latest_native_amount,latest_usd_amount,latest_donation,
-  city,country,state,postal_code
+  city,country,state,postal_code,timezone
 FROM silverpop_export_staging
 WHERE opted_out=0;
 
@@ -367,6 +370,7 @@
 country,
 state,
 postal_code,
+timezone,
 SUBSTRING(preferred_language, 1, 2) IsoLang,
 IF(has_recurred_donation, 'YES', 'NO') has_recurred_donation,
 highest_usd_amount,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Force User::__toString() return value to be string

2016-10-18 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Force User::__toString() return value to be string
..

Force User::__toString() return value to be string

Bug: T148486
Change-Id: I19f483b16c99d05f4d1626ee89ba1cfb7a78d52b
(cherry picked from commit c21f49aec738fcdc4bc6d5779accd8f2f53c49fe)
---
M includes/user/User.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/316729/1

diff --git a/includes/user/User.php b/includes/user/User.php
index 240b8ce..75d5581 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -325,7 +325,7 @@
 * @return string
 */
public function __toString() {
-   return $this->getName();
+   return (string)$this->getName();
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Update GUI
..


Update GUI

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

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



diff --git a/gui b/gui
index 1b19c28..ff26a76 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 1b19c285d1610278917b09d2865f1f01a2efef1a
+Subproject commit ff26a76ed81c219c096c23a784724d0576acbeb7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I132e4e71042292beace370f2688c637d63421297
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...OpenIDConnect[REL1_27]: Add localization to whitelisted page.

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Add localization to whitelisted page.
..


Add localization to whitelisted page.

Change-Id: I32d45063bb7ac27eefd4a62ff195658e2a12d8c7
(cherry picked from commit b8242eaca2ead0a59ac32a72eb5b4b2f6b430c73)
---
M OpenIDConnect.php
M extension.json
2 files changed, 12 insertions(+), 32 deletions(-)

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



diff --git a/OpenIDConnect.php b/OpenIDConnect.php
index f300719..b874f41 100644
--- a/OpenIDConnect.php
+++ b/OpenIDConnect.php
@@ -22,12 +22,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-$wgExtensionFunctions[] = function () {
-   if ( !class_exists( 'PluggableAuth' ) ) {
-   die( 'Error: This extension requires the PluggableAuth 
extension to be included first' );
-   }
-};
-
 use \MediaWiki\Session\SessionManager;
 use \MediaWiki\Auth\AuthManager;
 
@@ -345,19 +339,6 @@
return $name . $count;
}
 
-   public static function loadExtensionSchemaUpdates( $updater ) {
-   $updater->addExtensionField( 'user', 'subject',
-   __DIR__ . '/AddSubject.sql' );
-   $updater->addExtensionField( 'user', 'issuer',
-   __DIR__ . '/AddIssuer.sql' );
-   return true;
-   }
-
-   /**
-*
-* @param $page
-* @param $params
-*/
private static function redirect( $page, $params = null, $doExit = 
false ) {
$title = Title::newFromText( $page );
if ( is_null( $title ) ) {
@@ -375,17 +356,11 @@
}
}
 
-   /**
-* Implements extension registration callback.
-* See 
https://www.mediawiki.org/wiki/Manual:Extension_registration#Customizing_registration
-*
-* @since 2.3
-*
-*/
-   public static function onRegistration() {
-   if ( !$GLOBALS['wgWhitelistRead'] ) {
-   $GLOBALS['wgWhitelistRead'] = [];
-   }
-   $GLOBALS['wgWhitelistRead'][] = 
'Special:SelectOpenIDConnectIssuer';
+   public static function loadExtensionSchemaUpdates( $updater ) {
+   $updater->addExtensionField( 'user', 'subject',
+   __DIR__ . '/AddSubject.sql' );
+   $updater->addExtensionField( 'user', 'issuer',
+   __DIR__ . '/AddIssuer.sql' );
+   return true;
}
 }
diff --git a/extension.json b/extension.json
index d1cf213..f0791b4 100644
--- a/extension.json
+++ b/extension.json
@@ -7,6 +7,9 @@
"url": "https://www.mediawiki.org/wiki/Extension:OpenID_Connect;,
"descriptionmsg": "openidconnect-desc",
"type": "other",
+   "requires": {
+   "PluggableAuth": ">= 2.0"
+   },
"SpecialPages": {
"SelectOpenIDConnectIssuer": "SelectOpenIDConnectIssuer"
},
@@ -22,7 +25,6 @@
"OpenIDConnect": "OpenIDConnect.php",
"SelectOpenIDConnectIssuer": "SelectOpenIDConnectIssuer.php"
},
-   "callback": "OpenIDConnect::onRegistration",
"Hooks": {
"LoadExtensionSchemaUpdates": 
"OpenIDConnect::loadExtensionSchemaUpdates"
},
@@ -34,6 +36,9 @@
"OpenIDConnect_UseEmailNameAsUserName": false,
"PluggableAuth_Class": "OpenIDConnect"
},
+   "PluggableAuthLoginSpecialPages": [
+   "SelectOpenIDConnectIssuer"
+   ],
"load_composer_autoloader": true,
"manifest_version": 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32d45063bb7ac27eefd4a62ff195658e2a12d8c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenIDConnect
Gerrit-Branch: REL1_27
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 
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...PageTriage[master]: Fixing broken browser test for text rotation

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Fixing broken browser test for text rotation
..


Fixing broken browser test for text rotation

jquery-client expects an array of rulesets, not just a ruleset.

Bug: T105846
Change-Id: If30615c5dda64c6e15f54d969add6007579ce777
---
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js 
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
index 2650663..a05e0c9 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
@@ -113,7 +113,7 @@
 
// since transform only works 
in IE 9 and higher, use writing-mode
// to rotate the minimized 
toolbar content in older versions
-   if ( $.client.test( { msie: [ 
'<', 9 ] }, null, true ) ) {
+   if ( $.client.test( { msie: [ [ 
'<', 9 ] ] }, null, true ) ) {
$( 
'#mwe-pt-toolbar-vertical' ).css( 'writing-mode', 'tb-rl' );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If30615c5dda64c6e15f54d969add6007579ce777
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: WIP local geocoding for US addresses

2016-10-18 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: WIP local geocoding for US addresses
..

WIP local geocoding for US addresses

Bug: T148578
Change-Id: I03f00c016ee15f01206833df3fc52cabe0b735b8
---
A sites/all/modules/wmf_civicrm/update_7290.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
2 files changed, 43,239 insertions(+), 0 deletions(-)


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


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Postgres installation fixes

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Postgres installation fixes
..


Postgres installation fixes

* Make isTransactableQuery() exclude CREATE/ALTER.
  Starting transactions for schema changes like this can cause
  errors as it is not supported for MySQL and some Postgres
  operations. Note that temporary tables are session-level,
  so they are not effected by this change.
* Clean up the transaction logic in determineCoreSchema()
  so a transaction is not left dangling.
* Fix broken getSchemaPath() call in PostgresInstaller.
* Avoid warnings in DatabasePostgres::closeConnection() if
  mConn is already unset.
* Commit master changes in doMaintenance.php before running
  deferred updates, just as MediaWiki.php does.
* Change E_WARNING to E_USER_WARNING to avoid notices in the
  default /rdbms error handlers.
* Also avoid trying to rollback in MWExceptionHandler if the
  LBFactory service is disabled, which just results in an error.

Bug: T147599
Change-Id: I64ccab7f9b74f60309ba0c9a8ce68337c42ffb0f
---
M includes/exception/MWExceptionHandler.php
M includes/installer/PostgresInstaller.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/DatabaseMysqlBase.php
M includes/libs/rdbms/database/DatabaseMysqli.php
M includes/libs/rdbms/database/DatabasePostgres.php
M includes/libs/rdbms/database/DatabaseSqlite.php
M includes/libs/rdbms/lbfactory/LBFactory.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M maintenance/doMaintenance.php
10 files changed, 82 insertions(+), 61 deletions(-)

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



diff --git a/includes/exception/MWExceptionHandler.php 
b/includes/exception/MWExceptionHandler.php
index 4a1f190..736cb06 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -87,7 +87,12 @@
 * @param Exception|Throwable $e
 */
public static function rollbackMasterChangesAndLog( $e ) {
-   $lbFactory = 
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+   $services = MediaWikiServices::getInstance();
+   if ( $services->isServiceDisabled( 'DBLoadBalancerFactory' ) ) {
+   return; // T147599
+   }
+
+   $lbFactory = $services->getDBLoadBalancerFactory();
if ( $lbFactory->hasMasterChanges() ) {
$logger = LoggerFactory::getInstance( 'Bug56269' );
$logger->warning(
diff --git a/includes/installer/PostgresInstaller.php 
b/includes/installer/PostgresInstaller.php
index 33e1a1f..6dfa28b 100644
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -587,9 +587,7 @@
return $status;
}
 
-   /**
-* @var $conn Database
-*/
+   /** @var $conn DatabasePostgres */
$conn = $status->value;
 
if ( $conn->tableExists( 'archive' ) ) {
@@ -606,7 +604,7 @@
 
return $status;
}
-   $error = $conn->sourceFile( $conn->getSchemaPath() );
+   $error = $conn->sourceFile( $this->getSchemaPath( $conn ) );
if ( $error !== true ) {
$conn->reportQueryError( $error, 0, '', __METHOD__ );
$conn->rollback( __METHOD__ );
diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index a5a170b..f33e244 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -78,7 +78,7 @@
/** @var callback Error logging callback */
protected $errorLogger;
 
-   /** @var resource Database connection */
+   /** @var resource|null Database connection */
protected $mConn = null;
/** @var bool */
protected $mOpened = false;
@@ -382,7 +382,7 @@
}
if ( !isset( $p['errorLogger'] ) ) {
$p['errorLogger'] = function ( Exception $e ) {
-   trigger_error( get_class( $e ) . ': ' . 
$e->getMessage(), E_WARNING );
+   trigger_error( get_class( $e ) . ': ' . 
$e->getMessage(), E_USER_WARNING );
};
}
 
@@ -773,8 +773,11 @@
 * @return bool
 */
protected function isTransactableQuery( $sql ) {
-   $verb = $this->getQueryVerb( $sql );
-   return !in_array( $verb, [ 'BEGIN', 'COMMIT', 'ROLLBACK', 
'SHOW', 'SET' ], true );
+   return !in_array(
+   $this->getQueryVerb( $sql ),
+   [ 'BEGIN', 'COMMIT', 'ROLLBACK', 'SHOW', 'SET', 
'CREATE',

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI

2016-10-18 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

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

Change subject: Update GUI
..

Update GUI

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


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

diff --git a/gui b/gui
index 1b19c28..ff26a76 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 1b19c285d1610278917b09d2865f1f01a2efef1a
+Subproject commit ff26a76ed81c219c096c23a784724d0576acbeb7

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Improving documentation for updatePageTriageQueue maintenanc...

2016-10-18 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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

Change subject: Improving documentation for updatePageTriageQueue maintenance 
script
..

Improving documentation for updatePageTriageQueue maintenance script

Class descrition was wrong (looks like it was copied and pasted from
updateUserMetadata.php). Also clarifying description of script
that is returned by maybeHelp().

Change-Id: Id234ca1ff05c2487a950d8150c9cb03ee0b0f212
---
M cron/updatePageTriageQueue.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/cron/updatePageTriageQueue.php b/cron/updatePageTriageQueue.php
index 5f1b55c..e3f0508 100644
--- a/cron/updatePageTriageQueue.php
+++ b/cron/updatePageTriageQueue.php
@@ -7,7 +7,7 @@
 require_once "$IP/maintenance/Maintenance.php";
 
 /**
- * A maintenance script that updates expired user metadata
+ * A maintenance script that updates expired page metadata
  */
 class UpdatePageTriageQueue extends Maintenance {
 
@@ -24,7 +24,7 @@
 
public function __construct() {
parent::__construct();
-   $this->mDescription = "Remove page from pagetriage queue after 
30 days of article creation";
+   $this->mDescription = "Remove reviewed pages from pagetriage 
queue if they are older then 30 days";
}
 
protected function init() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id234ca1ff05c2487a950d8150c9cb03ee0b0f212
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
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] operations/puppet[production]: notebook: Apply analytics client role to test spark on jupyt...

2016-10-18 Thread Madhuvishy (Code Review)

Madhuvishy has submitted this change and it was merged.

Change subject: notebook: Apply analytics client role to test spark on 
jupyterhub
..


notebook: Apply analytics client role to test spark on jupyterhub

Change-Id: I67fd29d67670002ddee39a4530f1311fde6ea669
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index e9dbe19..8f1173b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2262,8 +2262,7 @@
 
 # Experimental Jupyter notebook servers
 node /^notebook100[12]\.eqiad\.wmnet$/ {
-role(notebook::server)
-
+role(notebook::server, analytics_cluster::client)
 include standard
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: notebook: Apply analytics client role to test spark on jupyt...

2016-10-18 Thread Madhuvishy (Code Review)

Madhuvishy has uploaded a new change for review.

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

Change subject: notebook: Apply analytics client role to test spark on 
jupyterhub
..

notebook: Apply analytics client role to test spark on jupyterhub

Change-Id: I67fd29d67670002ddee39a4530f1311fde6ea669
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/316725/1

diff --git a/manifests/site.pp b/manifests/site.pp
index e9dbe19..8f1173b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2262,8 +2262,7 @@
 
 # Experimental Jupyter notebook servers
 node /^notebook100[12]\.eqiad\.wmnet$/ {
-role(notebook::server)
-
+role(notebook::server, analytics_cluster::client)
 include standard
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Clean up and simplify icon SVGs

2016-10-18 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Clean up and simplify icon SVGs
..

Clean up and simplify icon SVGs

Using svgo and some manual fixes

Change-Id: Ifb2ca82da7e95e2f0deccbec0e01eeefaae43236
---
M modules/icons/feedback.svg
M modules/icons/generic.svg
M modules/icons/global.svg
M modules/icons/link-blue.svg
M modules/icons/mention-success.svg
M modules/icons/mention.svg
M modules/icons/thanks-ltr.svg
M modules/icons/thanks-rtl.svg
M modules/icons/trash.svg
M modules/icons/tray.svg
M modules/icons/user-rights.svg
M modules/icons/user-speech-bubble.svg
12 files changed, 19 insertions(+), 33 deletions(-)


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

diff --git a/modules/icons/feedback.svg b/modules/icons/feedback.svg
index bc5330c..c0aad33 100644
--- a/modules/icons/feedback.svg
+++ b/modules/icons/feedback.svg
@@ -1,17 +1,4 @@
-
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
-
-feedback
-Created with Sketch.
-
-
-
-
-
-
-
-
-
-
-
+
+http://www.w3.org/2000/svg; width="30" height="30" viewBox="0 0 30 
30">
+  
 
diff --git a/modules/icons/generic.svg b/modules/icons/generic.svg
index 297de26..d23d1b4 100644
--- a/modules/icons/generic.svg
+++ b/modules/icons/generic.svg
@@ -1,7 +1,7 @@
 
 http://www.w3.org/2000/svg; width="30" height="30" viewBox="0 0 30 
30">
-  
-
-
-  
+
+
+
+
 
diff --git a/modules/icons/global.svg b/modules/icons/global.svg
index 5038a09..5f1cd05 100644
--- a/modules/icons/global.svg
+++ b/modules/icons/global.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg;>
-
+
 
diff --git a/modules/icons/link-blue.svg b/modules/icons/link-blue.svg
index 6a37deb..208aa05 100644
--- a/modules/icons/link-blue.svg
+++ b/modules/icons/link-blue.svg
@@ -1,7 +1,7 @@
 
 http://www.w3.org/2000/svg; viewBox="0 0 30 30" width="30" 
height="30">
 
-
+
 
 
 
diff --git a/modules/icons/mention-success.svg 
b/modules/icons/mention-success.svg
index 5cfcabf..35c544f 100644
--- a/modules/icons/mention-success.svg
+++ b/modules/icons/mention-success.svg
@@ -1,4 +1,5 @@
 
 http://www.w3.org/2000/svg; width="30" height="30" viewBox="0 0 
213.37759 149.36432">
-
-
\ No newline at end of file
+
+
+
diff --git a/modules/icons/mention.svg b/modules/icons/mention.svg
index f090bf1..3008304 100644
--- a/modules/icons/mention.svg
+++ b/modules/icons/mention.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg;>
-
+
 
diff --git a/modules/icons/thanks-ltr.svg b/modules/icons/thanks-ltr.svg
index b58974c..f277ce4 100644
--- a/modules/icons/thanks-ltr.svg
+++ b/modules/icons/thanks-ltr.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
+
 
diff --git a/modules/icons/thanks-rtl.svg b/modules/icons/thanks-rtl.svg
index 7ef9ec2..0f9a6fb 100644
--- a/modules/icons/thanks-rtl.svg
+++ b/modules/icons/thanks-rtl.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
+
 
diff --git a/modules/icons/trash.svg b/modules/icons/trash.svg
index f0ceebc..8884a49 100644
--- a/modules/icons/trash.svg
+++ b/modules/icons/trash.svg
@@ -1,6 +1,4 @@
 
 http://www.w3.org/2000/svg;>
-
-
-
+
 
diff --git a/modules/icons/tray.svg b/modules/icons/tray.svg
index d7ab69b..7c617ee 100644
--- a/modules/icons/tray.svg
+++ b/modules/icons/tray.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
+
 
diff --git a/modules/icons/user-rights.svg b/modules/icons/user-rights.svg
index 6903ea8..ea5ee25 100644
--- a/modules/icons/user-rights.svg
+++ b/modules/icons/user-rights.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg;>
-
+
 
diff --git a/modules/icons/user-speech-bubble.svg 
b/modules/icons/user-speech-bubble.svg
index cf5e91b..12e60d4 100644
--- a/modules/icons/user-speech-bubble.svg
+++ b/modules/icons/user-speech-bubble.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
-
+
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_misc: pybal_config: use puppetmaster1001.eqiad only

2016-10-18 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: cache_misc: pybal_config: use puppetmaster1001.eqiad only
..


cache_misc: pybal_config: use puppetmaster1001.eqiad only

Ideally this should be an LVS service, but even if we converted to
the LVS model, we'd end up with config-master.svc.eqiad.wmnet and
.codfw.wmnet each mapping to a single host in that DC, and then
we'd only use the eqiad one here, as cache_misc doesn't really do
multi-dc (yet).  We probably shouldn't have been doing what we're
doing anyways, as it breaks that model and sends some requests
cross-dc without crypto.

Bug: T147847
Change-Id: I586f5b65cea5ce89c95c10415be0667401617142
---
M modules/role/manifests/cache/misc.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index af236ba..815864e 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -201,7 +201,7 @@
 'pybal_config' => {
 'dynamic'  => 'no',
 'type' => 'random',
-'backends' => keys(hiera('puppetmaster::servers')),
+'backends' => ['puppetmaster1001.eqiad.wmnet'],
 'be_opts'  => $app_def_be_opts,
 'req_host' => 'config-master.wikimedia.org',
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I586f5b65cea5ce89c95c10415be0667401617142
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
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] mediawiki/vagrant[master]: Add a link to the OAuth docs

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Add a link to the OAuth docs
..


Add a link to the OAuth docs

Change-Id: Ib30e54434d32741accbbf8bb35ae5d5f5daf1f69
---
M puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki 
b/puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki
index 8e1d86d..713eae6 100644
--- a/puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki
+++ b/puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki
@@ -3,6 +3,7 @@
 Special pages:
 * list consumers: [[Special:OAuthListConsumers]]
 * manage own consumers: [[Special:OAuthConsumerRegistration]]
+* manage all consumers: [[Special:OAuthManageConsumers]]
 * manage own grants: [[Special:OAuthManageMyGrants]]
 * consumer management log: [[Special:Log/mwoauthconsumer]]
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Revert "Convert PageTriage to extension registration"

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Convert PageTriage to extension registration"
..


Revert "Convert PageTriage to extension registration"

This reverts commit 7ef12cadb71e320ced64e375d1383368ae32fdde.

Change-Id: If46d32f83ae6499fbe810fe1a85333c4b5dc3224
---
M PageTriage.php
D extension.json
2 files changed, 664 insertions(+), 863 deletions(-)

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



diff --git a/PageTriage.php b/PageTriage.php
index ea42b43..a9acaf1 100644
--- a/PageTriage.php
+++ b/PageTriage.php
@@ -1,14 +1,666 @@
 https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   );*/
-   return;
-} else {
-   die( 'This version of the PageTriage extension requires MediaWiki 
1.28+' );
+/**
+ * MediaWiki PageTriage extension
+ * http://www.mediawiki.org/wiki/Extension:PageTriage
+ *
+ * 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.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY.
+ */
+
+/**
+ * This file loads everything needed for the PageTriage extension to function.
+ *
+ * @file
+ * @ingroup Extensions
+ * @author Ryan Kaldari
+ * @license MIT License
+ */
+
+// Alert the user that this is not a valid entry point to MediaWiki if they 
try to access the
+// special pages file directly.
+if ( !defined( 'MEDIAWIKI' ) ) {
+   echo << __FILE__,
+   'name' => 'PageTriage',
+   'version' => '0.2.1',
+   'url' => 'https://www.mediawiki.org/wiki/Extension:PageTriage',
+   'author' => [
+   'Ryan Kaldari',
+   'Benny Situ',
+   'Ian Baker',
+   'Andrew Garrett',
+   ],
+   'descriptionmsg' => 'pagetriage-desc',
+   'license-name' => 'MIT',
+];
+
+// Begin configuration variables
+// Maximum number of articles for the API to retrieve at once
+$wgPageTriagePagesPerRequest = 20;
+// Whether or not to use infinite scrolling in the page list
+$wgPageTriageInfiniteScrolling = true;
+// Whether or not the top nav bar should float
+$wgPageTriageStickyControlNav = true;
+// Whether or not the bottom nav bar should float
+$wgPageTriageStickyStatsNav = true;
+// 1 day - How long after visiting Special:NewPagesFeed do we show review 
links on articles
+$wgPageTriageMarkPatrolledLinkExpiry = 3600 * 24;
+// Array of template names (without prefixes) that will trigger noindexing of
+// pages that include them, for example, speedy deletion templates. Note that
+// it isn't necessary to list redirects or subtemplates.
+$wgPageTriageNoIndexTemplates = [];
+// Set this to true if new, unreviewed articles should be set to noindex. In 
other
+// words, if they should not be indexed by search engines until they are 
reviewed.
+$wgPageTriageNoIndexUnreviewedNewArticles = false;
+$wgPageTriageLearnMoreUrl = 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help';
+$wgPageTriageProjectLink = 'Wikipedia:Page Curation';
+$wgPageTriageFeedbackUrl = 
'//en.wikipedia.org/wiki/Wikipedia_talk:Page_Curation';
+// enable the curation toolbar?
+$wgPageTriageEnableCurationToolbar = true;
+$wgPageTriageCurationModules = [
+   'articleInfo' => [
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#PageInfo',
+   'namespace' => [ NS_MAIN, NS_USER ],
+   ],
+   'mark' => [
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#MarkReviewed',
+   'namespace' => [ NS_MAIN, NS_USER ],
+   'note' => [ NS_MAIN ],
+   ],
+   'tags' => [
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#AddTags',
+   'namespace' => [ NS_MAIN ],
+   ],
+   'delete' => [
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#MarkDeletion',
+   'namespace' => [ NS_MAIN, NS_USER ],
+   ],
+];
+// version number to be added to cache key so that cache can be refreshed 
easily
+$wgPageTriageCacheVersion = '1.4';
+// only include these namespaces for pagetriage
+$wgPageTriageNamespaces = [ NS_MAIN, NS_USER ];
+$wgTalkPageNoteTemplate = [
+   'Mark' => 'Reviewednote-NPF',
+   'UnMark' => [ 'note' => 'Unreviewednote-NPF', 'nonote' => 
'Unreviewednonote-NPF' ],
+   'Tags' => 'Taggednote-NPF'
+];
+// Set which PageTriage Echo events (defined in

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Force User::__toString() return value to be string

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Force User::__toString() return value to be string
..


Force User::__toString() return value to be string

Bug: T148486
Change-Id: I19f483b16c99d05f4d1626ee89ba1cfb7a78d52b
---
M includes/user/User.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/user/User.php b/includes/user/User.php
index df3b2ac..92a65f0 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -321,7 +321,7 @@
 * @return string
 */
public function __toString() {
-   return $this->getName();
+   return (string)$this->getName();
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add a link to the OAuth docs

2016-10-18 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Add a link to the OAuth docs
..

Add a link to the OAuth docs

Change-Id: Ib30e54434d32741accbbf8bb35ae5d5f5daf1f69
---
M puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/22/316722/1

diff --git a/puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki 
b/puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki
index 8e1d86d..713eae6 100644
--- a/puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki
+++ b/puppet/modules/role/files/oauth/VagrantRoleOAuth.wiki
@@ -3,6 +3,7 @@
 Special pages:
 * list consumers: [[Special:OAuthListConsumers]]
 * manage own consumers: [[Special:OAuthConsumerRegistration]]
+* manage all consumers: [[Special:OAuthManageConsumers]]
 * manage own grants: [[Special:OAuthManageMyGrants]]
 * consumer management log: [[Special:Log/mwoauthconsumer]]
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Force User::__toString() return value to be string

2016-10-18 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Force User::__toString() return value to be string
..

Force User::__toString() return value to be string

Bug: T148486
Change-Id: I19f483b16c99d05f4d1626ee89ba1cfb7a78d52b
---
M includes/user/User.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/316721/1

diff --git a/includes/user/User.php b/includes/user/User.php
index df3b2ac..92a65f0 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -321,7 +321,7 @@
 * @return string
 */
public function __toString() {
-   return $this->getName();
+   return (string)$this->getName();
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move FSFile classes to /fsfile

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Move FSFile classes to /fsfile
..


Move FSFile classes to /fsfile

Change-Id: I21f3a9ac52b1f953ca09da0705cac868785193e1
---
M autoload.php
R includes/libs/filebackend/fsfile/FSFile.php
R includes/libs/filebackend/fsfile/TempFSFile.php
3 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 1beb00c..3a2d06f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -436,7 +436,7 @@
'ExternalStoreHttp' => __DIR__ . 
'/includes/externalstore/ExternalStoreHttp.php',
'ExternalStoreMedium' => __DIR__ . 
'/includes/externalstore/ExternalStoreMedium.php',
'ExternalStoreMwstore' => __DIR__ . 
'/includes/externalstore/ExternalStoreMwstore.php',
-   'FSFile' => __DIR__ . '/includes/libs/filebackend/FSFile.php',
+   'FSFile' => __DIR__ . '/includes/libs/filebackend/fsfile/FSFile.php',
'FSFileBackend' => __DIR__ . 
'/includes/libs/filebackend/FSFileBackend.php',
'FSFileBackendDirList' => __DIR__ . 
'/includes/libs/filebackend/FSFileBackend.php',
'FSFileBackendFileList' => __DIR__ . 
'/includes/libs/filebackend/FSFileBackend.php',
@@ -1415,7 +1415,7 @@
'TableDiffFormatter' => __DIR__ . 
'/includes/diff/TableDiffFormatter.php',
'TablePager' => __DIR__ . '/includes/pager/TablePager.php',
'TagLogFormatter' => __DIR__ . '/includes/logging/TagLogFormatter.php',
-   'TempFSFile' => __DIR__ . '/includes/libs/filebackend/TempFSFile.php',
+   'TempFSFile' => __DIR__ . 
'/includes/libs/filebackend/fsfile/TempFSFile.php',
'TempFileRepo' => __DIR__ . '/includes/filerepo/FileRepo.php',
'TemplateParser' => __DIR__ . '/includes/TemplateParser.php',
'TemplatesOnThisPageFormatter' => __DIR__ . 
'/includes/TemplatesOnThisPageFormatter.php',
diff --git a/includes/libs/filebackend/FSFile.php 
b/includes/libs/filebackend/fsfile/FSFile.php
similarity index 100%
rename from includes/libs/filebackend/FSFile.php
rename to includes/libs/filebackend/fsfile/FSFile.php
diff --git a/includes/libs/filebackend/TempFSFile.php 
b/includes/libs/filebackend/fsfile/TempFSFile.php
similarity index 100%
rename from includes/libs/filebackend/TempFSFile.php
rename to includes/libs/filebackend/fsfile/TempFSFile.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21f3a9ac52b1f953ca09da0705cac868785193e1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Deprecate Database::getProperty()

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Deprecate Database::getProperty()
..


Deprecate Database::getProperty()

Change-Id: If0399dded731b139ffbaab405eceeeafcdf9aed9
---
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/IDatabase.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
3 files changed, 6 insertions(+), 9 deletions(-)

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



diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index a3544f1..38f51d3 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -609,6 +609,11 @@
return !!( $this->mFlags & $flag );
}
 
+   /**
+* @param string $name Class field name
+* @return mixed
+* @deprecated Since 1.28
+*/
public function getProperty( $name ) {
return $this->$name;
}
diff --git a/includes/libs/rdbms/database/IDatabase.php 
b/includes/libs/rdbms/database/IDatabase.php
index 952a2d6..c80fdec 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -323,14 +323,6 @@
public function getFlag( $flag );
 
/**
-* General read-only accessor
-*
-* @param string $name
-* @return string
-*/
-   public function getProperty( $name );
-
-   /**
 * @return string
 */
public function getDomainID();
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index b1c212e..894c0dc 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -887,7 +887,7 @@
// If all servers were busy, mLastError will contain 
something sensible
throw new DBConnectionError( null, $this->mLastError );
} else {
-   $context['db_server'] = $conn->getProperty( 'mServer' );
+   $context['db_server'] = $conn->getServer();
$this->connLogger->warning(
"Connection error: {last_error} ({db_server})",
$context

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiPurge: Remove setTriggeringUser call.

2016-10-18 Thread Ppchelko (Code Review)

Ppchelko has uploaded a new change for review.

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

Change subject: ApiPurge: Remove setTriggeringUser call.
..

ApiPurge: Remove setTriggeringUser call.

This is a revert of 315575. At that point we've been implementing
page-properties-change event for the EventBus extension and thought
adding this call would be a good idea. However, it was discovered
afterwards that there's much more extensions that don't set the
triggering user. Since that call is deprecated and plans are to
remove it - revert the change.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/316720/1

diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index 8be523e..8bbd88d 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -103,11 +103,6 @@
$updates = 
$content->getSecondaryDataUpdates(
$title, null, 
$forceRecursiveLinkUpdate, $p_result );
foreach ( $updates as $update ) 
{
-   # Some extensions, like 
EventBus, need to know the user
-   # that performed the 
purge action, so set it here
-   if ( $update instanceof 
LinksUpdate ) {
-   
$update->setTriggeringUser( $user );
-   }

DeferredUpdates::addUpdate( $update, DeferredUpdates::PRESEND );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix bogus variable usage

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Fix bogus variable usage
..


Fix bogus variable usage

Change-Id: I9100648d5b6be63a697a8660def33e592d010688
---
M includes/model/Notification.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/model/Notification.php b/includes/model/Notification.php
index a94b665..7192d29 100644
--- a/includes/model/Notification.php
+++ b/includes/model/Notification.php
@@ -144,7 +144,7 @@
 
if ( $this->event->getCategory() === 'edit-user-talk' ) {
$notifUser->flagCacheWithNewTalkNotification();
-   $this->mUser->setNewTalk( true );
+   $this->user->setNewtalk( true );
}
Hooks::run( 'EchoCreateNotificationComplete', array( $this ) );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9100648d5b6be63a697a8660def33e592d010688
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
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...OracleTextSearch[master]: Avoid deprecated Database::getProperty() method

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Avoid deprecated Database::getProperty() method
..


Avoid deprecated Database::getProperty() method

Change-Id: Ibd2d1b6340462533371b22181098c1b5138161ab
---
M SearchOracleText.php
M maintainenceFixOTSLinks.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/SearchOracleText.php b/SearchOracleText.php
index 52d68b6..c526da0 100644
--- a/SearchOracleText.php
+++ b/SearchOracleText.php
@@ -21,7 +21,7 @@
'SearchIndexUpdate:update' );
wfDebugLog( 'OracleTextSearch', 'Updated si_url for 
page ' . $id );
 
-   $index = $dbw->getProperty('mTablePrefix')."si_url_idx";
+   $index = $dbw->tablePrefix() . "si_url_idx";
$dbw->query( "CALL ctx_ddl.sync_index('$index')" );
wfDebugLog( 'OracleTextSearch', 'Synced index: 
'.$index);
}
diff --git a/maintainenceFixOTSLinks.php b/maintainenceFixOTSLinks.php
index 0e20053..faad8bb 100644
--- a/maintainenceFixOTSLinks.php
+++ b/maintainenceFixOTSLinks.php
@@ -58,7 +58,7 @@

if ( $syncIdx ) {
$this->output( "Syncing index... " );
-   $index = $dbw->getProperty('mTablePrefix')."si_url_idx";
+   $index = $dbw->tablePrefix() . "si_url_idx";
$dbw->query( "CALL ctx_ddl.sync_index('$index')" );
$this->output( "Done\n" );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd2d1b6340462533371b22181098c1b5138161ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OracleTextSearch
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
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...DumpHTML[master]: Avoid deprecated Database::getProperty() method

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Avoid deprecated Database::getProperty() method
..


Avoid deprecated Database::getProperty() method

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

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



diff --git a/dumpHTML.php b/dumpHTML.php
index 61af372..1642dde 100644
--- a/dumpHTML.php
+++ b/dumpHTML.php
@@ -128,7 +128,7 @@
 } else {
print "Creating static HTML dump in directory $dest. \n";
$dbr = wfGetDB( DB_SLAVE );
-   $server = $dbr->getProperty( 'mServer' );
+   $server = $dbr->getServer();
print "Using database {$server}\n";
 
if ( !isset( $options['e'] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I977f5548203961a91168bd939d481c04b041cf0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DumpHTML
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
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...InterwikiIntegration[master]: Avoid deprecated Database::getProperty() method

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Avoid deprecated Database::getProperty() method
..


Avoid deprecated Database::getProperty() method

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

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



diff --git a/SpecialInterwikiIntegration.php b/SpecialInterwikiIntegration.php
index b69a20a..42270fe 100644
--- a/SpecialInterwikiIntegration.php
+++ b/SpecialInterwikiIntegration.php
@@ -25,7 +25,7 @@
}
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
-   $localDBname = $dbr -> getProperty ( 'mDBname' );
+   $localDBname = $dbr ->getDBname();
$dbw->delete ( 'integration_prefix', '*' );
if ( isset ( $wgInterwikiIntegrationPrefix ) ) {
foreach ( $wgInterwikiIntegrationPrefix as $thisPrefix 
=> $thisDatabase ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e03077b891a4acbc417695a912ff4c0c255e8e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiIntegration
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Color selection dialog for CollaborationHubContent theming.

2016-10-18 Thread Harej (Code Review)

Harej has uploaded a new change for review.

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

Change subject: Color selection dialog for CollaborationHubContent theming.
..

Color selection dialog for CollaborationHubContent theming.

Same basic idea as the icon selector, but for colors.

Bug: T141220
Change-Id: I3114b3e8d607a9808252561730269b52b8a27988
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/CollaborationHubContentEditor.php
M includes/SpecialCreateCollaborationHub.php
A modules/ext.CollaborationKit.colour.js
A modules/ext.CollaborationKit.colourbrowser.styles.less
7 files changed, 226 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index cfe4e81..3df3477 100755
--- a/extension.json
+++ b/extension.json
@@ -86,6 +86,9 @@
"ext.CollaborationKit.iconbrowser.styles": {
"styles": "ext.CollaborationKit.iconbrowser.styles.less"
},
+   "ext.CollaborationKit.colourbrowser.styles": {
+   "styles": 
"ext.CollaborationKit.colourbrowser.styles.less"
+   },
"ext.CollaborationKit.icon": {
"scripts": "ext.CollaborationKit.icon.js",
"dependencies": [
@@ -101,6 +104,21 @@
"cancel"
]
},
+   "ext.CollaborationKit.colour": {
+   "scripts": "ext.CollaborationKit.colour.js",
+   "dependencies": [
+   "oojs-ui",
+   "oojs-ui.styles.icons-movement",
+   "mediawiki.widgets",
+   "mediawiki.widgets.UserInputWidget"
+   ],
+   "messages": [
+   "collaborationkit-colour-browser",
+   "collaborationkit-colour-select",
+   "collaborationkit-colour-launchbutton",
+   "cancel"
+   ]
+   },
"ext.CollaborationKit.list.edit": {
"scripts": "ext.CollaborationKit.list.edit.js",
"dependencies": [
diff --git a/i18n/en.json b/i18n/en.json
index 263604a..c31858e 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -88,6 +88,9 @@
"collaborationkit-icon-launchbutton": "Browse icons",
"collaborationkit-icon-browser": "Icon browser",
"collaborationkit-icon-select": "Select",
+   "collaborationkit-colour-launchbutton": "Browse colors",
+   "collaborationkit-colour-browser": "Color browser",
+   "collaborationkit-colour-select": "Select",
"collaborationkit-subpage-toc-label": "Part of a project:",
"collaborationkit-red1": "Dark red",
"collaborationkit-red2": "Red",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 716d9ca..47b1a34 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -88,6 +88,9 @@
"collaborationkit-icon-launchbutton": "Button label for button that 
launches the feature icon browser",
"collaborationkit-icon-browser": "Header label for the icon browser",
"collaborationkit-icon-select": "Button for selecting an icon in the 
icon browser",
+   "collaborationkit-colour-launchbutton": "Button label for button that 
launches the hub colour browser",
+   "collaborationkit-colour-browser": "Header label for the hub colour 
browser",
+   "collaborationkit-colour-select": "Button for selecting a colour in the 
hub colour browser",
"collaborationkit-subpage-toc-label": "Label for the toc on a 
Collaboration Hub subpage",
"collaborationkit-red1": "Color label",
"collaborationkit-red2": "Color label",
diff --git a/includes/CollaborationHubContentEditor.php 
b/includes/CollaborationHubContentEditor.php
index 64dffb4..1e4e659 100755
--- a/includes/CollaborationHubContentEditor.php
+++ b/includes/CollaborationHubContentEditor.php
@@ -153,6 +153,9 @@
 
$htmlForm = new OOUI\FieldsetLayout( [ 'items' => $formFields ] 
);
$out->enableOOUI();
+   $out->addModules( 'ext.CollaborationKit.colour' );
+   $out->addModuleStyles( 
'ext.CollaborationKit.colourbrowser.styles' );
+   $out->addJsConfigVars( 'wgCollaborationKitColourList', 
CollaborationHubContent::getThemeColours() );
$out->addHtml( $htmlForm );
}
 
diff --git a/includes/SpecialCreateCollaborationHub.php 
b/includes/SpecialCreateCollaborationHub.php
index e073ebf..26c761b 100755
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -17,6 +17,10 @@
 * @param $par string
 */
public

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Show JSON parse error

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Show JSON parse error
..


Show JSON parse error

Bug: T148504
Change-Id: I0b6d5e93d5cd911db8d319c85318f06aa89f655f
---
M wikibase/queryService/api/Sparql.js
1 file changed, 22 insertions(+), 23 deletions(-)

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



diff --git a/wikibase/queryService/api/Sparql.js 
b/wikibase/queryService/api/Sparql.js
index 98bf89f..2d5d5b0 100644
--- a/wikibase/queryService/api/Sparql.js
+++ b/wikibase/queryService/api/Sparql.js
@@ -146,11 +146,11 @@
self._rawData = data;
 
deferred.resolve();
-   } ).fail( function( request ) {
+   } ).fail( function( request, options, exception ) {
self._executionTime = null;
self._rawData = null;
self._resultLength = null;
-   self._generateErrorMessage( request );
+   self._generateErrorMessage( request, options, exception 
);
 
deferred.reject();
} );
@@ -163,36 +163,35 @@
 */
SELF.prototype._generateErrorMessage = function( request, options, 
exception ) {
var error = {
-   code: null,
+   code: ERROR_CODES.UNKNOWN,
message: null,
debug: request.responseText
};
 
-   if ( request.status === 0 ) {
+   if ( request.status === 0 || exception ) {
error.code = ERROR_CODES.SERVER;
-   error.message = exception;
-   } else {
+   error.message = exception.message;
+   }
 
-   try {
-   var errorToMatch = error.debug.substring( 
error.debug
-   .indexOf( 
'java.util.concurrent.ExecutionException:' ) );
+   try {//extract error from server response
+   var errorToMatch = error.debug.substring( error.debug
+   .indexOf( 
'java.util.concurrent.ExecutionException:' ) );
 
-   for ( var errorKey in ERROR_MAP ) {
-   if ( errorToMatch.indexOf( errorKey ) 
!== -1 ) {
-   error.code = ERROR_MAP[ 
errorKey ];
-   }
+   for ( var errorKey in ERROR_MAP ) {
+   if ( errorToMatch.indexOf( errorKey ) !== -1 ) {
+   error.code = ERROR_MAP[ errorKey ];
+   error.message = null;
}
-
-   if ( error.code === null || error.code === 
ERROR_CODES.MALFORMED ) {
-   error.message = error.debug
-   .match(
-   
/(java\.util\.concurrent\.ExecutionException\:)+(.*)(Exception\:)+(.*)/ )
-   .pop().trim();
-   }
-
-   } catch ( e ) {
-   error.code = ERROR_CODES.UNKNOWN;
}
+
+   if ( error.code === ERROR_CODES.UNKNOWN || error.code 
=== ERROR_CODES.MALFORMED ) {
+   error.message = error.debug
+   .match(
+   
/(java\.util\.concurrent\.ExecutionException\:)+(.*)(Exception\:)+(.*)/ )
+   .pop().trim();
+   }
+
+   } catch ( e ) {
}
 
this._error = error;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Revert "Convert PageTriage to extension registration"

2016-10-18 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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

Change subject: Revert "Convert PageTriage to extension registration"
..

Revert "Convert PageTriage to extension registration"

This reverts commit 7ef12cadb71e320ced64e375d1383368ae32fdde.

Change-Id: If46d32f83ae6499fbe810fe1a85333c4b5dc3224
---
M PageTriage.php
D extension.json
2 files changed, 664 insertions(+), 863 deletions(-)


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

diff --git a/PageTriage.php b/PageTriage.php
index ea42b43..a9acaf1 100644
--- a/PageTriage.php
+++ b/PageTriage.php
@@ -1,14 +1,666 @@
 https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   );*/
-   return;
-} else {
-   die( 'This version of the PageTriage extension requires MediaWiki 
1.28+' );
+/**
+ * MediaWiki PageTriage extension
+ * http://www.mediawiki.org/wiki/Extension:PageTriage
+ *
+ * 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.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY.
+ */
+
+/**
+ * This file loads everything needed for the PageTriage extension to function.
+ *
+ * @file
+ * @ingroup Extensions
+ * @author Ryan Kaldari
+ * @license MIT License
+ */
+
+// Alert the user that this is not a valid entry point to MediaWiki if they 
try to access the
+// special pages file directly.
+if ( !defined( 'MEDIAWIKI' ) ) {
+   echo << __FILE__,
+   'name' => 'PageTriage',
+   'version' => '0.2.1',
+   'url' => 'https://www.mediawiki.org/wiki/Extension:PageTriage',
+   'author' => [
+   'Ryan Kaldari',
+   'Benny Situ',
+   'Ian Baker',
+   'Andrew Garrett',
+   ],
+   'descriptionmsg' => 'pagetriage-desc',
+   'license-name' => 'MIT',
+];
+
+// Begin configuration variables
+// Maximum number of articles for the API to retrieve at once
+$wgPageTriagePagesPerRequest = 20;
+// Whether or not to use infinite scrolling in the page list
+$wgPageTriageInfiniteScrolling = true;
+// Whether or not the top nav bar should float
+$wgPageTriageStickyControlNav = true;
+// Whether or not the bottom nav bar should float
+$wgPageTriageStickyStatsNav = true;
+// 1 day - How long after visiting Special:NewPagesFeed do we show review 
links on articles
+$wgPageTriageMarkPatrolledLinkExpiry = 3600 * 24;
+// Array of template names (without prefixes) that will trigger noindexing of
+// pages that include them, for example, speedy deletion templates. Note that
+// it isn't necessary to list redirects or subtemplates.
+$wgPageTriageNoIndexTemplates = [];
+// Set this to true if new, unreviewed articles should be set to noindex. In 
other
+// words, if they should not be indexed by search engines until they are 
reviewed.
+$wgPageTriageNoIndexUnreviewedNewArticles = false;
+$wgPageTriageLearnMoreUrl = 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help';
+$wgPageTriageProjectLink = 'Wikipedia:Page Curation';
+$wgPageTriageFeedbackUrl = 
'//en.wikipedia.org/wiki/Wikipedia_talk:Page_Curation';
+// enable the curation toolbar?
+$wgPageTriageEnableCurationToolbar = true;
+$wgPageTriageCurationModules = [
+   'articleInfo' => [
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#PageInfo',
+   'namespace' => [ NS_MAIN, NS_USER ],
+   ],
+   'mark' => [
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#MarkReviewed',
+   'namespace' => [ NS_MAIN, NS_USER ],
+   'note' => [ NS_MAIN ],
+   ],
+   'tags' => [
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#AddTags',
+   'namespace' => [ NS_MAIN ],
+   ],
+   'delete' => [
+   'helplink' => 
'//en.wikipedia.org/wiki/Wikipedia:Page_Curation/Help#MarkDeletion',
+   'namespace' => [ NS_MAIN, NS_USER ],
+   ],
+];
+// version number to be added to cache key so that cache can be refreshed 
easily
+$wgPageTriageCacheVersion = '1.4';
+// only include these namespaces for pagetriage
+$wgPageTriageNamespaces = [ NS_MAIN, NS_USER ];
+$wgTalkPageNoteTemplate = [
+   'Mark' => 'Reviewednote-NPF',
+   'UnMark' => [ 'note' => 'Unreviewednote-NPF', 'nonote' => 
'Unreviewednonote-NPF' ],
+   'Tags' => 'Taggednote-NPF'
+];
+//

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move FSFile classes to /fsfile

2016-10-18 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Move FSFile classes to /fsfile
..

Move FSFile classes to /fsfile

Change-Id: I21f3a9ac52b1f953ca09da0705cac868785193e1
---
M autoload.php
D includes/libs/filebackend/FSFile.php
D includes/libs/filebackend/TempFSFile.php
3 files changed, 2 insertions(+), 421 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/316717/1

diff --git a/autoload.php b/autoload.php
index 1beb00c..3a2d06f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -436,7 +436,7 @@
'ExternalStoreHttp' => __DIR__ . 
'/includes/externalstore/ExternalStoreHttp.php',
'ExternalStoreMedium' => __DIR__ . 
'/includes/externalstore/ExternalStoreMedium.php',
'ExternalStoreMwstore' => __DIR__ . 
'/includes/externalstore/ExternalStoreMwstore.php',
-   'FSFile' => __DIR__ . '/includes/libs/filebackend/FSFile.php',
+   'FSFile' => __DIR__ . '/includes/libs/filebackend/fsfile/FSFile.php',
'FSFileBackend' => __DIR__ . 
'/includes/libs/filebackend/FSFileBackend.php',
'FSFileBackendDirList' => __DIR__ . 
'/includes/libs/filebackend/FSFileBackend.php',
'FSFileBackendFileList' => __DIR__ . 
'/includes/libs/filebackend/FSFileBackend.php',
@@ -1415,7 +1415,7 @@
'TableDiffFormatter' => __DIR__ . 
'/includes/diff/TableDiffFormatter.php',
'TablePager' => __DIR__ . '/includes/pager/TablePager.php',
'TagLogFormatter' => __DIR__ . '/includes/logging/TagLogFormatter.php',
-   'TempFSFile' => __DIR__ . '/includes/libs/filebackend/TempFSFile.php',
+   'TempFSFile' => __DIR__ . 
'/includes/libs/filebackend/fsfile/TempFSFile.php',
'TempFileRepo' => __DIR__ . '/includes/filerepo/FileRepo.php',
'TemplateParser' => __DIR__ . '/includes/TemplateParser.php',
'TemplatesOnThisPageFormatter' => __DIR__ . 
'/includes/TemplatesOnThisPageFormatter.php',
diff --git a/includes/libs/filebackend/FSFile.php 
b/includes/libs/filebackend/FSFile.php
deleted file mode 100644
index dacad1c..000
--- a/includes/libs/filebackend/FSFile.php
+++ /dev/null
@@ -1,223 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup FileBackend
- */
-
-/**
- * Class representing a non-directory file on the file system
- *
- * @ingroup FileBackend
- */
-class FSFile {
-   /** @var string Path to file */
-   protected $path;
-
-   /** @var string File SHA-1 in base 36 */
-   protected $sha1Base36;
-
-   /**
-* Sets up the file object
-*
-* @param string $path Path to temporary file on local disk
-*/
-   public function __construct( $path ) {
-   $this->path = $path;
-   }
-
-   /**
-* Returns the file system path
-*
-* @return string
-*/
-   public function getPath() {
-   return $this->path;
-   }
-
-   /**
-* Checks if the file exists
-*
-* @return bool
-*/
-   public function exists() {
-   return is_file( $this->path );
-   }
-
-   /**
-* Get the file size in bytes
-*
-* @return int|bool
-*/
-   public function getSize() {
-   return filesize( $this->path );
-   }
-
-   /**
-* Get the file's last-modified timestamp
-*
-* @return string|bool TS_MW timestamp or false on failure
-*/
-   public function getTimestamp() {
-   MediaWiki\suppressWarnings();
-   $timestamp = filemtime( $this->path );
-   MediaWiki\restoreWarnings();
-   if ( $timestamp !== false ) {
-   $timestamp = wfTimestamp( TS_MW, $timestamp );
-   }
-
-   return $timestamp;
-   }
-
-   /**
-* Get an associative array containing information about
-* a file with the given storage path.
-*
-* Resulting array fields include:
-*   - fileExists
-*   - size (filesize in bytes)
-*   - mime (as major/minor)
-*   - file-mime (as major/minor)
-*   - sha1 (in base 36)
-*   - major_mime
-*   - minor_mime
-*
-* @param string|bool $ext The file extension, or true to extract it 
from the filename.
-* Set it to false to ignore the extension. Currently 
unused.
-* @return array
-*/
-   public function getProps( $ext = true ) {
-   $info = self::placeholderProps();
-   $info['fileExists'] = $this->exists();
-
-   if ( $info['fileExists'] ) {
-   $info['size'] = $this->getSize(); // bytes
-   $info['sha1'] = $this->getSha1Base36();
-
-   $mime = mime_content_type( $this->path );
-   # MIME type

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Disallow css attr() with url type

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Disallow css attr() with url type
..


Disallow css attr() with url type

CSS3 seems like it will extend the attr() function which can interpret
attribute as different types, including 'url', which "...is interpreted
as a quoted string within the ‘url()’ notation."

Currently no browsers support this syntax yet, so submitting this
as a normal non-security patch.

Bug: T68404
Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
(cherry picked from commit 284173282d4fc25031b6ded0f696c46ecbf97338)
---
M RELEASE-NOTES-1.27
M includes/Sanitizer.php
M tests/phpunit/includes/SanitizerTest.php
3 files changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index af5e25f..d3215c9 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -1,3 +1,11 @@
+== MediaWiki 1.27.2 ==
+This is not a release yet!
+
+=== Changes since 1.27.1 ===
+
+* (T68404) CSS3 attr() function with url type argument is no longer allowed
+  in inline styles.
+
 == MediaWiki 1.27.1 ==
 
 This is a maintenance release of the MediaWiki 1.27 branch.
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index d321e9f..1d46e4e 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -983,6 +983,7 @@
| url\s*\(
| image\s*\(
| image-set\s*\(
+   | attr\s*\([^)]+[\s,]+url
!ix', $value ) ) {
return '/* insecure input */';
}
diff --git a/tests/phpunit/includes/SanitizerTest.php 
b/tests/phpunit/includes/SanitizerTest.php
index 72d7166..8bc7933 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -314,6 +314,8 @@
'/* insecure input */',
'background-image: -moz-image-set("asdf.png" 
1x, "asdf.png" 2x);'
],
+   [ '/* insecure input */', 'foo: attr( title, url );' ],
+   [ '/* insecure input */', 'foo: attr( title url );' ],
];
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_23]: Disallow css attr() with url type

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Disallow css attr() with url type
..


Disallow css attr() with url type

CSS3 seems like it will extend the attr() function which can interpret
attribute as different types, including 'url', which "...is interpreted
as a quoted string within the ‘url()’ notation."

Currently no browsers support this syntax yet, so submitting this
as a normal non-security patch.

Bug: T68404
Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
---
M RELEASE-NOTES-1.23
M includes/Sanitizer.php
M tests/phpunit/includes/SanitizerTest.php
3 files changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 031249d..4e1116a 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -1,6 +1,13 @@
 Security reminder: MediaWiki does not require PHP's register_globals. If you
 have it on, turn it '''off''' if you can.
 
+== MediaWiki 1.23.16 ==
+This is not a release yet!
+
+=== Changes since 1.23.15 ===
+* (T68404) CSS3 attr() function with url type is no longer allowed
+  in inline styles.
+
 == MediaWiki 1.23.15 ==
 
 This is a maintenance release of the MediaWiki 1.23 branch.
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 80740c3..8c247e3 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -951,6 +951,7 @@
| url\s*\(
| image\s*\(
| image-set\s*\(
+   | attr\s*\([^)]+[\s,]+url
!ix', $value ) ) {
return '/* insecure input */';
}
diff --git a/tests/phpunit/includes/SanitizerTest.php 
b/tests/phpunit/includes/SanitizerTest.php
index 97abf80..a00bcb6 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -275,6 +275,8 @@
array( '/* insecure input */', 'background-image: 
image-set("asdf.png" 1x, "asdf.png" 2x);' ),
array( '/* insecure input */', 'background-image: 
-webkit-image-set("asdf.png" 1x, "asdf.png" 2x);' ),
array( '/* insecure input */', 'background-image: 
-moz-image-set("asdf.png" 1x, "asdf.png" 2x);' ),
+   array( '/* insecure input */', 'foo: attr( title, url 
);' ),
+   array( '/* insecure input */', 'foo: attr( title url 
);' ),
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Filter refunds out of donation history

2016-10-18 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Filter refunds out of donation history
..

Filter refunds out of donation history

Apply the same filters as for the latest_donation logic.

Bug: T148062
Change-Id: If78471c395110016c0d95a2094cbb7b32d6c032f
---
M silverpop_export/update_table.sql
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/16/316716/1

diff --git a/silverpop_export/update_table.sql 
b/silverpop_export/update_table.sql
index 9773cd4..e5aff51 100755
--- a/silverpop_export/update_table.sql
+++ b/silverpop_export/update_table.sql
@@ -189,7 +189,9 @@
   FROM civicrm.civicrm_email e FORCE INDEX(UI_email)
   JOIN silverpop_export_staging ex ON e.email=ex.email
   JOIN civicrm.civicrm_contribution ct ON e.contact_id=ct.contact_id
-  WHERE ct.total_amount IS NOT NULL
+  WHERE ct.receive_date IS NOT NULL AND
+ct.total_amount > 0 AND -- Refunds don't count
+ct.contribution_status_id = 1 -- Only completed status
   GROUP BY e.email;
 
 -- (10 minutes)

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: htmlform: Tighten CSS rules for .mw-htmlform-flatlist

2016-10-18 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: htmlform: Tighten CSS rules for .mw-htmlform-flatlist
..

htmlform: Tighten CSS rules for .mw-htmlform-flatlist

They accidentally applies to MenuOptionWidgets in autocompletion dropdowns too.

Change-Id: I54d0988e78b65e0fb922ef353626453cce56e474
---
M resources/src/mediawiki/htmlform/ooui.styles.css
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/resources/src/mediawiki/htmlform/ooui.styles.css 
b/resources/src/mediawiki/htmlform/ooui.styles.css
index fc0fd6e..40f4f52 100644
--- a/resources/src/mediawiki/htmlform/ooui.styles.css
+++ b/resources/src/mediawiki/htmlform/ooui.styles.css
@@ -18,8 +18,8 @@
 /* Flatlist styling for PHP widgets... */
 .mw-htmlform-flatlist .oo-ui-fieldLayout-align-inline,
 /* ...and for JS widgets */
-.mw-htmlform-flatlist .oo-ui-optionWidget,
-.mw-htmlform-flatlist .oo-ui-multioptionWidget {
+.mw-htmlform-flatlist .oo-ui-radioOptionWidget,
+.mw-htmlform-flatlist .oo-ui-checkboxMultioptionWidget {
display: inline-block;
margin-right: 1em;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54d0988e78b65e0fb922ef353626453cce56e474
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_23]: Disallow css attr() with url type

2016-10-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Disallow css attr() with url type
..

Disallow css attr() with url type

CSS3 seems like it will extend the attr() function which can interpret
attribute as different types, including 'url', which "...is interpreted
as a quoted string within the ‘url()’ notation."

Currently no browsers support this syntax yet, so submitting this
as a normal non-security patch.

Bug: T68404
Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
---
M RELEASE-NOTES-1.23
M includes/Sanitizer.php
M tests/phpunit/includes/SanitizerTest.php
3 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/14/316714/1

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 031249d..4e1116a 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -1,6 +1,13 @@
 Security reminder: MediaWiki does not require PHP's register_globals. If you
 have it on, turn it '''off''' if you can.
 
+== MediaWiki 1.23.16 ==
+This is not a release yet!
+
+=== Changes since 1.23.15 ===
+* (T68404) CSS3 attr() function with url type is no longer allowed
+  in inline styles.
+
 == MediaWiki 1.23.15 ==
 
 This is a maintenance release of the MediaWiki 1.23 branch.
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 80740c3..8c247e3 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -951,6 +951,7 @@
| url\s*\(
| image\s*\(
| image-set\s*\(
+   | attr\s*\([^)]+[\s,]+url
!ix', $value ) ) {
return '/* insecure input */';
}
diff --git a/tests/phpunit/includes/SanitizerTest.php 
b/tests/phpunit/includes/SanitizerTest.php
index 97abf80..a00bcb6 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -275,6 +275,8 @@
array( '/* insecure input */', 'background-image: 
image-set("asdf.png" 1x, "asdf.png" 2x);' ),
array( '/* insecure input */', 'background-image: 
-webkit-image-set("asdf.png" 1x, "asdf.png" 2x);' ),
array( '/* insecure input */', 'background-image: 
-moz-image-set("asdf.png" 1x, "asdf.png" 2x);' ),
+   array( '/* insecure input */', 'foo: attr( title, url 
);' ),
+   array( '/* insecure input */', 'foo: attr( title url 
);' ),
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: CSteipp 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps: Enable root squash for maps on misc server

2016-10-18 Thread Madhuvishy (Code Review)

Madhuvishy has submitted this change and it was merged.

Change subject: maps: Enable root squash for maps on misc server
..


maps: Enable root squash for maps on misc server

Change-Id: I8a8896bf3e4b44be94e21323b05d35711e5377dc
---
M modules/labstore/templates/exports.labs_extras.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/labstore/templates/exports.labs_extras.erb 
b/modules/labstore/templates/exports.labs_extras.erb
index fd9f8e7..a9e057d 100644
--- a/modules/labstore/templates/exports.labs_extras.erb
+++ b/modules/labstore/templates/exports.labs_extras.erb
@@ -8,4 +8,4 @@
 /srv/dumps  *(ro,sec=sys,no_subtree_check,all_squash,nocrossmnt)
 /srv/statistics *(ro,sec=sys,no_subtree_check,all_squash,nocrossmnt)
 /srv/scratch *(rw,sec=sys,async,no_subtree_check,root_squash)
-/srv/maps   -rw,sec=sys,async,no_subtree_check,no_root_squash <%= 
Array(@maps_project_internal_ips).join(' ') %>
+/srv/maps   -rw,sec=sys,async,no_subtree_check,root_squash <%= 
Array(@maps_project_internal_ips).join(' ') %>

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps: Enable root squash for maps on misc server

2016-10-18 Thread Madhuvishy (Code Review)

Madhuvishy has uploaded a new change for review.

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

Change subject: maps: Enable root squash for maps on misc server
..

maps: Enable root squash for maps on misc server

Change-Id: I8a8896bf3e4b44be94e21323b05d35711e5377dc
---
M modules/labstore/templates/exports.labs_extras.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/316713/1

diff --git a/modules/labstore/templates/exports.labs_extras.erb 
b/modules/labstore/templates/exports.labs_extras.erb
index fd9f8e7..a9e057d 100644
--- a/modules/labstore/templates/exports.labs_extras.erb
+++ b/modules/labstore/templates/exports.labs_extras.erb
@@ -8,4 +8,4 @@
 /srv/dumps  *(ro,sec=sys,no_subtree_check,all_squash,nocrossmnt)
 /srv/statistics *(ro,sec=sys,no_subtree_check,all_squash,nocrossmnt)
 /srv/scratch *(rw,sec=sys,async,no_subtree_check,root_squash)
-/srv/maps   -rw,sec=sys,async,no_subtree_check,no_root_squash <%= 
Array(@maps_project_internal_ips).join(' ') %>
+/srv/maps   -rw,sec=sys,async,no_subtree_check,root_squash <%= 
Array(@maps_project_internal_ips).join(' ') %>

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nrpe: Update nrpe allowed_hosts

2016-10-18 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: nrpe: Update nrpe allowed_hosts
..


nrpe: Update nrpe allowed_hosts

Remove old entries and place tegmen, einsteinium in it as well

Change-Id: I400bbd172793a68a4bc094274d49e2f48ebd3eb5
---
M hieradata/common/nrpe.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/common/nrpe.yaml b/hieradata/common/nrpe.yaml
index f9b6ba5..3f74af8 100644
--- a/hieradata/common/nrpe.yaml
+++ b/hieradata/common/nrpe.yaml
@@ -1 +1 @@
-nrpe::allowed_hosts: '127.0.0.1,208.80.152.185,208.80.152.161,208.80.154.14'
+nrpe::allowed_hosts: '127.0.0.1,208.80.154.14,208.80.153.74,208.80.155.119'

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nrpe: Update nrpe allowed_hosts

2016-10-18 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: nrpe: Update nrpe allowed_hosts
..

nrpe: Update nrpe allowed_hosts

Remove old entries and place tegmen, einsteinium in it as well

Change-Id: I400bbd172793a68a4bc094274d49e2f48ebd3eb5
---
M hieradata/common/nrpe.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/316712/1

diff --git a/hieradata/common/nrpe.yaml b/hieradata/common/nrpe.yaml
index f9b6ba5..3f74af8 100644
--- a/hieradata/common/nrpe.yaml
+++ b/hieradata/common/nrpe.yaml
@@ -1 +1 @@
-nrpe::allowed_hosts: '127.0.0.1,208.80.152.185,208.80.152.161,208.80.154.14'
+nrpe::allowed_hosts: '127.0.0.1,208.80.154.14,208.80.153.74,208.80.155.119'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I400bbd172793a68a4bc094274d49e2f48ebd3eb5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps: Add maps mount to nfsmounts yaml config

2016-10-18 Thread Madhuvishy (Code Review)

Madhuvishy has submitted this change and it was merged.

Change subject: maps: Add maps mount to nfsmounts yaml config
..


maps: Add maps mount to nfsmounts yaml config

Change-Id: I26ea6b7ee707408b92bda36bdb9e86ff071320b7
---
M modules/labstore/files/nfs-mounts.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/labstore/files/nfs-mounts.yaml 
b/modules/labstore/files/nfs-mounts.yaml
index 194aef1..7e6542a 100644
--- a/modules/labstore/files/nfs-mounts.yaml
+++ b/modules/labstore/files/nfs-mounts.yaml
@@ -96,6 +96,7 @@
   home: true
   project: true
   scratch: true
+  maps: true
   maps-team:
 gid: 52497
 mounts:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps: Add maps mount to nfsmounts yaml config

2016-10-18 Thread Madhuvishy (Code Review)

Madhuvishy has uploaded a new change for review.

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

Change subject: maps: Add maps mount to nfsmounts yaml config
..

maps: Add maps mount to nfsmounts yaml config

Change-Id: I26ea6b7ee707408b92bda36bdb9e86ff071320b7
---
M modules/labstore/files/nfs-mounts.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/labstore/files/nfs-mounts.yaml 
b/modules/labstore/files/nfs-mounts.yaml
index 194aef1..7e6542a 100644
--- a/modules/labstore/files/nfs-mounts.yaml
+++ b/modules/labstore/files/nfs-mounts.yaml
@@ -96,6 +96,7 @@
   home: true
   project: true
   scratch: true
+  maps: true
   maps-team:
 gid: 52497
 mounts:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "labs: Attempt to debug maps nfs client issue"

2016-10-18 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: Revert "labs: Attempt to debug maps nfs client issue"
..


Revert "labs: Attempt to debug maps nfs client issue"

Debugging successful!

This reverts commit 371d0caa7d8828e75b72a8f62006035abe7f6825.

Change-Id: Ib0e3f1cad256a64f2b71b93f7cb76dd8454641e2
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index c683c29..e258887 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -26,7 +26,6 @@
 }
 
 if $::labsproject == 'maps' {
-notify { "Labsproject is ${::labsproject}": }
 labstore::nfs_mount { 'maps-on-labstore1003':
 mount_name  => 'maps',
 project => $::labsproject,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0e3f1cad256a64f2b71b93f7cb76dd8454641e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "labs: Attempt to debug maps nfs client issue"

2016-10-18 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: Revert "labs: Attempt to debug maps nfs client issue"
..

Revert "labs: Attempt to debug maps nfs client issue"

Debugging successful!

This reverts commit 371d0caa7d8828e75b72a8f62006035abe7f6825.

Change-Id: Ib0e3f1cad256a64f2b71b93f7cb76dd8454641e2
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/316710/1

diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index c683c29..e258887 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -26,7 +26,6 @@
 }
 
 if $::labsproject == 'maps' {
-notify { "Labsproject is ${::labsproject}": }
 labstore::nfs_mount { 'maps-on-labstore1003':
 mount_name  => 'maps',
 project => $::labsproject,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Default errors links to donate@ and other_ways

2016-10-18 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Default errors links to donate@ and other_ways
..

Default errors links to donate@ and other_ways

FIXME: We can't use message parameters in mapped error messages.

Bug: T117872
Change-Id: Ie9b3177d24f1949f66a4c75c149a0577207b7e28
---
M gateway_common/i18n/interface/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/gateway_common/i18n/interface/en.json 
b/gateway_common/i18n/interface/en.json
index f5e6a7a..49b9832 100644
--- a/gateway_common/i18n/interface/en.json
+++ b/gateway_common/i18n/interface/en.json
@@ -26,7 +26,7 @@
"donate_interface-amount-error": "Please select an amount to donate",
"donate_interface-smallamount-error": "Please select an amount (minimum 
$1)",
"donate_interface-bigamount-error": "We cannot accept donations greater 
than USD 1 ($1 $2) through our website. Please contact our major gifts 
staff at $3.",
-   "donate_interface-processing-error": "There has been an error 
processing your request.\nNo processors are available.",
+   "donate_interface-processing-error": "There has been an error 
processing your request.\nPlease try one of our other ways to give 
or contact us at mailto:don...@wikimedia.org\;>don...@wikimedia.org.",
"donate_interface-fallback-currency-notice": "Your currency was 
unsupported. Processing will take place using $1, if you decide to continue.",
"donate_interface-maintenance-notice": "We apologize, but this type of 
payment has been temporarily disabled.",
"donate_interface-AED": "UAE dirham",

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Attempt to debug maps nfs client issue

2016-10-18 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: labs: Attempt to debug maps nfs client issue
..


labs: Attempt to debug maps nfs client issue

Change-Id: I18af76d0122c840c351310fcde7615413e6c03b7
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index e258887..c683c29 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -26,6 +26,7 @@
 }
 
 if $::labsproject == 'maps' {
+notify { "Labsproject is ${::labsproject}": }
 labstore::nfs_mount { 'maps-on-labstore1003':
 mount_name  => 'maps',
 project => $::labsproject,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18af76d0122c840c351310fcde7615413e6c03b7
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labs: Attempt to debug maps nfs client issue

2016-10-18 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: labs: Attempt to debug maps nfs client issue
..

labs: Attempt to debug maps nfs client issue

Change-Id: I18af76d0122c840c351310fcde7615413e6c03b7
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/316708/1

diff --git a/modules/role/manifests/labs/nfsclient.pp 
b/modules/role/manifests/labs/nfsclient.pp
index e258887..851a1ed 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -26,6 +26,7 @@
 }
 
 if $::labsproject == 'maps' {
+notify { "Labsproject is ${maps}": }
 labstore::nfs_mount { 'maps-on-labstore1003':
 mount_name  => 'maps',
 project => $::labsproject,

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: repository: add bzr support

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: repository: add bzr support
..


repository: add bzr support

Change-Id: I64dcbc4ad6ccfebe53546a2b25425cfc29fc155b
Signed-off-by: Loic Dachary 
---
M FLOSSbot/repository.py
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/FLOSSbot/repository.py b/FLOSSbot/repository.py
index 8b2036a..205cf60 100644
--- a/FLOSSbot/repository.py
+++ b/FLOSSbot/repository.py
@@ -235,6 +235,8 @@
 return self.Q_File_Transfer_Protocol
 if url.startswith('cvs://'):
 return self.Q_Concurrent_Versions_System
+if url.startswith('bzr://'):
+return self.Q_GNU_Bazaar
 return None
 
 def verify_cvs(self, url, credentials):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64dcbc4ad6ccfebe53546a2b25425cfc29fc155b
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 
Gerrit-Reviewer: Dachary 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: repository: add cvs support

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: repository: add cvs support
..


repository: add cvs support

Change-Id: Ied2516c4cee2ec6c70f8c9100ad822329aa92eed
Signed-off-by: Loic Dachary 
---
M FLOSSbot/repository.py
1 file changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/FLOSSbot/repository.py b/FLOSSbot/repository.py
index 220d317..8b2036a 100644
--- a/FLOSSbot/repository.py
+++ b/FLOSSbot/repository.py
@@ -17,6 +17,7 @@
 import argparse
 import logging
 import re
+from urllib.parse import urlparse
 
 import pywikibot
 import requests
@@ -232,7 +233,21 @@
 return self.Q_Subversion
 if url.startswith('ftp://'):
 return self.Q_File_Transfer_Protocol
+if url.startswith('cvs://'):
+return self.Q_Concurrent_Versions_System
 return None
+
+def verify_cvs(self, url, credentials):
+parsed = urlparse(url)
+cvsroot = ':pserver:' + parsed.netloc + ':' + parsed.path
+return util.sh_bool("""
+set -e
+rm -fr /tmp/tmpclone
+mkdir -p /tmp/tmpclone
+cd /tmp/tmpclone
+timeout 30 cvs -d {cvsroot} -z3 get . || true
+test -d CVSROOT
+""".format(cvsroot=cvsroot))
 
 def verify_git(self, url):
 return util.sh_bool("timeout 30 git ls-remote " + url + " HEAD")
@@ -309,6 +324,8 @@
 return self.verify_http(url)
 elif protocol == self.Q_File_Transfer_Protocol:
 return self.verify_ftp(url)
+elif protocol == self.Q_Concurrent_Versions_System:
+return self.verify_cvs(url, credentials)
 return None
 
 def try_protocol(self, url, credentials):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied2516c4cee2ec6c70f8c9100ad822329aa92eed
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 
Gerrit-Reviewer: Dachary 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add kernel-wedge to package list

2016-10-18 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Add kernel-wedge to package list
..


Add kernel-wedge to package list

kernel-wedge is needed during the source generation stage to build the
Linux kernel. It was previously installed locally, but the recent
copper reimage made it go away.

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

Approvals:
  Muehlenhoff: Looks good to me, approved
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/package_builder/manifests/init.pp 
b/modules/package_builder/manifests/init.pp
index 2d9630a..fe5a2fe 100644
--- a/modules/package_builder/manifests/init.pp
+++ b/modules/package_builder/manifests/init.pp
@@ -42,6 +42,7 @@
 'pkg-php-tools',
 'dh-php5',
 'php5-dev',
+'kernel-wedge',
 ])
 
 if $::operatingsystem == 'Ubuntu' {

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: plugin: make search_entity fail if entity not found

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: plugin: make search_entity fail if entity not found
..


plugin: make search_entity fail if entity not found

Change-Id: Ib3ee3d76d5420536b2a1853e55776d0566f32768
Signed-off-by: Loic Dachary 
---
M FLOSSbot/plugin.py
1 file changed, 9 insertions(+), 6 deletions(-)

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



diff --git a/FLOSSbot/plugin.py b/FLOSSbot/plugin.py
index a4e04cf..5625675 100644
--- a/FLOSSbot/plugin.py
+++ b/FLOSSbot/plugin.py
@@ -211,12 +211,15 @@
 return super(Plugin, self).__getattribute__(name)
 label = " ".join(name.split('_')[1:])
 found = self.lookup_entity(label, type=type)
-if not found and self.args.test:
-self.create_entity(type, label)
-for i in range(120):
-found = self.lookup_entity(label, type=type)
-if found is not None:
-break
+if not found:
+if self.args.test:
+self.create_entity(type, label)
+for i in range(120):
+found = self.lookup_entity(label, type=type)
+if found is not None:
+break
+else:
+raise ValueError("found no items for " + name)
 return found
 
 def get_source(self, claim, id):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3ee3d76d5420536b2a1853e55776d0566f32768
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 
Gerrit-Reviewer: Dachary 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add kernel-wedge to package list

2016-10-18 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Add kernel-wedge to package list
..

Add kernel-wedge to package list

kernel-wedge is needed during the source generation stage to build the
Linux kernel. It was previously installed locally, but the recent
copper reimage made it go away.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/316707/1

diff --git a/modules/package_builder/manifests/init.pp 
b/modules/package_builder/manifests/init.pp
index 2d9630a..fe5a2fe 100644
--- a/modules/package_builder/manifests/init.pp
+++ b/modules/package_builder/manifests/init.pp
@@ -42,6 +42,7 @@
 'pkg-php-tools',
 'dh-php5',
 'php5-dev',
+'kernel-wedge',
 ])
 
 if $::operatingsystem == 'Ubuntu' {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Update for $wgMediaViewerEnableByDefault

2016-10-18 Thread Arseny1992 (Code Review)

Arseny1992 has uploaded a new change for review.

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

Change subject: Update for $wgMediaViewerEnableByDefault
..

Update for $wgMediaViewerEnableByDefault

To be consistent with $wgDefaultUserOptions logic

Migration of bugzilla bug id to maniphest

Bug: T148492
Change-Id: Ie371a0c2445c9aededb5c9e26018d19cbd616358
---
M MultimediaViewerHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index d27a3c7..13f8ae7 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -154,7 +154,7 @@
}
 
if ( $wgMediaViewerEnableByDefault ) {
-   $wgDefaultUserOptions['multimediaviewer-enable'] = true;
+   $wgDefaultUserOptions['multimediaviewer-enable'] = 1;
}
}
 
@@ -321,7 +321,7 @@
 
$user = $out->getUser();
$vars['wgMediaViewerOnClick'] = self::shouldHandleClicks( $user 
);
-   // needed because of bug 69942; could be different for anon and 
logged-in
+   // needed because of bug T71942; could be different for anon 
and logged-in
$vars['wgMediaViewerEnabledByDefault'] = !empty( 
$wgDefaultUserOptions['multimediaviewer-enable'] );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie371a0c2445c9aededb5c9e26018d19cbd616358
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Arseny1992 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: FormSpecialPage: Only add redirectparams for POST forms

2016-10-18 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: FormSpecialPage: Only add redirectparams for POST forms
..

FormSpecialPage: Only add redirectparams for POST forms

If the form is submitted via GET, using redirectparams doesn't make
sense, and you end up with redirect params being included in the GET
query string. And then if the form is submitted again, the
redirectparams include the previous redirectparams, and so on.

Change-Id: I9bc930e5dca557571b4658444fea6aec59c5797a
---
M includes/specialpage/FormSpecialPage.php
1 file changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/includes/specialpage/FormSpecialPage.php 
b/includes/specialpage/FormSpecialPage.php
index c28c456..6867f8a 100644
--- a/includes/specialpage/FormSpecialPage.php
+++ b/includes/specialpage/FormSpecialPage.php
@@ -107,14 +107,16 @@
$form->addHeaderText( $headerMsg->parseAsBlock() );
}
 
-   // Retain query parameters (uselang etc)
-   $params = array_diff_key(
-   $this->getRequest()->getQueryValues(), [ 'title' => 
null ] );
-   $form->addHiddenField( 'redirectparams', wfArrayToCgi( $params 
) );
 
$form->addPreText( $this->preText() );
$form->addPostText( $this->postText() );
$this->alterForm( $form );
+   if ( $form->getMethod() == 'post' ) {
+   // Retain query parameters (uselang etc) on POST 
requests
+   $params = array_diff_key(
+   $this->getRequest()->getQueryValues(), [ 
'title' => null ] );
+   $form->addHiddenField( 'redirectparams', wfArrayToCgi( 
$params ) );
+   }
 
// Give hooks a chance to alter the form, adding extra fields 
or text etc
Hooks::run( 'SpecialPageBeforeFormDisplay', [ $this->getName(), 
&$form ] );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Allow forceSearchIndex to ask for specific index to be used

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Allow forceSearchIndex to ask for specific index to be used
..


Allow forceSearchIndex to ask for specific index to be used

Bug: T147957
Change-Id: I2144b684f6c43b9e48e026126f4b07b0ac4f9e66
---
M maintenance/forceSearchIndex.php
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 17e88eb..2d5099e 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -103,6 +103,7 @@
'this with --indexOnSkip for the first half of the two 
phase index build.' );
$this->addOption( 'namespace', 'Only index pages in this given 
namespace', false, true );
$this->addOption( 'excludeContentTypes', 'Exclude pages of the 
specified content types. These must be a comma separated list of strings such 
as "wikitext" or "json" matching the CONTENT_MODEL_* constants.', false, true, 
false );
+   $this->addOption( 'useDbIndex', 'Use specific index when 
fetching IDs from the database.', false, true, false );
}
 
public function execute() {
@@ -445,6 +446,10 @@
"{$columnPrefix}_content_model NOT IN ($list)",
] );
}
+   if ( $this->hasOption( 'useDbIndex' ) ) {
+   $index = $this->getOption( 'useDbIndex' );
+   $it->addOptions( [ 'USE INDEX' => $index ] );
+   }
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2144b684f6c43b9e48e026126f4b07b0ac4f9e66
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: repository: s/Apache Subversion/Subversion/

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: repository: s/Apache Subversion/Subversion/
..


repository: s/Apache Subversion/Subversion/

It was renamed 
https://www.wikidata.org/w/index.php?title=Q46794=revision=387720392=384674412

Change-Id: Ia008e780014e379e17f8cdab5ef0a4d730768826
Signed-off-by: Loic Dachary 
---
M FLOSSbot/plugin.py
M FLOSSbot/repository.py
M tests/test_repository.py
3 files changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/FLOSSbot/plugin.py b/FLOSSbot/plugin.py
index ec770fa..a4e04cf 100644
--- a/FLOSSbot/plugin.py
+++ b/FLOSSbot/plugin.py
@@ -103,6 +103,7 @@
 'wikidata': {
 'git': 'Q186055',
 'Fossil': 'Q1439431',
+'Subversion': 'Q46794',
 },
 'test': {
 },
diff --git a/FLOSSbot/repository.py b/FLOSSbot/repository.py
index d8ef5a2..220d317 100644
--- a/FLOSSbot/repository.py
+++ b/FLOSSbot/repository.py
@@ -229,7 +229,7 @@
 if url.startswith('git://'):
 return self.Q_git
 if url.startswith('svn://'):
-return self.Q_Apache_Subversion
+return self.Q_Subversion
 if url.startswith('ftp://'):
 return self.Q_File_Transfer_Protocol
 return None
@@ -302,7 +302,7 @@
 return self.verify_fossil(url)
 elif protocol == self.Q_GNU_Bazaar:
 return self.verify_bzr(url)
-elif protocol == self.Q_Apache_Subversion:
+elif protocol == self.Q_Subversion:
 return self.verify_svn(url, credentials)
 elif (protocol == self.Q_Hypertext_Transfer_Protocol or
   protocol == self.Q_HTTPS):
@@ -317,7 +317,7 @@
 elif self.verify_hg(url):
 return self.Q_Mercurial
 elif self.verify_svn(url, credentials):
-return self.Q_Apache_Subversion
+return self.Q_Subversion
 elif self.verify_bzr(url):
 return self.Q_GNU_Bazaar
 elif self.verify_fossil(url):
diff --git a/tests/test_repository.py b/tests/test_repository.py
index bb703c6..246abac 100644
--- a/tests/test_repository.py
+++ b/tests/test_repository.py
@@ -81,7 +81,7 @@
 def test_guessproto__url_svn_schema(self):
 assert(
 self.r.guess_protocol_from_url('svn://example.org')
-== self.r.Q_Apache_Subversion)
+== self.r.Q_Subversion)
 
 def test_guessproto__url_ftp_schema(self):
 assert(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia008e780014e379e17f8cdab5ef0a4d730768826
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 
Gerrit-Reviewer: Dachary 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: FormSpecialPage: Use DerivativeContext/setTitle trick

2016-10-18 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: FormSpecialPage: Use DerivativeContext/setTitle trick
..

FormSpecialPage: Use DerivativeContext/setTitle trick

When constructing the HTMLForm instance, use a DerivativeContext that
has the title set to SpecialPage::getPageTitle(). This means that the
form will submit a post request against the root special page, and not
whatever subpage displayed the form.

Change-Id: I1ab90846f3d1f18586afa7469840821ccafa05f6
---
M includes/specialpage/FormSpecialPage.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/specialpage/FormSpecialPage.php 
b/includes/specialpage/FormSpecialPage.php
index c28c456..9b3fdcb 100644
--- a/includes/specialpage/FormSpecialPage.php
+++ b/includes/specialpage/FormSpecialPage.php
@@ -89,10 +89,12 @@
 * @return HTMLForm|null
 */
protected function getForm() {
+   $context = new DerivativeContext( $this->getContext() );
+   $context->setTitle( $this->getPageTitle() );
$form = HTMLForm::factory(
$this->getDisplayFormat(),
$this->getFormFields(),
-   $this->getContext(),
+   $context,
$this->getMessagePrefix()
);
$form->setSubmitCallback( [ $this, 'onSubmit' ] );

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove unnecessary ops restriction from piwik ldap

2016-10-18 Thread Milimetric (Code Review)

Milimetric has uploaded a new change for review.

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

Change subject: Remove unnecessary ops restriction from piwik ldap
..

Remove unnecessary ops restriction from piwik ldap

Change-Id: I8e7d1f71d850516f5eb614a873180d87c227359e
---
M modules/role/manifests/piwik/server.pp
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/piwik/server.pp 
b/modules/role/manifests/piwik/server.pp
index f77e1ea..cf1c7e1 100644
--- a/modules/role/manifests/piwik/server.pp
+++ b/modules/role/manifests/piwik/server.pp
@@ -45,12 +45,11 @@
 # LDAP configuration. Interpolated into the Apache site template
 # to provide mod_authnz_ldap-based user authentication.
 $auth_ldap = {
-name  => 'nda/ops/wmf',
+name  => 'nda/wmf',
 bind_dn   => 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org',
 bind_password => $passwords::ldap::production::proxypass,
 url   => 'ldaps://ldap-labs.eqiad.wikimedia.org 
ldap-labs.codfw.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn',
 groups=> [
-'cn=ops,ou=groups,dc=wikimedia,dc=org',
 'cn=nda,ou=groups,dc=wikimedia,dc=org',
 'cn=wmf,ou=groups,dc=wikimedia,dc=org',
 ],

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Follow-up e3192e2d3: property fix layout thrashing in update...

2016-10-18 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Follow-up e3192e2d3: property fix layout thrashing in 
updateInvisibleIcon
..

Follow-up e3192e2d3: property fix layout thrashing in updateInvisibleIcon

Rather than deferring the whole function with rAF, do the measurements
immediately and defer the DOM modification. In theory, this means we
should be able to do all the measurements first and all the DOM modifications
after that, causing no reflows. In practice, there are still a couple
of reflows because of other stuff that happens during FocusableNode
setup, so we'd need to use something like the fastdom library to
really cut down on reflows.

This cuts post-AJAX load time on [[en:Barack Obama]] down to 5.8s
down from 7.6s on my laptop.

Change-Id: I4aff88f705782d7ab3bd6f7aaa8096324a29b813
---
M src/ce/ve.ce.FocusableNode.js
1 file changed, 18 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/03/316703/1

diff --git a/src/ce/ve.ce.FocusableNode.js b/src/ce/ve.ce.FocusableNode.js
index 792fae9..e01852a 100644
--- a/src/ce/ve.ce.FocusableNode.js
+++ b/src/ce/ve.ce.FocusableNode.js
@@ -158,7 +158,7 @@
.find( 'img:not([width]),img:not([height])' )
.addBack( 'img:not([width]),img:not([height])' )
.on( 'load', this.updateInvisibleIcon.bind( this ) );
-   rAF( this.updateInvisibleIcon.bind( this ) );
+   this.updateInvisibleIcon();
}
 
this.isFocusableSetup = true;
@@ -177,17 +177,24 @@
if ( !this.constructor.static.iconWhenInvisible ) {
return;
}
-   if ( !this.hasRendering() ) {
-   if ( !this.$icon ) {
-   this.$icon = this.createInvisibleIcon();
+
+   var showIcon = !this.hasRendering(),
+   rAF = window.requestAnimationFrame || setTimeout,
+   node = this;
+
+   rAF( function () {
+   if ( showIcon ) {
+   if ( !node.$icon ) {
+   node.$icon = node.createInvisibleIcon();
+   }
+   node.$element.first()
+   .addClass( 've-ce-focusableNode-invisible' )
+   .prepend( node.$icon );
+   } else if ( node.$icon ) {
+   node.$element.first().removeClass( 
've-ce-focusableNode-invisible' );
+   node.$icon.detach();
}
-   this.$element.first()
-   .addClass( 've-ce-focusableNode-invisible' )
-   .prepend( this.$icon );
-   } else if ( this.$icon ) {
-   this.$element.first().removeClass( 
've-ce-focusableNode-invisible' );
-   this.$icon.detach();
-   }
+   } );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4aff88f705782d7ab3bd6f7aaa8096324a29b813
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Soften dependency on the BetaFeatures extension

2016-10-18 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Soften dependency on the BetaFeatures extension
..

Soften dependency on the BetaFeatures extension

If BetaFeatures isn't installed, assume that ORES is disabled.

Change-Id: I86b859033e00ee6c0ed47604a503397a3ae5452e
---
M includes/Hooks.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/includes/Hooks.php b/includes/Hooks.php
index f930b5a..9c887ea 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -538,6 +538,9 @@
 * @return bool
 */
private static function oresEnabled( User $user ) {
+   if ( !class_exists( 'BetaFeatures' ) ) {
+   return false;
+   }
return BetaFeatures::isFeatureEnabled( $user, 'ores-enabled' );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: repository: add cvs support

2016-10-18 Thread Dachary (Code Review)

Dachary has uploaded a new change for review.

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

Change subject: repository: add cvs support
..

repository: add cvs support

Change-Id: Ied2516c4cee2ec6c70f8c9100ad822329aa92eed
Signed-off-by: Loic Dachary 
---
M FLOSSbot/repository.py
1 file changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/FLOSSbot 
refs/changes/99/316699/1

diff --git a/FLOSSbot/repository.py b/FLOSSbot/repository.py
index 220d317..8b2036a 100644
--- a/FLOSSbot/repository.py
+++ b/FLOSSbot/repository.py
@@ -17,6 +17,7 @@
 import argparse
 import logging
 import re
+from urllib.parse import urlparse
 
 import pywikibot
 import requests
@@ -232,7 +233,21 @@
 return self.Q_Subversion
 if url.startswith('ftp://'):
 return self.Q_File_Transfer_Protocol
+if url.startswith('cvs://'):
+return self.Q_Concurrent_Versions_System
 return None
+
+def verify_cvs(self, url, credentials):
+parsed = urlparse(url)
+cvsroot = ':pserver:' + parsed.netloc + ':' + parsed.path
+return util.sh_bool("""
+set -e
+rm -fr /tmp/tmpclone
+mkdir -p /tmp/tmpclone
+cd /tmp/tmpclone
+timeout 30 cvs -d {cvsroot} -z3 get . || true
+test -d CVSROOT
+""".format(cvsroot=cvsroot))
 
 def verify_git(self, url):
 return util.sh_bool("timeout 30 git ls-remote " + url + " HEAD")
@@ -309,6 +324,8 @@
 return self.verify_http(url)
 elif protocol == self.Q_File_Transfer_Protocol:
 return self.verify_ftp(url)
+elif protocol == self.Q_Concurrent_Versions_System:
+return self.verify_cvs(url, credentials)
 return None
 
 def try_protocol(self, url, credentials):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied2516c4cee2ec6c70f8c9100ad822329aa92eed
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: plugin: make search_entity fail if entity not found

2016-10-18 Thread Dachary (Code Review)

Dachary has uploaded a new change for review.

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

Change subject: plugin: make search_entity fail if entity not found
..

plugin: make search_entity fail if entity not found

Change-Id: Ib3ee3d76d5420536b2a1853e55776d0566f32768
Signed-off-by: Loic Dachary 
---
M FLOSSbot/plugin.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/FLOSSbot 
refs/changes/98/316698/1

diff --git a/FLOSSbot/plugin.py b/FLOSSbot/plugin.py
index a4e04cf..963b010 100644
--- a/FLOSSbot/plugin.py
+++ b/FLOSSbot/plugin.py
@@ -130,7 +130,7 @@
 else:
 candidates.append(pywikibot.ItemPage(site, p['id'], 0))
 if len(candidates) == 0:
-return None
+raise ValueError("found no items for " + name)
 elif len(candidates) > 1 and kwargs['type'] == 'item':
 found = []
 for candidate in candidates:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3ee3d76d5420536b2a1853e55776d0566f32768
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: repository: s/Apache Subversion/Subversion/

2016-10-18 Thread Dachary (Code Review)

Dachary has uploaded a new change for review.

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

Change subject: repository: s/Apache Subversion/Subversion/
..

repository: s/Apache Subversion/Subversion/

It was renamed 
https://www.wikidata.org/w/index.php?title=Q46794=revision=387720392=384674412

Change-Id: Ia008e780014e379e17f8cdab5ef0a4d730768826
Signed-off-by: Loic Dachary 
---
M FLOSSbot/plugin.py
M FLOSSbot/repository.py
M tests/test_repository.py
3 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/FLOSSbot 
refs/changes/97/316697/1

diff --git a/FLOSSbot/plugin.py b/FLOSSbot/plugin.py
index ec770fa..a4e04cf 100644
--- a/FLOSSbot/plugin.py
+++ b/FLOSSbot/plugin.py
@@ -103,6 +103,7 @@
 'wikidata': {
 'git': 'Q186055',
 'Fossil': 'Q1439431',
+'Subversion': 'Q46794',
 },
 'test': {
 },
diff --git a/FLOSSbot/repository.py b/FLOSSbot/repository.py
index d8ef5a2..220d317 100644
--- a/FLOSSbot/repository.py
+++ b/FLOSSbot/repository.py
@@ -229,7 +229,7 @@
 if url.startswith('git://'):
 return self.Q_git
 if url.startswith('svn://'):
-return self.Q_Apache_Subversion
+return self.Q_Subversion
 if url.startswith('ftp://'):
 return self.Q_File_Transfer_Protocol
 return None
@@ -302,7 +302,7 @@
 return self.verify_fossil(url)
 elif protocol == self.Q_GNU_Bazaar:
 return self.verify_bzr(url)
-elif protocol == self.Q_Apache_Subversion:
+elif protocol == self.Q_Subversion:
 return self.verify_svn(url, credentials)
 elif (protocol == self.Q_Hypertext_Transfer_Protocol or
   protocol == self.Q_HTTPS):
@@ -317,7 +317,7 @@
 elif self.verify_hg(url):
 return self.Q_Mercurial
 elif self.verify_svn(url, credentials):
-return self.Q_Apache_Subversion
+return self.Q_Subversion
 elif self.verify_bzr(url):
 return self.Q_GNU_Bazaar
 elif self.verify_fossil(url):
diff --git a/tests/test_repository.py b/tests/test_repository.py
index bb703c6..246abac 100644
--- a/tests/test_repository.py
+++ b/tests/test_repository.py
@@ -81,7 +81,7 @@
 def test_guessproto__url_svn_schema(self):
 assert(
 self.r.guess_protocol_from_url('svn://example.org')
-== self.r.Q_Apache_Subversion)
+== self.r.Q_Subversion)
 
 def test_guessproto__url_ftp_schema(self):
 assert(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia008e780014e379e17f8cdab5ef0a4d730768826
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: repository: add bzr support

2016-10-18 Thread Dachary (Code Review)

Dachary has uploaded a new change for review.

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

Change subject: repository: add bzr support
..

repository: add bzr support

Change-Id: I64dcbc4ad6ccfebe53546a2b25425cfc29fc155b
Signed-off-by: Loic Dachary 
---
M FLOSSbot/repository.py
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/FLOSSbot 
refs/changes/00/316700/1

diff --git a/FLOSSbot/repository.py b/FLOSSbot/repository.py
index 8b2036a..205cf60 100644
--- a/FLOSSbot/repository.py
+++ b/FLOSSbot/repository.py
@@ -235,6 +235,8 @@
 return self.Q_File_Transfer_Protocol
 if url.startswith('cvs://'):
 return self.Q_Concurrent_Versions_System
+if url.startswith('bzr://'):
+return self.Q_GNU_Bazaar
 return None
 
 def verify_cvs(self, url, credentials):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64dcbc4ad6ccfebe53546a2b25425cfc29fc155b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Allow forceSearchIndex to ask for specific index to be used

2016-10-18 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

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

Change subject: Allow forceSearchIndex to ask for specific index to be used
..

Allow forceSearchIndex to ask for specific index to be used

Bug: T147957
Change-Id: I2144b684f6c43b9e48e026126f4b07b0ac4f9e66
---
M maintenance/forceSearchIndex.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 17e88eb..94544dd 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -103,6 +103,7 @@
'this with --indexOnSkip for the first half of the two 
phase index build.' );
$this->addOption( 'namespace', 'Only index pages in this given 
namespace', false, true );
$this->addOption( 'excludeContentTypes', 'Exclude pages of the 
specified content types. These must be a comma separated list of strings such 
as "wikitext" or "json" matching the CONTENT_MODEL_* constants.', false, true, 
false );
+   $this->addOption( 'useIndex', 'Use specific index when fetching 
IDs from the database.', false, true, false );
}
 
public function execute() {
@@ -445,6 +446,10 @@
"{$columnPrefix}_content_model NOT IN ($list)",
] );
}
+   if ( $this->hasOption( 'useIndex' ) ) {
+   $index = $this->getOption( 'useIndex' );
+   $it->addOptions( [ 'USE INDEX' => $index ] );
+   }
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2144b684f6c43b9e48e026126f4b07b0ac4f9e66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: [WIP] Remove index layer

2016-10-18 Thread Sbisson (Code Review)

Sbisson has uploaded a new change for review.

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

Change subject: [WIP] Remove index layer
..

[WIP] Remove index layer

Bug: T147058
Change-Id: I94fa23845797c94b84f062ffd97dce22a021e9c5
---
M includes/Data/ObjectLocator.php
1 file changed, 24 insertions(+), 21 deletions(-)


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

diff --git a/includes/Data/ObjectLocator.php b/includes/Data/ObjectLocator.php
index 8b326cd..171584e 100644
--- a/includes/Data/ObjectLocator.php
+++ b/includes/Data/ObjectLocator.php
@@ -53,7 +53,7 @@
$this->storage = $storage;
$this->indexes = $indexes;
$this->dbFactory = $dbFactory;
-   $this->lifecycleHandlers = array_merge( $indexes, 
$lifecycleHandlers );
+   $this->lifecycleHandlers = $lifecycleHandlers; //array_merge( 
$indexes, $lifecycleHandlers );
}
 
public function getMapper() {
@@ -84,24 +84,25 @@
$options['sort'] = ObjectManager::makeArray( 
$options['sort'] );
}
 
-   try {
-   $index = $this->getIndexFor( $keys, $options );
-   $res = $index->findMulti( $queries, $options );
-   } catch ( NoIndexException $e ) {
-   if ( array_search( 'topic_root_id', $keys ) ) {
-   wfDebugLog(
-   'Flow',
-   __METHOD__ . ': '
-   . json_encode( $keys ) . ' : '
-   . json_encode( $options ) . ' : '
-   . json_encode( array_map( 'get_class', 
$this->indexes ) )
-   );
-   \MWExceptionHandler::logException( $e );
-   } else {
-   wfDebugLog( 'FlowDebug', __METHOD__ . ': ' . 
$e->getMessage() );
-   }
-   $res = $this->storage->findMulti( 
$this->convertToDbQueries( $queries, $options ), $this->convertToDbOptions( 
$options ) );
-   }
+   $res = $this->storage->findMulti( $this->convertToDbQueries( 
$queries, $options ), $this->convertToDbOptions( $options ) );
+// try {
+// $index = $this->getIndexFor( $keys, $options );
+// $res = $index->findMulti( $queries, $options );
+// } catch ( NoIndexException $e ) {
+// if ( array_search( 'topic_root_id', $keys ) ) {
+// wfDebugLog(
+// 'Flow',
+// __METHOD__ . ': '
+// . json_encode( $keys ) . ' : '
+// . json_encode( $options ) . ' : '
+// . json_encode( array_map( 'get_class', 
$this->indexes ) )
+// );
+// \MWExceptionHandler::logException( $e );
+// } else {
+// wfDebugLog( 'FlowDebug', __METHOD__ . ': ' . 
$e->getMessage() );
+// }
+// $res = $this->storage->findMulti( 
$this->convertToDbQueries( $queries, $options ), $this->convertToDbOptions( 
$options ) );
+// }
 
$output = array();
foreach( $res as $index => $queryOutput ) {
@@ -127,7 +128,8 @@
 * @return bool
 */
public function found( array $attributes, array $options = array() ) {
-   return $this->foundMulti( array( $attributes ), $options );
+// return $this->foundMulti( array( $attributes ), $options );
+   return false;
}
 
/**
@@ -221,7 +223,8 @@
 * @return bool
 */
public function got( $id ) {
-   return $this->gotMulti( array( $id ) );
+// return $this->gotMulti( array( $id ) );
+   return false;
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94fa23845797c94b84f062ffd97dce22a021e9c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson 

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

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: plugin: use random name for tests

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: plugin: use random name for tests
..


plugin: use random name for tests

Do not use a fixed name (Q_git) to test entity creation because it will
race when running multiple tests at once.

Change-Id: Idcc8cbcbb53203ba2defe601aac344f935c4d816
Signed-off-by: Loic Dachary 
---
M tests/test_plugin.py
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index 8fe185a..253e027 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -49,11 +49,12 @@
 '--user=FLOSSbotCI',
 ])
 plugin = Plugin(bot, bot.args)
-item = plugin.Q_git
+name = 'Q_' + WikidataHelper.random_name()
+item = plugin.__getattribute__(name)
 assert 1 == len(plugin.bot.entities['item'])
 plugin.clear_entity_label(item.getID())
 assert 0 == len(plugin.bot.entities['item'])
-item = plugin.Q_git
+item = plugin.__getattribute__(name)
 assert 1 == len(plugin.bot.entities['item'])
 
 property2datatype = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idcc8cbcbb53203ba2defe601aac344f935c4d816
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 
Gerrit-Reviewer: Dachary 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: HTMLForm: Add OOUI support for 'multiselect' with 'dropdown'...

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: HTMLForm: Add OOUI support for 'multiselect' with 'dropdown' => 
true
..


HTMLForm: Add OOUI support for 'multiselect' with 'dropdown' => true

Using CapsuleMultiselectWidget.

Change-Id: I816739bc3acd40ee9d8b67e19ff3e4296fce66d3
---
M includes/htmlform/fields/HTMLMultiSelectField.php
M resources/src/mediawiki/htmlform/multiselect.js
2 files changed, 60 insertions(+), 10 deletions(-)

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



diff --git a/includes/htmlform/fields/HTMLMultiSelectField.php 
b/includes/htmlform/fields/HTMLMultiSelectField.php
index c9fcb09..fee5d63 100644
--- a/includes/htmlform/fields/HTMLMultiSelectField.php
+++ b/includes/htmlform/fields/HTMLMultiSelectField.php
@@ -120,6 +120,8 @@
 * @return OOUI\CheckboxMultiselectInputWidget
 */
public function getInputOOUI( $value ) {
+   $this->mParent->getOutput()->addModules( 'oojs-ui-widgets' );
+
$attr = $this->getTooltipAndAccessKey();
$attr['id'] = $this->mID;
$attr['name'] = "{$this->mName}[]";
diff --git a/resources/src/mediawiki/htmlform/multiselect.js 
b/resources/src/mediawiki/htmlform/multiselect.js
index a8786ef..9ab2532 100644
--- a/resources/src/mediawiki/htmlform/multiselect.js
+++ b/resources/src/mediawiki/htmlform/multiselect.js
@@ -32,9 +32,9 @@
 
function convertCheckboxesToMulti( $oldContainer, type ) {
var $fieldLabel = $( '' ),
-   $td = $( '' ),
-   $fieldLabelText = $( '' ),
-   $container;
+   $td = $( '' ),
+   $fieldLabelText = $( '' ),
+   $container;
if ( type === 'tr' ) {
addMulti( $oldContainer, $td );
$container = $( '' );
@@ -52,14 +52,62 @@
return $container;
}
 
+   function convertCheckboxesWidgetToCapsules( fieldLayout ) {
+   var checkboxesWidget, checkboxesOptions, capsulesOptions, 
capsulesWidget;
+
+   checkboxesWidget = fieldLayout.fieldWidget;
+   checkboxesOptions = 
checkboxesWidget.checkboxMultiselectWidget.getItems();
+   capsulesOptions = checkboxesOptions.map( function ( option ) {
+   return new OO.ui.MenuOptionWidget( {
+   data: option.getData(),
+   label: option.getLabel()
+   } );
+   } );
+   capsulesWidget = new OO.ui.CapsuleMultiselectWidget( {
+   menu: {
+   items: capsulesOptions
+   }
+   } );
+   capsulesWidget.setItemsFromData( checkboxesWidget.getValue() );
+
+   // Data from CapsuleMultiselectWidget will not be submitted 
with the form, so keep the original
+   // CheckboxMultiselectInputWidget up-to-date.
+   capsulesWidget.on( 'change', function () {
+   checkboxesWidget.setValue( 
capsulesWidget.getItemsData() );
+   } );
+
+   // Hide original widget and add new one in its place. This is a 
bit hacky, since the FieldLayout
+   // still thinks it's connected to the old widget.
+   checkboxesWidget.toggle( false );
+   checkboxesWidget.$element.after( capsulesWidget.$element );
+   }
+
mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
-   if ( $root.find( '.mw-htmlform-dropdown' ).length ) {
-   mw.loader.using( 'jquery.chosen', function () {
-   $root.find( '.mw-htmlform-dropdown' ).each( 
function () {
-   var type = this.nodeName.toLowerCase(),
-   $converted = 
convertCheckboxesToMulti( $( this ), type );
-   $converted.find( 
'.htmlform-chzn-select' ).chosen( { width: 'auto' } );
-   } );
+   var $dropdowns = $root.find( 
'.mw-htmlform-field-HTMLMultiSelectField.mw-htmlform-dropdown' );
+   if ( $dropdowns.length ) {
+   $dropdowns.each( function () {
+   var $el = $( this ),
+   data, modules, extraModules;
+   if ( $el.is( '[data-ooui]' ) ) {
+   // Load 'oojs-ui-widgets' for 
CapsuleMultiselectWidget
+   modules = [ 'mediawiki.htmlform.ooui', 
'oojs-ui-widgets' ];
+   data = $el.data( 'mw-modules' );
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow BatchRowIterator to also set query options.

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Allow BatchRowIterator to also set query options.
..


Allow BatchRowIterator to also set query options.

Change-Id: I15927c5b7f1edcfb40edd3cda9257b40d0276073
---
M includes/utils/BatchRowIterator.php
1 file changed, 14 insertions(+), 1 deletion(-)

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



diff --git a/includes/utils/BatchRowIterator.php 
b/includes/utils/BatchRowIterator.php
index 602587c..ef2c14a 100644
--- a/includes/utils/BatchRowIterator.php
+++ b/includes/utils/BatchRowIterator.php
@@ -78,6 +78,11 @@
private $key;
 
/**
+* @var array Additional query options
+*/
+   protected $options = [];
+
+   /**
 * @param IDatabase $db The database to read from
 * @param string|array $table  The name or names of the table to 
read from
 * @param string|array $primaryKey The name or names of the primary key 
columns
@@ -102,6 +107,14 @@
 */
public function addConditions( array $conditions ) {
$this->conditions = array_merge( $this->conditions, $conditions 
);
+   }
+
+   /**
+* @param array $options Query options suitable for use with
+*  IDatabase::select
+*/
+   public function addOptions( array $options ) {
+   $this->options = array_merge( $this->options, $options );
}
 
/**
@@ -199,7 +212,7 @@
[
'LIMIT' => $this->batchSize,
'ORDER BY' => $this->orderBy,
-   ],
+   ] + $this->options,
$this->joinConditions
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15927c5b7f1edcfb40edd3cda9257b40d0276073
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
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] pywikibot...FLOSSbot[master]: plugin: use random name for tests

2016-10-18 Thread Dachary (Code Review)

Dachary has uploaded a new change for review.

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

Change subject: plugin: use random name for tests
..

plugin: use random name for tests

Do not use a fixed name (Q_git) to test entity creation because it will
race when running multiple tests at once.

Change-Id: Idcc8cbcbb53203ba2defe601aac344f935c4d816
Signed-off-by: Loic Dachary 
---
M tests/test_plugin.py
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/FLOSSbot 
refs/changes/50/316650/1

diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index 8fe185a..253e027 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -49,11 +49,12 @@
 '--user=FLOSSbotCI',
 ])
 plugin = Plugin(bot, bot.args)
-item = plugin.Q_git
+name = 'Q_' + WikidataHelper.random_name()
+item = plugin.__getattribute__(name)
 assert 1 == len(plugin.bot.entities['item'])
 plugin.clear_entity_label(item.getID())
 assert 0 == len(plugin.bot.entities['item'])
-item = plugin.Q_git
+item = plugin.__getattribute__(name)
 assert 1 == len(plugin.bot.entities['item'])
 
 property2datatype = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcc8cbcbb53203ba2defe601aac344f935c4d816
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Small fixes

2016-10-18 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Small fixes
..


Small fixes

Change-Id: If34b68a17eb32ebcf8e88b899eea8fa7a8f6bd9c
---
M CargoQueryDisplayer.php
M CargoUtils.php
M maintenance/setCargoPageData.php
3 files changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/CargoQueryDisplayer.php b/CargoQueryDisplayer.php
index 06e0c31..4572a10 100644
--- a/CargoQueryDisplayer.php
+++ b/CargoQueryDisplayer.php
@@ -144,7 +144,7 @@
// cool, but those are apparently far
// from universal symbols.
$text = ( $value == true ) ? wfMessage( 
'htmlform-yes' )->text() : wfMessage( 'htmlform-no' )->text();
-   } elseif ( $fieldType == 'Searchtext' && 
array_key_exists( $fieldName, $this->mSQLQuery->mSearchTerms ) ) {
+   } elseif ( $fieldType == 'Searchtext' && 
$this->mSQLQuery && array_key_exists( $fieldName, 
$this->mSQLQuery->mSearchTerms ) ) {
$searchTerms = 
$this->mSQLQuery->mSearchTerms[$fieldName];
$text = Html::rawElement( 'span', 
array( 'class' => 'searchresult' ), self::getTextSnippet( $value, $searchTerms 
) );
} else {
diff --git a/CargoUtils.php b/CargoUtils.php
index a3eaa83..8d9076a 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -579,9 +579,8 @@
$createSQL .= ', ' . $cdb->addIdentifierQuotes( 
$fieldName . '__lon' ) . ' ';
$createSQL .= $floatTypeString;
} elseif ( $fieldType == 'Date' || $fieldType == 
'Datetime' ) {
-   $integerTypeString = self::fieldTypeToSQLType( 
'Integer', $dbType );
$createSQL .= ", " . $cdb->addIdentifierQuotes( 
$fieldName . '__precision' ) . ' ';
-   $createSQL .= $integerTypeString;
+   $createSQL .= $intTypeString;
} elseif ( $fieldType == 'Searchtext' ) {
$createSQL .= ", FULLTEXT KEY $fieldName (" . 
$cdb->addIdentifierQuotes( $fieldName ) . ')';
$containsSearchTextType = true;
diff --git a/maintenance/setCargoPageData.php b/maintenance/setCargoPageData.php
index eebf5b3..8d57508 100644
--- a/maintenance/setCargoPageData.php
+++ b/maintenance/setCargoPageData.php
@@ -35,7 +35,7 @@
public function __construct() {
parent::__construct();
 
-   $this->mDescription = "Stores a set of data each page in the 
wiki in one or more database tables, for use within Cargo queries.";
+   $this->mDescription = "Stores a set of data for each page in 
the wiki in one or more database tables, for use within Cargo queries.";
 
$this->addOption( "delete", "Delete the page data DB table(s)", 
false, false );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If34b68a17eb32ebcf8e88b899eea8fa7a8f6bd9c
Gerrit-PatchSet: 2
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] mediawiki...Cargo[master]: Small fixes

2016-10-18 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

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

Change subject: Small fixes
..

Small fixes

Change-Id: If34b68a17eb32ebcf8e88b899eea8fa7a8f6bd9c
---
M CargoQueryDisplayer.php
M CargoUtils.php
M maintenance/setCargoPageData.php
3 files changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/25/316625/2

diff --git a/CargoQueryDisplayer.php b/CargoQueryDisplayer.php
index 06e0c31..4572a10 100644
--- a/CargoQueryDisplayer.php
+++ b/CargoQueryDisplayer.php
@@ -144,7 +144,7 @@
// cool, but those are apparently far
// from universal symbols.
$text = ( $value == true ) ? wfMessage( 
'htmlform-yes' )->text() : wfMessage( 'htmlform-no' )->text();
-   } elseif ( $fieldType == 'Searchtext' && 
array_key_exists( $fieldName, $this->mSQLQuery->mSearchTerms ) ) {
+   } elseif ( $fieldType == 'Searchtext' && 
$this->mSQLQuery && array_key_exists( $fieldName, 
$this->mSQLQuery->mSearchTerms ) ) {
$searchTerms = 
$this->mSQLQuery->mSearchTerms[$fieldName];
$text = Html::rawElement( 'span', 
array( 'class' => 'searchresult' ), self::getTextSnippet( $value, $searchTerms 
) );
} else {
diff --git a/CargoUtils.php b/CargoUtils.php
index a3eaa83..8d9076a 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -579,9 +579,8 @@
$createSQL .= ', ' . $cdb->addIdentifierQuotes( 
$fieldName . '__lon' ) . ' ';
$createSQL .= $floatTypeString;
} elseif ( $fieldType == 'Date' || $fieldType == 
'Datetime' ) {
-   $integerTypeString = self::fieldTypeToSQLType( 
'Integer', $dbType );
$createSQL .= ", " . $cdb->addIdentifierQuotes( 
$fieldName . '__precision' ) . ' ';
-   $createSQL .= $integerTypeString;
+   $createSQL .= $intTypeString;
} elseif ( $fieldType == 'Searchtext' ) {
$createSQL .= ", FULLTEXT KEY $fieldName (" . 
$cdb->addIdentifierQuotes( $fieldName ) . ')';
$containsSearchTextType = true;
diff --git a/maintenance/setCargoPageData.php b/maintenance/setCargoPageData.php
index eebf5b3..8d57508 100644
--- a/maintenance/setCargoPageData.php
+++ b/maintenance/setCargoPageData.php
@@ -35,7 +35,7 @@
public function __construct() {
parent::__construct();
 
-   $this->mDescription = "Stores a set of data each page in the 
wiki in one or more database tables, for use within Cargo queries.";
+   $this->mDescription = "Stores a set of data for each page in 
the wiki in one or more database tables, for use within Cargo queries.";
 
$this->addOption( "delete", "Delete the page data DB table(s)", 
false, false );
}

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Fix ButtonElement's `:active:focus` state v...

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: MediaWiki theme: Fix ButtonElement's `:active:focus` state 
visually
..


MediaWiki theme: Fix ButtonElement's `:active:focus` state visually

When the ButtonElement is using a `` element, due to different
state handling by browsers, `:active:focus` can be visually irritating.
The ButtonElement shouldn't get `:focus` outline while actively
pressed. Visible example in Special:Redirect/file
Also adding ButtonInputWidget using `` element demo and featuring
just one primary submit button.
Additionally removing unnecessary `.oo-ui-widget-enabled` selectors as
those mixins get called just within enabled block.

Change-Id: I8f50e3668c451b51145e0e5efe571fe584b33e62
---
M demos/pages/widgets.js
M demos/pages/widgets.php
M src/themes/mediawiki/elements.less
3 files changed, 90 insertions(+), 69 deletions(-)

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



diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 2ab84bb..c0a0285 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1451,17 +1451,8 @@
new OO.ui.FieldLayout(
new OO.ui.ButtonInputWidget( {
label: 'Submit the form',
-   type: 'submit'
-   } ),
-   {
-   align: 'top',
-   label: 'ButtonInputWidget'
-   }
-   ),
-   new OO.ui.FieldLayout(
-   new OO.ui.ButtonInputWidget( {
-   label: 'Submit the form',
type: 'submit',
+   flags: [ 'primary', 
'progressive' ],
useInputTag: true
} ),
{
@@ -1471,9 +1462,19 @@
),
new OO.ui.FieldLayout(
new OO.ui.ButtonInputWidget( {
+   label: 'Another button',
+   type: 'button'
+   } ),
+   {
+   align: 'top',
+   label: 'ButtonInputWidget 
(using )\u200E'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.ButtonInputWidget( {
framed: false,
-   label: 'Submit the form',
-   type: 'submit'
+   label: 'Another button',
+   type: 'button'
} ),
{
align: 'top',
@@ -1483,8 +1484,8 @@
new OO.ui.FieldLayout(
new OO.ui.ButtonInputWidget( {
framed: false,
-   label: 'Submit the form',
-   type: 'submit',
+   label: 'Another button',
+   type: 'button',
useInputTag: true
} ),
{
diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php
index b93ce11..10584d4 100644
--- a/demos/pages/widgets.php
+++ b/demos/pages/widgets.php
@@ -704,23 +704,47 @@
new OOUI\FieldLayout(
new OOUI\ButtonInputWidget( [
'label' => 'Submit the form',
-   'type' => 'submit'
-   ] ),
-   [
-   'align' => 'top',
-   'label' => "ButtonInputWidget\xE2\x80\x8E"
-   ]
-   ),
-   new OOUI\FieldLayout(
-   new OOUI\ButtonInputWidget( [
-   'label' => 'Submit the form',
'type' => 'submit',
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Gallery: Use intrinsic width for gallery to center caption

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Gallery: Use intrinsic width for gallery to center caption
..


Gallery: Use intrinsic width for gallery to center caption

Currently the caption is always centered between the whole width of the browser.
When there are only a few images the caption is not on top of the images.
This change shrinks the gallery to its intrinsic width. The caption is now
centered on top of the images.

This patch does not support Internet Explorer.

Bug: T29540
Change-Id: I145b120183ef151cec98aa75f030d63a191bf9ac
---
M resources/src/mediawiki/page/gallery.css
1 file changed, 3 insertions(+), 0 deletions(-)

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

Objections:
  Jforrester: There's a problem with this change, please improve



diff --git a/resources/src/mediawiki/page/gallery.css 
b/resources/src/mediawiki/page/gallery.css
index 3c80bbb..e834e28 100644
--- a/resources/src/mediawiki/page/gallery.css
+++ b/resources/src/mediawiki/page/gallery.css
@@ -17,6 +17,9 @@
margin: 2px;
padding: 2px;
display: block;
+   width: -moz-fit-content;
+   width: -webkit-fit-content;
+   width: fit-content;
 }
 
 li.gallerycaption {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I145b120183ef151cec98aa75f030d63a191bf9ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Change-Prop: Require libsasl2-dev package.

2016-10-18 Thread jenkins-bot (Code Review)

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

Change subject: Change-Prop: Require libsasl2-dev package.
..


Change-Prop: Require libsasl2-dev package.

node-rdkafka driver uses librdkafka which requires a libsasl2-dev
package to be built by default. require the package in the puppet
role.

Bug: T148575
Change-Id: I2a0b1658c3518370a15ad087bd6f11ddb73d5c44
---
M puppet/modules/changeprop/manifests/init.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/changeprop/manifests/init.pp 
b/puppet/modules/changeprop/manifests/init.pp
index 29ea5a4..5567991 100644
--- a/puppet/modules/changeprop/manifests/init.pp
+++ b/puppet/modules/changeprop/manifests/init.pp
@@ -16,6 +16,8 @@
 $log_level = undef,
 ) {
 
+require_package('libsasl2-dev')
+
 $restbase_port = defined(Class['restbase']) ? {
 true=> $::restbase::port,
 default => 7231,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a0b1658c3518370a15ad087bd6f11ddb73d5c44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Change-Prop: Require libsasl2-dev package.

2016-10-18 Thread Ppchelko (Code Review)

Ppchelko has uploaded a new change for review.

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

Change subject: Change-Prop: Require libsasl2-dev package.
..

Change-Prop: Require libsasl2-dev package.

node-rdkafka driver uses librdkafka which requires a libsasl2-dev
package to be built by default. require the package in the puppet
role.

Bug: T148575
Change-Id: I2a0b1658c3518370a15ad087bd6f11ddb73d5c44
---
M puppet/modules/changeprop/manifests/init.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/23/316623/1

diff --git a/puppet/modules/changeprop/manifests/init.pp 
b/puppet/modules/changeprop/manifests/init.pp
index 29ea5a4..5567991 100644
--- a/puppet/modules/changeprop/manifests/init.pp
+++ b/puppet/modules/changeprop/manifests/init.pp
@@ -16,6 +16,8 @@
 $log_level = undef,
 ) {
 
+require_package('libsasl2-dev')
+
 $restbase_port = defined(Class['restbase']) ? {
 true=> $::restbase::port,
 default => 7231,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Enable jvm heap log to debug gerrit slowing down

2016-10-18 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Enable jvm heap log to debug gerrit slowing down
..

Enable jvm heap log to debug gerrit slowing down

This enables the jvm heap log to see if jvm gc is causing gerrit's
slowness.

Bug: T148478
Change-Id: Ia7cdde9140bf1739e05ca885814466b82684e00c
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
A modules/gerrit/templates/gerrit_head_log.erb
3 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/316622/1

diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 9f35328..475d666 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -102,6 +102,13 @@
 require => File['/var/lib/gerrit2/review_site/etc'],
 }
 
+file { '/var/log/gerrit/gerrit_heap_log':
+content => template('gerrit/gerrit_heap_log.erb'),
+owner   => 'gerrit2',
+group   => 'gerrit2',
+mode=> '0660',
+}
+
 if $ssh_host_key != undef {
 file { '/var/lib/gerrit2/review_site/etc/ssh_host_key':
 content => secret("gerrit/${ssh_host_key}"),
diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 07d85e3..0cf3add 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -34,7 +34,7 @@
 [container]
 user = gerrit2
 javaHome = /usr/lib/jvm/java-7-openjdk-amd64/jre
-javaOptions = 
-Dlog4j.configuration=file:///var/lib/gerrit2/review_site/etc/log4j.properties
+javaOptions = -XX:+HeapDumpOnOutOfMemoryError 
-XX:HeapDumpPath=file:///var/lib/gerrit2/review_site/etc/gerrit_heap_log 
-Dlog4j.configuration=file:///var/lib/gerrit2/review_site/etc/log4j.properties
 heapLimit = <%= @heap_limit %>
 slave = <%= @slave %>
 [sshd]
diff --git a/modules/gerrit/templates/gerrit_head_log.erb 
b/modules/gerrit/templates/gerrit_head_log.erb
new file mode 100644
index 000..111eaa4
--- /dev/null
+++ b/modules/gerrit/templates/gerrit_head_log.erb
@@ -0,0 +1,2 @@
+# jvm heap log for gerrit
+

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_26]: Disallow css attr() with url type

2016-10-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Disallow css attr() with url type
..

Disallow css attr() with url type

CSS3 seems like it will extend the attr() function which can interpret
attribute as different types, including 'url', which "...is interpreted
as a quoted string within the ‘url()’ notation."

Currently no browsers support this syntax yet, so submitting this
as a normal non-security patch.

Bug: T68404
Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
---
M RELEASE-NOTES-1.26
M includes/Sanitizer.php
M tests/phpunit/includes/SanitizerTest.php
3 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/316621/1

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index f5f2936..7dd56a7 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -1,6 +1,13 @@
 Security reminder: If you have PHP's register_globals option set, you must
 turn it off. MediaWiki will not work with it enabled.
 
+== MediaWiki 1.26.5 ==
+This is not yet a release!
+
+=== Changes since 1.26.4 ===
+* (T68404) CSS3 attr() function with url type is no longer allowed
+  in inline styles.
+
 == MediaWiki 1.26.4 ==
 
 This is a maintenance release of the MediaWiki 1.26 branch.
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index de63af7..15ea9b2 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -974,6 +974,7 @@
| url\s*\(
| image\s*\(
| image-set\s*\(
+   | attr\s*\([^)]+[\s,]+url
!ix', $value ) ) {
return '/* insecure input */';
}
diff --git a/tests/phpunit/includes/SanitizerTest.php 
b/tests/phpunit/includes/SanitizerTest.php
index d3dc512..3ebf8a2 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -314,6 +314,8 @@
'/* insecure input */',
'background-image: -moz-image-set("asdf.png" 
1x, "asdf.png" 2x);'
),
+   array( '/* insecure input */', 'foo: attr( title, url 
);' ),
+   array( '/* insecure input */', 'foo: attr( title url 
);' ),
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_26
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: CSteipp 

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Initial commit

2016-10-18 Thread Legoktm (Code Review)

Legoktm has submitted this change and it was merged.

Change subject: Initial commit
..


Initial commit

This configures a MediaWiki extension to recieve Parsoid's lint errors
and expose them to users.

Change-Id: Ie0776aecf145eb1c87c2a539ddf3ea8d35a899f5
---
A .gitignore
A .jscsrc
A .jshintignore
A .jshintrc
A COPYING
A Gruntfile.js
A README
A composer.json
A extension.json
A i18n/en.json
A i18n/qqq.json
A includes/ApiQueryLintErrors.php
A includes/ApiRecordLint.php
A includes/Database.php
A includes/Hooks.php
A includes/LintError.php
A includes/LintErrorsPager.php
A includes/SpecialLintErrors.php
A linter.sql
A modules/ext.linter.edit.js
A package.json
A phpcs.xml
22 files changed, 1,409 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..b4919db
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.svn
+*~
+*.kate-swp
+.*.swp
+composer.lock
+vendor
+node_modules/
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..8305d61
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,4 @@
+{
+   "preset": "wikimedia",
+   "es3": true
+}
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..3c3629e
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..66e3d48
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,24 @@
+{
+   // Enforcing
+   "bitwise": true,
+   "eqeqeq": true,
+   "freeze": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "undef": true,
+   "unused": true,
+   "strict": false,
+
+   // Relaxing
+   "es5": false,
+
+   // Environment
+   "browser": true,
+   "jquery": true,
+
+   "globals": {
+   "mediaWiki": false,
+   "OO": false
+   }
+}
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying,

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: add RELEASE notes for 28417328 (CSS3 attr() is banned)

2016-10-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: add RELEASE notes for 28417328 (CSS3 attr() is banned)
..

add RELEASE notes for 28417328 (CSS3 attr() is banned)

Change-Id: Ie42cb63072520f347393e7dbaaec381c6e106c1e
---
M RELEASE-NOTES-1.28
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/316620/1

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 75fc139..63f810b 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -229,6 +229,8 @@
 * The ArticleAfterFetchContent, ArticleInsertComplete, ArticleSave, 
ArticleSaveComplete,
   ArticleViewCustom, EditFilterMerged, EditPageGetDiffText, 
EditPageGetPreviewText and
   ShowRawCssJs hooks will now emit deprecation warnings if used.
+* (T68404) CSS3 attr() function with multiple arguments is no longer allowed
+  in inline styles.
 
 == Compatibility ==
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie42cb63072520f347393e7dbaaec381c6e106c1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Correct and simplify EventLogging monitoring

2016-10-18 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Correct and simplify EventLogging monitoring
..


Correct and simplify EventLogging monitoring

EventLogging monitoring was incorrectly calculating the difference
between valid and invalid events.  The valid event metric included
EventError which is a kafka topic where invalid events are sent.  This
fixes that and also removes the use of server-side event monitoring or
mention in role::eventlogging.

Bug: T147321
Change-Id: I8b7aadecb9cf2ef43f2b7a4a638d797271dfac9e
---
M manifests/role/eventlogging.pp
M modules/eventlogging/manifests/monitoring/graphite.pp
2 files changed, 14 insertions(+), 18 deletions(-)

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



diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 2845f8d..f3086ce 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -55,9 +55,8 @@
 # to your query params.
 $kafka_base_uri= inline_template('kafka:///<%= 
@kafka_brokers_array.join(":9092,") + ":9092" %>')
 
-# Read in server side and client side raw events from
-# Kafka, process them, and send events to schema
-# based topics in Kafka.
+# Read in raw events from Kafka, process them, and send them to
+# the schema corresponding to their topic in Kafka.
 $kafka_schema_uri  = "${kafka_base_uri}?topic=eventlogging_{schema}"
 
 # The downstream eventlogging MySQL consumer expects schemas to be
@@ -70,7 +69,6 @@
 default => 
"${kafka_base_uri}?topic=eventlogging-valid-mixed=${mixed_schema_blacklist}"
 }
 
-$kafka_server_side_raw_uri = 
"${kafka_base_uri}?topic=eventlogging-server-side"
 $kafka_client_side_raw_uri = 
"${kafka_base_uri}?topic=eventlogging-client-side"
 
 # This check was written for eventlog1001, so only include it there.,
diff --git a/modules/eventlogging/manifests/monitoring/graphite.pp 
b/modules/eventlogging/manifests/monitoring/graphite.pp
index 5fc9dd0..0275a4d 100644
--- a/modules/eventlogging/manifests/monitoring/graphite.pp
+++ b/modules/eventlogging/manifests/monitoring/graphite.pp
@@ -9,8 +9,9 @@
 #kafka::server::jmxtrans
 #
 class eventlogging::monitoring::graphite($kafka_brokers_graphite_wildcard) {
-$raw_events_rate_metric   = 
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.{eventlogging-client-side,eventlogging-server-side}.OneMinuteRate)"
-$valid_events_rate_metric = 
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging_*.OneMinuteRate)"
+$raw_events_rate_metric   = 
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging-client-side.OneMinuteRate)"
+$error_events_rate_metric = 
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging_EventError.OneMinuteRate)"
+$navigation_timing_events_rate_metric = 
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging_NavigationTiming.OneMinuteRate)"
 
 # Warn if 15% of overall event throughput goes beyond 1000 events/s
 # in a 15 min period.
@@ -28,7 +29,6 @@
 # Alarms if 15% of Navigation Timing event throughput goes under 1 req/sec
 # in a 15 min period
 # https://meta.wikimedia.org/wiki/Schema:NavigationTiming
-$navigation_timing_events_rate_metric = 
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging_NavigationTiming.OneMinuteRate)"
 monitoring::graphite_threshold { 
'eventlogging_NavigationTiming_throughput':
 description   => 'Throughput of EventLogging NavigationTiming events',
 metric=> $navigation_timing_events_rate_metric,
@@ -40,19 +40,17 @@
 under => true
 }
 
-# Warn/Alert if the difference between raw and valid EventLogging
-# alerts gets too big.  We put a 10 minute lag because of metrics
-# not being correct in graphite before.
-# If the difference gets too big, either the validation step is
-# overloaded, or high volume schemas are failing validation.
-monitoring::graphite_threshold { 'eventlogging_difference_raw_validated':
-description   => 'Difference between raw and validated EventLogging 
overall message rates',
-metric=> 
"absolute(diffSeries(${raw_events_rate_metric},${valid_events_rate_metric}))",
+# Warn if 15% of overall error event throughput goes above 20 events/s
+# in a 15 minute period.
+# The EventError topic counted here

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove ~ori/.hushlogin

2016-10-18 Thread Ori.livneh (Code Review)

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

Change subject: Remove ~ori/.hushlogin
..


Remove ~ori/.hushlogin

Hiding the MOTD banners isn't optimal when they are used to signal
things like the active deployment server.

Change-Id: I400c4c26fc87dc35886afed92307821a212f17dd
---
D modules/admin/files/home/ori/.hushlogin
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/files/home/ori/.hushlogin 
b/modules/admin/files/home/ori/.hushlogin
deleted file mode 100644
index e69de29..000
--- a/modules/admin/files/home/ori/.hushlogin
+++ /dev/null

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I400c4c26fc87dc35886afed92307821a212f17dd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow BatchRowIterator to also set query options.

2016-10-18 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review.

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

Change subject: Allow BatchRowIterator to also set query options.
..

Allow BatchRowIterator to also set query options.

Change-Id: I15927c5b7f1edcfb40edd3cda9257b40d0276073
---
M includes/utils/BatchRowIterator.php
1 file changed, 16 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/316619/1

diff --git a/includes/utils/BatchRowIterator.php 
b/includes/utils/BatchRowIterator.php
index 9fc2431..b006e02 100644
--- a/includes/utils/BatchRowIterator.php
+++ b/includes/utils/BatchRowIterator.php
@@ -78,6 +78,11 @@
private $key;
 
/**
+* @var array Additional query options
+*/
+   protected $options = [];
+
+   /**
 * @param IDatabase $db The database to read from
 * @param string|array $table  The name or names of the table to 
read from
 * @param string|array $primaryKey The name or names of the primary key 
columns
@@ -97,7 +102,7 @@
}
 
/**
-* @param array $condition Query conditions suitable for use with
+* @param array $conditions Query conditions suitable for use with
 *  IDatabase::select
 */
public function addConditions( array $conditions ) {
@@ -105,7 +110,15 @@
}
 
/**
-* @param array $condition Query join conditions suitable for use
+* @param array $options Query options suitable for use with
+*  IDatabase::select
+*/
+   public function addOptions( array $options ) {
+   $this->options = array_merge( $this->options, $options );
+   }
+
+   /**
+* @param array $conditions Query join conditions suitable for use
 *  with IDatabase::select
 */
public function addJoinConditions( array $conditions ) {
@@ -199,7 +212,7 @@
[
'LIMIT' => $this->batchSize,
'ORDER BY' => $this->orderBy,
-   ],
+   ] + $this->options,
$this->joinConditions
);
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Disallow css attr() with url type

2016-10-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Disallow css attr() with url type
..

Disallow css attr() with url type

CSS3 seems like it will extend the attr() function which can interpret
attribute as different types, including 'url', which "...is interpreted
as a quoted string within the ‘url()’ notation."

Currently no browsers support this syntax yet, so submitting this
as a normal non-security patch.

Bug: T68404
Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
(cherry picked from commit 284173282d4fc25031b6ded0f696c46ecbf97338)
---
M includes/Sanitizer.php
M tests/phpunit/includes/SanitizerTest.php
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/316618/1

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index d321e9f..1d46e4e 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -983,6 +983,7 @@
| url\s*\(
| image\s*\(
| image-set\s*\(
+   | attr\s*\([^)]+[\s,]+url
!ix', $value ) ) {
return '/* insecure input */';
}
diff --git a/tests/phpunit/includes/SanitizerTest.php 
b/tests/phpunit/includes/SanitizerTest.php
index 72d7166..8bc7933 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -314,6 +314,8 @@
'/* insecure input */',
'background-image: -moz-image-set("asdf.png" 
1x, "asdf.png" 2x);'
],
+   [ '/* insecure input */', 'foo: attr( title, url );' ],
+   [ '/* insecure input */', 'foo: attr( title url );' ],
];
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdae989764754c985a9292d62efae7cc47009df5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: CSteipp 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add dotall modifier to EDITSECTION_REGEX

2016-10-18 Thread Tim Starling (Code Review)

Tim Starling has uploaded a new change for review.

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

Change subject: Add dotall modifier to EDITSECTION_REGEX
..

Add dotall modifier to EDITSECTION_REGEX

The regex failed to match for input text like

==
==

resulting in  tags being leaked into the output.

Change-Id: I3daade920d2de8cd3fc31fcaabf46ffe14b047d5
---
M includes/parser/ParserOutput.php
M tests/parser/parserTests.txt
2 files changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/316617/1

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 9dfa97c..e9cdfcf 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -213,7 +213,7 @@
private $mMaxAdaptiveExpiry = INF;
 
const EDITSECTION_REGEX =
-   '#<(?:mw:)?editsection page="(.*?)" 
section="(.*?)"(?:/>|>(.*?)())#';
+   '#<(?:mw:)?editsection page="(.*?)" 
section="(.*?)"(?:/>|>(.*?)())#s';
 
// finalizeAdaptiveCacheExpiry() uses TTL = MAX( m * PARSE_TIME + b, 
MIN_AR_TTL)
// Current values imply that m=3933.33 and b=-333.33
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index ba7b0d4..e12bc03 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -514,6 +514,17 @@
 !! end
 
 !! test
+Heading with line break in nowiki
+!! wikitext
+== A B
+C ==
+!! html
+A B
+C[edit]
+
+!! end
+
+!! test
 Parsing an URL
 !! wikitext
 http://fr.wikipedia.org/wiki/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3daade920d2de8cd3fc31fcaabf46ffe14b047d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] operations...linux44[master]: Add patch for CVE-2016-7042

2016-10-18 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Add patch for CVE-2016-7042
..


Add patch for CVE-2016-7042

Change-Id: I92d77e50770ba459b99e4ba434cc810bc1b4f45f
---
M debian/changelog
A debian/patches/bugfix/all/CVE-2016-7042.patch
M debian/patches/series
3 files changed, 62 insertions(+), 1 deletion(-)

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



diff --git a/debian/changelog b/debian/changelog
index e279c41..652b851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,10 @@
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.24
   * Update to 4.4.25:
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.25
+  * Add patch by Vladis Dronov to address CVE-2016-7042 (not yet
+merged upstream)
 
- -- Moritz Muehlenhoff   Mon, 17 Oct 2016 10:00:33 
+0200
+ -- Moritz Muehlenhoff   Tue, 18 Oct 2016 21:33:33 
+0200
 
 linux (4.4.2-3+wmf5) jessie-wikimedia; urgency=medium
 
diff --git a/debian/patches/bugfix/all/CVE-2016-7042.patch 
b/debian/patches/bugfix/all/CVE-2016-7042.patch
new file mode 100644
index 000..5257ea9
--- /dev/null
+++ b/debian/patches/bugfix/all/CVE-2016-7042.patch
@@ -0,0 +1,58 @@
+KEYS: Fix short sprintf buffer in /proc/keys show function
+
+Fix a short sprintf buffer in proc_keys_show().  If the gcc stack protector
+is turned on, this can cause a panic due to stack corruption.
+
+The problem is that xbuf[] is not big enough to hold a 64-bit timeout
+rendered as weeks:
+
+   (gdb) p 0xULL/(60*60*24*7)
+   $2 = 30500568904943
+
+That's 14 chars plus NUL, not 11 chars plus NUL.
+
+Expand the buffer to 16 chars.
+
+I think the unpatched code apparently works if the stack-protector is not
+enabled because on a 32-bit machine the buffer won't be overflowed and on a
+64-bit machine there's a 64-bit aligned pointer at one side and an int that
+isn't checked again on the other side.
+
+The panic incurred looks something like:
+
+Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: 
81352ebe
+CPU: 0 PID: 1692 Comm: reproducer Not tainted 4.7.2-201.fc24.x86_64 #1
+Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011
+ 0086 fbbd2679 8800a044bc00 813d941f
+ 81a28d58 8800a044bc98 8800a044bc88 811b2cb6
+ 8810 8800a044bc98 8800a044bc30 fbbd2679
+Call Trace:
+ [] dump_stack+0x63/0x84
+ [] panic+0xde/0x22a
+ [] ? proc_keys_show+0x3ce/0x3d0
+ [] __stack_chk_fail+0x19/0x30
+ [] proc_keys_show+0x3ce/0x3d0
+ [] ? key_validate+0x50/0x50
+ [] ? key_default_cmp+0x20/0x20
+ [] seq_read+0x2cc/0x390
+ [] proc_reg_read+0x42/0x70
+ [] __vfs_read+0x37/0x150
+ [] ? security_file_permission+0xa0/0xc0
+ [] vfs_read+0x96/0x130
+ [] SyS_read+0x55/0xc0
+ [] entry_SYSCALL_64_fastpath+0x1a/0xa4
+
+Reported-by: Ondrej Kozina 
+Signed-off-by: David Howells 
+Tested-by: Ondrej Kozina 
+--- a/security/keys/proc.c 
 a/security/keys/proc.c 
+@@ -181,7 +181,7 @@ static int proc_keys_show(struct seq_file *m, void *v)
+   struct timespec now;
+   unsigned long timo;
+   key_ref_t key_ref, skey_ref;
+-  char xbuf[12];
++  char xbuf[16];
+   int rc;
+ 
+   struct keyring_search_context ctx = {
diff --git a/debian/patches/series b/debian/patches/series
index 287c245..380b702 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -126,3 +126,4 @@
 bugfix/all/stable-4.4.23.patch
 bugfix/all/stable-4.4.24.patch
 bugfix/all/stable-4.4.25.patch
+bugfix/all/CVE-2016-7042.patch

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92d77e50770ba459b99e4ba434cc810bc1b4f45f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux44
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Updating icon colors to latest palette

2016-10-18 Thread Pginer (Code Review)

Pginer has uploaded a new change for review.

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

Change subject: Updating icon colors to latest palette
..

Updating icon colors to latest palette

Echo icons updated to the new palette.
Bug: T147365

Change-Id: I16bdfbdada252ee27d5a0de11e0930347315b699
---
M modules/icons/link-blue.svg
1 file changed, 40 insertions(+), 6 deletions(-)


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

diff --git a/modules/icons/link-blue.svg b/modules/icons/link-blue.svg
index bb57a2c..2d04e13 100644
--- a/modules/icons/link-blue.svg
+++ b/modules/icons/link-blue.svg
@@ -1,7 +1,41 @@
-
-http://www.w3.org/2000/svg; viewBox="0 0 30 30" width="30" 
height="30">
-
-
-
-
+
+
+
+http://purl.org/dc/elements/1.1/;
+   xmlns:cc="http://creativecommons.org/ns#;
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+   xmlns:svg="http://www.w3.org/2000/svg;
+   xmlns="http://www.w3.org/2000/svg;
+   version="1.1"
+   width="30"
+   height="30"
+   viewBox="0 0 30 30"
+   id="svg2">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage; />
+
+  
+
+  
+  
+  
+
+
+  
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Let's disable l10nupdate completely until we have /srv/media...

2016-10-18 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Let's disable l10nupdate completely until we have 
/srv/mediawiki-staging back
..


Let's disable l10nupdate completely until we have /srv/mediawiki-staging back

Change-Id: I2879f1bca6f5d845dde148489b6e575b09e1
---
M hieradata/hosts/tin.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Chad: Looks good to me, but someone else must approve
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml
index 9250bb3..1aafc32 100644
--- a/hieradata/hosts/tin.yaml
+++ b/hieradata/hosts/tin.yaml
@@ -3,4 +3,4 @@
   - eqiad.wmnet
   - codfw.wmnet
 cluster: misc
-scap::l10nupdate::run_l10nupdate: true
+scap::l10nupdate::run_l10nupdate: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2879f1bca6f5d845dde148489b6e575b09e1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
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] operations/puppet[production]: Let's disable l10nupdate completely until we have /srv/media...

2016-10-18 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Let's disable l10nupdate completely until we have 
/srv/mediawiki-staging back
..

Let's disable l10nupdate completely until we have /srv/mediawiki-staging back

Change-Id: I2879f1bca6f5d845dde148489b6e575b09e1
---
M hieradata/hosts/tin.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/316615/1

diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml
index 9250bb3..1aafc32 100644
--- a/hieradata/hosts/tin.yaml
+++ b/hieradata/hosts/tin.yaml
@@ -3,4 +3,4 @@
   - eqiad.wmnet
   - codfw.wmnet
 cluster: misc
-scap::l10nupdate::run_l10nupdate: true
+scap::l10nupdate::run_l10nupdate: false

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: compiler: add hiera lookups for the project

2016-10-18 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: compiler: add hiera lookups for the project
..


compiler: add hiera lookups for the project

Change-Id: Ia8d4691d53ac89dfaf5fae178dca42b49666b6ed
---
A hieradata/labs/puppet3-diffs/common.yaml
1 file changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Giuseppe Lavagetto: Verified



diff --git a/hieradata/labs/puppet3-diffs/common.yaml 
b/hieradata/labs/puppet3-diffs/common.yaml
new file mode 100644
index 000..f17287d
--- /dev/null
+++ b/hieradata/labs/puppet3-diffs/common.yaml
@@ -0,0 +1,14 @@
+ssh::server::disable_nist_kex: false
+ssh::server::explicit_macs: false
+puppet_compiler::version: 0.1.6
+etcd::peers_list: compiler02=http://127.0.0.1:2380
+etcd::client::globalconfig::host: 127.0.0.1
+etcd::client::globalconfig::port: 2379
+etcd::client::globalconfig::protocol: http
+etcd::client::globalconfig::srv_domain: ""
+base::resolving::labs_additional_domains:
+  - wikimedia.org
+  - eqiad.wmnet
+  - codfw.wmnet
+  - esams.wmnet
+  - ulsfo.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8d4691d53ac89dfaf5fae178dca42b49666b6ed
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Andrew Bogott 
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] operations...linux44[master]: Add patch for CVE-2016-7042

2016-10-18 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Add patch for CVE-2016-7042
..

Add patch for CVE-2016-7042

Change-Id: I92d77e50770ba459b99e4ba434cc810bc1b4f45f
---
M debian/changelog
A debian/patches/bugfix/all/CVE-2016-7042.patch
M debian/patches/series
3 files changed, 62 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/linux44 
refs/changes/14/316614/1

diff --git a/debian/changelog b/debian/changelog
index e279c41..652b851 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,10 @@
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.24
   * Update to 4.4.25:
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.25
+  * Add patch by Vladis Dronov to address CVE-2016-7042 (not yet
+merged upstream)
 
- -- Moritz Muehlenhoff   Mon, 17 Oct 2016 10:00:33 
+0200
+ -- Moritz Muehlenhoff   Tue, 18 Oct 2016 21:33:33 
+0200
 
 linux (4.4.2-3+wmf5) jessie-wikimedia; urgency=medium
 
diff --git a/debian/patches/bugfix/all/CVE-2016-7042.patch 
b/debian/patches/bugfix/all/CVE-2016-7042.patch
new file mode 100644
index 000..5257ea9
--- /dev/null
+++ b/debian/patches/bugfix/all/CVE-2016-7042.patch
@@ -0,0 +1,58 @@
+KEYS: Fix short sprintf buffer in /proc/keys show function
+
+Fix a short sprintf buffer in proc_keys_show().  If the gcc stack protector
+is turned on, this can cause a panic due to stack corruption.
+
+The problem is that xbuf[] is not big enough to hold a 64-bit timeout
+rendered as weeks:
+
+   (gdb) p 0xULL/(60*60*24*7)
+   $2 = 30500568904943
+
+That's 14 chars plus NUL, not 11 chars plus NUL.
+
+Expand the buffer to 16 chars.
+
+I think the unpatched code apparently works if the stack-protector is not
+enabled because on a 32-bit machine the buffer won't be overflowed and on a
+64-bit machine there's a 64-bit aligned pointer at one side and an int that
+isn't checked again on the other side.
+
+The panic incurred looks something like:
+
+Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: 
81352ebe
+CPU: 0 PID: 1692 Comm: reproducer Not tainted 4.7.2-201.fc24.x86_64 #1
+Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011
+ 0086 fbbd2679 8800a044bc00 813d941f
+ 81a28d58 8800a044bc98 8800a044bc88 811b2cb6
+ 8810 8800a044bc98 8800a044bc30 fbbd2679
+Call Trace:
+ [] dump_stack+0x63/0x84
+ [] panic+0xde/0x22a
+ [] ? proc_keys_show+0x3ce/0x3d0
+ [] __stack_chk_fail+0x19/0x30
+ [] proc_keys_show+0x3ce/0x3d0
+ [] ? key_validate+0x50/0x50
+ [] ? key_default_cmp+0x20/0x20
+ [] seq_read+0x2cc/0x390
+ [] proc_reg_read+0x42/0x70
+ [] __vfs_read+0x37/0x150
+ [] ? security_file_permission+0xa0/0xc0
+ [] vfs_read+0x96/0x130
+ [] SyS_read+0x55/0xc0
+ [] entry_SYSCALL_64_fastpath+0x1a/0xa4
+
+Reported-by: Ondrej Kozina 
+Signed-off-by: David Howells 
+Tested-by: Ondrej Kozina 
+--- a/security/keys/proc.c 
 a/security/keys/proc.c 
+@@ -181,7 +181,7 @@ static int proc_keys_show(struct seq_file *m, void *v)
+   struct timespec now;
+   unsigned long timo;
+   key_ref_t key_ref, skey_ref;
+-  char xbuf[12];
++  char xbuf[16];
+   int rc;
+ 
+   struct keyring_search_context ctx = {
diff --git a/debian/patches/series b/debian/patches/series
index 287c245..380b702 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -126,3 +126,4 @@
 bugfix/all/stable-4.4.23.patch
 bugfix/all/stable-4.4.24.patch
 bugfix/all/stable-4.4.25.patch
+bugfix/all/CVE-2016-7042.patch

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92d77e50770ba459b99e4ba434cc810bc1b4f45f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux44
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 

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

1 2 3 >

1 - 100 of 270 matches

Mail list logo