[MediaWiki-commits] [Gerrit] base: Allow overriding core dump path via hiera - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173484
Change subject: base: Allow overriding core dump path via hiera
..
base: Allow overriding core dump path via hiera
Change-Id: I1d209df535a0387ba88c58c84bce72e8c4e175d4
Phab: T1259
---
M modules/base/manifests/environment.pp
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/173484/1
diff --git a/modules/base/manifests/environment.pp
b/modules/base/manifests/environment.pp
index 7edd8d5..79f5e20 100644
--- a/modules/base/manifests/environment.pp
+++ b/modules/base/manifests/environment.pp
@@ -82,6 +82,9 @@
# Write core dumps to
/var/tmp/core/core.
# Remove core dumps with atime > one week.
+# Allow overrides of the core dump path with hiera, so places
+# where we want core dumps to be elsewhere (CWD, etc) can
+# still have that.
file { '/var/tmp/core':
ensure => directory,
@@ -90,8 +93,9 @@
mode => '1773',
}
+$core_dump_pattern = hiera('core_dump_pattern',
'/var/tmp/core/core.%h.%e.%p.%t')
sysctl::parameters { 'core_dumps':
-values => { 'kernel.core_pattern' =>
'/var/tmp/core/core.%h.%e.%p.%t', },
+values => { 'kernel.core_pattern' => $core_dump_pattern, },
require => File['/var/tmp/core'],
}
--
To view, visit https://gerrit.wikimedia.org/r/173484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d209df535a0387ba88c58c84bce72e8c4e175d4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] set up redirects for bugzilla urls to redirect to phabricator. - change (operations/puppet)
20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173483
Change subject: set up redirects for bugzilla urls to redirect to phabricator.
..
set up redirects for bugzilla urls to redirect to phabricator.
This was already set up for testing in labs, this change applies
the same to production in preparation for the bugzilla migration.
Refs T40
Change-Id: I32cbc453946c5262802ee720644a4460ae375a79
---
M manifests/role/phabricator.pp
M modules/phabricator/files/preamble.php
M modules/phabricator/manifests/redirector.pp
M modules/phabricator/templates/redirect_config.json.erb
4 files changed, 91 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/173483/1
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index a953d56..72eea09 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -39,7 +39,9 @@
class role::phabricator::main {
-system::role { 'role::phabricator::main': description => 'Phabricator
(Main)' }
+system::role { 'role::phabricator::main':
+ description => 'Phabricator (Main)'
+}
#let's go jenkins
$current_tag = 'wmoauth-20141110'
@@ -51,8 +53,8 @@
mysql_admin_pass => $::mysql_adminpass,
auth_type=> 'dual',
extension_tag=> 'HEAD',
-extensions => ['MediaWikiUserpageCustomField.php',
- 'SecurityPolicyEnforcerAction.php'],
+extensions => [ 'MediaWikiUserpageCustomField.php',
+ 'SecurityPolicyEnforcerAction.php'],
settings => {
'search.elastic.host'=>
'http://search.svc.eqiad.wmnet:9200',
'search.elastic.namespace' => 'phabricatormain',
@@ -90,14 +92,16 @@
include phabricator::monitoring
class { '::phabricator::mailrelay':
-default => { security => 'users',
- maint=> 'false',
+default => {
+ security => 'users',
+ maint=> 'false',
},
address_routing => { testproj => 'demoproject'},
-phab_bot => { root_dir=> '/srv/phab/phabricator/',
- username=> 'emailbot',
- host=> "https://${domain}/api/";,
- certificate => $emailbotcert,
+phab_bot => {
+ root_dir=> '/srv/phab/phabricator/',
+ username=> 'emailbot',
+ host=> "https://${domain}/api/";,
+ certificate => $emailbotcert,
},
}
@@ -116,6 +120,15 @@
port => '25',
proto => 'tcp',
srange => inline_template('(<%= @mail_smarthost.map{|x|
"@resolve(#{x})" }.join(" ") %>)'),
+}
+
+phabricator::redirector { 'phabricator.wikimedia.org':
+mysql_user => $passwords::mysql::phabricator::maniphest_user,
+mysql_pass => $passwords::mysql::phabricator::maniphest_pass,
+mysql_host => 'm3-master.eqiad.wmnet',
+rootdir => '/srv/phab',
+field_index => '4rRUkCdImLQU',
+phab_host => 'phabricator.wikimedia.org',
}
}
@@ -178,10 +191,12 @@
# dummy redirector to test out the redirect patterns for bugzilla
phabricator::redirector { 'phabzilla.wmflabs.org':
-mysql_user => 'root',
-mysql_pass => $mysqlpass,
-mysql_host => 'localhost',
-rootdir => '/srv/phab',
+mysql_user => 'root',
+mysql_pass => $mysqlpass,
+mysql_host => 'localhost',
+rootdir => '/srv/phab',
+field_index => 'yERhvoZPNPtM',
+phab_host => 'phab-01.wmflabs.org',
}
}
diff --git a/modules/phabricator/files/preamble.php
b/modules/phabricator/files/preamble.php
index 668695f..6562fd0 100644
--- a/modules/phabricator/files/preamble.php
+++ b/modules/phabricator/files/preamble.php
@@ -1,63 +1,64 @@
config =
json_decode(file_get_contents(__DIR__.'/redirect_config.json'));
-$this->mysqli = new mysqli(
-$this->config->mysql->host,
-$this->config->mysql->user,
-$this->config->mysql->pass,
-'phabricator_maniphest'
-);
-if ($this->mysqli->connect_error) {
- die('Connect Error (' . $this->mysqli->connect_errno . ') '
-. $this->mysqli->connect_error);
-}
+ function __construct() {
+$this->config = json_decode(
+ file_get_contents(__DIR__.'/redirect_config.json'));
+
+$this->mysqli = new mysqli(
+ $this->config->mysql->host,
+ $this->config->mysql->user,
+ $this->config->mysql->pass,
+ 'phabricator_maniphest'
+);
+if ($this->mysqli->connect_error)
[MediaWiki-commits] [Gerrit] WIP: Stable Ids - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173482
Change subject: WIP: Stable Ids
..
WIP: Stable Ids
Change-Id: I1b243dfe9f49926b609b5ae069df389074aaf05f
---
A lib/stableIds.js
M tests/parse.js
2 files changed, 44 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/82/173482/1
diff --git a/lib/stableIds.js b/lib/stableIds.js
new file mode 100644
index 000..1270fe9
--- /dev/null
+++ b/lib/stableIds.js
@@ -0,0 +1,35 @@
+/**
+ * Stable Ids
+ *
+ * Maintain id assignment across wikitext edits by,
+ * - parsing old and new wikitext
+ * - using dom-diffing to mark differing nodes
+ * - copying over ids from old to new on unmodified nodes
+ *
+ * Example usage,
+ * > echo "fooboo" > /tmp/wt
+ * > node parse --dp < /tmp/wt > /tmp/orig.html
+ * > sed "s/foo/bar/g" < /tmp/wt > /tmp/editedwt
+ * > node parse --stableids --oldhtmlfile /tmp/orig.html < /tmp/editedwt
+ */
+
+"use strict";
+
+require("prfun");
+
+var WikitextSerializer =
require("./mediawiki.WikitextSerializer.js").WikitextSerializer,
+ DU = require("./mediawiki.DOMUtils.js").DOMUtils;
+
+var stableIds = module.exports = function( env, input ) {
+ return new Promise(function( resolve, reject ) {
+ if ( env.page.dom ) {
+ return reject( new Error("Old HTML is required.") );
+ }
+ env.setPageSrcInfo( input );
+ var parser =
env.pipelineFactory.getPipeline("text/x-mediawiki/full");
+ parser.once( "document", resolve );
+ parser.processToplevelDoc( env.page.src );
+ }).then(function( doc ) {
+ return { out: DU.normalizeOut( doc.body, false ), trailingNL:
false };
+ });
+};
diff --git a/tests/parse.js b/tests/parse.js
index b7491cc..50e2d0f 100755
--- a/tests/parse.js
+++ b/tests/parse.js
@@ -13,6 +13,7 @@
WikitextSerializer =
require('../lib/mediawiki.WikitextSerializer.js').WikitextSerializer,
SelectiveSerializer = require(
'../lib/mediawiki.SelectiveSerializer.js' ).SelectiveSerializer,
TemplateRequest =
require('../lib/mediawiki.ApiRequest.js').TemplateRequest,
+ stableIds = require('../lib/stableIds.js'),
Util = require('../lib/mediawiki.Util.js').Util,
DU = require('../lib/mediawiki.DOMUtils.js').DOMUtils,
yargs = require('yargs'),
@@ -51,6 +52,11 @@
},
'selser': {
description: 'Use the selective serializer to go from HTML to
Wikitext.',
+ 'boolean': true,
+ 'default': false
+ },
+ 'stableids': {
+ description: 'Preserve dom ids across a wt edit.',
'boolean': true,
'default': false
},
@@ -250,13 +256,14 @@
input = input.replace(/\r/g, '');
}
- if ( argv.html2wt || argv.html2html ) {
+ if ( argv.stableids ) {
+ return stableIds( argv, env, input );
+ } else if ( argv.html2wt || argv.html2html ) {
var dp = argv.dpin.length > 0 ? JSON.parse( argv.dpin )
: null;
return startsAtHTML( argv, env, input, dp );
} else {
return startsAtWikitext( argv, env, input );
}
-
}).then(function( res ) {
var stdout = process.stdout;
--
To view, visit https://gerrit.wikimedia.org/r/173482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b243dfe9f49926b609b5ae069df389074aaf05f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 62326) WIP: Upgrade express - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173481
Change subject: (Bug 62326) WIP: Upgrade express
..
(Bug 62326) WIP: Upgrade express
Change-Id: Id55e332050438df324c4ba898007718ac4c02888
---
M api/ParsoidService.js
M api/routes.js
M api/views/form.html
M package.json
M tests/mocha/api.js
M tests/mockAPI.js
M tests/server/package.json
7 files changed, 138 insertions(+), 89 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/81/173481/1
diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index 7d48ff3..8449c5c 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -7,7 +7,10 @@
// global includes
var express = require('express'),
- hbs = require('handlebars'),
+ hbs = require('express-handlebars'),
+ busboy = require('connect-busboy'),
+ favicon = require('serve-favicon'),
+ compression = require('compression'),
cluster = require('cluster'),
path = require('path'),
util = require('util'),
@@ -20,38 +23,60 @@
// Load routes
var routes = require('./routes')( parsoidConfig );
- var app = express.createServer();
+ var app = express();
// view engine
- app.set('views', path.join(__dirname, '/views'));
- app.set('view engine', 'html');
- app.register('html', hbs);
-
- // block helper to reference js files in page head.
- hbs.registerHelper('jsFiles', function(options){
- this.javascripts = options.fn(this);
+ var ve = hbs.create({
+ defaultLayout: "layout",
+ layoutsDir: path.join(__dirname, "/views"),
+ extname: ".html",
+ helpers: {
+ // block helper to reference js files in page head.
+ jsFiles: function( options ) {
+ this.javascripts = options.fn(this);
+ }
+ }
});
+ app.engine('html', ve.engine);
+ app.set('view engine', 'html');
+ app.set('views', path.join(__dirname, '/views'));
// serve static files
app.use("/static", express.static(path.join(__dirname, "/static")));
// favicon
- app.use(express.favicon(path.join(__dirname, "favicon.ico")));
+ app.use(favicon(path.join(__dirname, "favicon.ico")));
- // Increase the form field size limit from the 2M default.
- app.use(express.bodyParser({ maxFieldsSize: 15 * 1024 * 1024 }));
+ app.use(busboy({
+ immediate: true,
+ limits: {
+ // Increase the form field size limit from the 1M
default.
+ fieldSize: 15 * 1024 * 1024,
+ fields: 10
+ }
+ }));
+
+ app.use(function(req, res, next) {
+ req.body = req.body || {};
+ if ( !req.busboy ) {
+ return next();
+ }
+ req.busboy.on("field", function( field, val ) {
+ req.body[field] = val;
+ });
+ req.busboy.on("finish", function() {
+ next();
+ });
+ });
// Support gzip / deflate transfer-encoding
- app.use(express.compress());
-
- // limit upload file size
- app.use(express.limit('15mb'));
+ app.use(compression());
// request ids
var buf = new Buffer(16);
app.use(function(req, res, next) {
uuid(null, buf);
- res.local('reqId', buf.toString('hex'));
+ res.locals.reqId = buf.toString('hex');
next();
});
@@ -105,9 +130,9 @@
// default bind all
var host = parsoidConfig.serverInterface || process.env.INTERFACE;
- app.listen( port, host );
-
- processLogger.log( "info", util.format( "ready on %s:%s", host || "",
port ) );
+ app.listen(port, host, function() {
+ processLogger.log( "info", util.format( "ready on %s:%s", host
|| "", port ) );
+ });
}
module.exports = {
diff --git a/api/routes.js b/api/routes.js
index 213db5b..a561313 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -26,7 +26,9 @@
Diff = require( mp + 'mediawiki.Diff.js' ).Diff;
var ParsoidCacheRequest = ApiRequest.ParsoidCacheRequest,
- TemplateRequest = ApiRequest.TemplateRequest;
+ TemplateRequest = ApiRequest.TemplateRequest,
+ getParserEnv = Promise.promisify( MWParserEnv.getParserEnv, false,
MWParserEnv ),
+ execFile = Promise.promisify( child_process.execFile, ['stdout',
'stderr'], child_process );
module.exports = function( parsoidConfig ) {
@@ -75,7 +77,7 @@
var sufficientNodeVersion = !/^v0\.[0-8]\./.test( process.version );
var cpuTimeout = function( p, res ) {
- v
[MediaWiki-commits] [Gerrit] Set $wgUploadNavigationUrl on it.wikivoyage - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/173480 Change subject: Set $wgUploadNavigationUrl on it.wikivoyage .. Set $wgUploadNavigationUrl on it.wikivoyage Target URL: //commons.wikimedia.org/wiki/Special:UploadWizard?uselang=it Bug: 73439 Change-Id: I4c7c27c847da2e43df245c52828c326186ec9a8d --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/80/173480/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4fc8274..cce842b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1183,6 +1183,7 @@ 'huwiktionary' => '//commons.wikimedia.org/wiki/Special:UploadWizard?uselang=hu', 'incubatorwiki' => '/wiki/Special:MyLanguage/Incubator:Upload', 'iswiktionary' => '/wiki/Wikior%C3%B0ab%C3%B3k:Hla%C3%B0a_inn_skr%C3%A1', // bug 11187 + 'itwikivoyage' => '//commons.wikimedia.org/wiki/Special:UploadWizard?uselang=it', // Bug 73439 'jawiki' => '/wiki/Wikipedia:%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E3%81%AE%E3%82%A2%E3%83%83%E3%83%97%E3%83%AD%E3%83%BC%E3%83%89', 'jawikisource' => '//commons.wikimedia.org/wiki/Special:UploadWizard?uselang=ja', 'kowiki' => '/wiki/위키백과:파일_올리기', // bug 52076 -- To view, visit https://gerrit.wikimedia.org/r/173480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c7c27c847da2e43df245c52828c326186ec9a8d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add daily file for media file access aggregations - change (analytics/refinery)
QChris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173479
Change subject: Add daily file for media file access aggregations
..
Add daily file for media file access aggregations
Change-Id: I62a03e0ca38b4e5d5956ac7614a8dccca4208b59
---
A hive/playground/media-file-accesses/aggregate_media_file_accesses_daily.hql
1 file changed, 64 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/79/173479/1
diff --git
a/hive/playground/media-file-accesses/aggregate_media_file_accesses_daily.hql
b/hive/playground/media-file-accesses/aggregate_media_file_accesses_daily.hql
new file mode 100644
index 000..352d293
--- /dev/null
+++
b/hive/playground/media-file-accesses/aggregate_media_file_accesses_daily.hql
@@ -0,0 +1,64 @@
+SET hive.exec.compress.output=true;
+SET
mapreduce.output.fileoutputformat.compress.codec=org.apache.hadoop.io.compress.BZip2Codec;
+--^ To work around HIVE-3296, we have SETs before any comments
+
+-- hive -f aggregate_media_file_accesses_daily.hql -d year=2014 -d month=11 -d
day=12
+
+
+ADD JAR
/home/qchris/tmp/2014-11-13-media-files-hql/refinery-hive-0.0.2-SNAPSHOT.jar;
+
+CREATE TEMPORARY FUNCTION identify_media_files AS
'org.wikimedia.analytics.refinery.hive.IdentifyMediaFileUrlUDF';
+CREATE TEMPORARY FUNCTION identify_referer AS
'org.wikimedia.analytics.refinery.hive.IdentifyRefererUDF';
+
+INSERT OVERWRITE DIRECTORY
"/user/qchris/media_file_accesses/${year}-${month}-${day}T${hour}"
+SELECT CONCAT_WS(" ",
+base_name,
+CAST(total_response_size AS string),
+CAST(total AS string),
+CAST(original AS string),
+CAST(high_quality AS string),
+CAST(low_quality AS string),
+CAST(internal AS string),
+CAST(external AS string),
+CAST(unknown AS string),
+CAST(internal_original AS string),
+CAST(internal_high_quality AS string),
+CAST(internal_low_quality AS string)
+) line FROM (
+SELECT
+identified_url.base_name base_name,
+SUM(response_size) total_response_size,
+SUM(1) total,
+SUM(IF(identified_url.is_original, 1, 0)) original,
+SUM(IF(identified_url.is_high_quality, 1, 0)) high_quality,
+SUM(IF(identified_url.is_low_quality, 1, 0)) low_quality,
+SUM(IF(identified_referer.is_internal, 1, 0)) internal,
+SUM(IF(identified_referer.is_external, 1, 0)) external,
+SUM(IF(identified_referer.is_unknown, 1, 0)) unknown,
+SUM(IF(identified_referer.is_internal AND
identified_url.is_original, 1, 0)) internal_original,
+SUM(IF(identified_referer.is_internal AND
identified_url.is_high_quality, 1, 0)) internal_high_quality,
+SUM(IF(identified_referer.is_internal AND
identified_url.is_low_quality, 1, 0)) internal_low_quality
+FROM (
+SELECT
+response_size,
+identify_media_files(uri_path) identified_url,
+identify_referer(referer) identified_referer
+FROM wmf_raw.webrequest
+WHERE webrequest_source='upload'
+AND year=${year}
+AND month=${month}
+AND day=${day}
+AND (
+http_status IN (200, 304)
+OR (http_status=206
+AND SUBSTR(range, 1, 8) = 'bytes=0-'
+AND range != 'bytes=0-0'
+)
+)
+) identified
+WHERE identified_url.base_name IS NOT NULL
+GROUP BY identified_url.base_name
+) identified_grouped
+ORDER BY line
+-- as of 2014-10-01, we're seeing 16M lines per day. So 1000M should be
safe for now.
+LIMIT 10;
--
To view, visit https://gerrit.wikimedia.org/r/173479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62a03e0ca38b4e5d5956ac7614a8dccca4208b59
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: QChris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix misc jenkins warnings in multiple modules - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173478
Change subject: fix misc jenkins warnings in multiple modules
..
fix misc jenkins warnings in multiple modules
Change-Id: I83c8de2318f11355c1ad0c23eced02792005efe4
---
M modules/generic/manifests/upstart_job.pp
M modules/mw-rc-irc/manifests/irc-echo.pp
M modules/nagios_common/manifests/contacts.pp
M modules/quarry/manifests/init.pp
M modules/smokeping/manifests/init.pp
M modules/wikitech/manifests/wiki/passwords.pp
6 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/173478/1
diff --git a/modules/generic/manifests/upstart_job.pp
b/modules/generic/manifests/upstart_job.pp
index 1184987..13c18ab 100644
--- a/modules/generic/manifests/upstart_job.pp
+++ b/modules/generic/manifests/upstart_job.pp
@@ -10,7 +10,7 @@
if $install == true or $install == 'true' {
file { "/etc/init/${title}.conf":
-owner=> 'root',
+owner => 'root',
group => 'root',
mode=> '0444',
source => "puppet:///modules/generic/upstart/${title}.conf",
diff --git a/modules/mw-rc-irc/manifests/irc-echo.pp
b/modules/mw-rc-irc/manifests/irc-echo.pp
index 12df508..751438b 100644
--- a/modules/mw-rc-irc/manifests/irc-echo.pp
+++ b/modules/mw-rc-irc/manifests/irc-echo.pp
@@ -20,8 +20,8 @@
# Ensure that the service is running.
service { 'ircecho':
-ensure => running,
+ensure => running,
provider => 'upstart',
-require => File['/etc/init/ircecho.conf'],
+require => File['/etc/init/ircecho.conf'],
}
}
diff --git a/modules/nagios_common/manifests/contacts.pp
b/modules/nagios_common/manifests/contacts.pp
index d717dd8..9eb8cc1 100644
--- a/modules/nagios_common/manifests/contacts.pp
+++ b/modules/nagios_common/manifests/contacts.pp
@@ -46,11 +46,11 @@
}
} else {
file { "$config_dir/contacts.cfg":
-ensure => $ensure,
+ensure => $ensure,
content => template($template),
-owner => $owner,
-group => $group,
-mode => '0600', # Only $owner:$group can read/write
+owner => $owner,
+group => $group,
+mode=> '0600', # Only $owner:$group can read/write
}
}
}
diff --git a/modules/quarry/manifests/init.pp b/modules/quarry/manifests/init.pp
index 34eb778..6426102 100644
--- a/modules/quarry/manifests/init.pp
+++ b/modules/quarry/manifests/init.pp
@@ -60,7 +60,7 @@
$data_path = "/srv/mysql/data"
class { 'mysql::server':
-package_name => 'mariadb-server',
+package_name => 'mariadb-server',
config_hash => {
'datadir' => $data_path,
'bind_address'=> '0.0.0.0',
diff --git a/modules/smokeping/manifests/init.pp
b/modules/smokeping/manifests/init.pp
index 3460c54..dc1b12c 100644
--- a/modules/smokeping/manifests/init.pp
+++ b/modules/smokeping/manifests/init.pp
@@ -12,8 +12,8 @@
}
service { 'smokeping':
-require => [ Package['smokeping'], File['/etc/smokeping/config.d'] ],
+require => [ Package['smokeping'], File['/etc/smokeping/config.d'] ],
subscribe => File['/etc/smokeping/config.d'],
-ensure => running;
+ensure=> running;
}
}
diff --git a/modules/wikitech/manifests/wiki/passwords.pp
b/modules/wikitech/manifests/wiki/passwords.pp
index 40a25b3..3dab03f 100644
--- a/modules/wikitech/manifests/wiki/passwords.pp
+++ b/modules/wikitech/manifests/wiki/passwords.pp
@@ -12,11 +12,11 @@
# Drop this file onto the mediawiki deployment host so that the passwords
are deployed
file { '/srv/mediawiki/private/WikitechPrivateSettings.php':
-ensure => present,
+ensure => present,
content => template('wikitech/wikitech_private.php.erb'),
-mode => '0444',
-owner => 'root',
-group => 'root',
+mode=> '0444',
+owner => 'root',
+group => 'root',
}
file { '/srv/mediawiki/private/WikitechPrivateLdapSettings.php':
--
To view, visit https://gerrit.wikimedia.org/r/173478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83c8de2318f11355c1ad0c23eced02792005efe4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia/gerrit: move install_cert out of site.pp - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173477
Change subject: ganglia/gerrit: move install_cert out of site.pp
..
ganglia/gerrit: move install_cert out of site.pp
gerrit and ganglia: move install_certificate out
of site.pp from the node level and into role classes
instead
Change-Id: Icf8e84a7727747dd930341529e4d46936a69393d
---
M manifests/role/ganglia.pp
M manifests/role/gerrit.pp
M manifests/site.pp
3 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/173477/1
diff --git a/manifests/role/ganglia.pp b/manifests/role/ganglia.pp
index 86d4252..242dd9a 100644
--- a/manifests/role/ganglia.pp
+++ b/manifests/role/ganglia.pp
@@ -60,6 +60,8 @@
class role::ganglia::web {
include role::ganglia::config
+install_certificate{ 'ganglia.wikimedia.org': }
+
$gmetad_root = '/srv/ganglia'
$rrd_rootdir = "${gmetad_root}/rrds"
$gmetad_socket = '/var/run/rrdcached-gmetad.sock'
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index 7086c85..c77ac2e 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -30,6 +30,10 @@
system::role { 'role::gerrit::production': description => 'Gerrit
master' }
include role::backup::host
+install_certificate{ 'gerrit.wikimedia.org':
+ca => 'RapidSSL_CA.pem',
+}
+
backup::set { 'var-lib-gerrit2-review_site-git': }
interface::ip { 'role::gerrit::production_ipv4':
diff --git a/manifests/site.pp b/manifests/site.pp
index 3b16485..8717de9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2975,8 +2975,6 @@
# TODO: Resolve this
#include misc::monitoring::views
-install_certificate{ 'ganglia.wikimedia.org': }
-
interface::add_ip6_mapped { 'main':
interface => 'eth0',
}
@@ -3008,10 +3006,6 @@
# Note: whenever moving Gerrit out of ytterbium, you will need
# to update the role::zuul::production
include role::gerrit::production
-
-install_certificate{ 'gerrit.wikimedia.org':
-ca => 'RapidSSL_CA.pem',
-}
}
--
To view, visit https://gerrit.wikimedia.org/r/173477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf8e84a7727747dd930341529e4d46936a69393d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] realm.pp - remove pmtpa - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173476
Change subject: realm.pp - remove pmtpa
..
realm.pp - remove pmtpa
Change-Id: If6c4dbb88704cd4aa336027bf2fee0daf4b55e3e
---
M manifests/realm.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/173476/1
diff --git a/manifests/realm.pp b/manifests/realm.pp
index a28c7cf..9a3f3b0 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -24,10 +24,8 @@
}
$site = $main_ipaddress ? {
-/^208\.80\.152\./ => 'pmtpa',
/^208\.80\.153\./ => 'codfw',
/^208\.80\.15[45]\./ => 'eqiad',
-/^10\.[0-4]\./=> 'pmtpa',
/^10\.6[48]\./=> 'eqiad',
/^10\.192\./ => 'codfw',
/^91\.198\.174\./ => 'esams',
@@ -55,7 +53,7 @@
'codfw' => [ '208.80.153.254', '208.80.154.239' ], # codfw -> codfw, eqiad
'ulsfo' => [ '208.80.154.239', '208.80.153.254' ], # ulsfo -> eqiad, codfw
'esams' => [ '91.198.174.6', '208.80.154.239' ], # esams -> esams
(nescio, not LVS), eqiad
-default => [ '208.80.154.239', '208.80.153.254' ], # pmtpa? -> eqiad, codfw
+default => [ '208.80.154.239', '208.80.153.254' ], # ? -> eqiad, codfw
}
$domain_search = $domain
--
To view, visit https://gerrit.wikimedia.org/r/173476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6c4dbb88704cd4aa336027bf2fee0daf4b55e3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gerrit templates: fix jenkins/lint warnings - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173475
Change subject: gerrit templates: fix jenkins/lint warnings
..
gerrit templates: fix jenkins/lint warnings
Warning: Variable access via 'replication' is deprecated. Use '@replication'
instead
Warning: Variable access via 'smtp_host' is deprecated. Use '@smtp_host'
instead.
just fixing warnings i see in puppet-compiler when
i ran something else on ytterbium and this was just noise
in the output
Change-Id: I80a887e2e270e0f9ec62630e57a6fd18d6ed8ec9
---
M modules/gerrit/templates/gerrit.config.erb
M modules/gerrit/templates/replication.config.erb
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/173475/1
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index 1fc23f3..f619c41 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -29,7 +29,7 @@
[sendemail]
includeDiff = true
smtpServerPort = 25
-<% if smtp_host != "" then %>
+<% if @smtp_host != "" then %>
smtpServer = <%= @smtp_host %>
<% else %>
enable = false
diff --git a/modules/gerrit/templates/replication.config.erb
b/modules/gerrit/templates/replication.config.erb
index d88e3a8..e12ec81 100644
--- a/modules/gerrit/templates/replication.config.erb
+++ b/modules/gerrit/templates/replication.config.erb
@@ -7,8 +7,8 @@
# replication is a hash which maps remote "names" to their URLs
# and other settings.
-if replication != "" then
- replication.sort.each { |remote,settings|
+if @replication != "" then
+ @replication.sort.each { |remote,settings|
%>[remote "<%= remote %>"]
<%
settings.sort.each { |option,params|
--
To view, visit https://gerrit.wikimedia.org/r/173475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80a887e2e270e0f9ec62630e57a6fd18d6ed8ec9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use more human readable title name - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173474
Change subject: Use more human readable title name
..
Use more human readable title name
getNameText transforms underlines to white-spaces.
Change-Id: I3554aa70dac0c9bfabe62425dde2eabb78c2508d
---
M javascripts/modules/categories/CategoryOverlay.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/74/173474/1
diff --git a/javascripts/modules/categories/CategoryOverlay.js
b/javascripts/modules/categories/CategoryOverlay.js
index fce226d..3ab05ab 100644
--- a/javascripts/modules/categories/CategoryOverlay.js
+++ b/javascripts/modules/categories/CategoryOverlay.js
@@ -32,7 +32,7 @@
var title = mw.Title.newFromText(
category, 14 );
options.items.push( {
url: title.getUrl(),
- title: title.getName()
+ title: title.getNameText()
} );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/173474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3554aa70dac0c9bfabe62425dde2eabb78c2508d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ApiCentralNoticeBannerChoiceData tests - change (mediawiki...CentralNotice)
Ejegg has submitted this change and it was merged.
Change subject: ApiCentralNoticeBannerChoiceData tests
..
ApiCentralNoticeBannerChoiceData tests
Change-Id: I1b1cab6b85ef1386b32d9116844a9f143051f58c
---
M CentralNotice.hooks.php
A tests/ApiCentralNoticeBannerChoiceDataTest.php
2 files changed, 38 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php
index 3cc1993..f4c3dd3 100644
--- a/CentralNotice.hooks.php
+++ b/CentralNotice.hooks.php
@@ -364,6 +364,7 @@
$files[ ] = __DIR__ . '/tests/ApiAllocationsTest.php';
$files[ ] = __DIR__ . '/tests/BannerChooserTest.php';
+ $files[ ] = __DIR__ . '/tests/ApiCentralNoticeBannerChoiceDataTest.php';
$files[ ] = __DIR__ . '/tests/CentralNoticeTest.php';
$files[ ] = __DIR__ . '/tests/BannerAllocationCalculatorTest.php';
$files[ ] = __DIR__ . '/tests/BannerChoiceDataProviderTest.php';
diff --git a/tests/ApiCentralNoticeBannerChoiceDataTest.php
b/tests/ApiCentralNoticeBannerChoiceDataTest.php
new file mode 100644
index 000..2ee6365
--- /dev/null
+++ b/tests/ApiCentralNoticeBannerChoiceDataTest.php
@@ -0,0 +1,37 @@
+cnFixtures = new CentralNoticeTestFixtures();
+ }
+
+ protected function tearDown() {
+ $this->cnFixtures->removeFixtures();
+ parent::tearDown();
+ }
+
+ /**
+* @dataProvider CentralNoticeTestFixtures::allocationsData
+*/
+ public function testBannerChoiceResponse( $data ) {
+ $this->cnFixtures->addFixtures( $data['fixture'] );
+
+ $ret = $this->doApiRequest( array(
+ 'action' => 'centralnoticebannerchoicedata',
+ 'project' =>
CentralNoticeTestFixtures::$defaultCampaign['projects'][0],
+ 'language' =>
CentralNoticeTestFixtures::$defaultCampaign['project_languages'][0],
+ 'status' => 'anonymous',
+ ) );
+ $this->assertTrue( ComparisonUtil::assertSuperset(
$ret[0]['choices'], $data['choices'] ) );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/172881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b1cab6b85ef1386b32d9116844a9f143051f58c
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Mwalker
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixup! execution context issue - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: fixup! execution context issue
..
fixup! execution context issue
* Introduced in 5836e3c15ff87da3054dc6f0bc12d7d54deb616e.
Change-Id: Ic9bf71a33fbd92a58c01fa449e901369e8591ba7
---
M lib/mediawiki.ApiRequest.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index ca5591c..cc088d8 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -532,8 +532,8 @@
parsedHtml = parsedHtml.replace(/(^)|(<\/p>$)/g, '');
// Add the modules to the page data
+ var page = this.env.page;
var setPageProperty = function(src, property) {
- var page = this.env.page;
if (src) {
// This info comes back from the MW API when
extension tags are parsed.
// Since a page can have multiple extension
tags, we can hit this code
--
To view, visit https://gerrit.wikimedia.org/r/173449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9bf71a33fbd92a58c01fa449e901369e8591ba7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only load uploads code when it's turned on - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173473
Change subject: Only load uploads code when it's turned on
..
Only load uploads code when it's turned on
We shouldn't be loading this code.
Bug: 73449
Change-Id: I30ae19f4b979333e2b7e4b1a3c39e1d2bd2c7633
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
2 files changed, 22 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/73/173473/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 095c783..df3e6fd 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -191,6 +191,19 @@
),
),
+ 'mobile.leadPhotoUploader' => $wgMFResourceFileModuleBoilerplate +
array(
+ 'dependencies' => array(
+ 'mobile.startup',
+ 'mobile.user',
+ 'mobile.upload.ui',
+ ),
+ 'scripts' => array(
+ 'javascripts/modules/uploads/init.js',
+ ),
+ // This is a logged in user feature only.
+ 'group' => 'user',
+ ),
+
'mobile.editor' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
'mobile.stable.common',
@@ -1244,7 +1257,6 @@
),
'scripts' => array(
'javascripts/externals/micro.autosize.js',
- 'javascripts/modules/uploads/init.js',
'javascripts/modules/mainmenutweaks.js',
'javascripts/modules/mediaViewer/init.js',
'javascripts/modules/languages/init.js',
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index a852f60..e7dbf64 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -873,6 +873,15 @@
$req = $this->getRequest();
$action = $req->getVal( 'article_action' );
$campaign = $req->getVal( 'campaign' );
+ $title = $this->getTitle();
+
+ if (
+ $this->isAllowedPageAction( 'upload' )
+ && !$title->isMainPage()
+ && $this->mobileContext->userCanUpload()
+ ) {
+ $modules[] = 'mobile.leadPhotoUploader';
+ }
if ( $user->isLoggedIn() ) {
// enable the user module
--
To view, visit https://gerrit.wikimedia.org/r/173473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30ae19f4b979333e2b7e4b1a3c39e1d2bd2c7633
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable xhprof in labs, testwiki, and with ?forceprofile anyw... - change (operations/mediawiki-config)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173472
Change subject: Enable xhprof in labs, testwiki, and with ?forceprofile anywhere
..
Enable xhprof in labs, testwiki, and with ?forceprofile anywhere
* This only applies if the apache reached is using HHVM, otherwise
the old profiler is used as before.
Change-Id: I42742431d19544194c24d4650a5eb9e93ea1215a
---
M wmf-config/StartProfiler.php
1 file changed, 21 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/72/173472/1
diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index 8af1ded..fc22a5b 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -5,13 +5,22 @@
# Non-logged profiling for debugging
if ( isset( $_REQUEST['forceprofile'] ) ) {
- $wgProfiler['class'] = 'ProfilerSimpleText';
-# Non-logged profiling for debugging
-} elseif ( isset( $_REQUEST['forcetrace'] ) ) {
- $wgProfiler['class'] = 'ProfilerSimpleTrace';
+ if ( defined( 'HHVM_VERSION' ) ) {
+ $wgProfiler['class'] = 'ProfilerXhprof';
+ $wgProfiler['flags'] = XHPROF_FLAGS_NO_BUILTINS;
+ $wgProfiler['log'] = 'text';
+ } else {
+ $wgProfiler['class'] = 'ProfilerSimpleText';
+ }
# Profiling hack for test2 wiki (not sampled, but shouldn't distort too much)
} elseif ( isset( $_SERVER['HTTP_HOST'] ) && $_SERVER['HTTP_HOST'] ===
'test2.wikipedia.org' ) {
- $wgProfiler['class'] = 'ProfilerSimpleUDP';
+ if ( defined( 'HHVM_VERSION' ) ) {
+ $wgProfiler['class'] = 'ProfilerXhprof';
+ $wgProfiler['flags'] = XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY |
XHPROF_FLAGS_NO_BUILTINS;
+ $wgProfiler['log'] = 'udpprofile';
+ } else {
+ $wgProfiler['class'] = 'ProfilerSimpleUDP';
+ }
$wgProfiler['profileID'] = 'test2';
# Normal case: randomly (or not) selected for logged profiling sample
} elseif ( PHP_SAPI !== 'cli' && $wmfDatacenter == 'eqiad' && ( mt_rand() % 50
) == 0 ) {
@@ -26,7 +35,13 @@
$wgProfiler['profileID'] = $version;
}
} elseif ( $wmfRealm === 'labs' ) {
- $wgProfiler['class'] = 'ProfilerSimpleUDP';
+ if ( defined( 'HHVM_VERSION' ) ) {
+ $wgProfiler['class'] = 'ProfilerXhprof';
+ $wgProfiler['flags'] = XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY |
XHPROF_FLAGS_NO_BUILTINS;
+ $wgProfiler['log'] = 'udpprofile';
+ } else {
+ $wgProfiler['class'] = 'ProfilerSimpleUDP';
+ }
$coreGit = new GitInfo( $IP );
$wgProfiler['profileID'] = $coreGit->getHeadSHA1() ?: 'labs';
}
--
To view, visit https://gerrit.wikimedia.org/r/173472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42742431d19544194c24d4650a5eb9e93ea1215a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] For ios8 detection check for version 8 - change (mediawiki...MobileFrontend)
Robmoen has uploaded a new change for review. https://gerrit.wikimedia.org/r/173471 Change subject: For ios8 detection check for version 8 .. For ios8 detection check for version 8 This helps for testing in the simulator and future proofing As the Xcode6 simulator puts OSX version rather than IOS version Change-Id: Iad7f6dd5f1ba3fa0491332c317d5a58fac14325c --- M javascripts/application.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/71/173471/1 diff --git a/javascripts/application.js b/javascripts/application.js index aa69d11..f9e09c2 100644 --- a/javascripts/application.js +++ b/javascripts/application.js @@ -20,7 +20,7 @@ inWideScreenMode = false, ua = window.navigator.userAgent, isIos = /ipad|iphone/i.test( ua ), - isIos8 = isIos && /OS 8_/.test( ua ), + isIos8 = isIos && /OS 8_/.test( ua ) || /Version\/8/.test( ua ), isIPhone4 = isIos && /OS 4_/.test( ua ), isOldIPhone = isIos && /OS [4]_[0-2]|OS [3]_/.test( ua ), isIPhone5 = isIos && /OS 5_/.test( ua ), -- To view, visit https://gerrit.wikimedia.org/r/173471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad7f6dd5f1ba3fa0491332c317d5a58fac14325c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Robmoen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LDAP: rm pmtpa, +codfw, gluster/NFS server undef - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173470
Change subject: LDAP: rm pmtpa, +codfw, gluster/NFS server undef
..
LDAP: rm pmtpa, +codfw, gluster/NFS server undef
- remove pmtpa remnants
- partly prepare for codfw in the future
- gluster/NFS servers are undefined (? are they?)
Change-Id: I9fa24d47852ac2d3c91186f492edc6e6e25b0e29
---
M modules/ldap/manifests/client.pp
M modules/ldap/manifests/role/config.pp
M modules/ldap/manifests/role/server.pp
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/173470/1
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 900d813..751bc73 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -279,12 +279,12 @@
default => 'labs-nfs1',
}
$gluster_server_name = $instanceproject ? {
-default => 'projectstorage.pmtpa.wmnet',
+default => undef,
}
$autofs_subscribe = ['/etc/ldap/ldap.conf', '/etc/ldap.conf',
'/etc/nslcd.conf', '/data', '/public']
} else {
$homedir_location = '/home'
-$nfs_server_name = 'nfs-home.pmtpa.wmnet'
+$nfs_server_name = undef,
$autofs_subscribe = ['/etc/ldap/ldap.conf', '/etc/ldap.conf',
'/etc/nslcd.conf']
}
diff --git a/modules/ldap/manifests/role/config.pp
b/modules/ldap/manifests/role/config.pp
index 1f4cea6..2c7263a 100644
--- a/modules/ldap/manifests/role/config.pp
+++ b/modules/ldap/manifests/role/config.pp
@@ -39,8 +39,8 @@
$basedn = 'dc=wikimedia,dc=org'
$servernames = $site ? {
-'pmtpa' => [ ],
'eqiad' => [ ],
+'codfw' => [ ],
}
$sudobasedn = "ou=sudoers,${basedn}"
$ldapconfig = {
diff --git a/modules/ldap/manifests/role/server.pp
b/modules/ldap/manifests/role/server.pp
index 5968a95..1a68252 100644
--- a/modules/ldap/manifests/role/server.pp
+++ b/modules/ldap/manifests/role/server.pp
@@ -109,7 +109,7 @@
$proxyagent = $ldap::role::config::production::ldapconfig['proxyagent']
$proxypass = $ldap::role::config::production::ldapconfig['proxypass']
-$certificate = "${hostname}.pmtpa.wmnet"
+$certificate = "${hostname}.eqiad.wmnet"
$ca_name = 'wmf-ca.pem'
install_certificate{ $certificate: }
create_pkcs12{ "${certificate}.opendj":
--
To view, visit https://gerrit.wikimedia.org/r/173470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fa24d47852ac2d3c91186f492edc6e6e25b0e29
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logstash beta: remove pmtpa, do TODO - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173469
Change subject: logstash beta: remove pmtpa, do TODO
..
logstash beta: remove pmtpa, do TODO
remove pmtpa, do what the TODO says
beta cluster is eqiad
Change-Id: Ided32955fd37ff33d1aa2b2509a35148bfca8f38
---
M manifests/role/logging.pp
1 file changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/173469/1
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 157e749..5e2943b 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -44,16 +44,11 @@
labs => "deployment-fluoride.${::site}.wmflabs",
}
-# TODO remove once beta cluster is migrated to eqiad
-$logtash_host_beta = $::site ? {
-eqiad => 'deployment-logstash1.eqiad.wmflabs',
-pmtpa => 'logstash.pmtpa.wmflabs',
-}
$logstash_host = $::realm ? {
# TODO: Find a way to use multicast that doesn't cause duplicate
# messages to be stored in logstash. This is a SPOF.
production => 'logstash1001.eqiad.wmnet',
-labs => $logtash_host_beta,
+labs => 'deployment-logstash1.eqiad.wmflabs',
}
$logstash_port = 8324
--
To view, visit https://gerrit.wikimedia.org/r/173469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ided32955fd37ff33d1aa2b2509a35148bfca8f38
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unwanted HTML from translations. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Removed unwanted HTML from translations. .. Removed unwanted HTML from translations. Change-Id: I870650ee72546f39ed6715dd1e347cfabe9f6940 --- M wikipedia/ca.lproj/Localizable.strings 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Brion VIBBER: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/ca.lproj/Localizable.strings b/wikipedia/ca.lproj/Localizable.strings index 47a3741..63a1478 100644 --- a/wikipedia/ca.lproj/Localizable.strings +++ b/wikipedia/ca.lproj/Localizable.strings @@ -66,8 +66,8 @@ "wikitext-upload-save-sign-in" = "Inicia una sessió"; "wikitext-upload-save-sign-in-benefits" = "Així, els co-editors poden connectar-se amb tu i podràs veure els articles que has editat."; "wikitext-upload-save-anonymously" = "Desa anònimament"; -"wikitext-upload-save-anonymously-warning" = "Les edicions seran atribuïdes a l'adreça IP del dispositiu. Si vostè $1 disposarà de més privadesa."; -"wikitext-upload-save-terms-and-license" = "Si deseu, accepteu els $1, i accepteu també alliberar irrevocablement les vostres contribucions sota la llicència $2."; +"wikitext-upload-save-anonymously-warning" = "Les edicions seran atribuïdes a l'adreça IP del dispositiu. Si vostè $1 disposarà de més privadesa."; +"wikitext-upload-save-terms-and-license" = "Si deseu, accepteu els $1, i accepteu també alliberar irrevocablement les vostres contribucions sota la llicència $2."; "wikitext-upload-save-terms-name" = "Condicions d'ús"; "wikitext-upload-save-license-name" = "CC BY-SA 3.0"; "open-link-title" = "Obre l'enllaç"; @@ -150,15 +150,15 @@ "about-wikipedia" = "Viquipèdia"; "about-contributors" = "col·laboradors"; "about-translators" = "traductors"; -"about-translators-details" = "Traduït per voluntaris a $1"; +"about-translators-details" = "Traduït per voluntaris a $1"; "about-libraries" = "biblioteques utilitzades"; "about-repositories" = "repositoris"; "about-send-feedback" = "Enviar comentaris sobre l'aplicació"; -"about-product-of" = "Un producte de la $1"; +"about-product-of" = "Un producte de la $1"; "about-wikimedia-foundation" = "Fundació Wikimedia"; "share-menu-save-page" = "Desa l'article"; "share-menu-page-saved" = "Article desat"; -"share-menu-page-saved-access" = "Consell: per accedir a les vostres pàgines desades, puntegeu en $1 a dalt o premeu uns moments $2 a sota."; +"share-menu-page-saved-access" = "Consell: per accedir a les vostres pàgines desades, puntegeu en $1 a dalt o premeu uns moments $2 a sota."; "timestamp-just-now" = "ara mateix"; "timestamp-minutes" = "fa %d minuts"; "timestamp-hours" = "fa %d hores"; @@ -208,10 +208,10 @@ "menu-more-accessibility-label" = "Més paràmetres"; "menu-trash-accessibility-label" = "Esborra"; "nearby-title" = "A prop"; -"nearby-distance-label-meters" = "$1"; -"nearby-distance-label-km" = "$1"; -"nearby-distance-label-feet" = "$1 peus"; -"nearby-distance-label-miles" = "$1 milles"; +"nearby-distance-label-meters" = "$1 m"; +"nearby-distance-label-km" = "$1 km"; +"nearby-distance-label-feet" = "$1 peus"; +"nearby-distance-label-miles" = "$1 milles"; "nearby-pull-to-refresh-prompt" = "Estira per a refrescar"; "nearby-pull-to-refresh-is-refreshing" = "Refrescant"; "nearby-loading" = "Carregant articles a prop..."; -- To view, visit https://gerrit.wikimedia.org/r/173467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I870650ee72546f39ed6715dd1e347cfabe9f6940 Gerrit-PatchSet: 2 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd Gerrit-Reviewer: Brion VIBBER 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: Goodbye jscs/jsduck errors - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Goodbye jscs/jsduck errors
..
Hygiene: Goodbye jscs/jsduck errors
The sooner we get Jenkins doing this the better :)
Change-Id: I00240d7fa8a87fa4a17f94b69384a18dbb71f771
---
M javascripts/modules/infobox/Infobox.js
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/infobox/Infobox.js
b/javascripts/modules/infobox/Infobox.js
index 4dfef4d..37e8dae 100644
--- a/javascripts/modules/infobox/Infobox.js
+++ b/javascripts/modules/infobox/Infobox.js
@@ -7,10 +7,10 @@
/**
* A Wikidata generated infobox.
+* Emits photo-loaded event when images in the infobox have loaded.
* FIXME: This currently requires 2 hits to the Wikidata API on every
page load.
* @class Infobox
* @extends View
-* @fires photo-loaded when all ajax requests have completed
*/
Infobox = View.extend( {
template: mw.template.get( 'mobile.infobox', 'Infobox.hogan' ),
@@ -114,6 +114,7 @@
/**
* Given a title work out the url to the thumbnail for that
image
* FIXME: This should not make its way into stable.
+* @method
* @param {String} title of file page without File: prefix
* @return {String} url corresponding to thumbnail (size 160px)
*/
@@ -124,7 +125,7 @@
// uppercase first letter in file name
filename = title.charAt( 0 ).toUpperCase() +
title.substr( 1 );
// replace spaces with underscores
- filename = filename.replace(/ /g, '_');
+ filename = filename.replace( / /g, '_' );
md5 = md5fn( filename );
source = md5.charAt( 0 ) + '/' + md5.substr( 0, 2 ) +
'/' + filename;
if ( filename.substr( filename.length - 3 ) !== 'svg' )
{
--
To view, visit https://gerrit.wikimedia.org/r/173466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00240d7fa8a87fa4a17f94b69384a18dbb71f771
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Robmoen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bind events only once in _fixIosHeader - change (mediawiki...MobileFrontend)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173468
Change subject: Bind events only once in _fixIosHeader
..
Bind events only once in _fixIosHeader
Focus and blur events were bound multiple times on touchmove
Bug: 73046
Change-Id: I671b67aa133af94c72a6464a6d0c3b703645e3a0
---
M javascripts/Overlay.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/68/173468/1
diff --git a/javascripts/Overlay.js b/javascripts/Overlay.js
index fda08b8..4315ab4 100644
--- a/javascripts/Overlay.js
+++ b/javascripts/Overlay.js
@@ -224,7 +224,7 @@
if ( M.isIos ) {
this._resizeContent( $( window ).height() );
$( el )
- .on( 'focus', function () {
+ .once( 'focus', function () {
setTimeout( function () {
var keyboardHeight = 0;
@@ -241,7 +241,7 @@
}
}, 0 );
} )
- .on( 'blur', function () {
+ .once( 'blur', function () {
self._resizeContent(
$window.height() );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/173468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I671b67aa133af94c72a6464a6d0c3b703645e3a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Robmoen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unwanted HTML from translations. - change (apps...wikipedia)
Mhurd has uploaded a new change for review. https://gerrit.wikimedia.org/r/173467 Change subject: Removed unwanted HTML from translations. .. Removed unwanted HTML from translations. Change-Id: I870650ee72546f39ed6715dd1e347cfabe9f6940 --- M wikipedia/ca.lproj/Localizable.strings 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/67/173467/1 diff --git a/wikipedia/ca.lproj/Localizable.strings b/wikipedia/ca.lproj/Localizable.strings index 47a3741..2567a13 100644 --- a/wikipedia/ca.lproj/Localizable.strings +++ b/wikipedia/ca.lproj/Localizable.strings @@ -66,8 +66,8 @@ "wikitext-upload-save-sign-in" = "Inicia una sessió"; "wikitext-upload-save-sign-in-benefits" = "Així, els co-editors poden connectar-se amb tu i podràs veure els articles que has editat."; "wikitext-upload-save-anonymously" = "Desa anònimament"; -"wikitext-upload-save-anonymously-warning" = "Les edicions seran atribuïdes a l'adreça IP del dispositiu. Si vostè $1 disposarà de més privadesa."; -"wikitext-upload-save-terms-and-license" = "Si deseu, accepteu els $1, i accepteu també alliberar irrevocablement les vostres contribucions sota la llicència $2."; +"wikitext-upload-save-anonymously-warning" = "Les edicions seran atribuïdes a l'adreça IP del dispositiu. Si vostè $1 disposarà de més privadesa."; +"wikitext-upload-save-terms-and-license" = "Si deseu, accepteu els $1, i accepteu també alliberar irrevocablement les vostres contribucions sota la llicència $2."; "wikitext-upload-save-terms-name" = "Condicions d'ús"; "wikitext-upload-save-license-name" = "CC BY-SA 3.0"; "open-link-title" = "Obre l'enllaç"; @@ -150,15 +150,15 @@ "about-wikipedia" = "Viquipèdia"; "about-contributors" = "col·laboradors"; "about-translators" = "traductors"; -"about-translators-details" = "Traduït per voluntaris a $1"; +"about-translators-details" = "Traduït per voluntaris a $1"; "about-libraries" = "biblioteques utilitzades"; "about-repositories" = "repositoris"; "about-send-feedback" = "Enviar comentaris sobre l'aplicació"; -"about-product-of" = "Un producte de la $1"; +"about-product-of" = "Un producte de la $1"; "about-wikimedia-foundation" = "Fundació Wikimedia"; "share-menu-save-page" = "Desa l'article"; "share-menu-page-saved" = "Article desat"; -"share-menu-page-saved-access" = "Consell: per accedir a les vostres pàgines desades, puntegeu en $1 a dalt o premeu uns moments $2 a sota."; +"share-menu-page-saved-access" = "Consell: per accedir a les vostres pàgines desades, puntegeu en $1 a dalt o premeu uns moments $2 a sota."; "timestamp-just-now" = "ara mateix"; "timestamp-minutes" = "fa %d minuts"; "timestamp-hours" = "fa %d hores"; @@ -208,10 +208,10 @@ "menu-more-accessibility-label" = "Més paràmetres"; "menu-trash-accessibility-label" = "Esborra"; "nearby-title" = "A prop"; -"nearby-distance-label-meters" = "$1"; -"nearby-distance-label-km" = "$1"; -"nearby-distance-label-feet" = "$1 peus"; -"nearby-distance-label-miles" = "$1 milles"; +"nearby-distance-label-meters" = "$1"; +"nearby-distance-label-km" = "$1"; +"nearby-distance-label-feet" = "$1 peus"; +"nearby-distance-label-miles" = "$1 milles"; "nearby-pull-to-refresh-prompt" = "Estira per a refrescar"; "nearby-pull-to-refresh-is-refreshing" = "Refrescant"; "nearby-loading" = "Carregant articles a prop..."; -- To view, visit https://gerrit.wikimedia.org/r/173467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I870650ee72546f39ed6715dd1e347cfabe9f6940 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Goodbye jscs/jsduck errors - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173466
Change subject: Hygiene: Goodbye jscs/jsduck errors
..
Hygiene: Goodbye jscs/jsduck errors
The sooner we get Jenkins doing this the better :)
Change-Id: I00240d7fa8a87fa4a17f94b69384a18dbb71f771
---
M javascripts/modules/infobox/Infobox.js
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/66/173466/1
diff --git a/javascripts/modules/infobox/Infobox.js
b/javascripts/modules/infobox/Infobox.js
index 4dfef4d..37e8dae 100644
--- a/javascripts/modules/infobox/Infobox.js
+++ b/javascripts/modules/infobox/Infobox.js
@@ -7,10 +7,10 @@
/**
* A Wikidata generated infobox.
+* Emits photo-loaded event when images in the infobox have loaded.
* FIXME: This currently requires 2 hits to the Wikidata API on every
page load.
* @class Infobox
* @extends View
-* @fires photo-loaded when all ajax requests have completed
*/
Infobox = View.extend( {
template: mw.template.get( 'mobile.infobox', 'Infobox.hogan' ),
@@ -114,6 +114,7 @@
/**
* Given a title work out the url to the thumbnail for that
image
* FIXME: This should not make its way into stable.
+* @method
* @param {String} title of file page without File: prefix
* @return {String} url corresponding to thumbnail (size 160px)
*/
@@ -124,7 +125,7 @@
// uppercase first letter in file name
filename = title.charAt( 0 ).toUpperCase() +
title.substr( 1 );
// replace spaces with underscores
- filename = filename.replace(/ /g, '_');
+ filename = filename.replace( / /g, '_' );
md5 = md5fn( filename );
source = md5.charAt( 0 ) + '/' + md5.substr( 0, 2 ) +
'/' + filename;
if ( filename.substr( filename.length - 3 ) !== 'svg' )
{
--
To view, visit https://gerrit.wikimedia.org/r/173466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00240d7fa8a87fa4a17f94b69384a18dbb71f771
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikidata infoboxes: Reveal images - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Wikidata infoboxes: Reveal images
..
Wikidata infoboxes: Reveal images
Woo magic.
Change-Id: Ib1ec11bf44489a003bd59376799937e07189f789
---
M includes/Resources.php
A javascripts/externals/md5.js
M javascripts/modules/infobox/Infobox.js
M less/modules/infobox.less
M templates/modules/infobox/Infobox.hogan
5 files changed, 428 insertions(+), 6 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 325201f..34ea544 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -963,6 +963,9 @@
'Infobox.hogan' =>
'templates/modules/infobox/Infobox.hogan',
),
'scripts' => array(
+ // FIXME: This library shouldn't be needed. Wikidata api
+ // should return these thumbnail urls for us.
+ 'javascripts/externals/md5.js',
'javascripts/modules/infobox/Infobox.js',
),
'styles' => array(
diff --git a/javascripts/externals/md5.js b/javascripts/externals/md5.js
new file mode 100644
index 000..803a5b8
--- /dev/null
+++ b/javascripts/externals/md5.js
@@ -0,0 +1,383 @@
+;(function ( M ) {
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase*/
+var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_md5(s){ return rstr2hex(rstr_md5(str2rstr_utf8(s))); }
+function b64_md5(s){ return rstr2b64(rstr_md5(str2rstr_utf8(s))); }
+function any_md5(s, e) { return rstr2any(rstr_md5(str2rstr_utf8(s)), e); }
+function hex_hmac_md5(k, d)
+ { return rstr2hex(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function b64_hmac_md5(k, d)
+ { return rstr2b64(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d))); }
+function any_hmac_md5(k, d, e)
+ { return rstr2any(rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d)), e); }
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function md5_vm_test()
+{
+ return hex_md5("abc").toLowerCase() == "900150983cd24fb0d6963f7d28e17f72";
+}
+
+/*
+ * Calculate the MD5 of a raw string
+ */
+function rstr_md5(s)
+{
+ return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data (raw strings)
+ */
+function rstr_hmac_md5(key, data)
+{
+ var bkey = rstr2binl(key);
+ if(bkey.length > 16) bkey = binl_md5(bkey, key.length * 8);
+
+ var ipad = Array(16), opad = Array(16);
+ for(var i = 0; i < 16; i++)
+ {
+ipad[i] = bkey[i] ^ 0x36363636;
+opad[i] = bkey[i] ^ 0x5C5C5C5C;
+ }
+
+ var hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
+ return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
+}
+
+/*
+ * Convert a raw string to a hex string
+ */
+function rstr2hex(input)
+{
+ try { hexcase } catch(e) { hexcase=0; }
+ var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+ var output = "";
+ var x;
+ for(var i = 0; i < input.length; i++)
+ {
+x = input.charCodeAt(i);
+output += hex_tab.charAt((x >>> 4) & 0x0F)
+ + hex_tab.charAt( x& 0x0F);
+ }
+ return output;
+}
+
+/*
+ * Convert a raw string to a base-64 string
+ */
+function rstr2b64(input)
+{
+ try { b64pad } catch(e) { b64pad=''; }
+ var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ var output = "";
+ var len = input.length;
+ for(var i = 0; i < len; i += 3)
+ {
+var triplet = (input.charCodeAt(i) << 16)
+| (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
+| (i + 2 < len ? input.charCodeAt(i+2) : 0);
+for(var j = 0; j < 4; j++)
+{
+ if(i * 8 + j * 6 > input.length * 8) output += b64pad;
+ else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
+}
+ }
+ return output;
+}
+
+/*
+ * Convert a raw string to an arbitrary string encoding
+ */
+function rstr2any(input, encoding)
+{
+ var divisor = encoding.length;
+ var i, j, q, x, quotient;
+
+ /* Convert to an array of 16-bit big-endian values, forming the dividend */
+ var dividend = Array(Math.ceil(input.length / 2));
+ for(i = 0;
[MediaWiki-commits] [Gerrit] redirect.py: handle CircularRedirect exception - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: redirect.py: handle CircularRedirect exception .. redirect.py: handle CircularRedirect exception Handle CircularRedirect exception in get_moved_pages_redirects(). Bug: 69370 Change-Id: I7aa11a88ee9b8f23a9b19edb1343da2ba5ae3378 --- M scripts/redirect.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index a1f610f..5524483 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -367,6 +367,8 @@ except pywikibot.NoPage: # original title must have been deleted after move continue +except pywikibot.CircularRedirect: +continue class RedirectRobot(Bot): -- To view, visit https://gerrit.wikimedia.org/r/173451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7aa11a88ee9b8f23a9b19edb1343da2ba5ae3378 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] allpages.py: fix namespace param type - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: allpages.py: fix namespace param type
..
allpages.py: fix namespace param type
If namespace is a Namespace object, str(namespace) returns the name of
the namespace and not the index.
In the API query, the param will not be recognised as valid.
Bug: 73214
Change-Id: Ib69522bf8fc62cdd8815f45bfa7e9fb5c88f864e
---
M pywikibot/site.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 7f3e1ea..1d40648 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3079,7 +3079,7 @@
filterredir = False
apgen = self._generator(api.PageGenerator, type_arg="allpages",
-gapnamespace=str(namespace),
+gapnamespace=int(namespace),
gapfrom=start, step=step, total=total,
g_content=content)
if prefix:
@@ -3138,7 +3138,7 @@
if not isinstance(namespace, (int, Namespace)):
raise Error("alllinks: only one namespace permitted.")
algen = self._generator(api.ListGenerator, type_arg="alllinks",
-alnamespace=str(namespace), alfrom=start,
+alnamespace=int(namespace), alfrom=start,
step=step, total=total)
if prefix:
algen.request["alprefix"] = prefix
--
To view, visit https://gerrit.wikimedia.org/r/173465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib69522bf8fc62cdd8815f45bfa7e9fb5c88f864e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turn page action icons in alpha into SVGS - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Turn page action icons in alpha into SVGS
..
Turn page action icons in alpha into SVGS
Change-Id: I0f53dc032fc7d682f7c51409840d1d6baeb36d91
---
M less/content/headings.less
M less/iconsNew.less
A less/images/icons/edit.svg
A less/images/icons/editLocked.svg
A less/images/icons/talk.svg
A less/images/icons/upload.svg
A less/images/icons/uploadLocked.svg
M less/minerva.less/minerva.variables.less
M less/pageactions.less
M less/ui.less
10 files changed, 99 insertions(+), 40 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/content/headings.less b/less/content/headings.less
index bb7be26..083e28f 100644
--- a/less/content/headings.less
+++ b/less/content/headings.less
@@ -42,15 +42,15 @@
.pre-content h1,
.content h1 {
font-family: @fontFamilyHeading;
- font-size: 1.7em;
+ font-size: @fontSizeH1;
}
h2 {
- font-size: 1.5em;
+ font-size: @fontSizeH2;
}
h3 {
- font-size: 1.2em;
+ font-size: @fontSizeH3;
font-weight: bold;
}
diff --git a/less/iconsNew.less b/less/iconsNew.less
index 9277c8a..0651d0c 100644
--- a/less/iconsNew.less
+++ b/less/iconsNew.less
@@ -5,32 +5,12 @@
// FIXME: BEGIN: Find svg versions of all of these and add to icons folder
// UI set
-.mw-ui-icon-talk {
- .m-background-image('images/pagemenu/talk.png');
-}
-
-.mw-ui-icon-watch {
- .m-background-image-svg-quick('images/icons/watch');
-}
-
-.mw-ui-icon-edit {
- .m-background-image('images/pagemenu/edit-locked.png');
-}
-
-.mw-ui-icon-edit-enabled {
- .m-background-image('images/pagemenu/edit.png');
-}
-
.mw-ui-icon-arrow-down {
.m-background-image('images/show.png');
}
.mw-ui-icon-arrow-up {
.m-background-image('images/hide.png');
-}
-
-.mw-ui-icon-watched {
- .m-background-image-svg-quick('images/icons/watched');
}
// Menu set
@@ -87,14 +67,6 @@
// Uploads set
-.mw-ui-icon-addimage {
- .m-background-image('images/pagemenu/upload-locked.png');
-}
-
-.mw-ui-icon-addimage-enabled {
- .m-background-image('images/pagemenu/upload.png');
-}
-
.mw-ui-icon-photo {
.m-background-image('images/camera.png');
}
@@ -175,6 +147,35 @@
.m-background-image('images/ajax-loader.gif');
}
+// Page action set
+.mw-ui-icon-talk {
+ .m-background-image-svg-quick('images/icons/talk');
+}
+
+.mw-ui-icon-watch {
+ .m-background-image-svg-quick('images/icons/watch');
+}
+
+.mw-ui-icon-edit {
+ .m-background-image-svg-quick('images/icons/editLocked');
+}
+
+.mw-ui-icon-edit-enabled {
+ .m-background-image-svg-quick('images/icons/edit');
+}
+
+.mw-ui-icon-watched {
+ .m-background-image-svg-quick('images/icons/watched');
+}
+
+.mw-ui-icon-addimage {
+ .m-background-image-svg-quick('images/icons/uploadLocked');
+}
+
+.mw-ui-icon-addimage-enabled {
+ .m-background-image-svg-quick('images/icons/upload');
+}
+
// FIXME: Find better workaround for this
span.mw-ui-icon {
// a block inside an inline element is never a good idea - effects line
height of mobile diff bytesadded class
@@ -183,6 +184,11 @@
// FIXME: Upstream to mediawiki ui
.mw-ui-icon {
+ // FIXME: Needed for page actions, ensures tags can give icon height
+ * {
+ display: block;
+ }
+
&:before {
background-position: 50% 50%;
height: 100%;
diff --git a/less/images/icons/edit.svg b/less/images/icons/edit.svg
new file mode 100644
index 000..b041b1e
--- /dev/null
+++ b/less/images/icons/edit.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; viewBox="0 -410 2048 2048" width="24"
height="24">
+
+
+
+
diff --git a/less/images/icons/editLocked.svg b/less/images/icons/editLocked.svg
new file mode 100644
index 000..511f4af
--- /dev/null
+++ b/less/images/icons/editLocked.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; viewBox="0 -410 2048 2048" width="24"
height="24" fill="#777">
+
+
+
+
diff --git a/less/images/icons/talk.svg b/less/images/icons/talk.svg
new file mode 100644
index 000..71a2f0f
--- /dev/null
+++ b/less/images/icons/talk.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; viewBox="0 -410 2389. 2048"
width="28" height="24">
+
+
+
+
diff --git a/less/images/icons/upload.svg b/less/images/icons/upload.svg
new file mode 100644
index 000..50df291
--- /dev/null
+++ b/less/images/icons/upload.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; viewBox="0 -410 2389. 2048"
width="28" height="24">
+
+
+
+
diff --git a/less/images/icons/uploadLocked.svg
b/less/images/icons/uploadLocked.svg
new file mode 100644
index 000..3917e63
--- /dev/null
+++ b/less/images/icons/uploadLocked.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; vie
[MediaWiki-commits] [Gerrit] Prefix and full-text delayed searching. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Prefix and full-text delayed searching.
..
Prefix and full-text delayed searching.
0.3 seconds for prefix and 1 second for full text.
Change-Id: I81115585fb798ee2fb01a3c61f8955a3282d9f16
---
M wikipedia/Defines/Defines.h
M wikipedia/View Controllers/SearchResults/SearchResultsController.m
2 files changed, 37 insertions(+), 1 deletion(-)
Approvals:
Brion VIBBER: Looks good to me, approved
diff --git a/wikipedia/Defines/Defines.h b/wikipedia/Defines/Defines.h
index 79a7956..f9716bd 100644
--- a/wikipedia/Defines/Defines.h
+++ b/wikipedia/Defines/Defines.h
@@ -61,3 +61,7 @@
SEARCH_TYPE_TITLES,
SEARCH_TYPE_IN_ARTCILES
};
+
+#define SEARCH_DELAY_PREFIX 0.3
+#define SEARCH_DELAY_FULL_TEXT 1.0
+
diff --git a/wikipedia/View Controllers/SearchResults/SearchResultsController.m
b/wikipedia/View Controllers/SearchResults/SearchResultsController.m
index 7e194a3..214488a 100644
--- a/wikipedia/View Controllers/SearchResults/SearchResultsController.m
+++ b/wikipedia/View Controllers/SearchResults/SearchResultsController.m
@@ -41,6 +41,8 @@
@property (nonatomic, weak) IBOutlet SearchDidYouMeanButton *didYouMeanButton;
@property (nonatomic, weak) IBOutlet SearchMessageLabel *searchMessageLabel;
+@property (nonatomic, strong) NSTimer *delayedSearchTimer;
+
@end
@implementation SearchResultsController
@@ -103,7 +105,7 @@
context: (void *)context
{
if ((object == self.searchTypeMenu) && [keyPath
isEqualToString:@"searchType"]) {
-[self refreshSearchResults];
+[self refreshSearchResultsAfterDelay:@0.0f];
}
}
@@ -118,13 +120,43 @@
{
[super viewWillDisappear:animated];
+[self cancelDelayedSearch];
+
[self.searchTypeMenu removeObserver:self forKeyPath:@"searchType"];
[[QueuesSingleton sharedInstance].searchResultsFetchManager.operationQueue
cancelAllOperations];
}
+-(void)cancelDelayedSearch
+{
+if (self.delayedSearchTimer) {
+[self.delayedSearchTimer invalidate];
+self.delayedSearchTimer = nil;
+}
+}
+
-(void)refreshSearchResults
{
+CGFloat delay = (self.searchTypeMenu.searchType == SEARCH_TYPE_TITLES) ?
SEARCH_DELAY_PREFIX : SEARCH_DELAY_FULL_TEXT;
+
+[self refreshSearchResultsAfterDelay:@(delay)];
+}
+
+-(void)refreshSearchResultsAfterDelay:(NSNumber *)delay
+{
+[self cancelDelayedSearch];
+
+self.delayedSearchTimer = [NSTimer scheduledTimerWithTimeInterval:
delay.floatValue
+ target: self
+selector:
@selector(performSearch)
+userInfo: nil
+ repeats: NO];
+}
+
+-(void)performSearch
+{
+if (self.navigationController.topViewController != self) return;
+
if (ROOT.topMenuViewController.currentSearchString.length == 0) return;
[self updateWordsToHighlight];
--
To view, visit https://gerrit.wikimedia.org/r/173351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81115585fb798ee2fb01a3c61f8955a3282d9f16
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] allpages.py: fix namespace param type - change (pywikibot/core)
Mpaa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173465
Change subject: allpages.py: fix namespace param type
..
allpages.py: fix namespace param type
If namespace is a Namespace object, str(namespace) returns the name of
the namespace and not the index.
In the API query, the param will not be recognised as valid.
Bug: 73214
Change-Id: Ib69522bf8fc62cdd8815f45bfa7e9fb5c88f864e
---
M pywikibot/site.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/65/173465/1
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 7f3e1ea..1d40648 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3079,7 +3079,7 @@
filterredir = False
apgen = self._generator(api.PageGenerator, type_arg="allpages",
-gapnamespace=str(namespace),
+gapnamespace=int(namespace),
gapfrom=start, step=step, total=total,
g_content=content)
if prefix:
@@ -3138,7 +3138,7 @@
if not isinstance(namespace, (int, Namespace)):
raise Error("alllinks: only one namespace permitted.")
algen = self._generator(api.ListGenerator, type_arg="alllinks",
-alnamespace=str(namespace), alfrom=start,
+alnamespace=int(namespace), alfrom=start,
step=step, total=total)
if prefix:
algen.request["alprefix"] = prefix
--
To view, visit https://gerrit.wikimedia.org/r/173465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib69522bf8fc62cdd8815f45bfa7e9fb5c88f864e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing a ton of empty repositories - change (mediawiki/extensions)
Chad has submitted this change and it was merged. Change subject: Removing a ton of empty repositories .. Removing a ton of empty repositories Change-Id: Ie57de36523b1ef7dc2af847e3d4a029f5f2e3b69 --- M .gitmodules D AddMetaAndTitle D AmazonLookup D ArticleRatings D AzharAuth D CategoryMagicWords D Censor D ContextComments D CustomMagic D DataModel D DebianISOCodes D EImage D ELearnware D ExtensionStatus D FlashPlayer D GoogleTagManager D HaloTripleStoreConnector D HotCat D ISO3166 D ISO639 D ImportBibliography D InterwikiExistence D InterwikiMap D Ipernity D Isbn D IssueTracker D LightboxGallery D ListTransclusions D MailChimpSubscription D Memento D MetaDescriptionTag D MirrorTools D MobileSections D MultiAudioVideo D NoUnwrap D PDBHandler D PageCredits D PerformanceMonitor D PlaceNewSection D PopupPages D PrefixExport D PropertySuggester D ProtectedTitles D ProxyListDb D PubSubHubbubSubscriber D PurposeCentricSearch D QueryResult D RealNames D ReorderParserPhases D SMWHalo D SOLRSearch D ShareThisWidget D ShrinkTheWeb D SignupAPI D SimpleSamlAuth D SpecialNamespaces D StoryParagraph D SubpageWatchlist D SwedishCollation D TemplateDocumentation D UserSnoop D VersionView D VideoJsPlayer D VisualWiki D WebCache D WhichImageIsBetter D WikiCortex D WikiFarm D WikiShare D WikivotePageSchemas D WikivoyageMessages 71 files changed, 0 insertions(+), 280 deletions(-) Approvals: Chad: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index e831c58..05aabf5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -54,10 +54,6 @@ path = AddMessages url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AddMessages.git branch = . -[submodule "AddMetaAndTitle"] - path = AddMetaAndTitle - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AddMetaAndTitle.git - branch = . [submodule "AddThis"] path = AddThis url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AddThis.git @@ -89,10 +85,6 @@ [submodule "AllTimeZones"] path = AllTimeZones url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AllTimeZones.git - branch = . -[submodule "AmazonLookup"] - path = AmazonLookup - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AmazonLookup.git branch = . [submodule "AnchorHandler"] path = AnchorHandler @@ -146,10 +138,6 @@ path = ArticleIndex url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ArticleIndex.git branch = . -[submodule "ArticleRatings"] - path = ArticleRatings - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ArticleRatings.git - branch = . [submodule "AssertEdit"] path = AssertEdit url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AssertEdit.git @@ -177,10 +165,6 @@ [submodule "Awesomeness"] path = Awesomeness url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Awesomeness.git - branch = . -[submodule "AzharAuth"] - path = AzharAuth - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AzharAuth.git branch = . [submodule "Babel"] path = Babel @@ -274,10 +258,6 @@ path = Carp url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Carp.git branch = . -[submodule "CategoryMagicWords"] - path = CategoryMagicWords - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CategoryMagicWords.git - branch = . [submodule "CategorySlideShow"] path = CategorySlideShow url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CategorySlideShow.git @@ -297,10 +277,6 @@ [submodule "CategoryTree"] path = CategoryTree url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CategoryTree.git - branch = . -[submodule "Censor"] - path = Censor - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Censor.git branch = . [submodule "CentralAuth"] path = CentralAuth @@ -450,10 +426,6 @@ path = Contest url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Contest.git branch = . -[submodule "ContextComments"] - path = ContextComments - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ContextComments.git - branch = . [submodule "ContributionReporting"] path = ContributionReporting url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ContributionReporting.git @@ -506,10 +478,6 @@ path = CustomData url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CustomData.git branch = . -[submodule "CustomMagic"] - path = CustomMagic - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CustomMagic.git - branch = . [submodule "CustomUserSignup"] path = CustomUserSignup
[MediaWiki-commits] [Gerrit] rename BannerChooser test - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged. Change subject: rename BannerChooser test .. rename BannerChooser test To distinguish from upcoming tests of other allocations code paths. Change-Id: I9df1e97ddae2c089f48c554153ace110105b869d --- M CentralNotice.hooks.php R tests/BannerChooserTest.php 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php index f304171..3cc1993 100644 --- a/CentralNotice.hooks.php +++ b/CentralNotice.hooks.php @@ -362,8 +362,8 @@ $wgAutoloadClasses['CentralNoticeTestFixtures'] = __DIR__ . '/tests/CentralNoticeTestFixtures.php'; $wgAutoloadClasses['ComparisonUtil'] = __DIR__ . '/tests/ComparisonUtil.php'; - $files[ ] = __DIR__ . '/tests/AllocationsTest.php'; $files[ ] = __DIR__ . '/tests/ApiAllocationsTest.php'; + $files[ ] = __DIR__ . '/tests/BannerChooserTest.php'; $files[ ] = __DIR__ . '/tests/CentralNoticeTest.php'; $files[ ] = __DIR__ . '/tests/BannerAllocationCalculatorTest.php'; $files[ ] = __DIR__ . '/tests/BannerChoiceDataProviderTest.php'; diff --git a/tests/AllocationsTest.php b/tests/BannerChooserTest.php similarity index 100% rename from tests/AllocationsTest.php rename to tests/BannerChooserTest.php -- To view, visit https://gerrit.wikimedia.org/r/172667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9df1e97ddae2c089f48c554153ace110105b869d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Awight Gerrit-Reviewer: Ejegg Gerrit-Reviewer: Mwalker Gerrit-Reviewer: Ssmith Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added Wikidata descriptions to Nearby items. - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Added Wikidata descriptions to Nearby items.
..
Added Wikidata descriptions to Nearby items.
Change-Id: I41616c865c5be2500f944fffb838ff9d0bacafd0
---
M wikipedia/Categories/NSString+Extras.h
M wikipedia/Categories/NSString+Extras.m
M wikipedia/Networking/Fetchers/NearbyFetcher.m
M wikipedia/View Controllers/Nearby/NearbyResultCell.h
M wikipedia/View Controllers/Nearby/NearbyResultCell.m
M wikipedia/View Controllers/Nearby/NearbyResultCell.xib
M wikipedia/View Controllers/Nearby/NearbyViewController.m
M wikipedia/View Controllers/SearchResults/SearchResultCell.m
8 files changed, 163 insertions(+), 16 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/Categories/NSString+Extras.h
b/wikipedia/Categories/NSString+Extras.h
index 5574f05..cdc5c69 100644
--- a/wikipedia/Categories/NSString+Extras.h
+++ b/wikipedia/Categories/NSString+Extras.h
@@ -17,4 +17,6 @@
- (NSString *)wikiTitleWithoutUnderscores;
- (NSString *)wikiTitleWithoutSpaces;
+- (NSString *)capitalizeFirstLetter;
+
@end
diff --git a/wikipedia/Categories/NSString+Extras.m
b/wikipedia/Categories/NSString+Extras.m
index 67a32e4..0d497c7 100644
--- a/wikipedia/Categories/NSString+Extras.m
+++ b/wikipedia/Categories/NSString+Extras.m
@@ -4,6 +4,8 @@
#import "NSString+Extras.h"
#import "TFHpple.h"
#import
+#import "SessionSingleton.h"
+#import "MWLanguageInfo.h"
@implementation NSString (Extras)
@@ -110,4 +112,36 @@
return [self stringByReplacingOccurrencesOfString:@" " withString:@"_"];
}
+- (NSString *)capitalizeFirstLetter
+{
+// Capitalize first character of WikiData description.
+if (self.length > 1){
+NSString *firstChar = [self substringToIndex:1];
+NSString *remainingChars = [self substringFromIndex:1];
+NSLocale *locale = [self getLocaleForCurrentSearchDomain];
+firstChar = [firstChar capitalizedStringWithLocale:locale];
+return [firstChar stringByAppendingString:remainingChars];
+}
+return self;
+}
+
+-(NSLocale *)getLocaleForCurrentSearchDomain
+{
+NSString *domain = [SessionSingleton sharedInstance].domain;
+
+MWLanguageInfo *languageInfo = [MWLanguageInfo languageInfoForCode:domain];
+
+NSString *code = languageInfo.code;
+
+NSLocale *locale = nil;
+
+if (code && [[NSLocale availableLocaleIdentifiers] containsObject:code]){
+locale = [[NSLocale alloc] initWithLocaleIdentifier:code];
+}
+
+if(!locale) locale = [NSLocale currentLocale];
+
+return locale;
+}
+
@end
diff --git a/wikipedia/Networking/Fetchers/NearbyFetcher.m
b/wikipedia/Networking/Fetchers/NearbyFetcher.m
index cc00435..241cdcd 100644
--- a/wikipedia/Networking/Fetchers/NearbyFetcher.m
+++ b/wikipedia/Networking/Fetchers/NearbyFetcher.m
@@ -107,7 +107,8 @@
{
return @{
@"action": @"query",
- @"prop": @"coordinates|pageimages",
+ @"prop": @"coordinates|pageimages|pageprops",
+ @"ppprop": @"wikibase_item",
@"colimit": @"50",
@"pithumbsize" : @(SEARCH_THUMBNAIL_WIDTH),
@"pilimit": @"50",
@@ -142,7 +143,12 @@
if(pageImage)d[@"pageimage"] = pageImage;
if(thumbnail)d[@"thumbnail"] = thumbnail;
if(title)d[@"title"] = title;
-
+id pageprops = page[@"pageprops"];
+if ([pageprops isKindOfClass:[NSDictionary class]]) {
+if ([pageprops objectForKey:@"wikibase_item"]) {
+d[@"wikibase_item"] = pageprops[@"wikibase_item"];
+}
+}
[nearbyResults addObject:d];
}
}
diff --git a/wikipedia/View Controllers/Nearby/NearbyResultCell.h
b/wikipedia/View Controllers/Nearby/NearbyResultCell.h
index 92e8312..f5b279c 100644
--- a/wikipedia/View Controllers/Nearby/NearbyResultCell.h
+++ b/wikipedia/View Controllers/Nearby/NearbyResultCell.h
@@ -9,7 +9,6 @@
@interface NearbyResultCell : UITableViewCell
@property (weak, nonatomic) IBOutlet NearbyThumbnailView *thumbView;
-@property (weak, nonatomic) IBOutlet PaddedLabel *titleLabel;
@property (strong, nonatomic) NSNumber *distance;
@property (strong, nonatomic) CLLocation *location;
@@ -20,4 +19,7 @@
@property (strong, nonatomic) UILongPressGestureRecognizer
*longPressRecognizer;
+-(void)setTitle: (NSString *)title
+description: (NSString *)description;
+
@end
diff --git a/wikipedia/View Controllers/Nearby/NearbyResultCell.m
b/wikipedia/View Controllers/Nearby/NearbyResultCell.m
index 158e34a..6e81e82 100644
--- a/wikipedia/View Controllers/Nearby/NearbyResultCell.m
+++ b/wikipedia/View Controllers/Nearby/NearbyResultCell.m
@@ -12,13 +12,74 @@
#define RADIANS_TO_DEGREES(radians) ((radians) *
[MediaWiki-commits] [Gerrit] refactor test fixtures as json - change (mediawiki...CentralNotice)
Ejegg has submitted this change and it was merged.
Change subject: refactor test fixtures as json
..
refactor test fixtures as json
This makes it simple to reuse from QUnit, to test client-side
allocation calculation.
Change-Id: Icddf07c85b74bb18d201a4572b91281d1e98fd28
---
M tests/BannerAllocationCalculatorTest.php
M tests/BannerChoiceDataProviderTest.php
M tests/CentralNoticeTestFixtures.php
A tests/data/AllocationsFixtures.json
4 files changed, 396 insertions(+), 464 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/tests/BannerAllocationCalculatorTest.php
b/tests/BannerAllocationCalculatorTest.php
index 2e3b298..f20be61 100644
--- a/tests/BannerAllocationCalculatorTest.php
+++ b/tests/BannerAllocationCalculatorTest.php
@@ -23,8 +23,8 @@
/**
* @dataProvider CentralNoticeTestFixtures::allocationsData
*/
- public function testAllocations( $fixtures, $expectedChoices,
$expectedAllocations ) {
- $this->cnFixtures->addFixtures( $fixtures );
+ public function testAllocations( $data ) {
+ $this->cnFixtures->addFixtures( $data['fixture'] );
$allocationsProvider = new BannerChoiceDataProvider(
CentralNoticeTestFixtures::getDefaultProject(),
@@ -42,7 +42,7 @@
$allocations =
BannerAllocationCalculator::calculateAllocations( $banners );
$this->assertTrue(
- ComparisonUtil::assertEqualAllocations( $allocations,
$expectedAllocations )
+ ComparisonUtil::assertEqualAllocations( $allocations,
$data['allocations'] )
);
}
}
diff --git a/tests/BannerChoiceDataProviderTest.php
b/tests/BannerChoiceDataProviderTest.php
index 7b878ff..ec41dd3 100644
--- a/tests/BannerChoiceDataProviderTest.php
+++ b/tests/BannerChoiceDataProviderTest.php
@@ -23,8 +23,8 @@
/**
* @dataProvider CentralNoticeTestFixtures::allocationsData
*/
- public function testProviderResponse( $fixtures, $expected ) {
- $this->cnFixtures->addFixtures( $fixtures );
+ public function testProviderResponse( $data ) {
+ $this->cnFixtures->addFixtures( $data['fixture'] );
$allocationsProvider = new BannerChoiceDataProvider(
CentralNoticeTestFixtures::$defaultCampaign['projects'][0],
@@ -32,9 +32,9 @@
BannerChoiceDataProvider::ANONYMOUS
);
$choices = $allocationsProvider->getChoices();
- $this->assertTrue( ComparisonUtil::assertSuperset( $choices,
$expected ) );
+ $this->assertTrue( ComparisonUtil::assertSuperset( $choices,
$data['choices'] ) );
- if ( empty( $expected ) ) {
+ if ( empty( $data['choices'] ) ) {
$this->assertEmpty( $choices );
}
}
diff --git a/tests/CentralNoticeTestFixtures.php
b/tests/CentralNoticeTestFixtures.php
index dcbf0c0..fd7c053 100644
--- a/tests/CentralNoticeTestFixtures.php
+++ b/tests/CentralNoticeTestFixtures.php
@@ -1,6 +1,8 @@
array(
- array(
- 'category' => 'fundraising',
- 'preferred' =>
CentralNotice::NORMAL_PRIORITY,
- 'throttle' => 50,
- 'startTs' => $startTs,
- 'geotargetted' => true,
- 'geo_countries' => array(
- 'FR',
- 'GR',
- 'XX',
- ),
- 'banners' => array(
- array(
- 'name' => 'b1',
- 'weight' => 5,
- ),
- ),
- ),
- ),
- ),
- // expected
- array(
- array(
- 'preferred' => 1,
- 'throttle' => 50,
- 'bucket_count' => 1,
- 'geotargetted' => true,
- 'start' => $startTs,
- 'end' => $endTs,
- 'cou
[MediaWiki-commits] [Gerrit] mha: replace pmtpa with codfw? (and logging.pp) - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173464
Change subject: mha: replace pmtpa with codfw? (and logging.pp)
..
mha: replace pmtpa with codfw? (and logging.pp)
replace pmtpa with codfw in role/mha.pp, does this
make sense or should it just be removed?
plus mini change in logging to remove pmtpa
Change-Id: I2b45e65d503c7866a83cb72428c1eb2bcb27a6eb
---
M manifests/role/logging.pp
M manifests/role/mha.pp
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/173464/1
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 157e749..f12af61 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -47,7 +47,6 @@
# TODO remove once beta cluster is migrated to eqiad
$logtash_host_beta = $::site ? {
eqiad => 'deployment-logstash1.eqiad.wmflabs',
-pmtpa => 'logstash.pmtpa.wmflabs',
}
$logstash_host = $::realm ? {
# TODO: Find a way to use multicast that doesn't cause duplicate
diff --git a/manifests/role/mha.pp b/manifests/role/mha.pp
index da4e2ac..674fe2c 100644
--- a/manifests/role/mha.pp
+++ b/manifests/role/mha.pp
@@ -96,12 +96,12 @@
mha_shard_config { "${name}-eqiad":
shard => $shard,
site=> 'eqiad',
-altsite => 'pmtpa',
+altsite => 'codfw',
}
-# pmtpa
-mha_shard_config { "${name}-pmtpa":
+# codfw
+mha_shard_config { "${name}-codfw":
shard => $shard,
-site=> 'pmtpa',
+site=> 'codfw',
altsite => 'eqiad',
}
# dc switch
--
To view, visit https://gerrit.wikimedia.org/r/173464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b45e65d503c7866a83cb72428c1eb2bcb27a6eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove dead code paths - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove dead code paths
..
Hygiene: Remove dead code paths
* Last modified is always at top. No need for beta specific code.
* wgMFUserGender is not used anywhere
* Update alpha function so it's clearer.
Change-Id: I553cee09b49814529efeaf1f3595891805634853
---
M includes/skins/SkinMinervaAlpha.php
M includes/skins/SkinMinervaBeta.php
2 files changed, 1 insertion(+), 28 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinervaAlpha.php
b/includes/skins/SkinMinervaAlpha.php
index db3d1d2..aa3c227 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -35,6 +35,7 @@
/**
* Creates element relating to secondary button
+* Unlike method in stable adds span outside the link element.
* @param string $title Title attribute value of secondary button
* @param string $url of secondary button
* @param string $spanLabel text of span associated with secondary
button.
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index 51072a1..212af2c 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -28,34 +28,6 @@
}
/**
-* initialize various variables and generate the template
-* @return QuickTemplate
-*/
- protected function prepareQuickTemplate() {
- $tpl = parent::prepareQuickTemplate();
- // Move last modified link to top as long as it is not the main
page
- $tpl->set( '_lastModifiedAbove',
!$this->getTitle()->isMainPage() );
- return $tpl;
- }
-
- /**
-* Get various skin specific configuration.
-* @return array
-*/
- public function getSkinConfigVariables() {
- $vars = parent::getSkinConfigVariables();
- // Kill this when we fix the functionality in PageApi.js
- $user = $this->getUser();
- if ( $user->isLoggedIn() ) {
- $vars['wgMFUserGender'] = $this->getUser()->getOption(
'gender' );
- } else {
- $vars['wgMFUserGender'] = 'unknown';
- }
-
- return $vars;
- }
-
- /**
* Returns the javascript modules to load.
* @return array
*/
--
To view, visit https://gerrit.wikimedia.org/r/173214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I553cee09b49814529efeaf1f3595891805634853
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Bmansurov
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 inconsistent spacing in composer.json - change (mediawiki...cldr)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix inconsistent spacing in composer.json
..
Fix inconsistent spacing in composer.json
Change-Id: I16b8dc7c14b27259d7b936294ccadd0e644e108d
---
M composer.json
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index f27e604..50fd9a4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
{
"name": "mediawiki/cldr",
- "type": "mediawiki-extension",
- "description": "CLDR extension contains local language names
for different languages, countries, and currencies extracted from CLDR data",
- "homepage": "http://www.mediawiki.org/wiki/Extension:CLDR";,
- "license" : "GPL-2.0",
+ "type": "mediawiki-extension",
+ "description": "CLDR extension contains local language names for
different languages, countries, and currencies extracted from CLDR data",
+ "homepage": "http://www.mediawiki.org/wiki/Extension:CLDR";,
+ "license": "GPL-2.0",
- "require": {
- "composer/installers" : "*"
- }
+ "require": {
+ "composer/installers": "*"
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/173448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16b8dc7c14b27259d7b936294ccadd0e644e108d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/cldr
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Move getOrigin method from mw.mobileFrontend to Api - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Move getOrigin method from mw.mobileFrontend to Api
..
Hygiene: Move getOrigin method from mw.mobileFrontend to Api
* Update usage
* Styling fixes whilst there.
Change-Id: Ief1e6af11301638cae6dc142afab5d904d5b799a
---
M javascripts/api.js
M javascripts/application.js
M javascripts/modules/uploads/PhotoApi.js
M javascripts/specials/uploads.js
M tests/qunit/test_api.js
5 files changed, 18 insertions(+), 19 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/api.js b/javascripts/api.js
index 33978e0..83504f9 100644
--- a/javascripts/api.js
+++ b/javascripts/api.js
@@ -100,6 +100,16 @@
},
/**
+* Returns the current URL including protocol
+*
+* @method
+* @return {String}
+*/
+ getOrigin: function () {
+ return window.location.protocol + '//' +
window.location.hostname;
+ },
+
+ /**
* Retrieves a token for a given endpoint
* FIXME: consolidate with mw.Api.getToken
* use postWithToken / getToken where possible
@@ -149,7 +159,7 @@
type: tokenType
};
if ( endpoint ) {
- data.origin = M.getOrigin();
+ data.origin = this.getOrigin();
if ( caToken ) {
data.centralauthtoken = caToken;
}
diff --git a/javascripts/application.js b/javascripts/application.js
index aa69d11..ae9f1ad 100644
--- a/javascripts/application.js
+++ b/javascripts/application.js
@@ -249,16 +249,6 @@
}
/**
-* Returns the current URL including protocol
-*
-* @method
-* @return {String}
-*/
- function getOrigin() {
- return window.location.protocol + '//' +
window.location.hostname;
- }
-
- /**
* FIXME: sandbox from mf-application.js
*
* @method
@@ -389,7 +379,6 @@
escapeHash: escapeHash,
inNamespace: inNamespace,
getCurrentPage: getCurrentPage,
- getOrigin: getOrigin,
getLeadSection: getLeadSection,
getSessionId: getSessionId,
isWideScreen: isWideScreen,
diff --git a/javascripts/modules/uploads/PhotoApi.js
b/javascripts/modules/uploads/PhotoApi.js
index ea0b191..08fd16f 100644
--- a/javascripts/modules/uploads/PhotoApi.js
+++ b/javascripts/modules/uploads/PhotoApi.js
@@ -133,10 +133,10 @@
*/
save: function ( options ) {
var isNewPage = mw.config.get( 'wgArticleId' ) === 0,
- isNewFile = M.inNamespace( 'file' ) && isNewPage,
- self = this,
- result = $.Deferred(),
- apiUrl = endpoint || this.apiUrl;
+ isNewFile = M.inNamespace( 'file' ) &&
isNewPage,
+ self = this,
+ result = $.Deferred(),
+ apiUrl = endpoint || this.apiUrl;
options.editSummaryMessage = options.insertInPage ?
'mobile-frontend-photo-article-edit-comment' :
@@ -170,7 +170,7 @@
// add origin only when doing CORS
if ( endpoint ) {
- uploadUrl += '&origin=' + M.getOrigin();
+ uploadUrl += '&origin=' +
self.getOrigin();
if ( caToken ) {
data.centralauthtoken = caToken;
}
diff --git a/javascripts/specials/uploads.js b/javascripts/specials/uploads.js
index 37c01f9..73004df 100644
--- a/javascripts/specials/uploads.js
+++ b/javascripts/specials/uploads.js
@@ -36,7 +36,7 @@
gailimit: this.limit,
gaicontinue: this.endTimestamp,
prop: 'imageinfo',
- origin: corsUrl ? M.getOrigin() :
undefined,
+ origin: corsUrl ? this.getOrigin() :
undefined,
// FIXME: [API] have to request
timestamp since api returns an object
// rather than an array thus we need a
way to sort
[MediaWiki-commits] [Gerrit] Removing a ton of empty repositories - change (mediawiki/extensions)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/173463 Change subject: Removing a ton of empty repositories .. Removing a ton of empty repositories Change-Id: Ie57de36523b1ef7dc2af847e3d4a029f5f2e3b69 --- M .gitmodules D AddMetaAndTitle D AmazonLookup D ArticleRatings D AzharAuth D CategoryMagicWords D Censor D ContextComments D CustomMagic D DataModel D DebianISOCodes D EImage D ELearnware D ExtensionStatus D FlashPlayer D GoogleTagManager D HaloTripleStoreConnector D HotCat D ISO3166 D ISO639 D ImportBibliography D InterwikiExistence D InterwikiMap D Ipernity D Isbn D IssueTracker D LightboxGallery D ListTransclusions D MailChimpSubscription D Memento D MetaDescriptionTag D MirrorTools D MobileSections D MultiAudioVideo D NoUnwrap D PDBHandler D PageCredits D PerformanceMonitor D PhpTagsDebugger D PhpTagsWidgets D PlaceNewSection D PopupPages D PrefixExport D PropertySuggester D ProtectedTitles D ProxyListDb D PubSubHubbubSubscriber D PurposeCentricSearch D QueryResult D RealNames D ReorderParserPhases D SMWHalo D SOLRSearch D ShareThisWidget D ShrinkTheWeb D SignupAPI D SimpleSamlAuth D SpecialNamespaces D StoryParagraph D SubpageWatchlist D SwedishCollation D TemplateDocumentation D UserSnoop D VersionView D VideoJsPlayer D VisualWiki D WebCache D WhichImageIsBetter D WikiCortex D WikiFarm D WikiShare D WikivotePageSchemas D WikivoyageMessages 73 files changed, 0 insertions(+), 288 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/63/173463/1 diff --git a/.gitmodules b/.gitmodules index e831c58..9d08218 100644 --- a/.gitmodules +++ b/.gitmodules @@ -54,10 +54,6 @@ path = AddMessages url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AddMessages.git branch = . -[submodule "AddMetaAndTitle"] - path = AddMetaAndTitle - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AddMetaAndTitle.git - branch = . [submodule "AddThis"] path = AddThis url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AddThis.git @@ -89,10 +85,6 @@ [submodule "AllTimeZones"] path = AllTimeZones url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AllTimeZones.git - branch = . -[submodule "AmazonLookup"] - path = AmazonLookup - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AmazonLookup.git branch = . [submodule "AnchorHandler"] path = AnchorHandler @@ -146,10 +138,6 @@ path = ArticleIndex url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ArticleIndex.git branch = . -[submodule "ArticleRatings"] - path = ArticleRatings - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ArticleRatings.git - branch = . [submodule "AssertEdit"] path = AssertEdit url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AssertEdit.git @@ -177,10 +165,6 @@ [submodule "Awesomeness"] path = Awesomeness url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Awesomeness.git - branch = . -[submodule "AzharAuth"] - path = AzharAuth - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AzharAuth.git branch = . [submodule "Babel"] path = Babel @@ -274,10 +258,6 @@ path = Carp url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Carp.git branch = . -[submodule "CategoryMagicWords"] - path = CategoryMagicWords - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CategoryMagicWords.git - branch = . [submodule "CategorySlideShow"] path = CategorySlideShow url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CategorySlideShow.git @@ -297,10 +277,6 @@ [submodule "CategoryTree"] path = CategoryTree url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CategoryTree.git - branch = . -[submodule "Censor"] - path = Censor - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Censor.git branch = . [submodule "CentralAuth"] path = CentralAuth @@ -450,10 +426,6 @@ path = Contest url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Contest.git branch = . -[submodule "ContextComments"] - path = ContextComments - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ContextComments.git - branch = . [submodule "ContributionReporting"] path = ContributionReporting url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ContributionReporting.git @@ -506,10 +478,6 @@ path = CustomData url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CustomData.git branch = . -[submodule "CustomMagic"] - path = CustomMagic - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensio
[MediaWiki-commits] [Gerrit] Stop indentation at .flow-post-max-depth - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Stop indentation at .flow-post-max-depth
..
Stop indentation at .flow-post-max-depth
Change-Id: I3a57ab06cb63ddcdcc67371cc676c0b6b8993baa
---
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_post.handlebars
M modules/engine/components/board/base/flow-board-interactive-events.js
M modules/styles/board/topic/post.less
6 files changed, 18 insertions(+), 17 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 3d88968..36bb397 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -333,11 +333,9 @@
';},'flow_post' => function ($cx, $in) {return ''.LCRun3::wi($cx,
((isset($in['revision']) && is_array($in)) ? $in['revision'] : null), $in,
function($cx, $in) {return '
+ >
'.((LCRun3::ifvar($cx, ((isset($in['isModerated']) &&
is_array($in)) ? $in['isModerated'] : null))) ? '
'.LCRun3::hbch($cx, 'ifCond',
Array(Array(((isset($cx['scopes'][0]['rootBlock']['submitted']['showPostId'])
&& is_array($cx['scopes'][0]['rootBlock']['submitted'])) ?
$cx['scopes'][0]['rootBlock']['submitted']['showPostId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),Array()), $in, function($cx, $in) {return '
'.LCRun3::p($cx, 'flow_post_inner',
Array(Array($in),Array())).'
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index dc0245b..fa646a7 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -333,11 +333,9 @@
';},'flow_post' => function ($cx, $in) {return ''.LCRun3::wi($cx,
((isset($in['revision']) && is_array($in)) ? $in['revision'] : null), $in,
function($cx, $in) {return '
+ >
'.((LCRun3::ifvar($cx, ((isset($in['isModerated']) &&
is_array($in)) ? $in['isModerated'] : null))) ? '
'.LCRun3::hbch($cx, 'ifCond',
Array(Array(((isset($cx['scopes'][0]['rootBlock']['submitted']['showPostId'])
&& is_array($cx['scopes'][0]['rootBlock']['submitted'])) ?
$cx['scopes'][0]['rootBlock']['submitted']['showPostId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),Array()), $in, function($cx, $in) {return '
'.LCRun3::p($cx, 'flow_post_inner',
Array(Array($in),Array())).'
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index 3d38dc9..ff50df3 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -316,11 +316,9 @@
);
return ''.LCRun3::wi($cx, ((isset($in['revision']) && is_array($in)) ?
$in['revision'] : null), $in, function($cx, $in) {return '
+ >
'.((LCRun3::ifvar($cx, ((isset($in['isModerated']) &&
is_array($in)) ? $in['isModerated'] : null))) ? '
'.LCRun3::hbch($cx, 'ifCond',
Array(Array(((isset($cx['scopes'][0]['rootBlock']['submitted']['showPostId'])
&& is_array($cx['scopes'][0]['rootBlock']['submitted'])) ?
$cx['scopes'][0]['rootBlock']['submitted']['showPostId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),Array()), $in, function($cx, $in) {return '
'.LCRun3::p($cx, 'flow_post_inner',
Array(Array($in),Array())).'
diff --git a/handlebars/flow_post.handlebars b/handlebars/flow_post.handlebars
index 32a25d7..dc00a42 100644
--- a/handlebars/flow_post.handlebars
+++ b/handlebars/flow_post.handlebars
@@ -1,10 +1,7 @@
{{#with revision}}
{{#if isModerated}}
{{#ifCond @root.rootBlock.submitted.showPostId "==="
postId}}
diff --git
a/modules/engine/components/board/base/flow-board-interactive-events.js
b/modules/engine/components/board/base/flow-board-interactive-events.js
index b0e87ca..8c284df 100644
--- a/modules/engine/components/board/base/flow-board-interactive-events.js
+++ b/modules/engine/components/board/base/flow-board-interactive-events.js
@@ -160,7 +160,7 @@
var $form,
flowBoard = mw.flow.getPrototypeMethod( 'board',
'getInstanceByElement' )( $( this ) ),
$post = $( this ).closest( '.flow-post' ),
- $targetPost = $
[MediaWiki-commits] [Gerrit] Backfill daily projectcounts for 2012 - change (analytics...data)
Mforns has submitted this change and it was merged. Change subject: Backfill daily projectcounts for 2012 .. Backfill daily projectcounts for 2012 Projectcount files for 2012 have been taken from: http://dumps.wikimedia.org/other/pagecounts-ez/projectcounts/projectcounts-2012.tar No mobile or zero data, as the source does not contain them. Bug: 72740 Change-Id: Ib563a389177b55c0eb046bd91931aee123591d7d --- M projectcounts/daily/aawiki.csv M projectcounts/daily/aawikibooks.csv M projectcounts/daily/aawiktionary.csv M projectcounts/daily/abwiki.csv M projectcounts/daily/abwiktionary.csv M projectcounts/daily/acewiki.csv M projectcounts/daily/advisorywiki.csv M projectcounts/daily/afwiki.csv M projectcounts/daily/afwikibooks.csv M projectcounts/daily/afwikiquote.csv M projectcounts/daily/afwiktionary.csv M projectcounts/daily/akwiki.csv M projectcounts/daily/akwikibooks.csv M projectcounts/daily/akwiktionary.csv M projectcounts/daily/alswiki.csv M projectcounts/daily/alswikibooks.csv M projectcounts/daily/alswikiquote.csv M projectcounts/daily/alswiktionary.csv M projectcounts/daily/amwiki.csv M projectcounts/daily/amwikiquote.csv M projectcounts/daily/amwiktionary.csv M projectcounts/daily/angwiki.csv M projectcounts/daily/angwikibooks.csv M projectcounts/daily/angwikiquote.csv M projectcounts/daily/angwikisource.csv M projectcounts/daily/angwiktionary.csv M projectcounts/daily/anwiki.csv M projectcounts/daily/anwiktionary.csv M projectcounts/daily/arcwiki.csv M projectcounts/daily/arwiki.csv M projectcounts/daily/arwikibooks.csv M projectcounts/daily/arwikimedia.csv M projectcounts/daily/arwikinews.csv M projectcounts/daily/arwikiquote.csv M projectcounts/daily/arwikisource.csv M projectcounts/daily/arwikiversity.csv M projectcounts/daily/arwiktionary.csv M projectcounts/daily/arzwiki.csv M projectcounts/daily/astwiki.csv M projectcounts/daily/astwikibooks.csv M projectcounts/daily/astwikiquote.csv M projectcounts/daily/astwiktionary.csv M projectcounts/daily/aswiki.csv M projectcounts/daily/aswikibooks.csv M projectcounts/daily/aswikisource.csv M projectcounts/daily/aswiktionary.csv M projectcounts/daily/avwiki.csv M projectcounts/daily/avwiktionary.csv M projectcounts/daily/aywiki.csv M projectcounts/daily/aywikibooks.csv M projectcounts/daily/aywiktionary.csv M projectcounts/daily/azwiki.csv M projectcounts/daily/azwikibooks.csv M projectcounts/daily/azwikiquote.csv M projectcounts/daily/azwikisource.csv M projectcounts/daily/azwiktionary.csv M projectcounts/daily/barwiki.csv M projectcounts/daily/bat_smgwiki.csv M projectcounts/daily/bawiki.csv M projectcounts/daily/bawikibooks.csv M projectcounts/daily/bclwiki.csv M projectcounts/daily/bdwikimedia.csv M projectcounts/daily/be_x_oldwiki.csv M projectcounts/daily/betawikiversity.csv M projectcounts/daily/bewiki.csv M projectcounts/daily/bewikibooks.csv M projectcounts/daily/bewikimedia.csv M projectcounts/daily/bewikiquote.csv M projectcounts/daily/bewikisource.csv M projectcounts/daily/bewiktionary.csv M projectcounts/daily/bgwiki.csv M projectcounts/daily/bgwikibooks.csv M projectcounts/daily/bgwikinews.csv M projectcounts/daily/bgwikiquote.csv M projectcounts/daily/bgwikisource.csv M projectcounts/daily/bgwiktionary.csv M projectcounts/daily/bhwiki.csv M projectcounts/daily/bhwiktionary.csv M projectcounts/daily/biwiki.csv M projectcounts/daily/biwikibooks.csv M projectcounts/daily/biwiktionary.csv M projectcounts/daily/bjnwiki.csv M projectcounts/daily/bmwiki.csv M projectcounts/daily/bmwikibooks.csv M projectcounts/daily/bmwikiquote.csv M projectcounts/daily/bmwiktionary.csv M projectcounts/daily/bnwiki.csv M projectcounts/daily/bnwikibooks.csv M projectcounts/daily/bnwikisource.csv M projectcounts/daily/bnwiktionary.csv M projectcounts/daily/bowiki.csv M projectcounts/daily/bowikibooks.csv M projectcounts/daily/bowiktionary.csv M projectcounts/daily/bpywiki.csv M projectcounts/daily/brwiki.csv M projectcounts/daily/brwikimedia.csv M projectcounts/daily/brwikiquote.csv M projectcounts/daily/brwikisource.csv M projectcounts/daily/brwiktionary.csv M projectcounts/daily/bswiki.csv M projectcounts/daily/bswikibooks.csv M projectcounts/daily/bswikinews.csv M projectcounts/daily/bswikiquote.csv M projectcounts/daily/bswikisource.csv M projectcounts/daily/bswiktionary.csv M projectcounts/daily/bugwiki.csv M projectcounts/daily/bxrwiki.csv M projectcounts/daily/cawiki.csv M projectcounts/daily/cawikibooks.csv M projectcounts/daily/cawikinews.csv M projectcounts/daily/cawikiquote.csv M projectcounts/daily/cawikisource.csv M projectcounts/daily/cawiktionary.csv M projectcounts/daily/cbk_zamwiki.csv M projectcounts/daily/cdowiki.csv M projectcounts/daily/cebwiki.csv M projectcounts/daily/cewiki.csv M projectcounts/daily/chowiki.csv M projectcounts/daily/chrwiki.csv M projectcounts/daily/chrwiktionary.csv M projectcounts/daily/chwiki.csv M projectcounts/daily/chwikibooks.csv M projectc
[MediaWiki-commits] [Gerrit] Fix JS timestamp; shows up as 45 years ago (epoch) - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/173462 Change subject: Fix JS timestamp; shows up as 45 years ago (epoch) .. Fix JS timestamp; shows up as 45 years ago (epoch) Change-Id: If52524f1d4d566846eb14193eac7a973c18f7ea9 (cherry picked from commit 60b2da7e6598ae0d64969293b76a39d68f19accf) --- M includes/Formatter/RevisionFormatter.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/62/173462/1 diff --git a/includes/Formatter/RevisionFormatter.php b/includes/Formatter/RevisionFormatter.php index 7d126a0..75b8f5a 100644 --- a/includes/Formatter/RevisionFormatter.php +++ b/includes/Formatter/RevisionFormatter.php @@ -197,7 +197,7 @@ $row->revision->getLastContentEditUserId(), $row->revision->getLastContentEditUserIp() ), - 'lastEditId' => $row->revision->getLastContentEditId(), + 'lastEditId' => $row->revision->isOriginalContent() ? null : $row->revision->getLastContentEditId()->getAlphadecimal(), ); $prevRevId = $row->revision->getPrevRevisionId(); -- To view, visit https://gerrit.wikimedia.org/r/173462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If52524f1d4d566846eb14193eac7a973c18f7ea9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: wmf/1.25wmf8 Gerrit-Owner: EBernhardson Gerrit-Reviewer: Matthias Mullie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Backfill daily projectcounts for 2014 up to 2014-09-22 - change (analytics...data)
Mforns has submitted this change and it was merged. Change subject: Backfill daily projectcounts for 2014 up to 2014-09-22 .. Backfill daily projectcounts for 2014 up to 2014-09-22 Projectcount files have been taken from: http://dumps.wikimedia.org/other/pagecounts-ez/projectcounts/projectcounts-2014.tar No mobile or zero data, as the source does not contain them. No data for 2014-01-06 since projectcount files 20140106-16 is missing. No data for 2014-08-28 since projectcount files 20140828-17 -- 20140828-20 is missing. (See bug 70136) Data for 2014-01-05 is exceptionally low across the board. This might be related to the 2014-01-06 issue mentioned above. Bug: 72740 Change-Id: I105b9c9f84bfbcdc762cbe879d26c40248bb67cd --- M projectcounts/daily/aawiki.csv M projectcounts/daily/aawikibooks.csv M projectcounts/daily/aawiktionary.csv M projectcounts/daily/abwiki.csv M projectcounts/daily/abwiktionary.csv M projectcounts/daily/acewiki.csv M projectcounts/daily/advisorywiki.csv M projectcounts/daily/afwiki.csv M projectcounts/daily/afwikibooks.csv M projectcounts/daily/afwikiquote.csv M projectcounts/daily/afwiktionary.csv M projectcounts/daily/akwiki.csv M projectcounts/daily/akwikibooks.csv M projectcounts/daily/akwiktionary.csv M projectcounts/daily/alswiki.csv M projectcounts/daily/alswikibooks.csv M projectcounts/daily/alswikiquote.csv M projectcounts/daily/alswiktionary.csv M projectcounts/daily/amwiki.csv M projectcounts/daily/amwikiquote.csv M projectcounts/daily/amwiktionary.csv M projectcounts/daily/angwiki.csv M projectcounts/daily/angwikibooks.csv M projectcounts/daily/angwikiquote.csv M projectcounts/daily/angwikisource.csv M projectcounts/daily/angwiktionary.csv M projectcounts/daily/anwiki.csv M projectcounts/daily/anwiktionary.csv M projectcounts/daily/arcwiki.csv M projectcounts/daily/arwiki.csv M projectcounts/daily/arwikibooks.csv M projectcounts/daily/arwikimedia.csv M projectcounts/daily/arwikinews.csv M projectcounts/daily/arwikiquote.csv M projectcounts/daily/arwikisource.csv M projectcounts/daily/arwikiversity.csv M projectcounts/daily/arwiktionary.csv M projectcounts/daily/arzwiki.csv M projectcounts/daily/astwiki.csv M projectcounts/daily/astwikibooks.csv M projectcounts/daily/astwikiquote.csv M projectcounts/daily/astwiktionary.csv M projectcounts/daily/aswiki.csv M projectcounts/daily/aswikibooks.csv M projectcounts/daily/aswikisource.csv M projectcounts/daily/aswiktionary.csv M projectcounts/daily/avwiki.csv M projectcounts/daily/avwiktionary.csv M projectcounts/daily/aywiki.csv M projectcounts/daily/aywikibooks.csv M projectcounts/daily/aywiktionary.csv M projectcounts/daily/azwiki.csv M projectcounts/daily/azwikibooks.csv M projectcounts/daily/azwikiquote.csv M projectcounts/daily/azwikisource.csv M projectcounts/daily/azwiktionary.csv M projectcounts/daily/barwiki.csv M projectcounts/daily/bat_smgwiki.csv M projectcounts/daily/bawiki.csv M projectcounts/daily/bawikibooks.csv M projectcounts/daily/bclwiki.csv M projectcounts/daily/bdwikimedia.csv M projectcounts/daily/be_x_oldwiki.csv M projectcounts/daily/betawikiversity.csv M projectcounts/daily/bewiki.csv M projectcounts/daily/bewikibooks.csv M projectcounts/daily/bewikimedia.csv M projectcounts/daily/bewikiquote.csv M projectcounts/daily/bewikisource.csv M projectcounts/daily/bewiktionary.csv M projectcounts/daily/bgwiki.csv M projectcounts/daily/bgwikibooks.csv M projectcounts/daily/bgwikinews.csv M projectcounts/daily/bgwikiquote.csv M projectcounts/daily/bgwikisource.csv M projectcounts/daily/bgwiktionary.csv M projectcounts/daily/bhwiki.csv M projectcounts/daily/bhwiktionary.csv M projectcounts/daily/biwiki.csv M projectcounts/daily/biwikibooks.csv M projectcounts/daily/biwiktionary.csv M projectcounts/daily/bjnwiki.csv M projectcounts/daily/bmwiki.csv M projectcounts/daily/bmwikibooks.csv M projectcounts/daily/bmwikiquote.csv M projectcounts/daily/bmwiktionary.csv M projectcounts/daily/bnwiki.csv M projectcounts/daily/bnwikibooks.csv M projectcounts/daily/bnwikisource.csv M projectcounts/daily/bnwiktionary.csv M projectcounts/daily/bowiki.csv M projectcounts/daily/bowikibooks.csv M projectcounts/daily/bowiktionary.csv M projectcounts/daily/bpywiki.csv M projectcounts/daily/brwiki.csv M projectcounts/daily/brwikimedia.csv M projectcounts/daily/brwikiquote.csv M projectcounts/daily/brwikisource.csv M projectcounts/daily/brwiktionary.csv M projectcounts/daily/bswiki.csv M projectcounts/daily/bswikibooks.csv M projectcounts/daily/bswikinews.csv M projectcounts/daily/bswikiquote.csv M projectcounts/daily/bswikisource.csv M projectcounts/daily/bswiktionary.csv M projectcounts/daily/bugwiki.csv M projectcounts/daily/bxrwiki.csv M projectcounts/daily/cawiki.csv M projectcounts/daily/cawikibooks.csv M projectcounts/daily/cawikinews.csv M projectcounts/daily/cawikiquote.csv M projectcounts/daily/cawikisource.csv M projectcounts/daily/cawikt
[MediaWiki-commits] [Gerrit] Backfill daily projectcounts for 2013 - change (analytics...data)
Mforns has submitted this change and it was merged. Change subject: Backfill daily projectcounts for 2013 .. Backfill daily projectcounts for 2013 Projectcount files for 2013 have been taken from: http://dumps.wikimedia.org/other/pagecounts-ez/projectcounts/projectcounts-2013.tar No mobile or zero data, as the source does not contain them. No data for 2013-07-23, and 2013-07-24 since projectcount files 20130723-20 -- 20130724-15 are missing. Bug: 72740 Change-Id: Ie073a2c30f7c58c24675fedec2ce9f287cd9e6ca --- M projectcounts/daily/aawiki.csv M projectcounts/daily/aawikibooks.csv M projectcounts/daily/aawiktionary.csv M projectcounts/daily/abwiki.csv M projectcounts/daily/abwiktionary.csv M projectcounts/daily/acewiki.csv M projectcounts/daily/advisorywiki.csv M projectcounts/daily/afwiki.csv M projectcounts/daily/afwikibooks.csv M projectcounts/daily/afwikiquote.csv M projectcounts/daily/afwiktionary.csv M projectcounts/daily/akwiki.csv M projectcounts/daily/akwikibooks.csv M projectcounts/daily/akwiktionary.csv M projectcounts/daily/alswiki.csv M projectcounts/daily/alswikibooks.csv M projectcounts/daily/alswikiquote.csv M projectcounts/daily/alswiktionary.csv M projectcounts/daily/amwiki.csv M projectcounts/daily/amwikiquote.csv M projectcounts/daily/amwiktionary.csv M projectcounts/daily/angwiki.csv M projectcounts/daily/angwikibooks.csv M projectcounts/daily/angwikiquote.csv M projectcounts/daily/angwikisource.csv M projectcounts/daily/angwiktionary.csv M projectcounts/daily/anwiki.csv M projectcounts/daily/anwiktionary.csv M projectcounts/daily/arcwiki.csv M projectcounts/daily/arwiki.csv M projectcounts/daily/arwikibooks.csv M projectcounts/daily/arwikimedia.csv M projectcounts/daily/arwikinews.csv M projectcounts/daily/arwikiquote.csv M projectcounts/daily/arwikisource.csv M projectcounts/daily/arwikiversity.csv M projectcounts/daily/arwiktionary.csv M projectcounts/daily/arzwiki.csv M projectcounts/daily/astwiki.csv M projectcounts/daily/astwikibooks.csv M projectcounts/daily/astwikiquote.csv M projectcounts/daily/astwiktionary.csv M projectcounts/daily/aswiki.csv M projectcounts/daily/aswikibooks.csv M projectcounts/daily/aswikisource.csv M projectcounts/daily/aswiktionary.csv M projectcounts/daily/avwiki.csv M projectcounts/daily/avwiktionary.csv M projectcounts/daily/aywiki.csv M projectcounts/daily/aywikibooks.csv M projectcounts/daily/aywiktionary.csv M projectcounts/daily/azwiki.csv M projectcounts/daily/azwikibooks.csv M projectcounts/daily/azwikiquote.csv M projectcounts/daily/azwikisource.csv M projectcounts/daily/azwiktionary.csv M projectcounts/daily/barwiki.csv M projectcounts/daily/bat_smgwiki.csv M projectcounts/daily/bawiki.csv M projectcounts/daily/bawikibooks.csv M projectcounts/daily/bclwiki.csv M projectcounts/daily/bdwikimedia.csv M projectcounts/daily/be_x_oldwiki.csv M projectcounts/daily/betawikiversity.csv M projectcounts/daily/bewiki.csv M projectcounts/daily/bewikibooks.csv M projectcounts/daily/bewikimedia.csv M projectcounts/daily/bewikiquote.csv M projectcounts/daily/bewikisource.csv M projectcounts/daily/bewiktionary.csv M projectcounts/daily/bgwiki.csv M projectcounts/daily/bgwikibooks.csv M projectcounts/daily/bgwikinews.csv M projectcounts/daily/bgwikiquote.csv M projectcounts/daily/bgwikisource.csv M projectcounts/daily/bgwiktionary.csv M projectcounts/daily/bhwiki.csv M projectcounts/daily/bhwiktionary.csv M projectcounts/daily/biwiki.csv M projectcounts/daily/biwikibooks.csv M projectcounts/daily/biwiktionary.csv M projectcounts/daily/bjnwiki.csv M projectcounts/daily/bmwiki.csv M projectcounts/daily/bmwikibooks.csv M projectcounts/daily/bmwikiquote.csv M projectcounts/daily/bmwiktionary.csv M projectcounts/daily/bnwiki.csv M projectcounts/daily/bnwikibooks.csv M projectcounts/daily/bnwikisource.csv M projectcounts/daily/bnwiktionary.csv M projectcounts/daily/bowiki.csv M projectcounts/daily/bowikibooks.csv M projectcounts/daily/bowiktionary.csv M projectcounts/daily/bpywiki.csv M projectcounts/daily/brwiki.csv M projectcounts/daily/brwikimedia.csv M projectcounts/daily/brwikiquote.csv M projectcounts/daily/brwikisource.csv M projectcounts/daily/brwiktionary.csv M projectcounts/daily/bswiki.csv M projectcounts/daily/bswikibooks.csv M projectcounts/daily/bswikinews.csv M projectcounts/daily/bswikiquote.csv M projectcounts/daily/bswikisource.csv M projectcounts/daily/bswiktionary.csv M projectcounts/daily/bugwiki.csv M projectcounts/daily/bxrwiki.csv M projectcounts/daily/cawiki.csv M projectcounts/daily/cawikibooks.csv M projectcounts/daily/cawikinews.csv M projectcounts/daily/cawikiquote.csv M projectcounts/daily/cawikisource.csv M projectcounts/daily/cawiktionary.csv M projectcounts/daily/cbk_zamwiki.csv M projectcounts/daily/cdowiki.csv M projectcounts/daily/cebwiki.csv M projectcounts/daily/cewiki.csv M projectcounts/daily/chowiki.csv M projectcounts/daily/chrwiki.csv M projec
[MediaWiki-commits] [Gerrit] Backfill daily projectcounts up to 2014-11-08 - change (analytics...data)
Mforns has submitted this change and it was merged. Change subject: Backfill daily projectcounts up to 2014-11-08 .. Backfill daily projectcounts up to 2014-11-08 Projectcount files have been taken from: http://dumps.wikimedia.org/other/pagecounts-all-sites Bug: 72740 Change-Id: Ia368e81838e2fbf3f60de630c01a0d875b6e352a --- M projectcounts/daily/aawiki.csv M projectcounts/daily/aawikibooks.csv M projectcounts/daily/aawiktionary.csv M projectcounts/daily/abwiki.csv M projectcounts/daily/abwiktionary.csv M projectcounts/daily/acewiki.csv M projectcounts/daily/advisorywiki.csv M projectcounts/daily/afwiki.csv M projectcounts/daily/afwikibooks.csv M projectcounts/daily/afwikiquote.csv M projectcounts/daily/afwiktionary.csv M projectcounts/daily/akwiki.csv M projectcounts/daily/akwikibooks.csv M projectcounts/daily/akwiktionary.csv M projectcounts/daily/alswiki.csv M projectcounts/daily/alswikibooks.csv M projectcounts/daily/alswikiquote.csv M projectcounts/daily/alswiktionary.csv M projectcounts/daily/amwiki.csv M projectcounts/daily/amwikiquote.csv M projectcounts/daily/amwiktionary.csv M projectcounts/daily/angwiki.csv M projectcounts/daily/angwikibooks.csv M projectcounts/daily/angwikiquote.csv M projectcounts/daily/angwikisource.csv M projectcounts/daily/angwiktionary.csv M projectcounts/daily/anwiki.csv M projectcounts/daily/anwiktionary.csv M projectcounts/daily/arcwiki.csv M projectcounts/daily/arwiki.csv M projectcounts/daily/arwikibooks.csv M projectcounts/daily/arwikimedia.csv M projectcounts/daily/arwikinews.csv M projectcounts/daily/arwikiquote.csv M projectcounts/daily/arwikisource.csv M projectcounts/daily/arwikiversity.csv M projectcounts/daily/arwiktionary.csv M projectcounts/daily/arzwiki.csv M projectcounts/daily/astwiki.csv M projectcounts/daily/astwikibooks.csv M projectcounts/daily/astwikiquote.csv M projectcounts/daily/astwiktionary.csv M projectcounts/daily/aswiki.csv M projectcounts/daily/aswikibooks.csv M projectcounts/daily/aswikisource.csv M projectcounts/daily/aswiktionary.csv M projectcounts/daily/avwiki.csv M projectcounts/daily/avwiktionary.csv M projectcounts/daily/aywiki.csv M projectcounts/daily/aywikibooks.csv M projectcounts/daily/aywiktionary.csv M projectcounts/daily/azwiki.csv M projectcounts/daily/azwikibooks.csv M projectcounts/daily/azwikiquote.csv M projectcounts/daily/azwikisource.csv M projectcounts/daily/azwiktionary.csv M projectcounts/daily/barwiki.csv M projectcounts/daily/bat_smgwiki.csv M projectcounts/daily/bawiki.csv M projectcounts/daily/bawikibooks.csv M projectcounts/daily/bclwiki.csv M projectcounts/daily/bdwikimedia.csv M projectcounts/daily/be_x_oldwiki.csv M projectcounts/daily/betawikiversity.csv M projectcounts/daily/bewiki.csv M projectcounts/daily/bewikibooks.csv M projectcounts/daily/bewikimedia.csv M projectcounts/daily/bewikiquote.csv M projectcounts/daily/bewikisource.csv M projectcounts/daily/bewiktionary.csv M projectcounts/daily/bgwiki.csv M projectcounts/daily/bgwikibooks.csv M projectcounts/daily/bgwikinews.csv M projectcounts/daily/bgwikiquote.csv M projectcounts/daily/bgwikisource.csv M projectcounts/daily/bgwiktionary.csv M projectcounts/daily/bhwiki.csv M projectcounts/daily/bhwiktionary.csv M projectcounts/daily/biwiki.csv M projectcounts/daily/biwikibooks.csv M projectcounts/daily/biwiktionary.csv M projectcounts/daily/bjnwiki.csv M projectcounts/daily/bmwiki.csv M projectcounts/daily/bmwikibooks.csv M projectcounts/daily/bmwikiquote.csv M projectcounts/daily/bmwiktionary.csv M projectcounts/daily/bnwiki.csv M projectcounts/daily/bnwikibooks.csv M projectcounts/daily/bnwikisource.csv M projectcounts/daily/bnwiktionary.csv M projectcounts/daily/bowiki.csv M projectcounts/daily/bowikibooks.csv M projectcounts/daily/bowiktionary.csv M projectcounts/daily/bpywiki.csv M projectcounts/daily/brwiki.csv M projectcounts/daily/brwikimedia.csv M projectcounts/daily/brwikiquote.csv M projectcounts/daily/brwikisource.csv M projectcounts/daily/brwiktionary.csv M projectcounts/daily/bswiki.csv M projectcounts/daily/bswikibooks.csv M projectcounts/daily/bswikinews.csv M projectcounts/daily/bswikiquote.csv M projectcounts/daily/bswikisource.csv M projectcounts/daily/bswiktionary.csv M projectcounts/daily/bugwiki.csv M projectcounts/daily/bxrwiki.csv M projectcounts/daily/cawiki.csv M projectcounts/daily/cawikibooks.csv M projectcounts/daily/cawikinews.csv M projectcounts/daily/cawikiquote.csv M projectcounts/daily/cawikisource.csv M projectcounts/daily/cawiktionary.csv M projectcounts/daily/cbk_zamwiki.csv M projectcounts/daily/cdowiki.csv M projectcounts/daily/cebwiki.csv M projectcounts/daily/cewiki.csv M projectcounts/daily/chowiki.csv M projectcounts/daily/chrwiki.csv M projectcounts/daily/chrwiktionary.csv M projectcounts/daily/chwiki.csv M projectcounts/daily/chwikibooks.csv M projectcounts/daily/chwiktionary.csv M projectcounts/daily/chywiki.csv M projectcounts/daily/c
[MediaWiki-commits] [Gerrit] Make default settings generic - change (mediawiki...GlobalUserPage)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/173461 Change subject: Make default settings generic .. Make default settings generic * Use https for the central wiki url (bug 70584) Change-Id: I71853a2d686a483dfcc7bfd425071436f7095962 --- M GlobalUserPage.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage refs/changes/61/173461/1 diff --git a/GlobalUserPage.php b/GlobalUserPage.php index bafa0a5..aedc73d 100644 --- a/GlobalUserPage.php +++ b/GlobalUserPage.php @@ -35,7 +35,7 @@ /** * API endpoint of the central wiki */ -$wgGlobalUserPageAPIUrl = 'http://www.shoutwiki.com/w/api.php'; +$wgGlobalUserPageAPIUrl = 'https://example.org/w/api.php'; /** * By default enables global userpage for all users @@ -46,7 +46,7 @@ /** * Database name of the central wiki */ -$wgGlobalUserPageDBname = 'shoutwiki'; +$wgGlobalUserPageDBname = 'examplewiki'; /** * Optionally add a footer message to the @@ -80,7 +80,7 @@ $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'GlobalUserPage', - 'version' => '0.9.1', + 'version' => '0.10.0', 'author' => array( 'Kunal Mehta', 'Jack Phoenix' ), 'url' => 'https://www.mediawiki.org/wiki/Extension:GlobalUserPage', 'descriptionmsg' => 'globaluserpage-desc', -- To view, visit https://gerrit.wikimedia.org/r/173461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71853a2d686a483dfcc7bfd425071436f7095962 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUserPage Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] openstack: folsom -> havana as default version - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173460
Change subject: openstack: folsom -> havana as default version
..
openstack: folsom -> havana as default version
folsom is EOL and we don't use it anywhere afaict
setting default to 'havana' instead
https://wiki.openstack.org/wiki/Releases
Change-Id: I837187027eaa48ec52172ecc45dcf0465dea77a5
---
M modules/openstack/manifests/common.pp
M modules/openstack/manifests/database-server.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/openstack/manifests/neutron/nethost.pp
M modules/openstack/manifests/nova/api.pp
M modules/openstack/manifests/nova/compute.pp
M modules/openstack/manifests/nova/conductor.pp
M modules/openstack/manifests/nova/network.pp
M modules/openstack/manifests/nova/scheduler.pp
M modules/openstack/manifests/nova/volume.pp
M modules/openstack/manifests/openstack-manager.pp
M modules/openstack/manifests/repo.pp
13 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/173460/1
diff --git a/modules/openstack/manifests/common.pp
b/modules/openstack/manifests/common.pp
index f5dcfe6..e175ea1 100644
--- a/modules/openstack/manifests/common.pp
+++ b/modules/openstack/manifests/common.pp
@@ -7,7 +7,7 @@
$instance_status_dns_domain,
$instance_status_wiki_user,
$instance_status_wiki_pass,
-$openstack_version='folsom',
+$openstack_version='havana',
) {
if ! defined(Class['openstack::repo']) {
class { 'openstack::repo': openstack_version => $openstack_version }
diff --git a/modules/openstack/manifests/database-server.pp
b/modules/openstack/manifests/database-server.pp
index 5bc832e..137f4ef 100644
--- a/modules/openstack/manifests/database-server.pp
+++ b/modules/openstack/manifests/database-server.pp
@@ -2,7 +2,7 @@
$novaconfig,
$keystoneconfig,
$glanceconfig,
-$openstack_version='folsom',
+$openstack_version='havana',
) {
$nova_db_name = $novaconfig['db_name']
$nova_db_user = $novaconfig['db_user']
diff --git a/modules/openstack/manifests/glance/service.pp
b/modules/openstack/manifests/glance/service.pp
index 908830c..c91623a 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -1,4 +1,4 @@
-class openstack::glance::service($openstack_version="folsom", $glanceconfig) {
+class openstack::glance::service($openstack_version="havana", $glanceconfig) {
if ! defined(Class["openstack::repo"]) {
class { "openstack::repo": openstack_version => $openstack_version }
}
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index 96fbe93..52721a0 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -1,4 +1,4 @@
-class openstack::keystone::service($openstack_version="folsom",
$keystoneconfig, $glanceconfig) {
+class openstack::keystone::service($openstack_version="havana",
$keystoneconfig, $glanceconfig) {
if ! defined(Class["openstack::repo"]) {
class { "openstack::repo": openstack_version => $openstack_version }
}
diff --git a/modules/openstack/manifests/neutron/nethost.pp
b/modules/openstack/manifests/neutron/nethost.pp
index a2b35f3..49a046c 100644
--- a/modules/openstack/manifests/neutron/nethost.pp
+++ b/modules/openstack/manifests/neutron/nethost.pp
@@ -1,6 +1,6 @@
# Set up neutron on a dedicated network node
class openstack::neutron::nethost(
-$openstack_version='folsom',
+$openstack_version='havana',
$external_interface='eth0',
$neutronconfig,
$data_interface_ip
diff --git a/modules/openstack/manifests/nova/api.pp
b/modules/openstack/manifests/nova/api.pp
index e90abcb..e027a9c 100644
--- a/modules/openstack/manifests/nova/api.pp
+++ b/modules/openstack/manifests/nova/api.pp
@@ -1,4 +1,4 @@
-class openstack::nova::api($openstack_version="folsom", $novaconfig) {
+class openstack::nova::api($openstack_version="havana", $novaconfig) {
if ! defined(Class["openstack::repo"]) {
class { "openstack::repo": openstack_version => $openstack_version }
}
diff --git a/modules/openstack/manifests/nova/compute.pp
b/modules/openstack/manifests/nova/compute.pp
index f097370..e7858d2 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -1,4 +1,4 @@
-class openstack::nova::compute($openstack_version="folsom", $novaconfig) {
+class openstack::nova::compute($openstack_version="havana", $novaconfig) {
if ! defined(Class["openstack::repo"]) {
class { "openstack::repo": openstack_version => $openstack_version }
}
diff --git a/modules/openstack/manifests/nova/conductor.pp
b
[MediaWiki-commits] [Gerrit] Backfill daily projectcounts for 2009 - change (analytics...data)
Mforns has submitted this change and it was merged. Change subject: Backfill daily projectcounts for 2009 .. Backfill daily projectcounts for 2009 Projectcount files for 2009 have been taken from: http://dumps.wikimedia.org/other/pagecounts-ez/projectcounts/projectcounts-2009.tar No mobile or zero data, as the source does not contain them. No data for 2009-10-14 -- 2008-10-16, since projectcount files 20091014-23 -- 20091016-01 are missing. No data for 2009-11-22, since projectcount files 20091122-06 -- 20091122-14 are missing. Bug: 72740 Change-Id: I2e3fd20b99d1b92ee757921cc8bded92da9f0098 --- M projectcounts/daily/aawiki.csv M projectcounts/daily/aawikibooks.csv M projectcounts/daily/aawiktionary.csv M projectcounts/daily/abwiki.csv M projectcounts/daily/abwiktionary.csv M projectcounts/daily/acewiki.csv M projectcounts/daily/advisorywiki.csv M projectcounts/daily/afwiki.csv M projectcounts/daily/afwikibooks.csv M projectcounts/daily/afwikiquote.csv M projectcounts/daily/afwiktionary.csv M projectcounts/daily/akwiki.csv M projectcounts/daily/akwikibooks.csv M projectcounts/daily/akwiktionary.csv M projectcounts/daily/alswiki.csv M projectcounts/daily/alswikibooks.csv M projectcounts/daily/alswikiquote.csv M projectcounts/daily/alswiktionary.csv M projectcounts/daily/amwiki.csv M projectcounts/daily/amwikiquote.csv M projectcounts/daily/amwiktionary.csv M projectcounts/daily/angwiki.csv M projectcounts/daily/angwikibooks.csv M projectcounts/daily/angwikiquote.csv M projectcounts/daily/angwikisource.csv M projectcounts/daily/angwiktionary.csv M projectcounts/daily/anwiki.csv M projectcounts/daily/anwiktionary.csv M projectcounts/daily/arcwiki.csv M projectcounts/daily/arwiki.csv M projectcounts/daily/arwikibooks.csv M projectcounts/daily/arwikimedia.csv M projectcounts/daily/arwikinews.csv M projectcounts/daily/arwikiquote.csv M projectcounts/daily/arwikisource.csv M projectcounts/daily/arwikiversity.csv M projectcounts/daily/arwiktionary.csv M projectcounts/daily/arzwiki.csv M projectcounts/daily/astwiki.csv M projectcounts/daily/astwikibooks.csv M projectcounts/daily/astwikiquote.csv M projectcounts/daily/astwiktionary.csv M projectcounts/daily/aswiki.csv M projectcounts/daily/aswikibooks.csv M projectcounts/daily/aswikisource.csv M projectcounts/daily/aswiktionary.csv M projectcounts/daily/avwiki.csv M projectcounts/daily/avwiktionary.csv M projectcounts/daily/aywiki.csv M projectcounts/daily/aywikibooks.csv M projectcounts/daily/aywiktionary.csv M projectcounts/daily/azwiki.csv M projectcounts/daily/azwikibooks.csv M projectcounts/daily/azwikiquote.csv M projectcounts/daily/azwikisource.csv M projectcounts/daily/azwiktionary.csv M projectcounts/daily/barwiki.csv M projectcounts/daily/bat_smgwiki.csv M projectcounts/daily/bawiki.csv M projectcounts/daily/bawikibooks.csv M projectcounts/daily/bclwiki.csv M projectcounts/daily/bdwikimedia.csv M projectcounts/daily/be_x_oldwiki.csv M projectcounts/daily/betawikiversity.csv M projectcounts/daily/bewiki.csv M projectcounts/daily/bewikibooks.csv M projectcounts/daily/bewikimedia.csv M projectcounts/daily/bewikiquote.csv M projectcounts/daily/bewikisource.csv M projectcounts/daily/bewiktionary.csv M projectcounts/daily/bgwiki.csv M projectcounts/daily/bgwikibooks.csv M projectcounts/daily/bgwikinews.csv M projectcounts/daily/bgwikiquote.csv M projectcounts/daily/bgwikisource.csv M projectcounts/daily/bgwiktionary.csv M projectcounts/daily/bhwiki.csv M projectcounts/daily/bhwiktionary.csv M projectcounts/daily/biwiki.csv M projectcounts/daily/biwikibooks.csv M projectcounts/daily/biwiktionary.csv M projectcounts/daily/bjnwiki.csv M projectcounts/daily/bmwiki.csv M projectcounts/daily/bmwikibooks.csv M projectcounts/daily/bmwikiquote.csv M projectcounts/daily/bmwiktionary.csv M projectcounts/daily/bnwiki.csv M projectcounts/daily/bnwikibooks.csv M projectcounts/daily/bnwikisource.csv M projectcounts/daily/bnwiktionary.csv M projectcounts/daily/bowiki.csv M projectcounts/daily/bowikibooks.csv M projectcounts/daily/bowiktionary.csv M projectcounts/daily/bpywiki.csv M projectcounts/daily/brwiki.csv M projectcounts/daily/brwikimedia.csv M projectcounts/daily/brwikiquote.csv M projectcounts/daily/brwikisource.csv M projectcounts/daily/brwiktionary.csv M projectcounts/daily/bswiki.csv M projectcounts/daily/bswikibooks.csv M projectcounts/daily/bswikinews.csv M projectcounts/daily/bswikiquote.csv M projectcounts/daily/bswikisource.csv M projectcounts/daily/bswiktionary.csv M projectcounts/daily/bugwiki.csv M projectcounts/daily/bxrwiki.csv M projectcounts/daily/cawiki.csv M projectcounts/daily/cawikibooks.csv M projectcounts/daily/cawikinews.csv M projectcounts/daily/cawikiquote.csv M projectcounts/daily/cawikisource.csv M projectcounts/daily/cawiktionary.csv M projectcounts/daily/cbk_zamwiki.csv M projectcounts/daily/cdowiki.csv M projectcounts/daily/cebwiki.csv M projectcou
[MediaWiki-commits] [Gerrit] Backfill daily projectcounts for 2008 - change (analytics...data)
Mforns has submitted this change and it was merged. Change subject: Backfill daily projectcounts for 2008 .. Backfill daily projectcounts for 2008 Projectcount files for 2008 have been taken from: http://dumps.wikimedia.org/other/pagecounts-ez/projectcounts/projectcounts-2008.tar No mobile or zero data, as the source does not contain them. No data for 2008-10-21, and 2008-10-22, since projectcount files 20081021-15 -- 20081022-11 are missing. Data for 2008-03-03, 2008-03-04 is exceptionally low across the board, for unknown reason. Bug: 72740 Change-Id: Ib74c1abe8c486b0c4e770a68f0775331885b2191 --- M projectcounts/daily/aawiki.csv M projectcounts/daily/aawikibooks.csv M projectcounts/daily/aawiktionary.csv M projectcounts/daily/abwiki.csv M projectcounts/daily/abwiktionary.csv M projectcounts/daily/acewiki.csv M projectcounts/daily/advisorywiki.csv M projectcounts/daily/afwiki.csv M projectcounts/daily/afwikibooks.csv M projectcounts/daily/afwikiquote.csv M projectcounts/daily/afwiktionary.csv M projectcounts/daily/akwiki.csv M projectcounts/daily/akwikibooks.csv M projectcounts/daily/akwiktionary.csv M projectcounts/daily/alswiki.csv M projectcounts/daily/alswikibooks.csv M projectcounts/daily/alswikiquote.csv M projectcounts/daily/alswiktionary.csv M projectcounts/daily/amwiki.csv M projectcounts/daily/amwikiquote.csv M projectcounts/daily/amwiktionary.csv M projectcounts/daily/angwiki.csv M projectcounts/daily/angwikibooks.csv M projectcounts/daily/angwikiquote.csv M projectcounts/daily/angwikisource.csv M projectcounts/daily/angwiktionary.csv M projectcounts/daily/anwiki.csv M projectcounts/daily/anwiktionary.csv M projectcounts/daily/arcwiki.csv M projectcounts/daily/arwiki.csv M projectcounts/daily/arwikibooks.csv M projectcounts/daily/arwikimedia.csv M projectcounts/daily/arwikinews.csv M projectcounts/daily/arwikiquote.csv M projectcounts/daily/arwikisource.csv M projectcounts/daily/arwikiversity.csv M projectcounts/daily/arwiktionary.csv M projectcounts/daily/arzwiki.csv M projectcounts/daily/astwiki.csv M projectcounts/daily/astwikibooks.csv M projectcounts/daily/astwikiquote.csv M projectcounts/daily/astwiktionary.csv M projectcounts/daily/aswiki.csv M projectcounts/daily/aswikibooks.csv M projectcounts/daily/aswikisource.csv M projectcounts/daily/aswiktionary.csv M projectcounts/daily/avwiki.csv M projectcounts/daily/avwiktionary.csv M projectcounts/daily/aywiki.csv M projectcounts/daily/aywikibooks.csv M projectcounts/daily/aywiktionary.csv M projectcounts/daily/azwiki.csv M projectcounts/daily/azwikibooks.csv M projectcounts/daily/azwikiquote.csv M projectcounts/daily/azwikisource.csv M projectcounts/daily/azwiktionary.csv M projectcounts/daily/barwiki.csv M projectcounts/daily/bat_smgwiki.csv M projectcounts/daily/bawiki.csv M projectcounts/daily/bawikibooks.csv M projectcounts/daily/bclwiki.csv M projectcounts/daily/bdwikimedia.csv M projectcounts/daily/be_x_oldwiki.csv M projectcounts/daily/betawikiversity.csv M projectcounts/daily/bewiki.csv M projectcounts/daily/bewikibooks.csv M projectcounts/daily/bewikimedia.csv M projectcounts/daily/bewikiquote.csv M projectcounts/daily/bewikisource.csv M projectcounts/daily/bewiktionary.csv M projectcounts/daily/bgwiki.csv M projectcounts/daily/bgwikibooks.csv M projectcounts/daily/bgwikinews.csv M projectcounts/daily/bgwikiquote.csv M projectcounts/daily/bgwikisource.csv M projectcounts/daily/bgwiktionary.csv M projectcounts/daily/bhwiki.csv M projectcounts/daily/bhwiktionary.csv M projectcounts/daily/biwiki.csv M projectcounts/daily/biwikibooks.csv M projectcounts/daily/biwiktionary.csv M projectcounts/daily/bjnwiki.csv M projectcounts/daily/bmwiki.csv M projectcounts/daily/bmwikibooks.csv M projectcounts/daily/bmwikiquote.csv M projectcounts/daily/bmwiktionary.csv M projectcounts/daily/bnwiki.csv M projectcounts/daily/bnwikibooks.csv M projectcounts/daily/bnwikisource.csv M projectcounts/daily/bnwiktionary.csv M projectcounts/daily/bowiki.csv M projectcounts/daily/bowikibooks.csv M projectcounts/daily/bowiktionary.csv M projectcounts/daily/bpywiki.csv M projectcounts/daily/brwiki.csv M projectcounts/daily/brwikimedia.csv M projectcounts/daily/brwikiquote.csv M projectcounts/daily/brwikisource.csv M projectcounts/daily/brwiktionary.csv M projectcounts/daily/bswiki.csv M projectcounts/daily/bswikibooks.csv M projectcounts/daily/bswikinews.csv M projectcounts/daily/bswikiquote.csv M projectcounts/daily/bswikisource.csv M projectcounts/daily/bswiktionary.csv M projectcounts/daily/bugwiki.csv M projectcounts/daily/bxrwiki.csv M projectcounts/daily/cawiki.csv M projectcounts/daily/cawikibooks.csv M projectcounts/daily/cawikinews.csv M projectcounts/daily/cawikiquote.csv M projectcounts/daily/cawikisource.csv M projectcounts/daily/cawiktionary.csv M projectcounts/daily/cbk_zamwiki.csv M projectcounts/daily/cdowiki.csv M projectcounts/daily/cebwiki.csv M projectcounts/
[MediaWiki-commits] [Gerrit] Backfill daily projectcounts for 2011 - change (analytics...data)
Mforns has submitted this change and it was merged. Change subject: Backfill daily projectcounts for 2011 .. Backfill daily projectcounts for 2011 Projectcount files for 2011 have been taken from: http://dumps.wikimedia.org/other/pagecounts-ez/projectcounts/projectcounts-2011.tar No mobile or zero data, as the source does not contain them. No data for 2011-01-04, since projectcount files 20110104-07 -- 20110104-12 are missing. No data for 2011-06-14, since projectcount files 20110614-19 -- 20110614-20 are missing. Data for 2011-12-23 -- 2011-12-25 is exceptionally low across the board, for unknown reason. Bug: 72740 Change-Id: If089f7e1e4d724bd4fefeec6efed7c89e5257836 --- M projectcounts/daily/aawiki.csv M projectcounts/daily/aawikibooks.csv M projectcounts/daily/aawiktionary.csv M projectcounts/daily/abwiki.csv M projectcounts/daily/abwiktionary.csv M projectcounts/daily/acewiki.csv M projectcounts/daily/advisorywiki.csv M projectcounts/daily/afwiki.csv M projectcounts/daily/afwikibooks.csv M projectcounts/daily/afwikiquote.csv M projectcounts/daily/afwiktionary.csv M projectcounts/daily/akwiki.csv M projectcounts/daily/akwikibooks.csv M projectcounts/daily/akwiktionary.csv M projectcounts/daily/alswiki.csv M projectcounts/daily/alswikibooks.csv M projectcounts/daily/alswikiquote.csv M projectcounts/daily/alswiktionary.csv M projectcounts/daily/amwiki.csv M projectcounts/daily/amwikiquote.csv M projectcounts/daily/amwiktionary.csv M projectcounts/daily/angwiki.csv M projectcounts/daily/angwikibooks.csv M projectcounts/daily/angwikiquote.csv M projectcounts/daily/angwikisource.csv M projectcounts/daily/angwiktionary.csv M projectcounts/daily/anwiki.csv M projectcounts/daily/anwiktionary.csv M projectcounts/daily/arcwiki.csv M projectcounts/daily/arwiki.csv M projectcounts/daily/arwikibooks.csv M projectcounts/daily/arwikimedia.csv M projectcounts/daily/arwikinews.csv M projectcounts/daily/arwikiquote.csv M projectcounts/daily/arwikisource.csv M projectcounts/daily/arwikiversity.csv M projectcounts/daily/arwiktionary.csv M projectcounts/daily/arzwiki.csv M projectcounts/daily/astwiki.csv M projectcounts/daily/astwikibooks.csv M projectcounts/daily/astwikiquote.csv M projectcounts/daily/astwiktionary.csv M projectcounts/daily/aswiki.csv M projectcounts/daily/aswikibooks.csv M projectcounts/daily/aswikisource.csv M projectcounts/daily/aswiktionary.csv M projectcounts/daily/avwiki.csv M projectcounts/daily/avwiktionary.csv M projectcounts/daily/aywiki.csv M projectcounts/daily/aywikibooks.csv M projectcounts/daily/aywiktionary.csv M projectcounts/daily/azwiki.csv M projectcounts/daily/azwikibooks.csv M projectcounts/daily/azwikiquote.csv M projectcounts/daily/azwikisource.csv M projectcounts/daily/azwiktionary.csv M projectcounts/daily/barwiki.csv M projectcounts/daily/bat_smgwiki.csv M projectcounts/daily/bawiki.csv M projectcounts/daily/bawikibooks.csv M projectcounts/daily/bclwiki.csv M projectcounts/daily/bdwikimedia.csv M projectcounts/daily/be_x_oldwiki.csv M projectcounts/daily/betawikiversity.csv M projectcounts/daily/bewiki.csv M projectcounts/daily/bewikibooks.csv M projectcounts/daily/bewikimedia.csv M projectcounts/daily/bewikiquote.csv M projectcounts/daily/bewikisource.csv M projectcounts/daily/bewiktionary.csv M projectcounts/daily/bgwiki.csv M projectcounts/daily/bgwikibooks.csv M projectcounts/daily/bgwikinews.csv M projectcounts/daily/bgwikiquote.csv M projectcounts/daily/bgwikisource.csv M projectcounts/daily/bgwiktionary.csv M projectcounts/daily/bhwiki.csv M projectcounts/daily/bhwiktionary.csv M projectcounts/daily/biwiki.csv M projectcounts/daily/biwikibooks.csv M projectcounts/daily/biwiktionary.csv M projectcounts/daily/bjnwiki.csv M projectcounts/daily/bmwiki.csv M projectcounts/daily/bmwikibooks.csv M projectcounts/daily/bmwikiquote.csv M projectcounts/daily/bmwiktionary.csv M projectcounts/daily/bnwiki.csv M projectcounts/daily/bnwikibooks.csv M projectcounts/daily/bnwikisource.csv M projectcounts/daily/bnwiktionary.csv M projectcounts/daily/bowiki.csv M projectcounts/daily/bowikibooks.csv M projectcounts/daily/bowiktionary.csv M projectcounts/daily/bpywiki.csv M projectcounts/daily/brwiki.csv M projectcounts/daily/brwikimedia.csv M projectcounts/daily/brwikiquote.csv M projectcounts/daily/brwikisource.csv M projectcounts/daily/brwiktionary.csv M projectcounts/daily/bswiki.csv M projectcounts/daily/bswikibooks.csv M projectcounts/daily/bswikinews.csv M projectcounts/daily/bswikiquote.csv M projectcounts/daily/bswikisource.csv M projectcounts/daily/bswiktionary.csv M projectcounts/daily/bugwiki.csv M projectcounts/daily/bxrwiki.csv M projectcounts/daily/cawiki.csv M projectcounts/daily/cawikibooks.csv M projectcounts/daily/cawikinews.csv M projectcounts/daily/cawikiquote.csv M projectcounts/daily/cawikisource.csv M projectcounts/daily/cawiktionary.csv M projectcounts/daily/cbk_zamwiki.csv
[MediaWiki-commits] [Gerrit] Backfill daily projectcounts for 2010 - change (analytics...data)
Mforns has submitted this change and it was merged. Change subject: Backfill daily projectcounts for 2010 .. Backfill daily projectcounts for 2010 Projectcount files for 2010 have been taken from: http://dumps.wikimedia.org/other/pagecounts-ez/projectcounts/projectcounts-2010.tar No mobile or zero data, as the source does not contain them. No data for 2010-01-23, and 2010-01-24, since projectcount files 20100123-02 -- 20100124-23 are missing. No data for 2010-02-08, since projectcount files 20100208-13 -- 20100208-16 are missing. No data for 2010-02-26, since projectcount files 20100226-11 is missing. No data for 2010-06-27, and 2010-06-28 since projectcount files 20100627-09 -- 20100628-07 are missing. No data for 2010-07-05 since projectcount files 20100705-01 -- 20100705-14 are missing. No data for 2010-07-07 -- 2010-07-10 since projectcount files 20100707-10 -- 20100710-06 are missing. Data for 2010-06-11 -- 2010-06-17 is exceptionally low across the board, for unknown reason. Bug: 72740 Change-Id: I8fa8949150d9292b03a30861b4de08853f564596 --- M projectcounts/daily/aawiki.csv M projectcounts/daily/aawikibooks.csv M projectcounts/daily/aawiktionary.csv M projectcounts/daily/abwiki.csv M projectcounts/daily/abwiktionary.csv M projectcounts/daily/acewiki.csv M projectcounts/daily/advisorywiki.csv M projectcounts/daily/afwiki.csv M projectcounts/daily/afwikibooks.csv M projectcounts/daily/afwikiquote.csv M projectcounts/daily/afwiktionary.csv M projectcounts/daily/akwiki.csv M projectcounts/daily/akwikibooks.csv M projectcounts/daily/akwiktionary.csv M projectcounts/daily/alswiki.csv M projectcounts/daily/alswikibooks.csv M projectcounts/daily/alswikiquote.csv M projectcounts/daily/alswiktionary.csv M projectcounts/daily/amwiki.csv M projectcounts/daily/amwikiquote.csv M projectcounts/daily/amwiktionary.csv M projectcounts/daily/angwiki.csv M projectcounts/daily/angwikibooks.csv M projectcounts/daily/angwikiquote.csv M projectcounts/daily/angwikisource.csv M projectcounts/daily/angwiktionary.csv M projectcounts/daily/anwiki.csv M projectcounts/daily/anwiktionary.csv M projectcounts/daily/arcwiki.csv M projectcounts/daily/arwiki.csv M projectcounts/daily/arwikibooks.csv M projectcounts/daily/arwikimedia.csv M projectcounts/daily/arwikinews.csv M projectcounts/daily/arwikiquote.csv M projectcounts/daily/arwikisource.csv M projectcounts/daily/arwikiversity.csv M projectcounts/daily/arwiktionary.csv M projectcounts/daily/arzwiki.csv M projectcounts/daily/astwiki.csv M projectcounts/daily/astwikibooks.csv M projectcounts/daily/astwikiquote.csv M projectcounts/daily/astwiktionary.csv M projectcounts/daily/aswiki.csv M projectcounts/daily/aswikibooks.csv M projectcounts/daily/aswikisource.csv M projectcounts/daily/aswiktionary.csv M projectcounts/daily/avwiki.csv M projectcounts/daily/avwiktionary.csv M projectcounts/daily/aywiki.csv M projectcounts/daily/aywikibooks.csv M projectcounts/daily/aywiktionary.csv M projectcounts/daily/azwiki.csv M projectcounts/daily/azwikibooks.csv M projectcounts/daily/azwikiquote.csv M projectcounts/daily/azwikisource.csv M projectcounts/daily/azwiktionary.csv M projectcounts/daily/barwiki.csv M projectcounts/daily/bat_smgwiki.csv M projectcounts/daily/bawiki.csv M projectcounts/daily/bawikibooks.csv M projectcounts/daily/bclwiki.csv M projectcounts/daily/bdwikimedia.csv M projectcounts/daily/be_x_oldwiki.csv M projectcounts/daily/betawikiversity.csv M projectcounts/daily/bewiki.csv M projectcounts/daily/bewikibooks.csv M projectcounts/daily/bewikimedia.csv M projectcounts/daily/bewikiquote.csv M projectcounts/daily/bewikisource.csv M projectcounts/daily/bewiktionary.csv M projectcounts/daily/bgwiki.csv M projectcounts/daily/bgwikibooks.csv M projectcounts/daily/bgwikinews.csv M projectcounts/daily/bgwikiquote.csv M projectcounts/daily/bgwikisource.csv M projectcounts/daily/bgwiktionary.csv M projectcounts/daily/bhwiki.csv M projectcounts/daily/bhwiktionary.csv M projectcounts/daily/biwiki.csv M projectcounts/daily/biwikibooks.csv M projectcounts/daily/biwiktionary.csv M projectcounts/daily/bjnwiki.csv M projectcounts/daily/bmwiki.csv M projectcounts/daily/bmwikibooks.csv M projectcounts/daily/bmwikiquote.csv M projectcounts/daily/bmwiktionary.csv M projectcounts/daily/bnwiki.csv M projectcounts/daily/bnwikibooks.csv M projectcounts/daily/bnwikisource.csv M projectcounts/daily/bnwiktionary.csv M projectcounts/daily/bowiki.csv M projectcounts/daily/bowikibooks.csv M projectcounts/daily/bowiktionary.csv M projectcounts/daily/bpywiki.csv M projectcounts/daily/brwiki.csv M projectcounts/daily/brwikimedia.csv M projectcounts/daily/brwikiquote.csv M projectcounts/daily/brwikisource.csv M projectcounts/daily/brwiktionary.csv M projectcounts/daily/bswiki.csv M projectcounts/daily/bswikibooks.csv M projectcounts/daily/bswikinews.csv M projectcounts/daily/bswikiquo
[MediaWiki-commits] [Gerrit] generateLocalAutoload.php: Abort for web requests - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: generateLocalAutoload.php: Abort for web requests .. generateLocalAutoload.php: Abort for web requests The Maintenance class already does this, though this script does not use it for the obvious reason that when there is a missing or incorrect autoloader entry, it may not be possible to initialize MediaWiki. Hence it is necessary to do that explicitly in this script. Overwriting autoload.php potentially could disrupt the operation of a production wiki (the file is truncated when it is opened). Change-Id: I05d5d4b7c30c4643e71ca5819783627688e15da7 --- M maintenance/generateLocalAutoload.php 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/generateLocalAutoload.php b/maintenance/generateLocalAutoload.php index 78e66b7..5e4cac6 100644 --- a/maintenance/generateLocalAutoload.php +++ b/maintenance/generateLocalAutoload.php @@ -1,5 +1,9 @@ https://gerrit.wikimedia.org/r/173453 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05d5d4b7c30c4643e71ca5819783627688e15da7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PleaseStand Gerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Chad Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Parent5446 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] AutoloadGenerator: Add newline at end of output file - change (mediawiki/core)
PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173458
Change subject: AutoloadGenerator: Add newline at end of output file
..
AutoloadGenerator: Add newline at end of output file
Change-Id: I2b5a1adc115afd9430c1ea91285516c9c4290875
---
M includes/utils/AutoloadGenerator.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/173458/1
diff --git a/includes/utils/AutoloadGenerator.php
b/includes/utils/AutoloadGenerator.php
index ee2c77a..7cf05bc 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -159,6 +159,7 @@
\${$this->variableName} = array(
{$output}
);
+
EOD
);
}
--
To view, visit https://gerrit.wikimedia.org/r/173458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b5a1adc115afd9430c1ea91285516c9c4290875
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correctly display MathML fallback images. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Correctly display MathML fallback images.
..
Correctly display MathML fallback images.
Also update inverting of colors in Night mode for math images.
Also fix possible bug (unrelated) when collapsing tables. On some devices
(i.e. mine) the "element.children === null" check doesn't work.
Change-Id: I3e10a9a5955e9ab7de5710f51456db79c4b25288
---
M wikipedia/assets/bundle.js
M wikipedia/assets/night.css
M wikipedia/assets/preview.css
M wikipedia/assets/preview.js
M wikipedia/assets/styles.css
M www/js/night.js
M www/js/transforms.js
7 files changed, 92 insertions(+), 10 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 966a3f9..da4f26a 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -367,11 +367,25 @@
}
function invertElement( el ) {
+// first, invert the colors of tables and other elements
var allElements = el.querySelectorAll( '*[style]' );
- console.log( 'rewriting ' + allElements.length + ' elements' );
for ( var i = 0; i < allElements.length; i++ ) {
invertOneElement( allElements[i] );
}
+// and now, look for Math formula images, and invert them
+var mathImgs = el.querySelectorAll( "[class*='math-fallback']" );
+for ( i = 0; i < mathImgs.length; i++ ) {
+var mathImg = mathImgs[i];
+// KitKat and higher can use webkit to invert colors
+if (window.apiLevel >= 19) {
+mathImg.style.cssText = mathImg.style.cssText + ";-webkit-filter:
invert(100%);";
+} else {
+// otherwise, just give it a mild background color
+mathImg.style.backgroundColor = "#ccc";
+// and give it a little padding, since the text is right up
against the edge.
+mathImg.style.padding = "2px";
+}
+}
}
function toggle( nightCSSURL, hasPageLoaded ) {
@@ -683,7 +697,7 @@
*/
function getTableHeader( element ) {
var thArray = [];
-if (element.children === null) {
+if (element.children === undefined || element.children === null) {
return thArray;
}
for (var i = 0; i < element.children.length; i++) {
diff --git a/wikipedia/assets/night.css b/wikipedia/assets/night.css
index 0e99175..6cd5669 100644
--- a/wikipedia/assets/night.css
+++ b/wikipedia/assets/night.css
@@ -14,10 +14,6 @@
img {
background: #fff;
}
-img.mwe-math-fallback-png-inline {
- background: none;
- -webkit-filter: invert(100%);
-}
.content table td,
.content table th {
background-color: #000;
diff --git a/wikipedia/assets/preview.css b/wikipedia/assets/preview.css
index 3f514f3..222ac73 100644
--- a/wikipedia/assets/preview.css
+++ b/wikipedia/assets/preview.css
@@ -1061,4 +1061,26 @@
-moz-column-count: 1 !important;
-webkit-column-count: 1 !important;
column-count: 1 !important;
-}
\ No newline at end of file
+}
+.mwe-math-fallback-image-inline {
+ display: inline-block;
+ max-width: 100%;
+ vertical-align: middle;
+}
+.mwe-math-fallback-image-display {
+ display: block;
+ max-width: 100%;
+ margin-left: auto !important;
+ margin-right: auto !important;
+}
+.mwe-math-fallback-source-inline {
+ display: inline;
+ max-width: 100%;
+ vertical-align: middle;
+}
+.mwe-math-fallback-source-display {
+ display: block;
+ max-width: 100%;
+ margin-left: auto;
+ margin-right: auto;
+}
diff --git a/wikipedia/assets/preview.js b/wikipedia/assets/preview.js
index fd175a6..764411c 100644
--- a/wikipedia/assets/preview.js
+++ b/wikipedia/assets/preview.js
@@ -233,11 +233,25 @@
}
function invertElement( el ) {
+// first, invert the colors of tables and other elements
var allElements = el.querySelectorAll( '*[style]' );
- console.log( 'rewriting ' + allElements.length + ' elements' );
for ( var i = 0; i < allElements.length; i++ ) {
invertOneElement( allElements[i] );
}
+// and now, look for Math formula images, and invert them
+var mathImgs = el.querySelectorAll( "[class*='math-fallback']" );
+for ( i = 0; i < mathImgs.length; i++ ) {
+var mathImg = mathImgs[i];
+// KitKat and higher can use webkit to invert colors
+if (window.apiLevel >= 19) {
+mathImg.style.cssText = mathImg.style.cssText + ";-webkit-filter:
invert(100%);";
+} else {
+// otherwise, just give it a mild background color
+mathImg.style.backgroundColor = "#ccc";
+// and give it a little padding, since the text is right up
against the edge.
+mathImg.style.padding = "2px";
+}
+}
}
function toggle( nightCSSURL, hasPageLoaded ) {
diff --git a/wikipedia/assets/styles.css b/wikipedia/assets/styles.css
index aa88a93..aed0fad 100644
--- a/wikipedia/
[MediaWiki-commits] [Gerrit] Add conversion infrastructure with LQT API source. - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Add conversion infrastructure with LQT API source. .. Add conversion infrastructure with LQT API source. Modular design means we can read from the DB, an XML dump, a talk page or any other potential source of historical Flow posts if we want to. Supports history and headers. Bug: 45088 Change-Id: If41b45908542bf68521c0b31388ca6d33fd818f0 --- M autoload.php M container.php A includes/Import/ImportSource.php A includes/Import/ImportSourceStore.php A includes/Import/Importer.php A includes/Import/LiquidThreadsApi/CachedData.php A includes/Import/LiquidThreadsApi/Iterators.php A includes/Import/LiquidThreadsApi/Objects.php A includes/Import/LiquidThreadsApi/Source.php M includes/Parsoid/Utils.php A maintenance/MaintenanceDebugLogger.php A maintenance/convertLqt.php M scripts/gen-autoload.php A tests/phpunit/Import/HistoricalUIDGeneratorTest.php A tests/phpunit/Import/PageImportStateTest.php A tests/phpunit/Import/TalkpageImportOperationTest.php A tests/phpunit/Mock/MockImportHeader.php A tests/phpunit/Mock/MockImportPost.php A tests/phpunit/Mock/MockImportRevision.php A tests/phpunit/Mock/MockImportSource.php A tests/phpunit/Mock/MockImportSummary.php A tests/phpunit/Mock/MockImportTopic.php 22 files changed, 2,570 insertions(+), 1 deletion(-) Approvals: EBernhardson: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/autoload.php b/autoload.php index 886949e..709f2c3 100644 --- a/autoload.php +++ b/autoload.php @@ -160,6 +160,39 @@ $wgAutoloadClasses['Flow\\Formatter\\TopicListFormatter'] = __DIR__ . '/includes/Formatter/TopicListFormatter.php'; $wgAutoloadClasses['Flow\\Formatter\\TopicListQuery'] = __DIR__ . '/includes/Formatter/TopicListQuery.php'; $wgAutoloadClasses['Flow\\Formatter\\TopicRow'] = __DIR__ . '/includes/Formatter/TopicRow.php'; +$wgAutoloadClasses['Flow\\Import\\FileImportSourceStore'] = __DIR__ . '/includes/Import/ImportSourceStore.php'; +$wgAutoloadClasses['Flow\\Import\\HistoricalUIDGenerator'] = __DIR__ . '/includes/Import/Importer.php'; +$wgAutoloadClasses['Flow\\Import\\IImportHeader'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\IImportObject'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\IImportPost'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\IImportSource'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\IImportSummary'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\IImportTopic'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\IObjectRevision'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\IRevisionableObject'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\ImportException'] = __DIR__ . '/includes/Import/ImportSource.php'; +$wgAutoloadClasses['Flow\\Import\\ImportSourceStore'] = __DIR__ . '/includes/Import/ImportSourceStore.php'; +$wgAutoloadClasses['Flow\\Import\\Importer'] = __DIR__ . '/includes/Import/Importer.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ApiBackend'] = __DIR__ . '/includes/Import/LiquidThreadsApi/Source.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ApiNotFoundException'] = __DIR__ . '/includes/Import/LiquidThreadsApi/Source.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\CachedApiData'] = __DIR__ . '/includes/Import/LiquidThreadsApi/CachedData.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\CachedData'] = __DIR__ . '/includes/Import/LiquidThreadsApi/CachedData.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\CachedPageData'] = __DIR__ . '/includes/Import/LiquidThreadsApi/CachedData.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\CachedThreadData'] = __DIR__ . '/includes/Import/LiquidThreadsApi/CachedData.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ImportHeader'] = __DIR__ . '/includes/Import/LiquidThreadsApi/Objects.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ImportPost'] = __DIR__ . '/includes/Import/LiquidThreadsApi/Objects.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ImportRevision'] = __DIR__ . '/includes/Import/LiquidThreadsApi/Objects.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ImportSource'] = __DIR__ . '/includes/Import/LiquidThreadsApi/Source.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ImportSummary'] = __DIR__ . '/includes/Import/LiquidThreadsApi/Objects.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ImportTopic'] = __DIR__ . '/includes/Import/LiquidThreadsApi/Objects.php'; +$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\PageRevisionedObject'] = __DIR__ . '/includes/Import/LiquidThreadsApi/O
[MediaWiki-commits] [Gerrit] Run php-composer-validate test for all extensions - change (integration/config)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173457
Change subject: Run php-composer-validate test for all extensions
..
Run php-composer-validate test for all extensions
Bug: 73444
Change-Id: I6cfbd4dfd29b9a00465ec1a742e57d3abfcf3b0f
---
M jjb/php.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/57/173457/1
diff --git a/jjb/php.yaml b/jjb/php.yaml
index d15c038..e28b590 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -20,6 +20,6 @@
- zuul
builders:
- shell: |
- /srv/deployment/integration/composer/vendor/bin/composer --ansi
validate
+ if test -f "composer.json"; then
/srv/deployment/integration/composer/vendor/bin/composer --ansi validate;fi
logrotate:
daysToKeep: 15
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 615ab65..ba664ac 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1720,17 +1720,20 @@
check:
- 'mwext-{name}-jslint'
- 'mwext-{name}-lint'
+ - 'php-composer-validate'
test:
- 'mwext-{name}-jslint'
- 'mwext-{name}-lint':
# Extensions tests with core+vendor
- 'mwext-{name}-testextension'
+ - 'php-composer-validate'
gate-and-submit:
- mediawiki-gate
- 'mwext-{name}-jslint'
- 'mwext-{name}-lint':
# Extensions tests with core+vendor
- 'mwext-{name}-testextension'
+ - 'php-composer-validate'
experimental:
- mediawiki-core-extensions-integration
--
To view, visit https://gerrit.wikimedia.org/r/173457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cfbd4dfd29b9a00465ec1a742e57d3abfcf3b0f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.skinning: Provide SVG version of the "magnify clip... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.skinning: Provide SVG version of the "magnify clip"
icon
..
mediawiki.skinning: Provide SVG version of the "magnify clip" icon
PNGs re-generated from the SVG.
Bug: 69705
Change-Id: Ica2e82598f545764a734399462231fe3c4ea7005
---
M resources/src/mediawiki.skinning/content.css
M resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
A resources/src/mediawiki.skinning/images/magnify-clip-ltr.svg
M resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
A resources/src/mediawiki.skinning/images/magnify-clip-rtl.svg
5 files changed, 30 insertions(+), 3 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.skinning/content.css
b/resources/src/mediawiki.skinning/content.css
index 7a41708..51cb8d0 100644
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -165,8 +165,13 @@
width: 15px;
height: 11px;
/* Default styles when there's no .mw-content-ltr or .mw-content-rtl,
overridden below */
+
+ /* Use same SVG support hack as mediawiki.legacy's shared.css */
+ background-image: url(images/magnify-clip-ltr.png);
/* @embed */
- background: url(images/magnify-clip-ltr.png) center center no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/magnify-clip-ltr.svg);
+ /* @embed */
+ background-image: linear-gradient(transparent, transparent),
url(images/magnify-clip-ltr.svg);
/* Don't annoy people who copy-paste everything too much */
-moz-user-select: none;
-webkit-user-select: none;
@@ -194,8 +199,12 @@
/* @noflip */
.mw-content-ltr div.magnify a {
- /* @embed */
+ /* Use same SVG support hack as mediawiki.legacy's shared.css */
background-image: url(images/magnify-clip-ltr.png);
+ /* @embed */
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/magnify-clip-ltr.svg);
+ /* @embed */
+ background-image: linear-gradient(transparent, transparent),
url(images/magnify-clip-ltr.svg);
}
/* @noflip */
@@ -212,8 +221,12 @@
/* @noflip */
.mw-content-rtl div.magnify a {
- /* @embed */
+ /* Use same SVG support hack as mediawiki.legacy's shared.css */
background-image: url(images/magnify-clip-rtl.png);
+ /* @embed */
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(images/magnify-clip-rtl.svg);
+ /* @embed */
+ background-image: linear-gradient(transparent, transparent),
url(images/magnify-clip-rtl.svg);
}
/* @noflip */
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
index 00a9cee..712b1b4 100644
--- a/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-ltr.svg
b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.svg
new file mode 100644
index 000..4d3dcb6
--- /dev/null
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-ltr.svg
@@ -0,0 +1,7 @@
+
+http://www.w3.org/2000/svg"; viewBox="0 0 11 15" width="15"
height="11">
+
+
+
+
+
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
index ff85c07..1d03a8c 100644
--- a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.png
Binary files differ
diff --git a/resources/src/mediawiki.skinning/images/magnify-clip-rtl.svg
b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.svg
new file mode 100644
index 000..582e4ae
--- /dev/null
+++ b/resources/src/mediawiki.skinning/images/magnify-clip-rtl.svg
@@ -0,0 +1,7 @@
+
+http://www.w3.org/2000/svg"; viewBox="0 0 11 15" width="15"
height="11">
+
+
+
+
+
--
To view, visit https://gerrit.wikimedia.org/r/172214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica2e82598f545764a734399462231fe3c4ea7005
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Waldir
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lvs config: remove pmtpa - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173456
Change subject: lvs config: remove pmtpa
..
lvs config: remove pmtpa
just killin all the pmtpa stuff,
but do we have eqiad equivalents to add
for all the labs stuff?
Change-Id: I8f1789887fe8aef1196be7d301e6f40be548b603
---
M modules/lvs/manifests/configuration.pp
1 file changed, 0 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/173456/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index acf73d8..3718c08 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -12,7 +12,6 @@
default => undef,
},
'labs' => $::site ? {
-'pmtpa' => [ "i-0051" ],
default => undef,
},
default => undef,
@@ -26,7 +25,6 @@
default => undef,
},
'labs' => $::site ? {
-'pmtpa' => [ "i-0051" ],
default => undef,
},
default => undef,
@@ -41,7 +39,6 @@
default => undef,
},
'labs' => $::site ? {
-'pmtpa' => [ "i-0051" ],
default => undef,
},
default => undef,
@@ -54,7 +51,6 @@
default => undef,
},
'labs' => $::site ? {
-'pmtpa' => [ "i-0051" ],
default => undef,
},
default => undef,
@@ -244,29 +240,20 @@
},
'labs' => {
'text' => {
-'pmtpa' => "10.4.0.4",
},
'apaches' => {
-'pmtpa' => "10.4.0.254",
},
'hhvm_appservers' => {
-'pmtpa' => "10.4.0.254",
},
'hhvm_apaches' => {
-# left empty as probably not used anymore
},
'rendering' => {
-# Used to be 10.4.0.252
-'pmtpa' => [ '10.4.0.166', '10.4.0.187', ],
},
'api' => {
-'pmtpa' => "10.4.0.253",
},
'hhvm_api' => {
-'pmtpa' => "10.4.0.254",
},
'bits' => {
-'pmtpa' => "10.4.0.252",
},
'search_pool1' => {},
'search_pool2' => {},
@@ -292,10 +279,6 @@
'eqiad' => '10.68.16.189', # deployment-upload.eqiad.wmflabs
},
'upload' => {
-'pmtpa' => {
-'uploadlb' => [ '10.4.0.166', '10.4.0.187', ],
-'uploadsvc' => [ '10.4.0.166', '10.4.0.187', ],
-},
},
'parsoid' => {},
'parsoidcache' => {},
--
To view, visit https://gerrit.wikimedia.org/r/173456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f1789887fe8aef1196be7d301e6f40be548b603
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug: Fails signature detection with extra long signature - change (mediawiki...Echo)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173455
Change subject: Bug: Fails signature detection with extra long signature
..
Bug: Fails signature detection with extra long signature
Bug: 73426
Change-Id: Ic51c2bc2a08600f188db13a9a0537f1321c9a655
---
M includes/DiscussionParser.php
M tests/phpunit/includes/DiscussionParserTest.php
2 files changed, 21 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/55/173455/1
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 99a610e..1364465 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -161,6 +161,7 @@
foreach ( $links[NS_USER] as $dbk => $page_id ) {
$user = User::newFromName( $dbk );
+
// we should not add user to 'mention' notification
list if
// 1. the user name is not valid
// 2. the user mentions themselves
@@ -680,7 +681,7 @@
$potentialContext = substr( $line, 0, $timestampPos );
// only look at the 300 chars preceding the timestamp
$startCheckAt = max( 0, $timestampPos - 300 );
- $context = substr( $potentialContext, -$startCheckAt );
+ $context = $potentialContext; //substr( $potentialContext,
$startCheckAt );
if ( !preg_match_all( $regex, $context, $matches,
PREG_SET_ORDER ) ) {
return false;
diff --git a/tests/phpunit/includes/DiscussionParserTest.php
b/tests/phpunit/includes/DiscussionParserTest.php
index 7b0a611..2a49861 100644
--- a/tests/phpunit/includes/DiscussionParserTest.php
+++ b/tests/phpunit/includes/DiscussionParserTest.php
@@ -60,6 +60,7 @@
* FIXME some of the app logic is in the test...
*/
public function testSigningDetection( $line, $expectedUser ) {
+ $this->setMwGlobals( 'wgLanguageCode', 'pt' );
if ( !EchoDiscussionParser::isSignedComment( $line ) ) {
$this->assertEquals( $expectedUser, false );
return;
@@ -131,7 +132,7 @@
array(
"Beep boop [[User:I_Heart_Spaces]]
([[User_talk:I_Heart_Spaces]]) $ts",
array(
- 10,
+ strlen( "Beep boop " ),
'I Heart Spaces'
),
),
@@ -139,10 +140,26 @@
array(
"Shake n Bake --[[User:Werdna|wer]dna]] $ts",
array(
- 15,
+ strlen( "Shake n Bake --" ),
'Werdna',
),
),
+
+ array(
+ "ã?
[[User:Jam]] $ts",
+ array(
+ strlen(
"ã? " ),
+ "Jam"
+ ),
+ ),
+ // extra long signature
+ array(
+ "{{U|He7d3r}},
ã? [[User:Reverta-me|Paulo Eduardo]]''
[[User Talk:Reverta-me|Discussão]]'' $ts",
+ array(
+ strlen( "{{U|He7d3r}},
ã? " ),
+ 'Reverta-me',
+ ),
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/173455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic51c2bc2a08600f188db13a9a0537f1321c9a655
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sort list of CSVs before iterating over them for projectcoun... - change (analytics/aggregator)
jenkins-bot has submitted this change and it was merged.
Change subject: Sort list of CSVs before iterating over them for projectcount
aggregation
..
Sort list of CSVs before iterating over them for projectcount aggregation
Having the list of CSVs sorted gives a better feeling of how much work
is still to be done for a given day in verbose mode, which prints the
CSV names.
Change-Id: Ieaffc02e79aa60f13c8af5933bb4286091d7be77
---
M aggregator/projectcounts.py
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Mforns: Looks good to me, approved
jenkins-bot: Verified
diff --git a/aggregator/projectcounts.py b/aggregator/projectcounts.py
index 76b0b3c..230b2ec 100644
--- a/aggregator/projectcounts.py
+++ b/aggregator/projectcounts.py
@@ -145,7 +145,8 @@
:param force_recomputation: If True, recompute data for the given days,
even if it is already in the CSV. (Default: False)
"""
-for csv_file_abs in glob.glob(os.path.join(target_dir_abs, '*.csv')):
+for csv_file_abs in sorted(glob.glob(os.path.join(
+target_dir_abs, '*.csv'))):
logging.info("Updating csv '%s'" % (csv_file_abs))
csv_data = {}
--
To view, visit https://gerrit.wikimedia.org/r/173257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaffc02e79aa60f13c8af5933bb4286091d7be77
Gerrit-PatchSet: 1
Gerrit-Project: analytics/aggregator
Gerrit-Branch: master
Gerrit-Owner: QChris
Gerrit-Reviewer: Mforns
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow to force recomputation of existing data - change (analytics/aggregator)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow to force recomputation of existing data
..
Allow to force recomputation of existing data
Change-Id: Ida9d515ca5033e51a105624ed9f41325d658485a
---
M aggregator/projectcounts.py
M bin/aggregate_projectcounts
M tests/test_projectcounts.py
3 files changed, 55 insertions(+), 4 deletions(-)
Approvals:
Mforns: Looks good to me, approved
jenkins-bot: Verified
diff --git a/aggregator/projectcounts.py b/aggregator/projectcounts.py
index 31dd32d..f146136 100644
--- a/aggregator/projectcounts.py
+++ b/aggregator/projectcounts.py
@@ -124,7 +124,7 @@
def update_daily_per_project_csvs(source_dir_abs, target_dir_abs, first_date,
- last_date):
+ last_date, force_recomputation=False):
"""Updates daily per project CSVs from hourly projectcounts files.
The existing per project CSV files in target_dir_abs are updated with daily
@@ -142,6 +142,8 @@
:param target_dir_abs: Absolute directory of the per project CSVs.
:param first_date: The first date to compute non-existing data for.
:param last_date: The last date to compute non-existing data for.
+:param force_recomputation: If True, recompute data for the given days,
+even if it is already in the CSV. (Default: False)
"""
for csv_file_abs in glob.glob(os.path.join(target_dir_abs, '*.csv')):
logging.info("Updating csv '%s'" % (csv_file_abs))
@@ -166,7 +168,7 @@
date_str = date.isoformat()
logging.debug("Updating csv '%s' for date '%s'" % (
dbname, str(date)))
-if date_str not in csv_data:
+if date_str not in csv_data or force_recomputation:
# desktop site
abbreviation = util.dbname_to_webstatscollector_abbreviation(
dbname, 'desktop')
diff --git a/bin/aggregate_projectcounts b/bin/aggregate_projectcounts
index c8b5bb8..5b10343 100755
--- a/bin/aggregate_projectcounts
+++ b/bin/aggregate_projectcounts
@@ -18,7 +18,7 @@
Usage: aggregate_projectcounts [--source SOURCE_DIR] [--target TARGET_DIR]
[--first-date FIRST_DATE] [--last-date LAST_DATE] [--date DATE]
- [--log LOG_FILE] [--push-target] [-v ...] [--help]
+ [--log LOG_FILE] [--force] [--push-target] [-v ...] [--help]
Options:
-h, --help Show this help message and exit.
@@ -34,6 +34,8 @@
[default: yesterday]
--date DATE Day to aggregate for (overrides --first-date, and
--last-date)
+--force Force recomputation of given days, even if the CSV
+ would already contain that data.
--push-targetAssumes the target directory is a git repository,
and automatically hard reset it before the
aggregation, and commit and push after the
@@ -151,6 +153,8 @@
logging.error("first_date '%s' is not before last_date '%s'" %
(first_date, last_date))
+force_recomputation = arguments['--force']
+
if not all_parameters_ok:
logging.error("Parameters could not get parsed")
sys.exit(1)
@@ -166,7 +170,8 @@
source_dir_abs,
target_dir_abs,
first_date,
-last_date
+last_date,
+force_recomputation
)
if arguments["--push-target"]:
diff --git a/tests/test_projectcounts.py b/tests/test_projectcounts.py
index 98ce3c7..b8c783a 100644
--- a/tests/test_projectcounts.py
+++ b/tests/test_projectcounts.py
@@ -394,6 +394,50 @@
'2014-11-03,72276,0,0',
])
+def test_update_daily_forced_recomputation(self):
+fixture = os.path.join(FIXTURES_DIR_ABS,
+ '2014-11-3days-enwiki-day-times-100-plus-hour')
+date = datetime.date(2014, 11, 1)
+
+tmp_dir_abs = self.create_tmp_dir_abs()
+
+enwiki_file_abs = os.path.join(tmp_dir_abs, 'enwiki.csv')
+self.create_file(enwiki_file_abs, [
+'2014-11-01,1,2,3'
+])
+
+aggregator.update_daily_per_project_csvs(
+fixture,
+tmp_dir_abs,
+date,
+date,
+True)
+
+self.assert_file_content_equals(enwiki_file_abs, [
+'2014-11-01,24276,0,0',
+])
+
+def test_update_daily_forced_recomputation_missing_hours(self):
+fixture = os.path.join(FIXTURES_DIR_ABS, '2014-11-missing-hours')
+
+date = datetime.date(2014, 11, 1)
+
+tmp_dir_abs = self.create_tmp_dir_abs()
+
+enwiki_file_abs = os.path.join(tmp_dir_abs, 'enwiki.csv')
+self.create_file(enwiki_file_abs, [
+'2014-11-01,1,2,3'
+])
+
+nose.t
[MediaWiki-commits] [Gerrit] Switch to CRLF as line terminator for CSVs - change (analytics/aggregator)
jenkins-bot has submitted this change and it was merged.
Change subject: Switch to CRLF as line terminator for CSVs
..
Switch to CRLF as line terminator for CSVs
CRLF ending is dictated by RFC 4180. So we use it to be nice citizens.
Change-Id: I6c5a05937a589b56624e39d78cac409e09ebaf6a
---
M aggregator/projectcounts.py
M tests/test_projectcounts.py
2 files changed, 40 insertions(+), 28 deletions(-)
Approvals:
Mforns: Looks good to me, approved
jenkins-bot: Verified
diff --git a/aggregator/projectcounts.py b/aggregator/projectcounts.py
index fc426f4..31dd32d 100644
--- a/aggregator/projectcounts.py
+++ b/aggregator/projectcounts.py
@@ -30,6 +30,8 @@
PROJECTCOUNTS_STRFTIME_PATTERN = ('%%Y%s%%Y-%%m%sprojectcounts-%%Y%%m%%d-'
'%%H' % (os.sep, os.sep))
+CSV_LINE_ENDING = '\r\n'
+
cache = {}
@@ -158,7 +160,7 @@
if date_str != 'Date':
# No header line
-csv_data[date_str] = line.strip() + '\n'
+csv_data[date_str] = line.strip() + CSV_LINE_ENDING
for date in util.generate_dates(first_date, last_date):
date_str = date.isoformat()
@@ -184,14 +186,16 @@
source_dir_abs, abbreviation, date)
# injecting obtained data
-csv_data[date_str] = '%s,%d,%d,%d\n' % (
+csv_data[date_str] = '%s,%d,%d,%d%s' % (
date_str,
count_desktop,
count_mobile,
-count_zero)
+count_zero,
+CSV_LINE_ENDING)
with open(csv_file_abs, 'w') as csv_file:
-csv_file.write('Date,Desktop site,Mobile site,Zero site\n')
+csv_file.write('Date,Desktop site,Mobile site,Zero site%s' % (
+CSV_LINE_ENDING))
csv_file.writelines(sorted(csv_data.itervalues()))
@@ -226,7 +230,9 @@
if len(lines):
# Analyze last line
-last_line = (lines[-1]).split('\n', 1)[0]
+last_line = (lines[-1]).split('\n', 1)[0] # Since the file is
+# opened in text mode by default, line ends are normalized to
+# LF, event though CRLF gets written.
last_line_split = last_line.split(',')
if len(last_line_split) == 4:
# Check if last line is not older than yesterday
diff --git a/tests/test_projectcounts.py b/tests/test_projectcounts.py
index c48c5d6..98ce3c7 100644
--- a/tests/test_projectcounts.py
+++ b/tests/test_projectcounts.py
@@ -54,7 +54,7 @@
def create_file(self, file_abs, lines):
with open(file_abs, 'w') as file:
for line in lines:
-file.write(line + '\n')
+file.write(line + aggregator.CSV_LINE_ENDING)
def create_valid_aggregated_projects(self, tmp_dir_abs):
today = datetime.date.today()
@@ -73,14 +73,16 @@
for day_offset in range(-10, 0):
date = (today + datetime.timedelta(days=day_offset))
date_str = date.isoformat()
-file.write('%s,123456789,12345678,1234567\n' % (date_str))
+file.write('%s,123456789,12345678,1234567%s' % (
+date_str, aggregator.CSV_LINE_ENDING))
def assert_file_content_equals(self, actual_file_abs, expected_lines):
expected_lines.insert(0, 'Date,Desktop site,Mobile site,Zero site')
with open(actual_file_abs, 'r') as file:
for expected_line in expected_lines:
try:
-self.assertEquals(file.next(), expected_line + '\n')
+self.assertEquals(file.next(), expected_line +
+ aggregator.CSV_LINE_ENDING)
except StopIteration:
self.fail("File '%s' is missing the line:\n%s" % (
actual_file_abs, expected_line))
@@ -451,11 +453,12 @@
enwiki_file_abs = os.path.join(tmp_dir_abs, 'enwiki.csv')
yesterday = aggregator.parse_string_to_date('yesterday')
-with open(enwiki_file_abs, 'w') as file:
-for day_offset in range(-10, 0):
-date = (yesterday + datetime.timedelta(days=day_offset))
-date_str = date.isoformat()
-file.write('%s,123456789,12345678,1234567\n' % (date_str))
+lines = []
+for day_offset in range(-10, 0):
+date = (yesterday + datetime.timedelta(days=day_offset))
+date_str = date.isoformat()
+lines.append('%s,123456789,12345678,1234567' % (date_str))
+self.create_file(enwiki_file_abs, lines)
issues = aggregator.get_validity_issues_for_aggregated_projectcounts(
tmp_dir_abs)
@@ -470,11 +473,12 @@
[MediaWiki-commits] [Gerrit] Add total column for project aggregation CSVs - change (analytics/aggregator)
jenkins-bot has submitted this change and it was merged.
Change subject: Add total column for project aggregation CSVs
..
Add total column for project aggregation CSVs
While the total column does not add new information, it eases direct
plotting.
Change-Id: Ib62841200da246763efb6b9550df2b5af52be505
---
M aggregator/projectcounts.py
M tests/test_projectcounts.py
2 files changed, 80 insertions(+), 32 deletions(-)
Approvals:
Mforns: Looks good to me, approved
jenkins-bot: Verified
diff --git a/aggregator/projectcounts.py b/aggregator/projectcounts.py
index f146136..76b0b3c 100644
--- a/aggregator/projectcounts.py
+++ b/aggregator/projectcounts.py
@@ -188,16 +188,17 @@
source_dir_abs, abbreviation, date)
# injecting obtained data
-csv_data[date_str] = '%s,%d,%d,%d%s' % (
+csv_data[date_str] = '%s,%d,%d,%d,%d%s' % (
date_str,
+count_desktop + count_mobile + count_zero,
count_desktop,
count_mobile,
count_zero,
CSV_LINE_ENDING)
with open(csv_file_abs, 'w') as csv_file:
-csv_file.write('Date,Desktop site,Mobile site,Zero site%s' % (
-CSV_LINE_ENDING))
+csv_file.write('Date,Total,Desktop site,Mobile site,Zero site%s'
+ % (CSV_LINE_ENDING))
csv_file.writelines(sorted(csv_data.itervalues()))
@@ -236,7 +237,7 @@
# opened in text mode by default, line ends are normalized to
# LF, event though CRLF gets written.
last_line_split = last_line.split(',')
-if len(last_line_split) == 4:
+if len(last_line_split) == 5:
# Check if last line is not older than yesterday
try:
last_line_date = util.parse_string_to_date(
@@ -249,9 +250,20 @@
"'%s'" % (csv_file_abs, last_line))
if dbname in big_wikis:
-# Check desktop count
+# Check total count
try:
if int(last_line_split[1]) < 100:
+issues.append("Total count of last line of "
+ "%s is too low '%s'" % (
+ csv_file_abs, last_line))
+except ValueError:
+issues.append("Total count of last line of %s is"
+ "not an integer '%s'" % (
+ csv_file_abs, last_line))
+
+# Check desktop count
+try:
+if int(last_line_split[2]) < 100:
issues.append("Desktop count of last line of "
"%s is too low '%s'" % (
csv_file_abs, last_line))
@@ -262,7 +274,7 @@
# Check mobile count
try:
-if int(last_line_split[2]) < 1:
+if int(last_line_split[3]) < 1:
issues.append("Desktop count of last line of "
"%s is too low '%s'" % (
csv_file_abs, last_line))
@@ -273,7 +285,7 @@
# Check zero count
try:
-if int(last_line_split[3]) < 100:
+if int(last_line_split[4]) < 100:
issues.append("Zero count of last line of "
"%s is too low '%s'" % (
csv_file_abs, last_line))
@@ -282,8 +294,23 @@
"not an integer '%s'" % (
csv_file_abs, last_line))
+# Check zero count
+try:
+if int(last_line_split[1]) != \
+int(last_line_split[2]) + \
+int(last_line_split[3]) + \
+int(last_line_split[4]):
+issues.append(
+"Total column is not the sum of "
+"individual columns in '%s' for %s" % (
+last_line, csv_file_abs))
+except ValueError:
+# Some column is not a num
[MediaWiki-commits] [Gerrit] Add header line to CSVs for projectcounts aggregation - change (analytics/aggregator)
jenkins-bot has submitted this change and it was merged.
Change subject: Add header line to CSVs for projectcounts aggregation
..
Add header line to CSVs for projectcounts aggregation
Change-Id: I59ee3c235677d4c5538230fd591341e2b32b970f
---
M aggregator/projectcounts.py
M tests/test_projectcounts.py
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Mforns: Looks good to me, approved
jenkins-bot: Verified
diff --git a/aggregator/projectcounts.py b/aggregator/projectcounts.py
index 2f293f0..fc426f4 100644
--- a/aggregator/projectcounts.py
+++ b/aggregator/projectcounts.py
@@ -155,7 +155,10 @@
if date_str in csv_data:
raise RuntimeError(
"CSV contains the date '%s' twice" % (date_str))
-csv_data[date_str] = line.strip() + '\n'
+
+if date_str != 'Date':
+# No header line
+csv_data[date_str] = line.strip() + '\n'
for date in util.generate_dates(first_date, last_date):
date_str = date.isoformat()
@@ -188,6 +191,7 @@
count_zero)
with open(csv_file_abs, 'w') as csv_file:
+csv_file.write('Date,Desktop site,Mobile site,Zero site\n')
csv_file.writelines(sorted(csv_data.itervalues()))
diff --git a/tests/test_projectcounts.py b/tests/test_projectcounts.py
index 3f347b0..c48c5d6 100644
--- a/tests/test_projectcounts.py
+++ b/tests/test_projectcounts.py
@@ -76,6 +76,7 @@
file.write('%s,123456789,12345678,1234567\n' % (date_str))
def assert_file_content_equals(self, actual_file_abs, expected_lines):
+expected_lines.insert(0, 'Date,Desktop site,Mobile site,Zero site')
with open(actual_file_abs, 'r') as file:
for expected_line in expected_lines:
try:
--
To view, visit https://gerrit.wikimedia.org/r/172234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59ee3c235677d4c5538230fd591341e2b32b970f
Gerrit-PatchSet: 3
Gerrit-Project: analytics/aggregator
Gerrit-Branch: master
Gerrit-Owner: QChris
Gerrit-Reviewer: Mforns
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 switch for automatic pushing of data repo for projectcou... - change (analytics/aggregator)
jenkins-bot has submitted this change and it was merged.
Change subject: Add switch for automatic pushing of data repo for projectcounts
aggregation
..
Add switch for automatic pushing of data repo for projectcounts aggregation
Bug: 72740
Change-Id: I3fa7b025f1d5bad3e3fca53138c22aecb720f024
---
M bin/aggregate_projectcounts
1 file changed, 30 insertions(+), 1 deletion(-)
Approvals:
Mforns: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/aggregate_projectcounts b/bin/aggregate_projectcounts
index 6096f2e..c8b5bb8 100755
--- a/bin/aggregate_projectcounts
+++ b/bin/aggregate_projectcounts
@@ -18,7 +18,7 @@
Usage: aggregate_projectcounts [--source SOURCE_DIR] [--target TARGET_DIR]
[--first-date FIRST_DATE] [--last-date LAST_DATE] [--date DATE]
- [--log LOG_FILE] [-v ...] [--help]
+ [--log LOG_FILE] [--push-target] [-v ...] [--help]
Options:
-h, --help Show this help message and exit.
@@ -34,6 +34,10 @@
[default: yesterday]
--date DATE Day to aggregate for (overrides --first-date, and
--last-date)
+--push-targetAssumes the target directory is a git repository,
+ and automatically hard reset it before the
+ aggregation, and commit and push after the
+ aggregation.
--log LOG_FILE In addition to stdout, also log to LOG_FILE
-v, --verboseIncrease verbosity
@@ -48,11 +52,14 @@
from docopt import docopt
import logging
+import subprocess
import aggregator
LOG_MESSAGE_FORMAT = '%(asctime)s %(levelname)-6s %(message)s'
LOG_DATE_FORMAT = '%Y-%m-%dT%H:%M:%S'
+
+GIT_FILE_ABS = '/usr/bin/git'
def setup_logging(verbosity, log_file):
@@ -84,6 +91,15 @@
logging.basicConfig(level=log_level,
format=LOG_MESSAGE_FORMAT,
datefmt=LOG_DATE_FORMAT)
+
+
+def run_git(args):
+# To avoid depending on not-per-default-included git module, we run git by
+# hand.
+git_command = [GIT_FILE_ABS]
+git_command.extend(args)
+logging.info("Spawning git with : %s", git_command)
+subprocess.check_call(git_command)
if __name__ == '__main__':
@@ -139,9 +155,22 @@
logging.error("Parameters could not get parsed")
sys.exit(1)
+if arguments["--push-target"]:
+os.chdir(target_dir_abs)
+run_git(['reset', '--quiet', '--hard'])
+run_git(['checkout', '--quiet', 'master'])
+run_git(['pull', '--quiet'])
+run_git(['reset', '--quiet', '--hard', 'origin/master'])
+
aggregator.update_daily_per_project_csvs(
source_dir_abs,
target_dir_abs,
first_date,
last_date
)
+
+if arguments["--push-target"]:
+commit_message = "Automatic commit for dates %s until %s" % (
+first_date.isoformat(), last_date.isoformat())
+run_git(['commit', '--quiet', '*.csv', '-m', commit_message])
+run_git(['push', '--quiet', 'origin', 'HEAD:refs/heads/master'])
--
To view, visit https://gerrit.wikimedia.org/r/172198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3fa7b025f1d5bad3e3fca53138c22aecb720f024
Gerrit-PatchSet: 3
Gerrit-Project: analytics/aggregator
Gerrit-Branch: master
Gerrit-Owner: QChris
Gerrit-Reviewer: Mforns
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 basic monitoring script for projectcount aggregates - change (analytics/aggregator)
jenkins-bot has submitted this change and it was merged.
Change subject: Add basic monitoring script for projectcount aggregates
..
Add basic monitoring script for projectcount aggregates
Bug: 72740
Change-Id: I3709f8f259393a9aa083555618c3b212c8d5cb9b
---
M aggregator/projectcounts.py
A bin/check_validity_aggregated_projectcounts
M tests/test_projectcounts.py
3 files changed, 327 insertions(+), 0 deletions(-)
Approvals:
Mforns: Looks good to me, approved
jenkins-bot: Verified
diff --git a/aggregator/projectcounts.py b/aggregator/projectcounts.py
index c5300f9..2f293f0 100644
--- a/aggregator/projectcounts.py
+++ b/aggregator/projectcounts.py
@@ -189,3 +189,101 @@
with open(csv_file_abs, 'w') as csv_file:
csv_file.writelines(sorted(csv_data.itervalues()))
+
+
+def get_validity_issues_for_aggregated_projectcounts(data_dir_abs):
+"""Gets a list of obvious validity issues of aggregated projectcount CSVs
+
+:param data_dir_abs: Absolute directory of the per project CSVs.
+"""
+issues = []
+dbnames = []
+
+big_wikis = [
+'enwiki',
+'jawiki',
+'dewiki',
+'eswiki',
+'frwiki',
+'ruwiki',
+'itwiki',
+]
+
+yesterday = datetime.date.today() - datetime.timedelta(days=1)
+for csv_file_abs in sorted(glob.glob(os.path.join(data_dir_abs, '*.csv'))):
+logging.info("Checking csv '%s'" % (csv_file_abs))
+
+dbname = os.path.basename(csv_file_abs)
+dbname = dbname.rsplit('.csv', 1)[0]
+dbnames.append(dbname)
+
+with open(csv_file_abs, 'r') as file:
+lines = file.readlines()
+
+if len(lines):
+# Analyze last line
+last_line = (lines[-1]).split('\n', 1)[0]
+last_line_split = last_line.split(',')
+if len(last_line_split) == 4:
+# Check if last line is not older than yesterday
+try:
+last_line_date = util.parse_string_to_date(
+last_line_split[0])
+if last_line_date < yesterday:
+issues.append("Last line of %s is too old "
+ "'%s'" % (csv_file_abs, last_line))
+except ValueError:
+issues.append("Last line of %s is too old "
+ "'%s'" % (csv_file_abs, last_line))
+
+if dbname in big_wikis:
+# Check desktop count
+try:
+if int(last_line_split[1]) < 100:
+issues.append("Desktop count of last line of "
+ "%s is too low '%s'" % (
+ csv_file_abs, last_line))
+except ValueError:
+issues.append("Desktop count of last line of %s is"
+ "not an integer '%s'" % (
+ csv_file_abs, last_line))
+
+# Check mobile count
+try:
+if int(last_line_split[2]) < 1:
+issues.append("Desktop count of last line of "
+ "%s is too low '%s'" % (
+ csv_file_abs, last_line))
+except ValueError:
+issues.append("Mobile count of last line of %s is"
+ "not an integer '%s'" % (
+ csv_file_abs, last_line))
+
+# Check zero count
+try:
+if int(last_line_split[3]) < 100:
+issues.append("Zero count of last line of "
+ "%s is too low '%s'" % (
+ csv_file_abs, last_line))
+except ValueError:
+issues.append("Desktop count of last line of %s is"
+ "not an integer '%s'" % (
+ csv_file_abs, last_line))
+
+else:
+issues.append("Last line of %s does not have 4 columns: "
+ "'%s'" % (csv_file_abs, last_line))
+else:
+issues.append("No lines for %s" % csv_file_abs)
+
+if not len(dbnames):
+issues.append("Could not find any CSVs")
+
+if set(big_wikis) - set(dbnames):
+issues.append("Not all big wikis covered (Missing: %s)" % (
+[x for x in (set(b
[MediaWiki-commits] [Gerrit] Allow additional logging to disk for projectcounts aggregation - change (analytics/aggregator)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow additional logging to disk for projectcounts aggregation
..
Allow additional logging to disk for projectcounts aggregation
The logging to disk is happening at debug level, and hence helps
debugging gone wrong cron jobs.
Bug: 72740
Change-Id: I75ea2605fcc826264eb70360f486a5cd6cc9c825
---
M .gitignore
M bin/aggregate_projectcounts
2 files changed, 36 insertions(+), 9 deletions(-)
Approvals:
Mforns: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 6f9f3de..b75af7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
.tox
*.pyc
/data
+/log
diff --git a/bin/aggregate_projectcounts b/bin/aggregate_projectcounts
index 3330468..6096f2e 100755
--- a/bin/aggregate_projectcounts
+++ b/bin/aggregate_projectcounts
@@ -18,7 +18,7 @@
Usage: aggregate_projectcounts [--source SOURCE_DIR] [--target TARGET_DIR]
[--first-date FIRST_DATE] [--last-date LAST_DATE] [--date DATE]
- [-v ...] [--help]
+ [--log LOG_FILE] [-v ...] [--help]
Options:
-h, --help Show this help message and exit.
@@ -34,6 +34,7 @@
[default: yesterday]
--date DATE Day to aggregate for (overrides --first-date, and
--last-date)
+--log LOG_FILE In addition to stdout, also log to LOG_FILE
-v, --verboseIncrease verbosity
"""
@@ -50,20 +51,45 @@
import aggregator
-if __name__ == '__main__':
-arguments = docopt(__doc__)
+LOG_MESSAGE_FORMAT = '%(asctime)s %(levelname)-6s %(message)s'
+LOG_DATE_FORMAT = '%Y-%m-%dT%H:%M:%S'
-# Setting up logging
+
+def setup_logging(verbosity, log_file):
log_level_map = {
1: logging.WARNING,
2: logging.INFO,
3: logging.DEBUG,
}
-verbosity = min(arguments['--verbose'], 3) # cap at 3, to allow many "-v"
-log_level = log_level_map.get(verbosity, logging.ERROR)
-logging.basicConfig(level=log_level,
-format='%(asctime)s %(levelname)-6s %(message)s',
-datefmt='%Y-%m-%dT%H:%M:%S')
+log_level = log_level_map.get(min(verbosity, 3), logging.ERROR)
+
+if log_file:
+log_file_abs = os.path.abspath(log_file)
+
+# Make sure log file's directory exists
+if not os.path.exists(os.path.dirname(log_file_abs)):
+os.makedirs(os.path.dirname(log_file_abs))
+
+# Root logger at DEBUG
+logging.basicConfig(level=logging.DEBUG,
+format=LOG_MESSAGE_FORMAT,
+datefmt=LOG_DATE_FORMAT,
+filename=log_file_abs)
+# Console logger at user specified verbosity
+console_logger = logging.StreamHandler()
+console_logger.setLevel(log_level)
+console_logger.setFormatter(logging.Formatter(LOG_MESSAGE_FORMAT))
+logging.getLogger('').addHandler(console_logger)
+else:
+logging.basicConfig(level=log_level,
+format=LOG_MESSAGE_FORMAT,
+datefmt=LOG_DATE_FORMAT)
+
+
+if __name__ == '__main__':
+arguments = docopt(__doc__)
+
+setup_logging(arguments['--verbose'], arguments['--log'])
logging.debug("Parsed arguments: %s" % (arguments))
--
To view, visit https://gerrit.wikimedia.org/r/172197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75ea2605fcc826264eb70360f486a5cd6cc9c825
Gerrit-PatchSet: 3
Gerrit-Project: analytics/aggregator
Gerrit-Branch: master
Gerrit-Owner: QChris
Gerrit-Reviewer: Mforns
Gerrit-Reviewer: QChris
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 possible crash(es) on screen rotation. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix possible crash(es) on screen rotation.
..
Fix possible crash(es) on screen rotation.
- One crash may happen in NearbyFragment, where we call
invalidateOptionsMenu (unnecessarily) when we're no longer attached to
the activity.
- Another similar crash may happen in PageViewFragment.
Change-Id: I1b3330185e5b54cbb16e064108fe35c141c901ca
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index b515bca..a77e780 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -113,7 +113,6 @@
super.onCreate(savedInstanceState);
app = WikipediaApp.getInstance();
site = app.getPrimarySite();
-adapter = new NearbyAdapter(getActivity(), new
ArrayList());
}
@Override
@@ -132,6 +131,7 @@
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
setHasOptionsMenu(true);
+adapter = new NearbyAdapter(getActivity(), new
ArrayList());
nearbyList.setAdapter(adapter);
nearbyList.setOnItemClickListener(new
AdapterView.OnItemClickListener() {
@@ -438,9 +438,6 @@
((PageActivity)getActivity()).updateProgressBar(true, true, 0);
} else {
((PageActivity)getActivity()).updateProgressBar(false, true, 0);
-}
-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-getActivity().invalidateOptionsMenu();
}
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 04c5845..5a46a96 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -505,6 +505,9 @@
}
private void setState(int state, int subState) {
+if (!isAdded()) {
+return;
+}
this.state = state;
this.subState = subState;
getActivity().supportInvalidateOptionsMenu();
--
To view, visit https://gerrit.wikimedia.org/r/173337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b3330185e5b54cbb16e064108fe35c141c901ca
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
Gerrit-Reviewer: BearND
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pmacct - remove commented pmtpa core router - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: pmacct - remove commented pmtpa core router
..
pmacct - remove commented pmtpa core router
it's gone and not going to come back, removing
pmtpa core router reference
Change-Id: I250c90c4884e0b7e7f82b63a0e5cd9de11c4fb34
---
M manifests/role/pmacct.pp
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/pmacct.pp b/manifests/role/pmacct.pp
index 59c471a..6b70473 100644
--- a/manifests/role/pmacct.pp
+++ b/manifests/role/pmacct.pp
@@ -37,13 +37,6 @@
# Agent definitions
$pmacct_agents = {
-# tpa - as65001
-# Currently running old JunOS and will not sample correctly
-#cr2-pmtpa => {
-#port => '6512',
-#ip => '208.80.152.197',
-#samplerate => '1000',
-#},
# eqiad - as65002
cr1-eqiad => {
--
To view, visit https://gerrit.wikimedia.org/r/173454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I250c90c4884e0b7e7f82b63a0e5cd9de11c4fb34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pmacct - remove commented pmtpa core router - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173454
Change subject: pmacct - remove commented pmtpa core router
..
pmacct - remove commented pmtpa core router
it's gone and not going to come back, removing
pmtpa core router reference
Change-Id: I250c90c4884e0b7e7f82b63a0e5cd9de11c4fb34
---
M manifests/role/pmacct.pp
1 file changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/173454/1
diff --git a/manifests/role/pmacct.pp b/manifests/role/pmacct.pp
index 59c471a..6b70473 100644
--- a/manifests/role/pmacct.pp
+++ b/manifests/role/pmacct.pp
@@ -37,13 +37,6 @@
# Agent definitions
$pmacct_agents = {
-# tpa - as65001
-# Currently running old JunOS and will not sample correctly
-#cr2-pmtpa => {
-#port => '6512',
-#ip => '208.80.152.197',
-#samplerate => '1000',
-#},
# eqiad - as65002
cr1-eqiad => {
--
To view, visit https://gerrit.wikimedia.org/r/173454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I250c90c4884e0b7e7f82b63a0e5cd9de11c4fb34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updating WikiGrok A/B test start/end times - postponing unti... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Updating WikiGrok A/B test start/end times - postponing until Monday .. Updating WikiGrok A/B test start/end times - postponing until Monday Change-Id: Ic167480f9fa93a631c4e241e4a4e51eb2c558e21 --- M wmf-config/mobile.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Kaldari: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php index f7cf357..2b615d3 100644 --- a/wmf-config/mobile.php +++ b/wmf-config/mobile.php @@ -114,7 +114,7 @@ ), ); - $wgMFWikiGrokAbTestStartDate = 1415988000; // Fri, 14 Nov 2014 18:00:00 GMT - $wgMFWikiGrokAbTestEndDate = 1417197600; // Fri, 28 Nov 2014 18:00:00 GMT + $wgMFWikiGrokAbTestStartDate = 1416272400; // Tue, 18 Nov 2014 01:00:00 GMT + $wgMFWikiGrokAbTestEndDate = 1417482000; // Tue, 02 Dec 2014 01:00:00 GMT } } -- To view, visit https://gerrit.wikimedia.org/r/173447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic167480f9fa93a631c4e241e4a4e51eb2c558e21 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Kaldari Gerrit-Reviewer: Kaldari Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] generateLocalAutoload.php: Abort for web requests - change (mediawiki/core)
PleaseStand has uploaded a new change for review. https://gerrit.wikimedia.org/r/173453 Change subject: generateLocalAutoload.php: Abort for web requests .. generateLocalAutoload.php: Abort for web requests The Maintenance class already does this, though this script does not use it for the obvious reason that when there is a missing or incorrect autoloader entry, it may not be possible to initialize MediaWiki. Hence it is necessary to do that explicitly in this script. Overwriting autoload.php potentially could disrupt the operation of a production wiki (the file is truncated when it is opened). Change-Id: I05d5d4b7c30c4643e71ca5819783627688e15da7 --- M maintenance/generateLocalAutoload.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/53/173453/1 diff --git a/maintenance/generateLocalAutoload.php b/maintenance/generateLocalAutoload.php index 78e66b7..5e4cac6 100644 --- a/maintenance/generateLocalAutoload.php +++ b/maintenance/generateLocalAutoload.php @@ -1,5 +1,9 @@ https://gerrit.wikimedia.org/r/173453 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05d5d4b7c30c4643e71ca5819783627688e15da7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PleaseStand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add assigned articles per student to API output - change (mediawiki...EducationProgram)
Ragesoss has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173452
Change subject: Add assigned articles per student to API output
..
Add assigned articles per student to API output
When possible, show articles assigned to each student in each
class. Also, improve format of structured output for individual
students.
Change-Id: I5f9ece05e7f97e50e4953151cb90125f4fd9b48d
---
M includes/api/ApiListStudents.php
1 file changed, 56 insertions(+), 9 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram
refs/changes/52/173452/1
diff --git a/includes/api/ApiListStudents.php b/includes/api/ApiListStudents.php
index 04ca874..2c910e6 100644
--- a/includes/api/ApiListStudents.php
+++ b/includes/api/ApiListStudents.php
@@ -201,7 +201,7 @@
}
$results->addValue(
- $this->studentPath( $courseIndex ),
+ $this->studentsPath( $courseIndex ),
$propName . 's',
array( '*' => $csv )
);
@@ -220,6 +220,8 @@
/**
* For an array of user objects, output
* their usernames or user IDs as query results.
+* Also output the articles assigned to each user,
+* if possible.
*
* @param array $studentsList
* @param string $propName
@@ -236,18 +238,48 @@
) {
// Add the properties for each student to the result.
+ $studentIndex = 0;
foreach ( $studentsList as $student ) {
+
+ // Get the username or id of each student.
$studentProp = $this->getUserProperty( $student,
$propName );
+
$results->addValue(
- $this->studentPath( $courseIndex ),
- null,
+ $this->studentPath( $courseIndex, $studentIndex
),
+ $propName,
$studentProp
);
+
+ // If output is grouped by course, get the assigned
articles for each student.
+ if ($courseId ) {
+ $studentArticles = $this->getArticleNames(
$courseId, [ $student ] );
+
+ $articleIndex = 0;
+ foreach ( $studentArticles as $studentArticle )
{
+ $resultsPath = array (
$courseIndex, $studentIndex, $articleIndex );
+ $results->addValue(
+ $resultsPath,
+ 'title',
+ $studentArticle
+ );
+ $articleIndex++;
+ }
+
+ // Index the articles for the student.
+ $results->setIndexedTagName_internal(
+ array ( $courseIndex, $studentIndex ),
+ 'article'
+ );
+ }
+
+ $studentIndex++;
+
}
+ // Index the students.
$results->setIndexedTagName_internal(
- $this->studentPath( $courseIndex ),
- $propName
+ $this->articlesPath( $courseIndex ),
+ 'student'
);
}
@@ -274,13 +306,13 @@
}
$results->addValue(
- $this->articlePath( $courseIndex ),
+ $this->articlesPath( $courseIndex ),
null,
$articleNames
);
$results->setIndexedTagName_internal(
- $this->articlePath( $courseIndex ),
+ $this->articlesPath( $courseIndex ),
'articles'
);
@@ -381,7 +413,7 @@
*
* @param int $courseIndex
*/
- protected function studentPath( $courseIndex ) {
+ protected function studentsPath( $courseIndex ) {
if ( !is_null ( $courseIndex ) ) {
return array ( $courseIndex, 'students');
} else {
@@ -390,13 +422,28 @@
}
/**
+* Construct the results path for the element.
+*
+* @param int $courseIndex
+* @param int $studentIndex
+*/
+ protected function studentPath( $courseIndex, $studentIndex = null ) {
+ if ( !is_null ( $courseIndex ) ) {
+
[MediaWiki-commits] [Gerrit] Make sure we don't show WikiGrok in version B unless there a... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Make sure we don't show WikiGrok in version B unless there are
suggestions
..
Make sure we don't show WikiGrok in version B unless there are suggestions
Also, making sure we have proper error handling in place in version B.
Bug: 73437
Change-Id: I71801d516cd5a2453fc4abe70ba91e4b4bb65895
---
M javascripts/modules/wikigrok/WikiGrokDialogB.js
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Jdlrobson: Looks good to me, approved
Bmansurov: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/javascripts/modules/wikigrok/WikiGrokDialogB.js
b/javascripts/modules/wikigrok/WikiGrokDialogB.js
index 81e0948..66ceab6 100644
--- a/javascripts/modules/wikigrok/WikiGrokDialogB.js
+++ b/javascripts/modules/wikigrok/WikiGrokDialogB.js
@@ -190,10 +190,18 @@
self.apiWikiData.getClaims().done( function ( claims ) {
if ( claims.isHuman ) {
self.apiWikiGrokSuggestion.getSuggestions().done( function ( suggestions ) {
- if ( !$.isEmptyObject(
suggestions ) ) {
+ if ( ( suggestions.occupations
&& suggestions.occupations.list.length ) ||
+ (
suggestions.nationalities && suggestions.nationalities.list.length ) ||
+ ( suggestions.schools
&& suggestions.schools.list.length )
+ ) {
options.suggestions =
suggestions;
self.show();
+ } else {
+ // FIXME: remove this
before deploying to stable
+ self.logError(
'no-impression-not-enough-suggestions' );
}
+ } ).fail( function () {
+ self.logError(
'no-impression-cannot-fetch-suggestions' );
} );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/173445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71801d516cd5a2453fc4abe70ba91e4b4bb65895
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Robmoen
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 ruflin/elastica 1.3.0.0 for Elastica extension - change (mediawiki/vendor)
jenkins-bot has submitted this change and it was merged. Change subject: Add ruflin/elastica 1.3.0.0 for Elastica extension .. Add ruflin/elastica 1.3.0.0 for Elastica extension Change-Id: Ie5a3560ddd756f45b90ea02a2eedf7f828aebda0 --- M composer.json M composer.lock M composer/autoload_classmap.php M composer/autoload_namespaces.php M composer/installed.json A ruflin/elastica/LICENSE.txt A ruflin/elastica/README.markdown A ruflin/elastica/Vagrantfile A ruflin/elastica/build.xml A ruflin/elastica/changes.txt A ruflin/elastica/composer.json A ruflin/elastica/lib/Elastica/AbstractUpdateAction.php A ruflin/elastica/lib/Elastica/Aggregation/AbstractAggregation.php A ruflin/elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php A ruflin/elastica/lib/Elastica/Aggregation/Avg.php A ruflin/elastica/lib/Elastica/Aggregation/Cardinality.php A ruflin/elastica/lib/Elastica/Aggregation/DateHistogram.php A ruflin/elastica/lib/Elastica/Aggregation/DateRange.php A ruflin/elastica/lib/Elastica/Aggregation/ExtendedStats.php A ruflin/elastica/lib/Elastica/Aggregation/Filter.php A ruflin/elastica/lib/Elastica/Aggregation/GeoDistance.php A ruflin/elastica/lib/Elastica/Aggregation/GeohashGrid.php A ruflin/elastica/lib/Elastica/Aggregation/GlobalAggregation.php A ruflin/elastica/lib/Elastica/Aggregation/Histogram.php A ruflin/elastica/lib/Elastica/Aggregation/IpRange.php A ruflin/elastica/lib/Elastica/Aggregation/Max.php A ruflin/elastica/lib/Elastica/Aggregation/Min.php A ruflin/elastica/lib/Elastica/Aggregation/Missing.php A ruflin/elastica/lib/Elastica/Aggregation/Nested.php A ruflin/elastica/lib/Elastica/Aggregation/Range.php A ruflin/elastica/lib/Elastica/Aggregation/ReverseNested.php A ruflin/elastica/lib/Elastica/Aggregation/Stats.php A ruflin/elastica/lib/Elastica/Aggregation/Sum.php A ruflin/elastica/lib/Elastica/Aggregation/Terms.php A ruflin/elastica/lib/Elastica/Aggregation/ValueCount.php A ruflin/elastica/lib/Elastica/Bulk.php A ruflin/elastica/lib/Elastica/Bulk/Action.php A ruflin/elastica/lib/Elastica/Bulk/Action/AbstractDocument.php A ruflin/elastica/lib/Elastica/Bulk/Action/CreateDocument.php A ruflin/elastica/lib/Elastica/Bulk/Action/DeleteDocument.php A ruflin/elastica/lib/Elastica/Bulk/Action/IndexDocument.php A ruflin/elastica/lib/Elastica/Bulk/Action/UpdateDocument.php A ruflin/elastica/lib/Elastica/Bulk/Response.php A ruflin/elastica/lib/Elastica/Bulk/ResponseSet.php A ruflin/elastica/lib/Elastica/Client.php A ruflin/elastica/lib/Elastica/Cluster.php A ruflin/elastica/lib/Elastica/Cluster/Health.php A ruflin/elastica/lib/Elastica/Cluster/Health/Index.php A ruflin/elastica/lib/Elastica/Cluster/Health/Shard.php A ruflin/elastica/lib/Elastica/Cluster/Settings.php A ruflin/elastica/lib/Elastica/Connection.php A ruflin/elastica/lib/Elastica/Document.php A ruflin/elastica/lib/Elastica/Exception/Bulk/Response/ActionException.php A ruflin/elastica/lib/Elastica/Exception/Bulk/ResponseException.php A ruflin/elastica/lib/Elastica/Exception/Bulk/UdpException.php A ruflin/elastica/lib/Elastica/Exception/BulkException.php A ruflin/elastica/lib/Elastica/Exception/ClientException.php A ruflin/elastica/lib/Elastica/Exception/Connection/GuzzleException.php A ruflin/elastica/lib/Elastica/Exception/Connection/HttpException.php A ruflin/elastica/lib/Elastica/Exception/Connection/ThriftException.php A ruflin/elastica/lib/Elastica/Exception/ConnectionException.php A ruflin/elastica/lib/Elastica/Exception/ElasticsearchException.php A ruflin/elastica/lib/Elastica/Exception/ExceptionInterface.php A ruflin/elastica/lib/Elastica/Exception/InvalidException.php A ruflin/elastica/lib/Elastica/Exception/JSONParseException.php A ruflin/elastica/lib/Elastica/Exception/NotFoundException.php A ruflin/elastica/lib/Elastica/Exception/NotImplementedException.php A ruflin/elastica/lib/Elastica/Exception/PartialShardFailureException.php A ruflin/elastica/lib/Elastica/Exception/ResponseException.php A ruflin/elastica/lib/Elastica/Exception/RuntimeException.php A ruflin/elastica/lib/Elastica/Facet/AbstractFacet.php A ruflin/elastica/lib/Elastica/Facet/DateHistogram.php A ruflin/elastica/lib/Elastica/Facet/Filter.php A ruflin/elastica/lib/Elastica/Facet/GeoCluster.php A ruflin/elastica/lib/Elastica/Facet/GeoDistance.php A ruflin/elastica/lib/Elastica/Facet/Histogram.php A ruflin/elastica/lib/Elastica/Facet/Query.php A ruflin/elastica/lib/Elastica/Facet/Range.php A ruflin/elastica/lib/Elastica/Facet/Statistical.php A ruflin/elastica/lib/Elastica/Facet/Terms.php A ruflin/elastica/lib/Elastica/Facet/TermsStats.php A ruflin/elastica/lib/Elastica/Filter/AbstractFilter.php A ruflin/elastica/lib/Elastica/Filter/AbstractGeoDistance.php A ruflin/elastica/lib/Elastica/Filter/AbstractGeoShape.php A ruflin/elastica/lib/Elastica/Filter/AbstractMulti.php A ruflin/elastica/lib/Elastica/Filter/Bool.php A ruflin/elastica/lib/Elastica/Filter/BoolAnd.php A ruflin/elastica/lib/Elastica/Filt
[MediaWiki-commits] [Gerrit] Remove all references to pmtpa from role::cache - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Remove all references to pmtpa from role::cache
..
Remove all references to pmtpa from role::cache
Change-Id: I9164f99c33203633a3fa902bb4caa7304b630ac9
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 100 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 9b8ba2a..2559392 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -59,7 +59,6 @@
$active_nodes = {
'production' => {
'text' => {
-'pmtpa' => [],
'eqiad' => [
'cp1052.eqiad.wmnet',
'cp1053.eqiad.wmnet',
@@ -114,13 +113,11 @@
]
},
'api' => {
-'pmtpa' => [],
'eqiad' => [],
'esams' => [],
'ulsfo' => [],
},
'bits' => {
-'pmtpa' => [],
'eqiad' => ['cp1056.eqiad.wmnet',
'cp1057.eqiad.wmnet',
'cp1069.eqiad.wmnet',
@@ -138,7 +135,6 @@
],
},
'upload' => {
-'pmtpa' => [],
'eqiad' => [
'cp1048.eqiad.wmnet',
'cp1049.eqiad.wmnet',
@@ -173,7 +169,6 @@
],
},
'mobile' => {
-'pmtpa' => [],
'eqiad' => ['cp1046.eqiad.wmnet',
'cp1047.eqiad.wmnet',
'cp1059.eqiad.wmnet',
@@ -191,13 +186,11 @@
]
},
'parsoid' => {
-'pmtpa' => [],
'eqiad' => ['cp1045.eqiad.wmnet', 'cp1058.eqiad.wmnet'],
'esams' => [],
'ulsfo' => []
},
'misc' => {
-'pmtpa' => [],
'eqiad' => ['cp1043.eqiad.wmnet', 'cp1044.eqiad.wmnet'],
'esams' => [],
'ulsfo' => [],
@@ -206,73 +199,27 @@
'labs' => {
'api'=> {
'eqiad' => '127.0.0.1',
-'pmtpa' => '127.0.0.1',
},
'bits' => {
'eqiad' => '127.0.0.1',
-'pmtpa' => '127.0.0.1',
},
'mobile' => {
'eqiad' => '127.0.0.1',
-'pmtpa' => '127.0.0.1',
},
'text' => {
'eqiad' => '127.0.0.1',
-'pmtpa' => '127.0.0.1',
},
'upload' => {
'eqiad' => '127.0.0.1',
-'pmtpa' => '127.0.0.1',
},
'parsoid' => {
'eqiad' => '127.0.0.1',
-'pmtpa' => '127.0.0.1',
},
},
}
$decommissioned_nodes = {
'text' => {
-'pmtpa' => [
-'sq16.wikimedia.org',
-'sq17.wikimedia.org',
-'sq18.wikimedia.org',
-'sq19.wikimedia.org',
-'sq20.wikimedia.org',
-'sq21.wikimedia.org',
-'sq22.wikimedia.org',
-'sq23.wikimedia.org',
-'sq24.wikimedia.org',
-'sq25.wikimedia.org',
-'sq26.wikimedia.org',
-'sq27.wikimedia.org',
-'sq28.wikimedia.org',
-'sq29.wikimedia.org',
-'sq30.wikimedia.org',
-
-'sq31.wikimedia.org',
-'sq32.wikimedia.org',
-'sq35.wikimedia.org',
-'sq38.wikimedia.org',
-'sq40.wikimedia.org',
-'sq37.wikimedia.org',
-'sq59.wikimedia.org',
-'sq60.wikimedia.org',
-'sq61.wikimedia.org',
-'sq62.wikimedia.org',
-'sq63.wikimedia.org',
-'sq64.wikimedia.org',
-'sq65.wikimedia.org',
-'sq66.wikimedia.org',
-'sq71.wikimedia.org',
-'sq72.wikimedia.org',
-'sq73.wikimedia.org',
-'sq74.wikimedia.org',
-'sq75.wikimedia.org',
-'sq76.wikimedia.org',
-'sq77.wikimedia.org',
-
[MediaWiki-commits] [Gerrit] redirect.py: handle CircularRedirect exception - change (pywikibot/core)
Mpaa has uploaded a new change for review. https://gerrit.wikimedia.org/r/173451 Change subject: redirect.py: handle CircularRedirect exception .. redirect.py: handle CircularRedirect exception Handle CircularRedirect exception in get_moved_pages_redirects(). Bug: 69370 Change-Id: I7aa11a88ee9b8f23a9b19edb1343da2ba5ae3378 --- M scripts/redirect.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/51/173451/1 diff --git a/scripts/redirect.py b/scripts/redirect.py index a1f610f..5524483 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -367,6 +367,8 @@ except pywikibot.NoPage: # original title must have been deleted after move continue +except pywikibot.CircularRedirect: +continue class RedirectRobot(Bot): -- To view, visit https://gerrit.wikimedia.org/r/173451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7aa11a88ee9b8f23a9b19edb1343da2ba5ae3378 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QUnit Test for bug 73437 - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173450
Change subject: QUnit Test for bug 73437
..
QUnit Test for bug 73437
Change-Id: I8c0fc2e8b09b62d6d2dca5acbf73c4e946fc6700
---
M tests/qunit/modules/wikigrok/test_WikiGrokDialogB.js
1 file changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/50/173450/1
diff --git a/tests/qunit/modules/wikigrok/test_WikiGrokDialogB.js
b/tests/qunit/modules/wikigrok/test_WikiGrokDialogB.js
index 6c5b7bf..5059c4e 100644
--- a/tests/qunit/modules/wikigrok/test_WikiGrokDialogB.js
+++ b/tests/qunit/modules/wikigrok/test_WikiGrokDialogB.js
@@ -2,6 +2,7 @@
var WikiGrokDialogB = M.require( 'modules/wikigrok/WikiGrokDialogB' ),
WikiDataApi = M.require( 'modules/wikigrok/WikiDataApi' ),
+ WikiGrokSuggestionApi = M.require(
'modules/wikigrok/WikiGrokSuggestionApi' ),
WikiGrokResponseApi = M.require(
'modules/wikigrok/WikiGrokResponseApi' ),
suggestions = {
occupations: {
@@ -46,6 +47,17 @@
this.wk.remove();
},
setup: function () {
+ var noSuggestionResponse = $.Deferred().resolve( {
+ suggestions: {
+ occupations: {
+ id: 'P106', list: []
+ },
+ nationalities: {
+ id: 'P27', list: []
+ }
+ }
+ } );
+
this.$el = $( '' );
this.wk = new WikiGrokDialogB( {
el: this.$el,
@@ -59,14 +71,25 @@
debugDialog.apply( this );
// don't run eventLogging
this.stub( WikiGrokDialogB.prototype, 'log' );
- this.stub( WikiGrokDialogB.prototype, 'logError' );
+ this.logError = this.stub( WikiGrokDialogB.prototype,
'logError' );
this.sandbox.stub( WikiDataApi.prototype, 'getLabels' )
.returns( $.Deferred().resolve( labels ) );
+ this.sandbox.stub( WikiGrokSuggestionApi.prototype,
'getSuggestions' )
+ .returns( noSuggestionResponse );
+ this.sandbox.stub( WikiDataApi.prototype, 'getClaims' )
+ .returns( $.Deferred().resolve( { isHuman: true
} ) );
this.sandbox.stub( WikiGrokResponseApi.prototype,
'recordClaims' )
.returns( $.Deferred().resolve() );
}
} );
+ QUnit.test( '#UI should not display when there are no suggestions', 2,
function ( assert ) {
+ var spy = this.sandbox.stub( WikiGrokDialogB.prototype, 'show'
);
+ this.wk.reveal( {} );
+ assert.ok( spy.notCalled, 'We do not call if the response
provides no suggestions.' );
+ assert.ok( this.logError.called, 'Make sure we log an error.' );
+ } );
+
QUnit.test( '#UI renders initial screen', 4, function ( assert ) {
// Lets check that we've got the header, info, buttons and
'Tell me more'
assert.strictEqual( this.$el.find( '.wg-header' ).length, 1 );
--
To view, visit https://gerrit.wikimedia.org/r/173450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c0fc2e8b09b62d6d2dca5acbf73c4e946fc6700
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixup! weird scoping issue - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173449
Change subject: fixup! weird scoping issue
..
fixup! weird scoping issue
* Introduced in 5836e3c15ff87da3054dc6f0bc12d7d54deb616e.
* Exhibited by,
var f = function() {
this.t = 1
var g = function() {
console.log(this.t)
}
g()
}
f.call({})
f()
Why does the order of those calls matter?
Change-Id: Ic9bf71a33fbd92a58c01fa449e901369e8591ba7
---
M lib/mediawiki.ApiRequest.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/49/173449/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index ca5591c..cc088d8 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -532,8 +532,8 @@
parsedHtml = parsedHtml.replace(/(^)|(<\/p>$)/g, '');
// Add the modules to the page data
+ var page = this.env.page;
var setPageProperty = function(src, property) {
- var page = this.env.page;
if (src) {
// This info comes back from the MW API when
extension tags are parsed.
// Since a page can have multiple extension
tags, we can hit this code
--
To view, visit https://gerrit.wikimedia.org/r/173449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9bf71a33fbd92a58c01fa449e901369e8591ba7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove code powering talk count - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove code powering talk count
..
Remove code powering talk count
As much as I love this, it's not getting any love any time soon
and is just being a pest in our codebase so let's kill it.
Change-Id: Ifef3dc73f73178ed99fe7ca3f02dbfe56cb2382b
---
M includes/skins/SkinMinervaAlpha.php
M less/modules/talk.less
2 files changed, 0 insertions(+), 69 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinervaAlpha.php
b/includes/skins/SkinMinervaAlpha.php
index 0e28405..db3d1d2 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -57,16 +57,6 @@
}
/**
-* initialize various variables and generate the template
-* @return QuickTemplate
-*/
- protected function prepareQuickTemplate() {
- $tpl = parent::prepareQuickTemplate();
- $this->prepareTalkLabel( $tpl );
- return $tpl;
- }
-
- /**
* Get various skin specific configuration.
* @return array
*/
@@ -74,46 +64,5 @@
$vars = parent::getSkinConfigVariables();
$vars['wgMFAnonymousEditing'] = true;
return $vars;
- }
-
- /**
-* Add the talk page link for logged in alpha users to template
-* @param BaseTemplate $tpl an instance of BaseTemplate
-* @return QuickTemplate
-*/
- protected function prepareTalkLabel( BaseTemplate $tpl ) {
- $title = $this->getTitle();
- $isSpecialPage = $title->isSpecialPage();
-
- // talk page link for logged in alpha users
- if ( !$isSpecialPage && !$title->isTalkPage() ) {
- $talkTitle = $title->getTalkPage();
- if ( $talkTitle->getArticleID() ) {
- $dbr = wfGetDB( DB_SLAVE );
- $numTopics = (int)$dbr->selectField(
'page_props', 'pp_value',
- array(
- 'pp_page' =>
$talkTitle->getArticleID(),
- 'pp_propname' =>
'page_top_level_section_count'
- ),
- __METHOD__
- );
- } else {
- $numTopics = 0;
- }
- if ( $numTopics ) {
- $talkLabel = $this->getLanguage()->formatNum(
$numTopics );
-
- $class = MobileUI::iconClass( 'talk',
'element', 'count' );
- } else {
- $talkLabel = wfMessage(
'mobile-frontend-talk-overlay-header' );
- $class = MobileUI::iconClass( 'talk', 'element'
);
- }
- $menu = $tpl->data['page_actions'];
- if ( isset( $menu['talk'] ) ) {
- $menu['talk']['text'] = $talkLabel;
- $menu['talk']['class'] = $class;
- }
- $tpl->set( 'page_actions', $menu );
- }
}
}
diff --git a/less/modules/talk.less b/less/modules/talk.less
index f86f70c..a6d1a2e 100644
--- a/less/modules/talk.less
+++ b/less/modules/talk.less
@@ -1,24 +1,6 @@
@import "minerva.variables";
@import "minerva.mixins";
-
-.alpha #page-actions #ca-talk.count {
- a {
- text-indent: 0;
- text-align: center;
- line-height: 38px;
- font-weight: bold;
- color: #FFF;
- margin-left: 4px;
- font-size: 9px; // FIXME: use pixels for time being as the icon
in pixels.
- }
-}
-body.rtl #page-actions #ca-talk.count {
-a {
-padding-right: 15px;
-}
-}
-
.overlay {
.error {
border: solid 1px @redBase;
--
To view, visit https://gerrit.wikimedia.org/r/173213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef3dc73f73178ed99fe7ca3f02dbfe56cb2382b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Bmansurov
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 inconsistent spacing in composer.json - change (mediawiki...cldr)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173448
Change subject: Fix inconsistent spacing in composer.json
..
Fix inconsistent spacing in composer.json
Change-Id: I16b8dc7c14b27259d7b936294ccadd0e644e108d
---
M composer.json
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/cldr
refs/changes/48/173448/1
diff --git a/composer.json b/composer.json
index f27e604..43bc839 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
{
"name": "mediawiki/cldr",
- "type": "mediawiki-extension",
- "description": "CLDR extension contains local language names
for different languages, countries, and currencies extracted from CLDR data",
- "homepage": "http://www.mediawiki.org/wiki/Extension:CLDR";,
- "license" : "GPL-2.0",
+ "type": "mediawiki-extension",
+ "description": "CLDR extension contains local language names for
different languages, countries, and currencies extracted from CLDR data",
+ "homepage": "http://www.mediawiki.org/wiki/Extension:CLDR";,
+ "license": "GPL-2.0",
- "require": {
- "composer/installers" : "*"
- }
+ "require": {
+ "composer/installers" : "*"
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/173448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16b8dc7c14b27259d7b936294ccadd0e644e108d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/cldr
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updating WikiGrok A/B test start/end times - postponing unti... - change (operations/mediawiki-config)
Kaldari has uploaded a new change for review. https://gerrit.wikimedia.org/r/173447 Change subject: Updating WikiGrok A/B test start/end times - postponing until Monday .. Updating WikiGrok A/B test start/end times - postponing until Monday Change-Id: Ic167480f9fa93a631c4e241e4a4e51eb2c558e21 --- M wmf-config/mobile.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/47/173447/1 diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php index f7cf357..f7b0e06 100644 --- a/wmf-config/mobile.php +++ b/wmf-config/mobile.php @@ -114,7 +114,7 @@ ), ); - $wgMFWikiGrokAbTestStartDate = 1415988000; // Fri, 14 Nov 2014 18:00:00 GMT - $wgMFWikiGrokAbTestEndDate = 1417197600; // Fri, 28 Nov 2014 18:00:00 GMT + $wgMFWikiGrokAbTestStartDate = 1416247200; // Mon, 17 Nov 2014 18:00:00 GMT + $wgMFWikiGrokAbTestEndDate = 1417456800; // Mon, 01 Dec 2014 18:00:00 GMT } } -- To view, visit https://gerrit.wikimedia.org/r/173447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic167480f9fa93a631c4e241e4a4e51eb2c558e21 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Kaldari ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updating Response API for new schema (adding isLoggedIn) - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged.
Change subject: Updating Response API for new schema (adding isLoggedIn)
..
Updating Response API for new schema (adding isLoggedIn)
Also updating unit test.
Change-Id: Ifedf775b72e5e5f0f6bad6335e633c98f776ad98
---
M includes/api/ApiResponse.php
M tests/phpunit/api/ApiResponseTest.php
2 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
Bmansurov: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/api/ApiResponse.php b/includes/api/ApiResponse.php
index e57f552..9ec2fff 100644
--- a/includes/api/ApiResponse.php
+++ b/includes/api/ApiResponse.php
@@ -11,7 +11,7 @@
class ApiResponse extends ApiBase {
const SCHEMA = 'MobileWebWikiGrokResponse';
- const SCHEMA_REV_ID = 10278938;
+ const SCHEMA_REV_ID = 10352279;
/**
* Executes the action.
@@ -41,6 +41,7 @@
'subject' => $params['subject'],
'mobileMode' => $params['mobile_mode'],
'testing' => $params['testing'],
+ 'isLoggedIn' => $user->isLoggedIn(),
);
$eventLogger = $this->getEventLogger();
diff --git a/tests/phpunit/api/ApiResponseTest.php
b/tests/phpunit/api/ApiResponseTest.php
index d209d50..4d95c2b 100644
--- a/tests/phpunit/api/ApiResponseTest.php
+++ b/tests/phpunit/api/ApiResponseTest.php
@@ -41,12 +41,17 @@
}
class StubUser extends User {
- public function __construct( $editCount ) {
+ public function __construct( $editCount, $isLoggedIn ) {
$this->editCount = $editCount;
+ $this->isLoggedIn = $isLoggedIn;
}
public function getEditCount() {
return $this->editCount;
+ }
+
+ public function isLoggedIn() {
+ return $this->isLoggedIn;
}
}
@@ -64,7 +69,7 @@
);
$this->eventLogger = $this->getMock( 'WikiGrok\EventLogger' );
- $this->user = new StubUser( 1234 );
+ $this->user = new StubUser( 1234, true );
$this->context = new RequestContext();
$this->api = new StubApiResponse(
$this->eventLogger,
@@ -244,6 +249,7 @@
'value' => 'insurance broker',
'response' => true,
'testing' => true,
+ 'isLoggedIn' => true,
),
array(
'pageId' => 1,
@@ -260,6 +266,7 @@
'value' => 'engineer',
'response' => false,
'testing' => true,
+ 'isLoggedIn' => true,
),
),
),
--
To view, visit https://gerrit.wikimedia.org/r/17
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifedf775b72e5e5f0f6bad6335e633c98f776ad98
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Kaldari
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jhernandez
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Phuedx
Gerrit-Reviewer: Robmoen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use strict comparison for insertionAnnotationsChange - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Use strict comparison for insertionAnnotationsChange
..
Use strict comparison for insertionAnnotationsChange
74fc34ac changed the condition for emitting insertionAnnotationsChange
from a.containsAllOf( b ) && b.containsAllOf( a ) to a.compareTo( b ).
The containsAllOf test was stricter: if b contains an annotation
that is comparable to one in a, but not the same, the containsAllOf
test would fail, but the compareTo test would succeed.
This caused a bug with annotations with htmlAttributes. If you edited a
document containing Foo Bar, placed
the cursor at Fo|o, typed "x", then placed the cursor at Ba|r,
and typed "x", you would expect Foxo Baxr,
but you'd get Foxo Baxo.
This happened because the insertionAnnotations were set to
when you put the cursor in "Foo", and were not changed when
you put the cursor in "Bar" because is comparable to .
Even the original containsAllOf test wasn't strict enough, because
it didn't take order into account: it would consider [b, i]
the same as [i, b], so you could still get the same broken behavior
with Foo Bar (although that seems to
be straightened out by the openAndCloseAnnotations() in the
converter in practice, but it was still being put in the DM wrong).
To fix both of these problems, use ve.dm.AnnotationSet#compareToStrict
which checks for exact equality: equal store indexes in the same order.
Change-Id: I2cb9ab66cc6e0933134cd313fe30d7d88e0844de
---
M src/dm/ve.dm.AnnotationSet.js
M src/dm/ve.dm.Surface.js
2 files changed, 26 insertions(+), 2 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/dm/ve.dm.AnnotationSet.js b/src/dm/ve.dm.AnnotationSet.js
index 5551937..3aff1f6 100644
--- a/src/dm/ve.dm.AnnotationSet.js
+++ b/src/dm/ve.dm.AnnotationSet.js
@@ -333,6 +333,29 @@
};
/**
+ * Strictly compare two annotation sets for equality.
+ *
+ * This method only considers two annotation sets to be equal if they contain
exactly the same
+ * annotations (not just comparable, but with the same index in the
IndexValueStore)
+ * in exactly the same order.
+ *
+ * @param {ve.dm.AnnotationSet} set The annotation set to compare this one to
+ * @returns {boolean} The annotation sets are equal
+ */
+ve.dm.AnnotationSet.prototype.equalsInOrder = function ( set ) {
+ var i, len, ourIndexes = this.getIndexes(), theirIndexes =
set.getIndexes();
+ if ( ourIndexes.length !== theirIndexes.length ) {
+ return false;
+ }
+ for ( i = 0, len = ourIndexes.length; i < len; i++ ) {
+ if ( ourIndexes[i] !== theirIndexes[i] ) {
+ return false;
+ }
+ }
+ return true;
+};
+
+/**
* Add an annotation to the set.
*
* If the annotation is already present in the set, nothing happens.
diff --git a/src/dm/ve.dm.Surface.js b/src/dm/ve.dm.Surface.js
index 046fcb8..f17736f 100644
--- a/src/dm/ve.dm.Surface.js
+++ b/src/dm/ve.dm.Surface.js
@@ -650,8 +650,9 @@
}
}
- // Only emit an annotations change event if there's a
meaningful difference
- if ( !insertionAnnotations.compareTo( this.insertionAnnotations
) ) {
+ // Only emit an annotations change event if there's a difference
+ // Note that ANY difference matters here, even order
+ if ( !insertionAnnotations.equalsInOrder(
this.insertionAnnotations ) ) {
this.setInsertionAnnotations( insertionAnnotations );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/173240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cb9ab66cc6e0933134cd313fe30d7d88e0844de
Gerrit-PatchSet: 4
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Divec
Gerrit-Reviewer: Esanders
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: 0240713..17f6bad - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 0240713..17f6bad .. Syncronize VisualEditor: 0240713..17f6bad Change-Id: I7cab5147df61682efe996e93fe0b0694968b5e79 --- 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 0240713..17f6bad 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 02407138addb18a73b3495a3ced56978ae161d51 +Subproject commit 17f6badf0a12e0cf8a521cd2389a016679da2b57 -- To view, visit https://gerrit.wikimedia.org/r/173446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7cab5147df61682efe996e93fe0b0694968b5e79 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: 0240713..17f6bad - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/173446 Change subject: Syncronize VisualEditor: 0240713..17f6bad .. Syncronize VisualEditor: 0240713..17f6bad Change-Id: I7cab5147df61682efe996e93fe0b0694968b5e79 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/46/173446/1 diff --git a/VisualEditor b/VisualEditor index 0240713..17f6bad 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 02407138addb18a73b3495a3ced56978ae161d51 +Subproject commit 17f6badf0a12e0cf8a521cd2389a016679da2b57 -- To view, visit https://gerrit.wikimedia.org/r/173446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7cab5147df61682efe996e93fe0b0694968b5e79 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] Hygiene: Cleanup mw-ui-icon specific code - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Cleanup mw-ui-icon specific code
..
Hygiene: Cleanup mw-ui-icon specific code
* The watchstar icons in search should use a standard icon size
* Limit rules in page actions to the icons that have issues.
* Purposely misalign icons (see bug 73391)
Change-Id: I7356e832b1d160769ce965cfab20bae05696642f
---
M less/modules/watchstar.less
M less/pageactions.less
2 files changed, 8 insertions(+), 13 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/modules/watchstar.less b/less/modules/watchstar.less
index 6eb25cf..840615a 100644
--- a/less/modules/watchstar.less
+++ b/less/modules/watchstar.less
@@ -14,13 +14,6 @@
height: @watchThisArticleSize;
}
-// FIXME: This shouldn't be needed. (but the icon looks smaller compared to
beta, even though the SVG width is 24px)
-.alpha {
- .page-list .watch-this-article {
- font-size: 1.1em;
- }
-}
-
.animations {
.mw-ui-icon.watch-this-article,
.icon.watch-this-article {
diff --git a/less/pageactions.less b/less/pageactions.less
index a0f06f0..91af63f 100644
--- a/less/pageactions.less
+++ b/less/pageactions.less
@@ -30,6 +30,8 @@
// Needed for non-JavaScript users
position: relative;
cursor: pointer;
+ // Override .hlist rule.
+ margin-right: 0;
// FIXME: use .cloaked class
// file inputs are notoriously difficult to style
@@ -57,13 +59,13 @@
margin: 0 16px 0 0;
}
- &.mw-ui-icon {
+ // FIXME: Remove this when these are all svgs
+ &.mw-ui-icon-edit,
+ &.mw-ui-icon-edit-enabled,
+ &.mw-ui-icon-addimage,
+ &.mw-ui-icon-talk,
+ &.mw-ui-icon-addimage-enabled {
font-size: 1.3em;
- margin-right: 0;
- // FIXME: remove this once other icons are also SVGs,
they looks smaller because they are PNGs
- &.watch-this-article {
- font-size: 1.1em;
- }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/173112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7356e832b1d160769ce965cfab20bae05696642f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] update references test for modern RSpec syntax - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] update references test for modern RSpec syntax .. [BrowserTest] update references test for modern RSpec syntax simple update to a nice test Change-Id: Iad00e779295ccc610d20241693a87b76b817fbd6 --- M modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Cmcmahon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb index 49ecc8b..72c56a6 100644 --- a/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb +++ b/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb @@ -46,17 +46,17 @@ end Then(/^first link to reference should be visible$/) do - on(VisualEditorPage).first_reference_element.when_present.should be_visible + expect(on(VisualEditorPage).first_reference_element.when_present).to be_visible end Then(/^second link to reference should be visible$/) do - on(VisualEditorPage).second_reference_element.when_present.should be_visible + expect(on(VisualEditorPage).second_reference_element.when_present).to be_visible end Then(/^I should see Insert reference button enabled$/) do - on(VisualEditorPage).insert_reference_element.should be_visible + expect(on(VisualEditorPage).insert_reference_element).to be_visible end Then(/^link to Insert menu should be visible$/) do - on(VisualEditorPage).insert_menu_element.should be_visible + expect(on(VisualEditorPage).insert_menu_element).to be_visible end \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/173444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad00e779295ccc610d20241693a87b76b817fbd6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon Gerrit-Reviewer: Cmcmahon Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove webkit color inversion for Math images. - change (mediawiki...MobileApp)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove webkit color inversion for Math images.
..
Remove webkit color inversion for Math images.
It's now done in javascript, conditional on webkit version.
Change-Id: Ia3c2a89041c2d4475b27de579fa5c6b9d6f45f9b
---
M less/night.less
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/night.less b/less/night.less
index 502b159..5ea84ae 100644
--- a/less/night.less
+++ b/less/night.less
@@ -16,11 +16,6 @@
background: #fff;
}
-img.mwe-math-fallback-png-inline {
-background: none;
--webkit-filter: invert(100%);
-}
-
/* Same specificity as in less/content/main.less */
.content table td,
.content table th {
--
To view, visit https://gerrit.wikimedia.org/r/173436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3c2a89041c2d4475b27de579fa5c6b9d6f45f9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Dbrant
Gerrit-Reviewer: BearND
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Infobox styling tweaks - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Infobox styling tweaks
..
Infobox styling tweaks
* Avoid flash of unstyled content when loading wikidata infobox
* Move 'expand' on to new line
Change-Id: Id5de721a61879ed9301c4ef25497ea79a7bb8f16
---
M javascripts/modules/infobox/init.js
M less/content/hacks.less
M templates/modules/infobox/Infobox.hogan
3 files changed, 12 insertions(+), 5 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/infobox/init.js
b/javascripts/modules/infobox/init.js
index 08d6e23..2ef9b1a 100644
--- a/javascripts/modules/infobox/init.js
+++ b/javascripts/modules/infobox/init.js
@@ -1,4 +1,4 @@
-( function ( M, $ ) {
+( function ( M ) {
M.assertMode( [ 'alpha' ] );
var infobox,
page = M.getCurrentPage(),
@@ -7,12 +7,10 @@
// Load infoboxes on pages in the main space which are not main pages
if ( wikidataID && !page.isMainPage() && page.getNamespaceId() === 0 ) {
- // upset people
- $( '.infobox' ).hide();
// build the future
infobox = new Infobox( {
itemId: wikidataID
} );
infobox.insertBefore( '#content' );
}
-}( mw.mobileFrontend, jQuery ) );
+}( mw.mobileFrontend ) );
diff --git a/less/content/hacks.less b/less/content/hacks.less
index 0c221cc..8d0dbc4 100644
--- a/less/content/hacks.less
+++ b/less/content/hacks.less
@@ -12,6 +12,13 @@
@import "minerva.variables";
@import "minerva.mixins";
+// Hide the infobox in alpha JS mode
+.client-js .alpha {
+ .infobox {
+ display: none;
+ }
+}
+
/* Hide some on-wiki defined classes */
.content {
// Hide cleanup templates by default to non-javascript users as these
stop them from reading the article itself
diff --git a/templates/modules/infobox/Infobox.hogan
b/templates/modules/infobox/Infobox.hogan
index 0fd73cb..33b53ca 100644
--- a/templates/modules/infobox/Infobox.hogan
+++ b/templates/modules/infobox/Infobox.hogan
@@ -1,6 +1,8 @@
{{description}}
{{^rows}}
-expand…
+
+ expand…
+
{{/rows}}
{{{spinner}}}
{{#rows}}
--
To view, visit https://gerrit.wikimedia.org/r/173428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5de721a61879ed9301c4ef25497ea79a7bb8f16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure we don't show WikiGrok in version B unless there a... - change (mediawiki...MobileFrontend)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173445
Change subject: Make sure we don't show WikiGrok in version B unless there are
suggestions
..
Make sure we don't show WikiGrok in version B unless there are suggestions
Also, making sure we have proper error handling in place in version B.
Bug: 73437
Change-Id: I71801d516cd5a2453fc4abe70ba91e4b4bb65895
---
M javascripts/modules/wikigrok/WikiGrokDialogB.js
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/45/173445/1
diff --git a/javascripts/modules/wikigrok/WikiGrokDialogB.js
b/javascripts/modules/wikigrok/WikiGrokDialogB.js
index 81e0948..febf7db 100644
--- a/javascripts/modules/wikigrok/WikiGrokDialogB.js
+++ b/javascripts/modules/wikigrok/WikiGrokDialogB.js
@@ -190,10 +190,18 @@
self.apiWikiData.getClaims().done( function ( claims ) {
if ( claims.isHuman ) {
self.apiWikiGrokSuggestion.getSuggestions().done( function ( suggestions ) {
- if ( !$.isEmptyObject(
suggestions ) ) {
+ if ( ( suggestions.occupations
&& suggestions.occupations.list.length ) ||
+ (
suggestions.nationalities && suggestions.nationalities.list.length ) ||
+ ( suggestions.schools
&& suggestions.schools.list.length )
+ ) {
options.suggestions =
suggestions;
self.show();
+ } else {
+ // FIXME: remove this
before deploying to stable
+ self.logError(
'no-impression-not-enough-suggestions' );
}
+ } ).fail( function () {
+ self.logError(
'no-impression-cannot-fetch-suggestions' );
} );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/173445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71801d516cd5a2453fc4abe70ba91e4b4bb65895
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't load infobox on main page / non-main namespace articles - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't load infobox on main page / non-main namespace articles
..
Don't load infobox on main page / non-main namespace articles
Change-Id: Ib7febb797df4ae4e05933a7a8e545572f5e877e1
---
M javascripts/modules/infobox/init.js
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/infobox/init.js
b/javascripts/modules/infobox/init.js
index 981fa4c..08d6e23 100644
--- a/javascripts/modules/infobox/init.js
+++ b/javascripts/modules/infobox/init.js
@@ -1,10 +1,12 @@
( function ( M, $ ) {
M.assertMode( [ 'alpha' ] );
var infobox,
+ page = M.getCurrentPage(),
wikidataID = mw.config.get( 'wgWikibaseItemId' ),
Infobox = M.require( 'modules/wikigrok/Infobox' );
- if ( wikidataID ) {
+ // Load infoboxes on pages in the main space which are not main pages
+ if ( wikidataID && !page.isMainPage() && page.getNamespaceId() === 0 ) {
// upset people
$( '.infobox' ).hide();
// build the future
--
To view, visit https://gerrit.wikimedia.org/r/173427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7febb797df4ae4e05933a7a8e545572f5e877e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] update references test for modern RSpec syntax - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/173444 Change subject: [BrowserTest] update references test for modern RSpec syntax .. [BrowserTest] update references test for modern RSpec syntax simple update to a nice test Change-Id: Iad00e779295ccc610d20241693a87b76b817fbd6 --- M modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/44/173444/1 diff --git a/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb index 49ecc8b..72c56a6 100644 --- a/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb +++ b/modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb @@ -46,17 +46,17 @@ end Then(/^first link to reference should be visible$/) do - on(VisualEditorPage).first_reference_element.when_present.should be_visible + expect(on(VisualEditorPage).first_reference_element.when_present).to be_visible end Then(/^second link to reference should be visible$/) do - on(VisualEditorPage).second_reference_element.when_present.should be_visible + expect(on(VisualEditorPage).second_reference_element.when_present).to be_visible end Then(/^I should see Insert reference button enabled$/) do - on(VisualEditorPage).insert_reference_element.should be_visible + expect(on(VisualEditorPage).insert_reference_element).to be_visible end Then(/^link to Insert menu should be visible$/) do - on(VisualEditorPage).insert_menu_element.should be_visible + expect(on(VisualEditorPage).insert_menu_element).to be_visible end \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/173444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad00e779295ccc610d20241693a87b76b817fbd6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore original rowspan/colspan rather than normalizing or ... - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173443
Change subject: Restore original rowspan/colspan rather than normalizing or
overwriting with NaN
..
Restore original rowspan/colspan rather than normalizing or overwriting with NaN
Store originalRowspan/Colspan as strings instead of numbers,
so we get the actual original value. Use the original value
if the number we're setting is not really different
(prevents normalization of "02" to "2") or is NaN
(prevents normalization of "2 blah" to "NaN").
Bonus: don't modify dataElement.attributes
Change-Id: Ic30e0d6f7bfe27c10e505b7c18fe9200f322cfc7
---
M src/dm/nodes/ve.dm.TableCellNode.js
M tests/dm/ve.dm.example.js
2 files changed, 46 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/43/173443/1
diff --git a/src/dm/nodes/ve.dm.TableCellNode.js
b/src/dm/nodes/ve.dm.TableCellNode.js
index ba267d1..85e2dd4 100644
--- a/src/dm/nodes/ve.dm.TableCellNode.js
+++ b/src/dm/nodes/ve.dm.TableCellNode.js
@@ -52,12 +52,12 @@
if ( colspan !== null && colspan !== '' ) {
attributes.colspan = Number( colspan );
- attributes.originalColspan = attributes.colspan;
+ attributes.originalColspan = colspan;
}
if ( rowspan !== null && rowspan !== '' ) {
attributes.rowspan = Number( rowspan );
- attributes.originalRowspan = attributes.rowspan;
+ attributes.originalRowspan = rowspan;
}
return {
@@ -69,18 +69,31 @@
ve.dm.TableCellNode.static.toDomElements = function ( dataElement, doc ) {
var tag = dataElement.attributes && dataElement.attributes.style ===
'header' ? 'th' : 'td',
domElement = doc.createElement( tag ),
- attributes = dataElement.attributes;
+ attributes = dataElement.attributes,
+ spans = {
+ colspan: attributes.colspan,
+ rowspan: attributes.rowspan
+ };
// Ignore spans of 1 unless they were in the original HTML
- if ( attributes.colspan === 1 && !attributes.originalColspan ) {
- attributes.colspan = null;
+ if ( attributes.colspan === 1 && Number( attributes.originalColspan )
!== 1 ) {
+ spans.colspan = null;
}
- if ( attributes.rowspan === 1 && !attributes.originalRowspan ) {
- attributes.rowspan = null;
+ if ( attributes.rowspan === 1 && Number( attributes.originalRowspan )
!== 1 ) {
+ spans.rowspan = null;
}
- ve.setDomAttributes( domElement, dataElement.attributes, [ 'colspan',
'rowspan' ] );
+ // Use original value if the numerical value didn't change, or if the
numerical value is NaN
+ if ( attributes.colspan === Number( attributes.originalColspan ) ||
isNaN( attributes.colspan ) ) {
+ spans.colspan = attributes.originalColspan;
+ }
+
+ if ( attributes.rowspan === Number( attributes.originalRowspan ) ||
isNaN( attributes.rowspan ) ) {
+ spans.rowspan = attributes.originalRowspan;
+ }
+
+ ve.setDomAttributes( domElement, spans );
return [ domElement ];
};
diff --git a/tests/dm/ve.dm.example.js b/tests/dm/ve.dm.example.js
index 515bb85..7f3c4e9 100644
--- a/tests/dm/ve.dm.example.js
+++ b/tests/dm/ve.dm.example.js
@@ -776,7 +776,7 @@
];
ve.dm.example.complexTableHtml =
'FooBar' +
-
'BazQuuxWhee';
+ 'BazQuuxWhee';
ve.dm.example.complexTable = [
{ type: 'table' },
@@ -800,7 +800,14 @@
{ type: '/tableSection' },
{ type: 'tableSection', attributes: { style: 'footer' } },
{ type: 'tableRow' },
- { type: 'tableCell', attributes: { style: 'data' } },
+ {
+ type: 'tableCell',
+ attributes: {
+ style: 'data',
+ colspan: 2,
+ originalColspan: '2'
+ }
+ },
{ type: 'paragraph', internal: { generated: 'wrapper' } },
'B',
'a',
@@ -811,7 +818,14 @@
{ type: '/tableSection' },
{ type: 'tableSection', attributes: { style: 'body' } },
{ type: 'tableRow' },
- { type: 'tableCell', attributes: { style: 'data' } },
+ {
+ type: 'tableCell',
+ attributes: {
+ style: 'data',
+ rowspan: 2,
+ originalRowspan: '02'
+ }
+ },
{ type: 'paragraph', internal: { generated: 'wrapper' } },
'Q',
'u',
@@ -819,7 +833,14 @@
'x',
{ type: '/paragraph' },
{ type: '/tableCell' },
- { type: 'tableCell', attributes: { style: 'data' } },
+ {
+ type: 'tableCell',
+
[MediaWiki-commits] [Gerrit] ssh server: make PermitRootLogin configurable - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: ssh server: make PermitRootLogin configurable
..
ssh server: make PermitRootLogin configurable
Change-Id: I2ff3755b5c0842aae0367d63a25a079aace1a509
---
M modules/ssh/manifests/server.pp
M modules/ssh/templates/sshd_config.erb
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index 255ab46..2f2670e 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -1,6 +1,7 @@
class ssh::server (
$listen_port = '22',
$listen_address = undef,
+$permit_root = true,
) {
package { 'openssh-server':
ensure => latest;
diff --git a/modules/ssh/templates/sshd_config.erb
b/modules/ssh/templates/sshd_config.erb
index 4d67e46..12394f4 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -28,7 +28,12 @@
# Authentication:
LoginGraceTime 120
+<% if @permit_root %>
PermitRootLogin yes
+<% else %>
+PermitRootLogin no
+<% end %>
+
StrictModes yes
RSAAuthentication yes
--
To view, visit https://gerrit.wikimedia.org/r/172804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ff3755b5c0842aae0367d63a25a079aace1a509
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: JanZerebecki
Gerrit-Reviewer: John F. Lewis
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't allow dropping inside a handlesOwnChildren node - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173442
Change subject: Don't allow dropping inside a handlesOwnChildren node
..
Don't allow dropping inside a handlesOwnChildren node
Change-Id: I56f1f84adb8602d3bf78bbe2ca3a6ace41438e54
---
M src/ce/ve.ce.Surface.js
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/42/173442/1
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index be1d420..f128ca9 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -822,7 +822,7 @@
if ( !this.relocatingNode ) {
return;
}
- var $target, $dropTarget, node, dropPosition, nodeType;
+ var $target, $dropTarget, node, dropPosition, nodeType,
inHandlesOwnChildren;
if ( !this.relocatingNode.isContent() ) {
e.preventDefault();
@@ -835,6 +835,15 @@
node = node.parent;
}
if ( node.parent ) {
+ inHandlesOwnChildren = false;
+ node.parent.traverseUpstream( function ( n ) {
+ if ( n.handlesOwnChildren() ) {
+ inHandlesOwnChildren = true;
+ return false;
+ }
+ } );
+ }
+ if ( node.parent && !inHandlesOwnChildren ) {
$dropTarget = node.$element;
dropPosition = e.originalEvent.pageY -
$dropTarget.offset().top > $dropTarget.outerHeight() / 2 ? 'bottom' : 'top';
} else {
--
To view, visit https://gerrit.wikimedia.org/r/173442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56f1f84adb8602d3bf78bbe2ca3a6ace41438e54
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] Deploy Translate extension on ca.wikimedia - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Deploy Translate extension on ca.wikimedia .. Deploy Translate extension on ca.wikimedia Change-Id: If60e3fe979bd6b3ac2904cf8af717e898d2d56c7 RT: 8856 Bug: 73394 --- M wmf-config/InitialiseSettings.php 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved Nikerabbit: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, but someone else must approve diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7c7fcba..4fc8274 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8054,6 +8054,9 @@ '+cawiki' => array( 'sysop' => array( 'rollbacker', 'autopatrolled', 'abusefilter', 'accountcreator' ), // bug 56570 ), + '+cawikimedia' => array( + 'bureaucrat' => array ( 'translationadmin' ), // Bug 73394 + ), '+checkuserwiki' => array( 'bureaucrat' => array( 'accountcreator', 'import', 'transwiki', 'user', 'autoconfirmed', 'ipblock-exempt', ), ), @@ -8621,6 +8624,9 @@ ), '+cawiki' => array( 'sysop' => array( 'rollbacker', 'autopatrolled', 'abusefilter', 'accountcreator' ), // bug 56570 + ), + '+cawikimedia' => array( + 'bureaucrat' => array( 'translationadmin' ), // Bug 73394 ), '+checkuserwiki' => array( 'bureaucrat' => array( 'sysop', 'accountcreator', 'import', 'transwiki', 'user', 'autoconfirmed', 'ipblock-exempt', 'bureaucrat', ), @@ -10771,6 +10777,7 @@ 'commonswiki' => array( 'sysop' => array( 'translationadmin' ) ), // Bug 54732 'metawiki' => array( 'sysop' => array( 'flood', 'translationadmin' ) ), // Bug 37198 'otrs_wikiwiki' => array( 'sysop' => array( 'translationadmin' ) ), // bug 61297 + 'cawikimedia' => array( 'sysop' => array( 'translationadmin' ) ), // Bug 73394 'enwikibooks' => array( 'sysop' => array( 'flood' ) ), 'enwikinews' => array( 'sysop' => array( 'flood' ) ), 'enwikisource' => array( 'sysop' => array( 'flood' ) ), //Bug 36863 @@ -10790,6 +10797,7 @@ 'commonswiki' => array( 'sysop' => array( 'translationadmin' ) ), // Bug 54732 'metawiki' => array( 'sysop' => array( 'flood', 'translationadmin' ) ), // Bug 37198 'otrs_wikiwiki' => array( 'sysop' => array( 'translationadmin' ) ), // Bug 61297 + 'cawikimedia' => array( 'sysop' => array( 'translationadmin' ) ), // Bug 73394 'ckbwiki' => array( 'flood' => array( 'flood' ), // Bug 51803 'botadmin' => array( 'botadmin' ), // Bug 51803 @@ -12981,6 +12989,7 @@ 'default' => false, 'bewikimedia' => true, // bug 37391 'brwikimedia' => true, // bug 44054 + 'cawikimedia' => true, // Bug 73394 'collabwiki' => true, 'commonswiki' => true, // bug 48620 'incubatorwiki' => true, // bug 34213 @@ -13053,6 +13062,7 @@ 'default' => false, 'testwiki' => true, 'brwikimedia' => true, // Bug 44054 + 'cawikimedia' => true, // Bug 73394 'incubatorwiki' => true, 'mediawikiwiki' => true, 'metawiki' => true, -- To view, visit https://gerrit.wikimedia.org/r/173229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If60e3fe979bd6b3ac2904cf8af717e898d2d56c7 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Reedy 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 gitignore - change (labs...wikipedia-android-builds)
Yuvipanda has submitted this change and it was merged. Change subject: Update gitignore .. Update gitignore Change-Id: I1f95494d111b197fe582bd0633dca554b9e4b869 --- M .gitignore 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore index dc6fb23..aaef71a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ -android-sdk*/ -apache-maven*/ -wikipedia/ -job/ -tmp/ +/public_html/runs/ +*.pyc *.log *.cnf .* -- To view, visit https://gerrit.wikimedia.org/r/173441 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f95494d111b197fe582bd0633dca554b9e4b869 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikipedia-android-builds Gerrit-Branch: master Gerrit-Owner: BearND Gerrit-Reviewer: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update SDK download/update scripts for new location - change (labs...wikipedia-android-builds)
Yuvipanda has submitted this change and it was merged. Change subject: Update SDK download/update scripts for new location .. Update SDK download/update scripts for new location Also ran the update script to update the SDK for 5.0 Change-Id: I13485e9e4e27658ac28c08d60ddd4b75fc75fb1d --- M bin/download-android-sdk.bash M bin/update-android-sdk.bash 2 files changed, 5 insertions(+), 6 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/bin/download-android-sdk.bash b/bin/download-android-sdk.bash index 139450d..b395fe0 100644 --- a/bin/download-android-sdk.bash +++ b/bin/download-android-sdk.bash @@ -1,5 +1,4 @@ -SDK_HOME_PATH="$HOME" -SDK_PATH="$SDK_HOME_PATH/android-sdk-linux" +SDK_HOME_PATH="/srv/adk" # Needs to be updated when new releases are made SDK_DOWNLOAD_URL="http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz"; diff --git a/bin/update-android-sdk.bash b/bin/update-android-sdk.bash index 7281493..c28fba1 100644 --- a/bin/update-android-sdk.bash +++ b/bin/update-android-sdk.bash @@ -1,8 +1,8 @@ -SDK_HOME_PATH="$HOME" -SDK_PATH="$SDK_HOME_PATH/android-sdk-linux" -SDK_PACKAGES="tools,platform-tools,build-tools-20.0.0,android-19,extra-android-m2repository" +SDK_PATH="/srv/adk" +SDK_PACKAGES="tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository" +export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" export _JAVA_OPTIONS="-Xmx256m" -export ANDROID_SWT="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext" +export ANDROID_SWT="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext" # Just install platform-tools, build-tools & Android-19 # Filter names are from `android list sdk -e -a` -- To view, visit https://gerrit.wikimedia.org/r/173440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13485e9e4e27658ac28c08d60ddd4b75fc75fb1d Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikipedia-android-builds Gerrit-Branch: master Gerrit-Owner: BearND Gerrit-Reviewer: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: move beta::mwdeploy_sudo to mediawiki::users - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: mediawiki: move beta::mwdeploy_sudo to mediawiki::users
..
mediawiki: move beta::mwdeploy_sudo to mediawiki::users
Currently, when deployers run scap, scap SSHs them into each application
servers and runs commands as mwdeploy and as apache by running 'sudo -u
mwdeploy ..', 'sudo -u apache ..', etc. This is possible because users in the
wikidev group are allowed to sudo to mwdeploy and apache. We're changing scap
to make it SSH into each host as mwdeploy, using the shared keyholder key. To
make the migration smooth, we need to continue to allow scap to run commands on
application servers by running 'sudo -u mwdeploy' or ('-u apache'). At the
moment, however, mwdeploy is not allowed to sudo as itself.
Bryan has already done this for beta, so it's simply a matter of moving the
code to mediawiki::users rather than the beta-specific beta::mwdeploy_sudo.
This scheme conforms to the security hierarchy:
https://wikitech.wikimedia.org/wiki/UID
Change-Id: I50a5aa3ffa102556f2efcd5ad3c2b7a046511722
---
M modules/beta/manifests/autoupdater.pp
D modules/beta/manifests/mwdeploy_sudo.pp
M modules/beta/manifests/scap/target.pp
M modules/mediawiki/manifests/users.pp
4 files changed, 11 insertions(+), 18 deletions(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
Ori.livneh: Verified; Looks good to me, approved
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/beta/manifests/autoupdater.pp
b/modules/beta/manifests/autoupdater.pp
index d31074b..3205801 100644
--- a/modules/beta/manifests/autoupdater.pp
+++ b/modules/beta/manifests/autoupdater.pp
@@ -6,7 +6,6 @@
class beta::autoupdater {
include ::beta::config
require misc::deployment::common_scripts
-include ::beta::mwdeploy_sudo
$stage_dir = $::beta::config::scap_stage_dir
diff --git a/modules/beta/manifests/mwdeploy_sudo.pp
b/modules/beta/manifests/mwdeploy_sudo.pp
deleted file mode 100644
index 9c4c4c6..000
--- a/modules/beta/manifests/mwdeploy_sudo.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# == Class: beta::mwdeploy_sudo
-#
-# Manage sudo rights for the mwdeploy user.
-#
-class beta::mwdeploy_sudo {
-# Grant mwdeploy sudo rights to run anything as itself, apache or
-# l10nupdate and to (re)start the hhvm fcgi service. This is a subset of
-# the rights granted to the wikidev group by the mediawiki::users class.
-sudo::user { 'mwdeploy' :
-privileges => [
-'ALL = (apache,mwdeploy,l10nupdate) NOPASSWD: ALL',
-'ALL = (root) NOPASSWD: /sbin/restart hhvm',
-'ALL = (root) NOPASSWD: /sbin/start hhvm',
-]
-}
-}
diff --git a/modules/beta/manifests/scap/target.pp
b/modules/beta/manifests/scap/target.pp
index 4958a4f..541c56f 100644
--- a/modules/beta/manifests/scap/target.pp
+++ b/modules/beta/manifests/scap/target.pp
@@ -5,7 +5,6 @@
class beta::scap::target {
include ::beta::config
include ::mediawiki::scap
-include ::beta::mwdeploy_sudo
# Install authorized_keys for mwdeploy user
file { '/etc/ssh/userkeys/mwdeploy':
diff --git a/modules/mediawiki/manifests/users.pp
b/modules/mediawiki/manifests/users.pp
index 5f00aef..db1f493 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -106,6 +106,17 @@
],
}
+# Grant mwdeploy sudo rights to run anything as itself or apache.
+# This allows MediaWiki deployers to deploy as mwdeploy.
+
+sudo::user { 'mwdeploy':
+privileges => [
+'ALL = (apache,mwdeploy,l10nupdate) NOPASSWD: ALL',
+'ALL = (root) NOPASSWD: /sbin/restart hhvm',
+'ALL = (root) NOPASSWD: /sbin/start hhvm',
+]
+}
+
sudo::user { 'l10nupdate':
require=> User['l10nupdate', 'mwdeploy'],
privileges => ['ALL = (mwdeploy) NOPASSWD: ALL'],
--
To view, visit https://gerrit.wikimedia.org/r/173364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50a5aa3ffa102556f2efcd5ad3c2b7a046511722
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trebuchet: Fix-up for Ie6673c8af - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: trebuchet: Fix-up for Ie6673c8af
..
trebuchet: Fix-up for Ie6673c8af
'./.' doesn't point to the local Git repository, since we aren't invoking git
from the repository directory.
Change-Id: I296bf161173c98c844fd06b61ae18e411882e2e0
---
M modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
b/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
index 39e4892..a3638e3 100644
--- a/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
+++ b/modules/trebuchet/lib/puppet/provider/package/trebuchet.rb
@@ -142,9 +142,9 @@
# Get the SHA1 associated with a Git tag.
def resolve_tag(tag)
-['origin', './.'].each do |remote|
+['origin', target_path].each do |remote|
sha1 = git('ls-remote', remote, '--tags', "refs/tags/#{tag}")
- return sha1[/^\S+/] if sha1.is_a?(String)
+ return sha1[/^\S+/] unless sha1.nil? or sha1.empty?
end
rescue Puppet::ExecutionFailure
end
--
To view, visit https://gerrit.wikimedia.org/r/173438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I296bf161173c98c844fd06b61ae18e411882e2e0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
