[MediaWiki-commits] [Gerrit] Use mobileview for main pages - change (mediawiki...mobileapps)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Use mobileview for main pages
..


Use mobileview for main pages

For main page only, switch to mobileview content because Parsoid doesn't
provide a good mobile presentation of main pages.

Change-Id: Id958304e01068e61d62732dd02892c48393928a6
---
M lib/transforms.js
M routes/mobile-html-sections.js
2 files changed, 78 insertions(+), 32 deletions(-)

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



diff --git a/lib/transforms.js b/lib/transforms.js
index 723e509..6a40cee 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -5,6 +5,7 @@
 
 'use strict';
 
+var domino = require('domino');
 var util = require('util');
 var relocateFirstParagraph = 
require('./transformations/relocateFirstParagraph');
 var anchorPopUpMediaTransforms = 
require('./transformations/anchorPopUpMediaTransforms');
@@ -211,49 +212,57 @@
 //'span[style~="display:none"]', // Remove 
 ];
 
-//if (sectionIndex === 0) {
-//rmElementsWithSelectors.push('div.hatnote');
-//}
-
 removeUnwantedElements(doc, rmSelectors);
 
 anchorPopUpMediaTransforms.fixVideoAnchor(doc);
 hideRedLinks.hideRedLinks(doc);
 setMathFormulaImageMaxWidth.setMathFormulaImageMaxWidth(doc);
-
-applyParsoidSpecificTransformations(doc);
-applyOptionalParsoidSpecificTransformations(doc);
-
-return doc.body.innerHTML;
 }
 
 
+///**
+// * Nukes stuff from the lead section we don't want.
+// */
+//function runLeadSectionTransforms(doc) {
+//// TODO: once Parsoid produces  tags this should be easier.
+//
+////var rmElementsWithSelectors = [
+////'div.hatnote'
+////];
+////removeUnwantedElements(doc, rmElementsWithSelectors);
+//}
+
 /**
- * Nukes stuff from the lead section we don't want.
+ * Nukes stuff from the DOM we don't want for pages from Parsoid.
  */
-function runLeadSectionTransforms(doc) {
-// TODO: once Parsoid produces  tags this should be easier.
+function runParsoidDomTransforms(doc) {
+runAllSectionsTransforms(doc);
+//runLeadSectionTransforms(doc);
+applyParsoidSpecificTransformations(doc);
+applyOptionalParsoidSpecificTransformations(doc);
 
-//var rmElementsWithSelectors = [
-//'div.hatnote'
-//];
-//removeUnwantedElements(doc, rmElementsWithSelectors);
-
+// any page except main pages. It's ok to do unconditionally since we 
throw away
+// the page content if this turns out to be a main page.
+// TODO: should we also exclude file and other special pages?
 relocateFirstParagraph.moveFirstGoodParagraphUp(doc);
 }
 
 /**
- * Nukes stuff from the DOM we don't want.
+ * Nukes stuff from the DOM we don't want for the main page, which comes from 
mobileview.
  */
-function runDomTransforms(doc) {
+function runMainPageDomTransforms(text) {
+var doc = domino.createDocument(text);
+
 runAllSectionsTransforms(doc);
-runLeadSectionTransforms(doc);
+//runLeadSectionTransforms(doc);
+
+return doc.body.innerHTML;
 }
 
 module.exports = {
 NodeType: NodeType,
-runDomDocTransforms: runAllSectionsTransforms,
-runDomTransforms: runDomTransforms,
+runParsoidDomTransforms: runParsoidDomTransforms,
+runMainPageDomTransforms: runMainPageDomTransforms,
 
 // visible for testing only:
 _rmBracketSpans: rmBracketSpans,
diff --git a/routes/mobile-html-sections.js b/routes/mobile-html-sections.js
index 97f5d39..ca2c9fc 100644
--- a/routes/mobile-html-sections.js
+++ b/routes/mobile-html-sections.js
@@ -37,7 +37,7 @@
  */
 var app;
 
-/** Returns a promise to retrieve the page content from MW API mobileview */
+/** Returns a promise to retrieve the page content from Parsoid */
 function pageContentPromise(logger, domain, title, revision) {
 return parsoid.getContent(logger, app.conf.restbase_uri, domain, title, 
revision)
 .then(function (response) {
@@ -46,16 +46,28 @@
 page.lastmodified = parsoid.getModified(doc);
 parse.parseGeo(doc, page);
 parse.parseSpokenWikipedia(doc, page);
-transforms.runDomTransforms(doc);
-
-// if (!response.body.mobileview.mainpage) {
-// don't do anything if this is the main page, since many wikis
-// arrange the main page in a series of tables.
-// TODO: should we also exclude file and other special pages?
-// sections[0].text = 
transforms.moveFirstParagraphUpInLeadSection(sections[0].text);
-// }
+transforms.runParsoidDomTransforms(doc);
 
 page.sections = parsoid.getSectionsText(doc);
+return page;
+});
+}
+
+/** Returns a promise to retrieve the page content from MW API mobileview */
+function pageContentForMainPagePromise(logger, domain, title) {
+return mwapi.getAllSections(logger, domain, title)
+.then(function (response) {
+var page = 

[MediaWiki-commits] [Gerrit] Let fundraising/tools gate properly - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Let fundraising/tools gate properly
..

Let fundraising/tools gate properly

wikimedia/fundraising/tools gate solely has jsonlint/jshint jobs. In
case a patch does not alter any .js/.json none of the jobs are launched
and Zuul does not process.

Add a noop job which should let Zuul proceed.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/08/251208/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a871199..7c36343 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2783,6 +2783,7 @@
 gate-and-submit:
   - jshint
   - jsonlint
+  - noop  # in case a patch has no .js/.json
 experimental:
   - tox-jessie
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04ed57d9801a74c780a7acd68c2ae7e7251c8edb
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Run JSHint and JSCS against tests - change (mediawiki...RelatedArticles)

[Phuedx (Code Review)]

Phuedx has uploaded a new change for review.

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

Change subject: Run JSHint and JSCS against tests
..

Run JSHint and JSCS against tests

Changes:

* Extend the definition of all JavaScript files to include those in the
  tests directory
* Run JSHint and JSCS against all JavaScript files
* Fix the existing code style errors in the RelatedPagesGateway
  test

Change-Id: Ia6d8fa63e0b86760857d4480a0575b57512fa36b
---
M .jshintrc
M Gruntfile.js
M tests/qunit/ext.relatedArticles.readMore/test_RelatedPagesGateway.js
3 files changed, 11 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles 
refs/changes/10/251210/1

diff --git a/.jshintrc b/.jshintrc
index c305b65..5827a77 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -17,6 +17,7 @@
"mw": false,
"$": false,
"jQuery": true,
-   "OO": true
+   "OO": true,
+   "QUnit": true
}
 }
diff --git a/Gruntfile.js b/Gruntfile.js
index aec6ea4..bdd611c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,17 +6,20 @@
grunt.loadNpmTasks( 'grunt-jscs' );
 
grunt.initConfig( {
+   files: {
+   all: [
+   'resources/**/*.js',
+   'tests/**/*.js'
+   ]
+   },
jshint: {
options: {
jshintrc: true
},
-   all: [
-   '*.js',
-   'resources/**/*.js'
-   ]
+   all: '<%= files.all %>'
},
jscs: {
-   src: '<%= jshint.all %>'
+   src: '<%= files.all %>'
},
banana: {
all: 'i18n/'
diff --git 
a/tests/qunit/ext.relatedArticles.readMore/test_RelatedPagesGateway.js 
b/tests/qunit/ext.relatedArticles.readMore/test_RelatedPagesGateway.js
index 781b303..0103d30 100644
--- a/tests/qunit/ext.relatedArticles.readMore/test_RelatedPagesGateway.js
+++ b/tests/qunit/ext.relatedArticles.readMore/test_RelatedPagesGateway.js
@@ -30,7 +30,7 @@
this.sandbox.stub( api, 'get' ).returns( $.Deferred().resolve( 
relatedPages ) );
gateway.getForCurrentPage( 1 ).then( function ( results ) {
assert.ok( $.isArray( results ), 'Results must be an 
array' );
-   assert.strictEqual( results[0].title, 'Oh noes' );
+   assert.strictEqual( results[ 0 ].title, 'Oh noes' );
} );
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6d8fa63e0b86760857d4480a0575b57512fa36b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: dev
Gerrit-Owner: Phuedx 

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

[MediaWiki-commits] [Gerrit] Add search generator prefix config variable - change (mediawiki...MobileFrontend)

[Bene (Code Review)]

Bene has uploaded a new change for review.

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

Change subject: Add search generator prefix config variable
..

Add search generator prefix config variable

Bug: T110069
Change-Id: Ic8ebc8b2efb020149a7719cd640753dc17c15ad3
---
M resources/mobile.search.api/SearchGateway.js
1 file changed, 13 insertions(+), 11 deletions(-)


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

diff --git a/resources/mobile.search.api/SearchGateway.js 
b/resources/mobile.search.api/SearchGateway.js
index 24ee6f3..5006f67 100644
--- a/resources/mobile.search.api/SearchGateway.js
+++ b/resources/mobile.search.api/SearchGateway.js
@@ -25,17 +25,19 @@
 * @return {Object}
 */
getApiData: function ( query ) {
-   var data = $.extend( {
-   generator: 'prefixsearch',
-   gpssearch: query,
-   gpsnamespace: this.searchNamespace,
-   gpslimit: 15,
-   prop: mw.config.get( 'wgMFQueryPropModules' ),
-   redirects: '',
-   list: 'prefixsearch',
-   pssearch: query,
-   pslimit: 15
-   }, mw.config.get( 'wgMFSearchAPIParams' ) );
+   var prefix = mw.config.get( 
'wgMFSearchGeneratorPrefix', 'ps' ),
+   data = $.extend( {
+   generator: 'prefixsearch',
+   prop: mw.config.get( 
'wgMFQueryPropModules' ),
+   redirects: '',
+   list: 'prefixsearch'
+   }, mw.config.get( 'wgMFSearchAPIParams' ) );
+
+   data['g' + prefix + 'search'] = query;
+   data['g' + prefix + 'namespace'] = this.searchNamespace;
+   data['g' + prefix + 'limit'] = 15;
+   data[prefix + 'search'] = query;
+   data[prefix + 'limit'] = 15;
 
// If PageImages is being used configure further.
if ( data.pilimit ) {

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

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

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

[MediaWiki-commits] [Gerrit] Add ip resolution for new codfw db servers; Poolings and dep... - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Add ip resolution for new codfw db servers; Poolings and 
depoolings
..

Add ip resolution for new codfw db servers; Poolings and depoolings

Ip addresses for db2055 to db2070 has been added to db-codfw.php
files in preparation to pool them. These are used to localy resolve
the servers.

In addition, db2048, db2049 and db2050 has been repooled after
being cloned. In order to minimize problems, we are going to
use different servers for cloning next: db2034, db2035 and db2051
are being depooled.

New servers already cloned (db2055, db2057 and db2063) are being
pooled for the first time.

Change-Id: I8cb6aeec87687f1cd2ed18e13fcead7d59dcfc62
References: T84428
---
M wmf-config/db-codfw.php
1 file changed, 25 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 698384a..e5e1bd9 100755
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -91,30 +91,33 @@
's1' => array(
'db1052' => 0,   # 2.8TB  96GB
'db2016' => 100,
-   'db2034' => 100,
+#  'db2034' => 100, (down for maintenance)
'db2042' => 100,
-#  'db2048' => 100, (down for maintenance)
+   'db2048' => 100,
+   'db2055' => 100,
),
's2' => array(
'db1024' => 0,   # 1.4TB  64GB
'db2017' => 100,
-   'db2035' => 100,
+#  'db2035' => 100, (down for maintenance)
'db2041' => 100,
-#  'db2049' => 100, (down for maintenance)
+   'db2049' => 100,
+   'db2063' => 100,
),
/* s3 */ 'DEFAULT' => array(
'db1038' => 0,   # 1.4TB  64GB
'db2018' => 100,
'db2036' => 100,
'db2043' => 100,
-#  'db2050' => 100, (down for maintenance)
+   'db2050' => 100,
+   'db2057' => 100,
),
's4' => array(
'db1040' => 0,   # 1.4TB  64GB
'db2019' => 100,
'db2037' => 100,
'db2044' => 100,
-   'db2051' => 100,
+#  'db2051' => 100, (down for maintenance)
),
's5' => array(
'db1058' => 0,   # 2.8TB  96GB
@@ -279,6 +282,22 @@
'db2052' => '10.192.48.4', # do not remove or comment out
'db2053' => '10.192.48.5', # do not remove or comment out
'db2054' => '10.192.48.6', # do not remove or comment out
+   'db2055' => '10.192.48.7', # do not remove or comment out
+   'db2056' => '10.192.48.8', # do not remove or comment out
+   'db2057' => '10.192.48.9', # do not remove or comment out
+   'db2058' => '10.192.48.10', # do not remove or comment out
+   'db2059' => '10.192.48.11', # do not remove or comment out
+   'db2060' => '10.192.48.12', # do not remove or comment out
+   'db2061' => '10.192.48.13', # do not remove or comment out
+   'db2062' => '10.192.48.14', # do not remove or comment out
+   'db2063' => '10.192.48.15', # do not remove or comment out
+   'db2064' => '10.192.48.16', # do not remove or comment out
+   'db2065' => '10.192.48.17', # do not remove or comment out
+   'db2066' => '10.192.48.18', # do not remove or comment out
+   'db2067' => '10.192.48.19', # do not remove or comment out
+   'db2068' => '10.192.48.20', # do not remove or comment out
+   'db2069' => '10.192.48.21', # do not remove or comment out
+   'db2070' => '10.192.48.22', # do not remove or comment out
'virt1000' => '208.80.154.18', #do not remove or comment out
'silver' => '208.80.154.136', #do not remove or comment out
 ),

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

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

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

[MediaWiki-commits] [Gerrit] Use displaytext form api result in search display - change (mediawiki...MobileFrontend)

[Bene (Code Review)]

Bene has uploaded a new change for review.

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

Change subject: Use displaytext form api result in search display
..

Use displaytext form api result in search display

Bug: T110069
Change-Id: I2043353dab8085a0cd316785f2a4fe0f4a3e4826
---
M resources/mobile.search.api/SearchGateway.js
1 file changed, 5 insertions(+), 16 deletions(-)


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

diff --git a/resources/mobile.search.api/SearchGateway.js 
b/resources/mobile.search.api/SearchGateway.js
index 95ed47f..e3b0429 100644
--- a/resources/mobile.search.api/SearchGateway.js
+++ b/resources/mobile.search.api/SearchGateway.js
@@ -85,21 +85,6 @@
},
 
/**
-* Return data used for creating {Page} objects
-* @param {String} query to search for
-* @param {Object} info page info from the API
-* @return {Object} data needed to create a {Page}
-* @private
-*/
-   _getPage: function ( query, info ) {
-   var page = Page.newFromJSON( info );
-   // Highlight the search term
-   // FIXME: Given that displayTitle could have html in it 
be safe and just highlight text.
-   page.displayTitle = this._highlightSearchTerm( 
page.title, query );
-   return page;
-   },
-
-   /**
 * Process the data returned by the api call.
 * FIXME: remove filtering of redirects once the upstream bug 
has been fixed:
 * https://bugzilla.wikimedia.org/show_bug.cgi?id=73673
@@ -148,11 +133,15 @@
info = 
data.query.pages[id];
}
 
+   // Highlight the search term
+   // FIXME: Given that 
displayTitle could have html in it be safe and just highlight text.
+   info.displayTitle = 
this._highlightSearchTerm( page.displaytext || title, query );
+
if ( $.inArray( id, pageIds ) 
=== -1 ) {
if ( info ) {
// return all 
possible page data
pageIds.push( 
id );
-   results.push( 
self._getPage( query, info ) );
+   results.push( 
Page.newFromJSON( info ) );
} else {
mwTitle = 
mw.Title.newFromText( page.title, self._searchNamespace );
 

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

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

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

[MediaWiki-commits] [Gerrit] Offload client DOM transformations - change (mediawiki...mobileapps)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Offload client DOM transformations
..


Offload client DOM transformations

Do only the transformations that don't depend on a client setting, the client 
width, or are dealing with click handlers.
Since the Android app has the option of accessing the MW API directly for now,
we need to keep this in sync with the app.

Also moved the functions we use to parse certain information out of the
DOM tree into its own module, parseProperty.js.

Bug: T117450
Bug: T117505
Change-Id: I9437791ba8f5953be98546f76a6d15437cb58fc2
---
A lib/parseProperty.js
A lib/transformations/anchorPopUpMediaTransforms.js
A lib/transformations/hideRedLinks.js
A lib/transformations/relocateFirstParagraph.js
A lib/transformations/setMathFormulaImageMaxWidth.js
M lib/transforms.js
M routes/mobile-html-sections.js
7 files changed, 297 insertions(+), 114 deletions(-)

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



diff --git a/lib/parseProperty.js b/lib/parseProperty.js
new file mode 100644
index 000..170baa1
--- /dev/null
+++ b/lib/parseProperty.js
@@ -0,0 +1,94 @@
+/**
+ * Common DOM transformations for mobile apps.
+ * We rearrange some content and remove content that is not shown/needed.
+ */
+
+'use strict';
+
+var mUtil = require('../lib/mobile-util');
+var util = require('util');
+
+function parseInfobox(doc) {
+var ROW_SELECTOR = 'table.infobox > tbody > tr';
+var ROW_COL_SELECTOR = 'tr > td, tr > th';
+
+var rows = doc.querySelectorAll(ROW_SELECTOR);
+var table = rows.map(function (row) {
+var cols = row.querySelectorAll(ROW_COL_SELECTOR);
+return cols.map(function(column) { return column.innerHTML.trim(); });
+});
+
+return mUtil.defaultVal(mUtil.filterEmpty(table));
+}
+
+function ensureUrlWithDomain(url, domain) {
+if (url.indexOf("//") === -1) {
+url = "//" + domain + url;
+}
+return url;
+}
+
+function parsePronunciation(doc, domain) {
+var anchor = doc.querySelector('span.IPA a[href]');
+return anchor && { 'url': ensureUrlWithDomain(anchor.getAttribute('href'), 
domain) };
+}
+
+/**
+ * @returns {Geo} if latitude or longitude is truthy, else undefined.
+ */
+function latLngStrToGeo(latLngStr) {
+var latLng = latLngStr && latLngStr.split('; ') || [];
+return latLng.length
+&& { "latitude": latLng[0] && parseFloat(latLng[0]),
+"longitude": latLng[1] && parseFloat(latLng[1]) };
+}
+
+/**
+ * Searches for Geo coordinates and adds them to the given page object
+ */
+function parseGeo(lead, page) {
+var coordinates = lead.querySelector('span#coordinates .geo');
+page.geo = coordinates && latLngStrToGeo(coordinates.innerHTML);
+}
+
+/**
+ * Searches for Spoken Wikipedia audio files and adds them to the given page 
object.
+ * 
https://en.wikipedia.org/wiki/Wikipedia:WikiProject_Spoken_Wikipedia/Template_guidelines
+ */
+function parseSpokenWikipedia(doc, page) {
+var dataMW, template, target, match, maxKey, key, fileName,
+spokenSectionDiv = doc.querySelector('div#section_SpokenWikipedia');
+
+if (spokenSectionDiv) {
+dataMW = spokenSectionDiv.getAttribute('data-mw');
+template = JSON.parse(dataMW).parts[0].template;
+target = template.target;
+if (target && target.wt) {
+if (target.wt === 'Spoken Wikipedia') {
+// single audio file: use first param (2nd param is recording 
date)
+fileName = 'File:' + template.params['1'].wt;
+page.spoken = {};
+page.spoken.files = [fileName];
+} else {
+match = /Spoken Wikipedia-([2-5])/.exec(target.wt);
+if (match) {
+maxKey = 2 + parseInt(match[1]);
+// multiple audio files: skip first param (recording date)
+page.spoken = {};
+page.spoken.files = [];
+for (key = 2; key < maxKey; key++) {
+fileName = 'File:' + template.params[key].wt;
+page.spoken.files.push(fileName);
+}
+}
+}
+}
+}
+}
+
+module.exports = {
+parseInfobox: parseInfobox,
+parsePronunciation: parsePronunciation,
+parseSpokenWikipedia: parseSpokenWikipedia,
+parseGeo: parseGeo
+};
diff --git a/lib/transformations/anchorPopUpMediaTransforms.js 
b/lib/transformations/anchorPopUpMediaTransforms.js
new file mode 100644
index 000..f5fe7e1
--- /dev/null
+++ b/lib/transformations/anchorPopUpMediaTransforms.js
@@ -0,0 +1,26 @@
+/**
+ * DOM transformation shared with app. Let's keep this in sync with the app.
+ * Last sync: Android repo 3d5b441 
www/js/transforms/anchorPopUpMediaTransforms.js
+ *
+ * This is much simpler with Parsoid since we don't need to introduce new 
elements.

[MediaWiki-commits] [Gerrit] Let fundraising/tools gate properly - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Let fundraising/tools gate properly
..


Let fundraising/tools gate properly

wikimedia/fundraising/tools gate solely has jsonlint/jshint jobs. In
case a patch does not alter any .js/.json none of the jobs are launched
and Zuul does not process.

Add a noop job which should let Zuul proceed.

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a871199..7c36343 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2783,6 +2783,7 @@
 gate-and-submit:
   - jshint
   - jsonlint
+  - noop  # in case a patch has no .js/.json
 experimental:
   - tox-jessie
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04ed57d9801a74c780a7acd68c2ae7e7251c8edb
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Assign Salt grain through the role, not by host - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign Salt grain through the role, not by host
..


Assign Salt grain through the role, not by host

The grains are genereally assigned per role (with the only exception being
one-off canary hosts).

Also add the new grain to a server group.

Change-Id: Idecb57e51baff82bda6cfc9490755d0747df59bf
---
M hieradata/hosts/rutherfordium.yaml
A hieradata/role/common/peopleweb.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/hieradata/hosts/rutherfordium.yaml 
b/hieradata/hosts/rutherfordium.yaml
index f3fb330..abcb8a1 100644
--- a/hieradata/hosts/rutherfordium.yaml
+++ b/hieradata/hosts/rutherfordium.yaml
@@ -3,9 +3,6 @@
   - eqiad.wmnet
   - esams.wikimedia.org
   - codfw.wmnet
-debdeploy::grains:
-  debdeploy-people:
-value: standard
 admin::groups:
   - analytics-admins
   - analytics-privatedata-users
diff --git a/hieradata/role/common/peopleweb.yaml 
b/hieradata/role/common/peopleweb.yaml
new file mode 100644
index 000..c48e362
--- /dev/null
+++ b/hieradata/role/common/peopleweb.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-people:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 9d7ae63..c7e898a 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -6,7 +6,7 @@
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
 misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-syslog:standard, debdeploy-ipv6relay:standard, 
debdeploy-archiva:standard, debdeploy-pmacct:standard, 
debdeploy-labmon:standard, debdeploy-nova-control:standard, 
debdeploy-bugzilla:standard, debdeploy-installserver:standard, 
debdeploy-xenon:standard, debdeploy-icinga:standard, 
debdeploy-kafkatee:standard, debdeploy-gerrit:standard, 
debdeploy-ganglia:standard, debdeploy-db-maintenance:standard, 
debdeploy-hue:standard, debdeploy-ci:standard, debdeploy-librenms:standard, 
debdeploy-graphite:standard
-misc-external-services = debdeploy-tor:standard, debdeploy-etherpad:standard, 
debdeploy-lists:standard, debdeploy-planet:standard, debdeploy-otrs:standard, 
debdeploy-ipv6relay:standard
+misc-external-services = debdeploy-tor:standard, debdeploy-etherpad:standard, 
debdeploy-lists:standard, debdeploy-planet:standard, debdeploy-otrs:standard, 
debdeploy-ipv6relay:standard, debdeploy-people:standard
 misc-monitoring = debdeploy-grafana:standard, debdeploy-syslog:standard, 
debdeploy-ganglia:standard, debdeploy-graphite:standard, 
debdeploy-labmon:standard, debdeploy-icinga:standard
 misc-virt = debdeploy-nova-control:standard, debdeploy-horizon:standard, 
debdeploy-nova-manager:standard, debdeploy-nova-api:standard
 misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, 
debdeploy-xenon:standard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idecb57e51baff82bda6cfc9490755d0747df59bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Dzahn 
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] Add ip resolution for new codfw db servers; Poolings and dep... - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Add ip resolution for new codfw db servers; Poolings and 
depoolings
..


Add ip resolution for new codfw db servers; Poolings and depoolings

Ip addresses for db2055 to db2070 have been added to db-codfw.php
files in preparation to pool them. These are used to localy resolve
the servers.

In addition, db2048, db2049 and db2050 have been repooled after
being cloned. In order to minimize problems, we are going to
use different servers for cloning next: db2034, db2035 and db2051
are being depooled.

New servers already cloned (db2055, db2057 and db2063) are being
pooled for the first time.

Change-Id: I8cb6aeec87687f1cd2ed18e13fcead7d59dcfc62
References: T84428
---
M wmf-config/db-codfw.php
1 file changed, 25 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 698384a..e5e1bd9 100755
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -91,30 +91,33 @@
's1' => array(
'db1052' => 0,   # 2.8TB  96GB
'db2016' => 100,
-   'db2034' => 100,
+#  'db2034' => 100, (down for maintenance)
'db2042' => 100,
-#  'db2048' => 100, (down for maintenance)
+   'db2048' => 100,
+   'db2055' => 100,
),
's2' => array(
'db1024' => 0,   # 1.4TB  64GB
'db2017' => 100,
-   'db2035' => 100,
+#  'db2035' => 100, (down for maintenance)
'db2041' => 100,
-#  'db2049' => 100, (down for maintenance)
+   'db2049' => 100,
+   'db2063' => 100,
),
/* s3 */ 'DEFAULT' => array(
'db1038' => 0,   # 1.4TB  64GB
'db2018' => 100,
'db2036' => 100,
'db2043' => 100,
-#  'db2050' => 100, (down for maintenance)
+   'db2050' => 100,
+   'db2057' => 100,
),
's4' => array(
'db1040' => 0,   # 1.4TB  64GB
'db2019' => 100,
'db2037' => 100,
'db2044' => 100,
-   'db2051' => 100,
+#  'db2051' => 100, (down for maintenance)
),
's5' => array(
'db1058' => 0,   # 2.8TB  96GB
@@ -279,6 +282,22 @@
'db2052' => '10.192.48.4', # do not remove or comment out
'db2053' => '10.192.48.5', # do not remove or comment out
'db2054' => '10.192.48.6', # do not remove or comment out
+   'db2055' => '10.192.48.7', # do not remove or comment out
+   'db2056' => '10.192.48.8', # do not remove or comment out
+   'db2057' => '10.192.48.9', # do not remove or comment out
+   'db2058' => '10.192.48.10', # do not remove or comment out
+   'db2059' => '10.192.48.11', # do not remove or comment out
+   'db2060' => '10.192.48.12', # do not remove or comment out
+   'db2061' => '10.192.48.13', # do not remove or comment out
+   'db2062' => '10.192.48.14', # do not remove or comment out
+   'db2063' => '10.192.48.15', # do not remove or comment out
+   'db2064' => '10.192.48.16', # do not remove or comment out
+   'db2065' => '10.192.48.17', # do not remove or comment out
+   'db2066' => '10.192.48.18', # do not remove or comment out
+   'db2067' => '10.192.48.19', # do not remove or comment out
+   'db2068' => '10.192.48.20', # do not remove or comment out
+   'db2069' => '10.192.48.21', # do not remove or comment out
+   'db2070' => '10.192.48.22', # do not remove or comment out
'virt1000' => '208.80.154.18', #do not remove or comment out
'silver' => '208.80.154.136', #do not remove or comment out
 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8cb6aeec87687f1cd2ed18e13fcead7d59dcfc62
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Assign Salt grain through the role, not by host - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Assign Salt grain through the role, not by host
..

Assign Salt grain through the role, not by host

The grains are genereally assigned per role (with the only exception being
one-off canary hosts).

Also add the new grain to a server group.

Change-Id: Idecb57e51baff82bda6cfc9490755d0747df59bf
---
M hieradata/hosts/rutherfordium.yaml
A hieradata/role/common/peopleweb.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/hieradata/hosts/rutherfordium.yaml 
b/hieradata/hosts/rutherfordium.yaml
index f3fb330..abcb8a1 100644
--- a/hieradata/hosts/rutherfordium.yaml
+++ b/hieradata/hosts/rutherfordium.yaml
@@ -3,9 +3,6 @@
   - eqiad.wmnet
   - esams.wikimedia.org
   - codfw.wmnet
-debdeploy::grains:
-  debdeploy-people:
-value: standard
 admin::groups:
   - analytics-admins
   - analytics-privatedata-users
diff --git a/hieradata/role/common/peopleweb.yaml 
b/hieradata/role/common/peopleweb.yaml
new file mode 100644
index 000..c48e362
--- /dev/null
+++ b/hieradata/role/common/peopleweb.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-people:
+value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 9d7ae63..c7e898a 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -6,7 +6,7 @@
 # A list of servers, each defined by one or more Salt grains. If multiple 
grains
 # are specified, they're processed sequentially
 misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, 
debdeploy-gitblit:standard, debdeploy-spare:standard, 
debdeploy-releases:standard, debdeploy-testsystem:standard, 
debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, 
debdeploy-phabricator:standard, debdeploy-nova-manager:standard, 
debdeploy-planet:standard, debdeploy-horizon:standard, 
debdeploy-grafana:standard, debdeploy-irc:standard, 
debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-syslog:standard, debdeploy-ipv6relay:standard, 
debdeploy-archiva:standard, debdeploy-pmacct:standard, 
debdeploy-labmon:standard, debdeploy-nova-control:standard, 
debdeploy-bugzilla:standard, debdeploy-installserver:standard, 
debdeploy-xenon:standard, debdeploy-icinga:standard, 
debdeploy-kafkatee:standard, debdeploy-gerrit:standard, 
debdeploy-ganglia:standard, debdeploy-db-maintenance:standard, 
debdeploy-hue:standard, debdeploy-ci:standard, debdeploy-librenms:standard, 
debdeploy-graphite:standard
-misc-external-services = debdeploy-tor:standard, debdeploy-etherpad:standard, 
debdeploy-lists:standard, debdeploy-planet:standard, debdeploy-otrs:standard, 
debdeploy-ipv6relay:standard
+misc-external-services = debdeploy-tor:standard, debdeploy-etherpad:standard, 
debdeploy-lists:standard, debdeploy-planet:standard, debdeploy-otrs:standard, 
debdeploy-ipv6relay:standard, debdeploy-people:standard
 misc-monitoring = debdeploy-grafana:standard, debdeploy-syslog:standard, 
debdeploy-ganglia:standard, debdeploy-graphite:standard, 
debdeploy-labmon:standard, debdeploy-icinga:standard
 misc-virt = debdeploy-nova-control:standard, debdeploy-horizon:standard, 
debdeploy-nova-manager:standard, debdeploy-nova-api:standard
 misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, 
debdeploy-xenon:standard

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idecb57e51baff82bda6cfc9490755d0747df59bf
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] Fix name of PoolCounter callback in thumb.php - change (mediawiki/core)

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix name of PoolCounter callback in thumb.php
..

Fix name of PoolCounter callback in thumb.php

The callback is named doCachedWork, not getCachedWork. The typo
made it so that if multiple people try to render a file at once,
MediaWiki would not check if the last person to go already did the
needed work.

This might not make as much difference as it would sound, as the
pool counter lock is for the entire file, not a specific size,
and I'm unsure if swift has an equivalent of "slave lag", where the
check to see if a cached version is available might happen before
the write is totally visible.

Also merge the fallback handler into the error handler, so we get
actually error messages reported.

Change-Id: I12d228961de39cffc3d492554d93e30bd741adc9
---
M thumb.php
1 file changed, 2 insertions(+), 5 deletions(-)


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

diff --git a/thumb.php b/thumb.php
index c699bb1..34f641d 100644
--- a/thumb.php
+++ b/thumb.php
@@ -420,18 +420,15 @@
'doWork' => function () use ( $file, $params ) {
return $file->transform( $params, 
File::RENDER_NOW );
},
-   'getCachedWork' => function () use ( $file, 
$params, $thumbPath ) {
+   'doCachedWork' => function () use ( $file, 
$params, $thumbPath ) {
// If the worker that finished made 
this thumbnail then use it.
// Otherwise, it probably made a 
different thumbnail for this file.
return $file->getRepo()->fileExists( 
$thumbPath )
? $file->transform( $params, 
File::RENDER_NOW )
: false; // retry once more in 
exclusive mode
},
-   'fallback' => function () {
-   return wfMessage( 'generic-pool-error' 
)->parse();
-   },
'error' => function ( Status $status ) {
-   return $status->getHTML();
+   return wfMessage( 'generic-pool-error' 
)->parse() . '' . $status->getHTML();
}
)
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12d228961de39cffc3d492554d93e30bd741adc9
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] Update most used messages - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: Update most used messages
..


Update most used messages

Per I61fb5011ffd740b8e5fb07fcb3b257e8c1f117ab

Change-Id: I4df407bf20f212e6f298faf639ad6c5f3d57ac88
---
M groups/MediaWiki/wikimedia-mostused-2015.txt
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/wikimedia-mostused-2015.txt 
b/groups/MediaWiki/wikimedia-mostused-2015.txt
index 4944f13..766065a 100644
--- a/groups/MediaWiki/wikimedia-mostused-2015.txt
+++ b/groups/MediaWiki/wikimedia-mostused-2015.txt
@@ -530,7 +530,6 @@
 imgfile
 april-gen
 wm-license-cc-by-sa-3.0-text
-mobile-frontend-username-placeholder
 mobile-frontend-password-placeholder
 june-gen
 july-gen
@@ -538,7 +537,6 @@
 nextrevision
 currentrevisionlink
 vector-action-move
-mobile-frontend-generic-login
 currentrev-asof
 dellogpage
 userlogin-yourpassword-ph
@@ -555,13 +553,11 @@
 templatesused
 passwordreset
 mobile-frontend-main-menu-account-create
-mobile-frontend-login
 timedmedia-source-file
 logentry-move-move
 timedmedia-no-player-js
 allarticles
 wikibase-description-empty
-mobile-frontend-generic-login-action
 categories
 hiddencategories
 wm-license-gfdl-1.2-and-later

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4df407bf20f212e6f298faf639ad6c5f3d57ac88
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Update most used messages - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: Update most used messages
..

Update most used messages

Per I61fb5011ffd740b8e5fb07fcb3b257e8c1f117ab

Change-Id: I4df407bf20f212e6f298faf639ad6c5f3d57ac88
---
M groups/MediaWiki/wikimedia-mostused-2015.txt
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/04/251204/1

diff --git a/groups/MediaWiki/wikimedia-mostused-2015.txt 
b/groups/MediaWiki/wikimedia-mostused-2015.txt
index 4944f13..766065a 100644
--- a/groups/MediaWiki/wikimedia-mostused-2015.txt
+++ b/groups/MediaWiki/wikimedia-mostused-2015.txt
@@ -530,7 +530,6 @@
 imgfile
 april-gen
 wm-license-cc-by-sa-3.0-text
-mobile-frontend-username-placeholder
 mobile-frontend-password-placeholder
 june-gen
 july-gen
@@ -538,7 +537,6 @@
 nextrevision
 currentrevisionlink
 vector-action-move
-mobile-frontend-generic-login
 currentrev-asof
 dellogpage
 userlogin-yourpassword-ph
@@ -555,13 +553,11 @@
 templatesused
 passwordreset
 mobile-frontend-main-menu-account-create
-mobile-frontend-login
 timedmedia-source-file
 logentry-move-move
 timedmedia-no-player-js
 allarticles
 wikibase-description-empty
-mobile-frontend-generic-login-action
 categories
 hiddencategories
 wm-license-gfdl-1.2-and-later

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4df407bf20f212e6f298faf639ad6c5f3d57ac88
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Don't escape HTML in tpt-discouraged-language - change (mediawiki...Translate)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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

Change subject: Don't escape HTML in tpt-discouraged-language
..

Don't escape HTML in tpt-discouraged-language

Bug: T117852
Change-Id: I6efc07c96365c904e81960204e2c46b00415e5fe
---
M resources/js/ext.translate.special.translate.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/js/ext.translate.special.translate.js 
b/resources/js/ext.translate.special.translate.js
index 566f317..b60bb28 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -189,7 +189,7 @@
'tpt-discouraged-language-force-content' :
'tpt-discouraged-language-content',
preferredLanguages
-   ).parse();
+   ).text();
 
$groupWarning.append(
$( '' ).append( $( '' ).text( 
headerMessage ) ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6efc07c96365c904e81960204e2c46b00415e5fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 

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

[MediaWiki-commits] [Gerrit] terbium: move mediawiki monitoring - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: terbium: move mediawiki monitoring
..


terbium: move mediawiki monitoring

Bug: T116728
Change-Id: I299e49da8b5563a44c989928c4c47697ef7eb614
---
M manifests/site.pp
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 3b562d1..2fa385b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1909,8 +1909,9 @@
 
 # mw1152 is the experimental HAT script runner
 node 'mw1152.eqiad.wmnet' {
-role mediawiki::maintenance, db::maintenance
+role mediawiki::maintenance, db::maintenance, mediawiki::generic_monitoring
 include standard
+include ldap::role::client::labs
 }
 
 
@@ -2409,7 +2410,7 @@
 
 # https://wikitech.wikimedia.org/wiki/Terbium
 node 'terbium.eqiad.wmnet' {
-role db::maintenance, peopleweb, noc, mediawiki::generic_monitoring, 
mediawiki::maintenance, backup::host
+role db::maintenance, peopleweb, noc, mediawiki::maintenance, backup::host
 
 include ldap::role::client::labs
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I299e49da8b5563a44c989928c4c47697ef7eb614
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
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] Don't make broken wikitext links for sister project links - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Don't make broken wikitext links for sister project links
..

Don't make broken wikitext links for sister project links

It's better not to link sister projects in client recent changes
and watchlist, vs. making broken wikitext links.

I think it is somewhat non-trivial to add a decent mechanism
to build interwiki wikitext links for sister projects, and
this is a short term solution that at least makes things
less broken.

The ideal solution would be to have such decent mechanism
for making interwiki links for sister projects, with the
correct site group prefix + subdomain for applicable projects
and handle special cases like wikidata itself, with 'd' prefix
and no subdomain.

Also, added test case for this and while touching the tests,
changed protected -> private and factored out some of the code
that had been duplicated in numerous places in the test file.

and removed the wikitext link formatting in the
RecentChangeFactoryTest, since the SiteStore mock does
not actually know about any sites and thus the links
would be unlinked in this case.

Bug: T116459
Change-Id: Iabc4ea9a82c90ec9db899139cb7b5eed862e4cc6
---
M client/includes/SiteLinkCommentCreator.php
M client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php
3 files changed, 46 insertions(+), 43 deletions(-)


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

diff --git a/client/includes/SiteLinkCommentCreator.php 
b/client/includes/SiteLinkCommentCreator.php
index 3e8ba59..5f4a54b 100644
--- a/client/includes/SiteLinkCommentCreator.php
+++ b/client/includes/SiteLinkCommentCreator.php
@@ -247,18 +247,22 @@
 * @return string wikitext interwiki link
 */
private function getSitelinkWikitext( $siteId, $pageTitle ) {
-   $interwikiId = $siteId;
-
// Try getting the interwiki id from the Site object of the 
link target
$site = $this->siteStore->getSite( $siteId );
+
if ( $site ) {
-   $iw_ids = $site->getInterwikiIds();
-   if ( isset( $iw_ids[0] ) ) {
-   $interwikiId = $iw_ids[0];
+   $interwikiIds = $site->getInterwikiIds();
+
+   if ( isset( $interwikiIds[0] ) ) {
+   $interwikiId = $interwikiIds[0];
+
+   return "[[:$interwikiId:$pageTitle]]";
}
}
 
-   return "[[:$interwikiId:$pageTitle]]";
+   // @todo: provide a mechanism to get the interwiki id for a 
sister project wiki.
+   // e.g. get "voy:it" for Italian Wikivoyage from English 
Wikipedia. (see T117738)
+   return "$siteId:$pageTitle";
}
 
/**
diff --git a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php 
b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index 3ffc0de..91b1f19 100644
--- a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++ b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -72,10 +72,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
 
-   $changeFactory = TestChanges::getEntityChangeFactory();
-   $change = $changeFactory->newFromUpdate( ItemChange::UPDATE, 
$item, $item2 );
-
-   return $change->getSiteLinkDiff();
+   return $this->getSiteLinkDiffForUpdate( $item, $item2 );
}
 
protected function getUnlinkDiff() {
@@ -85,10 +82,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->removeLinkWithSiteId( 'enwiki' );
 
-   $changeFactory = TestChanges::getEntityChangeFactory();
-   $change = $changeFactory->newFromUpdate( ItemChange::UPDATE, 
$item, $item2 );
-
-   return $change->getSiteLinkDiff();
+   return $this->getSiteLinkDiffForUpdate( $item, $item2 );
}
 
protected function getLinkChangeDiff() {
@@ -98,10 +92,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Tokyo' );
 
-   $changeFactory = TestChanges::getEntityChangeFactory();
-   $change = $changeFactory->newFromUpdate( ItemChange::UPDATE, 
$item, $item2 );
-
-   return $change->getSiteLinkDiff();
+   return $this->getSiteLinkDiffForUpdate( $item, $item2 );
}
 
protected function getOldLinkChangeDiff() {
@@ -119,10 +110,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 

[MediaWiki-commits] [Gerrit] Update Wikibase: Fix #property parser function's default lan... - change (mediawiki...Wikidata)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Update Wikibase: Fix #property parser function's default 
language
..

Update Wikibase: Fix #property parser function's default language

Contains: cc75a7d92831e7309f391a83f2a57a0497ba9acb

Change-Id: Ife3a6da63cc51269579baf6a65a76d3fd95fbf59
---
M composer.lock
M 
extensions/Wikibase/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
M 
extensions/Wikibase/lib/includes/formatters/OutputFormatValueFormatterFactory.php
M 
extensions/Wikibase/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
M vendor/composer/installed.json
5 files changed, 132 insertions(+), 108 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index bec0760..9758b8c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1389,12 +1389,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "c229412dbd318e65c8a1a1b87ac193250c04faa7"
+"reference": "cc75a7d92831e7309f391a83f2a57a0497ba9acb"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c229412dbd318e65c8a1a1b87ac193250c04faa7;,
-"reference": "c229412dbd318e65c8a1a1b87ac193250c04faa7",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/cc75a7d92831e7309f391a83f2a57a0497ba9acb;,
+"reference": "cc75a7d92831e7309f391a83f2a57a0497ba9acb",
 "shasum": ""
 },
 "require": {
@@ -1464,7 +1464,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2015-11-02 18:24:20"
+"time": "2015-11-05 10:59:56"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git 
a/extensions/Wikibase/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
 
b/extensions/Wikibase/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
index 1dc158f..bf03a82 100644
--- 
a/extensions/Wikibase/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
+++ 
b/extensions/Wikibase/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
@@ -61,7 +61,6 @@
 * @return SnakFormatter
 */
public function getSnakFormatter( $format, FormatterOptions $options ) {
-   $options->defaultOption( SnakFormatter::OPT_LANG, 'en' );
$options->defaultOption( SnakFormatter::OPT_ON_ERROR, 
SnakFormatter::ON_ERROR_WARN );
 
$this->valueFormatterFactory->applyLanguageDefaults( $options );
diff --git 
a/extensions/Wikibase/lib/includes/formatters/OutputFormatValueFormatterFactory.php
 
b/extensions/Wikibase/lib/includes/formatters/OutputFormatValueFormatterFactory.php
index cf4200c..e3bb294 100644
--- 
a/extensions/Wikibase/lib/includes/formatters/OutputFormatValueFormatterFactory.php
+++ 
b/extensions/Wikibase/lib/includes/formatters/OutputFormatValueFormatterFactory.php
@@ -97,9 +97,7 @@
 * @todo: this shouldn't be public at all. Perhaps factor it out into a 
helper class.
 */
public function applyLanguageDefaults( FormatterOptions $options ) {
-   if ( !$options->hasOption( ValueFormatter::OPT_LANG ) ) {
-   $options->setOption( ValueFormatter::OPT_LANG, 
$this->defaultLanguage->getCode() );
-   }
+   $options->defaultOption( ValueFormatter::OPT_LANG, 
$this->defaultLanguage->getCode() );
 
$lang = $options->getOption( ValueFormatter::OPT_LANG );
if ( !is_string( $lang ) ) {
diff --git 
a/extensions/Wikibase/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
 
b/extensions/Wikibase/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
index 0b45b3a..2bc85a6 100644
--- 
a/extensions/Wikibase/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
+++ 
b/extensions/Wikibase/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
@@ -7,6 +7,7 @@
 use DataValues\StringValue;
 use Language;
 use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\LanguageFallbackChainFactory;
@@ -31,26 +32,29 @@
$self = $this;
$callbacks = array(
'VT:string' => function( $format, FormatterOptions 
$options ) use ( $self ) {
-   return $format === SnakFormatter::FORMAT_PLAIN 
? $self->makeMockValueFormatter() : null;
+   

[MediaWiki-commits] [Gerrit] [WIP] Add initial oozie job for CirrusSearchRequestSet - change (analytics/refinery)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: [WIP] Add initial oozie job for CirrusSearchRequestSet
..

[WIP] Add initial oozie job for CirrusSearchRequestSet

Add a preliminary oozie job for CirrusSearchRequestSet:
* Only create partitions

WIP: Add README.md

Change-Id: I4c1436f5062f66f76971feea4ba16597ad4159f7
---
A hive/mediawiki/cirrus-searchrequest-set/CirrusSearchRequestSet.avsc
A 
hive/mediawiki/cirrus-searchrequest-set/create_CirrusSearchRequestSet_table.hql
A oozie/mediawiki/cirrus-searchrequest-set/datasets_raw.xml
A oozie/mediawiki/cirrus-searchrequest-set/load/bundle.properties
A oozie/mediawiki/cirrus-searchrequest-set/load/bundle.xml
A oozie/mediawiki/cirrus-searchrequest-set/load/coordinator.xml
A oozie/mediawiki/cirrus-searchrequest-set/load/workflow.xml
7 files changed, 519 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/38/251238/1

diff --git 
a/hive/mediawiki/cirrus-searchrequest-set/CirrusSearchRequestSet.avsc 
b/hive/mediawiki/cirrus-searchrequest-set/CirrusSearchRequestSet.avsc
new file mode 100644
index 000..b81c597
--- /dev/null
+++ b/hive/mediawiki/cirrus-searchrequest-set/CirrusSearchRequestSet.avsc
@@ -0,0 +1,147 @@
+{
+  "type": "record",
+  "name": "CirrusSearchRequestSet",
+  "namespace": "org.wikimedia.analytics.schemas",
+  "doc": "A set of requests made by CirrusSearch to the elasticsearch user for 
a single php execution context",
+  "fields": [
+{
+  "name": "ts",
+  "doc": "The timestamp, in unix time, that the request was made",
+  "type": "int",
+  "default": 0
+},
+{
+  "name": "wikiId",
+  "doc": "The wiki making this request, such as dewiki or enwiktionary",
+  "type": "string",
+  "default": ""
+},
+{
+  "name": "source",
+  "doc": "Where the request is coming from. Typically: web, api or cli",
+  "type": "string",
+  "default": ""
+},
+{
+  "name": "identity",
+  "doc": "A hash identifying the requestor. Includes the IP address and 
User Agent when available.",
+  "type": "string",
+  "default": ""
+},
+{
+  "name": "ip",
+  "doc": "The IP address (either ipv4 or ipv6) in string notation",
+  "type": "string",
+  "default": ""
+},
+{
+  "name": "userAgent",
+  "doc": "The HTTP User-Agent header, or null if not-applicable",
+  "type": "string",
+  "default": ""
+},
+{
+  "name": "backendUserTests",
+  "doc": "List of backend tests the requests are participating in",
+  "type": {
+"type": "array",
+"items": "string"
+  },
+  "default": []
+},
+ {
+"name": "requests",
+"doc": "A list of requests made between mediawiki and elasticsearch in 
a single execution context",
+"default": [],
+"type": {
+  "type": "array",
+  "items": {
+"name": "CirrusSearchRequest",
+"namespace": "org.wikimedia.analytics.schemas",
+"doc": "An individual request made between mediawiki and 
elasticsearch",
+"type": "record",
+"fields": [
+  {
+"name": "query",
+"doc": "The actual search request",
+"type": "string",
+"default": ""
+  },
+  {
+"name": "queryType",
+"doc": "The general type of query performed, such as 
full_text, prefix, etc.",
+"type": "string",
+"default": ""
+  },
+  {
+"name": "indices",
+"doc": "The list of indices the request was performed against",
+"type": {
+  "type": "array",
+  "items": "string"
+},
+"default": []
+  },
+  {
+"name": "tookMs",
+"doc": "The number of milliseconds between passing the query 
to the client library and getting the response back in the application",
+"type": "int",
+"default": -1
+  },
+  {
+"name": "elasticTookMs",
+"doc": "The number of milliseconds the query took, according 
to the elasticsearch response",
+"type": "int",
+"default": -1
+  },
+  {
+"name": "limit",
+"doc": "The maximum number of results requested by the 
application",
+"type": "int",
+"default": -1
+  },
+  {
+"name": "hitsTotal",
+"doc": "The approximate total number of documents matching the 
query",
+"type": "int",
+"default": -1
+ 

[MediaWiki-commits] [Gerrit] Don't make broken wikitext links for sister project links - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Don't make broken wikitext links for sister project links
..


Don't make broken wikitext links for sister project links

It's better not to link sister projects in client recent changes
and watchlist, vs. making broken wikitext links.

I think it is somewhat non-trivial to add a decent mechanism
to build interwiki wikitext links for sister projects, and
this is a short term solution that at least makes things
less broken.

The ideal solution would be to have such decent mechanism
for making interwiki links for sister projects, with the
correct site group prefix + subdomain for applicable projects
and handle special cases like wikidata itself, with 'd' prefix
and no subdomain.

Also, added test case for this and while touching the tests,
changed protected -> private and factored out some of the code
that had been duplicated in numerous places in the test file.

and removed the wikitext link formatting in the
RecentChangeFactoryTest, since the SiteStore mock does
not actually know about any sites and thus the links
would be unlinked in this case.

Bug: T116459
Change-Id: Iabc4ea9a82c90ec9db899139cb7b5eed862e4cc6
---
M client/includes/SiteLinkCommentCreator.php
M client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php
3 files changed, 46 insertions(+), 43 deletions(-)

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



diff --git a/client/includes/SiteLinkCommentCreator.php 
b/client/includes/SiteLinkCommentCreator.php
index 3e8ba59..5f4a54b 100644
--- a/client/includes/SiteLinkCommentCreator.php
+++ b/client/includes/SiteLinkCommentCreator.php
@@ -247,18 +247,22 @@
 * @return string wikitext interwiki link
 */
private function getSitelinkWikitext( $siteId, $pageTitle ) {
-   $interwikiId = $siteId;
-
// Try getting the interwiki id from the Site object of the 
link target
$site = $this->siteStore->getSite( $siteId );
+
if ( $site ) {
-   $iw_ids = $site->getInterwikiIds();
-   if ( isset( $iw_ids[0] ) ) {
-   $interwikiId = $iw_ids[0];
+   $interwikiIds = $site->getInterwikiIds();
+
+   if ( isset( $interwikiIds[0] ) ) {
+   $interwikiId = $interwikiIds[0];
+
+   return "[[:$interwikiId:$pageTitle]]";
}
}
 
-   return "[[:$interwikiId:$pageTitle]]";
+   // @todo: provide a mechanism to get the interwiki id for a 
sister project wiki.
+   // e.g. get "voy:it" for Italian Wikivoyage from English 
Wikipedia. (see T117738)
+   return "$siteId:$pageTitle";
}
 
/**
diff --git a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php 
b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index 3ffc0de..91b1f19 100644
--- a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++ b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -72,10 +72,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
 
-   $changeFactory = TestChanges::getEntityChangeFactory();
-   $change = $changeFactory->newFromUpdate( ItemChange::UPDATE, 
$item, $item2 );
-
-   return $change->getSiteLinkDiff();
+   return $this->getSiteLinkDiffForUpdate( $item, $item2 );
}
 
protected function getUnlinkDiff() {
@@ -85,10 +82,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->removeLinkWithSiteId( 'enwiki' );
 
-   $changeFactory = TestChanges::getEntityChangeFactory();
-   $change = $changeFactory->newFromUpdate( ItemChange::UPDATE, 
$item, $item2 );
-
-   return $change->getSiteLinkDiff();
+   return $this->getSiteLinkDiffForUpdate( $item, $item2 );
}
 
protected function getLinkChangeDiff() {
@@ -98,10 +92,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Tokyo' );
 
-   $changeFactory = TestChanges::getEntityChangeFactory();
-   $change = $changeFactory->newFromUpdate( ItemChange::UPDATE, 
$item, $item2 );
-
-   return $change->getSiteLinkDiff();
+   return $this->getSiteLinkDiffForUpdate( $item, $item2 );
}
 
protected function getOldLinkChangeDiff() {
@@ -119,10 +110,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan', 
array( new ItemId( 'Q17' ) ) );
 
-   

[MediaWiki-commits] [Gerrit] Align DatabaseBz2::select() with abstract method - change (mediawiki...Offline)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Align DatabaseBz2::select() with abstract method
..

Align DatabaseBz2::select() with abstract method

Change-Id: I6dafa8d9dfd8b52f35205be532637e60e3b22025
DatabaseBase::select() has a new parameter: $join_conds = array()
---
M DatabaseBz2.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Offline 
refs/changes/40/251240/1

diff --git a/DatabaseBz2.php b/DatabaseBz2.php
index addb010..3f889a4 100644
--- a/DatabaseBz2.php
+++ b/DatabaseBz2.php
@@ -26,7 +26,8 @@
 
 class DatabaseBz2 extends DatabaseBase
 {
-   function select( $table, $fields, $conds='', $fname = 
'DatabaseBase::select', $options = array() )
+   function select( $table, $fields, $conds='', $fname = 
'DatabaseBase::select',
+   $options = array(), $join_conds = array() )
{
$row = array();
$title = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6dafa8d9dfd8b52f35205be532637e60e3b22025
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Offline
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Improve contrast of brackets as requested by Lydia - change (wikidata...rdf)

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Improve contrast of brackets as requested by Lydia
..

Improve contrast of brackets as requested by Lydia

Change-Id: Ic4c7b4baf4f13285f5049fb81477f42fccbda6a1
---
M gui/style.css
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/gui/style.css b/gui/style.css
index 97669ff..65b4edc 100644
--- a/gui/style.css
+++ b/gui/style.css
@@ -27,6 +27,7 @@
   background-color: inherit;
 }
 
+.cm-s-default .cm-bracket {color: #000;}
 
 .exampleQueries{
width:160px;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4c7b4baf4f13285f5049fb81477f42fccbda6a1
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] Fix undo form for OO UI selection changes - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Fix undo form for OO UI selection changes
..


Fix undo form for OO UI selection changes

Activate editor after it's in DOM.

Bug: T117835
Change-Id: I925c022401fbd1db78328cb971c20e2e7ed52ffd
---
M modules/flow-initialize.js
M modules/mw.flow.Initializer.js
2 files changed, 13 insertions(+), 12 deletions(-)

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



diff --git a/modules/flow-initialize.js b/modules/flow-initialize.js
index 73a49e2..70ec772 100644
--- a/modules/flow-initialize.js
+++ b/modules/flow-initialize.js
@@ -44,7 +44,7 @@
// For reference and debugging
mw.flow.system = initializer.getDataModelSystem();
 
-   if ( initializer.isDiffPage() ) {
+   if ( initializer.isUndoForm() ) {
// Setup undo pages
initializer.setupUndoPage();
} else {
diff --git a/modules/mw.flow.Initializer.js b/modules/mw.flow.Initializer.js
index ab98443..d6a9927 100644
--- a/modules/mw.flow.Initializer.js
+++ b/modules/mw.flow.Initializer.js
@@ -690,6 +690,15 @@
// function, so make a forced connection
editor.error = error;
 
+   $wrapper = $( '' )
+   .append(
+   error.$element,
+   anonWarning.$element,
+   editor.$element
+   );
+
+   $domToReplace.replaceWith( $wrapper );
+
// Prepare the editor
editor.pushPending();
editor.activate();
@@ -726,23 +735,15 @@
// returnToBoard();
} );
 
-   $wrapper = $( '' )
-   .append(
-   error.$element,
-   anonWarning.$element,
-   editor.$element
-   );
-   $domToReplace.replaceWith( $wrapper );
-
return editor;
};
 
/**
-* Check whether we are on a diff page
+* Check whether we are on an undo form page
 *
-* @return {boolean} The page is a diff page
+* @return {boolean} The page is an in-progress undo form
 */
-   mw.flow.Initializer.prototype.isDiffPage = function () {
+   mw.flow.Initializer.prototype.isUndoForm = function () {
return !!( $( 'form[data-module="topic"]' ).length ||
$( 'form[data-module="header"]' ).length );
};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I925c022401fbd1db78328cb971c20e2e7ed52ffd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ApiVisualEditor: Return the correct notice when user is not ... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: ApiVisualEditor: Return the correct notice when user is not 
allowed to create page
..


ApiVisualEditor: Return the correct notice when user is not allowed to create 
page

'nocreatetext' is only the right error message when anonymous users
are generally not allowed to create pages on the wiki. But there are
other situations, for example a title might be blacklisted.

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

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



diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index b0e3388..366c268 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -430,10 +430,11 @@
}
 
// Permission notice
-   if ( !$title->userCan( 'create' ) && 
!$title->exists() ) {
+   $permErrors = $title->getUserPermissionsErrors( 
'create', $user );
+   if ( $permErrors && !$title->exists() ) {
$notices[] = $this->msg(

'permissionserrorstext-withaction', 1, $this->msg( 'action-createpage' )
-   ) . "" . $this->msg( 'nocreatetext' 
)->parse();
+   ) . "" . call_user_func_array( 
array( $this, 'msg' ), $permErrors[0] )->parse();
}
 
// Show notice when editing user / user talk 
page of a user that doesn't exist

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b8e83fa0bf98449e63e67705b709d227d9a379f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] noc: remove mod_userdir inclusion - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: noc: remove mod_userdir inclusion
..


noc: remove mod_userdir inclusion

It's not needed in noc since we now redirect to people.w.o

Change-Id: I78bb1e7b47b23a39ea12e92b7bf8a5b932a20842
---
M modules/noc/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index e9941d5..5642faa 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -13,7 +13,7 @@
 }
 
 include ::apache::mod::php5
-include ::apache::mod::userdir
+
 include ::apache::mod::rewrite
 include ::apache::mod::headers
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78bb1e7b47b23a39ea12e92b7bf8a5b932a20842
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
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: extract php config from web::modules, use in noc - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: mediawiki: extract php config from web::modules, use in noc
..


mediawiki: extract php config from web::modules, use in noc

As we want to make ::noc compatible with trusty, we need to include the
relevant configuration in the module. We abstract this common config to
a separate class that we can include here as well.

Change-Id: Ifeacd1610660085979f33c036463124f1eaee287
---
M modules/mediawiki/manifests/web/modules.pp
A modules/mediawiki/manifests/web/php_engine.pp
M modules/noc/manifests/init.pp
3 files changed, 48 insertions(+), 34 deletions(-)

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



diff --git a/modules/mediawiki/manifests/web/modules.pp 
b/modules/mediawiki/manifests/web/modules.pp
index 86c2f26..bbb3136 100644
--- a/modules/mediawiki/manifests/web/modules.pp
+++ b/modules/mediawiki/manifests/web/modules.pp
@@ -10,35 +10,8 @@
 include ::apache::mod::setenvif
 include ::apache::mod::status
 
-if os_version('ubuntu >= trusty') {
-include ::apache::mod::proxy_fcgi
-
-apache::mod_conf { 'mod_php5':
-ensure => absent,
-}
-
-# HHVM catchall, and removal of mod_php
-apache::conf { 'hhvm_catchall':
-source   => 
'puppet:///modules/mediawiki/apache/configs/hhvm_catchall.conf',
-priority => 50,
-}
-
-# Mark static assets as coming from an HHVM appserver as well. Needed 
for Varnish
-apache::conf { 'mark_engine':
-source   => 
'puppet:///modules/mediawiki/apache/configs/hhvm_mark_engine.conf',
-priority => 49,
-}
-
-# Add headers lost by mod_proxy_fastcgi
-apache::conf { 'fcgi_headers':
-source   => 
'puppet:///modules/mediawiki/apache/configs/fcgi_headers.conf',
-priority => 0,
-}
-
-
-} else {
-include ::apache::mod::php5
-}
+# Include the apache configurations for php
+include ::mediawiki::web::php_engine
 
 # Modules we don't enable.
 # Note that deflate and filter are activated deep down in the
diff --git a/modules/mediawiki/manifests/web/php_engine.pp 
b/modules/mediawiki/manifests/web/php_engine.pp
new file mode 100644
index 000..7f3dfcb
--- /dev/null
+++ b/modules/mediawiki/manifests/web/php_engine.pp
@@ -0,0 +1,34 @@
+# === Class mediawiki::web::php_engine
+# Selects to run web requests via mod_php or HHVM depending on the OS version.
+class mediawiki::web::php_engine {
+if os_version('ubuntu >= trusty') {
+include ::apache::mod::proxy_fcgi
+
+apache::mod_conf { 'mod_php5':
+ensure => absent,
+}
+
+# HHVM catchall, and removal of mod_php
+apache::conf { 'hhvm_catchall':
+source   => 
'puppet:///modules/mediawiki/apache/configs/hhvm_catchall.conf',
+priority => 50,
+}
+
+# Mark static assets as coming from an HHVM appserver as well. Needed 
for Varnish
+apache::conf { 'mark_engine':
+source   => 
'puppet:///modules/mediawiki/apache/configs/hhvm_mark_engine.conf',
+priority => 49,
+}
+
+# Add headers lost by mod_proxy_fastcgi
+apache::conf { 'fcgi_headers':
+source   => 
'puppet:///modules/mediawiki/apache/configs/fcgi_headers.conf',
+priority => 0,
+}
+
+
+} else {
+include ::apache::mod::php5
+}
+
+}
diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 5642faa..a441297 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -2,7 +2,19 @@
 # https://dbtree.wikimedia.org/
 class noc {
 
+# NOC needs a working mediawiki installation at the moment
+include ::mediawiki
+
 include ::apache
+
+if os_version('ubuntu >= trusty') {
+apache::def { 'HHVM': }
+}
+
+include ::mediawiki::web::php_engine
+
+include ::apache::mod::rewrite
+include ::apache::mod::headers
 
 apache::site { 'noc.wikimedia.org':
 content => template('noc/noc.wikimedia.org.erb'),
@@ -11,11 +23,6 @@
 apache::site { 'dbtree.wikimedia.org':
 content => template('noc/dbtree.wikimedia.org.erb'),
 }
-
-include ::apache::mod::php5
-
-include ::apache::mod::rewrite
-include ::apache::mod::headers
 
 # dbtree config
 include passwords::tendril

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeacd1610660085979f33c036463124f1eaee287
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] noc: make noc virtualhost compatible with apache 2.4 - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: noc: make noc virtualhost compatible with apache 2.4
..


noc: make noc virtualhost compatible with apache 2.4

Change-Id: Ibbb930966db1a3596cd6fc146de0f7233a070fcd
---
M modules/noc/templates/noc.wikimedia.org.erb
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/modules/noc/templates/noc.wikimedia.org.erb 
b/modules/noc/templates/noc.wikimedia.org.erb
index cb442e1..99034d2 100644
--- a/modules/noc/templates/noc.wikimedia.org.erb
+++ b/modules/noc/templates/noc.wikimedia.org.erb
@@ -29,8 +29,13 @@
 CustomLog /var/log/apache2/access.log combined
 
 
-Order Deny,Allow
 AllowOverride All
+= 2.4>
+Require all granted
+
+
+Order Deny,Allow
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbb930966db1a3596cd6fc146de0f7233a070fcd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
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] noc: puppetize dbtree directories - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: noc: puppetize dbtree directories
..

noc: puppetize dbtree directories

Change-Id: I8fa9c482d2fe17faf646a64c6513f3017711ba14
---
M modules/noc/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/251233/1

diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index a441297..c80b036 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -29,7 +29,9 @@
 $tendril_user_web = $passwords::tendril::db_user_web
 $tendril_pass_web = $passwords::tendril::db_pass_web
 
-file { '/srv/org/wikimedia/dbtree':
+
+
+file { ['/srv/org/wikimedia/dbtree', '/srv/org/wikimedia', '/srv/org']:
 ensure => 'directory',
 owner  => 'mwdeploy',
 group  => 'mwdeploy',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fa9c482d2fe17faf646a64c6513f3017711ba14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Add schema definitions for openldap/labs to be passed in $ex... - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Add schema definitions for openldap/labs to be passed in 
$extra_schemas
..


Add schema definitions for openldap/labs to be passed in $extra_schemas

Bug: T101299
Change-Id: Ibc369e15fe0bd95d448066363f3c4ee94f5afdad
---
A modules/openldap/files/dnsdomain2.schema
A modules/openldap/files/nova_sun.schema
A modules/openldap/files/openssh-ldap.schema
A modules/openldap/files/puppet.schema
A modules/openldap/files/sudo.schema
5 files changed, 352 insertions(+), 0 deletions(-)

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



diff --git a/modules/openldap/files/dnsdomain2.schema 
b/modules/openldap/files/dnsdomain2.schema
new file mode 100644
index 000..a89aeaf
--- /dev/null
+++ b/modules/openldap/files/dnsdomain2.schema
@@ -0,0 +1,195 @@
+# A schema for storing DNS zones in LDAP
+#
+# ORDERING is not necessary, and some servers don't support
+# integerOrderingMatch. Omit or change if you like
+
+attributetype ( 1.3.6.1.4.1.2428.20.0.0  NAME 'dNSTTL'
+   DESC 'An integer denoting time to live'
+   EQUALITY integerMatch
+   ORDERING integerOrderingMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.0.1 NAME 'dNSClass'
+   DESC 'The class of a resource record'
+   EQUALITY caseIgnoreIA5Match
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.11 NAME 'wKSRecord'
+   DESC 'a well known service description, RFC 1035'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.12 NAME 'pTRRecord'
+   DESC 'domain name pointer, RFC 1035'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.13 NAME 'hInfoRecord'
+   DESC 'host information, RFC 1035'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.14 NAME 'mInfoRecord'
+   DESC 'mailbox or mail list information, RFC 1035'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.16 NAME 'tXTRecord'
+   DESC 'text string, RFC 1035'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.17 NAME 'rPRecord'
+   DESC 'for Responsible Person, RFC 1183'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.18 NAME 'aFSDBRecord'
+   DESC 'for AFS Data Base location, RFC 1183'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.24 NAME 'SigRecord'
+   DESC 'Signature, RFC 2535'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.25 NAME 'KeyRecord'
+   DESC 'Key, RFC 2535'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.27 NAME 'gPosRecord'
+   DESC 'Geographical Position, RFC 1712'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.28 NAME 'aAAARecord'
+   DESC 'IPv6 address, RFC 1886'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.29 NAME 'LocRecord'
+   DESC 'Location, RFC 1876'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.30 NAME 'nXTRecord'
+   DESC 'non-existant, RFC 2535'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.33 NAME 'sRVRecord'
+   DESC 'service location, RFC 2782'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.35 NAME 'nAPTRRecord'
+   DESC 'Naming Authority Pointer, RFC 2915'
+   EQUALITY caseIgnoreIA5Match
+   SUBSTR caseIgnoreIA5SubstringsMatch
+   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 

[MediaWiki-commits] [Gerrit] fully deprovision tungsten - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: fully deprovision tungsten
..

fully deprovision tungsten

Bug: T97274
Change-Id: I5dbec26cae171799f944231c915daa8f595ce57a
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 3 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/251228/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2fa385b..c38a06e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1095,7 +1095,7 @@
 }
 }
 
-# Primary graphite machines, replacing tungsten
+# Primary graphite machines
 node 'graphite1001.eqiad.wmnet' {
 role graphite::production, statsdlb, performance, 
graphite::production::alerts, restbase::alerts
 include standard
@@ -1106,7 +1106,7 @@
 role testsystem
 }
 
-# Primary graphite machines, replacing tungsten
+# Primary graphite machines
 node 'graphite2001.codfw.wmnet' {
 role graphite::production, statsdlb, gdash
 include standard
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index a934c25..52d1b02 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -71,7 +71,7 @@
elastic20[0-2][0-9]|elastic203[0-1]) echo 
partman/elasticsearch-raid1.cfg ;; \

bromine|etherpad[12]001|fermium|krypton|mendelevium|planet1001|pollux|rutherfordium)
 echo partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
-   francium|nobelium|tungsten) echo partman/raid10-gpt.cfg ;; \
+   francium|nobelium) echo partman/raid10-gpt.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
ganeti200[1-9]) echo partman/ganeti.cfg ;; \
graphite1002) echo partman/graphite-dmcache.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 702dd3b..f8b2d36 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6305,11 +6305,6 @@
fixed-address titanium.wikimedia.org;
 }
 
-host tungsten {
-   hardware ethernet 78:2b:cb:0a:04:12;
-   fixed-address tungsten.eqiad.wmnet;
-}
-
 host uranium {
hardware ethernet 84:2b:2b:fb:a6:67;
fixed-address uranium.wikimedia.org;

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

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

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

[MediaWiki-commits] [Gerrit] noc: remove unused ssl settings - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: noc: remove unused ssl settings
..


noc: remove unused ssl settings

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

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 75b62ec..505fa24 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -4,8 +4,6 @@
 
 include ::apache
 
-$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
-
 apache::site { 'noc.wikimedia.org':
 content => template('noc/noc.wikimedia.org.erb'),
 }
@@ -53,4 +51,3 @@
 }
 
 }
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd15fda78e05cbacb6311a2502bb4fa3ae5802e0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
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] noc: remove mod_cgi - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: noc: remove mod_cgi
..


noc: remove mod_cgi

it's not compatible with apache 2.4, and it's apparently unused (no
AddHandler directive or ScriptAlias to speak of on terbium).

Probably just a relic of a past time.

Change-Id: I97b8de7f21547a26cd48be0d602c39aa9d0d6c75
---
M modules/noc/manifests/init.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 505fa24..e9941d5 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -14,7 +14,6 @@
 
 include ::apache::mod::php5
 include ::apache::mod::userdir
-include ::apache::mod::cgi
 include ::apache::mod::rewrite
 include ::apache::mod::headers
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97b8de7f21547a26cd48be0d602c39aa9d0d6c75
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
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] Syncronize VisualEditor: 3716682..8afae11 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 3716682..8afae11
..

Syncronize VisualEditor: 3716682..8afae11

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/31/251231/1

diff --git a/VisualEditor b/VisualEditor
index 3716682..8afae11 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3716682570aacb9b7caf9c5c419c56a02579f658
+Subproject commit 8afae11a1c43ee7b6f38269f7db8ac6bc84a62cb

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3716682..8afae11 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 3716682..8afae11
..


Syncronize VisualEditor: 3716682..8afae11

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

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



diff --git a/VisualEditor b/VisualEditor
index 3716682..8afae11 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3716682570aacb9b7caf9c5c419c56a02579f658
+Subproject commit 8afae11a1c43ee7b6f38269f7db8ac6bc84a62cb

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8afae11..4a1a9bb - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 8afae11..4a1a9bb
..


Syncronize VisualEditor: 8afae11..4a1a9bb

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

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



diff --git a/VisualEditor b/VisualEditor
index 8afae11..4a1a9bb 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 8afae11a1c43ee7b6f38269f7db8ac6bc84a62cb
+Subproject commit 4a1a9bbf82335801a15dcd5c4f5326630278701a

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8afae11..4a1a9bb - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 8afae11..4a1a9bb
..

Syncronize VisualEditor: 8afae11..4a1a9bb

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


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

diff --git a/VisualEditor b/VisualEditor
index 8afae11..4a1a9bb 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 8afae11a1c43ee7b6f38269f7db8ac6bc84a62cb
+Subproject commit 4a1a9bbf82335801a15dcd5c4f5326630278701a

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

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

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

[MediaWiki-commits] [Gerrit] ve.init.mw.Target: Update TitleBlacklist error code - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: ve.init.mw.Target: Update TitleBlacklist error code
..


ve.init.mw.Target: Update TitleBlacklist error code

The error code has changed after T115258 and is now consistently
'titleblacklist-forbidden' for all TitleBlacklist errors.

The API now also provides information about the exact error message to
display (error.message) and the TitleBlacklist rule that matched
(error.line), but we probably don't have that message client-side, so
we're not trying to display it. Maybe when we can load it (T40280).

Bug: T116198
Change-Id: I32fccc7d0b2b66c739d59db05c568a56d9f07eec
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 736cf8d..0c200fd 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -586,7 +586,7 @@
} else if ( data.error && data.error.code === 'pagedeleted' ) {
this.saveErrorPageDeleted();
return;
-   } else if ( data.error && data.error.code === 
'titleblacklist-forbidden-edit' ) {
+   } else if ( data.error && data.error.code === 
'titleblacklist-forbidden' ) {
this.saveErrorTitleBlacklist();
return;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32fccc7d0b2b66c739d59db05c568a56d9f07eec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] noc: add role to mw1152 - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: noc: add role to mw1152
..


noc: add role to mw1152

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

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



diff --git a/manifests/site.pp b/manifests/site.pp
index c38a06e..c2e421a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1910,6 +1910,7 @@
 # mw1152 is the experimental HAT script runner
 node 'mw1152.eqiad.wmnet' {
 role mediawiki::maintenance, db::maintenance, mediawiki::generic_monitoring
+include role::noc
 include standard
 include ldap::role::client::labs
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63b8cc27c871dfe9fff382c6048253b259e8b4de
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
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] noc: puppetize dbtree directories - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: noc: puppetize dbtree directories
..


noc: puppetize dbtree directories

Change-Id: I8fa9c482d2fe17faf646a64c6513f3017711ba14
---
M modules/noc/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index a441297..c80b036 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -29,7 +29,9 @@
 $tendril_user_web = $passwords::tendril::db_user_web
 $tendril_pass_web = $passwords::tendril::db_pass_web
 
-file { '/srv/org/wikimedia/dbtree':
+
+
+file { ['/srv/org/wikimedia/dbtree', '/srv/org/wikimedia', '/srv/org']:
 ensure => 'directory',
 owner  => 'mwdeploy',
 group  => 'mwdeploy',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fa9c482d2fe17faf646a64c6513f3017711ba14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
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] Keep alive connection to MySQL database using Ping - change (labs...heritage)

[jenkins-bot (Code Review)]

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

Change subject: Keep alive connection to MySQL database using Ping
..


Keep alive connection to MySQL database using Ping

To avoid OperationalError: MySQL server has gone away

Bug: T117045
Change-Id: Ib49e120500f8d24dbe77fb10740ae8c1eed862b4
---
M erfgoedbot/categorize_images.py
M erfgoedbot/database_statistics.py
M erfgoedbot/images_of_monuments_without_id.py
M erfgoedbot/missing_commonscat_links.py
M erfgoedbot/populate_image_table.py
M erfgoedbot/unused_monument_images.py
M erfgoedbot/update_database.py
M erfgoedbot/update_id_dump.py
8 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Jean-Frédéric: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/erfgoedbot/categorize_images.py b/erfgoedbot/categorize_images.py
index 57de829..3f9c009 100644
--- a/erfgoedbot/categorize_images.py
+++ b/erfgoedbot/categorize_images.py
@@ -188,6 +188,7 @@
 '''
 conn = MySQLdb.connect(host=mconfig.db_server, db=mconfig.db, 
user=config.db_username,
passwd=config.db_password, use_unicode=True, 
charset='utf8')
+conn.ping(True)
 cursor = conn.cursor()
 return (conn, cursor)
 
diff --git a/erfgoedbot/database_statistics.py 
b/erfgoedbot/database_statistics.py
index 58fa9be..e1e65dc 100755
--- a/erfgoedbot/database_statistics.py
+++ b/erfgoedbot/database_statistics.py
@@ -18,6 +18,7 @@
 conn = MySQLdb.connect(host=mconfig.db_server, db=mconfig.db,
user=config.db_username, passwd=config.db_password,
use_unicode=True, charset='utf8')
+conn.ping(True)
 cursor = conn.cursor()
 return (conn, cursor)
 
diff --git a/erfgoedbot/images_of_monuments_without_id.py 
b/erfgoedbot/images_of_monuments_without_id.py
index 5266720..625415c 100644
--- a/erfgoedbot/images_of_monuments_without_id.py
+++ b/erfgoedbot/images_of_monuments_without_id.py
@@ -29,6 +29,7 @@
 '''
 conn = MySQLdb.connect(host=mconfig.db_server, db=mconfig.db, 
user=config.db_username,
passwd=config.db_password, use_unicode=True, 
charset='utf8')
+conn.ping(True)
 cursor = conn.cursor()
 return (conn, cursor)
 
diff --git a/erfgoedbot/missing_commonscat_links.py 
b/erfgoedbot/missing_commonscat_links.py
index 658eea4..c04ea2a 100644
--- a/erfgoedbot/missing_commonscat_links.py
+++ b/erfgoedbot/missing_commonscat_links.py
@@ -25,6 +25,7 @@
 conn = MySQLdb.connect(host=mconfig.db_server, db=mconfig.db,
user=config.db_username, passwd=config.db_password,
use_unicode=True, charset='utf8')
+conn.ping(True)
 cursor = conn.cursor()
 return (conn, cursor)
 
diff --git a/erfgoedbot/populate_image_table.py 
b/erfgoedbot/populate_image_table.py
index 782939f..3ffc122 100644
--- a/erfgoedbot/populate_image_table.py
+++ b/erfgoedbot/populate_image_table.py
@@ -40,6 +40,7 @@
 '''
 conn = MySQLdb.connect(host=mconfig.db_server, db=mconfig.db, 
user=config.db_username,
passwd=config.db_password, use_unicode=True, 
charset='utf8')
+conn.ping(True)
 cursor = conn.cursor()
 return (conn, cursor)
 
diff --git a/erfgoedbot/unused_monument_images.py 
b/erfgoedbot/unused_monument_images.py
index 578e4f8..ee73147 100644
--- a/erfgoedbot/unused_monument_images.py
+++ b/erfgoedbot/unused_monument_images.py
@@ -24,6 +24,7 @@
 '''
 conn = MySQLdb.connect(host=mconfig.db_server, db=mconfig.db, 
user=config.db_username,
passwd=config.db_password, use_unicode=True, 
charset='utf8')
+conn.ping(True)
 cursor = conn.cursor()
 return (conn, cursor)
 
diff --git a/erfgoedbot/update_database.py b/erfgoedbot/update_database.py
index ef08449..9d9f994 100755
--- a/erfgoedbot/update_database.py
+++ b/erfgoedbot/update_database.py
@@ -27,6 +27,7 @@
 '''
 conn = MySQLdb.connect(host=mconfig.db_server, db=mconfig.db, 
user=config.db_username,
passwd=config.db_password, use_unicode=True, 
charset='utf8')
+conn.ping(True)
 cursor = conn.cursor()
 return (conn, cursor)
 
diff --git a/erfgoedbot/update_id_dump.py b/erfgoedbot/update_id_dump.py
index af9ca31..76712f0 100755
--- a/erfgoedbot/update_id_dump.py
+++ b/erfgoedbot/update_id_dump.py
@@ -28,6 +28,7 @@
 '''
 conn = MySQLdb.connect(host=mconfig.db_server, db=mconfig.db, 
user=config.db_username,
passwd=config.db_password, use_unicode=True, 
charset='utf8')
+conn.ping(True)
 cursor = conn.cursor()
 return (conn, cursor)
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib49e120500f8d24dbe77fb10740ae8c1eed862b4
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage

[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] CommandHelp: Cleanup regitry API - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: [BREAKING CHANGE] CommandHelp: Cleanup regitry API
..

[BREAKING CHANGE] CommandHelp: Cleanup regitry API

* Rename 'sequence' list to 'sequences' (plural)
* Rename 'msg' to 'label' and use the deferred message type

Change-Id: I34c0c702fcb6941c45aad0fac1ba74392ad10f18
---
M src/ui/dialogs/ve.ui.CommandHelpDialog.js
M src/ui/ve.ui.CommandHelpRegistry.js
2 files changed, 46 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/11/251211/1

diff --git a/src/ui/dialogs/ve.ui.CommandHelpDialog.js 
b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
index 0a9cac8..6a07922 100644
--- a/src/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -40,27 +40,27 @@
 
 ve.ui.CommandHelpDialog.static.commandGroups = {
textStyle: {
-   title: 'visualeditor-shortcuts-text-style',
+   title: OO.ui.deferMsg( 'visualeditor-shortcuts-text-style' ),
promote: [ 'bold', 'italic', 'link' ],
demote: [ 'clear' ]
},
clipboard: {
-   title: 'visualeditor-shortcuts-clipboard',
+   title: OO.ui.deferMsg( 'visualeditor-shortcuts-clipboard' ),
promote: [],
demote: []
},
formatting: {
-   title: 'visualeditor-shortcuts-formatting',
+   title: OO.ui.deferMsg( 'visualeditor-shortcuts-formatting' ),
promote: [ 'paragraph', 'pre', 'blockquote' ],
demote: []
},
history: {
-   title: 'visualeditor-shortcuts-history',
+   title: OO.ui.deferMsg( 'visualeditor-shortcuts-history' ),
promote: [ 'undo', 'redo' ],
demote: []
},
other: {
-   title: 'visualeditor-shortcuts-other',
+   title: OO.ui.deferMsg( 'visualeditor-shortcuts-other' ),
promote: [ 'findAndReplace', 'findNext', 'findPrevious' ],
demote: [ 'commandHelp' ]
}
@@ -122,9 +122,9 @@
triggerList[ k ].getMessage( true 
).map( ve.ui.CommandHelpDialog.static.buildKeyNode )
).find( 'kbd + kbd' ).before( '+' ).end() );
}
-   if ( commands[ j ].sequence ) {
-   for ( k = 0, kLen = commands[ j 
].sequence.length; k < kLen; k++ ) {
-   sequence = 
ve.ui.sequenceRegistry.lookup( commands[ j ].sequence[ k ] );
+   if ( commands[ j ].sequences ) {
+   for ( k = 0, kLen = commands[ j 
].sequences.length; k < kLen; k++ ) {
+   sequence = 
ve.ui.sequenceRegistry.lookup( commands[ j ].sequences[ k ] );
if ( sequence ) {
$shortcut.append( $( '' )
.attr( 'data-label', 
ve.msg( 'visualeditor-shortcuts-sequence-notice' ) )
@@ -137,14 +137,14 @@
}
$list.append(
$shortcut,
-   $( '' ).text( ve.msg( commands[ j ].msg ) )
+   $( '' ).text( OO.ui.resolveMsg( commands[ j 
].label ) )
);
}
this.$container.append(
$( '' )
.addClass( 've-ui-commandHelpDialog-section' )
.append(
-   $( '' ).text( ve.msg( 
commandGroups[ i ].title ) ),
+   $( '' ).text( OO.ui.resolveMsg( 
commandGroups[ i ].title ) ),
$list
)
);
diff --git a/src/ui/ve.ui.CommandHelpRegistry.js 
b/src/ui/ve.ui.CommandHelpRegistry.js
index da7cd04..988d5c3 100644
--- a/src/ui/ve.ui.CommandHelpRegistry.js
+++ b/src/ui/ve.ui.CommandHelpRegistry.js
@@ -29,6 +29,10 @@
  * @param {string} groupName Dialog-category in which to display this
  * @param {string} commandName Name of the command
  * @param {Object} details Details about the command
+ * @param {Function|string} details.label Label describing the command. String 
or deferred message function.
+ * @param {string} [details.trigger] Symbolic name of trigger this for this 
command
+ * @param {string} [details.shortcut] Keyboard shortcut if this is not a real 
trigger (e.g. copy/paste)
+ * @param {string[]} [details.sequences] Symbolic names of sequences, if this 
is a sequence, not a trigger
  */
 ve.ui.CommandHelpRegistry.prototype.register = function ( 

[MediaWiki-commits] [Gerrit] VE: Register sequence with CommandHelp - change (mediawiki...wikihiero)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: VE: Register sequence with CommandHelp
..

VE: Register sequence with CommandHelp

Depends on I65e2bfc2 in VE-MW

Change-Id: I6e8575b9e7dcfe08c7d3c0e372c938c85a05feba
---
M modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js 
b/modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
index 46b3945..a364e14 100644
--- a/modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
+++ b/modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
@@ -32,3 +32,8 @@
 ve.ui.sequenceRegistry.register(
new ve.ui.Sequence( 'wikitextHiero', 'hiero', '

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

[MediaWiki-commits] [Gerrit] fully deprovision tungsten - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: fully deprovision tungsten
..


fully deprovision tungsten

Bug: T97274
Change-Id: I5dbec26cae171799f944231c915daa8f595ce57a
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 3 insertions(+), 8 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 2fa385b..c38a06e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1095,7 +1095,7 @@
 }
 }
 
-# Primary graphite machines, replacing tungsten
+# Primary graphite machines
 node 'graphite1001.eqiad.wmnet' {
 role graphite::production, statsdlb, performance, 
graphite::production::alerts, restbase::alerts
 include standard
@@ -1106,7 +1106,7 @@
 role testsystem
 }
 
-# Primary graphite machines, replacing tungsten
+# Primary graphite machines
 node 'graphite2001.codfw.wmnet' {
 role graphite::production, statsdlb, gdash
 include standard
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index a934c25..52d1b02 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -71,7 +71,7 @@
elastic20[0-2][0-9]|elastic203[0-1]) echo 
partman/elasticsearch-raid1.cfg ;; \

bromine|etherpad[12]001|fermium|krypton|mendelevium|planet1001|pollux|rutherfordium)
 echo partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
-   francium|nobelium|tungsten) echo partman/raid10-gpt.cfg ;; \
+   francium|nobelium) echo partman/raid10-gpt.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
ganeti200[1-9]) echo partman/ganeti.cfg ;; \
graphite1002) echo partman/graphite-dmcache.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 702dd3b..f8b2d36 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6305,11 +6305,6 @@
fixed-address titanium.wikimedia.org;
 }
 
-host tungsten {
-   hardware ethernet 78:2b:cb:0a:04:12;
-   fixed-address tungsten.eqiad.wmnet;
-}
-
 host uranium {
hardware ethernet 84:2b:2b:fb:a6:67;
fixed-address uranium.wikimedia.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5dbec26cae171799f944231c915daa8f595ce57a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Create a define to register extra LDAP schemas - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Create a define to register extra LDAP schemas
..

Create a define to register extra LDAP schemas

Also move the existing base LDAP schemas to this mechanism.

Bug: T101299
Change-Id: Ic7c158386982e62d4b394002b4a6457e5d95b83a
---
M modules/openldap/manifests/init.pp
1 file changed, 17 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/251229/1

diff --git a/modules/openldap/manifests/init.pp 
b/modules/openldap/manifests/init.pp
index d2d0e72..8284fb2 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -53,6 +53,19 @@
 
 require_package('slapd', 'ldap-utils', 'python-ldap')
 
+define include_ldap_schemas {
+file { "/etc/ldap/schema/$name" :
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+source  => "puppet:///modules/openldap/$name",
+}
+
+Package['slapd'] -> File["/etc/ldap/schema/$name"]
+File["/etc/ldap/schema/$name"] -> Service['slapd']
+}
+
 service { 'slapd':
 ensure => running,
 hasstatus  => true,
@@ -85,21 +98,12 @@
 content => template('openldap/default.erb'),
 }
 
-file { '/etc/ldap/schema/samba.schema' :
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/openldap/samba.schema',
+include_ldap_schemas { ['samba.schema', 'rfc2307bis.schema']
+
+if $extra_schemas {
+include_ldap_schemas { $extra_schemas: }
 }
 
-file { '/etc/ldap/schema/rfc2307bis.schema' :
-ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/openldap/rfc2307bis.schema',
-}
 # We do this cause we want to rely on using slapd.conf for now
 exec { 'rm_slapd.d':
 onlyif  => '/usr/bin/test -d /etc/ldap/slapd.d',
@@ -124,9 +128,5 @@
 File['/etc/ldap/slapd.conf'] ~> Service['slapd'] # We also notify
 File['/etc/default/slapd'] ~> Service['slapd'] # We also notify
 File[$datadir] -> Service['slapd']
-Package['slapd'] -> File['/etc/ldap/schema/rfc2307bis.schema']
-Package['slapd'] -> File['/etc/ldap/schema/samba.schema']
-File['/etc/ldap/schema/rfc2307bis.schema'] -> Service['slapd']
-File['/etc/ldap/schema/samba.schema'] -> Service['slapd']
 File['/etc/ldap/ldap.conf'] -> Service['slapd']
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7c158386982e62d4b394002b4a6457e5d95b83a
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] Add triggeringRevisionId to LinksUpdate JobSpec - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Add triggeringRevisionId to LinksUpdate JobSpec
..

Add triggeringRevisionId to LinksUpdate JobSpec

Bug: T117860
Change-Id: I8c730a434b8bdda7664fd1e3bb3fbc8840804950
---
M includes/changes/RecentChange.php
M includes/deferred/LinksUpdate.php
M includes/jobqueue/jobs/RefreshLinksJob.php
3 files changed, 18 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/251230/1

diff --git a/includes/changes/RecentChange.php 
b/includes/changes/RecentChange.php
index 9025736..7c6fbb9 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -800,7 +800,6 @@
$ip = '',
$deleted = 0
) {
-
$rc = new RecentChange;
$rc->mTitle = $categoryTitle;
$rc->mPerformer = $user;
diff --git a/includes/deferred/LinksUpdate.php 
b/includes/deferred/LinksUpdate.php
index 9a24b96..dbfdab0d 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -1011,6 +1011,13 @@
} else {
$userInfo = false;
}
+
+   if ( $this->mRevision ) {
+   $triggeringRevisionId = $this->mRevision->getId();
+   } else {
+   $triggeringRevisionId = false;
+   }
+
return array(
'wiki' => $this->mDb->getWikiID(),
'job'  => new JobSpecification(
@@ -1020,6 +1027,7 @@
'rootJobTimestamp' => 
$this->mParserOutput->getCacheTime(),
'useRecursiveLinksUpdate' => 
$this->mRecursive,
'triggeringUser' => $userInfo,
+   'triggeringRevisionId' => 
$triggeringRevisionId,
),
array( 'removeDuplicates' => true ),
$this->getTitle()
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php 
b/includes/jobqueue/jobs/RefreshLinksJob.php
index 26f4520..25c3ba4 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -229,6 +229,16 @@
}
$update->setTriggeringUser( $user );
}
+   if ( isset( 
$this->params['triggeringRevisionId'] ) && 
$this->params['triggeringRevisionId'] ) {
+   $revision = Revision::newFromId( 
$this->params['triggeringRevisionId'] );
+   if ( $revision === null ) {
+   $revision = Revision::newFromId(
+   
$this->params['triggeringRevisionId'],
+   Revision::READ_LATEST
+   );
+   }
+   $update->setRevision( $revision );
+   }
}
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Add footer (copyright/privacy/about/disclaimers/project links) - change (mediawiki...Blueprint)

[Pastakhov (Code Review)]

Pastakhov has uploaded a new change for review.

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

Change subject: Add footer (copyright/privacy/about/disclaimers/project links)
..

Add footer (copyright/privacy/about/disclaimers/project links)

Change BlueprintSkinTemplate base class from QuickTemplate to BaseTemplate
It's used for functions:
* getIndicators()
* getFooterLinks()
* getFooterIcons()

It's identical to skin Vector

Bug: T104288
Change-Id: I46ca48da671563a403db5bcf41f3751b9be027fe
---
M resources/master.less
M src/BlueprintSkinTemplate.php
M templates/Skin.mustache
3 files changed, 85 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint 
refs/changes/17/251217/1

diff --git a/resources/master.less b/resources/master.less
index ff2e1ec..261c6b8 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -301,6 +301,65 @@
background-color: @sidebar-bg-color;
 }
 
+/* Footer */
+// copyed from footer.less of skin Vector
+div#footer {
+   margin-left: 10em;
+   margin-top: 0;
+   padding: 0.75em;
+   direction: ltr;
+   font-size: 1.1em;
+
+   ul {
+   list-style-type: none;
+   list-style-image: none;
+   margin: 0;
+   padding: 0;
+
+   li {
+   margin: 0;
+   padding: 0;
+   padding-top: 0.5em;
+   padding-bottom: 0.5em;
+   color: #333;
+   font-size: 0.7em;
+   }
+   }
+
+   #footer-icons {
+   float: right;
+
+   li {
+   float: left;
+   margin-left: 0.5em;
+   line-height: 2em;
+   text-align: right;
+   }
+   }
+
+   #footer-info {
+   li {
+   line-height: 1.4em;
+   }
+   }
+
+   #footer-places {
+   li {
+   float: left;
+   margin-right: 1em;
+   line-height: 2em;
+   }
+   }
+}
+
+body.ltr {
+   div#footer {
+   #footer-places {
+   /* @noflip */
+   float: left;
+   }
+   }
+}
 
 /* MediaWiki Stuff */
 @media screen {
diff --git a/src/BlueprintSkinTemplate.php b/src/BlueprintSkinTemplate.php
index d1b6c5e..92bde84 100644
--- a/src/BlueprintSkinTemplate.php
+++ b/src/BlueprintSkinTemplate.php
@@ -1,6 +1,6 @@
 data['getdebughtml'] = MWDebug::getDebugHTML( 
$this->getSkin()->getContext() );
$this->data['left_nav_sections'] = $this->getLeftNav();
@@ -13,19 +13,31 @@
} else {
$this->data['username'] = wfMessage( 
'blueprint-anon-username' )->text();
}
-   // Make HTML for page status indicators, copied from 
BaseTemplate::getIndicators().
-   $tmp = "\n";
-   foreach ( $this->data['indicators'] as $id => $content ) {
-   $tmp .= Html::rawElement(
-   'div',
-   array(
-   'id' => Sanitizer::escapeId( 
"mw-indicator-$id" ),
-   'class' => 'mw-indicator',
-   ),
-   $content
-   ) . "\n";
+
+   $this->data['html_indicators'] = $this->getIndicators(); // Get 
page status indicators HTML
+
+   // Make HTML of footer links, copied from class VectorTemplate
+   $tmp = 'data['userlangattributes'] . ">\n";
+   foreach ( $this->getFooterLinks() as $category => $links ) {
+   $tmp .= "\n";
+   foreach ( $links as $link ) {
+   $tmp .= "" . 
$this->data[$link] . "\n";
+   }
+   $tmp .= "\n";
}
-   $this->data['html_indicators'] = $tmp . "\n";
+   $footericons = $this->getFooterIcons( "icononly" );
+   if ( count( $footericons ) > 0 ) {
+   $tmp .= '' . "\n";
+   foreach ( $footericons as $blockName => $footerIcons ) {
+   $tmp .= '' . "\n";
+   foreach ( $footerIcons as $icon ) {
+   $tmp .= 
$this->getSkin()->makeFooterIcon( $icon );
+   }
+   $tmp .= "\n";
+   }
+   $tmp .= "\n";
+   }
+   $this->data['html_footer'] = $tmp . "\n\n";
 
$templateParser = new TemplateParser( __DIR__ . '/../templates' 
);
try {
diff 

[MediaWiki-commits] [Gerrit] Move wikibase stuff to wikibase directory - change (wikidata...rdf)

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Move wikibase stuff to wikibase directory
..

Move wikibase stuff to wikibase directory

Change-Id: I4ac95066a7af0b0587e308c6baa6bb411c177c8c
---
M gui/index.html
R gui/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js
R gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
R gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
4 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/gui/index.html b/gui/index.html
index f853505..43b15b6 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -6,18 +6,18 @@
 
 
 
-
-
-
 
+
+
+
 
 
 
 
-
 
 
 
+
 
 
diff --git a/gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js 
b/gui/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js
similarity index 100%
rename from gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js
rename to gui/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js
diff --git a/gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js 
b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
similarity index 100%
rename from gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js
rename to gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
diff --git a/gui/vendor/codemirror/addon/tooltip/WikibaseRDFTooltip.js 
b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
similarity index 100%
rename from gui/vendor/codemirror/addon/tooltip/WikibaseRDFTooltip.js
rename to gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ac95066a7af0b0587e308c6baa6bb411c177c8c
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] Merge branch 'debian/precise-wikimedia' into debian/trusty-w... - change (integration/zuul)

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: Merge branch 'debian/precise-wikimedia' into 
debian/trusty-wikimedia
..


Merge branch 'debian/precise-wikimedia' into debian/trusty-wikimedia

Change-Id: Ic59fb96be7edfe1a26789578d8369fbd0d27fa8e
---
M debian/changelog
M debian/control
2 files changed, 9 insertions(+), 66 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 0374d00..b7e18a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,54 +1,12 @@
-<<< HEAD   (38cdea Merge branch 'debian/precise-wikimedia' into 
debian/trusty-w)
-zuul (2.0.0-304-g685ca22-wmf2trusty1) trusty-wikimedia; urgency=low
-===
-zuul (2.1.0-60-g1cc37f7-wmf1precise1) precise-wikimedia; urgency=medium
+zuul (2.1.0-60-g1cc37f7-wmf1trusty1) trusty-wikimedia; urgency=medium
 
+  * Sync with precise-wikimedia
   * Bump upstream from 3ebedde to 1cc37f7
+  * Embed python-daemon and python-gear
 
-  * Rebased patches and dropped patches merged upstream
-  0002-Merger-ensure_cloned-now-looks-for-.git.patch
-  0007-Remove-lockfile-from-requirements.patch
+ -- Antoine Musso   Mon, 02 Nov 2015 16:50:58 +0100
 
-  * Dependencies changes:
-Babel1.3 -> 2.1.1
-lockfile  0.10.2 -> 0.11.0
-python-daemon  2.0.5 -> 2.0.6
-+ gear 0.5.8
-
- -- Antoine Musso   Mon, 02 Nov 2015 12:01:46 +0100
-
-zuul (2.0.0-327-g3ebedde-wmf3precise1) precise-wikimedia; urgency=medium
-
-  * 0008-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no
-Makes Zuul to send code-review and verified label votes using the shortcuts
---verified and --code-review since --label is case sensitive.
-   See https://phabricator.wikimedia.org/T106596
-
- -- Antoine Musso   Thu, 23 Jul 2015 14:11:53 +
-
-zuul (2.0.0-327-g3ebedde-wmf2precise1) precise-wikimedia; urgency=medium
-
-  * 0007-Remove-lockfile-from-requirements.patch
-  * python-daemon 2.x shipped via the venv
-
- -- Antoine Musso   Tue, 21 Jul 2015 21:27:42 +0200
-
-zuul (2.0.0-327-g3ebedde-wmf1precise1) precise-wikimedia; urgency=low
-
-  * Bump upstream 5984adc..3ebedde
-  * python-daemon to >= 2.0.4
-
- -- Antoine Musso   Tue, 21 Jul 2015 16:29:03 +0200
-
-
-zuul (2.0.0-306-g5984adc-wmf1precise1) precise-wikimedia; urgency=low
-
-  * Bump GitPython from 0.3.2.RC1 to 0.3.2.1. Fetched by dh_virtualenv.
-
- -- Antoine Musso   Mon, 20 Jul 2015 16:10:02 +0200
-
-zuul (2.0.0-304-g685ca22-wmf2precise1) precise-wikimedia; urgency=low
->>> BRANCH (5ceb59 Bump Debian version and rebase patches)
+zuul (2.0.0-304-g685ca22-wmf2trusty1) trusty-wikimedia; urgency=low
 
   * Sync with precise-wikimedia
   * T97106 zuul-cloner should use hard links when fetching from cache-dir
diff --git a/debian/control b/debian/control
index 031e93e..cb6f0d4 100644
--- a/debian/control
+++ b/debian/control
@@ -23,23 +23,16 @@
  python-paste,
  python-webob,
  python-paramiko,
-<<< HEAD   (38cdea Merge branch 'debian/precise-wikimedia' into 
debian/trusty-w)
- python-git (>= 0.3.2~RC1), python-git (<<0.3.3),
- python-gitdb,
- python-smmap,
- python-lockfile (>= 0.8),
-===
-# python-git (= 0.3.2.RC1-1),
+# python-git (>= 0.3.2~RC1),python-git (<<0.3.3),
 # python-gitdb,
 # python-smmap,
->>> BRANCH (5ceb59 Bump Debian version and rebase patches)
 #Build in python 2.7:
 #python-orderdict
 #python-daemon,
  python-extras,
 #python-statsd (>= 1.0.0, <3.0)
  python-voluptuous (>= 0.7),
- python-gear (>= 0.5.4),
+# python-gear (>= 0.5.4),
  python-apscheduler (>= 2.1.1),
  python-prettytable (>= 0.6),
  python-tz,
@@ -84,21 +77,13 @@
  python-paste,
  python-webob,
  python-paramiko,
-<<< HEAD   (38cdea Merge branch 'debian/precise-wikimedia' into 
debian/trusty-w)
- python-git (>= 0.3.2~RC1), python-git (<<0.3.3),
- python-gitdb,
- python-smmap,
- python-lockfile (>= 0.8),
- python-daemon,
-===
-# python-git (= 0.3.2.RC1-1),
+# python-git (>= 0.3.2~RC1),python-git (<<0.3.3),
 # python-gitdb,
 # python-smmap,
 # python-daemon,
->>> BRANCH (5ceb59 Bump Debian version and rebase patches)
  python-extras,
  python-voluptuous (>= 0.7),
- python-gear (>= 0.5.4),
+# python-gear (>= 0.5.4),
  python-apscheduler (>= 2.1.1),
  python-prettytable (>= 0.6),
  python-six (>= 1.6.0),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic59fb96be7edfe1a26789578d8369fbd0d27fa8e
Gerrit-PatchSet: 2
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/trusty-wikimedia
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 

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

[MediaWiki-commits] [Gerrit] noc: remove mod_userdir inclusion - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: noc: remove mod_userdir inclusion
..

noc: remove mod_userdir inclusion

It's not needed in noc since we now redirect to people.w.o

Change-Id: I78bb1e7b47b23a39ea12e92b7bf8a5b932a20842
---
M modules/noc/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index e9941d5..5642faa 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -13,7 +13,7 @@
 }
 
 include ::apache::mod::php5
-include ::apache::mod::userdir
+
 include ::apache::mod::rewrite
 include ::apache::mod::headers
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78bb1e7b47b23a39ea12e92b7bf8a5b932a20842
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] noc: make noc virtualhost compatible with apache 2.4 - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: noc: make noc virtualhost compatible with apache 2.4
..

noc: make noc virtualhost compatible with apache 2.4

Change-Id: Ibbb930966db1a3596cd6fc146de0f7233a070fcd
---
M modules/noc/templates/noc.wikimedia.org.erb
1 file changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/modules/noc/templates/noc.wikimedia.org.erb 
b/modules/noc/templates/noc.wikimedia.org.erb
index cb442e1..99034d2 100644
--- a/modules/noc/templates/noc.wikimedia.org.erb
+++ b/modules/noc/templates/noc.wikimedia.org.erb
@@ -29,8 +29,13 @@
 CustomLog /var/log/apache2/access.log combined
 
 
-Order Deny,Allow
 AllowOverride All
+= 2.4>
+Require all granted
+
+
+Order Deny,Allow
+
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbb930966db1a3596cd6fc146de0f7233a070fcd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] noc: add role to mw1152 - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: noc: add role to mw1152
..

noc: add role to mw1152

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/251226/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 2fa385b..77b8863 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1910,6 +1910,7 @@
 # mw1152 is the experimental HAT script runner
 node 'mw1152.eqiad.wmnet' {
 role mediawiki::maintenance, db::maintenance, mediawiki::generic_monitoring
+include role::noc
 include standard
 include ldap::role::client::labs
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63b8cc27c871dfe9fff382c6048253b259e8b4de
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] noc: remove unused ssl settings - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: noc: remove unused ssl settings
..

noc: remove unused ssl settings

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


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

diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 75b62ec..505fa24 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -4,8 +4,6 @@
 
 include ::apache
 
-$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat')
-
 apache::site { 'noc.wikimedia.org':
 content => template('noc/noc.wikimedia.org.erb'),
 }
@@ -53,4 +51,3 @@
 }
 
 }
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd15fda78e05cbacb6311a2502bb4fa3ae5802e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] mediawiki: extract php config from web::modules, use in noc - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: mediawiki: extract php config from web::modules, use in noc
..

mediawiki: extract php config from web::modules, use in noc

As we want to make ::noc compatible with trusty, we need to include the
relevant configuration in the module. We abstract this common config to
a separate class that we can include here as well.

Change-Id: Ifeacd1610660085979f33c036463124f1eaee287
---
M modules/mediawiki/manifests/web/modules.pp
A modules/mediawiki/manifests/web/php_engine.pp
M modules/noc/manifests/init.pp
3 files changed, 48 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/251224/1

diff --git a/modules/mediawiki/manifests/web/modules.pp 
b/modules/mediawiki/manifests/web/modules.pp
index 86c2f26..bbb3136 100644
--- a/modules/mediawiki/manifests/web/modules.pp
+++ b/modules/mediawiki/manifests/web/modules.pp
@@ -10,35 +10,8 @@
 include ::apache::mod::setenvif
 include ::apache::mod::status
 
-if os_version('ubuntu >= trusty') {
-include ::apache::mod::proxy_fcgi
-
-apache::mod_conf { 'mod_php5':
-ensure => absent,
-}
-
-# HHVM catchall, and removal of mod_php
-apache::conf { 'hhvm_catchall':
-source   => 
'puppet:///modules/mediawiki/apache/configs/hhvm_catchall.conf',
-priority => 50,
-}
-
-# Mark static assets as coming from an HHVM appserver as well. Needed 
for Varnish
-apache::conf { 'mark_engine':
-source   => 
'puppet:///modules/mediawiki/apache/configs/hhvm_mark_engine.conf',
-priority => 49,
-}
-
-# Add headers lost by mod_proxy_fastcgi
-apache::conf { 'fcgi_headers':
-source   => 
'puppet:///modules/mediawiki/apache/configs/fcgi_headers.conf',
-priority => 0,
-}
-
-
-} else {
-include ::apache::mod::php5
-}
+# Include the apache configurations for php
+include ::mediawiki::web::php_engine
 
 # Modules we don't enable.
 # Note that deflate and filter are activated deep down in the
diff --git a/modules/mediawiki/manifests/web/php_engine.pp 
b/modules/mediawiki/manifests/web/php_engine.pp
new file mode 100644
index 000..7f3dfcb
--- /dev/null
+++ b/modules/mediawiki/manifests/web/php_engine.pp
@@ -0,0 +1,34 @@
+# === Class mediawiki::web::php_engine
+# Selects to run web requests via mod_php or HHVM depending on the OS version.
+class mediawiki::web::php_engine {
+if os_version('ubuntu >= trusty') {
+include ::apache::mod::proxy_fcgi
+
+apache::mod_conf { 'mod_php5':
+ensure => absent,
+}
+
+# HHVM catchall, and removal of mod_php
+apache::conf { 'hhvm_catchall':
+source   => 
'puppet:///modules/mediawiki/apache/configs/hhvm_catchall.conf',
+priority => 50,
+}
+
+# Mark static assets as coming from an HHVM appserver as well. Needed 
for Varnish
+apache::conf { 'mark_engine':
+source   => 
'puppet:///modules/mediawiki/apache/configs/hhvm_mark_engine.conf',
+priority => 49,
+}
+
+# Add headers lost by mod_proxy_fastcgi
+apache::conf { 'fcgi_headers':
+source   => 
'puppet:///modules/mediawiki/apache/configs/fcgi_headers.conf',
+priority => 0,
+}
+
+
+} else {
+include ::apache::mod::php5
+}
+
+}
diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 5642faa..a441297 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -2,7 +2,19 @@
 # https://dbtree.wikimedia.org/
 class noc {
 
+# NOC needs a working mediawiki installation at the moment
+include ::mediawiki
+
 include ::apache
+
+if os_version('ubuntu >= trusty') {
+apache::def { 'HHVM': }
+}
+
+include ::mediawiki::web::php_engine
+
+include ::apache::mod::rewrite
+include ::apache::mod::headers
 
 apache::site { 'noc.wikimedia.org':
 content => template('noc/noc.wikimedia.org.erb'),
@@ -11,11 +23,6 @@
 apache::site { 'dbtree.wikimedia.org':
 content => template('noc/dbtree.wikimedia.org.erb'),
 }
-
-include ::apache::mod::php5
-
-include ::apache::mod::rewrite
-include ::apache::mod::headers
 
 # dbtree config
 include passwords::tendril

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeacd1610660085979f33c036463124f1eaee287
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing 

[MediaWiki-commits] [Gerrit] noc: remove mod_cgi - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: noc: remove mod_cgi
..

noc: remove mod_cgi

it's not compatible with apache 2.4, and it's apparently unused (no
AddHandler directive or ScriptAlias to speak of on terbium).

Probably just a relic of a past time.

Change-Id: I97b8de7f21547a26cd48be0d602c39aa9d0d6c75
---
M modules/noc/manifests/init.pp
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 505fa24..e9941d5 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -14,7 +14,6 @@
 
 include ::apache::mod::php5
 include ::apache::mod::userdir
-include ::apache::mod::cgi
 include ::apache::mod::rewrite
 include ::apache::mod::headers
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97b8de7f21547a26cd48be0d602c39aa9d0d6c75
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] noc: point misc-varnish to mw1152 for both noc and dbtree - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: noc: point misc-varnish to mw1152 for both noc and dbtree
..

noc: point misc-varnish to mw1152 for both noc and dbtree

Change-Id: I9f79eeddcb20fa9bbea4511b841b80718bd2a621
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index a363423..82b0366 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -79,7 +79,7 @@
 // No caching of configs; scripts may want to know when things change
 return (pass);
 } elsif (req.http.Host == "noc.wikimedia.org" || req.http.Host == 
"dbtree.wikimedia.org") {
-set req.backend = terbium;
+set req.backend = mw1152.eqiad.wmnet;
 } elsif (req.http.Host == "scholarships.wikimedia.org" || req.http.Host == 
"iegreview.wikimedia.org") {
 set req.backend = krypton;
 } elsif (req.http.Host == "hue.wikimedia.org") {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f79eeddcb20fa9bbea4511b841b80718bd2a621
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] VE: Register sequence with CommandHelp - change (mediawiki...SyntaxHighlight_GeSHi)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: VE: Register sequence with CommandHelp
..

VE: Register sequence with CommandHelp

Depends on I65e2bfc2 in VE-MW

Change-Id: I6054caa97c4f7e5fcd632912534deac977af6016
---
M modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js 
b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js
index bc93faa..7a38705 100644
--- a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js
+++ b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js
@@ -44,3 +44,8 @@
 ve.ui.sequenceRegistry.register(
new ve.ui.Sequence( 'wikitextSource', 'syntaxhighlightDialog', 
'

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

[MediaWiki-commits] [Gerrit] CommandHelpDialog: Layout tweak - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: CommandHelpDialog: Layout tweak
..

CommandHelpDialog: Layout tweak

Centre titles, move the lists closer to the titles and get rid
of bottom whitespace.

Change-Id: Iac72dd6b3bec36ba70a5d5e439a0663e6813f678
---
M src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/16/251216/1

diff --git a/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css 
b/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
index 2712d31..3e313c3 100644
--- a/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
+++ b/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
@@ -21,12 +21,13 @@
 }
 
 .ve-ui-commandHelpDialog-section h3 {
-   margin: 0 0 1em 0;
+   text-align: center;
+   margin: 0;
padding: 0;
 }
 
 .ve-ui-commandHelpDialog-list {
-   margin: 1em 0;
+   margin: 0.5em 0 1.5em 0;
 }
 
 .ve-ui-commandHelpDialog-list dd {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac72dd6b3bec36ba70a5d5e439a0663e6813f678
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] [PULL THROUGH] Update CommandHelpRegistry calls - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: [PULL THROUGH] Update CommandHelpRegistry calls
..

[PULL THROUGH] Update CommandHelpRegistry calls

Depends on I34c0c702fc in master

Change-Id: I65e2bfc299fbd60d6bdc7a57a030980b6cb8ab18
---
M modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
M modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
M modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js
M modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
M modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js
5 files changed, 15 insertions(+), 15 deletions(-)


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

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
index 413fa8a..8048799 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
@@ -27,7 +27,7 @@
 
 ve.ui.MWCommandHelpDialog.static.commandGroups = ve.extendObject( 
ve.ui.CommandHelpDialog.static.commandGroups, {
insert: {
-   title: 'visualeditor-shortcuts-insert',
+   title: OO.ui.deferMsg( 'visualeditor-shortcuts-insert' ),
promote: [],
demote: []
}
@@ -44,7 +44,7 @@
if ( save !== '-' && save !== '' ) {
ve.ui.commandHelpRegistry.register( 'other', 'save', {
shortcuts: [ accessKeyPrefix + save.toUpperCase() ],
-   msg: 'visualeditor-savedialog-label-save',
+   label: OO.ui.deferMsg( 
'visualeditor-savedialog-label-save' ),
demote: true
} );
}
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
index 36a5c23..1830044 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWLinkInspectorTool.js
@@ -79,4 +79,4 @@
new ve.ui.Sequence( 'wikitextLink', 'link', '[[', 2 )
 );
 
-ve.ui.commandHelpRegistry.register( 'textStyle', 'link', { sequence: [ 
'wikitextLink' ] } );
+ve.ui.commandHelpRegistry.register( 'textStyle', 'link', { sequences: [ 
'wikitextLink' ] } );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js
index e81e85f..a365e16 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js
@@ -65,8 +65,8 @@
 );
 
 ve.ui.commandHelpRegistry.register( 'insert', 'ref', {
-   sequence: [ 'wikitextRef' ],
-   msg: 'visualeditor-dialog-reference-title'
+   sequences: [ 'wikitextRef' ],
+   label: OO.ui.deferMsg( 'visualeditor-dialog-reference-title' )
 } );
 
 /**
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
index e84b771..646bde9 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
@@ -87,6 +87,6 @@
 );
 
 ve.ui.commandHelpRegistry.register( 'insert', 'template', {
-   sequence: [ 'wikitextTemplate' ],
-   msg: 'visualeditor-dialog-template-title'
+   sequences: [ 'wikitextTemplate' ],
+   label: OO.ui.deferMsg( 'visualeditor-dialog-template-title' )
 } );
diff --git a/modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js 
b/modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js
index b961fce..20b3769 100644
--- a/modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js
+++ b/modules/ve-mw/ui/ve.ui.MWSequenceRegistry.js
@@ -36,16 +36,16 @@
 /* Help registrations */
 
 ve.ui.commandHelpRegistry.register( 'formatting', 'heading2', {
-   sequence: [ 'wikitextHeading' ],
-   msg: 'visualeditor-formatdropdown-format-heading2'
+   sequences: [ 'wikitextHeading' ],
+   label: OO.ui.deferMsg( 'visualeditor-formatdropdown-format-heading2' )
 } );
-ve.ui.commandHelpRegistry.register( 'formatting', 'listNumber', { sequence: [ 
'numberHash' ] } );
-ve.ui.commandHelpRegistry.register( 'formatting', 'blockquote', { sequence: [ 
'wikitextDescription' ] } );
+ve.ui.commandHelpRegistry.register( 'formatting', 'listNumber', { sequences: [ 
'numberHash' ] } );
+ve.ui.commandHelpRegistry.register( 'formatting', 'blockquote', { sequences: [ 
'wikitextDescription' ] } );
 ve.ui.commandHelpRegistry.register( 'insert', 'table', {
-   sequence: [ 'wikitextTable' ],
-   msg: 'visualeditor-table-insert-table'
+   sequences: [ 'wikitextTable' ],
+   label: OO.ui.deferMsg( 'visualeditor-table-insert-table' )
 } );
 ve.ui.commandHelpRegistry.register( 'insert', 'comment', {
-   sequence: [ 'wikitextComment' ],
-   msg: 'visualeditor-commentinspector-title'
+   sequences: [ 'wikitextComment' ],
+   

[MediaWiki-commits] [Gerrit] VE: Register sequence with CommandHelp - change (mediawiki...Math)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: VE: Register sequence with CommandHelp
..

VE: Register sequence with CommandHelp

Depends on I65e2bfc2 in VE-MW

Change-Id: I8f71b1b242cb5c273c6d4a16bdfef6bf1e0adb55
---
M modules/ve-math/ve.ui.MWMathInspectorTool.js
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-math/ve.ui.MWMathInspectorTool.js 
b/modules/ve-math/ve.ui.MWMathInspectorTool.js
index 2056416..dc65dfb 100644
--- a/modules/ve-math/ve.ui.MWMathInspectorTool.js
+++ b/modules/ve-math/ve.ui.MWMathInspectorTool.js
@@ -39,3 +39,8 @@
 ve.ui.sequenceRegistry.register(
new ve.ui.Sequence( 'wikitextMath', 'math', '

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

[MediaWiki-commits] [Gerrit] openldap: Allow specifying an additional set of LDAP schemas - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: openldap: Allow specifying an additional set of LDAP schemas
..


openldap: Allow specifying an additional set of LDAP schemas

Bug: T101299
Change-Id: I376e2d320fc555cb069c27f9b18d7cd4af6879ad
---
M modules/openldap/manifests/init.pp
M modules/openldap/templates/slapd.erb
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/openldap/manifests/init.pp 
b/modules/openldap/manifests/init.pp
index 95fc7cc..d2d0e72 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -24,6 +24,8 @@
 #   Optional. TLS enable the server. The path to the certificate file
 #$ca
 #   Optional. TLS enable the server. The path to the CA certificate file
+#$extra_schemas
+#   Optional. A list of schema files relative to the /etc/ldap/schema 
directory
 #
 # Actions:
 #   Install/configure slapd
@@ -46,6 +48,7 @@
 $certificate=undef,
 $key=undef,
 $ca=undef,
+$extra_schemas=undef,
 ) {
 
 require_package('slapd', 'ldap-utils', 'python-ldap')
diff --git a/modules/openldap/templates/slapd.erb 
b/modules/openldap/templates/slapd.erb
index 05e85f8..189c7ee 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -15,6 +15,11 @@
 include /etc/ldap/schema/samba.schema
 include /etc/ldap/schema/ppolicy.schema
 
+<% if @extra_schemas -%>
+<%- @extra_schemas.each do |extra_schema| %>
+include /etc/ldap/schema/<%= extra_schema %>
+<% end %>
+<% end -%>
 # Where the pid file is put. The init.d script
 # will not stop the server if you change this.
 pidfile /var/run/slapd/slapd.pid

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I376e2d320fc555cb069c27f9b18d7cd4af6879ad
Gerrit-PatchSet: 8
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] Fix #property parser function's default language - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix #property parser function's default language
..

Fix #property parser function's default language

I used git bisect to find that this bug was introduced in
https://gerrit.wikimedia.org/r/243640

Change-Id: I76a9615fc723034ad22f395c6aa760c06345c589
Fixes: T116503
(cherry picked from commit e458e8c1c2c822fbaa52713e46c059e4d7182d1c)
---
M lib/includes/formatters/OutputFormatSnakFormatterFactory.php
M lib/includes/formatters/OutputFormatValueFormatterFactory.php
M lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
3 files changed, 43 insertions(+), 19 deletions(-)


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

diff --git a/lib/includes/formatters/OutputFormatSnakFormatterFactory.php 
b/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
index 1dc158f..bf03a82 100644
--- a/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
+++ b/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
@@ -61,7 +61,6 @@
 * @return SnakFormatter
 */
public function getSnakFormatter( $format, FormatterOptions $options ) {
-   $options->defaultOption( SnakFormatter::OPT_LANG, 'en' );
$options->defaultOption( SnakFormatter::OPT_ON_ERROR, 
SnakFormatter::ON_ERROR_WARN );
 
$this->valueFormatterFactory->applyLanguageDefaults( $options );
diff --git a/lib/includes/formatters/OutputFormatValueFormatterFactory.php 
b/lib/includes/formatters/OutputFormatValueFormatterFactory.php
index cf4200c..e3bb294 100644
--- a/lib/includes/formatters/OutputFormatValueFormatterFactory.php
+++ b/lib/includes/formatters/OutputFormatValueFormatterFactory.php
@@ -97,9 +97,7 @@
 * @todo: this shouldn't be public at all. Perhaps factor it out into a 
helper class.
 */
public function applyLanguageDefaults( FormatterOptions $options ) {
-   if ( !$options->hasOption( ValueFormatter::OPT_LANG ) ) {
-   $options->setOption( ValueFormatter::OPT_LANG, 
$this->defaultLanguage->getCode() );
-   }
+   $options->defaultOption( ValueFormatter::OPT_LANG, 
$this->defaultLanguage->getCode() );
 
$lang = $options->getOption( ValueFormatter::OPT_LANG );
if ( !is_string( $lang ) ) {
diff --git 
a/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php 
b/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
index 0b45b3a..2bc85a6 100644
--- a/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
+++ b/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
@@ -7,6 +7,7 @@
 use DataValues\StringValue;
 use Language;
 use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\LanguageFallbackChainFactory;
@@ -31,26 +32,29 @@
$self = $this;
$callbacks = array(
'VT:string' => function( $format, FormatterOptions 
$options ) use ( $self ) {
-   return $format === SnakFormatter::FORMAT_PLAIN 
? $self->makeMockValueFormatter() : null;
+   return $format === SnakFormatter::FORMAT_PLAIN
+   ? $self->makeMockValueFormatter()
+   : null;
},
);
-
-   $dataTypeFactory = new DataTypeFactory( array(
-   'string' => 'string'
-   ) );
-
-   $dataTypeLookup = $this->getMock( 
'Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup' );
-   $dataTypeLookup->expects( $this->any() )
-   ->method( 'getDataTypeIdForProperty' )
-   ->will( $this->returnValue( 'string' ) );
-
$valueFormatterFactory = new OutputFormatValueFormatterFactory(
$callbacks,
Language::factory( 'en' ),
new LanguageFallbackChainFactory()
);
 
-   return new OutputFormatSnakFormatterFactory( 
$valueFormatterFactory, $dataTypeLookup, $dataTypeFactory );
+   $dataTypeLookup = $this->getMock(
+   
'Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup'
+   );
+   $dataTypeLookup->expects( $this->any() )
+   ->method( 'getDataTypeIdForProperty' )
+   ->will( $this->returnValue( 'string' ) );
+
+   return new OutputFormatSnakFormatterFactory(
+   $valueFormatterFactory,
+   $dataTypeLookup,
+ 

[MediaWiki-commits] [Gerrit] Fix inputextender test documentation - change (data-values/value-view)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix inputextender test documentation
..

Fix inputextender test documentation

Change-Id: I70416f81d942d6e2bd303600e8aad3c3dfda4a35
---
M tests/lib/jquery.ui/jquery.ui.inputextender.tests.js
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/data-values/value-view 
refs/changes/20/251220/1

diff --git a/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js 
b/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js
index 58f334b..3d8a646 100644
--- a/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js
+++ b/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js
@@ -216,6 +216,10 @@
} );
} );
 
+   /**
+* @param {QUnit.assert} assert
+* @param {jQuery.ui.inputextender[]} inputExtenders
+*/
function assertCurrentlyVisibleExtensions( assert, inputExtenders ) {
var visibleExtenders = 
$.ui.inputextender.getInstancesWithVisibleExtensions();
assert.ok(
@@ -236,12 +240,13 @@
 * then, the others.
 * After each step, getInstancesWithVisibleExtensions() will be tested 
for its return value.
 *
-* @param assert
-* @param inactiveExtenders
+* @param {QUnit.assert} assert
+* @param {jQuery.ui.inputextender[]} inactiveExtenders
+* @param {jQuery.ui.inputextender[]} activeExtenders private
 * @return {Object} jQuery.Promise
 */
function testGetInstancesWithVisibleExtensions(
-   assert, inactiveExtenders, /* private */ activeExtenders
+   assert, inactiveExtenders, activeExtenders
) {
activeExtenders = activeExtenders || [];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70416f81d942d6e2bd303600e8aad3c3dfda4a35
Gerrit-PatchSet: 1
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] CommandHelp: Add 'or' separator between shortcuts - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: CommandHelp: Add 'or' separator between shortcuts
..

CommandHelp: Add 'or' separator between shortcuts

Makes it clear the shortcuts are linked and equivalent.

For sequences the separator is 'or type'.

Change-Id: I8485409996a96dde47c38bf34c7f80ce48c4cf31
---
M i18n/en.json
M i18n/qqq.json
M src/ui/dialogs/ve.ui.CommandHelpDialog.js
M src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
4 files changed, 28 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/61/251261/1

diff --git a/i18n/en.json b/i18n/en.json
index e6cafcd..21780f1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -108,7 +108,9 @@
"visualeditor-shortcuts-formatting": "Paragraph formatting",
"visualeditor-shortcuts-history": "History",
"visualeditor-shortcuts-other": "Other",
-   "visualeditor-shortcuts-sequence-notice": "Type",
+   "visualeditor-shortcuts-separator": "or",
+   "visualeditor-shortcuts-sequence-notice": "type",
+   "visualeditor-shortcuts-sequence-separator": "or type",
"visualeditor-shortcuts-text-style": "Text styling",
"visualeditor-slug-insert": "Insert paragraph",
"visualeditor-specialcharacter-button-tooltip": "Special character",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 939cc59..3ec95ab 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -116,7 +116,9 @@
"visualeditor-shortcuts-formatting": "Heading for paragraph formatting 
shortcuts",
"visualeditor-shortcuts-history": "Heading for history 
shortcuts.\n\nSee also:\n* 
{{msg-mw|Visualeditor-historybutton-redo-tooltip}}\n* 
{{msg-mw|Visualeditor-historybutton-undo-tooltip}}\n{{Identical|History}}",
"visualeditor-shortcuts-other": "Heading for other 
shortcuts.\n{{Identical|Other}}",
+   "visualeditor-shortcuts-separator": "Separator when listing multiple 
possible keyboard shortcuts.",
"visualeditor-shortcuts-sequence-notice": "{{Doc-important|This means 
\"type on a keyboard\" - not \"type\" in the sense of \"category\" or 
\"manner\".}}\nNotice before a text-sequence shortcut that it should be typed 
out instead of being several keys to press at once\n{{Identical|Type}}",
+   "visualeditor-shortcuts-sequence-separator": "Separator when listing 
multiple possible keyboard sequences.",
"visualeditor-shortcuts-text-style": "Heading for text formatting 
shortcuts",
"visualeditor-slug-insert": "Label for slug to insert paragraph on an 
otherwise unreachable line",
"visualeditor-specialcharacter-button-tooltip": "Tooltip text for the 
insert character button.\n{{Identical|Special character}}",
diff --git a/src/ui/dialogs/ve.ui.CommandHelpDialog.js 
b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
index 6a07922..6716c1c 100644
--- a/src/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -118,9 +118,15 @@
}
$shortcut = $( '' );
for ( k = 0, kLen = triggerList.length; k < kLen; k++ ) 
{
-   $shortcut.append( $( '' ).append(
-   triggerList[ k ].getMessage( true 
).map( ve.ui.CommandHelpDialog.static.buildKeyNode )
-   ).find( 'kbd + kbd' ).before( '+' ).end() );
+   $shortcut.append( $( '' )
+   .append(
+   triggerList[ k ].getMessage( 
true ).map( ve.ui.CommandHelpDialog.static.buildKeyNode )
+   )
+   .attr( 'data-separator', ve.msg( 
'visualeditor-shortcuts-separator' ) )
+   .find( 'kbd + kbd' )
+   .before( '+' )
+   .end()
+   );
}
if ( commands[ j ].sequences ) {
for ( k = 0, kLen = commands[ j 
].sequences.length; k < kLen; k++ ) {
@@ -128,6 +134,7 @@
if ( sequence ) {
$shortcut.append( $( '' )
.attr( 'data-label', 
ve.msg( 'visualeditor-shortcuts-sequence-notice' ) )
+   .attr( 
'data-separator', ve.msg( 'visualeditor-shortcuts-sequence-separator' ) )
.append(

sequence.getMessage( true ).map( ve.ui.CommandHelpDialog.static.buildKeyNode )
)

[MediaWiki-commits] [Gerrit] debian-glue should use our /etc/pbuilderrc - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: debian-glue should use our /etc/pbuilderrc
..


debian-glue should use our /etc/pbuilderrc

The puppet class ::package_builder provides a pbuilder hook to recognize
-wikimedia. jenkins-debian-glue is not loading it by default. A
use case is operations/debs/nodepool which has a changelog pointing to
'jessie-wikimedia' when the cow image is 'jessie'.

Inform jenkins-debian-glue about our custom configuration:
export PBUILDER_CONFIG=/etc/pbuilderrc

Change-Id: I4717c5659cd287270e0d00f009dfaae0006c88f5
---
M jjb/operations-debs.yaml
1 file changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index f369918..91e6f03 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -10,6 +10,13 @@
   export distribution={distribution}
   export REPOSITORY=/data/project/debianrepo
   export REPOS=jenkins-debian-glue
+
+  # Use Wikimedia hooks provided by puppet ::package_builder
+  # See below for more detailled explanations
+  export PBUILDER_CONFIG=/etc/pbuilderrc
+  . /etc/pbuilderrc
+  export COWBUILDER_BASE="$BASEPATH"
+
   /usr/bin/build-and-provide-package
 
 - builder:
@@ -112,6 +119,18 @@
 export distribution=$(dpkg-parsechangelog --show-field 
distribution -lsource/debian/changelog)
 echo "Distribution set from debian/changelog to $distribution"
 
+# Use Wikimedia hooks provided by puppet ::package_builder
+export PBUILDER_CONFIG=/etc/pbuilderrc
+
+# We set DIST which is used by pbuilderrc to determine whether it a
+# Wikimedia flavor.  We point jenkins-debian-glue cowbuilder path
+# to the canonical image, ie have jessie-wikimedia to point to
+# base-jessie-amd64.cow and init hook
+# Since $WIKIMEDIA is set, the hook will inject apt.wikimedia.org
+export DIST=$distribution
+. /etc/pbuilderrc
+export COWBUILDER_BASE="$BASEPATH"
+
 /usr/bin/build-and-provide-package
 - debian-glue-lintian
 - debian-glue-piuparts

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

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

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

[MediaWiki-commits] [Gerrit] Add time frame selection (preset + custom) > Added an opti... - change (wikimedia...rainbow)

[OliverKeyes (Code Review)]

OliverKeyes has submitted this change and it was merged.

Change subject: Add time frame selection (preset + custom)   > Added an option 
to view last 7/30/90 days or have a custom range   > Uses global setting by 
default with ability to override for "local" plot   > This is independent of 
the KPI date range stuff because that g
..


Add time frame selection (preset + custom)
  > Added an option to view last 7/30/90 days or have a custom range
  > Uses global setting by default with ability to override for "local" plot
  > This is independent of the KPI date range stuff because that gets 2x range
in order to compute a % change, so letting the user specify a "custom" range
would take a lot of work and would be wonky. So the new selector (specific
to KPI tabset) only has presets: Yesterday and  Last 7/30/90 days.
+ Moved smoothing into a 'Global Settings' menu where time frame also lives
+ Fixes the KPI date range selection
  > It relied on unstable data, so that got fixed.
  > It used "safe_tail" which is bad because it relies on n rather than dates
  > Switched over to subsetting by dates

! Note: This relies on polloi 0.0.5 to be CR'd and merged.

Bug: T116782
Change-Id: I72a90a00235c536da35a893e03a68f9a23caa62d
---
M CHANGELOG.md
M server.R
M tab_documentation/kpis_summary.md
M ui.R
M utils.R
5 files changed, 314 insertions(+), 202 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3628ba9..12412a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Change Log (Patch Notes)
 All notable changes to this project will be documented in this file.
 
+## 2015/11/05
+- Added time frame selection
+- Fixed KPI date range selection (more robust, correct)
+
+## 2015/11/04
+- Began the move to 'date'-named datasets (as opposed to 'timestamp'-named 
datasets)
+- Removed moving average as a smoothing option
+
 ## 2015/09/30
 - Added a change log
 - Added a contributor code of conduct
diff --git a/server.R b/server.R
index a17775e..287487c 100644
--- a/server.R
+++ b/server.R
@@ -1,4 +1,4 @@
-## Version 0.2.0
+## Version 0.3.0
 source("utils.R")
 
 existing_date <- Sys.Date() - 1
@@ -14,6 +14,24 @@
 read_augmented_clickthrough()
 read_lethal_dose()
 existing_date <<- Sys.Date()
+  }
+
+  # This is used to subset for getting the bounds for 
polloi::subset_by_date_range():
+  time_frame_range <- function(tf_selector) {
+tf_setting <- input[[tf_selector]]
+if ( tf_setting == 'global' ) {
+  if ( input$timeframe_global == 'custom' ) {
+return(input$daterange_global)
+  } else {
+tf_setting <- input$timeframe_global
+  }
+}
+return(switch(tf_setting,
+  all = c(as.Date("2015-04-14"), Sys.Date()-1),
+  week = c(Sys.Date()-8, Sys.Date()-1),
+  month = c(Sys.Date()-31, Sys.Date()-1),
+  quarter = c(Sys.Date()-91, Sys.Date()-1),
+  custom = input[[paste(tf_selector, "daterange", sep = 
"_")]]))
   }
 
   ## Desktop value boxes
@@ -46,18 +64,17 @@
 
   ## The dynamic graphs of events on desktop
   output$desktop_event_plot <- renderDygraph({
-polloi::make_dygraph(data = polloi::smoother(desktop_dygraph_set,
- smooth_level = 
polloi::smooth_switch(input$smoothing_global,
-  
input$smoothing_desktop_event)),
- xlab = "Date", ylab = "Events", title = "Desktop 
search events, by day")
+desktop_dygraph_set %>%
+  polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_desktop_event)) 
%>%
+  
polloi::subset_by_date_range(time_frame_range("desktop_event_timeframe")) %>%
+  polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Desktop 
search events, by day")
   })
 
   output$desktop_load_plot <- renderDygraph({
-polloi::make_dygraph(data = polloi::smoother(desktop_load_data,
- smooth_level = 
polloi::smooth_switch(input$smoothing_global,
-  
input$smoothing_desktop_load)),
- xlab = "Date", ylab = "Load time (ms)", title = 
"Desktop load times, by day",
- use_si = FALSE)
+desktop_load_data %>%
+  polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_desktop_load)) %>%
+  polloi::subset_by_date_range(time_frame_range("desktop_load_timeframe")) 
%>%
+  polloi::make_dygraph(xlab = "Date", ylab = "Load time (ms)", title = 
"Desktop load times, by day", use_si = FALSE)
   })
 
   ## Mobile value boxes
@@ -90,18 +107,17 @@
 
   ## Mobile plots
   output$mobile_event_plot <- renderDygraph({
-

[MediaWiki-commits] [Gerrit] Update edit icon with Material style. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Update edit icon with Material style.
..


Update edit icon with Material style.

Pulled changes from corresponding MobileApp patch:
https://gerrit.wikimedia.org/r/249750

This specifically targets only the edit pencil change. No other CSS
changes were pulled in (i.e. from MFE).

Also removed unused edit icon in assets.

Bug: T114582
Change-Id: I0ef9a83f79b5aff968058db993930f2b8a221efa
---
D app/src/main/assets/images/images/edit.png
M app/src/main/assets/styles.css
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/app/src/main/assets/images/images/edit.png 
b/app/src/main/assets/images/images/edit.png
deleted file mode 100644
index 4d773a3..000
--- a/app/src/main/assets/images/images/edit.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 131672d..9915e5f 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -602,8 +602,8 @@
   height: 32px;
   width: 32px;
   border: 8px solid transparent;
-  background-image: 
url(data:image/png;base64,iVBORw0KGgoNSUhEUgAAAFBQCAMAAAC5zwKfNlBMVEUAAAD///9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW+FiFraEXRSTlMAABAgMEBQYHCAkKCwwNDg8InUWv0AAAGfSURBVHhe7djBjsIgFIXhOwjFeltK3/9lJ4J6SG5dHGgyyaRn1dUXlb8slJ+T9//AC7zACxRiLu37EqXsDPCW9ue2cBLo8/7a/RQwFK9OTwDj3k6Hwbk6Mb/EeRDUojyaHzKMgG4pRmy/ehoAXcklT3h+buoGffU8vDJlQJtfuuG5busEY/Xc28N4EPkp7EHwUaODjSkLIr8Iu/VIELkE2Bj9psDzSBuLQoLIxX1sLEfhQHirQ9rwvLAgcoHdejx4b3IJ8PDOcCBysfklJzToipc9Piu2OKFA5LL5o/xUhAZ9Qi7W40Dkspj8as48OGXkYj0ORH73w/yC8OCMXA5y5sE2lwgPh86Bbi3h+i8506Brc3kYjwb9VkL7lh8N+jaXxXg0GBGayW8WCoSXq+dNzjyIXGx+UXhQm1yCyZkHA8JAfvBosF6h21RvU3vb86B+4lCTcxf4rkTV3PZ9IAiTcxcYvnm94P3Qi9IN6rHXDybL5SAD4IHnZQAMxtu8jIA4E+Q8BKr1xkCcybrOcwhOBsE3JOT+4G+WC7zAC7zAXxMIT+qGYJfyAElFTkSuQmCC);
-  background-image: 
url(http://127.0.0.1:8080/w/extensions/MobileApp/images/edit.png?dd026)!ie;
+  background-image: 
url(data:image/png;base64,iVBORw0KGgoNSUhEUgAAAFBQCAYAAACOEfKtBGdBTUEAALGPC/xhBQlwSFlzAAAuIQAALiEBB1v8/wAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAAAlRJREFUeNrt3DtOxDAQBuDtANFDsRJacQIeF9pywXbGlnIEOAkSJ0CioOIgaAW0wBVCA8tj5Th+JTP2/JKrbZJP49hjZTObcTgcDmfWdR0Px3ACciIrkKsyogr//8hY22hegJxtFwZkQAZkQAasCBAADqWCW6ngQyp4FQqulVI7PgbVAgLAkZTwJBV0f4aEx7Zt90Mr0OpUEqAVLwCxOkAnnidiVYCD8TwQqwH0xtuM5sEYs1c1YDjeD6Jtda4CUAh99rVV6YKHbK6qnsJN05xHIr5UDZgA8b0awJUxc9szKxixgZs+F+8DVazRWi+EgrVUcJcKUShYr1btQfGAv/C+b96KKABOpYK3AYDPF8Yc97kEHekTwHMiXmp94kD0wiML6NrnKQX3y+Vy1xPRu/JIAg7dJHsiBk1bcoC+HcZAxOBpSwowoj2zLyxCn2mtF6HTlgxgbG/bV4kx05YEYM9qmw2xb6UlBRh/quKP6NqmkAFMjbfpMIyZh+KRAcyBl6rDQA+Y6pmXpT3DDoi58tADUsBDC0gFDyUgJTx0gNTwUAGOjef9lj1mQKp4KACnxotNEGAqTOp4kwKWgDcZYCl4kwCWhDc6YGl4owKWiDcaYKl4owCWjBcN6LrI0vGyAtaAlxUw9TG8ULDGhpcVsPTKowSIFo8CIGo87IDo8TADksDDCkgGDyMgKTxsgOTwMAGSxMMCSBYvK2CKC8OOhxaQCh5KQEp46ACp4WUFDHnLiRqe1z3b/lg8+qc0SwMcUk014HnPdVQfeKWIyYAcDofD4WTOJ7kJZm/P5peYAElFTkSuQmCC);
+  background-image: 
url(http://127.0.0.1:8080/w/extensions/MobileApp/images/edit.png?300e0)!ie;
   background-repeat: no-repeat;
   background-size: 32px 32px;
   float: right;
@@ -648,8 +648,8 @@
   display: none;
 }
 .page-protected a.edit_section_button {
-  background-image: 
url(data:image/png;base64,iVBORw0KGgoNSUhEUgAAAFBQCAMAAAC5zwKfXVBMVEUAAADPz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz8/Pz8/Pz89sbW/Pz89sbW/Pz8/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW+fZUWwHXRSTlMAABAQICAwMEBAUFBgYHBwgJCgoLDAwNDQ4ODw8PGFG8cAAAHOSURBVHhe7dTLcoMwDAVQxVCXJAoByiPUEf//mcW0Gh5KFrbojrtidUYM9wKnnfOP4AEe4AGCT3JvmuHR3BOAXcDrc/jN87wLeBvmnCUIATnZEUyeC/A7UYHWjeDdQ48PSL68eNOA6GgEH9Nh3m9GsFGASOTB6S7wufrHeLCkGfycwLMKrGgBwm8UoKknD/cCTffn7QSmk+cup51A6ybP+hsGmUCQvd7CTiCST2dAB0pPAcr6VQY0oPRgCqpB005eydvTglxnPlYLWvZ4ezqQ65zxsVrwwvPg7SlBJJ4HH6sDc64ze0qwWnroSAHKeSDRDL6JBGX9eB4FKUH2Sj5WC9p+PQ8lyA1BPnYVZ4NBnOssvS4NvhBp4dl+45nAV+Yv2q3nwakMBICyztnWAwgEzcpDWgchABR1Fp5DCAXTlVdtPAuBINevEB5/pQBQ1rneeAZCQaTVPERdQsGMVn97UZdgMJ89UeccIsDaA7V55SHEgD0vDtCJukSAKQM5kvBiwAtxRF3iwPKtFwm2TIi6RIJvvGgwe+UhxIO55ByCAqylZ0ED9luvt6ABU1kXUIHLWru2LVoDOrAk6tu6KLKMJSVohaMAtTnA4BzgAf4Asb6U9nmPcP4ASUVORK5CYII=);
-  background-image: 
url(http://127.0.0.1:8080/w/extensions/MobileApp/images/edit-locked.png?2ded5)!ie;
+  background-image: 

[MediaWiki-commits] [Gerrit] cassandra: add praseodymium-a instance - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: add praseodymium-a instance
..

cassandra: add praseodymium-a instance

Change-Id: If278c96423f4f163676807cc2d7845121fe8b53c
---
M hieradata/hosts/praseodymium.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/praseodymium.yaml 
b/hieradata/hosts/praseodymium.yaml
index 59865e7..fa30924 100644
--- a/hieradata/hosts/praseodymium.yaml
+++ b/hieradata/hosts/praseodymium.yaml
@@ -1,3 +1,9 @@
 debdeploy::grains:
   debdeploy-restbase:
 value: canary
+cassandra::instances:
+  a:
+jmx_port: 7189
+listen_address: 10.64.16.188
+rpc_address: 10.64.16.188
+rpc_interface: eth0

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

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

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

[MediaWiki-commits] [Gerrit] Footer tpl cleanup - change (wikimedia...civicrm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Footer tpl cleanup
..

Footer tpl cleanup

This is one of 2 security fixes in the newly released 4.6.10.

I have pushed the 2 fixes up for review - we can review at more leisure the 
process for changing version.

(note this fix is not exploitable in the context of WMF but it's good practice 
to have it).

Change-Id: If1b7563ecbce86a8899e42f3bd79d86fa28a67fd
---
M templates/CRM/common/footer.tpl
1 file changed, 23 insertions(+), 20 deletions(-)


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

diff --git a/templates/CRM/common/footer.tpl b/templates/CRM/common/footer.tpl
index 229c9ef..01e4bf9 100644
--- a/templates/CRM/common/footer.tpl
+++ b/templates/CRM/common/footer.tpl
@@ -23,24 +23,27 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing|
  ++
 *}
-{include file="CRM/common/accesskeys.tpl"}
-{if !empty($contactId)}
-  {include file="CRM/common/contactFooter.tpl"}
-{/if}
-
-
-  {crmVersion assign=version}
-  {ts 1=$version}Powered by CiviCRM %1.{/ts}
-  {if !empty($security_update)}
-
-  https://civicrm.org/advisory;>{ts}Security update 
required.{/ts}
-  {elseif !empty($newer_civicrm_version)}
-{ts 1=$newer_civicrm_version}A newer version (%1){/ts}
-https://civicrm.org/download;>{ts}is available for 
download{/ts}.
+{if call_user_func(array('CRM_Core_Permission','check'), 'access CiviCRM')}
+  {include file="CRM/common/accesskeys.tpl"}
+  {if !empty($contactId)}
+{include file="CRM/common/contactFooter.tpl"}
   {/if}
-  {ts 1='http://www.gnu.org/licenses/agpl-3.0.html'}CiviCRM is openly 
available under the GNU AGPL License.{/ts}
-  https://civicrm.org/download;>{ts}Download CiviCRM.{/ts}  

-  http://issues.civicrm.org/jira/browse/CRM?report=com.atlassian.jira.plugin.system.project:roadmap-panel;>{ts}View
 issues and report bugs.{/ts}  
-  {docURL page="" text="Online documentation."}
-
-{include file="CRM/common/notifications.tpl"}
+
+  
+{crmVersion assign=version}
+{ts 1=$version}Powered by CiviCRM %1.{/ts}
+{if !empty($security_update)}
+  
+  https://civicrm.org/advisory;>{ts}Security update 
required.{/ts}
+{elseif !empty($newer_civicrm_version)}
+  {ts 1=$newer_civicrm_version}A newer version 
(%1){/ts}
+https://civicrm.org/download;>{ts}is available for 
download{/ts}.
+  
+{/if}
+{ts 1='http://www.gnu.org/licenses/agpl-3.0.html'}CiviCRM is openly 
available under the GNU AGPL License.{/ts}
+https://civicrm.org/download;>{ts}Download CiviCRM.{/ts} 
 
+http://issues.civicrm.org/jira/browse/CRM?report=com.atlassian.jira.plugin.system.project:roadmap-panel;>{ts}View
 issues and report bugs.{/ts}  
+{docURL page="" text="Online documentation."}
+  
+  {include file="CRM/common/notifications.tpl"}
+{/if}

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

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

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

[MediaWiki-commits] [Gerrit] Update Wikibase: Fix #property parser function, client edit ... - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: Update Wikibase: Fix #property parser function, client edit 
summaries
..


Update Wikibase: Fix #property parser function, client edit summaries

Contains:
* cc75a7d92831e7309f391a83f2a57a0497ba9acb
* 7d64df93a0ffa83347de40da067456faee227164

Change-Id: Ife3a6da63cc51269579baf6a65a76d3fd95fbf59
---
M composer.lock
M extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
M 
extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php
M 
extensions/Wikibase/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
M 
extensions/Wikibase/lib/includes/formatters/OutputFormatValueFormatterFactory.php
M 
extensions/Wikibase/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php
M vendor/composer/installed.json
8 files changed, 178 insertions(+), 151 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index bec0760..074d664 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1389,12 +1389,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "c229412dbd318e65c8a1a1b87ac193250c04faa7"
+"reference": "7d64df93a0ffa83347de40da067456faee227164"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c229412dbd318e65c8a1a1b87ac193250c04faa7;,
-"reference": "c229412dbd318e65c8a1a1b87ac193250c04faa7",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/7d64df93a0ffa83347de40da067456faee227164;,
+"reference": "7d64df93a0ffa83347de40da067456faee227164",
 "shasum": ""
 },
 "require": {
@@ -1464,7 +1464,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2015-11-02 18:24:20"
+"time": "2015-11-05 14:21:41"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/includes/SiteLinkCommentCreator.php 
b/extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
index 3e8ba59..5f4a54b 100644
--- a/extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
+++ b/extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
@@ -247,18 +247,22 @@
 * @return string wikitext interwiki link
 */
private function getSitelinkWikitext( $siteId, $pageTitle ) {
-   $interwikiId = $siteId;
-
// Try getting the interwiki id from the Site object of the 
link target
$site = $this->siteStore->getSite( $siteId );
+
if ( $site ) {
-   $iw_ids = $site->getInterwikiIds();
-   if ( isset( $iw_ids[0] ) ) {
-   $interwikiId = $iw_ids[0];
+   $interwikiIds = $site->getInterwikiIds();
+
+   if ( isset( $interwikiIds[0] ) ) {
+   $interwikiId = $interwikiIds[0];
+
+   return "[[:$interwikiId:$pageTitle]]";
}
}
 
-   return "[[:$interwikiId:$pageTitle]]";
+   // @todo: provide a mechanism to get the interwiki id for a 
sister project wiki.
+   // e.g. get "voy:it" for Italian Wikivoyage from English 
Wikipedia. (see T117738)
+   return "$siteId:$pageTitle";
}
 
/**
diff --git 
a/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
 
b/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index 3ffc0de..91b1f19 100644
--- 
a/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++ 
b/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -72,10 +72,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Japan' );
 
-   $changeFactory = TestChanges::getEntityChangeFactory();
-   $change = $changeFactory->newFromUpdate( ItemChange::UPDATE, 
$item, $item2 );
-
-   return $change->getSiteLinkDiff();
+   return $this->getSiteLinkDiffForUpdate( $item, $item2 );
}
 
protected function getUnlinkDiff() {
@@ -85,10 +82,7 @@
$item2 = $this->getNewItem();
$item2->getSiteLinkList()->removeLinkWithSiteId( 'enwiki' );
 
-   $changeFactory = TestChanges::getEntityChangeFactory();
-

[MediaWiki-commits] [Gerrit] Fix traceback for verbose view of deployment result - change (operations...debdeploy)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Fix traceback for verbose view of deployment result
..


Fix traceback for verbose view of deployment result

This occured if the server group consisted of multiple groups and
some of the servers didn't contain the software to be deployed.

Change-Id: I02cc5a1f4398cd4f794e6b366365c374a7e64a74
---
M master/debdeploy
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/master/debdeploy b/master/debdeploy
index 65e7c9b..c132fd7 100755
--- a/master/debdeploy
+++ b/master/debdeploy
@@ -147,7 +147,8 @@
 
 if opt.verbose:
 print
-indented = ['  ' + l for l in 
res[host]['return']['aptlog'].splitlines()]
+if res[host]['return'].has_key('aptlog'):
+indented = ['  ' + l for l in 
res[host]['return']['aptlog'].splitlines()]
 print "\n".join(indented)
 
 print 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02cc5a1f4398cd4f794e6b366365c374a7e64a74
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/debdeploy
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Cleanup folder structure of codemirror and enable placeholder - change (wikidata...rdf)

[jenkins-bot (Code Review)]

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

Change subject: Cleanup folder structure of codemirror and enable placeholder
..


Cleanup folder structure of codemirror and enable placeholder

Bug: T115995
Change-Id: I281ecef1f57d5542e0351b7de593c9b5e602f684
---
M gui/index.html
A gui/vendor/codemirror/addon/display/placeholder.js
R gui/vendor/codemirror/addon/hint/show-hint.css
R gui/vendor/codemirror/addon/hint/show-hint.js
R gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js
R gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js
R gui/vendor/codemirror/addon/tooltip/WikibaseRDFTooltip.js
R gui/vendor/codemirror/lib/codemirror.css
R gui/vendor/codemirror/lib/codemirror.js
R gui/vendor/codemirror/mode/sparql.js
10 files changed, 70 insertions(+), 9 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/gui/index.html b/gui/index.html
index 40df811..ab59cc8 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -3,20 +3,21 @@
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
+
 
 
 
 
 
 
-
-
+
+
 
 
@@ -63,7 +64,7 @@



-   
+   


Press 
[CTRL-SPACE] to activate auto completion. Data last updated: [connecting]
diff --git a/gui/vendor/codemirror/addon/display/placeholder.js 
b/gui/vendor/codemirror/addon/display/placeholder.js
new file mode 100644
index 000..babddfb
--- /dev/null
+++ b/gui/vendor/codemirror/addon/display/placeholder.js
@@ -0,0 +1,60 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
+var prev = old && old != CodeMirror.Init;
+if (val && !prev) {
+  cm.on("blur", onBlur);
+  cm.on("change", onChange);
+  onChange(cm);
+} else if (!val && prev) {
+  cm.off("blur", onBlur);
+  cm.off("change", onChange);
+  clearPlaceholder(cm);
+  var wrapper = cm.getWrapperElement();
+  wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
+}
+
+if (val && !cm.hasFocus()) onBlur(cm);
+  });
+
+  function clearPlaceholder(cm) {
+if (cm.state.placeholder) {
+  cm.state.placeholder.parentNode.removeChild(cm.state.placeholder);
+  cm.state.placeholder = null;
+}
+  }
+  function setPlaceholder(cm) {
+clearPlaceholder(cm);
+var elt = cm.state.placeholder = document.createElement("pre");
+elt.style.cssText = "height: 0; overflow: visible";
+elt.className = "CodeMirror-placeholder";
+var placeHolder = cm.getOption("placeholder")
+if (typeof placeHolder == "string") placeHolder = 
document.createTextNode(placeHolder)
+elt.appendChild(placeHolder)
+cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
+  }
+
+  function onBlur(cm) {
+if (isEmpty(cm)) setPlaceholder(cm);
+  }
+  function onChange(cm) {
+var wrapper = cm.getWrapperElement(), empty = isEmpty(cm);
+wrapper.className = wrapper.className.replace(" CodeMirror-empty", "") + 
(empty ? " CodeMirror-empty" : "");
+
+if (empty) setPlaceholder(cm);
+else clearPlaceholder(cm);
+  }
+
+  function isEmpty(cm) {
+return (cm.lineCount() === 1) && (cm.getLine(0) === "");
+  }
+});
diff --git a/gui/addon/hint/show-hint.css 
b/gui/vendor/codemirror/addon/hint/show-hint.css
similarity index 100%
rename from gui/addon/hint/show-hint.css
rename to gui/vendor/codemirror/addon/hint/show-hint.css
diff --git a/gui/addon/hint/show-hint.js 
b/gui/vendor/codemirror/addon/hint/show-hint.js
similarity index 100%
rename from gui/addon/hint/show-hint.js
rename to gui/vendor/codemirror/addon/hint/show-hint.js
diff --git a/gui/addon/hint/wikibase-rdf-hint.js 
b/gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js
similarity index 100%
rename from gui/addon/hint/wikibase-rdf-hint.js
rename to gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js
diff --git a/gui/addon/hint/wikibase-sparql-hint.js 
b/gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js
similarity index 100%
rename from gui/addon/hint/wikibase-sparql-hint.js
rename to gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js
diff --git a/gui/addon/tooltip/WikibaseRDFTooltip.js 

[MediaWiki-commits] [Gerrit] mw1152: allow connecting to labswiki database - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: mw1152: allow connecting to labswiki database
..


mw1152: allow connecting to labswiki database

Change-Id: Ifc6e8711c4cf3ca62fa811735ade5b5c72bd596b
---
M manifests/role/mariadb.pp
M templates/mariadb/grants-wikitech.sql.erb
2 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Jcrespo: Looks good to me, but someone else must approve
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 93f9a4e..05e7f9b 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -650,7 +650,7 @@
 ferm::service { 'mysql_deployment_terbium':
 proto  => 'tcp',
 port   => '3306',
-srange => '@resolve((tin.eqiad.wmnet mira.codfw.wmnet 
terbium.eqiad.wmnet))',
+srange => '@resolve((tin.eqiad.wmnet mira.codfw.wmnet 
terbium.eqiad.wmnet mw1152.eqiad.wmnet))',
 }
 }
 
diff --git a/templates/mariadb/grants-wikitech.sql.erb 
b/templates/mariadb/grants-wikitech.sql.erb
index bf16392..60b83da 100644
--- a/templates/mariadb/grants-wikitech.sql.erb
+++ b/templates/mariadb/grants-wikitech.sql.erb
@@ -8,3 +8,9 @@
 GRANT ALL PRIVILEGES
 ON `labswiki`.* TO 'wikiadmin'@'10.64.32.13'
 IDENTIFIED BY '<%= @wikiadmin_pass %>';
+
+-- queries from mw1152
+GRANT ALL PRIVILEGES
+ON `labswiki`.* TO 'wikiadmin'@'10.64.16.132'
+IDENTIFIED BY '<%= @wikiadmin_pass %>';
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc6e8711c4cf3ca62fa811735ade5b5c72bd596b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix npm errors - change (mediawiki...Translate)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Fix npm errors
..

Fix npm errors

Bananan checker isen't registered yet will do i follow up patch.

Change-Id: Ieaa647b61eae0418896a14e9c1e8f39e62f405c9
---
M Gruntfile.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/59/251259/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 4436d52..220da1a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,7 +2,7 @@
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
-   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   /*grunt.loadNpmTasks( 'grunt-banana-checker' );*/
 
grunt.initConfig( {
jshint: {
@@ -32,6 +32,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint' /*'banana'*/ ] );
grunt.registerTask( 'default', 'test' );
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaa647b61eae0418896a14e9c1e8f39e62f405c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Decrease binding in EntityParserOutputDataUpdater - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Decrease binding in EntityParserOutputDataUpdater
..

Decrease binding in EntityParserOutputDataUpdater

And make the method names more clearly match their responsibility

Change-Id: I7b68c4f6a861b5cf2eca9893aa061261654d71b0
---
M repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
1 file changed, 8 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/60/251260/1

diff --git a/repo/includes/ParserOutput/EntityParserOutputDataUpdater.php 
b/repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
index 1b68c94..007b656 100644
--- a/repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
+++ b/repo/includes/ParserOutput/EntityParserOutputDataUpdater.php
@@ -6,6 +6,8 @@
 use ParserOutput;
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\Item;
+use Wikibase\DataModel\SiteLinkList;
+use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\Statement\StatementListProvider;
 
 /**
@@ -61,43 +63,34 @@
$this->dataUpdaters = $dataUpdaters;
}
 
-   /**
-* @param EntityDocument $entity
-*/
public function processEntity( EntityDocument $entity ) {
if ( $entity instanceof StatementListProvider ) {
-   $this->processStatementListProvider( $entity );
+   $this->processStatementList( $entity->getStatements() );
}
 
if ( $entity instanceof Item ) {
-   $this->processItem( $entity );
+   $this->processSiteLinks( $entity->getSiteLinkList() );
}
}
 
-   /**
-* @param StatementListProvider $entity
-*/
-   private function processStatementListProvider( StatementListProvider 
$entity ) {
+   private function processStatementList( StatementList $statements ) {
if ( empty( $this->statementDataUpdaters ) ) {
return;
}
 
-   foreach ( $entity->getStatements() as $statement ) {
+   foreach ( $statements as $statement ) {
foreach ( $this->statementDataUpdaters as $updater ) {
$updater->processStatement( $statement );
}
}
}
 
-   /**
-* @param Item $item
-*/
-   private function processItem( Item $item ) {
+   private function processSiteLinks( SiteLinkList $siteLinks ) {
if ( empty( $this->siteLinkDataUpdaters ) ) {
return;
}
 
-   foreach ( $item->getSiteLinkList() as $siteLink ) {
+   foreach ( $siteLinks as $siteLink ) {
foreach ( $this->siteLinkDataUpdaters as $updater ) {
$updater->processSiteLink( $siteLink );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b68c4f6a861b5cf2eca9893aa061261654d71b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

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

[MediaWiki-commits] [Gerrit] Hygiene: rename SyntaxHighlightTests - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: rename SyntaxHighlightTests
..


Hygiene: rename SyntaxHighlightTests

* Rename SyntaxHighlightTests to SyntaxHighlighterTest because it tests
  SyntaxHighlighter.
* Repackage SyntaxHighlighterTest to match SyntaxHighlighter.

Change-Id: I07c812f771493981ee91e2d913aacf7ebf8f72eb
---
R 
app/src/androidTest/java/org/wikipedia/editing/richtext/SyntaxHighlighterTest.java
1 file changed, 3 insertions(+), 6 deletions(-)

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



diff --git 
a/app/src/androidTest/java/org/wikipedia/test/SyntaxHighlightTests.java 
b/app/src/androidTest/java/org/wikipedia/editing/richtext/SyntaxHighlighterTest.java
similarity index 81%
rename from 
app/src/androidTest/java/org/wikipedia/test/SyntaxHighlightTests.java
rename to 
app/src/androidTest/java/org/wikipedia/editing/richtext/SyntaxHighlighterTest.java
index 694e7f4..9983978 100644
--- a/app/src/androidTest/java/org/wikipedia/test/SyntaxHighlightTests.java
+++ 
b/app/src/androidTest/java/org/wikipedia/editing/richtext/SyntaxHighlighterTest.java
@@ -1,19 +1,16 @@
-package org.wikipedia.test;
+package org.wikipedia.editing.richtext;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.widget.EditText;
 
-import org.wikipedia.editing.richtext.ColorSpanEx;
-import org.wikipedia.editing.richtext.SpanExtents;
-import org.wikipedia.editing.richtext.SyntaxHighlighter;
 import org.wikipedia.page.PageActivity;
 
 import java.util.List;
 
-public class SyntaxHighlightTests extends 
ActivityInstrumentationTestCase2 {
+public class SyntaxHighlighterTest extends 
ActivityInstrumentationTestCase2 {
 private PageActivity activity;
 
-public SyntaxHighlightTests() {
+public SyntaxHighlighterTest() {
 super(PageActivity.class);
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Update restbase to 7fde654 - change (mediawiki...deploy)

[Milimetric (Code Review)]

Milimetric has submitted this change and it was merged.

Change subject: Update restbase to 7fde654
..


Update restbase to 7fde654

List of changes:
5a00677 Do not DOS ourselves by re-rendering the same title in monitoring
348227d Stop testing with iojs
abc07e7 Back-end services: Strip content-length and content-encoding headers
220b21a Patch to remove all-years parameter
b7ebbce Patch to remove all-years parameter
f77357b what the hell, git
684b6e2 Revisions mod: Bug fix: Compare two revisions properly
8e678f0 Page revisions: Bug fix: Check array length difference correctly
420ce2e Cleanup: Remove backwards-compatibility to old action module config 
style
b6c2fa1 Clarify 404 errors and make room for bigger ints
0fc8d1a Use string instead of long
660d39b Use long instead of string, improve tests
24b59ae Remove test that only works locally
9dfb87f Remove outdated comment
8254710 Parsoid: Bug fix, sections request returns full content if no-cache is 
provided and render unchanged
a88beaf Nitting

Change-Id: Id7b6f1a79c0f2eb4fa7f2d09a1ad4eb77de1e6ce
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/src b/src
index e751634..7fde654 16
--- a/src
+++ b/src
-Subproject commit e7516348864a563b09bf3af9471a313ea76d791d
+Subproject commit 7fde654e6ce103de92e0aa5621d1c76549f9d752

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7b6f1a79c0f2eb4fa7f2d09a1ad4eb77de1e6ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/aqs/deploy
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] Use interwiki cache directly to resolve transwiki import sou... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Use interwiki cache directly to resolve transwiki import sources
..


Use interwiki cache directly to resolve transwiki import sources

In order to resolve T17583, we will need to have a WMF-wide map of import
sources. This will most likely consist of a project dropdown, e.g.
"wikipedia", "wiktionary", "meta"... and a subproject dropdown, listing
each language edition of the selected project.

This would mean, if we wanted to import a page from French Wikipedia to
English Wikipedia, we would need to select project "wikipedia" and language
"fr". Currently, this causes the error "Bad interwiki link", because the
prefix "wikipedia:" maps to the local project namespace on enwiki, instead
of the relevant interwiki prefix.

To avoid this error we need to bypass Title and directly query the
interwiki map.

Change-Id: I68989203e367e7ea515e4aec330b264a7cb1
---
M includes/Import.php
1 file changed, 31 insertions(+), 16 deletions(-)

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



diff --git a/includes/Import.php b/includes/Import.php
index 6a0bfd0..efb37ae 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -1940,23 +1940,38 @@
if ( $page == '' ) {
return Status::newFatal( 'import-noarticle' );
}
-   $link = Title::newFromText( "$interwiki:Special:Export/$page" );
-   if ( is_null( $link ) || !$link->isExternal() ) {
+
+   # Look up the first interwiki prefix, and let the foreign site 
handle
+   # subsequent interwiki prefixes
+   $firstIwPrefix = strtok( $interwiki, ':' );
+   $firstIw = Interwiki::fetch( $firstIwPrefix );
+   if ( !$firstIw ) {
return Status::newFatal( 'importbadinterwiki' );
-   } else {
-   $params = array();
-   if ( $history ) {
-   $params['history'] = 1;
-   }
-   if ( $templates ) {
-   $params['templates'] = 1;
-   }
-   if ( $pageLinkDepth ) {
-   $params['pagelink-depth'] = $pageLinkDepth;
-   }
-   $url = $link->getFullURL( $params );
-   # For interwikis, use POST to avoid redirects.
-   return ImportStreamSource::newFromURL( $url, "POST" );
}
+
+   $additionalIwPrefixes = strtok( '' );
+   if ( $additionalIwPrefixes ) {
+   $additionalIwPrefixes .= ':';
+   }
+   # Have to do a DB-key replacement ourselves; otherwise spaces 
get
+   # URL-encoded to +, which is wrong in this case. Similar to 
logic in
+   # Title::getLocalURL
+   $link = $firstIw->getURL( strtr( 
"${additionalIwPrefixes}Special:Export/$page",
+   ' ', '_' ) );
+
+   $params = array();
+   if ( $history ) {
+   $params['history'] = 1;
+   }
+   if ( $templates ) {
+   $params['templates'] = 1;
+   }
+   if ( $pageLinkDepth ) {
+   $params['pagelink-depth'] = $pageLinkDepth;
+   }
+
+   $url = wfAppendQuery( $link, $params );
+   # For interwikis, use POST to avoid redirects.
+   return ImportStreamSource::newFromURL( $url, "POST" );
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68989203e367e7ea515e4aec330b264a7cb1
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] AvroBinaryMessageDecoder: timestamp should be ts - change (analytics...source)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: AvroBinaryMessageDecoder: timestamp should be ts
..

AvroBinaryMessageDecoder: timestamp should be ts

"ts" is defined in the schema get getTimestamp() expects "timestamp".

Change-Id: Ie575f47110621972f820d49191b23510048afb37
---
M 
refinery-camus/src/main/java/org/wikimedia/analytics/refinery/camus/coders/AvroBinaryMessageDecoder.java
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/67/251267/1

diff --git 
a/refinery-camus/src/main/java/org/wikimedia/analytics/refinery/camus/coders/AvroBinaryMessageDecoder.java
 
b/refinery-camus/src/main/java/org/wikimedia/analytics/refinery/camus/coders/AvroBinaryMessageDecoder.java
index c979ce5..80d203e 100644
--- 
a/refinery-camus/src/main/java/org/wikimedia/analytics/refinery/camus/coders/AvroBinaryMessageDecoder.java
+++ 
b/refinery-camus/src/main/java/org/wikimedia/analytics/refinery/camus/coders/AvroBinaryMessageDecoder.java
@@ -141,8 +141,8 @@
 
 if (header != null && header.get("time") != null) {
 return (Long) header.get("time");
-} else if (super.getRecord().get("timestamp") != null) {
-return (Long) super.getRecord().get("timestamp");
+} else if (super.getRecord().get("ts") != null) {
+return (Long) super.getRecord().get("ts");
 } else {
 return System.currentTimeMillis();
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie575f47110621972f820d49191b23510048afb37
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] Remove superprotect - change (operations/mediawiki-config)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Remove superprotect
..

Remove superprotect

Not used on any pages across the cluster, being removed per new
product development process docs.

https://www.mediawiki.org/wiki/WMF_Product_Development_Process/2015-11-05

Note: Not removing WikimediaMessages i18n on purpose, please do not
submit a patch for that. Doing so will result in improperly formatted
log entries on the few occasions this was used.

Change-Id: I579c11a2ff00ada97ce7cc41738d37adda3ca4be
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 13 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8cc91f0..5587324 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -571,7 +571,6 @@
 $wgAvailableRights[] = 'validate';
 // So that protection rights can be assigned to global groups
 $wgAvailableRights[] = 'templateeditor';
-$wgAvailableRights[] = 'superprotect';
 $wgAvailableRights[] = 'editeditorprotected';
 // Adding Flow's rights so that they are available for global groups/staff 
rights
 $wgAvailableRights[] = 'flow-edit-post';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index fa92220..9ebc1ca 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4177,19 +4177,18 @@
'',
'autoconfirmed', // semi-protection level on
'sysop',
-   'superprotect', // per request by Erik Möller
),
-   'arwiki' => array( '', 'autoconfirmed', 'autoreview', 'sysop', 
'superprotect' ), // T54109
-   'ckbwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop', 
'superprotect' ), // T54533
-   'dewiki' => array( '', 'autoconfirmed', 'editeditorprotected', 'sysop', 
'superprotect' ), // T94368
-   'enwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // T57432
-   'hewiki' => array( '', 'autoconfirmed', 'autopatrol',  'templateeditor' 
/* T102466 */, 'sysop', 'superprotect' ), // T60207
-   'huwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // T74055
-   'lvwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop', 
'superprotect' ), // T92645
-   'plwiki' => array( '', 'autoconfirmed', 'editor', 'sysop', 
'superprotect' ), // T48990
-   'ptwiki' => array( '', 'autoconfirmed', 'autoreviewer', 'sysop', 
'superprotect' ), // T41652
-   'rowiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // T63172
-   'testwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // T61084
+   'arwiki' => array( '', 'autoconfirmed', 'autoreview', 'sysop' ), // 
T54109
+   'ckbwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop' ), // 
T54533
+   'dewiki' => array( '', 'autoconfirmed', 'editeditorprotected', 'sysop' 
), // T94368
+   'enwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop' ), // 
T57432
+   'hewiki' => array( '', 'autoconfirmed', 'autopatrol',  'templateeditor' 
/* T102466 */, 'sysop' ), // T60207
+   'huwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop' ), // 
T74055
+   'lvwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop' ), // 
T92645
+   'plwiki' => array( '', 'autoconfirmed', 'editor', 'sysop' ), // T48990
+   'ptwiki' => array( '', 'autoconfirmed', 'autoreviewer', 'sysop' ), // 
T41652
+   'rowiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop' ), // 
T63172
+   'testwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop' ), 
// T61084
 ),
 # @} end of wgRestrictionLevels
 

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

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

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

[MediaWiki-commits] [Gerrit] Remove superprotect - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Remove superprotect
..


Remove superprotect

Not used on any pages across the cluster, being removed per new
product development process docs.

https://www.mediawiki.org/wiki/WMF_Product_Development_Process/2015-11-05

Note: Not removing WikimediaMessages i18n on purpose, please do not
submit a patch for that. Doing so will result in improperly formatted
log entries on the few occasions this was used.

Change-Id: I579c11a2ff00ada97ce7cc41738d37adda3ca4be
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 13 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8cc91f0..5587324 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -571,7 +571,6 @@
 $wgAvailableRights[] = 'validate';
 // So that protection rights can be assigned to global groups
 $wgAvailableRights[] = 'templateeditor';
-$wgAvailableRights[] = 'superprotect';
 $wgAvailableRights[] = 'editeditorprotected';
 // Adding Flow's rights so that they are available for global groups/staff 
rights
 $wgAvailableRights[] = 'flow-edit-post';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index fa92220..9ebc1ca 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4177,19 +4177,18 @@
'',
'autoconfirmed', // semi-protection level on
'sysop',
-   'superprotect', // per request by Erik Möller
),
-   'arwiki' => array( '', 'autoconfirmed', 'autoreview', 'sysop', 
'superprotect' ), // T54109
-   'ckbwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop', 
'superprotect' ), // T54533
-   'dewiki' => array( '', 'autoconfirmed', 'editeditorprotected', 'sysop', 
'superprotect' ), // T94368
-   'enwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // T57432
-   'hewiki' => array( '', 'autoconfirmed', 'autopatrol',  'templateeditor' 
/* T102466 */, 'sysop', 'superprotect' ), // T60207
-   'huwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // T74055
-   'lvwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop', 
'superprotect' ), // T92645
-   'plwiki' => array( '', 'autoconfirmed', 'editor', 'sysop', 
'superprotect' ), // T48990
-   'ptwiki' => array( '', 'autoconfirmed', 'autoreviewer', 'sysop', 
'superprotect' ), // T41652
-   'rowiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // T63172
-   'testwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop', 
'superprotect' ), // T61084
+   'arwiki' => array( '', 'autoconfirmed', 'autoreview', 'sysop' ), // 
T54109
+   'ckbwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop' ), // 
T54533
+   'dewiki' => array( '', 'autoconfirmed', 'editeditorprotected', 'sysop' 
), // T94368
+   'enwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop' ), // 
T57432
+   'hewiki' => array( '', 'autoconfirmed', 'autopatrol',  'templateeditor' 
/* T102466 */, 'sysop' ), // T60207
+   'huwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop' ), // 
T74055
+   'lvwiki' => array( '', 'autoconfirmed', 'autopatrol', 'sysop' ), // 
T92645
+   'plwiki' => array( '', 'autoconfirmed', 'editor', 'sysop' ), // T48990
+   'ptwiki' => array( '', 'autoconfirmed', 'autoreviewer', 'sysop' ), // 
T41652
+   'rowiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop' ), // 
T63172
+   'testwiki' => array( '', 'autoconfirmed', 'templateeditor', 'sysop' ), 
// T61084
 ),
 # @} end of wgRestrictionLevels
 

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

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

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

[MediaWiki-commits] [Gerrit] Add "Support Wikipedia" option to Nav menu. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Add "Support Wikipedia" option to Nav menu.
..


Add "Support Wikipedia" option to Nav menu.

This adds a simple item in the Nav list to take the user to an external
web page where they may make a donation. The app version and system
language are encoded into the URL.

This uses the "ic_favorite" icon from the Material set.

Bug: T116591
Change-Id: I817db20687d0538c3eeada04de17154f29a9c8d3
---
M app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
A app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png
A app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png
A app/src/main/res/drawable-xhdpi/ic_favorite_black_24dp.png
A app/src/main/res/drawable-xxhdpi/ic_favorite_black_24dp.png
A app/src/main/res/drawable-xxxhdpi/ic_favorite_black_24dp.png
M app/src/main/res/menu/menu_nav_drawer.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/strings_no_translate.xml
10 files changed, 21 insertions(+), 0 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java 
b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
index 93d04bc..0e44d3f 100644
--- a/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
+++ b/app/src/main/java/org/wikipedia/page/NavDrawerHelper.java
@@ -1,6 +1,7 @@
 package org.wikipedia.page;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -12,6 +13,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.wikipedia.BuildConfig;
 import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.analytics.LoginFunnel;
@@ -25,6 +27,7 @@
 import org.wikipedia.savedpages.SavedPagesFragment;
 import org.wikipedia.settings.SettingsActivity;
 import org.wikipedia.util.FeedbackUtil;
+import org.wikipedia.util.UriUtil;
 
 public class NavDrawerHelper {
 
@@ -93,6 +96,9 @@
 case R.id.nav_item_random:
 activity.getRandomHandler().doVisitRandomArticle();
 funnel.logRandom();
+break;
+case R.id.nav_item_donate:
+openDonatePage();
 break;
 default:
 return false;
@@ -237,4 +243,11 @@
 activity.closeNavDrawer();
 FeedbackUtil.showMessage(activity, R.string.toast_logout_complete);
 }
+
+private void openDonatePage() {
+activity.closeNavDrawer();
+UriUtil.visitInExternalBrowser(activity,
+
Uri.parse(String.format(activity.getString(R.string.donate_url),
+BuildConfig.VERSION_NAME, 
app.getSystemLanguageCode(;
+}
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png 
b/app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png
new file mode 100644
index 000..b8a2be6
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_favorite_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png 
b/app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png
new file mode 100644
index 000..b3659bc
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_favorite_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_black_24dp.png 
b/app/src/main/res/drawable-xhdpi/ic_favorite_black_24dp.png
new file mode 100644
index 000..460bfb6
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_favorite_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_black_24dp.png 
b/app/src/main/res/drawable-xxhdpi/ic_favorite_black_24dp.png
new file mode 100644
index 000..1139f5f
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_favorite_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_black_24dp.png 
b/app/src/main/res/drawable-xxxhdpi/ic_favorite_black_24dp.png
new file mode 100644
index 000..b46fa0a
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_favorite_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/menu/menu_nav_drawer.xml 
b/app/src/main/res/menu/menu_nav_drawer.xml
index 04a0b88..62a8c3d 100644
--- a/app/src/main/res/menu/menu_nav_drawer.xml
+++ b/app/src/main/res/menu/menu_nav_drawer.xml
@@ -45,4 +45,9 @@
 android:title="@string/settings_item_preferences"
 android:icon="@drawable/ic_settings_black_24dp" />
 
+
+
+
 
\ No newline at end of file
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index de0dad1..360ae28 100644
--- 

[MediaWiki-commits] [Gerrit] SpecialAllPages: Use OOUI form - change (mediawiki/core)

[Code Review]

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

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

Change subject: SpecialAllPages: Use OOUI form
..

SpecialAllPages: Use OOUI form

Bug: T117724
Change-Id: I7d87fb6bbff56c5001e60fbc95d2bec5c4793e17
---
M includes/specials/SpecialAllPages.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/specials/SpecialAllPages.php 
b/includes/specials/SpecialAllPages.php
index 2446270..b720141 100644
--- a/includes/specials/SpecialAllPages.php
+++ b/includes/specials/SpecialAllPages.php
@@ -133,7 +133,7 @@
'value' => $hideRedirects,
),
);
-   $form = HTMLForm::factory( 'table', $fields, 
$this->getContext() );
+   $form = HTMLForm::factory( 'ooui', $fields, $this->getContext() 
);
$form->setMethod( 'get' )
->setWrapperLegendMsg( 'allpages' )
->setSubmitTextMsg( 'allpagessubmit' )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d87fb6bbff56c5001e60fbc95d2bec5c4793e17
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] mw.UploadWizardDetails: Upload TitleBlacklist error handling... - change (mediawiki...UploadWizard)

[jenkins-bot (Code Review)]

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

Change subject: mw.UploadWizardDetails: Upload TitleBlacklist error handling 
for T115258
..


mw.UploadWizardDetails: Upload TitleBlacklist error handling for T115258

'code' is always 'titleblacklist-forbidden' now, the specific error
message is returned in 'message'.

Change-Id: If25432c9972d8327fb9f1e985bfeed839d844db2
---
M resources/mw.UploadWizardDetails.js
1 file changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/resources/mw.UploadWizardDetails.js 
b/resources/mw.UploadWizardDetails.js
index a43d4e7..7e8e5f2 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -1784,13 +1784,15 @@
processError: function ( code, result ) {
var statusKey, comma,
statusLine = mw.message( 
'api-error-unclassified' ).text(),
-   titleErrorMap = {
-   senselessimagename: 
'senselessimagename',
-   'fileexists-shared-forbidden': 
'fileexists-shared-forbidden',
+   titleBlacklistMessageMap = {
+   senselessimagename: 
'senselessimagename', // TODO This is probably never hit?
'titleblacklist-custom-filename': 
'hosting',
'titleblacklist-custom-SVG-thumbnail': 
'thumbnail',
'titleblacklist-custom-thumbnail': 
'thumbnail',
-   
'titleblacklist-custom-double-apostrophe': 'double-apostrophe',
+   
'titleblacklist-custom-double-apostrophe': 'double-apostrophe'
+   },
+   titleErrorMap = {
+   'fileexists-shared-forbidden': 
'fileexists-shared-forbidden',
protectedpage: 'protected'
};
 
@@ -1806,6 +1808,9 @@
if ( titleErrorMap[ code ] ) {
this.recoverFromError( this.titleId, 
mw.message( 'mwe-upwiz-error-title-' + titleErrorMap[ code ] ).escaped(), 
'title-' + titleErrorMap[ code ] );
return;
+   } else if ( code === 'titleblacklist-forbidden' 
) {
+   this.recoverFromError( this.titleId, 
mw.message( 'mwe-upwiz-error-title-' + titleBlacklistMessageMap[ 
result.error.message ] ).escaped(), 'title-' + titleBlacklistMessageMap[ 
result.error.message ] );
+   return;
} else {
statusKey = 'api-error-' + code;
if ( code === 'filetype-banned' && 
result.error.blacklisted ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If25432c9972d8327fb9f1e985bfeed839d844db2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] debian-glue should use our /etc/pbuilderrc - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: debian-glue should use our /etc/pbuilderrc
..

debian-glue should use our /etc/pbuilderrc

The puppet class ::package_builder provides a pbuilder hook to recognize
-wikimedia. jenkins-debian-glue is not loading it by default. A
use case is operations/debs/nodepool which has a changelog pointing to
'jessie-wikimedia' when the cow image is 'jessie'.

Inform jenkins-debian-glue about our custom configuration:
export PBUILDER_CONFIG=/etc/pbuilderrc

Change-Id: I4717c5659cd287270e0d00f009dfaae0006c88f5
---
M jjb/operations-debs.yaml
1 file changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/64/251264/1

diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index f369918..91e6f03 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -10,6 +10,13 @@
   export distribution={distribution}
   export REPOSITORY=/data/project/debianrepo
   export REPOS=jenkins-debian-glue
+
+  # Use Wikimedia hooks provided by puppet ::package_builder
+  # See below for more detailled explanations
+  export PBUILDER_CONFIG=/etc/pbuilderrc
+  . /etc/pbuilderrc
+  export COWBUILDER_BASE="$BASEPATH"
+
   /usr/bin/build-and-provide-package
 
 - builder:
@@ -112,6 +119,18 @@
 export distribution=$(dpkg-parsechangelog --show-field 
distribution -lsource/debian/changelog)
 echo "Distribution set from debian/changelog to $distribution"
 
+# Use Wikimedia hooks provided by puppet ::package_builder
+export PBUILDER_CONFIG=/etc/pbuilderrc
+
+# We set DIST which is used by pbuilderrc to determine whether it a
+# Wikimedia flavor.  We point jenkins-debian-glue cowbuilder path
+# to the canonical image, ie have jessie-wikimedia to point to
+# base-jessie-amd64.cow and init hook
+# Since $WIKIMEDIA is set, the hook will inject apt.wikimedia.org
+export DIST=$distribution
+. /etc/pbuilderrc
+export COWBUILDER_BASE="$BASEPATH"
+
 /usr/bin/build-and-provide-package
 - debian-glue-lintian
 - debian-glue-piuparts

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4717c5659cd287270e0d00f009dfaae0006c88f5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Hygiene: upgrade testing libraries - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Hygiene: upgrade testing libraries
..

Hygiene: upgrade testing libraries

* Add Espresso and recommended Android instrumentation test
  dependencies[1]:
  * Upgrade Android JUnit Runner to v0.4.1.
  * Add JUnit Rules v0.4.1.
  * Add Espresso-core, Espresso-contrib[2], Espresso-idling-resource,
and Espresso-web v2.2.1.
* Upgrade Robolectric to v3.0.
[0] https://github.com/square/okhttp/blob/master/CHANGELOG.md#version-250
[1] https://google.github.io/android-testing-support-library/downloads/
[2] The Google testing libraries often have dependency issues. I used
the workarounds mentioned here:

http://stackoverflow.com/questions/30578243/why-would-adding-espresso-contrib-cause-an-inflateexception

Change-Id: I282162bb9872b9b06afcaf784e163c6a8633538b
---
M app/build.gradle
1 file changed, 23 insertions(+), 5 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 476b82a..72f9372 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -171,14 +171,32 @@
 }
 compile 'net.hockeyapp.android:HockeySDK:3.6.2'
 
-androidTestCompile('com.android.support.test:runner:0.4')
-// Required by com.android.support.test:runner.
-androidTestCompile 'com.android.support:support-annotations:23.1.0'
-
 testCompile 'junit:junit:4.12'
 testCompile 'org.mockito:mockito-core:1.9.5'
-testCompile 'org.robolectric:robolectric:3.0-rc3'
+testCompile 'org.robolectric:robolectric:3.0'
 testCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
+
+// Required by Android JUnit Runner.
+androidTestCompile 'com.android.support:support-annotations:23.1.0'
+
+androidTestCompile 'com.android.support.test:rules:0.4.1' // JUnit Rules
+androidTestCompile 'com.android.support.test:runner:0.4.1' // Android 
JUnit Runner
+androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+
+// Espresso-contrib for DatePicker, RecyclerView, Drawer actions, 
Accessibility checks,
+// CountingIdlingResource
+
androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.1') {
+// 
http://stackoverflow.com/questions/30578243/why-would-adding-espresso-contrib-cause-an-inflateexception
+exclude group: 'com.android.support', module: 'appcompat'
+exclude group: 'com.android.support', module: 'support-v4'
+exclude module: 'recyclerview-v7'
+}
+
+// Espresso-web for WebView support
+androidTestCompile 'com.android.support.test.espresso:espresso-web:2.2.1'
+
+// Espresso-idling-resource for synchronization with background jobs.
+androidTestCompile 
'com.android.support.test.espresso:espresso-idling-resource:2.2.1'
 }
 
 private setSigningConfigKey(config, Properties props) {

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

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

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

[MediaWiki-commits] [Gerrit] Add missing client tests and increase coverage for abstracts - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Add missing client tests and increase coverage for abstracts
..

Add missing client tests and increase coverage for abstracts

An abstract base class is covered by its concrete implementations
tests, right?

Change-Id: If53004a490c3aa5f29795c0553e460845323133a
---
M client/includes/PropertyLabelNotResolvedException.php
M client/includes/Usage/NullUsageTracker.php
A client/tests/phpunit/includes/PropertyLabelNotResolvedExceptionTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
M client/tests/phpunit/includes/Usage/HashUsageAccumulatorTest.php
A client/tests/phpunit/includes/Usage/NullSubTrackerTest.php
A client/tests/phpunit/includes/Usage/NullUsageTrackerTest.php
M client/tests/phpunit/includes/Usage/ParserOutputUsageAccumulatorTest.php
A client/tests/phpunit/includes/recentchanges/ExternalChangeTest.php
10 files changed, 165 insertions(+), 11 deletions(-)


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

diff --git a/client/includes/PropertyLabelNotResolvedException.php 
b/client/includes/PropertyLabelNotResolvedException.php
index fdac5dc..a7fd557 100644
--- a/client/includes/PropertyLabelNotResolvedException.php
+++ b/client/includes/PropertyLabelNotResolvedException.php
@@ -2,24 +2,31 @@
 
 namespace Wikibase\Client;
 
+use Exception;
+use RuntimeException;
+
 /**
  * @since 0.5
  *
  * @licence GNU GPL v2+
  * @author Katie Filbert < aude.w...@gmail.com >
  */
-class PropertyLabelNotResolvedException extends \RuntimeException {
+class PropertyLabelNotResolvedException extends RuntimeException {
 
-   protected $label;
-
-   protected $lang;
-
-   public function __construct( $label, $lang, $message = null, \Exception 
$previous = null ) {
-   $this->label = $label;
-   $this->lang = $lang;
-
+   /**
+* @param string $label
+* @param string $languageCode
+* @param string|null $message
+* @param Exception|null $previous
+*/
+   public function __construct(
+   $label,
+   $languageCode,
+   $message = null,
+   Exception $previous = null
+   ) {
if ( $message === null ) {
-   $message = "Property not found for label '$label' and 
language '$lang'";
+   $message = "Property not found for label '$label' and 
language '$languageCode'";
}
 
parent::__construct( $message, 0, $previous );
diff --git a/client/includes/Usage/NullUsageTracker.php 
b/client/includes/Usage/NullUsageTracker.php
index 58b2789..6464ee2 100644
--- a/client/includes/Usage/NullUsageTracker.php
+++ b/client/includes/Usage/NullUsageTracker.php
@@ -68,7 +68,7 @@
 * @return Iterator
 */
public function getPagesUsing( array $entities, array $aspects = 
array() ) {
-   return new ArrayIterator( array() );
+   return new ArrayIterator();
}
 
 }
diff --git 
a/client/tests/phpunit/includes/PropertyLabelNotResolvedExceptionTest.php 
b/client/tests/phpunit/includes/PropertyLabelNotResolvedExceptionTest.php
new file mode 100644
index 000..31669d8
--- /dev/null
+++ b/client/tests/phpunit/includes/PropertyLabelNotResolvedExceptionTest.php
@@ -0,0 +1,38 @@
+', 
'' );
+   $message = $ex->getMessage();
+   $this->assertContains( '', $message );
+   $this->assertContains( '', $message );
+   $this->assertSame( 0, $ex->getCode() );
+   $this->assertNull( $ex->getPrevious() );
+   }
+
+   public function testWithCustomParameters() {
+   $previous = new Exception();
+   $ex = new PropertyLabelNotResolvedException( '', '', 
'', $previous );
+   $message = $ex->getMessage();
+   $this->assertSame( '', $message );
+   $this->assertSame( 0, $ex->getCode() );
+   $this->assertSame( $previous, $ex->getPrevious() );
+   }
+
+}
diff --git 
a/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php 
b/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
index 3b8d509..bdebfda 100644
--- a/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
+++ b/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
@@ -11,6 +11,7 @@
 
 /**
  * @covers Wikibase\Client\UpdateRepo\UpdateRepoOnDelete
+ * @covers Wikibase\Client\UpdateRepo\UpdateRepo
  *
  * @group WikibaseClient
  * @group Test
diff --git a/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php 
b/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
index f443903..5b29116 100644
--- 

[MediaWiki-commits] [Gerrit] Hygiene: move PageLoadPerformanceTests to JUnit 4 - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Hygiene: move PageLoadPerformanceTests to JUnit 4
..

Hygiene: move PageLoadPerformanceTests to JUnit 4

* Replace ActivityInstrumentationTestCase2 with @ActivityTestRule and
  JUnit 4.
* Replace assertEquals calls with assertThat.

Change-Id: Ice8ffa34a9e37dd80094ca0aa47522fda5adc27a
---
M app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
1 file changed, 15 insertions(+), 14 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
 
b/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
index b68bdc8..480198f 100644
--- 
a/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
+++ 
b/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
@@ -1,14 +1,18 @@
 package org.wikipedia.test.perf;
 
+import org.junit.Rule;
+import org.junit.Test;
 import org.wikipedia.page.PageActivity;
 import org.wikipedia.page.PageFragment;
 import org.wikipedia.page.PageLoadCallbacks;
 import org.wikipedia.page.PageLoadTests;
 import org.wikipedia.testlib.TestLatch;
 
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.annotation.NonNull;
+import android.support.test.rule.ActivityTestRule;
 import android.test.suitebuilder.annotation.LargeTest;
 
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsNull.notNullValue;
 
@@ -16,22 +20,14 @@
  * Test performance of page loading. Update the NUM_RUNS for better 
statistical significance.
  */
 @LargeTest
-public class PageLoadPerformanceTests extends 
ActivityInstrumentationTestCase2 {
+public class PageLoadPerformanceTests {
+@Rule @NonNull
+public final ActivityTestRule activityRule = new 
ActivityTestRule<>(PageActivity.class);
+
 private static final int NUM_RUNS = 1; //50;
 private final MeasurementController measurement = new 
MeasurementController();
 
-public PageLoadPerformanceTests() {
-super(PageActivity.class);
-}
-
-@Override
-protected void setUp() throws Exception {
-super.setUp();
-
-// Launch Activity.
-getActivity();
-}
-
+@Test
 public void testLoadPages() throws Throwable {
 loadPageMultipleTimes("Test_page_for_app_testing/Section1");
 loadPageMultipleTimes("A_long_page");
@@ -48,6 +44,7 @@
 
 private void loadPageUi(final String title) throws Throwable {
 final TestLatch latch = new TestLatch();
+
 getInstrumentation().runOnMainSync(new Runnable() {
 @Override
 public void run() {
@@ -74,4 +71,8 @@
 private PageFragment getFragment() {
 return (PageFragment) getActivity().getTopFragment();
 }
+
+private PageActivity getActivity() {
+return activityRule.getActivity();
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] Campaign categories using legacy: global config var and data... - change (mediawiki...CentralNotice)

[AndyRussG (Code Review)]

AndyRussG has uploaded a new change for review.

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

Change subject: Campaign categories using legacy: global config var and data 
property
..

Campaign categories using legacy: global config var and data property

Adds the global configuration variable $wgCentralNoticeCategoriesUsingLegacy
and the client-side subscribing data property campaignCategoryUsingLegacy.

Bug: T117650
Change-Id: I73421094da5c70915dc09784a0c3138086dd6f32
---
M CentralNotice.hooks.php
M CentralNotice.php
M resources/subscribing/ext.centralNotice.display.state.js
3 files changed, 18 insertions(+), 1 deletion(-)


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

diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php
index eb94981..5278ce7 100644
--- a/CentralNotice.hooks.php
+++ b/CentralNotice.hooks.php
@@ -235,11 +235,14 @@
  */
 function efCentralNoticeDefaults( &$vars ) {
// Using global $wgUser for compatibility with 1.18
-   global $wgNoticeProject, $wgUser, $wgMemc;
+   global $wgNoticeProject, $wgCentralNoticeCategoriesUsingLegacy,
+   $wgUser, $wgMemc;
 
// FIXME Is this no longer used anywhere in JS following the switch to
// client-side banner selection? If so, remove it.
$vars[ 'wgNoticeProject' ] = $wgNoticeProject;
+   $vars[ 'wgCentralNoticeCategoriesUsingLegacy' ] =
+   $wgCentralNoticeCategoriesUsingLegacy;
 
// Output the user's registration date, total edit count, and past 
year's edit count.
// This is useful for banners that need to be targeted to specific 
types of users.
diff --git a/CentralNotice.php b/CentralNotice.php
index e7acb7d..724d614 100644
--- a/CentralNotice.php
+++ b/CentralNotice.php
@@ -207,6 +207,11 @@
 // given as a proportion of the "all" list length.
 $wgNoticeListComplementThreshold = 0.75;
 
+// Temporary measure: Campaigns whose banners are all set to this category will
+// use some legacy mechanisms (especially cookies instead of the KVStore).
+// TODO Fix and remove!
+$wgCentralNoticeCategoriesUsingLegacy = array( 'Fundraising' );
+
 /** @var $wgNoticeTabifyPages array Declare all pages that should be tabified 
as CN pages */
 $wgNoticeTabifyPages = array(
/* Left side 'namespace' tabs */
diff --git a/resources/subscribing/ext.centralNotice.display.state.js 
b/resources/subscribing/ext.centralNotice.display.state.js
index e9030b0..6cc084c 100644
--- a/resources/subscribing/ext.centralNotice.display.state.js
+++ b/resources/subscribing/ext.centralNotice.display.state.js
@@ -262,6 +262,15 @@
}
 
state.data.campaignCategory = campaignCategory;
+
+   // Is the campaign category among the categories 
configured to use
+   // legacy mechanisms?
+   state.data.campaignCategoryUsingLegacy = (
+   $.inArray(
+   campaignCategory,
+   mw.config.get( 
'wgCentralNoticeCategoriesUsingLegacy' )
+   ) !== -1
+   );
},
 
getCampaign: function() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73421094da5c70915dc09784a0c3138086dd6f32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 

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

[MediaWiki-commits] [Gerrit] Put jquery and bootstrap to vendor directory - change (wikidata...rdf)

[jenkins-bot (Code Review)]

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

Change subject: Put jquery and bootstrap to vendor directory
..


Put jquery and bootstrap to vendor directory

Bug: T115995
Change-Id: Id3a2db76fdf8683c13c389d93dd495a49395d3ad
---
M gui/index.html
R gui/vendor/bootstrap/bootstrap.min.css
R gui/vendor/bootstrap/bootstrap.min.js
R gui/vendor/jquery/jquery-1.11.3.js
4 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/gui/index.html b/gui/index.html
index ab59cc8..f853505 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -1,8 +1,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -14,8 +14,8 @@
 
 
 
-
 
+
 
 
 
diff --git a/gui/bootstrap.min.css b/gui/vendor/bootstrap/bootstrap.min.css
similarity index 100%
rename from gui/bootstrap.min.css
rename to gui/vendor/bootstrap/bootstrap.min.css
diff --git a/gui/bootstrap.min.js b/gui/vendor/bootstrap/bootstrap.min.js
similarity index 100%
rename from gui/bootstrap.min.js
rename to gui/vendor/bootstrap/bootstrap.min.js
diff --git a/gui/jquery-1.11.3.js b/gui/vendor/jquery/jquery-1.11.3.js
similarity index 100%
rename from gui/jquery-1.11.3.js
rename to gui/vendor/jquery/jquery-1.11.3.js

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3a2db76fdf8683c13c389d93dd495a49395d3ad
Gerrit-PatchSet: 3
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add support for npm tests - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Add support for npm tests
..


Add support for npm tests

Run jshint and jsonlint tests through npm.

Disable banana checker due to missing messages in documentation.

Will re enable banana in a follow up patch.

Change-Id: Idc71cdd65cda36bc3639eec63a08532108a55c96
---
M .gitignore
M .jshintignore
M .jshintrc
A Gruntfile.js
A package.json
5 files changed, 53 insertions(+), 2 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 115b5cd..e71d5dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.svn
 *~
 .*.swp
 *.kate-swp
@@ -12,3 +11,4 @@
 composer.lock
 extensions/
 vendor/
+node_modules/
diff --git a/.jshintignore b/.jshintignore
index 6fe22a3..e7bc219 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,3 +1,5 @@
+node_modules/
+
 # upstream libs
 resources/js/jquery.autosize.js
 resources/js/jquery.ui.position.js
diff --git a/.jshintrc b/.jshintrc
index d7649a3..ce29904 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -16,7 +16,7 @@
"bitwise": true,
"forin": false,
"regexp": false,
-   "strict": true,
+   "strict": false,
"laxbreak": true,
"smarttabs": true,
"multistr": true,
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..4436d52
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,37 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
+   },
+   /* banana: {
+   all: [
+   'i18n/api',
+   'i18n/core',
+   'i18n/pagetranslation',
+   'i18n/sandbox',
+   'i18n/search'
+   ]
+   },
+   */
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..e0061f2
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-contrib-jshint": "0.11.3",
+"grunt-jsonlint": "1.0.5"
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc71cdd65cda36bc3639eec63a08532108a55c96
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Paladox 
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] [Translate] Update Jenkins tests - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [Translate] Update Jenkins tests
..

[Translate] Update Jenkins tests

Add support for running npm test.

Move jshint and jsonlint to check: for non-whitelisted users.

Change-Id: I2a02a4428213262bb26a10b43de500d010a0f0a3
---
M zuul/layout.yaml
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/53/251253/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bf0d8ab..38a7b96 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7281,10 +7281,12 @@
 template:
   - name: extension-qunit-generic
   - name: extension-rubylint
-  - name: jshint
-  - name: jsonlint
   - name: extension-unittests
+  - name: npm
   - name: extension-phpcs
+check:
+  - jshint
+  - jsonlint
 experimental:
   - php-composer-test
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a02a4428213262bb26a10b43de500d010a0f0a3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] HTTPS redirects: remove InstantCommons exception - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: HTTPS redirects: remove InstantCommons exception
..


HTTPS redirects: remove InstantCommons exception

Bug: T102566
Change-Id: Id099415d36b02c6a88938fe62c1e6e102f674d64
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 0cb856f..43e5b8c 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -214,11 +214,8 @@
// wikimedia.org has multi-level subdomains used for 
HTTP for which we have no certs, so they must be avoided here:
// Ref: T102826 + T102827
else if(req.http.Host ~ 
"(?i)^([^.]+\.)?(m\.)?wikimedia\.org$") {
-   // For now, avoid matching commons for MW UAs. 
Ref: T102566
-   if (!(req.http.Host ~ 
"(?i)^commons\.wikimedia\.org$" && req.http.User-Agent ~ "^MediaWiki/")) {
-   set req.http.Location = "https://; + 
req.http.Host + req.url;
-   error 751 "TLS Redirect";
-   }
+   set req.http.Location = "https://; + 
req.http.Host + req.url;
+   error 751 "TLS Redirect";
}
}
 <% if @vcl_config.fetch("secure_post", true) -%>

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

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

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

[MediaWiki-commits] [Gerrit] Convert Special:ConfirmEmail to OOUIHTMLForm - change (mediawiki/core)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Convert Special:ConfirmEmail to OOUIHTMLForm
..

Convert Special:ConfirmEmail to OOUIHTMLForm

Bug: T117792
Change-Id: I41e752d91598e8e00376e8b2a56629bb40a39ac3
---
M includes/specials/SpecialConfirmemail.php
1 file changed, 45 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/251283/1

diff --git a/includes/specials/SpecialConfirmemail.php 
b/includes/specials/SpecialConfirmemail.php
index 147f67e..17230c9 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -78,16 +78,37 @@
$user = $this->getUser();
$out = $this->getOutput();
 
-   if ( $this->getRequest()->wasPosted() &&
-   $user->matchEditToken( $this->getRequest()->getText( 
'token' ) )
-   ) {
-   $status = $user->sendConfirmationMail();
-   if ( $status->isGood() ) {
-   $out->addWikiMsg( 'confirmemail_sent' );
-   } else {
-   $out->addWikiText( $status->getWikiText( 
'confirmemail_sendfailed' ) );
+   if ( !$user->isEmailConfirmed() ) {
+   $descriptor = array();
+   if ( $user->isEmailConfirmationPending() ) {
+   $descriptor += array(
+   'pending' => array(
+   'type' => 'info',
+   'raw' => true,
+   'default' => "\n" .
+   $this->msg( 
'confirmemail_pending' )->escaped() .
+   "\n",
+   ),
+   );
}
-   } elseif ( $user->isEmailConfirmed() ) {
+
+   $out->addWikiMsg( 'confirmemail_text' );
+   $form = HTMLForm::factory( 'ooui', $descriptor, 
$this->getContext() );
+   $form
+   ->setMethod( 'post' )
+   
->setAction($this->getPageTitle()->getLocalURL() )
+   ->setSubmitTextMsg( 'confirmemail_send' )
+   ->setSubmitCallback( array( $this, 'submitSend' 
) );
+
+   $retval = $form->show();
+
+   if ( $retval === true ) {
+   // should never happen, but if so, don't let 
the user without any message
+   $out->addWikiMsg( 'confirmemail_sent' );
+   } elseif ( $retval instanceof Status && 
$retval->isGood() ) {
+   $out->addWikiText( $retval->getValue() );
+   }
+   } else {
// date and time are separate parameters to facilitate 
localisation.
// $time is kept for backward compat reasons.
// 'emailauthenticated' is also used in 
SpecialPreferences.php
@@ -97,23 +118,22 @@
$d = $lang->userDate( $emailAuthenticated, $user );
$t = $lang->userTime( $emailAuthenticated, $user );
$out->addWikiMsg( 'emailauthenticated', $time, $d, $t );
-   } else {
-   if ( $user->isEmailConfirmationPending() ) {
-   $out->wrapWikiMsg(
-   "\n$1\n",
-   'confirmemail_pending'
-   );
-   }
+   }
+   }
 
-   $out->addWikiMsg( 'confirmemail_text' );
-   $form = Html::openElement(
-   'form',
-   array( 'method' => 'post', 'action' => 
$this->getPageTitle()->getLocalURL() )
-   ) . "\n";
-   $form .= Html::hidden( 'token', $user->getEditToken() ) 
. "\n";
-   $form .= Xml::submitButton( $this->msg( 
'confirmemail_send' )->text() ) . "\n";
-   $form .= Html::closeElement( 'form' ) . "\n";
-   $out->addHTML( $form );
+   /**
+* Callback for HTMLForm send confirmation mail.
+*
+* @return Status Status object with the result
+*/
+   public function submitSend() {
+   $status = $this->getUser()->sendConfirmationMail();
+   if ( $status->isGood() ) {
+   return Status::newGood( $this->msg( 

[MediaWiki-commits] [Gerrit] Migrate to new mechanism for extension registration. - change (mediawiki...LastUserLogin)

[Ingomueller-net (Code Review)]

Ingomueller-net has uploaded a new change for review.

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

Change subject: Migrate to new mechanism for extension registration.
..

Migrate to new mechanism for extension registration.

I followed the recommended procedure described here:
php maintenance/convertExtensionToRegistration.php 
extensions/MassMessage/MassMessage.php
As suggested, most work was done by using the migration script:
php maintenance/convertExtensionToRegistration.php 
extensions/LastUserLogin/LastUserLogin.php
In the first run, the script complained about the deprecated
$wgSpecialPageGroups, which I migrated to using getGroupName as
suggested here: https://www.mediawiki.org/wiki/Manual:$wgSpecialPageGroups.

for details.

Change-Id: Ica83a254248b18e683ec9dfbcda72f6656f89c9c
---
M LastUserLogin.body.php
M LastUserLogin.php
A extension.json
3 files changed, 54 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LastUserLogin 
refs/changes/85/251285/1

diff --git a/LastUserLogin.body.php b/LastUserLogin.body.php
index 77110d2..bfca806 100644
--- a/LastUserLogin.body.php
+++ b/LastUserLogin.body.php
@@ -27,6 +27,13 @@
}
 
/**
+* Put the special page into the 'users' group
+*/
+   protected function getGroupName() {
+   return 'users';
+   }
+
+   /**
 * Updates the database when a user logs in
 */
public static function updateUserTouched() {
diff --git a/LastUserLogin.php b/LastUserLogin.php
index 78cb073..6ae9631 100644
--- a/LastUserLogin.php
+++ b/LastUserLogin.php
@@ -18,26 +18,16 @@
  * @file
  */
 
-$wgExtensionCredits['specialpage'][] = array(
-   'path' => __FILE__,
-   'name' => 'LastUserLogin',
-   'version' => '1.3',
-   'author' => array( 'Justin G. Cramer', 'Danila Ulyanov', 'Thomas 
Klein', 'Luis Felipe Schenone' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:LastUserLogin',
-   'descriptionmsg' => 'lastuserlogin-desc',
-);
-
-$wgAutoloadClasses['LastUserLogin'] = __DIR__ . '/LastUserLogin.body.php';
-$wgExtensionMessagesFiles['LastUserLogin'] = __DIR__ . 
'/LastUserLogin.i18n.php';
-$wgExtensionMessagesFiles['LastUserLoginAlias'] = __DIR__ . 
'/LastUserLogin.alias.php';
-
-// New user right
-$wgAvailableRights[] = 'lastlogin';
-$wgGroupPermissions['sysop']['lastlogin'] = true;
-
-// Set up the new special page
-$wgSpecialPages['LastUserLogin'] = 'LastUserLogin';
-$wgSpecialPageGroups['LastUserLogin'] = 'users';
-
-// Register the method that updates the database when a user logs in
-$wgExtensionFunctions[] = 'LastUserLogin::updateUserTouched';
\ No newline at end of file
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'LastUserLogin' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['LastUserLogin'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['LastUserLoginAlias'] = __DIR__ . 
'/LastUserLogin.alias.php';
+   wfWarn(
+   'Deprecated PHP entry point used for LastUserLogin extension. 
Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the LastUserLogin extension requires MediaWiki 
1.25+' );
+}
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..2054de4
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,34 @@
+{
+   "name": "LastUserLogin",
+   "version": "1.3",
+   "author": [
+   "Justin G. Cramer",
+   "Danila Ulyanov",
+   "Thomas Klein",
+   "Luis Felipe Schenone"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:LastUserLogin;,
+   "descriptionmsg": "lastuserlogin-desc",
+   "type": "specialpage",
+   "GroupPermissions": {
+   "sysop": {
+   "lastlogin": true
+   }
+   },
+   "AvailableRights": [
+   "lastlogin"
+   ],
+   "ExtensionFunctions": [
+   "LastUserLogin::updateUserTouched"
+   ],
+   "SpecialPages": {
+   "LastUserLogin": "LastUserLogin"
+   },
+   "ExtensionMessagesFiles": {
+   "LastUserLogin": "LastUserLogin.i18n.php",
+   "LastUserLoginAlias": "LastUserLogin.alias.php"
+   },
+   "AutoloadClasses": {
+   "LastUserLogin": "LastUserLogin.body.php"
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica83a254248b18e683ec9dfbcda72f6656f89c9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LastUserLogin
Gerrit-Branch: master
Gerrit-Owner: Ingomueller-net 

[MediaWiki-commits] [Gerrit] Prevent infinite loops in ACE graph editor - change (mediawiki...Graph)

[Ferdbold (Code Review)]

Ferdbold has uploaded a new change for review.

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

Change subject: Prevent infinite loops in ACE graph editor
..

Prevent infinite loops in ACE graph editor

Change-Id: I881a9348a3999e7451c9a933cf8b1d1527281a9e
---
M modules/ve-graph/ve.ui.MWGraphDialog.js
1 file changed, 18 insertions(+), 8 deletions(-)


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

diff --git a/modules/ve-graph/ve.ui.MWGraphDialog.js 
b/modules/ve-graph/ve.ui.MWGraphDialog.js
index 66433bb..d81b0b1 100644
--- a/modules/ve-graph/ve.ui.MWGraphDialog.js
+++ b/modules/ve-graph/ve.ui.MWGraphDialog.js
@@ -406,13 +406,15 @@
var newRawData;
 
try {
-   // If parsing fails here, nothing more needs to happen
-   newRawData = JSON.parse( value );
+   if ( !this.changingJsonTextInput ) {
+   // If parsing fails here, nothing more needs to happen
+   newRawData = JSON.parse( value );
 
-   // Only pass changes to model if there was anything worthwhile 
to change
-   if ( !OO.compare( this.cachedRawData, newRawData ) ) {
-   this.cachedRawData = newRawData;
-   this.graphModel.setSpecFromString( value );
+   // Only pass changes to model if there was anything 
worthwhile to change
+   if ( !OO.compare( this.cachedRawData, newRawData ) ) {
+   this.cachedRawData = newRawData;
+   this.graphModel.setSpecFromString( value );
+   }
}
} catch ( err ) {}
 };
@@ -495,11 +497,19 @@
  * @private
  */
 ve.ui.MWGraphDialog.prototype.onSpecChange = function () {
-   var padding,
+   var self = this,
paddingAuto = this.graphModel.isPaddingAutomatic(),
-   paddingObj = this.graphModel.getPaddingObject();
+   paddingObj = this.graphModel.getPaddingObject(),
+   padding;
 
+   this.changingJsonTextInput = true;
this.jsonTextInput.setValue( this.graphModel.getSpecString() );
+   // HACK: MWAceEditorWidget.loadingPromise isn't exposed to the outside, 
but we
+   // need to be able to listen to setValue()'s promise in order to 
prevent infinite
+   // update loops between graph model and ACE's value
+   this.jsonTextInput.loadingPromise.done( function () {
+   self.changingJsonTextInput = false;
+   } );
 
if ( paddingAuto ) {
// Clear padding table if set to automatic

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I881a9348a3999e7451c9a933cf8b1d1527281a9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Ferdbold 

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

[MediaWiki-commits] [Gerrit] Resolve rare bug - change (wikimedia...polloi)

[OliverKeyes (Code Review)]

OliverKeyes has submitted this change and it was merged.

Change subject: Resolve rare bug
..


Resolve rare bug

Sometimes lubridate::month/week(dataset[, 1]) yields:
Error in as.POSIXlt.default(x, tz = tz(x)) :
  do not know how to convert 'x' to class “POSIXlt”

This is meant to address that.

Change-Id: Iff01c7289191e4594a571232783ea90f70f1d440
---
M DESCRIPTION
M NEWS.md
M R/smoothing.R
3 files changed, 10 insertions(+), 6 deletions(-)

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



diff --git a/DESCRIPTION b/DESCRIPTION
index 2d6e95e..5292f5a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: polloi
 Type: Package
 Title: Common Functionality for Wikimedia Dashboards
-Version: 0.0.4
-Date: 2015-09-30
+Version: 0.0.5
+Date: 2015-11-04
 Author: Oliver Keyes [aut, cre], Mikhail Popov [aut]
 Maintainer: Oliver Keyes 
 Description: This package (which I can say because BDR is nowhere in sight) 
contains common functionality
diff --git a/NEWS.md b/NEWS.md
index c6d9914..da1a980 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+polloi 0.0.5
+=
+- Added subsetting by date range
+
 polloi 0.0.4
 =
 - Added a change log
diff --git a/R/smoothing.R b/R/smoothing.R
index 30194d6..c0b3c74 100644
--- a/R/smoothing.R
+++ b/R/smoothing.R
@@ -40,13 +40,13 @@
   # whatsoever, and so the original dataset is returned.
   switch(smooth_level,
  week = {
-   dataset$filter_1 <- lubridate::week(dataset[, 1])
-   dataset$filter_2 <- lubridate::year(dataset[, 1])
+   dataset$filter_1 <- lubridate::week(dataset[[1]])
+   dataset$filter_2 <- lubridate::year(dataset[[1]])
name_append <- ifelse(rename, " (Weekly average)", "")
  },
  month = {
-   dataset$filter_1 <- lubridate::month(dataset[, 1])
-   dataset$filter_2 <- lubridate::year(dataset[, 1])
+   dataset$filter_1 <- lubridate::month(dataset[[1]])
+   dataset$filter_2 <- lubridate::year(dataset[[1]])
name_append <- ifelse(rename, " (Monthly average)", "")
  },
  {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff01c7289191e4594a571232783ea90f70f1d440
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/polloi
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: OliverKeyes 

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

[MediaWiki-commits] [Gerrit] Allow configurable ACLs - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Allow configurable ACLs
..

Allow configurable ACLs

LDAP ACLs are highly dependant on the order of the rules being processed,
so for practical purposes it might also be necessary to prepend some rules
to the base ACL set. But the currently version should be a sufficient base
to build upon.

Some of the current corp ACLs could be moved into an extra_acls option
in a later commit.

Bug: T101299
Change-Id: I21adea32ef824e3d18992083b1ca42ae63611690
---
M modules/openldap/manifests/init.pp
A modules/openldap/templates/base-acls.erb
M modules/openldap/templates/slapd.erb
3 files changed, 59 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/251272/1

diff --git a/modules/openldap/manifests/init.pp 
b/modules/openldap/manifests/init.pp
index bfa99d9..8e39216 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -26,6 +26,9 @@
 #   Optional. TLS enable the server. The path to the CA certificate file
 #$extra_schemas
 #   Optional. A list of schema files relative to the /etc/ldap/schema 
directory
+#$extra_acls
+#   Optional. Specify an ERB template file with additional ACL access rules
+#   (in addition to the base rules)
 #
 # Actions:
 #   Install/configure slapd
@@ -49,6 +52,7 @@
 $key=undef,
 $ca=undef,
 $extra_schemas=undef,
+$extra_acls=undef,
 ) {
 
 require_package('slapd', 'ldap-utils', 'python-ldap')
@@ -105,6 +109,19 @@
 include_ldap_schemas { $extra_schemas: }
 }
 
+file { '/etc/ldap/base-acls.conf' :
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+
+if $extra_acls {
+content => template('openldap/base-acls.erb', $extra_acls),
+} else {
+content => template('openldap/base-acls.erb'),
+}
+}
+
 # We do this cause we want to rely on using slapd.conf for now
 exec { 'rm_slapd.d':
 onlyif  => '/usr/bin/test -d /etc/ldap/slapd.d',
@@ -121,6 +138,7 @@
 }
 
 # Relationships
+File['/etc/ldap/base-acls.conf'] -> File['/etc/ldap/slapd.conf']
 Package['slapd'] -> File['/etc/ldap/slapd.conf']
 Package['slapd'] -> File['/etc/default/slapd']
 Package['slapd'] -> File[$datadir]
diff --git a/modules/openldap/templates/base-acls.erb 
b/modules/openldap/templates/base-acls.erb
new file mode 100644
index 000..c8da0f1
--- /dev/null
+++ b/modules/openldap/templates/base-acls.erb
@@ -0,0 +1,39 @@
+###
+## Access lists
+
+# Allow radiusagent to check sambaNTPassword for 802.1x Enterprise WPA2
+access to attrs=sambaNTPassword
+   by dn="cn=admin,<%= @suffix %>" write
+   by dn="cn=radiusagent,ou=other,<%= @suffix %>" read
+   by anonymous auth
+   by self write
+   by * none
+
+# The userPassword by default can be changed
+# by the entry owning it if they are authenticated.
+# Others should not be able to see it, except the
+# admin entry below
+# These access lines apply to database #1 only
+access to attrs=userPassword,shadowLastChange
+   by dn="cn=admin,<%= @suffix %>" write
+   by anonymous auth
+   by self write
+   by * none
+
+# Ensure read access to the base for things like
+# supportedSASLMechanisms.  Without this you may
+# have problems with SASL not knowing what
+# mechanisms are available and the like.
+# Note that this is covered by the 'access to *'
+# ACL below too but if you change that as people
+# are wont to do you'll still need this if you
+# want SASL (and possible other things) to work
+# happily.
+access to dn.base="" by * read
+
+# The admin dn has full write access, everyone else
+# can read everything.
+access to *
+   by dn="cn=admin,<%= @suffix %>" write
+   by self write
+   by * read
diff --git a/modules/openldap/templates/slapd.erb 
b/modules/openldap/templates/slapd.erb
index 189c7ee..396f8da 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -163,42 +163,5 @@
 lastmod on
 checkpoint  512 30
 
-###
-## Access lists
-
-# Allow radiusagent to check sambaNTPassword for 802.1x Enterprise WPA2
-access to attrs=sambaNTPassword
-   by dn="cn=admin,<%= @suffix %>" write
-   by dn="cn=radiusagent,ou=other,<%= @suffix %>" read
-   by anonymous auth
-   by self write
-   by * none
-
-# The userPassword by default can be changed
-# by the entry owning it if they are authenticated.
-# Others should not be able to see it, except the
-# admin entry below
-# These access lines apply to database #1 only
-access to attrs=userPassword,shadowLastChange
-   by 

[MediaWiki-commits] [Gerrit] Historical UID: Change counter to start at any possible value - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Historical UID: Change counter to start at any possible value
..


Historical UID: Change counter to start at any possible value

For historical (U)UID generation (used by import), start the counter
at any possible random value, rather than capping at 2^8.

Change-Id: I4d3d4fe5d7fad9b8a0ec10b96caee8e8a9446260
---
M includes/Import/Importer.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, approved
  EBernhardson: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Import/Importer.php b/includes/Import/Importer.php
index d93a4d8..5d36885 100644
--- a/includes/Import/Importer.php
+++ b/includes/Import/Importer.php
@@ -142,9 +142,11 @@
  */
 class HistoricalUIDGenerator extends UIDGenerator {
public static function historicalTimestampedUID88( $timestamp, $base = 
10 ) {
+   $COUNTER_MAX = 1023; // 2^10 - 1
+
static $counter = false;
if ( $counter === false ) {
-   $counter = mt_rand( 0, 256 );
+   $counter = mt_rand( 0, $COUNTER_MAX );
}
 
$time = array(
@@ -159,7 +161,7 @@
$gen = self::singleton();
self::rotateNodeId( $gen );
$binaryUUID = $gen->getTimestampedID88(
-   array( $time, ++$counter % 1024 )
+   array( $time, ++$counter % ( $COUNTER_MAX + 1) )
);
 
return wfBaseConvert( $binaryUUID, 2, $base );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d3d4fe5d7fad9b8a0ec10b96caee8e8a9446260
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Matthias Mullie 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Hygiene: update Checkstyle ignored annotations - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: update Checkstyle ignored annotations
..


Hygiene: update Checkstyle ignored annotations

Checkstyle enforces private member variables. This patch makes
exceptions to the rule for specific annotations requiring non-public
access.

* Update Butter Knife annotations to be complete.
* Add JUnit @Rule for ActivityTestRule.

Change-Id: I10579f5ee41f12a303c8da6524dcae100729db09
---
M config/checkstyle.xml
1 file changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 2744504..f64a3d7 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -159,6 +159,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 
 
 

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

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

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

[MediaWiki-commits] [Gerrit] Fix regression in edit post and edit topic summary due to OO... - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Fix regression in edit post and edit topic summary due to OO UI 
changes
..


Fix regression in edit post and edit topic summary due to OO UI changes

This was a regression in Firefox due to the nodes not being in the DOM.
It's solved by doing the phase that requires being in the DOM outside
of the constructor, when the initializer has put it in the DOM.

This was caused by Ie4f66b15f4f5ec9932d5fd72e12b4453724e3742 .
I believe the specific change was I4109d5ad6089035cf689e11667e6ec2bb007d6ce
which affects how OOjs UI handles text selection ranges.

Bug: T117698
Change-Id: I5de75d586594122eb634a219513f8d53dec4fd22
(cherry picked from commit 715e950bd33939d8ef984fa163b9ffd55e347993)
---
M modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
M modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
M modules/mw.flow.Initializer.js
3 files changed, 55 insertions(+), 41 deletions(-)

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



diff --git a/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
index 656d35b..1255341 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
@@ -50,15 +50,38 @@
this.editor.$element
);
 
-   // Load the editor
+   };
+
+   /* Initialization */
+
+   OO.inheritClass( mw.flow.ui.EditPostWidget, OO.ui.Widget );
+
+   /* Events */
+
+   /**
+* Save the content of the reply
+* @event saveContent
+* @param {string} workflow The workflow this reply was saved under
+* @param {string} content The content of the reply
+* @param {string} contentFormat The format of the content of this reply
+*/
+
+   /* Methods */
+
+   /**
+* Activate the widget.  These needs to be called when it's visible and 
in the body.
+*/
+   mw.flow.ui.EditPostWidget.prototype.activate = function () {
+   var widget, contentFormat;
+
this.editor.pushPending();
this.editor.activate();
 
// Get the post from the API
-   var widget = this,
-   contentFormat = this.editor.getContentFormat();
+   widget = this;
+   contentFormat = this.editor.getContentFormat();
 
-   this.api.getPost( topicId, postId, contentFormat ).then(
+   this.api.getPost( this.topicId, this.postId, contentFormat 
).then(
function ( post ) {
var content = OO.getProp( post, 'content', 
'content' ),
format = OO.getProp( post, 'content', 
'format' );
@@ -84,24 +107,7 @@
// Focus again: pending editors are disabled and can't 
be focused
widget.editor.focus();
} );
-
};
-
-   /* Initialization */
-
-   OO.inheritClass( mw.flow.ui.EditPostWidget, OO.ui.Widget );
-
-   /* Events */
-
-   /**
-* Save the content of the reply
-* @event saveContent
-* @param {string} workflow The workflow this reply was saved under
-* @param {string} content The content of the reply
-* @param {string} contentFormat The format of the content of this reply
-*/
-
-   /* Methods */
 
/**
 * Respond to editor cancel
diff --git a/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
index 123a233..a834e3b 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
@@ -50,16 +50,39 @@
this.error.$element,
this.editor.$element
);
+   };
+
+   /* Initialization */
+
+   OO.inheritClass( mw.flow.ui.EditTopicSummaryWidget, OO.ui.Widget );
+
+   /* Events */
+
+   /**
+* Save the content of the reply
+* @event saveContent
+* @param {string} workflow The workflow this reply was saved under
+* @param {string} content The content of the reply
+* @param {string} contentFormat The format of the content of this reply
+*/
+
+   /* Methods */
+
+   /**
+* Activate the widget.  These needs to be called when it's visible and 
in the body.
+*/
+   mw.flow.ui.EditTopicSummaryWidget.prototype.activate = function () {
+   var widget, contentFormat;
 
// Load the editor
this.editor.pushPending();
this.editor.activate();
 
// Get the post from the API
-