[MediaWiki-commits] [Gerrit] lint - change (mediawiki/vagrant)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: lint
..

lint

* Use single quotes unless interpolating variables.
* Prefer hash representation of MediaWiki config vars.
* When present, 'ensure' should be the first property in a declaration.
* Align arrows.

Change-Id: I04fb433daf3e73bf16cef1a62f076fcd8976a55c
---
M puppet/manifests/roles/accountinfo.pp
M puppet/manifests/roles/wikidiff2.pp
M puppet/manifests/roles/wikimetrics.pp
M puppet/modules/php/manifests/remote_debug.pp
4 files changed, 12 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/26/117826/1

diff --git a/puppet/manifests/roles/accountinfo.pp 
b/puppet/manifests/roles/accountinfo.pp
index faf9911..1f97d1e 100644
--- a/puppet/manifests/roles/accountinfo.pp
+++ b/puppet/manifests/roles/accountinfo.pp
@@ -1,8 +1,7 @@
 # == Class: role::accountinfo
-# The AccountInfo extension allows users to look at
-# private information that is stored about them.
-# It also includes the CheckUser extension, which
-# AccountInfo integrates with.
+# The AccountInfo extension allows users to look at private information
+# that is stored about them. It also includes the CheckUser extension,
+# which AccountInfo integrates with.
 class role::accountinfo {
 include role::mediawiki
 
@@ -11,12 +10,7 @@
 }
 
 mediawiki::extension { 'AccountInfo':
-settings => {
-wgPutIPinRC => true,
-},
-require => [
-Mediawiki::Extension['CheckUser'],
-],
-
+settings => { 'wgPutIPinRC' => true, },
+require  => Mediawiki::Extension['CheckUser'],
 }
 }
diff --git a/puppet/manifests/roles/wikidiff2.pp 
b/puppet/manifests/roles/wikidiff2.pp
index bec3e48..1e6af30 100644
--- a/puppet/manifests/roles/wikidiff2.pp
+++ b/puppet/manifests/roles/wikidiff2.pp
@@ -6,10 +6,10 @@
 include packages::wikidiff2
 
 mediawiki::settings { 'wikidiff2':
-ensure   => present,
-values   => [
-'$wgExternalDiffEngine = "wikidiff2";',
-],
-require  => Package["php-wikidiff2"],
+ensure  => present,
+require => Package['php-wikidiff2'],
+values  => {
+'wgExternalDiffEngine' => 'wikidiff2',
+},
 }
 }
diff --git a/puppet/manifests/roles/wikimetrics.pp 
b/puppet/manifests/roles/wikimetrics.pp
index 7c5e88f..9eac165 100644
--- a/puppet/manifests/roles/wikimetrics.pp
+++ b/puppet/manifests/roles/wikimetrics.pp
@@ -71,7 +71,7 @@
 class { '::wikimetrics::database':
 db_root_pass => $::role::mysql::db_pass,
 wikimetrics_path => $wikimetrics_path,
-require => Exec['install_wikimetrics_dependencies'],
+require  => Exec['install_wikimetrics_dependencies'],
 }
 
 class { '::wikimetrics::queue':
diff --git a/puppet/modules/php/manifests/remote_debug.pp 
b/puppet/modules/php/manifests/remote_debug.pp
index e8d81e1..b00f815 100644
--- a/puppet/modules/php/manifests/remote_debug.pp
+++ b/puppet/modules/php/manifests/remote_debug.pp
@@ -32,8 +32,8 @@
 
 # Remove apt package so it doesn't clash with PECL package
 package { 'purge php5-xdebug':
-name   => 'php5-xdebug',
 ensure => purged,
+name   => 'php5-xdebug',
 }
 
 php::ini { 'remote_debug':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04fb433daf3e73bf16cef1a62f076fcd8976a55c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] WIP Schema change: create tables - change (mediawiki...Campaigns)

[AndyRussG (Code Review)]

AndyRussG has uploaded a new change for review.

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

Change subject: WIP Schema change: create tables
..

WIP Schema change: create tables

Change-Id: I6ae2151ad9ec34a2708560705515308baecbaa76
---
M Campaigns.hooks.php
M Campaigns.php
A sql/CampaignsCampaignTable.sql
A sql/CampaignsParticipationTable.sql
4 files changed, 95 insertions(+), 0 deletions(-)


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

diff --git a/Campaigns.hooks.php b/Campaigns.hooks.php
index e9c8d83..90102c3 100644
--- a/Campaigns.hooks.php
+++ b/Campaigns.hooks.php
@@ -2,12 +2,39 @@
 
 namespace Campaigns;
 
+use \DatabaseUpdater;
+
 /**
  * Static methods for hooks.
  */
 class Hooks {
 
/**
+* Update database schema to add Campaigns tables.
+*
+* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/LoadExtensionSchemaUpdates
+*
+* @param DatabaseUpdater $updater
+* @return bool
+*/
+   public static function onLoadExtensionSchemaUpdate( DatabaseUpdater 
$updater ) {
+
+   $sqlDir = __DIR__ . '/sql';
+
+   $updater->addExtensionTable(
+   'campaigns_campaign',
+   $sqlDir . '/CampaignsCampaignTable.sql'
+   );
+
+   $updater->addExtensionTable(
+   'campaigns_participation',
+   $sqlDir . '/CampaignsParticipationTable.sql'
+   );
+
+   return true;
+   }
+
+   /**
 * If there's a ?campaign=someName in the query string and the user is 
not
 * logged in, send JavaScript with the page to process campaign.
 *
diff --git a/Campaigns.php b/Campaigns.php
index bffe0ec..c26527d 100644
--- a/Campaigns.php
+++ b/Campaigns.php
@@ -37,6 +37,7 @@
 $wgHooks['UserCreateForm'][] = 'Campaigns\Hooks::onUserCreateForm';
 $wgHooks['AddNewAccount'][] = 'Campaigns\Hooks::onAddNewAccount';
 $wgHooks['UserLoginForm'][] = 'Campaigns\Hooks::onUserLoginForm';
+$wgHooks['LoadExtensionSchemaUpdates'][] = 
'Campaigns\Hooks::onLoadExtensionSchemaUpdate';
 
 
 // Modules
diff --git a/sql/CampaignsCampaignTable.sql b/sql/CampaignsCampaignTable.sql
new file mode 100644
index 000..852ab13
--- /dev/null
+++ b/sql/CampaignsCampaignTable.sql
@@ -0,0 +1,34 @@
+-- Table for information about campaigns
+CREATE TABLE IF NOT EXISTS /*_*/campaigns_campaign (
+
+   -- Auto-increment id
+   campaign_id int unsigned NOT NULL PRIMARY KEY auto_increment,
+
+   -- Time the campaign was created
+   campaign_time_created varbinary(14) NOT NULL,
+
+   -- A string to identify the campaign in URLs
+   campaign_url_id varchar(255) NOT NULL UNIQUE,
+
+   -- Name of the campaign
+   campaign_name varchar(255) NOT NULL UNIQUE,
+
+   -- ID of a page about the campaign, foreign key on page.page_id
+   campaign_wikipage_id int unsigned,
+
+   -- Flag to use only legacy features for participations in this campaign
+   -- (i.e., just log via EventLogging when an account is created with the
+   -- campaign's URL ID in the URL)
+   campaign_legacy boolean NOT NULL default false
+
+) /*$wgDBTableOptions*/;
+
+-- Indexes
+CREATE UNIQUE INDEX /*i*/campaigns_campaign_id ON
+   /*_*/campaigns_campaign (campaign_id);
+
+CREATE UNIQUE INDEX /*i*/campaigns_campaign_url_id ON
+   /*_*/campaigns_campaign (campaign_url_id);
+
+CREATE UNIQUE INDEX /*i*/campaigns_campaign_name ON
+   /*_*/campaigns_campaign (campaign_name);
diff --git a/sql/CampaignsParticipationTable.sql 
b/sql/CampaignsParticipationTable.sql
new file mode 100644
index 000..24434cf
--- /dev/null
+++ b/sql/CampaignsParticipationTable.sql
@@ -0,0 +1,33 @@
+-- Table for participations in a campaign
+CREATE TABLE IF NOT EXISTS /*_*/campaigns_participation (
+
+   -- Auto-increment id
+   participation_id int unsigned NOT NULL PRIMARY KEY auto_increment,
+
+   -- User ID, foreign key on user.user_id
+   participation_user_id INT unsigned NOT NULL,
+
+   -- Campaign ID, foreign key on campaigns_campaign.campaign_id
+   participation_campaign_id INT unsigned NOT NULL,
+
+   -- Time the user joined the campaign
+   participation_time_joined varbinary(14) NOT NULL,
+
+   -- Time the user left the campaign
+   participation_time_left varbinary(14),
+
+   -- Flag for campaign organizers
+   particiption_organizer boolean NOT NULL default false
+
+) /*$wgDBTableOptions*/;
+
+-- Indexes
+CREATE UNIQUE INDEX /*i*/campaigns_participation_id ON
+   /*_*/campaigns_participation (participation_id);
+
+CREATE INDEX /*i*/campaigns_participation_camp_id_org_active ON
+   /*_*/campaigns_participation (participation_campaign_id,
+   particiption_organizer, participation_time_left);
+
+CREATE INDEX /*i*/campaigns_participation_user_i

[MediaWiki-commits] [Gerrit] WIP: Support structured logging and lazy pulling for backends. - change (mediawiki...parsoid)

[Mariapacana (Code Review)]

Mariapacana has uploaded a new change for review.

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

Change subject: WIP: Support structured logging and lazy pulling for backends.
..

WIP: Support structured logging and lazy pulling for backends.

Change-Id: I11aa47bf5ec460be35011a63b78cffe886bbfd28
---
M api/ParsoidService.js
A lib/LogData.js
M lib/Logger.js
3 files changed, 181 insertions(+), 97 deletions(-)


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

diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index ed7aeb9..f826cab 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -439,32 +439,12 @@
function parserEnvMw( req, res, next ) {
MWParserEnvironment.getParserEnv( parsoidConfig, null, 
res.local('iwp'), res.local('pageName'), req.headers.cookie, function ( err, 
env ) {
 
-   function generateErrCBMessage (obj) {
-   var messageString = "";
-   if (obj.constructor.name === "Error") {
-   messageString += obj.message;
-   messageString += 'ERROR in ' + 
res.local('iwp') + ':' + res.local('pageName');
-   messageString += "\n" + obj.stack;
-   } else {
-   if (obj.msg) {
-   messageString += obj.msg;
-   }
-   if (obj.location) {
-   messageString += "\n" + 
obj.location;
-   }
-   if (obj.stack) {
-   messageString += "\n" + 
obj.stack;
-   }
-   }
-   return messageString;
-   }
-
function errCB ( res, env, obj, callback ) {
try {
if (env.responseSent) {
return;
} else {
-   var messageString = 
generateErrCBMessage(obj);
+   var messageString = obj.fullMsg;
setHeader(res, env, 
'Content-Type', 'text/plain; charset=UTF-8' );
sendResponse(res, env, 
messageString, obj.code || 500);
res.on('finish', callback);
diff --git a/lib/LogData.js b/lib/LogData.js
new file mode 100644
index 000..207a7a9
--- /dev/null
+++ b/lib/LogData.js
@@ -0,0 +1,164 @@
+"use strict";
+require('./core-upgrade.js');
+
+var Util = require( './mediawiki.Util.js' ).Util,
+   DU = require( './mediawiki.DOMUtils.js').DOMUtils,
+   util = require('util'),
+   defines = require('./mediawiki.parser.defines.js'),
+   async = require('async');
+
+/**
+ *
+ * Extract properties and generate messages for logged objects.
+ *
+ * @class
+ * @constructor
+ * @param {MWParserEnvironment} env
+ * @param {string} logType
+ * @param {object} logObject
+ */
+
+var LogData = function (env, logType, logObject) {
+   this.env = env;
+   this.logType = logType;
+   this.logObject = logObject;
+
+   this.includeStackTrace = 
/(^(error|fatal)|(^|\/)stacktrace)(\/|$)/.test(logType);
+   this.shouldAnnounceLocation = /^(error|warning)(\/|$)/.test(logType);
+
+   // Cache log information if previously constructed.
+   this.cachedStack = null;
+   this.cachedflatLO = null;
+   this.cachedMsg = null;
+   this.cachedLoc = null;
+   this.cachedFullMsg = null;
+
+   // Expose specific logData properties so backends can access them
+   // as needed; compute them on demand with defineProperty.
+   Object.defineProperty(this,
+   
"flatLO",
+   
{get: this.getOrReturnCachedFlatLO });
+
+   Object.defineProperty(this,
+   
"stack",
+   
{get: this.getOrReturnCachedStack});
+
+   Object.defineProperty(this,
+   
"loc",
+   
{get: this.getOrReturnCachedLo

[MediaWiki-commits] [Gerrit] Added instancetype fact to get labs instance flavor. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Added instancetype fact to get labs instance flavor.
..

Added instancetype fact to get labs instance flavor.

Change-Id: I8889f2dc478aef61e91e4fc819b3e41eb7dd40cf
---
A modules/base/lib/facter/instancetype.rb
1 file changed, 19 insertions(+), 0 deletions(-)


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

diff --git a/modules/base/lib/facter/instancetype.rb 
b/modules/base/lib/facter/instancetype.rb
new file mode 100644
index 000..01afa35
--- /dev/null
+++ b/modules/base/lib/facter/instancetype.rb
@@ -0,0 +1,19 @@
+# ec2id.rb
+#
+# This fact provides the instance type (aka 'flavor') of the running instance.
+# Flavors are names like 'm1.small' or 'm1.large'.  In eqiad there are also
+# flavors duplicated from pmtpa like 'pmtpa-3'.  This is necessary because
+# default flavor names seem to vary by OpenStack version.
+
+require 'facter'
+
+Facter.add(:instancetype) do
+  setcode do
+domain = Facter::Util::Resolution.exec("hostname -d").chomp
+if domain.include? "wmflabs"
+  Facter::Util::Resolution.exec("curl 
http://169.254.169.254/2009-04-04/meta-data/instance-type 2> /dev/null").chomp
+else
+  ""
+end
+  end
+end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8889f2dc478aef61e91e4fc819b3e41eb7dd40cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] v1.3.2.1 - change (xowa)

[Gnosygnu (Code Review)]

Gnosygnu has submitted this change and it was merged.

Change subject: v1.3.2.1
..


v1.3.2.1

Change-Id: I8b9f4b6dd31c9776e05da47a6155ef4e46d74ce5
---
M 100_core/src_110_primitive/gplx/ByteAryBfr.java
M 100_core/src_110_primitive/gplx/ByteAryFmtr.java
M 100_core/src_110_primitive/gplx/ByteAry_.java
M 100_core/src_200_io/gplx/Io_mgr.java
M 100_core/src_200_io/gplx/ios/IoStream_.java
M 100_core/src_220_console/gplx/ConsoleAdp.java
M 140_dbs/src_100_core/gplx/dbs/Db_provider_.java
M 400_xowa/src/gplx/fsdb/Fsdb_db_abc_mgr.java
M 400_xowa/src/gplx/gfs/Gfs_parser_tst.java
R 400_xowa/src/gplx/html/Html_consts.java
R 400_xowa/src/gplx/html/Html_utl.java
A 400_xowa/src/gplx/html/Html_utl_tst.java
M 400_xowa/src/gplx/html/Html_wtr.java
M 400_xowa/src/gplx/json/Json_grp.java
M 400_xowa/src/gplx/json/Json_itm.java
M 400_xowa/src/gplx/json/Json_itm_nde.java
M 400_xowa/src/gplx/xowa/Xoa_app.java
M 400_xowa/src/gplx/xowa/Xoa_app_.java
M 400_xowa/src/gplx/xowa/Xoa_shell.java
M 400_xowa/src/gplx/xowa/apps/Apps_app_mgr.java
M 400_xowa/src/gplx/xowa/bldrs/files/Xob_lnki_temp_wkr.java
M 400_xowa/src/gplx/xowa/bldrs/imports/Xob_search_base.java
M 400_xowa/src/gplx/xowa/bldrs/imports/Xobc_core_make_id.java
M 400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_categorylinks_base.java
M 400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_ctg_v1_base.java
M 400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xoctg_link_idx_wkr.java
M 400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_db_txt.java
M 400_xowa/src/gplx/xowa/ctgs/Xoctg_fmtr_itm.java
M 400_xowa/src/gplx/xowa/ctgs/Xoctg_pagelist_itms.java
M 400_xowa/src/gplx/xowa/files/Xof_lnki_file_mgr.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_cfg_mgr.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_dir_itm.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_dir_mgr.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_dir_tbl.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_fil_itm.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_fil_mgr.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_fil_tbl.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_mgr.java
A 400_xowa/src/gplx/xowa/html/ByteAryFmtrArg_html_fmtr.java
R 400_xowa/src/gplx/xowa/html/Xoh_consts.java
M 400_xowa/src/gplx/xowa/html/Xoh_html_mgr.java
R 400_xowa/src/gplx/xowa/html/Xoh_html_tag.java
R 400_xowa/src/gplx/xowa/html/Xoh_html_wtr.java
R 400_xowa/src/gplx/xowa/html/Xoh_html_wtr_tst.java
R 400_xowa/src/gplx/xowa/html/Xoh_lnki_wtr.java
R 400_xowa/src/gplx/xowa/html/Xoh_lnki_wtr_tst.java
C 400_xowa/src/gplx/xowa/html/Xoh_xtn_itm.java
A 400_xowa/src/gplx/xowa/html/Xoh_xtn_mgr.java
M 400_xowa/src/gplx/xowa/html/Xohp_title_wkr.java
M 400_xowa/src/gplx/xowa/html/Xow_html_mgr.java
A 400_xowa/src/gplx/xowa/html/tidy/ProcessAdp_tidy_html.java
A 400_xowa/src/gplx/xowa/html/tidy/Xoh_tidy_mgr.java
M 400_xowa/src/gplx/xowa/html/utils/Xoh_js_cleaner.java
M 400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_html_wtr.java
M 400_xowa/src/gplx/xowa/servers/Gxw_html_server.java
A 400_xowa/src/gplx/xowa/servers/http/File_retrieve_mode.java
R 400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java
R 400_xowa/src/gplx/xowa/servers/tcp/Socket_rdr.java
R 400_xowa/src/gplx/xowa/servers/tcp/Socket_wtr.java
A 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_cmd_types.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_msg.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_msg_rdr.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_msg_rdr_tst.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_server.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_server_tst.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_socket_rdr.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_socket_wtr.java
M 400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages.java
M 400_xowa/src/gplx/xowa/specials/movePage/Move_page.java
M 400_xowa/src/gplx/xowa/users/Xouc_setup_mgr.java
M 400_xowa/src/gplx/xowa/users/dbs/Xou_db_mgr.java
M 400_xowa/src/gplx/xowa/users/prefs/Prefs_html_wtr.java
M 400_xowa/src/gplx/xowa/xtns/Xox_mgr_base.java
M 400_xowa/src/gplx/xowa/xtns/Xox_xnde.java
M 400_xowa/src/gplx/xowa/xtns/categoryList/Xtn_categorylist_nde.java
M 400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_itm.java
M 400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_xnde.java
M 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html.java
M 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_nde.java
M 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser.java
A 400_xowa/src/gplx/xowa/xtns/geoCrumbs/Geoc_isin_mgr.java
A 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_html_wtr.java
A 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_nde.java
R 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_nde_tst.java
A 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_parser.java
C 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_xtn_mgr.java
D 400_xowa/src/gplx/xowa/xtns/hiero/Xtn_hiero_nde.java
M 400_xowa/src/gplx/xowa/xtns/imageMap/Xop_imageMap_xnde.java
M 400_xowa/src/gplx/xowa/xtns/inputBox/Xtn_inputbox_nde.java
M 400_xowa/src/gpl

[MediaWiki-commits] [Gerrit] v1.3.2.1 - change (xowa)

[Gnosygnu (Code Review)]

Gnosygnu has uploaded a new change for review.

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

Change subject: v1.3.2.1
..

v1.3.2.1

Change-Id: I8b9f4b6dd31c9776e05da47a6155ef4e46d74ce5
---
M 100_core/src_110_primitive/gplx/ByteAryBfr.java
M 100_core/src_110_primitive/gplx/ByteAryFmtr.java
M 100_core/src_110_primitive/gplx/ByteAry_.java
M 100_core/src_200_io/gplx/Io_mgr.java
M 100_core/src_200_io/gplx/ios/IoStream_.java
M 100_core/src_220_console/gplx/ConsoleAdp.java
M 140_dbs/src_100_core/gplx/dbs/Db_provider_.java
M 400_xowa/src/gplx/fsdb/Fsdb_db_abc_mgr.java
M 400_xowa/src/gplx/gfs/Gfs_parser_tst.java
R 400_xowa/src/gplx/html/Html_consts.java
R 400_xowa/src/gplx/html/Html_utl.java
A 400_xowa/src/gplx/html/Html_utl_tst.java
M 400_xowa/src/gplx/html/Html_wtr.java
M 400_xowa/src/gplx/json/Json_grp.java
M 400_xowa/src/gplx/json/Json_itm.java
M 400_xowa/src/gplx/json/Json_itm_nde.java
M 400_xowa/src/gplx/xowa/Xoa_app.java
M 400_xowa/src/gplx/xowa/Xoa_app_.java
M 400_xowa/src/gplx/xowa/Xoa_shell.java
M 400_xowa/src/gplx/xowa/apps/Apps_app_mgr.java
M 400_xowa/src/gplx/xowa/bldrs/files/Xob_lnki_temp_wkr.java
M 400_xowa/src/gplx/xowa/bldrs/imports/Xob_search_base.java
M 400_xowa/src/gplx/xowa/bldrs/imports/Xobc_core_make_id.java
M 400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_categorylinks_base.java
M 400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xob_ctg_v1_base.java
M 400_xowa/src/gplx/xowa/bldrs/imports/ctgs/Xoctg_link_idx_wkr.java
M 400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_db_txt.java
M 400_xowa/src/gplx/xowa/ctgs/Xoctg_fmtr_itm.java
M 400_xowa/src/gplx/xowa/ctgs/Xoctg_pagelist_itms.java
M 400_xowa/src/gplx/xowa/files/Xof_lnki_file_mgr.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_cfg_mgr.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_dir_itm.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_dir_mgr.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_dir_tbl.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_fil_itm.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_fil_mgr.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_fil_tbl.java
M 400_xowa/src/gplx/xowa/files/fsdb/caches/Cache_mgr.java
A 400_xowa/src/gplx/xowa/html/ByteAryFmtrArg_html_fmtr.java
R 400_xowa/src/gplx/xowa/html/Xoh_consts.java
M 400_xowa/src/gplx/xowa/html/Xoh_html_mgr.java
R 400_xowa/src/gplx/xowa/html/Xoh_html_tag.java
R 400_xowa/src/gplx/xowa/html/Xoh_html_wtr.java
R 400_xowa/src/gplx/xowa/html/Xoh_html_wtr_tst.java
R 400_xowa/src/gplx/xowa/html/Xoh_lnki_wtr.java
R 400_xowa/src/gplx/xowa/html/Xoh_lnki_wtr_tst.java
C 400_xowa/src/gplx/xowa/html/Xoh_xtn_itm.java
A 400_xowa/src/gplx/xowa/html/Xoh_xtn_mgr.java
M 400_xowa/src/gplx/xowa/html/Xohp_title_wkr.java
M 400_xowa/src/gplx/xowa/html/Xow_html_mgr.java
A 400_xowa/src/gplx/xowa/html/tidy/ProcessAdp_tidy_html.java
A 400_xowa/src/gplx/xowa/html/tidy/Xoh_tidy_mgr.java
M 400_xowa/src/gplx/xowa/html/utils/Xoh_js_cleaner.java
M 400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_html_wtr.java
M 400_xowa/src/gplx/xowa/servers/Gxw_html_server.java
A 400_xowa/src/gplx/xowa/servers/http/File_retrieve_mode.java
R 400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java
R 400_xowa/src/gplx/xowa/servers/tcp/Socket_rdr.java
R 400_xowa/src/gplx/xowa/servers/tcp/Socket_wtr.java
A 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_cmd_types.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_msg.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_msg_rdr.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_msg_rdr_tst.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_server.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_server_tst.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_socket_rdr.java
R 400_xowa/src/gplx/xowa/servers/tcp/Xosrv_socket_wtr.java
M 400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages.java
M 400_xowa/src/gplx/xowa/specials/movePage/Move_page.java
M 400_xowa/src/gplx/xowa/users/Xouc_setup_mgr.java
M 400_xowa/src/gplx/xowa/users/dbs/Xou_db_mgr.java
M 400_xowa/src/gplx/xowa/users/prefs/Prefs_html_wtr.java
M 400_xowa/src/gplx/xowa/xtns/Xox_mgr_base.java
M 400_xowa/src/gplx/xowa/xtns/Xox_xnde.java
M 400_xowa/src/gplx/xowa/xtns/categoryList/Xtn_categorylist_nde.java
M 400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_itm.java
M 400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_xnde.java
M 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_html.java
M 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_nde.java
M 400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser.java
A 400_xowa/src/gplx/xowa/xtns/geoCrumbs/Geoc_isin_mgr.java
A 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_html_wtr.java
A 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_nde.java
R 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_nde_tst.java
A 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_parser.java
C 400_xowa/src/gplx/xowa/xtns/hiero/Hiero_xtn_mgr.java
D 400_xowa/src/gplx/xowa/xtns/hiero/Xtn_hiero_nde.java
M 400_xowa/src/gplx/xowa/xtns/imageMap/Xop_imageMap_xnde.java
M 400_xowa/src/gplx/xowa/xtns/inputBox/Xtn_inp

[MediaWiki-commits] [Gerrit] Remove removed scap symlinks - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Remove removed scap symlinks
..


Remove removed scap symlinks

Remove mention of the deleted scripts entirely from the manifests. This
should not be merged until I15efb3c has been merged and applied on all
effected hosts.

Change-Id: I9f05dc92e363070c7f9b1dc9d74905d7ce0c47c2
---
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 0 insertions(+), 10 deletions(-)

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



diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index c08d6b1..0d3e20b 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -182,13 +182,9 @@
"${scriptpath}/restart-twemproxy":
ensure => link,
target => "/srv/scap/bin/restart-twemproxy";
-   "${scriptpath}/scap-old":
-   ensure => absent;
"${scriptpath}/scap":
ensure => link,
target => "/srv/scap/bin/scap";
-   "${scriptpath}/sync-common-all":
-   ensure => absent;
"${scriptpath}/sync-common-file":
ensure => link,
target => "/srv/scap/bin/sync-common-file";
diff --git a/modules/mediawiki/manifests/sync.pp 
b/modules/mediawiki/manifests/sync.pp
index 5cd888a..803d449 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -18,16 +18,10 @@
$scriptpath = "/usr/local/bin"
 
file {
-   "${scriptpath}/find-nearest-rsync":
-   ensure  => absent;
"${scriptpath}/mwversionsinuse":
ensure  => link,
target  => '/srv/scap/bin/mwversionsinuse',
require => Git::Clone['mediawiki/tools/scap'];
-   "${scriptpath}/scap-1":
-   ensure  => absent;
-   "${scriptpath}/scap-2":
-   ensure  => absent;
"${scriptpath}/scap-rebuild-cdbs":
ensure  => link,
target  => '/srv/scap/bin/scap-rebuild-cdbs',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f05dc92e363070c7f9b1dc9d74905d7ce0c47c2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Dzahn 
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] Force l10n rebuild after bootstrapping - change (mediawiki...scap)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Force l10n rebuild after bootstrapping
..

Force l10n rebuild after bootstrapping

Call rebuildLocalisationCache.php with the `--force` command line option
after bootstrapping English l10n data..

Bug: 51174
Change-Id: I4b24b55e01180dc003a458f5ee7bd7de4128da6c
---
M bin/mw-update-l10n
1 file changed, 5 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/21/117821/1

diff --git a/bin/mw-update-l10n b/bin/mw-update-l10n
index 57b2eb5..d3e7eeb 100755
--- a/bin/mw-update-l10n
+++ b/bin/mw-update-l10n
@@ -21,6 +21,7 @@
 fi
 
 QUIET=--quiet
+FORCE_FULL_REBUILD=
 TEMP=`getopt -o '' -l verbose -- "$@"`
 if [ $? -ne 0 ]; then
exit 1
@@ -64,7 +65,6 @@
fi
 
mwL10nCacheDir="$MW_COMMON_SOURCE/php-$mwVerNum/cache/l10n"
-   mwEnCDBStubbed=
if [[ ! -e $mwL10nCacheDir/l10n_cache-en.cdb ]]; then
# Bug: 51174
# Another potential bootstrapping problem, 
mergeMessageFileList.php
@@ -73,7 +73,9 @@
sudo -u l10nupdate $BINDIR/mwscript 
rebuildLocalisationCache.php \
--wiki="$mwDbName" --lang=en --outdir="$mwL10nCacheDir" 
--quiet ||
die
-   mwEnCDBStubbed=true
+   # Force full rebuild in subequent rebuild call to override stub 
l10n
+   # files
+   FORCE_FULL_REBUILD="--force"
fi
echo -n "Updating ExtensionMessages-$mwVerNum.php..."
mwTempDest=$(sudo -u apache mktemp) || die
@@ -95,17 +97,11 @@
echo "done"
fi
 
-   if [[ -n ${mwEnCDBStubbed} ]]; then
-   # Bug: 51174
-   # Delete stub en localization before full l10n update.
-   echo "Cleaning up stub l10n_cache-en.cdb"
-   sudo -u l10nupdate rm "${mwL10nCacheDir}/l10n_cache-en.cdb"
-   fi
# Rebuild all the CDB files for each language
echo -n "Updating LocalisationCache for $mwVerNum... "
sudo -u l10nupdate $BINDIR/mwscript rebuildLocalisationCache.php \
--wiki="$mwDbName" --outdir="$mwL10nCacheDir" $QUIET \
-   --threads=$THREADS ||
+   --threads=$THREADS $FORCE_FULL_REBUILD ||
die
 
# Include JSON versions of the CDB files and add MD5 files

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b24b55e01180dc003a458f5ee7bd7de4128da6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] Implement multiversion/refreshWikiversionsCDB in python - change (mediawiki...scap)

[jenkins-bot (Code Review)]

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

Change subject: Implement multiversion/refreshWikiversionsCDB in python
..


Implement multiversion/refreshWikiversionsCDB in python

Adds a pure python version of the multiversion/refreshWikiversionsCDB
PHP script.

* Add wmf_realm and datacenter configuration settings
* Add a python implementation of MWRealm's getRealmSpecificFilename
* Import cdblib.py from https://python-pure-cdb.googlecode.com/
* Add tasks.compile_wikiversions_cdb as a refreshWikiversionsCDB
  workalike
* Change tasks.scap to use compile_wikiversions_cdb instead of shelling
  out to PHP script

Change-Id: Ie50be09e724b276a009037a4ee2fd059d1fd87dc
---
M docs/api.rst
M scap.cfg
A scap/cdblib.py
M scap/config.py
M scap/tasks.py
M scap/utils.py
6 files changed, 363 insertions(+), 2 deletions(-)

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



diff --git a/docs/api.rst b/docs/api.rst
index 921e048..9d12e10 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -15,3 +15,10 @@
 .. automodule:: scap.tasks
 
 .. automodule:: scap.utils
+
+Third party
+===
+
+cdblib
+--
+.. automodule:: scap.cdblib
diff --git a/scap.cfg b/scap.cfg
index b57dff6..55acbc8 100644
--- a/scap.cfg
+++ b/scap.cfg
@@ -32,12 +32,31 @@
 # Statsd server port
 statsd_port: 2003
 
+# Deployment realm
+wmf_realm: production
+
+# Deployment datacenter
+datacenter: pmtpa
+
+
+[eqiad.wmnet]
+# Wikimedia Foundation production eqiad datacenter
+datacenter: eqiad
+
+
 [wmnet]
 # Wikimedia Foundation production cluster configuration
 master_rsync: tin.eqiad.wmnet
 statsd_host: statsd.eqiad.wmnet
 
+
+[eqiad.wmflabs]
+# Wikimedia Foundation beta eqiad datacenter
+datacenter: eqiad
+
+
 [wmflabs]
 # Wikimedia Foundation beta cluster configuration
 master_rsync: deployment-bastion.pmtpa.wmflabs
 statsd_host: deployment-bastion.pmtpa.wmflabs
+wmf_realm: labs
diff --git a/scap/cdblib.py b/scap/cdblib.py
new file mode 100644
index 000..bc64058
--- /dev/null
+++ b/scap/cdblib.py
@@ -0,0 +1,235 @@
+# -*- coding: utf-8 -*-
+'''
+| Imported from: `python-pure-cdb `_
+| Author: David Wilson
+| License: MIT
+
+Manipulate DJB's Constant Databases. These are 2 level disk-based hash tables
+that efficiently handle many keys, while remaining space-efficient.
+
+http://cr.yp.to/cdb.html
+
+When generated databases are only used with Python code, consider using hash()
+rather than djb_hash() for a tidy speedup.
+
+.. note::
+Minor alterations made to comply with PEP8 style check and to remove
+attempt to import C implementation of djb_hash. -- bd808, 2014-03-04
+'''
+
+from _struct import Struct
+from itertools import chain
+
+
+def py_djb_hash(s):
+'''Return the value of DJB's hash function for the given 8-bit string.'''
+h = 5381
+for c in s:
+h = (((h << 5) + h) ^ ord(c)) & 0x
+return h
+
+# 2014-03-04 bd808: removed try block for importing C hash implementation
+djb_hash = py_djb_hash
+
+read_2_le4 = Struct('> 1 for p in self.index)
+
+def iteritems(self):
+'''Like dict.iteritems(). Items are returned in insertion order.'''
+pos = 2048
+while pos < self.table_start:
+klen, dlen = read_2_le4(self.data[pos:pos + 8])
+pos += 8
+
+key = self.data[pos:pos + klen]
+pos += klen
+
+data = self.data[pos:pos + dlen]
+pos += dlen
+
+yield key, data
+
+def items(self):
+'''Like dict.items().'''
+return list(self.iteritems())
+
+def iterkeys(self):
+'''Like dict.iterkeys().'''
+return (p[0] for p in self.iteritems())
+__iter__ = iterkeys
+
+def itervalues(self):
+'''Like dict.itervalues().'''
+return (p[1] for p in self.iteritems())
+
+def keys(self):
+'''Like dict.keys().'''
+return [p[0] for p in self.iteritems()]
+
+def values(self):
+'''Like dict.values().'''
+return [p[1] for p in self.iteritems()]
+
+def __getitem__(self, key):
+'''Like dict.__getitem__().'''
+value = self.get(key)
+if value is None:
+raise KeyError(key)
+return value
+
+def has_key(self, key):
+'''Return True if key exists in the database.'''
+return self.get(key) is not None
+__contains__ = has_key
+
+def __len__(self):
+'''Return the number of records in the database.'''
+return self.length
+
+def gets(self, key):
+'''Yield values for key in insertion order.'''
+# Truncate to 32 bits and remove sign.
+h = self.hashfn(key) & 0x
+start, nslots = self.index[h & 0xff]
+
+if nslots:
+end = start + (nslots << 3)
+slot_off = start + (((h >> 8) % nslots) << 3)
+
+for pos in chain(xrange(slot_off, end, 8),

[MediaWiki-commits] [Gerrit] Fix Header::create, which now needs to set ->userWiki becaus... - change (mediawiki...Flow)

[Werdna (Code Review)]

Werdna has uploaded a new change for review.

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

Change subject: Fix Header::create, which now needs to set ->userWiki because 
of I439b102e9125c4e6aed988032a21d51b1079f93b
..

Fix Header::create, which now needs to set ->userWiki because of 
I439b102e9125c4e6aed988032a21d51b1079f93b

Change-Id: I50d990f6d0f0f87ee2f9e4c87346b06da4de2dfe
---
M includes/Model/Header.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/includes/Model/Header.php b/includes/Model/Header.php
index ac952f2..7631f7e 100644
--- a/includes/Model/Header.php
+++ b/includes/Model/Header.php
@@ -27,6 +27,7 @@
if ( !$user->getId() ) {
$obj->userIp = $user->getName();
}
+   $obj->userWiki = wfWikiId();
$obj->prevRevision = null; // no prior revision
$obj->setContent( $content );
$obj->changeType = $changeType;

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

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

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

[MediaWiki-commits] [Gerrit] Remove dangling scap symlinks - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Remove dangling scap symlinks
..


Remove dangling scap symlinks

Remove symlinks to scap scripts that were deleted from scap in If4c1580
and I4d1817a.

Change-Id: I15efb3c27858cc67990acf77018998f718f6726b
---
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 5 insertions(+), 13 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 57c9a4d..c08d6b1 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -183,14 +183,12 @@
ensure => link,
target => "/srv/scap/bin/restart-twemproxy";
"${scriptpath}/scap-old":
-   ensure => link,
-   target => "/srv/scap/bin/scap-old";
+   ensure => absent;
"${scriptpath}/scap":
ensure => link,
target => "/srv/scap/bin/scap";
"${scriptpath}/sync-common-all":
-   ensure => link,
-   target => "/srv/scap/bin/sync-common-all";
+   ensure => absent;
"${scriptpath}/sync-common-file":
ensure => link,
target => "/srv/scap/bin/sync-common-file";
diff --git a/modules/mediawiki/manifests/sync.pp 
b/modules/mediawiki/manifests/sync.pp
index c801dc7..5cd888a 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -19,21 +19,15 @@
 
file {
"${scriptpath}/find-nearest-rsync":
-   ensure  => link,
-   target  => '/srv/scap/bin/find-nearest-rsync',
-   require => Git::Clone['mediawiki/tools/scap'];
+   ensure  => absent;
"${scriptpath}/mwversionsinuse":
ensure  => link,
target  => '/srv/scap/bin/mwversionsinuse',
require => Git::Clone['mediawiki/tools/scap'];
"${scriptpath}/scap-1":
-   ensure  => link,
-   target  => '/srv/scap/bin/scap-1',
-   require => Git::Clone['mediawiki/tools/scap'];
+   ensure  => absent;
"${scriptpath}/scap-2":
-   ensure  => link,
-   target  => '/srv/scap/bin/scap-2',
-   require => Git::Clone['mediawiki/tools/scap'];
+   ensure  => absent;
"${scriptpath}/scap-rebuild-cdbs":
ensure  => link,
target  => '/srv/scap/bin/scap-rebuild-cdbs',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15efb3c27858cc67990acf77018998f718f6726b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dzahn 
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] Fix editing header on untouched page. - change (mediawiki...Flow)

[Werdna (Code Review)]

Werdna has uploaded a new change for review.

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

Change subject: Fix editing header on untouched page.
..

Fix editing header on untouched page.

Adding BoardHistory block in I363b6bd9e972467953b0e64cd437309ce08446b7 threw an
exception if there was no history for all API calls.

Change-Id: I929e3c1f0279d7f4a986a28f73c55c0272deb3d2
---
M includes/Block/BoardHistory.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/Block/BoardHistory.php b/includes/Block/BoardHistory.php
index fc83e2b..ebe809d 100644
--- a/includes/Block/BoardHistory.php
+++ b/includes/Block/BoardHistory.php
@@ -81,7 +81,7 @@
);
 
if ( !$history ) {
-   throw new InvalidDataException( 'Unable to load topic 
list history for ' . $this->workflow->getId()->getAlphadecimal(), 
'fail-load-history' );
+   return array();
}
 
// get rid of history entries user doesn't have sufficient 
permissions for

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

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

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

[MediaWiki-commits] [Gerrit] Remove removed scap symlinks - change (operations/puppet)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Remove removed scap symlinks
..

Remove removed scap symlinks

Remove mention of the deleted scripts entirely from the manifests. This
should not be merged until I15efb3c has been merged and applied on all
effected hosts.

Change-Id: I9f05dc92e363070c7f9b1dc9d74905d7ce0c47c2
---
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 0 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/117818/1

diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index e1914d2..2c36c50 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -182,13 +182,9 @@
"${scriptpath}/restart-twemproxy":
ensure => link,
target => "/srv/scap/bin/restart-twemproxy";
-   "${scriptpath}/scap-old":
-   ensure => absent;
"${scriptpath}/scap":
ensure => link,
target => "/srv/scap/bin/scap";
-   "${scriptpath}/sync-common-all":
-   ensure => absent;
"${scriptpath}/sync-common-file":
ensure => link,
target => "/srv/scap/bin/sync-common-file";
diff --git a/modules/mediawiki/manifests/sync.pp 
b/modules/mediawiki/manifests/sync.pp
index 5cd888a..803d449 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -18,16 +18,10 @@
$scriptpath = "/usr/local/bin"
 
file {
-   "${scriptpath}/find-nearest-rsync":
-   ensure  => absent;
"${scriptpath}/mwversionsinuse":
ensure  => link,
target  => '/srv/scap/bin/mwversionsinuse',
require => Git::Clone['mediawiki/tools/scap'];
-   "${scriptpath}/scap-1":
-   ensure  => absent;
-   "${scriptpath}/scap-2":
-   ensure  => absent;
"${scriptpath}/scap-rebuild-cdbs":
ensure  => link,
target  => '/srv/scap/bin/scap-rebuild-cdbs',

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

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

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

[MediaWiki-commits] [Gerrit] Remove dangling scap symlinks - change (operations/puppet)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Remove dangling scap symlinks
..

Remove dangling scap symlinks

Remove symlinks to scap scripts that were deleted from scap in If4c1580
and I4d1817a.

Change-Id: I15efb3c27858cc67990acf77018998f718f6726b
---
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 5 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/117817/1

diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index abb2b16..e1914d2 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -183,14 +183,12 @@
ensure => link,
target => "/srv/scap/bin/restart-twemproxy";
"${scriptpath}/scap-old":
-   ensure => link,
-   target => "/srv/scap/bin/scap-old";
+   ensure => absent;
"${scriptpath}/scap":
ensure => link,
target => "/srv/scap/bin/scap";
"${scriptpath}/sync-common-all":
-   ensure => link,
-   target => "/srv/scap/bin/sync-common-all";
+   ensure => absent;
"${scriptpath}/sync-common-file":
ensure => link,
target => "/srv/scap/bin/sync-common-file";
diff --git a/modules/mediawiki/manifests/sync.pp 
b/modules/mediawiki/manifests/sync.pp
index c801dc7..5cd888a 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -19,21 +19,15 @@
 
file {
"${scriptpath}/find-nearest-rsync":
-   ensure  => link,
-   target  => '/srv/scap/bin/find-nearest-rsync',
-   require => Git::Clone['mediawiki/tools/scap'];
+   ensure  => absent;
"${scriptpath}/mwversionsinuse":
ensure  => link,
target  => '/srv/scap/bin/mwversionsinuse',
require => Git::Clone['mediawiki/tools/scap'];
"${scriptpath}/scap-1":
-   ensure  => link,
-   target  => '/srv/scap/bin/scap-1',
-   require => Git::Clone['mediawiki/tools/scap'];
+   ensure  => absent;
"${scriptpath}/scap-2":
-   ensure  => link,
-   target  => '/srv/scap/bin/scap-2',
-   require => Git::Clone['mediawiki/tools/scap'];
+   ensure  => absent;
"${scriptpath}/scap-rebuild-cdbs":
ensure  => link,
target  => '/srv/scap/bin/scap-rebuild-cdbs',

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

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

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

[MediaWiki-commits] [Gerrit] Remove a bunch of the $wgTitles in SemanticForms - change (mediawiki...SemanticForms)

[jenkins-bot (Code Review)]

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

Change subject: Remove a bunch of the $wgTitles in SemanticForms
..


Remove a bunch of the $wgTitles in SemanticForms

This extension is one of the worst offenders of using $wgTitle.
This is a big step in the right direction.

Change-Id: I8c93e0e9a68dad0d49d1586d634349071a7daed3
---
M includes/SF_FormEditPage.php
M includes/SF_ParserFunctions.php
M specials/SF_RunQuery.php
3 files changed, 5 insertions(+), 7 deletions(-)

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



diff --git a/includes/SF_FormEditPage.php b/includes/SF_FormEditPage.php
index 92d355e..a94993e 100644
--- a/includes/SF_FormEditPage.php
+++ b/includes/SF_FormEditPage.php
@@ -31,10 +31,10 @@
 
function setHeaders() {
parent::setHeaders();
-   global $wgOut, $wgTitle;
+   global $wgOut;
if ( !$this->isConflict ) {
$wgOut->setPageTitle( wfMessage( 'sf_formedit_title',
-   $this->form->getText(), 
$wgTitle->getPrefixedText() )->text() );
+   $this->form->getText(), 
$this->getContextTitle()->getPrefixedText() )->text() );
}
}
 
diff --git a/includes/SF_ParserFunctions.php b/includes/SF_ParserFunctions.php
index 63d3d97..33e326d 100644
--- a/includes/SF_ParserFunctions.php
+++ b/includes/SF_ParserFunctions.php
@@ -503,8 +503,6 @@
 
 
static function renderAutoEdit( &$parser ) {
-   global $wgTitle;
-
// set defaults
$formcontent = '';
$linkString = null;
@@ -604,7 +602,7 @@
}
 
if ( $summary == null ) {
-   $summary = wfMessage( 'sf_autoedit_summary', 
"[[$wgTitle]]" )->text();
+   $summary = wfMessage( 'sf_autoedit_summary', 
"[[{$parser->getTitle()}]]" )->text();
}
 
$formcontent .= Html::hidden( 'wpSummary', $summary );
diff --git a/specials/SF_RunQuery.php b/specials/SF_RunQuery.php
index 0dd86c0..b1be28a 100644
--- a/specials/SF_RunQuery.php
+++ b/specials/SF_RunQuery.php
@@ -32,7 +32,7 @@
 
function printPage( $form_name, $embedded = false ) {
global $wgOut, $wgRequest, $sfgFormPrinter, $wgParser, 
$sfgRunQueryFormAtTop;
-   global $wgUser, $wgTitle;
+   global $wgUser;
 
// Get contents of form-definition page.
$form_title = Title::makeTitleSafe( SF_NS_FORM, $form_name );
@@ -96,7 +96,7 @@
}
 
$wgParser->mOptions = ParserOptions::newFromUser( 
$wgUser );
-   $resultsText = $wgParser->parse( $data_text, $wgTitle, 
$wgParser->mOptions )->getText();
+   $resultsText = $wgParser->parse( $data_text, 
$this->getTitle(), $wgParser->mOptions )->getText();
}
 
// Get the full text of the form.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c93e0e9a68dad0d49d1586d634349071a7daed3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Set a title for the context during import on the cli - change (mediawiki/core)

[MarkAHershberger (Code Review)]

MarkAHershberger has uploaded a new change for review.

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

Change subject: Set a title for the context during import on the cli
..

Set a title for the context during import on the cli

Bug: 62467
Change-Id: I9e0b6a219ea4176f9a3d14b8dbbea08b36c76c59
---
M maintenance/importTextFile.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/117816/1

diff --git a/maintenance/importTextFile.php b/maintenance/importTextFile.php
index dadc84a..c7df6c3 100644
--- a/maintenance/importTextFile.php
+++ b/maintenance/importTextFile.php
@@ -42,6 +42,7 @@
 
echo "\nUsing title '" . $title->getPrefixedText() . 
"'...";
if ( !$title->exists() || !isset( 
$options['nooverwrite'] ) ) {
+   RequestContext::getMain()->setTitle( $title );
 
$text = file_get_contents( $filename );
$user = isset( $options['user'] ) ? 
$options['user'] : 'Maintenance script';

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

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

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

[MediaWiki-commits] [Gerrit] Workaround for issue where UTPage title is never created, an... - change (mediawiki/core)

[Werdna (Code Review)]

Werdna has uploaded a new change for review.

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

Change subject: Workaround for issue where UTPage title is never created, and 
so there is no existing page to test against.
..

Workaround for issue where UTPage title is never created, and so there is no 
existing page to test against.

Not sure if this is the correct solution, but it does fix my tests

Change-Id: If414c633a3abb6019f9d677b70e6bc790c0c241d
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index 4d64d057..1572cb0 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -429,7 +429,7 @@
 
//Make 1 page with 1 revision
$page = WikiPage::factory( Title::newFromText( 'UTPage' ) );
-   if ( !$page->getId() == 0 ) {
+   if ( $page->getId() == 0 ) {
$page->doEditContent(
new WikitextContent( 'UTContent' ),
'UTPageSummary',

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

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

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

[MediaWiki-commits] [Gerrit] Exclude backlinks from selection - change (mediawiki...Cite)

[jenkins-bot (Code Review)]

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

Change subject: Exclude backlinks from selection
..


Exclude backlinks from selection

Steps to test the change:
* Open a random page in browser.
* Select all or a part of the page.
* Copy the selection to clipboard.
* Open a word processor like LibreOffice Writer.
* Paste the content of the clipboard.

Change-Id: Ibae4292b5dd8cc02a769e85adfea991d8d6ceb59
---
M modules/ext.cite.css
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/ext.cite.css b/modules/ext.cite.css
index 4ea7a81..68fde43 100644
--- a/modules/ext.cite.css
+++ b/modules/ext.cite.css
@@ -14,3 +14,11 @@
width: 1px !important;
overflow: hidden;
 }
+
+.mw-cite-backlink,
+.cite-accessibility-label {
+   -moz-user-select: none;
+   -webkit-user-select: none;
+   -ms-user-select: none;
+   user-select: none;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibae4292b5dd8cc02a769e85adfea991d8d6ceb59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove JavaScript link insertion code - change (mediawiki...WikimediaShopLink)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Remove JavaScript link insertion code
..

Remove JavaScript link insertion code

* Since change I92dac7589, the shop link insertion is done in PHP.
  The JavaScript code was retained as a fall-back for pages that were
  cached before the update. But since then nearly two months have elapsed.
* Removed WikimediaShopLinkHooks in favor of a single anonymous function.
* Removed $wgWikimediaShopEnableLink config var. Since inserting the link is
  the sole feature of this extension, $wgWikimediaShopEnableLink is basically
  $wmgUseWikimediaShopLink by another name.
* Bump version to 1.0, which reflects the fact that the extension is considered
  complete.

Change-Id: I667e169c0fd25eafbffee8bbb7e58a9c7a6cd6c7
---
D WikimediaShopLink.hooks.php
M WikimediaShopLink.php
D ext.wikimediaShopLink.core.js
3 files changed, 14 insertions(+), 98 deletions(-)


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

diff --git a/WikimediaShopLink.hooks.php b/WikimediaShopLink.hooks.php
deleted file mode 100644
index 8f04dd5..000
--- a/WikimediaShopLink.hooks.php
+++ /dev/null
@@ -1,54 +0,0 @@
-addModules( array( 'ext.wikimediaShopLink.core' ) 
);
-   }
-
-   return true;
-   }
-
-   /**
-* onResourceLoaderGetConfigVars
-* Exposed through the startup module site-wide.
-*
-* @param $vars array
-* @return bool
-*/
-   public static function addJsVars( $vars ) {
-   global $wgWikimediaShopEnableLink, $wgWikimediaShopLinkTarget;
-
-   if ( $wgWikimediaShopEnableLink ) {
-   $vars['wmfshopLinkTarget'] = $wgWikimediaShopLinkTarget;
-   }
-
-   return true;
-   }
-
-   /**
-* SkinBuildSidebar hook handler that adds shop link to sidebar
-*
-* @param $skin Skin
-* @param &$sidebar array
-*/
-   public static function addSidebarLink( $skin, &$sidebar ) {
-   global $wgWikimediaShopEnableLink, $wgWikimediaShopLinkTarget;
-
-   if ( $wgWikimediaShopEnableLink ) {
-   $sidebar['navigation'][] = array(
-   'text'  => $skin->msg( 
'wikimediashoplink-linktext' ),
-   'href'  => $wgWikimediaShopLinkTarget,
-   'title' => $skin->msg( 
'wikimediashoplink-link-tooltip' ),
-   'id'=> 'n-shoplink',
-   );
-   }
-   }
-}
diff --git a/WikimediaShopLink.php b/WikimediaShopLink.php
index a31535d..f699461 100644
--- a/WikimediaShopLink.php
+++ b/WikimediaShopLink.php
@@ -13,44 +13,29 @@
  *
  * @author James Alexander 
  * @license GPL v2
- * @version 0.5.0
+ * @version 1.0
  */
 
 $wgExtensionCredits['other'][] = array(
'path'   => __FILE__,
'name'   => 'WikimediaShopLink',
'author' => 'James Alexander',
-   'version'=> '0.5.0',
+   'version'=> '1.0',
'url'=> 
'https://www.mediawiki.org/wiki/Extension:WikimediaShopLink',
'descriptionmsg' => 'wikimediashoplink-desc',
 );
 
-$dir = dirname( __FILE__ );
+$wgExtensionMessagesFiles['WikimediaShopLink'] = __DIR__ . 
'/WikimediaShopLink.i18n.php';
 
-// Register php files
-$wgExtensionMessagesFiles['WikimediaShopLink'] = $dir . 
'/WikimediaShopLink.i18n.php';
-$wgAutoloadClasses['WikimediaShopLinkHooks'] = $dir . 
'/WikimediaShopLink.hooks.php';
-
-// Register hooks
-$wgHooks['BeforePageDisplay'][] = 'WikimediaShopLinkHooks::loadLink';
-$wgHooks['ResourceLoaderGetConfigVars'][] = 
'WikimediaShopLinkHooks::addJsVars';
-$wgHooks['SkinBuildSidebar'][] = 'WikimediaShopLinkHooks::addSidebarLink';
-
-// Register ResourceLoader modules
-$wgResourceModules[ 'ext.wikimediaShopLink.core' ] = array(
-   'scripts' => 'ext.wikimediaShopLink.core.js',
-   'messages' => array(
-   'wikimediashoplink-linktext',
-   'wikimediashoplink-link-tooltip',
-   ),
-   'dependencies' => 'mediawiki.util',
-   'localBasePath' => $dir,
-   'remoteExtPath' => 'WikimediaShopLink',
-);
-
-// On/off switch
-$wgWikimediaShopEnableLink = false;
-$wgExtensionMessagesFiles['WikimediaShopLink'] = $dir . 
'/WikimediaShopLink.i18n.php';
-
-// Set this to the base target of any button
 $wgWikimediaShopLinkTarget = '//shop.wikimedia.org';
+
+$wgHooks['SkinBuildSidebar'][] = function ( $skin, &$sidebar ) {
+   global $wgWikimediaShopLinkTarget;
+
+   $sidebar['navigation'][] = array(
+   'text'  => $skin->msg( 'wikimediashoplink-linktext' ),
+   'href'  => $wgWikimediaShopLinkTarget,
+   'title' => $skin->msg( 'wikimediashoplink-link-toolti

[MediaWiki-commits] [Gerrit] Remove the skins and SkinPerPage extension from make-wmf-branch - change (mediawiki...release)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Remove the skins and SkinPerPage extension from make-wmf-branch
..

Remove the skins and SkinPerPage extension from make-wmf-branch

Per I5c2d201

Change-Id: I3b4d1f123e5a778c053e07359d28cc5e87d53303
---
M make-wmf-branch/default.conf
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/13/117813/1

diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf
index ee15738..57e8e1a 100644
--- a/make-wmf-branch/default.conf
+++ b/make-wmf-branch/default.conf
@@ -114,8 +114,6 @@
'SecurePoll',
'ShortUrl',
'SiteMatrix',
-   'SkinPerPage', // Foundation wiki
-   'skins', // Foundation wiki
'Solarium',
'SpamBlacklist',
'StrategyWiki',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b4d1f123e5a778c053e07359d28cc5e87d53303
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Don't branch skins or SkinPerPage extensions - change (mediawiki...release)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Don't branch skins or SkinPerPage extensions
..

Don't branch skins or SkinPerPage extensions

Change-Id: I2bc66f3c5e13f6ecd06d3a9786d7f1d636197a52
---
M make-wmf-branch/default.conf
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/12/117812/1

diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf
index ee15738..57e8e1a 100644
--- a/make-wmf-branch/default.conf
+++ b/make-wmf-branch/default.conf
@@ -114,8 +114,6 @@
'SecurePoll',
'ShortUrl',
'SiteMatrix',
-   'SkinPerPage', // Foundation wiki
-   'skins', // Foundation wiki
'Solarium',
'SpamBlacklist',
'StrategyWiki',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc66f3c5e13f6ecd06d3a9786d7f1d636197a52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Couple of minor code updates - change (mediawiki...VipsScaler)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Couple of minor code updates
..

Couple of minor code updates

gunzip license.gz to license (GPL)

Change-Id: If9351627d0bc454f62ffe76a68171b0155bbf790
---
M VipsScaler.php
M VipsTest.php
A modules/jquery.ucompare/license
D modules/jquery.ucompare/license.gz
4 files changed, 683 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VipsScaler 
refs/changes/11/117811/1

diff --git a/VipsScaler.php b/VipsScaler.php
index 0630338..725d801 100644
--- a/VipsScaler.php
+++ b/VipsScaler.php
@@ -28,7 +28,7 @@
'url' => '//www.mediawiki.org/wiki/Extension:VipsScaler',
 );
 
-$dir = dirname( __FILE__ );
+$dir = __DIR__;
 
 $wgAutoloadClasses['VipsScaler']  = "$dir/VipsScaler_body.php";
 $wgAutoloadClasses['VipsCommand'] = "$dir/VipsScaler_body.php";
@@ -43,7 +43,8 @@
 # Download vips from http://www.vips.ecs.soton.ac.uk/
 $wgVipsCommand = 'vips';
 
-/* Options and conditions for images to be scaled with this scaler.
+/**
+ * Options and conditions for images to be scaled with this scaler.
  * Set to an array of arrays. The inner array contains a condition array, which
  * contains a list of conditions that the image should pass for it to be scaled
  * with vips. Conditions are mimeType, minArea, maxArea, minShrinkFactor,
@@ -92,7 +93,7 @@
'jquery.ucompare',
),
 
-   'localBasePath' => dirname( __FILE__ ) . '/modules/ext.vipsScaler',
+   'localBasePath' => __DIR__ . '/modules/ext.vipsScaler',
'remoteExtPath' => 'VipsScaler/modules/ext.vipsScaler',
 );
 
@@ -101,7 +102,7 @@
'scripts' => array( 'js/jquery.ucompare.js', ),
'styles' => array( 'css/jquery.ucompare.css' ),
 
-   'localBasePath' => dirname( __FILE__ ) . '/modules/jquery.ucompare',
+   'localBasePath' => __DIR__ . '/modules/jquery.ucompare',
'remoteExtPath' => 'VipsScaler/modules/jquery.ucompare'
 );
 
diff --git a/VipsTest.php b/VipsTest.php
index c479d7e..79ab1b2 100644
--- a/VipsTest.php
+++ b/VipsTest.php
@@ -5,7 +5,9 @@
  * must be enabled.
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) exit( 1 );
+if ( !defined( 'MEDIAWIKI' ) ) {
+   exit( 1 );
+}
 
 /**
  * The host to send the request to when doing the scaling remotely. Set this to
@@ -18,7 +20,7 @@
  */
 $wgVipsTestExpiry = 3600;
 
-$dir = dirname( __FILE__ );
+$dir = __DIR__;
 
 /** Registration */
 $wgAutoloadClasses['SpecialVipsTest'] = "$dir/SpecialVipsTest.php";
diff --git a/modules/jquery.ucompare/license b/modules/jquery.ucompare/license
new file mode 100644
index 000..94a9ed0
--- /dev/null
+++ b/modules/jquery.ucompare/license
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the deve

[MediaWiki-commits] [Gerrit] Undeploy the skins extension - change (operations/mediawiki-config)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Undeploy the skins extension
..

Undeploy the skins extension

These skins are terrible, unused (at least nobody has them as default
on foundationwiki) and mostly broken, that's why I see no use in
having this extension deployed.

Change-Id: I5c2d201552cfe5ab4d974f8644623b0b5b6b431b
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 15f1ff5..bfeacbd 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -687,9 +687,6 @@
 if ( $wgDBname == 'foundationwiki' ) {
include( "$IP/extensions/FormPreloadPostCache/FormPreloadPostCache.php" 
);
include( "$IP/extensions/SkinPerPage/SkinPerPage.php" );
-   include( "$IP/extensions/skins/Schulenburg/Schulenburg.php" );
-   include( "$IP/extensions/skins/Tomas/Tomas.php" );
-   include( "$IP/extensions/skins/Donate/Donate.php" );
 
$wgAllowedTemplates = array(
'enwiki_00', 'enwiki_01', 'enwiki_02', 'enwiki_03',
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 92f063a..2ef5f60 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -104,8 +104,6 @@
 $IP/extensions/ShortUrl/ShortUrl.php
 $IP/extensions/SiteMatrix/SiteMatrix.php
 $IP/extensions/SkinPerPage/SkinPerPage.php
-$IP/extensions/skins/Schulenburg/Schulenburg.php
-$IP/extensions/skins/Tomas/Tomas.php
 $IP/extensions/Solarium/Solarium.php
 $IP/extensions/SpamBlacklist/SpamBlacklist.php
 $IP/extensions/SubPageList3/SubPageList3.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c2d201552cfe5ab4d974f8644623b0b5b6b431b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Use Vips for images over 20MP - change (operations/mediawiki-config)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Use Vips for images over 20MP
..

Use Vips for images over 20MP

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 15f1ff5..d9295d6 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2133,7 +2133,7 @@
array(
'conditions' => array(
'mimeType' => 'image/png',
-   'minArea' => 3.5e7,
+   'minArea' => 2e7,
),
),
);

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

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

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

[MediaWiki-commits] [Gerrit] TableSorter: Improve detection and handling of isoDate - change (mediawiki/core)

[TheDJ (Code Review)]

TheDJ has uploaded a new change for review.

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

Change subject: TableSorter: Improve detection and handling of isoDate
..

TableSorter: Improve detection and handling of isoDate

Change-Id: I193870dcc97477a4fd52a75d3beb9db21e64f171
---
M resources/jquery/jquery.tablesorter.js
1 file changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/117808/1

diff --git a/resources/jquery/jquery.tablesorter.js 
b/resources/jquery/jquery.tablesorter.js
index f9ee268..b2f5ac0 100644
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -651,7 +651,8 @@
new RegExp( /(https?|ftp|file):\/\//)
],
isoDate: [
-   new RegExp( /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/)
+   new RegExp( 
/^-?\d{4}-[01]\d-[0-3]\d([T\s](([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)?(\15([0-5]\d))?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?/
 ),
+   new RegExp( /^-?\d{4}-[01]\d-[0-3]\d/ )
],
usLongDate: [
new RegExp( /^[A-Za-z]{3,10}\.? [0-9]{1,2}, 
([0-9]{4}|'?[0-9]{2}) 
(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/)
@@ -1048,8 +1049,16 @@
return ts.rgx.isoDate[0].test(s);
},
format: function ( s ) {
-   return $.tablesorter.formatFloat((s !== '') ? new 
Date(s.replace(
-   new RegExp( /-/g), '/')).getTime() : '0' );
+   var isodate,
+   matches;
+   if ( !Date.prototype.toISOString ) {
+   // Old browsers don't understand iso, Fallback 
to US date parsing and ignore the time part.
+   matches = $.trim(s).match( ts.rgx.isoDate[1] );
+   isodate = new Date( matches[1] + '/' + 
matches[2] + '/' + matches[3] );
+   } else {
+   isodate = new Date( $.trim( s ) );
+   }
+   return ( typeof isodate !== "undefined" ) ? 
isodate.getTime() : 0;
},
type: 'numeric'
} );

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

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

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

[MediaWiki-commits] [Gerrit] 'Markbotedits' user right for rollbackers on shwiki - change (operations/mediawiki-config)

[Odder (Code Review)]

Odder has uploaded a new change for review.

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

Change subject: 'Markbotedits' user right for rollbackers on shwiki
..

'Markbotedits' user right for rollbackers on shwiki

Doing just that.

Bug: 62462
Change-Id: I1a438ccd295475444319027629201dc08f7d8c88
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index fffa933..ef1fa0a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7402,7 +7402,10 @@
'patrolmarks' => true, // bug 60818
),
'confirmed' => array( 'patrolmarks' => true, ),
-   'rollbacker' => array( 'rollback' => true ),
+   'rollbacker' => array(
+   'rollback' => true,
+   'markbotedits' => true, // bug 62462
+   ),
'filemover' => array( 'movefile' => true, 'suppressredirect' => 
true ),
'flood' => array( 'bot' => true ),
),

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

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

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

[MediaWiki-commits] [Gerrit] Reapplying r45820 to support the NewSignupPage extension. - change (mediawiki/core)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

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

Change subject: Reapplying r45820 to support the NewSignupPage extension.
..

Reapplying r45820 to support the NewSignupPage extension.

Sometimes you really need to have a link (or two) in a checkbox message.

Change-Id: Ib75133cb1dfaa796c3acff6f4aa57eb25a806a0f
---
M includes/templates/Usercreate.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/117806/1

diff --git a/includes/templates/Usercreate.php 
b/includes/templates/Usercreate.php
index 0cb83d5..1f91fee 100644
--- a/includes/templates/Usercreate.php
+++ b/includes/templates/Usercreate.php
@@ -212,7 +212,7 @@

echo 'checked="checked"';
} ?>
>
-   msg( $inputItem['msg'] ); ?>
+   msgHtml( $inputItem['msg'] ); ?>

https://gerrit.wikimedia.org/r/117806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib75133cb1dfaa796c3acff6f4aa57eb25a806a0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fb48384..302b98b - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: fb48384..302b98b
..

Syncronize VisualEditor: fb48384..302b98b

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/05/117805/1

diff --git a/VisualEditor b/VisualEditor
index fb48384..302b98b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit fb483849e6bd973534cdf474b0c9f6d3d7a338c1
+Subproject commit 302b98b873c36698bd94d50b4b4e1e973573f5e7

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fb48384..302b98b - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: fb48384..302b98b
..


Syncronize VisualEditor: fb48384..302b98b

Change-Id: If408d46cdc73c3a3ecba7b093f8cd883c6b548d2
---
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 fb48384..302b98b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit fb483849e6bd973534cdf474b0c9f6d3d7a338c1
+Subproject commit 302b98b873c36698bd94d50b4b4e1e973573f5e7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If408d46cdc73c3a3ecba7b093f8cd883c6b548d2
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] Add final preiod to api module descriptions - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Add final preiod to api module descriptions
..

Add final preiod to api module descriptions

Change-Id: Icae68c1ab1fd0006e00a3a9a56ae8f831d3d0d45
---
M includes/api/ApiBlock.php
M includes/api/ApiComparePages.php
M includes/api/ApiCreateAccount.php
M includes/api/ApiDelete.php
M includes/api/ApiDisabled.php
M includes/api/ApiEditPage.php
M includes/api/ApiEmailUser.php
M includes/api/ApiExpandTemplates.php
M includes/api/ApiFeedContributions.php
M includes/api/ApiFeedWatchlist.php
M includes/api/ApiFileRevert.php
M includes/api/ApiHelp.php
M includes/api/ApiImageRotate.php
M includes/api/ApiImport.php
M includes/api/ApiLogin.php
M includes/api/ApiLogout.php
M includes/api/ApiMain.php
M includes/api/ApiMove.php
M includes/api/ApiOpenSearch.php
M includes/api/ApiOptions.php
M includes/api/ApiParamInfo.php
M includes/api/ApiParse.php
M includes/api/ApiPatrol.php
M includes/api/ApiProtect.php
M includes/api/ApiPurge.php
M includes/api/ApiQuery.php
M includes/api/ApiQueryAllCategories.php
M includes/api/ApiQueryAllImages.php
M includes/api/ApiQueryAllMessages.php
M includes/api/ApiQueryAllPages.php
M includes/api/ApiQueryAllUsers.php
M includes/api/ApiQueryBacklinks.php
M includes/api/ApiQueryBlocks.php
M includes/api/ApiQueryCategories.php
M includes/api/ApiQueryCategoryInfo.php
M includes/api/ApiQueryCategoryMembers.php
M includes/api/ApiQueryContributors.php
M includes/api/ApiQueryDeletedrevs.php
M includes/api/ApiQueryDisabled.php
M includes/api/ApiQueryDuplicateFiles.php
M includes/api/ApiQueryExtLinksUsage.php
M includes/api/ApiQueryExternalLinks.php
M includes/api/ApiQueryFileRepoInfo.php
M includes/api/ApiQueryFilearchive.php
M includes/api/ApiQueryIWBacklinks.php
M includes/api/ApiQueryIWLinks.php
M includes/api/ApiQueryImageInfo.php
M includes/api/ApiQueryImages.php
M includes/api/ApiQueryLangBacklinks.php
M includes/api/ApiQueryLangLinks.php
M includes/api/ApiQueryLinks.php
M includes/api/ApiQueryLogEvents.php
M includes/api/ApiQueryPagePropNames.php
M includes/api/ApiQueryPageProps.php
M includes/api/ApiQueryPagesWithProp.php
M includes/api/ApiQueryProtectedTitles.php
M includes/api/ApiQueryQueryPage.php
M includes/api/ApiQueryRandom.php
M includes/api/ApiQueryRecentChanges.php
M includes/api/ApiQueryRedirects.php
M includes/api/ApiQueryRevisions.php
M includes/api/ApiQuerySearch.php
M includes/api/ApiQuerySiteinfo.php
M includes/api/ApiQueryStashImageInfo.php
M includes/api/ApiQueryTags.php
M includes/api/ApiQueryUserContributions.php
M includes/api/ApiQueryUserInfo.php
M includes/api/ApiQueryUsers.php
M includes/api/ApiQueryWatchlist.php
M includes/api/ApiQueryWatchlistRaw.php
M includes/api/ApiRevisionDelete.php
M includes/api/ApiRollback.php
M includes/api/ApiRsd.php
M includes/api/ApiRunJobs.php
M includes/api/ApiSetNotificationTimestamp.php
M includes/api/ApiTokens.php
M includes/api/ApiUnblock.php
M includes/api/ApiUndelete.php
M includes/api/ApiUpload.php
M includes/api/ApiUserrights.php
M includes/api/ApiWatch.php
81 files changed, 99 insertions(+), 99 deletions(-)


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

diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php
index 332fa9e..364300e 100644
--- a/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -222,7 +222,7 @@
}
 
public function getDescription() {
-   return 'Block a user';
+   return 'Block a user.';
}
 
public function getPossibleErrors() {
diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index 237e8c8..c1bbea7 100644
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -157,8 +157,8 @@
 
public function getDescription() {
return array(
-   'Get the difference between 2 pages',
-   'You must pass a revision number or a page title or a 
page ID id for each part (1 and 2)'
+   'Get the difference between 2 pages.',
+   'You must pass a revision number or a page title or a 
page ID id for each part (1 and 2).'
);
}
 
diff --git a/includes/api/ApiCreateAccount.php 
b/includes/api/ApiCreateAccount.php
index c550fce..be8286c 100644
--- a/includes/api/ApiCreateAccount.php
+++ b/includes/api/ApiCreateAccount.php
@@ -167,7 +167,7 @@
}
 
public function getDescription() {
-   return 'Create a new user account';
+   return 'Create a new user account.';
}
 
public function mustBePosted() {
diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index c09cad3..acc2eb8 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -240,7 +240,7 @@
}
 
public function getDescrip

[MediaWiki-commits] [Gerrit] Remove final period from api module descriptions - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Remove final period from api module descriptions
..


Remove final period from api module descriptions

The most description are without a final period, so that looks common.

Change-Id: If72a3cc094cfff436b53948728354cbaeff768c8
---
M includes/api/ApiCreateAccount.php
M includes/api/ApiEditPage.php
M includes/api/ApiEmailUser.php
M includes/api/ApiImport.php
M includes/api/ApiOptions.php
M includes/api/ApiParse.php
M includes/api/ApiPurge.php
M includes/api/ApiQueryBacklinks.php
M includes/api/ApiQueryDisabled.php
M includes/api/ApiQueryFileRepoInfo.php
M includes/api/ApiQueryLangBacklinks.php
M includes/api/ApiSetNotificationTimestamp.php
12 files changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/includes/api/ApiCreateAccount.php 
b/includes/api/ApiCreateAccount.php
index be8286c..c550fce 100644
--- a/includes/api/ApiCreateAccount.php
+++ b/includes/api/ApiCreateAccount.php
@@ -167,7 +167,7 @@
}
 
public function getDescription() {
-   return 'Create a new user account.';
+   return 'Create a new user account';
}
 
public function mustBePosted() {
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 73eebca..695a76f 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -492,7 +492,7 @@
}
 
public function getDescription() {
-   return 'Create and edit pages.';
+   return 'Create and edit pages';
}
 
public function getPossibleErrors() {
diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php
index 29f7e05..5125ce3 100644
--- a/includes/api/ApiEmailUser.php
+++ b/includes/api/ApiEmailUser.php
@@ -130,7 +130,7 @@
}
 
public function getDescription() {
-   return 'Email a user.';
+   return 'Email a user';
}
 
public function getPossibleErrors() {
diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php
index 295f16e..99307fd 100644
--- a/includes/api/ApiImport.php
+++ b/includes/api/ApiImport.php
@@ -151,7 +151,7 @@
return array(
'Import a page from another wiki, or an XML file.',
'Note that the HTTP POST must be done as a file upload 
(i.e. using multipart/form-data) when',
-   'sending a file for the "xml" parameter.'
+   'sending a file for the "xml" parameter'
);
}
 
diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index fb441a3..6d045f8 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -189,7 +189,7 @@
'Change preferences of the current user',
'Only options which are registered in core or in one of 
installed extensions,',
'or as options with keys prefixed with \'userjs-\' 
(intended to be used by user',
-   'scripts), can be set.'
+   'scripts), can be set'
);
}
 
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 47ad80f..4c1ddc2 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -824,7 +824,7 @@
'There are several ways to specify the text to parse:',
"1) Specify a page or revision, using {$p}page, 
{$p}pageid, or {$p}oldid.",
"2) Specify content explicitly, using {$p}text, 
{$p}title, and {$p}contentmodel.",
-   "3) Specify only a summary to parse. {$p}prop should be 
given an empty value.",
+   "3) Specify only a summary to parse. {$p}prop should be 
given an empty value",
);
}
 
diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index e5d6a3c..3516bf2 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -182,7 +182,7 @@
 
public function getDescription() {
return array( 'Purge the cache for the given titles.',
-   'Requires a POST request if the user is not logged in.'
+   'Requires a POST request if the user is not logged in'
);
}
 
diff --git a/includes/api/ApiQueryBacklinks.php 
b/includes/api/ApiQueryBacklinks.php
index bda1e03..a0460fd 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -538,7 +538,7 @@
case 'embeddedin':
return 'Find all pages that embed (transclude) 
the given title';
case 'imageusage':
-   return 'Find all pages that use the given image 
title.';
+

[MediaWiki-commits] [Gerrit] python cron script needs python - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: python cron script needs python
..


python cron script needs python

Change-Id: I99bdef9d69004ac83d83aa4c816b9939ddcc7dc7
---
M modules/dataset/manifests/cron/rsync/peers.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/dataset/manifests/cron/rsync/peers.pp 
b/modules/dataset/manifests/cron/rsync/peers.pp
index 56ea314..322f68c 100644
--- a/modules/dataset/manifests/cron/rsync/peers.pp
+++ b/modules/dataset/manifests/cron/rsync/peers.pp
@@ -28,7 +28,7 @@
 
 cron { 'rsync-dumps':
 ensure  => $ensure,
-command => '/usr/local/bin/rsync-dumps.py',
+command => '/usr/bin/python /usr/local/bin/rsync-dumps.py',
 user=> 'root',
 minute  => '0',
 hour=> '*/2',

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

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

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

[MediaWiki-commits] [Gerrit] python cron script needs python - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: python cron script needs python
..

python cron script needs python

Change-Id: I99bdef9d69004ac83d83aa4c816b9939ddcc7dc7
---
M modules/dataset/manifests/cron/rsync/peers.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/dataset/manifests/cron/rsync/peers.pp 
b/modules/dataset/manifests/cron/rsync/peers.pp
index 56ea314..322f68c 100644
--- a/modules/dataset/manifests/cron/rsync/peers.pp
+++ b/modules/dataset/manifests/cron/rsync/peers.pp
@@ -28,7 +28,7 @@
 
 cron { 'rsync-dumps':
 ensure  => $ensure,
-command => '/usr/local/bin/rsync-dumps.py',
+command => '/usr/bin/python /usr/local/bin/rsync-dumps.py',
 user=> 'root',
 minute  => '0',
 hour=> '*/2',

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

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

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

[MediaWiki-commits] [Gerrit] Fallback rmf -> fi - change (translatewiki)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Fallback rmf -> fi
..

Fallback rmf -> fi

Change-Id: I5c1e7631c575788f5c1cecdb7af8c4ced7d7374d
---
M FallbackSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/01/117701/1

diff --git a/FallbackSettings.php b/FallbackSettings.php
index 511cbf9..98b437d 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -85,6 +85,7 @@
 $wgTranslateLanguageFallbacks['rgn'] = array( 'it', 'egl' );
 $wgTranslateLanguageFallbacks['rif'] = array( 'ar', 'fr' ); # Robin 2011-09-30
 $wgTranslateLanguageFallbacks['rki'] = array( 'my' );
+$wgTranslateLanguageFallbacks['rmf'] = array( 'fi' );
 $wgTranslateLanguageFallbacks['rut'] = array( 'az', 'ru', 'lez' ); # Robin 
2012-07-24
 $wgTranslateLanguageFallbacks['ryu'] = array( 'ja' );
 $wgTranslateLanguageFallbacks['saz'] = array( 'gu' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c1e7631c575788f5c1cecdb7af8c4ced7d7374d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] Catalan and Spanish TY translation updates - change (wikimedia...crm)

[Pcoombe (Code Review)]

Pcoombe has submitted this change and it was merged.

Change subject: Catalan and Spanish TY translation updates
..


Catalan and Spanish TY translation updates

Deleting the Spanish-Spain variant for the current campaign, since it seems to
be neglected.

Change-Id: I4a1bb4c527bdd177ef00c2ec3622b8eec2bb30f2
---
M sites/all/modules/thank_you/templates/html/thank_you.ca.html
D sites/all/modules/thank_you/templates/html/thank_you.es-es.html
M sites/all/modules/thank_you/templates/html/thank_you.es.html
3 files changed, 136 insertions(+), 160 deletions(-)

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



diff --git a/sites/all/modules/thank_you/templates/html/thank_you.ca.html 
b/sites/all/modules/thank_you/templates/html/thank_you.ca.html
index 501b7bb..c3d71d3 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.ca.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.ca.html
@@ -1,73 +1,93 @@
 Benvolgut/da {{ first_name }},
-Gràcies per fer un donatiu a la Wikimedia Foundation. És
-meravellós!
-És fàcil ignorar els nostres anuncis per a la recaptació de fons, i
-me n'alegro que tu no ho fessis. És així com la Viquipèdia paga els seus
-comptes: mitjançant gent com tu que dóna diners, podem mantenir la
-pàgina lliure i disponible per a tothom.
-La gent m'explica que dóna diners a la Viquipèdia perquè la troben
-útil i hi poden confiar ja que, tot i no ser perfecta, saben que s'escriu
-per a ells. La Viquipèdia no pretén promoure cap agenda de relacions
-públiques, fomentar una ideologia en particular o presuadir-te a creure
-quelcom fals. El nostre objectiu és dir la veritat, i podem fer-ho
-gràcies a tu. El fet que financiïs la pàgina ens manté independents i
-capaços per proporcionar-te el que necessites i vols de la Viquipèdia.
-Exactament com ha de ser.
-Hauries de saber: la teva donació no només cobreix els teus costs. El
-donant mitjà paga pel seu propi ús de la Viquipèdia, més els costs de
-centenars d'altres persones. La teva donació fa que la Viquipèdia sigui
-disponible per a una ambiciosa nena a Bangalore que aprèn programació
-informàtica de manera autodidacta. Una mestressa de casa de mitjana edat a
-Viena a qui tot just li han diagnosticat l'Enfermetat d'Alzhèimer. Un
-novel·lista a la recerca d'informació sobre la Gran Bretanya del 1850. Un
-nen de 10 anys a San Salvador que tot just ha descobert en Carl Sagan.
-En nom d'aquelles persones i dels 500 milions de lectors de la
-Viquipèdia i les seves pàgines i projectes, et dono les gràcies per
-unir-te a nosaltres en un esforç per fer que la totalitat del coneixement
-de la humanitat estigui disponible per a tothom. La teva donació fa del
-món un lloc millor. Gràcies.
-La majoria de la gent no sap que la Viquipèdia no té afany de lucre,
-així que planteja't enviar aquest correu electrònic a alguns dels teus
-amics per tal que s'animin a contribuir ells també. Si t'interessa, pots
-mirar d'afegir informació nova a la Viquipèdia. Si veus errors
-tipogràfics o altres errors menors, si us plau corregeix-los, i si trobes
-que falta informació, afegeix-la. Existeixen recursos [#edit aquí] que
-poden ajudar-te a començar. No pateixis si comets errors: és normal quan
-la gent comença a editar i si passa, altres Viquipedistes ho solucionaran
-encantats.
-Li agraïm que confiï en nosaltres, i li prometem que farem bon ús
-dels seus diners.
-Gràcies,
-Sue
+
+Ets fantàstic. Gràcies per donar suport a la Fundació Wikimedia,
+l’organització sense ànim de lucre que gestiona la Viquipèdia i els seus 
projectes
+germans.
+
+La teva donació no només cobreix les teves pròpies despeses d’ús de la 
Viquipèdia, sinó
+també les d’altres lectors.
+
+Des d'el granger jubilat de l'Estat de Nova York que utilitza la Viquipèdia 
per estudiar la
+ciència del fang, i l'estudiant de Kuala Lumpur que està fent recerca sobre la 
química orgànica.
+Des d'el mecànic britànic que, després de trencar-se l'esquena, troba en la 
Viquipèdia les eines
+per convertir-se en desenvolupador web, passant pel funcionari finlandès que 
ha establert una
+versió offline de Viquipèdia per a una petita escola de Ghana i el pare a la 
Ciutat de Mèxic que
+porta les seves filles al museu els caps de setmana i pot explicar-los millor 
el que veuen gràcies
+a la Viquipèdia.
+
+L’objectiu de la Viquipèdia és reunir el coneixement humà i oferir-lo a 
tothom arreu
+del món en la seva llengua. Aquesta és una missió força atrevida, però amb 30 
milions
+d'articles i 287 llengües, crec que ho estem aconseguint gràcies a persones 
com tu.
+
+En nom de la Fundació Wikimedia, i del milions de lectors de la Viquipèdia 
arreu
+del món: gràcies. Que ajudis a pagar les despeses del funcionament de la 
Viquipèdia vol dir que
+aquest lloc web podrà romandre imparcial i lliure d’anuncis, i concentrar-se 
només en ajudar els
+lectors. Exactament com hauria de ser.
+
+T'hauràs adonat que, per primera vegada, enguany h

[MediaWiki-commits] [Gerrit] Catalan and Spanish TY translation updates - change (wikimedia...crm)

[Adamw (Code Review)]

Adamw has uploaded a new change for review.

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

Change subject: Catalan and Spanish TY translation updates
..

Catalan and Spanish TY translation updates

Change-Id: I4a1bb4c527bdd177ef00c2ec3622b8eec2bb30f2
---
M sites/all/modules/thank_you/templates/html/thank_you.ca.html
M sites/all/modules/thank_you/templates/html/thank_you.es.html
2 files changed, 136 insertions(+), 115 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/00/117700/1

diff --git a/sites/all/modules/thank_you/templates/html/thank_you.ca.html 
b/sites/all/modules/thank_you/templates/html/thank_you.ca.html
index 501b7bb..c3d71d3 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.ca.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.ca.html
@@ -1,73 +1,93 @@
 Benvolgut/da {{ first_name }},
-Gràcies per fer un donatiu a la Wikimedia Foundation. És
-meravellós!
-És fàcil ignorar els nostres anuncis per a la recaptació de fons, i
-me n'alegro que tu no ho fessis. És així com la Viquipèdia paga els seus
-comptes: mitjançant gent com tu que dóna diners, podem mantenir la
-pàgina lliure i disponible per a tothom.
-La gent m'explica que dóna diners a la Viquipèdia perquè la troben
-útil i hi poden confiar ja que, tot i no ser perfecta, saben que s'escriu
-per a ells. La Viquipèdia no pretén promoure cap agenda de relacions
-públiques, fomentar una ideologia en particular o presuadir-te a creure
-quelcom fals. El nostre objectiu és dir la veritat, i podem fer-ho
-gràcies a tu. El fet que financiïs la pàgina ens manté independents i
-capaços per proporcionar-te el que necessites i vols de la Viquipèdia.
-Exactament com ha de ser.
-Hauries de saber: la teva donació no només cobreix els teus costs. El
-donant mitjà paga pel seu propi ús de la Viquipèdia, més els costs de
-centenars d'altres persones. La teva donació fa que la Viquipèdia sigui
-disponible per a una ambiciosa nena a Bangalore que aprèn programació
-informàtica de manera autodidacta. Una mestressa de casa de mitjana edat a
-Viena a qui tot just li han diagnosticat l'Enfermetat d'Alzhèimer. Un
-novel·lista a la recerca d'informació sobre la Gran Bretanya del 1850. Un
-nen de 10 anys a San Salvador que tot just ha descobert en Carl Sagan.
-En nom d'aquelles persones i dels 500 milions de lectors de la
-Viquipèdia i les seves pàgines i projectes, et dono les gràcies per
-unir-te a nosaltres en un esforç per fer que la totalitat del coneixement
-de la humanitat estigui disponible per a tothom. La teva donació fa del
-món un lloc millor. Gràcies.
-La majoria de la gent no sap que la Viquipèdia no té afany de lucre,
-així que planteja't enviar aquest correu electrònic a alguns dels teus
-amics per tal que s'animin a contribuir ells també. Si t'interessa, pots
-mirar d'afegir informació nova a la Viquipèdia. Si veus errors
-tipogràfics o altres errors menors, si us plau corregeix-los, i si trobes
-que falta informació, afegeix-la. Existeixen recursos [#edit aquí] que
-poden ajudar-te a començar. No pateixis si comets errors: és normal quan
-la gent comença a editar i si passa, altres Viquipedistes ho solucionaran
-encantats.
-Li agraïm que confiï en nosaltres, i li prometem que farem bon ús
-dels seus diners.
-Gràcies,
-Sue
+
+Ets fantàstic. Gràcies per donar suport a la Fundació Wikimedia,
+l’organització sense ànim de lucre que gestiona la Viquipèdia i els seus 
projectes
+germans.
+
+La teva donació no només cobreix les teves pròpies despeses d’ús de la 
Viquipèdia, sinó
+també les d’altres lectors.
+
+Des d'el granger jubilat de l'Estat de Nova York que utilitza la Viquipèdia 
per estudiar la
+ciència del fang, i l'estudiant de Kuala Lumpur que està fent recerca sobre la 
química orgànica.
+Des d'el mecànic britànic que, després de trencar-se l'esquena, troba en la 
Viquipèdia les eines
+per convertir-se en desenvolupador web, passant pel funcionari finlandès que 
ha establert una
+versió offline de Viquipèdia per a una petita escola de Ghana i el pare a la 
Ciutat de Mèxic que
+porta les seves filles al museu els caps de setmana i pot explicar-los millor 
el que veuen gràcies
+a la Viquipèdia.
+
+L’objectiu de la Viquipèdia és reunir el coneixement humà i oferir-lo a 
tothom arreu
+del món en la seva llengua. Aquesta és una missió força atrevida, però amb 30 
milions
+d'articles i 287 llengües, crec que ho estem aconseguint gràcies a persones 
com tu.
+
+En nom de la Fundació Wikimedia, i del milions de lectors de la Viquipèdia 
arreu
+del món: gràcies. Que ajudis a pagar les despeses del funcionament de la 
Viquipèdia vol dir que
+aquest lloc web podrà romandre imparcial i lliure d’anuncis, i concentrar-se 
només en ajudar els
+lectors. Exactament com hauria de ser.
+
+T'hauràs adonat que, per primera vegada, enguany hem canviat el nostre 
recapte de fons per a que
+la majoria de gent només vegi els avisos une

[MediaWiki-commits] [Gerrit] Fix mobile/desktop view choices substainability on 3 parts d... - change (mediawiki...MobileFrontend)

[Kelson (Code Review)]

Kelson has uploaded a new change for review.

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

Change subject: Fix mobile/desktop view choices substainability on 3 parts 
domain names (like wikimedia.org.uk) #54885
..

Fix mobile/desktop view choices substainability on 3 parts domain names (like 
wikimedia.org.uk) #54885

Change-Id: I4cc4faf6c6f80571a65483299e04c596a7c1a5f8
---
M includes/MobileContext.php
1 file changed, 9 insertions(+), 8 deletions(-)


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

diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index b65140d..ad19f00 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -493,11 +493,7 @@
$host = $parsedUrl['host'];
// Validates value as IP address
if ( !IP::isValid( $host ) ) {
-   $domainParts = explode( '.', $host );
-   $domainParts = array_reverse( $domainParts );
-   // Although some browsers will accept cookies without 
the initial ., » RFC 2109 requires it to be included.
-   wfProfileOut( __METHOD__ );
-   return count( $domainParts ) >= 2 ? '.' . 
$domainParts[1] . '.' . $domainParts[0] : $host;
+   return substr( $host, strpos( $host, "." ) );
}
wfProfileOut( __METHOD__ );
return $host;
@@ -511,10 +507,15 @@
 * @return string
 */
public function getStopMobileRedirectCookieDomain() {
-   global $wgMFStopRedirectCookieHost;
+   global $wgMFStopRedirectCookieHost, $wgMFCookieDomain;
+   $host = $this->getRequest()->getHeader( 'Host' );
 
-   if ( !$wgMFStopRedirectCookieHost ) {
-   $wgMFStopRedirectCookieHost = $this->getBaseDomain();
+   if ( !$wgMFStopRedirectCookieHost || 
$wgMFStopRedirectCookieHost != $host ) {
+   if ( $wgMFCookieDomain && ( strpos( $host, 
$wgMFCookieDomain ) !== false )) {
+   $wgMFStopRedirectCookieHost = $wgMFCookieDomain;
+   } else {
+   $wgMFStopRedirectCookieHost = 
$this->getBaseDomain();
+   }
}
 
return $wgMFStopRedirectCookieHost;

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

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

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

[MediaWiki-commits] [Gerrit] ldap: replace iptables with ferm rule - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: ldap: replace iptables with ferm rule
..

ldap: replace iptables with ferm rule

Change-Id: Ieee75b4f65c20d240a6398babbe72f88376803d0
---
M modules/ldap/manifests/server.pp
1 file changed, 7 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/117698/1

diff --git a/modules/ldap/manifests/server.pp b/modules/ldap/manifests/server.pp
index f524f1d..c64d36e 100644
--- a/modules/ldap/manifests/server.pp
+++ b/modules/ldap/manifests/server.pp
@@ -1,50 +1,15 @@
 # ldap
 #
 
-class ldap::server::iptables-purges {
+class ldap::server::firewall {
 
-require 'iptables::tables'
+ferm::rule { 'ldap_server_corp':
+rule => 'saddr (216.38.130.188) proto tcp dport (ldap) ACCEPT;',
+}
 
-# The deny_all rule must always be purged, otherwise ACCEPTs can be placed 
below it
-iptables_purge_service{ 'ldap_deny_all': service  => 'ldap' }
-iptables_purge_service{ 'ldaps_deny_all': service => 'ldaps' }
-
-# When removing or modifying a rule, place the old rule here, otherwise it 
won't
-# be purged, and will stay in the iptables forever
-
-}
-
-class ldap::server::iptables-accepts {
-
-require 'ldap::server::iptables-purges'
-
-# Remember to place modified or removed rules into purges!
-iptables_add_service{ 'ldap_server_corp': service  => 'ldap', source  => 
'216.38.130.188', jump => 'ACCEPT' }
-iptables_add_service{ 'ldaps_server_corp': service => 'ldaps', source => 
'216.38.130.188', jump => 'ACCEPT' }
-iptables_add_service{ 'ldaps_server_neon': service => 'ldaps', source => 
'208.80.154.14', jump  => 'ACCEPT' }
-
-}
-
-class ldap::server::iptables-drops {
-
-require 'ldap::server::iptables-accepts'
-
-iptables_add_service{ 'ldap_server_deny_all': service  => 'ldap', jump  => 
'DROP' }
-iptables_add_service{ 'ldaps_server_deny_all': service => 'ldaps', jump => 
'DROP' }
-
-}
-
-class ldap::server::iptables  {
-
-# We use the following requirement chain:
-# iptables -> iptables::drops -> iptables::accepts -> iptables::purges
-#
-# This ensures proper ordering of the rules
-require 'ldap::server::iptables-drops'
-
-# This exec should always occur last in the requirement chain.
-iptables_add_exec{ 'ldap_server': service => 'ldap_server' }
-
+ferm::rule { 'ldap_server_corp_neon':
+rule => 'saddr (216.38.130.188 208.80.154.14) proto tcp dport (ldaps) 
ACCEPT;',
+}
 }
 
 class ldap::server( $certificate_location, $certificate, $ca_name, $cert_pass, 
$base_dn, $proxyagent, $proxyagent_pass, $server_bind_ips, $initial_password, 
$first_master=false ) {

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

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

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

[MediaWiki-commits] [Gerrit] Shorter lines in LanguageUz.php comments - change (mediawiki/core)

[SPQRobin (Code Review)]

SPQRobin has submitted this change and it was merged.

Change subject: Shorter lines in LanguageUz.php comments
..


Shorter lines in LanguageUz.php comments

Follows up gerrit change 116914

Change-Id: I75215416277eb8f5d9e16a1bf91637c673be0a48
---
M languages/classes/LanguageUz.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/languages/classes/LanguageUz.php b/languages/classes/LanguageUz.php
index 2079c5e..88d57de 100644
--- a/languages/classes/LanguageUz.php
+++ b/languages/classes/LanguageUz.php
@@ -54,7 +54,8 @@
'ф' => 'f', 'Ф' => 'F',
'ц' => 'c', 'Ц' => 'C',
'ў' => 'oʻ', 'Ў' => 'Oʻ',
-   'ц' => 'ts', 'Ц' => 'Ts', // note: at the beginning of a word 
and right after a consonant, only "s" is used
+   // note: at the beginning of a word and right after a 
consonant, only "s" is used
+   'ц' => 'ts', 'Ц' => 'Ts',
'қ' => 'q', 'Қ' => 'Q',
'ё' => 'yo', 'Ё' => 'Yo',
'ю' => 'yu', 'Ю' => 'Yu',
@@ -69,7 +70,9 @@
'a' => 'а', 'A' => 'А',
'b' => 'б', 'B' => 'Б',
'd' => 'д', 'D' => 'Д',
-   'e' => 'э', 'E' => 'Э', // at the beginning of a word and after 
a vowel, "э" is used instead of "e" (see regex below)
+   // at the beginning of a word and after a vowel, "э" is used 
instead of "e"
+   // (see regex below)
+   'e' => 'э', 'E' => 'Э',
'f' => 'ф', 'F' => 'Ф',
'g' => 'г', 'G' => 'Г',
'g‘' => 'ғ', 'G‘' => 'Ғ', 'gʻ' => 'ғ', 'Gʻ' => 'Ғ',
@@ -115,6 +118,7 @@
$text = str_replace( 'ye', 'е', $text );
$text = str_replace( 'Ye', 'Е', $text );
$text = str_replace( 'YE', 'Е', $text );
+   // "е" after consonants, otherwise "э" (see above)
$text = preg_replace( 
'/([BVGDJZYKLMNPRSTFXCWQʻ‘H])E/u', '$1Е', $text );
$text = preg_replace( 
'/([bvgdjzyklmnprstfxcwqʻ‘h])e/ui', '$1е', $text );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75215416277eb8f5d9e16a1bf91637c673be0a48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: SPQRobin 
Gerrit-Reviewer: SPQRobin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Shorter lines in LanguageUz.php comments - change (mediawiki/core)

[SPQRobin (Code Review)]

SPQRobin has uploaded a new change for review.

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

Change subject: Shorter lines in LanguageUz.php comments
..

Shorter lines in LanguageUz.php comments

Follows up gerrit change 116914

Change-Id: I75215416277eb8f5d9e16a1bf91637c673be0a48
---
M languages/classes/LanguageUz.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/117697/1

diff --git a/languages/classes/LanguageUz.php b/languages/classes/LanguageUz.php
index 2079c5e..88d57de 100644
--- a/languages/classes/LanguageUz.php
+++ b/languages/classes/LanguageUz.php
@@ -54,7 +54,8 @@
'ф' => 'f', 'Ф' => 'F',
'ц' => 'c', 'Ц' => 'C',
'ў' => 'oʻ', 'Ў' => 'Oʻ',
-   'ц' => 'ts', 'Ц' => 'Ts', // note: at the beginning of a word 
and right after a consonant, only "s" is used
+   // note: at the beginning of a word and right after a 
consonant, only "s" is used
+   'ц' => 'ts', 'Ц' => 'Ts',
'қ' => 'q', 'Қ' => 'Q',
'ё' => 'yo', 'Ё' => 'Yo',
'ю' => 'yu', 'Ю' => 'Yu',
@@ -69,7 +70,9 @@
'a' => 'а', 'A' => 'А',
'b' => 'б', 'B' => 'Б',
'd' => 'д', 'D' => 'Д',
-   'e' => 'э', 'E' => 'Э', // at the beginning of a word and after 
a vowel, "э" is used instead of "e" (see regex below)
+   // at the beginning of a word and after a vowel, "э" is used 
instead of "e"
+   // (see regex below)
+   'e' => 'э', 'E' => 'Э',
'f' => 'ф', 'F' => 'Ф',
'g' => 'г', 'G' => 'Г',
'g‘' => 'ғ', 'G‘' => 'Ғ', 'gʻ' => 'ғ', 'Gʻ' => 'Ғ',
@@ -115,6 +118,7 @@
$text = str_replace( 'ye', 'е', $text );
$text = str_replace( 'Ye', 'Е', $text );
$text = str_replace( 'YE', 'Е', $text );
+   // "е" after consonants, otherwise "э" (see above)
$text = preg_replace( 
'/([BVGDJZYKLMNPRSTFXCWQʻ‘H])E/u', '$1Е', $text );
$text = preg_replace( 
'/([bvgdjzyklmnprstfxcwqʻ‘h])e/ui', '$1е', $text );
}

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

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

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

[MediaWiki-commits] [Gerrit] datasets: enable the python rsync script in cron - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: datasets: enable the python rsync script in cron
..


datasets: enable the python rsync script in cron

Change-Id: Ie05c4ff1d2672e56bcdfeb9fb51809435a58fc04
---
M modules/dataset/manifests/cron/rsync/peers.pp
1 file changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/modules/dataset/manifests/cron/rsync/peers.pp 
b/modules/dataset/manifests/cron/rsync/peers.pp
index d99a259..56ea314 100644
--- a/modules/dataset/manifests/cron/rsync/peers.pp
+++ b/modules/dataset/manifests/cron/rsync/peers.pp
@@ -17,12 +17,21 @@
 source => 'puppet:///modules/dataset/rsync-dumps.sh',
 }
 
+file { '/usr/local/bin/rsync-dumps.py':
+ensure => $ensure,
+mode   => '0755',
+owner  => 'root',
+group  => 'root',
+path   => '/usr/local/bin/rsync-dumps.py',
+source => 'puppet:///modules/dataset/rsync-dumps.py',
+}
+
 cron { 'rsync-dumps':
 ensure  => $ensure,
-command => '/usr/local/bin/rsync-dumps.sh',
+command => '/usr/local/bin/rsync-dumps.py',
 user=> 'root',
 minute  => '0',
 hour=> '*/2',
-require => File['/usr/local/bin/rsync-dumps.sh'],
+require => File['/usr/local/bin/rsync-dumps.py'],
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] datasets: enable the python rsync script in cron - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: datasets: enable the python rsync script in cron
..

datasets: enable the python rsync script in cron

Change-Id: Ie05c4ff1d2672e56bcdfeb9fb51809435a58fc04
---
M modules/dataset/manifests/cron/rsync/peers.pp
1 file changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/117696/1

diff --git a/modules/dataset/manifests/cron/rsync/peers.pp 
b/modules/dataset/manifests/cron/rsync/peers.pp
index d99a259..56ea314 100644
--- a/modules/dataset/manifests/cron/rsync/peers.pp
+++ b/modules/dataset/manifests/cron/rsync/peers.pp
@@ -17,12 +17,21 @@
 source => 'puppet:///modules/dataset/rsync-dumps.sh',
 }
 
+file { '/usr/local/bin/rsync-dumps.py':
+ensure => $ensure,
+mode   => '0755',
+owner  => 'root',
+group  => 'root',
+path   => '/usr/local/bin/rsync-dumps.py',
+source => 'puppet:///modules/dataset/rsync-dumps.py',
+}
+
 cron { 'rsync-dumps':
 ensure  => $ensure,
-command => '/usr/local/bin/rsync-dumps.sh',
+command => '/usr/local/bin/rsync-dumps.py',
 user=> 'root',
 minute  => '0',
 hour=> '*/2',
-require => File['/usr/local/bin/rsync-dumps.sh'],
+require => File['/usr/local/bin/rsync-dumps.py'],
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] make composer use dev-master - change (mediawiki...AbuseFilter)

[jenkins-bot (Code Review)]

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

Change subject: make composer use dev-master
..


make composer use dev-master

Change-Id: I16ab1386ed14286efec482fa21b268d27fd18ab6
---
M composer.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 36ff7e8..3227b84 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
"license" : "GPL-2.0+",
 
"require": {
-   "composer/installers" : "*",
-   "mediawiki/anti-spoof" : "*"
+   "composer/installers" : "dev-master",
+   "mediawiki/anti-spoof" : "dev-master"
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16ab1386ed14286efec482fa21b268d27fd18ab6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jeroen De Dauw 
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 composer use dev-master - change (mediawiki...AbuseFilter)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: make composer use dev-master
..

make composer use dev-master

Change-Id: I16ab1386ed14286efec482fa21b268d27fd18ab6
---
M composer.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/95/117695/1

diff --git a/composer.json b/composer.json
index 36ff7e8..3227b84 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
"license" : "GPL-2.0+",
 
"require": {
-   "composer/installers" : "*",
-   "mediawiki/anti-spoof" : "*"
+   "composer/installers" : "dev-master",
+   "mediawiki/anti-spoof" : "dev-master"
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16ab1386ed14286efec482fa21b268d27fd18ab6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Remove dependencies on globals, ContextSource gets instead - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has uploaded a new change for review.

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

Change subject: Remove dependencies on globals, ContextSource gets instead
..

Remove dependencies on globals, ContextSource gets instead

Change-Id: I7577fcc6173be5c733f0ae5aad470e7392a090a9
---
M GetNew.api.php
M Kick.api.php
M MediaWikiChat.php
M Send.api.php
M SendPM.api.php
5 files changed, 28 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat 
refs/changes/94/117694/1

diff --git a/GetNew.api.php b/GetNew.api.php
index 2c87c87..221b0b2 100644
--- a/GetNew.api.php
+++ b/GetNew.api.php
@@ -4,12 +4,13 @@
 class ChatGetNewAPI extends ApiBase {
 
public function execute() {
-   global $wgUser, $wgChatSocialAvatars;
+   global $wgChatSocialAvatars;
 
$result = $this->getResult();
$mName = $this->getModuleName();
+   $user = $this->getUser();
 
-   if ( $wgUser->isAllowed( 'chat' ) ) {
+   if ( $user->isAllowed( 'chat' ) ) {
 
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
@@ -19,7 +20,7 @@
$res = $dbr->selectField(
'chat_users',
'cu_timestamp',
-   array( 'cu_user_id' => $wgUser->getId() ),
+   array( 'cu_user_id' => $user->getId() ),
__METHOD__
);
 
@@ -29,14 +30,14 @@
$dbw->update(
'chat_users',
array( 'cu_timestamp' => $thisCheck ),
-   array( 'cu_user_id' => $wgUser->getId() 
),
+   array( 'cu_user_id' => $user->getId() ),
__METHOD__
);
} else {
$dbw->insert(
'chat_users',
array(
-   'cu_user_id' => 
$wgUser->getId(),
+   'cu_user_id' => $user->getId(),
'cu_timestamp' => $thisCheck,
),
__METHOD__
@@ -73,8 +74,8 @@
 
} elseif ( $row->chat_type == 
MediaWikiChat::TYPE_PM
&& (
-   $row->chat_user_id == 
$wgUser->getId()
-   || $row->chat_to_id == 
$wgUser->getId()
+   $row->chat_user_id == 
$user->getId()
+   || $row->chat_to_id == 
$user->getId()
) ) {
 
$message = $row->chat_message;
@@ -84,7 +85,7 @@
$fromid = $row->chat_user_id;
$toid = $row->chat_to_id;
 
-   if ( $fromid == $wgUser->getId() ) {
+   if ( $fromid == $user->getId() ) {
$convwith = User::newFromId( 
$toid )->getName();
} else {
$convwith = User::newFromId( 
$fromid )->getName();
@@ -98,7 +99,7 @@
$users[$toid] = true; // ensure pm 
receiver is in users list
 
} elseif ( $row->chat_type == 
MediaWikiChat::TYPE_KICK ) {
-   if ( $row->chat_to_id == 
$wgUser->getId() ) {
+   if ( $row->chat_to_id == $user->getId() 
) {
$result->addValue( $mName, 
'kick', true );
}
$timestamp = $row->chat_timestamp;
@@ -117,7 +118,7 @@
}
}
 
-   $users[$wgUser->getId()] = true; // ensure current user 
is in the users list
+   $users[$user->getId()] = true; // ensure current user 
is in the users list
 
$onlineUsers = MediaWikiChat::getOnline();
foreach ( $onlineUsers as $id => $away ) {
@@ -148,7 +149,7 @@
 
$result->addValue( $mName, 'now', MediaWikiChat::now() 
);
 
-   if ( !$wgUser->is

[MediaWiki-commits] [Gerrit] Remove dependencies on globals, ContextSource gets instead - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has submitted this change and it was merged.

Change subject: Remove dependencies on globals, ContextSource gets instead
..


Remove dependencies on globals, ContextSource gets instead

Change-Id: I7577fcc6173be5c733f0ae5aad470e7392a090a9
---
M GetNew.api.php
M Kick.api.php
M MediaWikiChat.php
M Send.api.php
M SendPM.api.php
5 files changed, 28 insertions(+), 26 deletions(-)

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



diff --git a/GetNew.api.php b/GetNew.api.php
index 2c87c87..221b0b2 100644
--- a/GetNew.api.php
+++ b/GetNew.api.php
@@ -4,12 +4,13 @@
 class ChatGetNewAPI extends ApiBase {
 
public function execute() {
-   global $wgUser, $wgChatSocialAvatars;
+   global $wgChatSocialAvatars;
 
$result = $this->getResult();
$mName = $this->getModuleName();
+   $user = $this->getUser();
 
-   if ( $wgUser->isAllowed( 'chat' ) ) {
+   if ( $user->isAllowed( 'chat' ) ) {
 
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
@@ -19,7 +20,7 @@
$res = $dbr->selectField(
'chat_users',
'cu_timestamp',
-   array( 'cu_user_id' => $wgUser->getId() ),
+   array( 'cu_user_id' => $user->getId() ),
__METHOD__
);
 
@@ -29,14 +30,14 @@
$dbw->update(
'chat_users',
array( 'cu_timestamp' => $thisCheck ),
-   array( 'cu_user_id' => $wgUser->getId() 
),
+   array( 'cu_user_id' => $user->getId() ),
__METHOD__
);
} else {
$dbw->insert(
'chat_users',
array(
-   'cu_user_id' => 
$wgUser->getId(),
+   'cu_user_id' => $user->getId(),
'cu_timestamp' => $thisCheck,
),
__METHOD__
@@ -73,8 +74,8 @@
 
} elseif ( $row->chat_type == 
MediaWikiChat::TYPE_PM
&& (
-   $row->chat_user_id == 
$wgUser->getId()
-   || $row->chat_to_id == 
$wgUser->getId()
+   $row->chat_user_id == 
$user->getId()
+   || $row->chat_to_id == 
$user->getId()
) ) {
 
$message = $row->chat_message;
@@ -84,7 +85,7 @@
$fromid = $row->chat_user_id;
$toid = $row->chat_to_id;
 
-   if ( $fromid == $wgUser->getId() ) {
+   if ( $fromid == $user->getId() ) {
$convwith = User::newFromId( 
$toid )->getName();
} else {
$convwith = User::newFromId( 
$fromid )->getName();
@@ -98,7 +99,7 @@
$users[$toid] = true; // ensure pm 
receiver is in users list
 
} elseif ( $row->chat_type == 
MediaWikiChat::TYPE_KICK ) {
-   if ( $row->chat_to_id == 
$wgUser->getId() ) {
+   if ( $row->chat_to_id == $user->getId() 
) {
$result->addValue( $mName, 
'kick', true );
}
$timestamp = $row->chat_timestamp;
@@ -117,7 +118,7 @@
}
}
 
-   $users[$wgUser->getId()] = true; // ensure current user 
is in the users list
+   $users[$user->getId()] = true; // ensure current user 
is in the users list
 
$onlineUsers = MediaWikiChat::getOnline();
foreach ( $onlineUsers as $id => $away ) {
@@ -148,7 +149,7 @@
 
$result->addValue( $mName, 'now', MediaWikiChat::now() 
);
 
-   if ( !$wgUser->isAllowed( 'chat' ) ) {
+   if ( !$user->isAllowed( 'c

[MediaWiki-commits] [Gerrit] datasets: replace bash rsync script with python - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: datasets: replace bash rsync script with python
..


datasets: replace bash rsync script with python

writing in the exceptions for subdirs in bash was just
too painful

Change-Id: I3e81738ed482d2f29b6999b88c971d1a820f7903
---
A modules/dataset/files/rsync-dumps.py
1 file changed, 180 insertions(+), 0 deletions(-)

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



diff --git a/modules/dataset/files/rsync-dumps.py 
b/modules/dataset/files/rsync-dumps.py
new file mode 100644
index 000..baf14c9
--- /dev/null
+++ b/modules/dataset/files/rsync-dumps.py
@@ -0,0 +1,180 @@
+import os
+import sys
+import re
+import subprocess
+import socket
+
+
+class Rsyncer(object):
+def __init__(self, max_bw, dryrun, list_only):
+self.max_bw = str(max_bw)
+self.dryrun = dryrun
+self.list_only = list_only
+self.host = socket.gethostname()
+self.rsync_args = ["--bwlimit=" + self.max_bw, '-a', '--delete']
+if self.list_only:
+self.rsync_args.append("--list-only")
+else:
+self.rsync_args.append("-q")
+self.excludes = ['--exclude=wikidump_*', '--exclude=md5temp.*']
+
+def get_excludes_for_job(self, jobname, host_info):
+excludes = []
+for job in host_info:
+# 'exclude': { 'dir': 'other', 'job': 'public' }
+if (job != jobname and 'exclude' in host_info[job] and
+host_info[job]['exclude']['job'] == jobname):
+excludes.append(host_info[job]['exclude']['dir'])
+return excludes
+
+def rsync_all(self, host_info):
+for job in host_info:
+excludes = self.get_excludes_for_job(job, host_info)
+
+hosts = host_info[job]['hosts']
+if self.host not in hosts:
+# no rsync job info for this host
+continue
+
+targets = [h for h in hosts if h != self.host]
+if not len(targets):
+# no hosts to rsync to
+continue
+
+if 'primary' in hosts[self.host]:
+# this host rsyncs everything except a specific list of dirs
+dir_args = ["--exclude=/" + d.strip('/') + "/" for d in 
excludes]
+for h in targets:
+if 'dirs' in hosts[h]:
+dir_args.extend(["--exclude=/" + d.strip('/') + "/"
+ for d in hosts[h]['dirs']])
+
+elif 'dirs' in hosts[self.host]:
+# this host keeps data in a specific list of dirs and must 
rsync
+# those everywhere else
+
+dirs_to_include = [d.strip('/') for d in 
hosts[self.host]['dirs']]
+if not len(dirs_to_include):
+# no specific dirs to sync
+continue
+
+dir_args = ["--include=/" + d + "/" for d in dirs_to_include]
+dir_args.extend(["--include=/" + d + "/**" for d in 
dirs_to_include])
+dir_args.append('--exclude=*')
+
+else:
+# not a primary, no specific dirs to sync, do nothing
+continue
+
+self.do_rsync(host_info[job]['source'], host_info[job]['dest'],
+  targets, dir_args)
+
+def check_output(self, command):
+process = subprocess.Popen(command, stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT)
+output, unused_err = process.communicate()
+retcode = process.poll()
+if retcode:
+raise subprocess.CalledProcessError(retcode, command)
+return output
+
+def do_rsync(self, src, dest, targets, dir_args):
+for t in targets:
+command = ["/usr/bin/pgrep", "-u", "root", "-f", "%s::%s" % (t, 
dest)]
+result = subprocess.call(command)
+if result != 1:  # already running or some error
+continue
+
+command = (["/usr/bin/rsync"] + self.rsync_args + self.excludes +
+   dir_args + [src, "%s::%s" % (t, dest)])
+if self.dryrun:
+print " ".join(command)
+else:
+output = None
+try:
+output = self.check_output(command)
+except subprocess.CalledProcessError, e:
+# fixme might want to do something with error output
+pass
+if output:
+if self.list_only:
+print output
+else:
+command = ["/usr/bin/mail", '-E', '-s',
+   "DUMPS RSYNC " + self.host,
+   'ops-dumps' + '@' + 'wikimedia' + '.org']
+proc = subprocess.Popen(command

[MediaWiki-commits] [Gerrit] Make avatars in sidebar module greyscale where away too - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has submitted this change and it was merged.

Change subject: Make avatars in sidebar module greyscale where away too
..


Make avatars in sidebar module greyscale where away too

Change-Id: I3cffa598daa37abb53fae92e477538771693b8c4
---
M MediaWikiChat.hooks.php
M MediaWikiChat.php
2 files changed, 15 insertions(+), 5 deletions(-)

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



diff --git a/MediaWikiChat.hooks.php b/MediaWikiChat.hooks.php
index f918e48..eceb8f7 100644
--- a/MediaWikiChat.hooks.php
+++ b/MediaWikiChat.hooks.php
@@ -84,13 +84,23 @@
$user = User::newFromId( $id );
$avatar = MediaWikiChat::getAvatar( $id 
);
$page = str_replace( '$1', 'User:' . 
rawurlencode( $user->getName() ), $wgArticlePath );
+   $style = "display: block;
+   background-position: right 1em 
center;
+   background-repeat: no-repeat;
+   background-image: 
url($avatar);";
+   if ( $away ) {
+   $style .= "-webkit-filter: 
grayscale(1); /* old webkit */
+   -webkit-filter: 
grayscale(100%); /* new webkit */
+   -moz-filter: 
grayscale(100%); /* safari */
+   -ms-filter: 
progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); /* maybe ie */
+   filter: 
progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); /* maybe ie */
+   filter: gray; /* maybe 
ie */
+   filter: 
grayscale(100%); /* future */";
+   }
$arr[$id] = array(
'text' => $user->getName(),
'href' => $page,
-   'style' => "display: block;
-   background-position: 
right 1em center;
-   background-repeat: 
no-repeat;
-   background-image: 
url($avatar);",
+   'style' => $style,
'class' => 'mwchat-sidebar-user'
);
}
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index 632a321..2a1a925 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
 $wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'MediaWikiChat',
-   'version' => '2.9.0',
+   'version' => '2.9.1',
'author' => 'Adam Carter/UltrasonicNXT',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' => 'chat-desc',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3cffa598daa37abb53fae92e477538771693b8c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 
Gerrit-Reviewer: UltrasonicNXT 

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

[MediaWiki-commits] [Gerrit] Make avatars in sidebar module greyscale where away too - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has uploaded a new change for review.

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

Change subject: Make avatars in sidebar module greyscale where away too
..

Make avatars in sidebar module greyscale where away too

Change-Id: I3cffa598daa37abb53fae92e477538771693b8c4
---
M MediaWikiChat.hooks.php
M MediaWikiChat.php
2 files changed, 15 insertions(+), 5 deletions(-)


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

diff --git a/MediaWikiChat.hooks.php b/MediaWikiChat.hooks.php
index f918e48..eceb8f7 100644
--- a/MediaWikiChat.hooks.php
+++ b/MediaWikiChat.hooks.php
@@ -84,13 +84,23 @@
$user = User::newFromId( $id );
$avatar = MediaWikiChat::getAvatar( $id 
);
$page = str_replace( '$1', 'User:' . 
rawurlencode( $user->getName() ), $wgArticlePath );
+   $style = "display: block;
+   background-position: right 1em 
center;
+   background-repeat: no-repeat;
+   background-image: 
url($avatar);";
+   if ( $away ) {
+   $style .= "-webkit-filter: 
grayscale(1); /* old webkit */
+   -webkit-filter: 
grayscale(100%); /* new webkit */
+   -moz-filter: 
grayscale(100%); /* safari */
+   -ms-filter: 
progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); /* maybe ie */
+   filter: 
progid:DXImageTransform.Microsoft.BasicImage(grayscale=1); /* maybe ie */
+   filter: gray; /* maybe 
ie */
+   filter: 
grayscale(100%); /* future */";
+   }
$arr[$id] = array(
'text' => $user->getName(),
'href' => $page,
-   'style' => "display: block;
-   background-position: 
right 1em center;
-   background-repeat: 
no-repeat;
-   background-image: 
url($avatar);",
+   'style' => $style,
'class' => 'mwchat-sidebar-user'
);
}
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index 632a321..2a1a925 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
 $wgExtensionCredits['specialpage'][] = array(
'path' => __FILE__,
'name' => 'MediaWikiChat',
-   'version' => '2.9.0',
+   'version' => '2.9.1',
'author' => 'Adam Carter/UltrasonicNXT',
'url' => 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' => 'chat-desc',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cffa598daa37abb53fae92e477538771693b8c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT 

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

[MediaWiki-commits] [Gerrit] datasets: replace bash rsync script with python - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: datasets: replace bash rsync script with python
..

datasets: replace bash rsync script with python

writing in the exceptions for subdirs in bash was just
too painful

Change-Id: I3e81738ed482d2f29b6999b88c971d1a820f7903
---
A modules/dataset/files/rsync-dumps.py
1 file changed, 180 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/117692/1

diff --git a/modules/dataset/files/rsync-dumps.py 
b/modules/dataset/files/rsync-dumps.py
new file mode 100644
index 000..baf14c9
--- /dev/null
+++ b/modules/dataset/files/rsync-dumps.py
@@ -0,0 +1,180 @@
+import os
+import sys
+import re
+import subprocess
+import socket
+
+
+class Rsyncer(object):
+def __init__(self, max_bw, dryrun, list_only):
+self.max_bw = str(max_bw)
+self.dryrun = dryrun
+self.list_only = list_only
+self.host = socket.gethostname()
+self.rsync_args = ["--bwlimit=" + self.max_bw, '-a', '--delete']
+if self.list_only:
+self.rsync_args.append("--list-only")
+else:
+self.rsync_args.append("-q")
+self.excludes = ['--exclude=wikidump_*', '--exclude=md5temp.*']
+
+def get_excludes_for_job(self, jobname, host_info):
+excludes = []
+for job in host_info:
+# 'exclude': { 'dir': 'other', 'job': 'public' }
+if (job != jobname and 'exclude' in host_info[job] and
+host_info[job]['exclude']['job'] == jobname):
+excludes.append(host_info[job]['exclude']['dir'])
+return excludes
+
+def rsync_all(self, host_info):
+for job in host_info:
+excludes = self.get_excludes_for_job(job, host_info)
+
+hosts = host_info[job]['hosts']
+if self.host not in hosts:
+# no rsync job info for this host
+continue
+
+targets = [h for h in hosts if h != self.host]
+if not len(targets):
+# no hosts to rsync to
+continue
+
+if 'primary' in hosts[self.host]:
+# this host rsyncs everything except a specific list of dirs
+dir_args = ["--exclude=/" + d.strip('/') + "/" for d in 
excludes]
+for h in targets:
+if 'dirs' in hosts[h]:
+dir_args.extend(["--exclude=/" + d.strip('/') + "/"
+ for d in hosts[h]['dirs']])
+
+elif 'dirs' in hosts[self.host]:
+# this host keeps data in a specific list of dirs and must 
rsync
+# those everywhere else
+
+dirs_to_include = [d.strip('/') for d in 
hosts[self.host]['dirs']]
+if not len(dirs_to_include):
+# no specific dirs to sync
+continue
+
+dir_args = ["--include=/" + d + "/" for d in dirs_to_include]
+dir_args.extend(["--include=/" + d + "/**" for d in 
dirs_to_include])
+dir_args.append('--exclude=*')
+
+else:
+# not a primary, no specific dirs to sync, do nothing
+continue
+
+self.do_rsync(host_info[job]['source'], host_info[job]['dest'],
+  targets, dir_args)
+
+def check_output(self, command):
+process = subprocess.Popen(command, stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT)
+output, unused_err = process.communicate()
+retcode = process.poll()
+if retcode:
+raise subprocess.CalledProcessError(retcode, command)
+return output
+
+def do_rsync(self, src, dest, targets, dir_args):
+for t in targets:
+command = ["/usr/bin/pgrep", "-u", "root", "-f", "%s::%s" % (t, 
dest)]
+result = subprocess.call(command)
+if result != 1:  # already running or some error
+continue
+
+command = (["/usr/bin/rsync"] + self.rsync_args + self.excludes +
+   dir_args + [src, "%s::%s" % (t, dest)])
+if self.dryrun:
+print " ".join(command)
+else:
+output = None
+try:
+output = self.check_output(command)
+except subprocess.CalledProcessError, e:
+# fixme might want to do something with error output
+pass
+if output:
+if self.list_only:
+print output
+else:
+command = ["/usr/bin/mail", '-E', '-s',
+   "DUMPS RSYNC " + self.host,
+   'ops-dumps' + '@' + 'wikimedia' + '.org']
+   

[MediaWiki-commits] [Gerrit] Wrap long text of action=mobileview sections - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Wrap long text of action=mobileview sections
..


Wrap long text of action=mobileview sections

Makes the api help really really wide!

Change-Id: I6d69dbf444538e1ab68eb7515b921950a747e2a0
---
M includes/api/ApiMobileView.php
1 file changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index b21dcd6..283652f 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -592,10 +592,11 @@
'id' => 'Id of the page',
'page' => 'Title of page to process',
'redirect' => 'Whether redirects should be followed',
-   'sections' => "Pipe-separated list of section numbers 
for which to return text. "
-   . "`all' can be used to return for all. Ranges 
in format '1-4' mean get sections 1,2,3,4. "
-   . "Ranges without second number, e.g. '1-' 
means get all until the end. "
-   . "`references' can be used to specify that all 
sections containing references should be returned.",
+   'sections' => array( 'Pipe-separated list of section 
numbers for which to return text.',
+   " `all' can be used to return for all. Ranges 
in format '1-4' mean get sections 1,2,3,4.",
+   " Ranges without second number, e.g. '1-' means 
get all until the end.",
+   " `references' can be used to specify that all 
sections containing references should be returned."
+   ),
'prop' => array(
'Which information to get',
' text- HTML of selected 
section(s)',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d69dbf444538e1ab68eb7515b921950a747e2a0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add users being away - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has submitted this change and it was merged.

Change subject: Add users being away
..


Add users being away

Via a toggle in the mwchat-me section.
An away user will have a lighter background color, greyer text, a tooltip,
and on some browsers, a greyscale avatar
Requires update.php due to field addition in chat_users table
Bump version
Change online users format

Change-Id: I99675f26f00c517784b021ca69e0edd24496ba7d
---
A Away.api.php
M GetNew.api.php
M MediaWikiChat.css
M MediaWikiChat.hooks.php
M MediaWikiChat.i18n.php
M MediaWikiChat.js
M MediaWikiChat.php
M MediaWikiChatClass.php
M SpecialChat.template.php
M chat_users.sql
A cu_away.sql
11 files changed, 146 insertions(+), 14 deletions(-)

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



diff --git a/Away.api.php b/Away.api.php
new file mode 100644
index 000..7033855
--- /dev/null
+++ b/Away.api.php
@@ -0,0 +1,58 @@
+getResult();
+   $user = $this->getUser();
+
+   if ( $user->isAllowed( 'chat' ) ) {
+   $away = $this->getMain()->getVal( 'away' ) ? 1 : 0;
+
+   $dbw = wfGetDB( DB_MASTER );
+
+   $dbw->update(
+   'chat_users',
+   array( 'cu_away' => $away ),
+   array( 'cu_user_id' => $user->getId() ),
+   __METHOD__
+   );
+
+   $result->addValue( $this->getModuleName(), 'timestamp', 
MediaWikiChat::now() );
+
+   } else {
+   $result->addValue( $this->getModuleName(), 'error', 
'you are not allowed to chat' );
+   }
+
+   return true;
+   }
+
+   public function getDescription() {
+   return 'Toggle away on the current user.';
+   }
+
+   public function getAllowedParams() {
+   return array(
+   'away' => array (
+   ApiBase::PARAM_TYPE => 'boolean',
+   ApiBase::PARAM_REQUIRED => true
+   )
+   );
+   }
+
+   public function getParamDescription() {
+   return array(
+   'away' => 'Whether the current user should be away or 
not away.'
+   );
+   }
+
+   public function getExamples() {
+   return array(
+   'api.php?action=chataway&away=true' => 'Make the 
current user away'
+   );
+   }
+
+   public function mustBePosted() {
+   return true;
+   }
+}
\ No newline at end of file
diff --git a/GetNew.api.php b/GetNew.api.php
index 0bebb4f..2c87c87 100644
--- a/GetNew.api.php
+++ b/GetNew.api.php
@@ -17,10 +17,10 @@
$thisCheck = MediaWikiChat::now();
 
$res = $dbr->selectField(
-   'chat_users',
-   array( 'cu_timestamp' ),
-   array( 'cu_user_id' => $wgUser->getId() 
),
-   __METHOD__
+   'chat_users',
+   'cu_timestamp',
+   array( 'cu_user_id' => $wgUser->getId() ),
+   __METHOD__
);
 
$lastCheck = strval( $res );
@@ -120,7 +120,7 @@
$users[$wgUser->getId()] = true; // ensure current user 
is in the users list
 
$onlineUsers = MediaWikiChat::getOnline();
-   foreach ( $onlineUsers as $id ) {
+   foreach ( $onlineUsers as $id => $away ) {
$users[$id] = true; // ensure all online users 
are present in the users list
}
$genderCache = GenderCache::singleton();
@@ -132,9 +132,12 @@
if ( $wgChatSocialAvatars ) {
$result->addValue( array( $mName, 
'users', $idString ), 'avatar', MediaWikiChat::getAvatar( $id ) );
}
-   if ( in_array( $id, $onlineUsers ) ) {
+   if ( array_key_exists( $id, $onlineUsers ) ) {
$result->addValue( array( $mName, 
'users', $idString ), 'online', true );
}
+   if ( $onlineUsers[$id] ) {
+   $result->addValue( array( $mName, 
'users', $idString ), 'away', true );
+   }
$groups = $userObject->getGroups();
if ( in_array( 'chatmod', $groups ) || 
in_array( 'sysop', $groups ) ) {
  

[MediaWiki-commits] [Gerrit] pep8 fixes - change (operations...adminbot)

[Merlijn van Deen (Code Review)]

Merlijn van Deen has uploaded a new change for review.

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

Change subject: pep8 fixes
..

pep8 fixes

adminlog.py: fix indentation to be pure tabs
adminlogbot.py: add blank line
config.py: add # noqa markers -- a tab is seen as 8 spaces, or two indents,
   so a tab indentation for a dict is seen as 'too much indentation'.
   I think it makes more sense to ignore this message than to switch
   to spaces for these few lines.

Change-Id: Ib3e077472b4f270274545bb64821b266bc794e60
---
M adminlog.py
M adminlogbot.py
M config.py
3 files changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot 
refs/changes/91/117691/1

diff --git a/adminlog.py b/adminlog.py
index 8196d6d..240c778 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -22,8 +22,8 @@
pagename = config.wiki_page
 
page = site.Pages[pagename]
-if page.redirect:
-page = next(p.links())
+   if page.redirect:
+   page = next(p.links())
 
text = page.edit()
lines = text.split('\n')
diff --git a/adminlogbot.py b/adminlogbot.py
index dfa46b1..884cf66 100755
--- a/adminlogbot.py
+++ b/adminlogbot.py
@@ -18,6 +18,7 @@
 
 LOG_FORMAT = "%(asctime)-15s %(levelname)s: %(message)s"
 
+
 class logbot(ircbot.SingleServerIRCBot):
 def __init__(self, name, config):
 self.config = config
diff --git a/config.py b/config.py
index ca3369b..c08b016 100644
--- a/config.py
+++ b/config.py
@@ -19,10 +19,10 @@
 # application's settings'. Finally, go back to the 'Details' tab and click
 # 'Create my access token'.
 twitter_api_params = {
-   'access_token_key': 
'NN-XXX',
-   'access_token_secret': 'XX',
-   'consumer_key': 'X',
-   'consumer_secret': 'X',
+   'access_token_key': 
'NN-XXX',  # noqa
+   'access_token_secret': 'XX',
   # noqa
+   'consumer_key': 'X',
   # noqa
+   'consumer_secret': 'X', 
   # noqa
 }
 
 # Channels to join

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3e077472b4f270274545bb64821b266bc794e60
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen 

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

[MediaWiki-commits] [Gerrit] Add users being away - change (mediawiki...MediaWikiChat)

[UltrasonicNXT (Code Review)]

UltrasonicNXT has uploaded a new change for review.

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

Change subject: Add users being away
..

Add users being away

Via a toggle in the mwchat-me section.
An away user will have a lighter background color, greyer text, a tooltip,
and on some browsers, a greyscale avatar
Requires update.php due to field addition in chat_users table

Change-Id: I99675f26f00c517784b021ca69e0edd24496ba7d
---
A Away.api.php
M GetNew.api.php
M MediaWikiChat.css
M MediaWikiChat.hooks.php
M MediaWikiChat.i18n.php
M MediaWikiChat.js
M MediaWikiChat.php
M MediaWikiChatClass.php
M SpecialChat.template.php
M chat_users.sql
A cu_away.sql
11 files changed, 150 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat 
refs/changes/90/117690/1

diff --git a/Away.api.php b/Away.api.php
new file mode 100644
index 000..7033855
--- /dev/null
+++ b/Away.api.php
@@ -0,0 +1,58 @@
+getResult();
+   $user = $this->getUser();
+
+   if ( $user->isAllowed( 'chat' ) ) {
+   $away = $this->getMain()->getVal( 'away' ) ? 1 : 0;
+
+   $dbw = wfGetDB( DB_MASTER );
+
+   $dbw->update(
+   'chat_users',
+   array( 'cu_away' => $away ),
+   array( 'cu_user_id' => $user->getId() ),
+   __METHOD__
+   );
+
+   $result->addValue( $this->getModuleName(), 'timestamp', 
MediaWikiChat::now() );
+
+   } else {
+   $result->addValue( $this->getModuleName(), 'error', 
'you are not allowed to chat' );
+   }
+
+   return true;
+   }
+
+   public function getDescription() {
+   return 'Toggle away on the current user.';
+   }
+
+   public function getAllowedParams() {
+   return array(
+   'away' => array (
+   ApiBase::PARAM_TYPE => 'boolean',
+   ApiBase::PARAM_REQUIRED => true
+   )
+   );
+   }
+
+   public function getParamDescription() {
+   return array(
+   'away' => 'Whether the current user should be away or 
not away.'
+   );
+   }
+
+   public function getExamples() {
+   return array(
+   'api.php?action=chataway&away=true' => 'Make the 
current user away'
+   );
+   }
+
+   public function mustBePosted() {
+   return true;
+   }
+}
\ No newline at end of file
diff --git a/GetNew.api.php b/GetNew.api.php
index 0bebb4f..2c87c87 100644
--- a/GetNew.api.php
+++ b/GetNew.api.php
@@ -17,10 +17,10 @@
$thisCheck = MediaWikiChat::now();
 
$res = $dbr->selectField(
-   'chat_users',
-   array( 'cu_timestamp' ),
-   array( 'cu_user_id' => $wgUser->getId() 
),
-   __METHOD__
+   'chat_users',
+   'cu_timestamp',
+   array( 'cu_user_id' => $wgUser->getId() ),
+   __METHOD__
);
 
$lastCheck = strval( $res );
@@ -120,7 +120,7 @@
$users[$wgUser->getId()] = true; // ensure current user 
is in the users list
 
$onlineUsers = MediaWikiChat::getOnline();
-   foreach ( $onlineUsers as $id ) {
+   foreach ( $onlineUsers as $id => $away ) {
$users[$id] = true; // ensure all online users 
are present in the users list
}
$genderCache = GenderCache::singleton();
@@ -132,9 +132,12 @@
if ( $wgChatSocialAvatars ) {
$result->addValue( array( $mName, 
'users', $idString ), 'avatar', MediaWikiChat::getAvatar( $id ) );
}
-   if ( in_array( $id, $onlineUsers ) ) {
+   if ( array_key_exists( $id, $onlineUsers ) ) {
$result->addValue( array( $mName, 
'users', $idString ), 'online', true );
}
+   if ( $onlineUsers[$id] ) {
+   $result->addValue( array( $mName, 
'users', $idString ), 'away', true );
+   }
$groups = $userObject->getGroups();
if ( in_array( 'chatmod', $groups ) || 
in_

[MediaWiki-commits] [Gerrit] Consistency tweaks - change (mediawiki...PGFTikZ)

[Siebrand (Code Review)]

Siebrand has submitted this change and it was merged.

Change subject: Consistency tweaks
..


Consistency tweaks

* Use single quotes in i18n file
* Image -> File
* Add FIXME for message documentation
* Fix extension type

Change-Id: I0ed44a981862df277f7396fbc79b45bbf59b156b
---
M PGFTikZ.i18n.php
M PGFTikZ.php
2 files changed, 60 insertions(+), 62 deletions(-)

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



diff --git a/PGFTikZ.i18n.php b/PGFTikZ.i18n.php
index 2c07773..73539f6 100644
--- a/PGFTikZ.i18n.php
+++ b/PGFTikZ.i18n.php
@@ -11,78 +11,76 @@
  * @author thibault marin
  */
 $messages['en'] = array(
-
// Description
-   'pgftikz-desc' => "Render PGF/TikZ graphs in wiki",
+   'pgftikz-desc' => 'Render PGF/TikZ graphs in wiki',
 
// Error messages
'pgftikz-error-title' => 'PGFTikZ parser error:',
-   'pgftikz-error-emptyinput' => "Empty input.",
-   'pgftikz-error-imagelineparse' => "Could not parse image line, expected 
something like ([[Image:image_file_name.ext|image link]]).",
-   'pgftikz-error-apigetpagecontent' => "Could not get image page content 
for comparision.",
-   'pgftikz-error-apiedit' => "Could not update file wikipage.",
-   'pgftikz-error-apidelete' => "Could not delete preview wikipage.",
-   'pgftikz-error-nonpgffile' => "Existing file is not PGFTikZ-generated, 
not overwriting.",
-   'pgftikz-error-preambleparse' => "Error parsing LaTeX preamble.",
-   'pgftikz-error-tmpdircreate' => "Error creating temporary folder.",
-   'pgftikz-error-texfilecreate' => "Error creating LaTeX source file.",
-   'pgftikz-error-latexnoout' => "Error when running LaTeX (no output, is 
latex present?).",
-   'pgftikz-error-latexcompil' => "Error when running LaTeX (compilation 
error).",
-   'pgftikz-error-dvipsnoout' => "Error when running dvips (no output, is 
dvips present?).",
-   'pgftikz-error-dvipscompil' => "Error when running dvips (runtime 
error).",
-   'pgftikz-error-epstoolnoout' => "Error when running epstool (no output, 
is epstool present?).",
-   'pgftikz-error-epstoolrun' => "Error when running epstool (runtime 
error).",
-   'pgftikz-error-convertnoout' => "Error when running convert (no output, 
is convert present?).",
-   'pgftikz-error-convertrun' => "Error when running convert (runtime).",
+   'pgftikz-error-emptyinput' => 'Empty input.',
+   'pgftikz-error-imagelineparse' => 'Could not parse image line, expected 
something like ([[File:Image file name.ext|file link]]).',
+   'pgftikz-error-apigetpagecontent' => 'Could not get image page content 
for comparision.',
+   'pgftikz-error-apiedit' => 'Could not update file wikipage.',
+   'pgftikz-error-apidelete' => 'Could not delete preview wikipage.',
+   'pgftikz-error-nonpgffile' => 'Existing file is not PGF/TikZ-generated, 
not overwriting.',
+   'pgftikz-error-preambleparse' => 'Error parsing LaTeX preamble.',
+   'pgftikz-error-tmpdircreate' => 'Error creating temporary folder.',
+   'pgftikz-error-texfilecreate' => 'Error creating LaTeX source file.',
+   'pgftikz-error-latexnoout' => 'Error when running LaTeX (no output, is 
latex present?).',
+   'pgftikz-error-latexcompil' => 'Error when running LaTeX (compilation 
error).',
+   'pgftikz-error-dvipsnoout' => 'Error when running dvips (no output, is 
dvips present?).',
+   'pgftikz-error-dvipscompil' => 'Error when running dvips (runtime 
error).',
+   'pgftikz-error-epstoolnoout' => 'Error when running epstool (no output, 
is epstool present?).',
+   'pgftikz-error-epstoolrun' => 'Error when running epstool (runtime 
error).',
+   'pgftikz-error-convertnoout' => 'Error when running convert (no output, 
is convert present?).',
+   'pgftikz-error-convertrun' => 'Error when running convert (runtime).',
 
-   'pgftikz-error-uploadlocal_error_empty' => "Error during upload (empty 
file).",
-   'pgftikz-error-uploadlocal_error_missing' => "Error during upload 
(filetype missing).",
-   'pgftikz-error-uploadlocal_error_badtype' => "Error during upload (bad 
filetype).",
-   'pgftikz-error-uploadlocal_error_tooshort' => "Error during upload 
(filename too short).",
-   'pgftikz-error-uploadlocal_error_illegal' => "Error during upload 
(illegal filename).",
-   'pgftikz-error-uploadlocal_error_overwrite' => "Error during upload 
(overwrite).",
-   'pgftikz-error-uploadlocal_error_verify' => "Error during upload 
(verification error).",
-   'pgftikz-error-uploadlocal_error_hook' => "Error during upload (hook 
aborted).",
-   'pgftikz-error-uploadlocal_error_unknown' => "Error during upload 
(unknown error)."
-
+   'pgftikz-error-uploadlocal_error_empty' => 'Error during upload (empty 
file).',
+   'pgftikz-error-uploadlocal_error_missing' => 'Error during upload 
(filetype missing).',
+ 

[MediaWiki-commits] [Gerrit] Wrap long line - change (mediawiki...GlobalBlocking)

[jenkins-bot (Code Review)]

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

Change subject: Wrap long line
..


Wrap long line

Change-Id: Ib0784135b9c771dbf3a1d40058c5f4f106c8b8aa
---
M ApiGlobalBlock.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/ApiGlobalBlock.php b/ApiGlobalBlock.php
index 8b8d1e4..93d4de9 100644
--- a/ApiGlobalBlock.php
+++ b/ApiGlobalBlock.php
@@ -95,7 +95,11 @@
public function getParamDescription() {
return array(
'target' => 'The target IP.',
-   'expiry' => 'If specified, will block or reblock the 
user. Determines how long the block will last for, e.g. \'5 months\' or \'2 
weeks\'. If set to \'infinite\' or \'indefinite\' the block will never expire.',
+   'expiry' => array(
+   'If specified, will block or reblock the user.',
+   "Determines how long the block will last for, 
e.g. '5 months' or '2 weeks'.",
+   "If set to 'infinite' or 'indefinite' the block 
will never expire."
+   ),
'unblock' => 'If specified, will unblock the user.',
'reason' => 'The reason for blocking/unblocking.',
'anononly' => 'Specify this if the block should only 
affect logged-out users.',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0784135b9c771dbf3a1d40058c5f4f106c8b8aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bug: 61832 - fixed. - change (pywikibot/core)

[Purodha (Code Review)]

Purodha has uploaded a new change for review.

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

Change subject: Bug: 61832 - fixed.
..

Bug: 61832 - fixed.

Following bug 61832 comment 3 suggeston a)

Change-Id: Ibaa00e00bc61c734955e1377604241541eab336b
---
M pywikibot/site.py
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/89/117689/1

diff --git a/pywikibot/site.py b/pywikibot/site.py
index 78196a5..487f5f1 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -155,7 +155,12 @@
 user = user[0].upper() + user[1:]
 if sysop:
 sysop = sysop[0].upper() + sysop[1:]
-self._username = [user, sysop]
+if user:
+   user = user.replace('_', ' ')
+if sysop:
+   sysop = sysop.replace('_', ' ')
+   self._username = [user, sysop]
+
 self.use_hard_category_redirects = (
 self.code in self.family.use_hard_category_redirects)
 
@@ -869,6 +874,7 @@
 DEPRECATED (use .user() method instead)
 
 """
+
 return self.logged_in(sysop) and self.user()
 
 def login(self, sysop=False):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaa00e00bc61c734955e1377604241541eab336b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Purodha 

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

[MediaWiki-commits] [Gerrit] dataset2 to use new dataset module - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: dataset2 to use new dataset module
..


dataset2 to use new dataset module

Change-Id: Iea15e73f3d01f7fe59e32adccdb7e9b1769ca033
---
M manifests/site.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 85731bc..956c6ed 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -530,7 +530,9 @@
 $gid= '500'
 
 include accounts::brion
-include role::download::primary
+#include role::download::primary
+include role::dataset::secondary
+include role::download::wikimedia
 }
 
 node 'dataset1001.wikimedia.org' {

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

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

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

[MediaWiki-commits] [Gerrit] dataset2 to use new dataset module - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: dataset2 to use new dataset module
..

dataset2 to use new dataset module

Change-Id: Iea15e73f3d01f7fe59e32adccdb7e9b1769ca033
---
M manifests/site.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/117687/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 85731bc..956c6ed 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -530,7 +530,9 @@
 $gid= '500'
 
 include accounts::brion
-include role::download::primary
+#include role::download::primary
+include role::dataset::secondary
+include role::download::wikimedia
 }
 
 node 'dataset1001.wikimedia.org' {

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

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

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

[MediaWiki-commits] [Gerrit] dataset: rsync nice and ionice only for nonpublic rsyncs - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: dataset: rsync nice and ionice only for nonpublic rsyncs
..


dataset: rsync nice and ionice only for nonpublic rsyncs

Change-Id: I48b82578a3a3c391b70d985d9be76098104d9092
---
M modules/dataset/manifests/rsync/default.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/dataset/manifests/rsync/default.pp 
b/modules/dataset/manifests/rsync/default.pp
index 5705aaf..3be1876 100644
--- a/modules/dataset/manifests/rsync/default.pp
+++ b/modules/dataset/manifests/rsync/default.pp
@@ -5,13 +5,13 @@
 $rsync_config_file = undef
 ) {
 if $public == true {
-$rsync_nice = '10'
-$rsync_ionice = '-c3'
-}
-else {
 $rsync_nice = undef
 $rsync_ionice = undef
 }
+else {
+$rsync_nice = '10'
+$rsync_ionice = '-c3'
+}
 
 file { '/etc/default/rsync':
 ensure   => 'present',

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

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

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

[MediaWiki-commits] [Gerrit] dataset: rsync nice and ionice only for nonpublic rsyncs - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: dataset: rsync nice and ionice only for nonpublic rsyncs
..

dataset: rsync nice and ionice only for nonpublic rsyncs

Change-Id: I48b82578a3a3c391b70d985d9be76098104d9092
---
M modules/dataset/manifests/rsync/default.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/117686/1

diff --git a/modules/dataset/manifests/rsync/default.pp 
b/modules/dataset/manifests/rsync/default.pp
index 5705aaf..3be1876 100644
--- a/modules/dataset/manifests/rsync/default.pp
+++ b/modules/dataset/manifests/rsync/default.pp
@@ -5,13 +5,13 @@
 $rsync_config_file = undef
 ) {
 if $public == true {
-$rsync_nice = '10'
-$rsync_ionice = '-c3'
-}
-else {
 $rsync_nice = undef
 $rsync_ionice = undef
 }
+else {
+$rsync_nice = '10'
+$rsync_ionice = '-c3'
+}
 
 file { '/etc/default/rsync':
 ensure   => 'present',

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

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

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

[MediaWiki-commits] [Gerrit] one more nfs remnant to toss from download web server manifest - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: one more nfs remnant to toss from download web server manifest
..


one more nfs remnant to toss from download web server manifest

Change-Id: I5e43aa0a9cb4979ebd8314d3b0f04c6a9f4aa0a0
---
M modules/download/manifests/wikimedia.pp
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/modules/download/manifests/wikimedia.pp 
b/modules/download/manifests/wikimedia.pp
index 4a530bd..846c4e6 100644
--- a/modules/download/manifests/wikimedia.pp
+++ b/modules/download/manifests/wikimedia.pp
@@ -23,9 +23,4 @@
 description   => 'LighttpdHTTP',
 check_command => 'check_http'
 }
-
-monitor_service { 'nfs':
-description   => 'NFS',
-check_command => 'check_tcp!2049'
-}
 }

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

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

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

[MediaWiki-commits] [Gerrit] one more nfs remnant to toss from download web server manifest - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: one more nfs remnant to toss from download web server manifest
..

one more nfs remnant to toss from download web server manifest

Change-Id: I5e43aa0a9cb4979ebd8314d3b0f04c6a9f4aa0a0
---
M modules/download/manifests/wikimedia.pp
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/117685/1

diff --git a/modules/download/manifests/wikimedia.pp 
b/modules/download/manifests/wikimedia.pp
index 4a530bd..846c4e6 100644
--- a/modules/download/manifests/wikimedia.pp
+++ b/modules/download/manifests/wikimedia.pp
@@ -23,9 +23,4 @@
 description   => 'LighttpdHTTP',
 check_command => 'check_http'
 }
-
-monitor_service { 'nfs':
-description   => 'NFS',
-check_command => 'check_tcp!2049'
-}
 }

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

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

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

[MediaWiki-commits] [Gerrit] remove nfs stuff from download web server manifest - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: remove nfs stuff from download web server manifest
..


remove nfs stuff from download web server manifest

Change-Id: I81a8578ca408ef6259048ee6e9604e7e086aa2a1
---
M modules/download/manifests/wikimedia.pp
1 file changed, 0 insertions(+), 16 deletions(-)

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



diff --git a/modules/download/manifests/wikimedia.pp 
b/modules/download/manifests/wikimedia.pp
index 95c4694..4a530bd 100644
--- a/modules/download/manifests/wikimedia.pp
+++ b/modules/download/manifests/wikimedia.pp
@@ -17,22 +17,6 @@
 ensure => running,
 }
 
-package { 'nfs-kernel-server':
-ensure => present,
-}
-
-file { '/etc/exports':
-mode=> '0444',
-owner   => 'root',
-group   => 'root',
-source  => 'puppet:///modules/download/exports',
-require => Package['nfs-kernel-server'],
-}
-
-service { 'nfs-kernel-server':
-require => [ Package['nfs-kernel-server'], File['/etc/exports'] ],
-}
-
 include generic::higher_min_free_kbytes
 
 monitor_service { 'lighttpd http':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81a8578ca408ef6259048ee6e9604e7e086aa2a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
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 nfs stuff from download web server manifest - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: remove nfs stuff from download web server manifest
..

remove nfs stuff from download web server manifest

Change-Id: I81a8578ca408ef6259048ee6e9604e7e086aa2a1
---
M modules/download/manifests/wikimedia.pp
1 file changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/117684/1

diff --git a/modules/download/manifests/wikimedia.pp 
b/modules/download/manifests/wikimedia.pp
index 95c4694..4a530bd 100644
--- a/modules/download/manifests/wikimedia.pp
+++ b/modules/download/manifests/wikimedia.pp
@@ -17,22 +17,6 @@
 ensure => running,
 }
 
-package { 'nfs-kernel-server':
-ensure => present,
-}
-
-file { '/etc/exports':
-mode=> '0444',
-owner   => 'root',
-group   => 'root',
-source  => 'puppet:///modules/download/exports',
-require => Package['nfs-kernel-server'],
-}
-
-service { 'nfs-kernel-server':
-require => [ Package['nfs-kernel-server'], File['/etc/exports'] ],
-}
-
 include generic::higher_min_free_kbytes
 
 monitor_service { 'lighttpd http':

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

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

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

[MediaWiki-commits] [Gerrit] dataset1001 to use new dataset role - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: dataset1001 to use new dataset role
..


dataset1001 to use new dataset role

Change-Id: I3e8203637897ed9f3ec08cd9fe84b68046b62ce4
---
M manifests/site.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 98eff6f..85731bc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -542,7 +542,9 @@
 }
 
 include accounts::brion
-include role::download::secondary
+#include role::download::secondary
+include role::dataset::primary
+include role::download::wikimedia
 }
 
 # pmtpa dbs

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

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

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

[MediaWiki-commits] [Gerrit] dataset1001 to use new dataset role - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: dataset1001 to use new dataset role
..

dataset1001 to use new dataset role

Change-Id: I3e8203637897ed9f3ec08cd9fe84b68046b62ce4
---
M manifests/site.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/117683/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 98eff6f..85731bc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -542,7 +542,9 @@
 }
 
 include accounts::brion
-include role::download::secondary
+#include role::download::secondary
+include role::dataset::primary
+include role::download::wikimedia
 }
 
 # pmtpa dbs

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

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

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

[MediaWiki-commits] [Gerrit] datasets: rsyncd conf file pieces must end in .conf for the ... - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: datasets: rsyncd conf file pieces must end in .conf for the 
concat
..


datasets: rsyncd conf file pieces must end in .conf for the concat

Change-Id: I71f57bea84e42ed63c0efa62081690c7a474ebd8
---
M modules/dataset/manifests/rsync/public.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/dataset/manifests/rsync/public.pp 
b/modules/dataset/manifests/rsync/public.pp
index 0999170..65f3886 100644
--- a/modules/dataset/manifests/rsync/public.pp
+++ b/modules/dataset/manifests/rsync/public.pp
@@ -13,7 +13,7 @@
 
 include role::mirror::common
 include dataset::rsync::common
-file { '/etc/rsyncd.d/20-rsync-dumps_to_public':
+file { '/etc/rsyncd.d/20-rsync-dumps_to_public.conf':
 ensure  => $ensure,
 mode=> '0444',
 owner   => 'root',

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

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

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

[MediaWiki-commits] [Gerrit] datasets: rsyncd conf file pieces must end in .conf for the ... - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: datasets: rsyncd conf file pieces must end in .conf for the 
concat
..

datasets: rsyncd conf file pieces must end in .conf for the concat

Change-Id: I71f57bea84e42ed63c0efa62081690c7a474ebd8
---
M modules/dataset/manifests/rsync/public.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/117682/1

diff --git a/modules/dataset/manifests/rsync/public.pp 
b/modules/dataset/manifests/rsync/public.pp
index 0999170..65f3886 100644
--- a/modules/dataset/manifests/rsync/public.pp
+++ b/modules/dataset/manifests/rsync/public.pp
@@ -13,7 +13,7 @@
 
 include role::mirror::common
 include dataset::rsync::common
-file { '/etc/rsyncd.d/20-rsync-dumps_to_public':
+file { '/etc/rsyncd.d/20-rsync-dumps_to_public.conf':
 ensure  => $ensure,
 mode=> '0444',
 owner   => 'root',

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

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

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

[MediaWiki-commits] [Gerrit] Wrap long text - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Wrap long text
..


Wrap long text

Change-Id: I37fe6fbdc8779ba86318e587c3d9e217bede400a
---
M includes/api/ApiOptions.php
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index fb441a3..74dd660 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -174,10 +174,11 @@
'token' => 'An options token previously obtained 
through the action=tokens',
'reset' => 'Resets preferences to the site defaults',
'resetkinds' => 'List of types of options to reset when 
the "reset" option is set',
-   'change' => 'List of changes, formatted name=value 
(e.g. skin=vector), ' .
-   'value cannot contain pipe characters. If no 
value is given (not ' .
+   'change' => array( 'List of changes, formatted 
name=value (e.g. skin=vector), ' .
+   'value cannot contain pipe characters. If no 
value is given (not ',
'even an equals sign), e.g., 
optionname|otheroption|..., the ' .
-   'option will be reset to its default value',
+   'option will be reset to its default value'
+   ),
'optionname' => 'A name of a option which should have 
an optionvalue set',
'optionvalue' => 'A value of the option specified by 
the optionname, ' .
'can contain pipe characters',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37fe6fbdc8779ba86318e587c3d9e217bede400a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Wrap long line - change (mediawiki...GlobalBlocking)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Wrap long line
..

Wrap long line

Change-Id: Ib0784135b9c771dbf3a1d40058c5f4f106c8b8aa
---
M ApiGlobalBlock.php
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/ApiGlobalBlock.php b/ApiGlobalBlock.php
index 8b8d1e4..93d4de9 100644
--- a/ApiGlobalBlock.php
+++ b/ApiGlobalBlock.php
@@ -95,7 +95,11 @@
public function getParamDescription() {
return array(
'target' => 'The target IP.',
-   'expiry' => 'If specified, will block or reblock the 
user. Determines how long the block will last for, e.g. \'5 months\' or \'2 
weeks\'. If set to \'infinite\' or \'indefinite\' the block will never expire.',
+   'expiry' => array(
+   'If specified, will block or reblock the user.',
+   "Determines how long the block will last for, 
e.g. '5 months' or '2 weeks'.",
+   "If set to 'infinite' or 'indefinite' the block 
will never expire."
+   ),
'unblock' => 'If specified, will unblock the user.',
'reason' => 'The reason for blocking/unblocking.',
'anononly' => 'Specify this if the block should only 
affect logged-out users.',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0784135b9c771dbf3a1d40058c5f4f106c8b8aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Wrap long text - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Wrap long text
..

Wrap long text

Change-Id: I37fe6fbdc8779ba86318e587c3d9e217bede400a
---
M includes/api/ApiOptions.php
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index fb441a3..74dd660 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -174,10 +174,11 @@
'token' => 'An options token previously obtained 
through the action=tokens',
'reset' => 'Resets preferences to the site defaults',
'resetkinds' => 'List of types of options to reset when 
the "reset" option is set',
-   'change' => 'List of changes, formatted name=value 
(e.g. skin=vector), ' .
-   'value cannot contain pipe characters. If no 
value is given (not ' .
+   'change' => array( 'List of changes, formatted 
name=value (e.g. skin=vector), ' .
+   'value cannot contain pipe characters. If no 
value is given (not ',
'even an equals sign), e.g., 
optionname|otheroption|..., the ' .
-   'option will be reset to its default value',
+   'option will be reset to its default value'
+   ),
'optionname' => 'A name of a option which should have 
an optionvalue set',
'optionvalue' => 'A value of the option specified by 
the optionname, ' .
'can contain pipe characters',

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

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

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

[MediaWiki-commits] [Gerrit] Wrap long text of action=mobileview sections - change (mediawiki...MobileFrontend)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Wrap long text of action=mobileview sections
..

Wrap long text of action=mobileview sections

Makes the api help really really wide!

Change-Id: I6d69dbf444538e1ab68eb7515b921950a747e2a0
---
M includes/api/ApiMobileView.php
1 file changed, 5 insertions(+), 4 deletions(-)


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

diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index b21dcd6..4590988 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -592,10 +592,11 @@
'id' => 'Id of the page',
'page' => 'Title of page to process',
'redirect' => 'Whether redirects should be followed',
-   'sections' => "Pipe-separated list of section numbers 
for which to return text. "
-   . "`all' can be used to return for all. Ranges 
in format '1-4' mean get sections 1,2,3,4. "
-   . "Ranges without second number, e.g. '1-' 
means get all until the end. "
-   . "`references' can be used to specify that all 
sections containing references should be returned.",
+   'sections' => array( 'Pipe-separated list of section 
numbers for which to return text.',
+   " `all' can be used to return for all. Ranges 
in format '1-4' mean get sections 1,2,3,4. ",
+   " Ranges without second number, e.g. '1-' means 
get all until the end.",
+   " `references' can be used to specify that all 
sections containing references should be returned."
+   ),
'prop' => array(
'Which information to get',
' text- HTML of selected 
section(s)',

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

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

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

[MediaWiki-commits] [Gerrit] Remove API developer email addresses - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Remove API developer email addresses
..


Remove API developer email addresses

They just end up being used for direct support requests that should
really be done on public mailing lists etc

Change-Id: If704ec8dff5fc4669165b580290cc29cf953a25b
---
M includes/api/ApiMain.php
1 file changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 0939dea..37273d9 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1162,12 +1162,11 @@
protected function getCredits() {
return array(
'API developers:',
-   'Roan Kattouw - roan . kattouw @ gmail . com (lead 
developer Sep 2007-2009)',
-   'Victor Vasiliev - vasilvv @ gmail . com',
-   'Bryan Tong Minh - bryan . tongminh @ gmail . com',
-   'Sam Reed - sam @ reedyboy . net',
-   'Yuri Astrakhan - yuri . astrakhan @ gmail . com 
(creator, lead ' .
-   'developer Sep 2006-Sep 2007, 2012-present)',
+   'Roan Kattouw (lead developer Sep 2007-2009)',
+   'Victor Vasiliev',
+   'Bryan Tong Minh',
+   'Sam Reed',
+   'Yuri Astrakhan (creator, lead developer Sep 
2006-Sep 2007, 2012-present)',
'',
'Please send your comments, suggestions and questions 
to mediawiki-...@lists.wikimedia.org',
'or file a bug report at 
https://bugzilla.wikimedia.org/'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If704ec8dff5fc4669165b580290cc29cf953a25b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove API developer email addresses - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Remove API developer email addresses
..

Remove API developer email addresses

They just end up being used for direct support requests that should
really be done on public mailing lists etc

Change-Id: If704ec8dff5fc4669165b580290cc29cf953a25b
---
M includes/api/ApiMain.php
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/117678/1

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 0939dea..37273d9 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1162,12 +1162,11 @@
protected function getCredits() {
return array(
'API developers:',
-   'Roan Kattouw - roan . kattouw @ gmail . com (lead 
developer Sep 2007-2009)',
-   'Victor Vasiliev - vasilvv @ gmail . com',
-   'Bryan Tong Minh - bryan . tongminh @ gmail . com',
-   'Sam Reed - sam @ reedyboy . net',
-   'Yuri Astrakhan - yuri . astrakhan @ gmail . com 
(creator, lead ' .
-   'developer Sep 2006-Sep 2007, 2012-present)',
+   'Roan Kattouw (lead developer Sep 2007-2009)',
+   'Victor Vasiliev',
+   'Bryan Tong Minh',
+   'Sam Reed',
+   'Yuri Astrakhan (creator, lead developer Sep 
2006-Sep 2007, 2012-present)',
'',
'Please send your comments, suggestions and questions 
to mediawiki-...@lists.wikimedia.org',
'or file a bug report at 
https://bugzilla.wikimedia.org/'

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

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

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

[MediaWiki-commits] [Gerrit] Consistency tweaks - change (mediawiki...PGFTikZ)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: Consistency tweaks
..

Consistency tweaks

* Use single quotes in i18n file
* Image -> File
* Add FIXME for message documentation
* Fix extension type

Change-Id: I0ed44a981862df277f7396fbc79b45bbf59b156b
---
M PGFTikZ.i18n.php
M PGFTikZ.php
2 files changed, 59 insertions(+), 61 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PGFTikZ 
refs/changes/77/117677/1

diff --git a/PGFTikZ.i18n.php b/PGFTikZ.i18n.php
index 2c07773..73539f6 100644
--- a/PGFTikZ.i18n.php
+++ b/PGFTikZ.i18n.php
@@ -11,78 +11,76 @@
  * @author thibault marin
  */
 $messages['en'] = array(
-
// Description
-   'pgftikz-desc' => "Render PGF/TikZ graphs in wiki",
+   'pgftikz-desc' => 'Render PGF/TikZ graphs in wiki',
 
// Error messages
'pgftikz-error-title' => 'PGFTikZ parser error:',
-   'pgftikz-error-emptyinput' => "Empty input.",
-   'pgftikz-error-imagelineparse' => "Could not parse image line, expected 
something like ([[Image:image_file_name.ext|image link]]).",
-   'pgftikz-error-apigetpagecontent' => "Could not get image page content 
for comparision.",
-   'pgftikz-error-apiedit' => "Could not update file wikipage.",
-   'pgftikz-error-apidelete' => "Could not delete preview wikipage.",
-   'pgftikz-error-nonpgffile' => "Existing file is not PGFTikZ-generated, 
not overwriting.",
-   'pgftikz-error-preambleparse' => "Error parsing LaTeX preamble.",
-   'pgftikz-error-tmpdircreate' => "Error creating temporary folder.",
-   'pgftikz-error-texfilecreate' => "Error creating LaTeX source file.",
-   'pgftikz-error-latexnoout' => "Error when running LaTeX (no output, is 
latex present?).",
-   'pgftikz-error-latexcompil' => "Error when running LaTeX (compilation 
error).",
-   'pgftikz-error-dvipsnoout' => "Error when running dvips (no output, is 
dvips present?).",
-   'pgftikz-error-dvipscompil' => "Error when running dvips (runtime 
error).",
-   'pgftikz-error-epstoolnoout' => "Error when running epstool (no output, 
is epstool present?).",
-   'pgftikz-error-epstoolrun' => "Error when running epstool (runtime 
error).",
-   'pgftikz-error-convertnoout' => "Error when running convert (no output, 
is convert present?).",
-   'pgftikz-error-convertrun' => "Error when running convert (runtime).",
+   'pgftikz-error-emptyinput' => 'Empty input.',
+   'pgftikz-error-imagelineparse' => 'Could not parse image line, expected 
something like ([[File:Image file name.ext|file link]]).',
+   'pgftikz-error-apigetpagecontent' => 'Could not get image page content 
for comparision.',
+   'pgftikz-error-apiedit' => 'Could not update file wikipage.',
+   'pgftikz-error-apidelete' => 'Could not delete preview wikipage.',
+   'pgftikz-error-nonpgffile' => 'Existing file is not PGF/TikZ-generated, 
not overwriting.',
+   'pgftikz-error-preambleparse' => 'Error parsing LaTeX preamble.',
+   'pgftikz-error-tmpdircreate' => 'Error creating temporary folder.',
+   'pgftikz-error-texfilecreate' => 'Error creating LaTeX source file.',
+   'pgftikz-error-latexnoout' => 'Error when running LaTeX (no output, is 
latex present?).',
+   'pgftikz-error-latexcompil' => 'Error when running LaTeX (compilation 
error).',
+   'pgftikz-error-dvipsnoout' => 'Error when running dvips (no output, is 
dvips present?).',
+   'pgftikz-error-dvipscompil' => 'Error when running dvips (runtime 
error).',
+   'pgftikz-error-epstoolnoout' => 'Error when running epstool (no output, 
is epstool present?).',
+   'pgftikz-error-epstoolrun' => 'Error when running epstool (runtime 
error).',
+   'pgftikz-error-convertnoout' => 'Error when running convert (no output, 
is convert present?).',
+   'pgftikz-error-convertrun' => 'Error when running convert (runtime).',
 
-   'pgftikz-error-uploadlocal_error_empty' => "Error during upload (empty 
file).",
-   'pgftikz-error-uploadlocal_error_missing' => "Error during upload 
(filetype missing).",
-   'pgftikz-error-uploadlocal_error_badtype' => "Error during upload (bad 
filetype).",
-   'pgftikz-error-uploadlocal_error_tooshort' => "Error during upload 
(filename too short).",
-   'pgftikz-error-uploadlocal_error_illegal' => "Error during upload 
(illegal filename).",
-   'pgftikz-error-uploadlocal_error_overwrite' => "Error during upload 
(overwrite).",
-   'pgftikz-error-uploadlocal_error_verify' => "Error during upload 
(verification error).",
-   'pgftikz-error-uploadlocal_error_hook' => "Error during upload (hook 
aborted).",
-   'pgftikz-error-uploadlocal_error_unknown' => "Error during upload 
(unknown error)."
-
+   'pgftikz-error-uploadlocal_error_empty' => 'Error during upload (empty 
file).',
+   'pgftikz-err

[MediaWiki-commits] [Gerrit] Created a ClientSiteLinkLookup to query sitelinks - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has submitted this change and it was merged.

Change subject: Created a ClientSiteLinkLookup to query sitelinks
..


Created a ClientSiteLinkLookup to query sitelinks

The class allows to get the sitelinks connected with a given title and
also includes the badges of this sitelink by loading the cached entity.

Change-Id: Ibc0471ce1c08d8b52b5f56f97375022b0d8ef910
---
A client/includes/ClientSiteLinkLookup.php
A client/tests/phpunit/includes/ClientSiteLinkLookupTest.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
3 files changed, 160 insertions(+), 1 deletion(-)

Approvals:
  WikidataJenkins: Verified
  Addshore: Looks good to me, approved



diff --git a/client/includes/ClientSiteLinkLookup.php 
b/client/includes/ClientSiteLinkLookup.php
new file mode 100644
index 000..9801f13
--- /dev/null
+++ b/client/includes/ClientSiteLinkLookup.php
@@ -0,0 +1,71 @@
+
+ */
+class ClientSiteLinkLookup {
+
+   /**
+* @var string
+*/
+   protected $localSiteId;
+
+   /**
+* @var SiteLinkLookup
+*/
+   protected $siteLinkLookup;
+
+   /**
+* @var EntityLookup
+*/
+   protected $entityLookup;
+
+   /**
+* @param string $localSiteId global id of the client wiki
+* @param SiteLinkLookup $siteLinkLookup
+* @param EntityLookup $entityLookup
+*/
+   public function __construct( $localSiteId, SiteLinkLookup 
$siteLinkLookup, EntityLookup $entityLookup ) {
+   $this->localSiteId = $localSiteId;
+   $this->siteLinkLookup = $siteLinkLookup;
+   $this->entityLookup = $entityLookup;
+   }
+
+   /**
+* Finds the corresponding item on the repository and
+* returns the item's site links including badges.
+*
+* @since 0.5
+*
+* @param Title $title
+*
+* @return SiteLink[]
+*/
+   public function getSiteLinks( Title $title ) {
+   $siteLink = new SiteLink( $this->localSiteId, $title->getText() 
);
+   $itemId = $this->siteLinkLookup->getEntityIdForSiteLink( 
$siteLink );
+
+   if ( $itemId === null ) {
+   return array();
+   }
+
+   $item = $this->entityLookup->getEntity( $itemId );
+   if ( $item === null ) {
+   return array();
+   }
+   return $item->getSiteLinks();
+   }
+
+}
diff --git a/client/tests/phpunit/includes/ClientSiteLinkLookupTest.php 
b/client/tests/phpunit/includes/ClientSiteLinkLookupTest.php
new file mode 100644
index 000..c402ae1
--- /dev/null
+++ b/client/tests/phpunit/includes/ClientSiteLinkLookupTest.php
@@ -0,0 +1,88 @@
+
+ */
+class ClientSiteLinkLookupTest extends \PHPUnit_Framework_TestCase {
+
+   static $itemData = array(
+   1 => array(
+   'id' => 1,
+   'label' => array( 'en' => 'Foo' ),
+   'links' => array(
+   'dewiki' => array(
+   'name' => 'Foo de',
+   'badges' => array( 'Q3' )
+   ),
+   'enwiki' => array(
+   'name' => 'Foo en',
+   'badges' => array( 'Q4', 'Q123' )
+   ),
+   'srwiki' => 'Foo sr',
+   'dewiktionary' => 'Foo de word',
+   'enwiktionary' => 'Foo en word',
+   )
+   )
+   );
+
+   private function getClientSiteLinkLookup( $localSiteId ) {
+   $mockRepo = new MockRepository();
+
+   foreach ( self::$itemData as $data ) {
+   $item = new Item( $data );
+   $mockRepo->putEntity( $item );
+   }
+
+   return new ClientSiteLinkLookup(
+   $localSiteId,
+   $mockRepo,
+   $mockRepo
+   );
+   }
+
+   /**
+* @dataProvider provideGetSiteLinks
+*/
+   public function testGetSiteLinks( $expected, $localSiteId, Title 
$title, $message ) {
+   $ClientSiteLinkLookup = $this->getClientSiteLinkLookup( 
$localSiteId );
+
+   $this->assertEquals(
+   $expected,
+   $ClientSiteLinkLookup->getSiteLinks( $title ),
+   $message
+   );
+   }
+
+   public function provideGetSiteLinks() {
+   $sitelinks = array(
+   new SiteLink( 'dewiki', 'Foo de', array( new ItemId( 
'Q3' ) ) ),
+   new SiteLink( 'enwiki', 'Foo en', array( new ItemId( 
'Q4' ), new ItemId( 'Q123'

[MediaWiki-commits] [Gerrit] slim down download::common in prep for refactor - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: slim down download::common in prep for refactor
..


slim down download::common in prep for refactor

Change-Id: I9fe0b9422865bebb6ce5ff8dd7821c716dff47a5
---
M manifests/role/download.pp
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/download.pp b/manifests/role/download.pp
index 7af4920..0f526b0 100644
--- a/manifests/role/download.pp
+++ b/manifests/role/download.pp
@@ -3,8 +3,7 @@
 # common classes included by all download servers
 class role::download::common {
 
-include download,
-standard,
+include standard,
 admins::roots,
 groups::wikidev,
 accounts::catrope
@@ -17,6 +16,7 @@
 system::role { 'role::download::primary': description => 'primary download 
server' }
 
 include role::download::common,
+download,
 download::primary,
 download::kiwix
 
@@ -28,6 +28,7 @@
 system::role { 'role::download::primary': description => 'secondary 
download server' }
 
 include role::download::common,
+download,
 download::mirror,
 download::gluster
 

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

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

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

[MediaWiki-commits] [Gerrit] slim down download::common in prep for refactor - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: slim down download::common in prep for refactor
..

slim down download::common in prep for refactor

Change-Id: I9fe0b9422865bebb6ce5ff8dd7821c716dff47a5
---
M manifests/role/download.pp
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/manifests/role/download.pp b/manifests/role/download.pp
index 7af4920..0f526b0 100644
--- a/manifests/role/download.pp
+++ b/manifests/role/download.pp
@@ -3,8 +3,7 @@
 # common classes included by all download servers
 class role::download::common {
 
-include download,
-standard,
+include standard,
 admins::roots,
 groups::wikidev,
 accounts::catrope
@@ -17,6 +16,7 @@
 system::role { 'role::download::primary': description => 'primary download 
server' }
 
 include role::download::common,
+download,
 download::primary,
 download::kiwix
 
@@ -28,6 +28,7 @@
 system::role { 'role::download::primary': description => 'secondary 
download server' }
 
 include role::download::common,
+download,
 download::mirror,
 download::gluster
 

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 09/03/2014 10:00 - change (mediawiki...Wikidata)

[Addshore (Code Review)]

Addshore has submitted this change and it was merged.

Change subject: New Wikidata Build - 09/03/2014 10:00
..


New Wikidata Build - 09/03/2014 10:00

Change-Id: I7a76def8e7aeb1eff245ba7d8db077eef0b6962f
---
M vendor/autoload.php
M vendor/composer/autoload_real.php
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/vendor/autoload.php b/vendor/autoload.php
index d67fc3f..93fddd1 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitabb001e4c1f1a55417a7be26cfd3d1a4::getLoader();
+return ComposerAutoloaderInit17b8520b55e9f5044f84fbedd6927d1c::getLoader();
diff --git a/vendor/composer/autoload_real.php 
b/vendor/composer/autoload_real.php
index c5603fb..a037b16 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitabb001e4c1f1a55417a7be26cfd3d1a4
+class ComposerAutoloaderInit17b8520b55e9f5044f84fbedd6927d1c
 {
 private static $loader;
 
@@ -19,9 +19,9 @@
 return self::$loader;
 }
 
-
spl_autoload_register(array('ComposerAutoloaderInitabb001e4c1f1a55417a7be26cfd3d1a4',
 'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit17b8520b55e9f5044f84fbedd6927d1c',
 'loadClassLoader'), true, true);
 self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitabb001e4c1f1a55417a7be26cfd3d1a4',
 'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit17b8520b55e9f5044f84fbedd6927d1c',
 'loadClassLoader'));
 
 $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
 
 $includeFiles = require __DIR__ . '/autoload_files.php';
 foreach ($includeFiles as $file) {
-composerRequireabb001e4c1f1a55417a7be26cfd3d1a4($file);
+composerRequire17b8520b55e9f5044f84fbedd6927d1c($file);
 }
 
 return $loader;
 }
 }
 
-function composerRequireabb001e4c1f1a55417a7be26cfd3d1a4($file)
+function composerRequire17b8520b55e9f5044f84fbedd6927d1c($file)
 {
 require $file;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a76def8e7aeb1eff245ba7d8db077eef0b6962f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WikidataJenkins 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] icinga: replace iptable with ferm rules - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: icinga: replace iptable with ferm rules
..

icinga: replace iptable with ferm rules

Change-Id: Iaef6d1e5ed1c26df6ae54ef2a88b2108848582b3
---
M manifests/misc/icinga.pp
1 file changed, 25 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/117674/1

diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index a155f43..e9d5ba2 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -607,55 +607,36 @@
 
 }
 
-
 class icinga::monitor::firewall {
 
-  # deny access to port 5667 TCP (nsca) from external networks
-  # deny service snmp-trap (port 162) for external networks
+$localhost_all = '127.0.0.1',
+$private_pmtpa_nolabs  = '10.0.0.0/14',
+$private_esams = '10.21.0.0/24',
+$private_eqiad1= '10.64.0.0/17',
+$private_eqiad2= '10.65.0.0/20',
+$private_ulsfo = '10.128.0.0/17',
+$private_virt  = '10.4.16.0/24',
+$public_152= '208.80.152.0/24',
+$public_153= '208.80.153.128/26',
+$public_154= '208.80.154.0/24',
+$public_fundraising= '208.80.155.0/27',
+$public_esams  = '91.198.174.0/25',
+$public_ulsfo  = '198.35.26.0/23',
 
-  class iptables-purges {
+#ncsa on port 5667
+ferm::rule { 'ncsa_allowed':
+rule => 'saddr ($localhost_all $private_pmtpa_nolabs $private_esams 
$private_eqiad1 $private_eqiad2 $private_ulsfo $private_virt $public_152 
$public_153 $public_154 $public_fundraising $public_esams $public_ulsfo ) proto 
tcp dport 5667 ACCEPT';
+}
 
-require 'iptables::tables'
-iptables_purge_service{  'deny_pub_snmptrap': service => 'snmptrap' }
-iptables_purge_service{  'deny_pub_nsca': service => 'nsca' }
-  }
+#snmptrap on port 162
+ferm::rule { 'snmptrap_allowed':
+rule => 'saddr ($localhost_all $private_pmtpa_nolabs $private_esams 
$private_eqiad1 $private_eqiad2 $private_ulsfo $private_virt $public_152 
$public_153 $public_154 $public_fundraising $public_esams $public_ulsfo ) proto 
tcp dport 162 ACCEPT';
+}
 
-  class iptables-accepts {
-
-require 'icinga::monitor::firewall::iptables-purges'
-
-iptables_add_service{ 'lo_all': interface=> 'lo', service  
  => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'localhost_all': source=> '127.0.0.1', 
service => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_pmtpa_nolabs': source => '10.0.0.0/14', 
service   => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_esams': source=> '10.21.0.0/24', 
service  => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_eqiad1': source   => '10.64.0.0/17', 
service  => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_eqiad2': source   => '10.65.0.0/20', 
service  => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_ulsfo': source=> '10.128.0.0/17', 
service => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'private_virt': source => '10.4.16.0/24', 
service  => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_152': source   => '208.80.152.0/24', 
service   => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_153': source   => 
'208.80.153.128/26', service => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_154': source   => '208.80.154.0/24', 
service   => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_fundraising': source   => '208.80.155.0/27', 
service   => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_esams': source => '91.198.174.0/25', 
service   => 'all', jump => 'ACCEPT' }
-iptables_add_service{ 'public_ulsfo': source => '198.35.26.0/23', 
service=> 'all', jump => 'ACCEPT'}
-  }
-
-  class iptables-drops {
-
-require 'icinga::monitor::firewall::iptables-accepts'
-iptables_add_service{ 'deny_pub_nsca': service => 'nsca', jump => 'DROP' }
-iptables_add_service{ 'deny_pub_snmptrap': service => 'snmptrap', jump => 
'DROP' }
-iptables_add_service{ 'TEMP_deny_smtp': service => 'smtp', jump => 'DROP' }
-  }
-
-  class iptables {
-
-require 'icinga::monitor::firewall::iptables-drops'
-iptables_add_exec{ "${hostname}_nsca": service => 'nsca' }
-iptables_add_exec{ "${hostname}_snmptrap": service => 'snmptrap' }
-  }
-
-  require 'icinga::monitor::firewall::iptables'
+#snmp on port 161
+ferm::rule { 'snmp_allowed':
+rule => 'saddr ($localhost_all $private_pmtpa_nolabs $private_esams 
$private_eqiad1 $private_eqiad2 $private_ulsfo $private_virt $public_152 
$public_153 $public_154 $public_fundraising $public_esams $public_ulsfo ) proto 
tcp dport 

[MediaWiki-commits] [Gerrit] Remove 2 false values returned in execute() - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Remove 2 false values returned in execute()
..


Remove 2 false values returned in execute()

They're not used at the calling point!

Change-Id: Ib32f1f4abd3576366e4653e9b07bc53ff4925cc3
---
M includes/specials/SpecialEmailuser.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/specials/SpecialEmailuser.php 
b/includes/specials/SpecialEmailuser.php
index 6695c82..c867f06 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -143,7 +143,7 @@
}
$out->addHTML( $this->userForm( $this->mTarget ) );
 
-   return false;
+   return;
}
 
$this->mTargetObj = $ret;
@@ -159,7 +159,7 @@
$form->loadData();
 
if ( !wfRunHooks( 'EmailUserForm', array( &$form ) ) ) {
-   return false;
+   return;
}
 
$result = $form->show();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib32f1f4abd3576366e4653e9b07bc53ff4925cc3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: IAlex 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] API 1.1 ow_syntrans initial changes - change (mediawiki...WikiLexicalData)

[Kipcool (Code Review)]

Kipcool has submitted this change and it was merged.

Change subject: API 1.1 ow_syntrans initial changes
..


API 1.1 ow_syntrans initial changes

Patch 1:
- ver 1.1 display, substitute '{$ctr}.' with 'sid_$sid'
- added ow_syntrans[dmid] and ow_syntrans[lang] when available.
- also added langid and im to each sid.
- revised API help
- some code cleaning
- And should I say it? We are now using Cache!

Patch 2:
- removed extra space error.

Change-Id: Ie5bc82413faeac5ea87aa2f43df16dbb7b4779fe
---
M includes/api/owSyntrans.php
1 file changed, 96 insertions(+), 46 deletions(-)

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



diff --git a/includes/api/owSyntrans.php b/includes/api/owSyntrans.php
index e201016..cf605d2 100644
--- a/includes/api/owSyntrans.php
+++ b/includes/api/owSyntrans.php
@@ -7,8 +7,13 @@
  * @param  opt'l   int lang'the defined meaning's language id'
  * @param  opt'l   int e   'the defined meaning's expression'
  * @param  opt'l   str part'synonym or translation'
+ * @param  opt'l   str ver 'the module version'
  *
  * HISTORY
+ * - 2014-03-05: version 1.1 display added. substitute '{$ctr}.' with 
'sid$sid'.
+ * added ow_syntrans[dmid] and ow_syntrans[lang] when available.
+ * also added langid and im to each sid.
+ * And should I say it? We are now using Cache!
  * - 2013-06-13: Minimized data output, corrections. Error were
  * generated last time.
  * - 2013-06-11:
@@ -25,12 +30,12 @@
  * TODO
  * - Integrate with Define Class
  * - Transfer getSynonymAndTranslation function to WikiDataAPI when ready
- * - Add parameter
- * see below.
- * - Add parameters to include sid, langid and im to output.
  *
  * QUESTION
- * - none
+ * - Is caching the parameters better than non at all?
+ * - how long should the cache stay?
+ * - a developer parameter to skip the cache. Useful for contributors who wants
+ * to see if their contribution was included.
  */
 
 require_once( 'extensions/WikiLexicalData/OmegaWiki/WikiDataAPI.php' );
@@ -40,7 +45,7 @@
public $languageId, $text, $spelling, $spellingLanguageId;
 
public function __construct( $main, $action ) {
-   parent :: __construct( $main, $action, null);
+   parent :: __construct( $main, $action, null );
}
 
public function execute() {
@@ -63,43 +68,55 @@
 
// Optional parameter
$options = array();
-   $part = 'all';
 
-   if ( isset( $params['part'] ) ) {
-   $part = $params['part'];
+   if ( isset( $params['ver'] ) ) {
+   $options['ver'] = $params['ver'];
+   }
+
+   if ( !isset( $params['part'] ) ) {
+   $params['part'] = 'all';
+   }
+   if ( $params['part'] == 'all' ) {
+   $partIsValid = true;
}
 
// error if $params['part'] is empty
-   if ( $part == '' ) {
+   if ( $params['part'] == '' ) {
$this->dieUsage( 'parameter part for adding syntrans is 
empty', 'param part is empty' );
}
 
// get syntrans
// When returning synonyms or translation only
-   if ( $part == 'syn' or $part == 'trans') {
+   if ( $params['part'] == 'syn' or $params['part'] == 'trans' ) {
if ( !isset( $params['lang'] ) ) {
$this->dieUsage( 'parameter lang for adding 
syntrans is missing', 'param lang is missing' );
}
$options['part'] = $part;
+   $partIsValid = true;
+   }
+
+   // error message if part is invalid
+   if ( !$partIsValid ) {
+   $this->dieUsage( 'parameter part for adding syntrans is 
neither syn, trans nor all', 'invalid param part value' );
}
 
if ( $params['lang'] ) {
-   $trueOrFalse = LanguageIdExist( $params['lang']);
+   $trueOrFalse = LanguageIdExist( $params['lang'] );
if ( $trueOrFalse == true ) {
$options['lang'] = $params['lang'];
} else {
-   if ( $part == 'syn' or $part == 'trans') {
+   if ( $params['part'] == 'syn' or 
$params['part'] == 'trans' ) {
$this->dieUsage( 'parameter lang for 
adding syntrans does not exist', 'param lang does not exist' );
}
}
} else {
-   if ( $part == 'syn' or $part == 'trans') {
+ 

[MediaWiki-commits] [Gerrit] API cache output for owDefine - change (mediawiki...WikiLexicalData)

[Kipcool (Code Review)]

Kipcool has submitted this change and it was merged.

Change subject: API cache output for owDefine
..


API cache output for owDefine

Change-Id: Ie254b4369a84f3cea54c2ddef997452899f15ba8
---
M includes/api/owDefine.php
1 file changed, 106 insertions(+), 60 deletions(-)

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



diff --git a/includes/api/owDefine.php b/includes/api/owDefine.php
index 3d5bbc8..94cfff9 100644
--- a/includes/api/owDefine.php
+++ b/includes/api/owDefine.php
@@ -3,6 +3,7 @@
 /** O m e g a W i k i   A P I ' s   D e f i n e   c l a s s
  *
  * HISTORY
+ * - 2014-03-07: Cache output
  * - 2013-06-12: Add optional translation list option. &syntrans= (syn, trans 
or all)
  * added ability to add syntrans.
  * - 2013-06-05: Readjusted defining and definingByAnyLanguage functions into
@@ -42,71 +43,116 @@
 
// Get the parameters
$params = $this->extractRequestParams();
+   $defined = $this->cacheDefine( $params );
 
-   // Required parameter
-   // Check if dm is valid
-   if ( !isset( $params['dm'] ) ) {
-   $this->dieUsage( 'parameter dm for adding syntrans is 
missing', 'param dm is missing' );
-   } else {
-   // check that defined_meaning_id exists
-   if ( !verifyDefinedMeaningId( $params['dm'] ) ) {
-   $this->dieUsage( 'Non existent dm id (' . 
$params['dm'] . ').', "dm not found." );
-   }
-   }
-
-   // Optional parameter
-   $options = array();
-   $part = 'off';
-
-   if ( isset( $params['syntrans'] ) ) {
-   $part = $params['syntrans'];
-   }
-
-   // error if $params['part'] is empty
-   if ( $part == '' ) {
-   $this->dieUsage( 'parameter part for adding syntrans is 
empty', 'param part is empty' );
-   }
-
-   // get syntrans
-   // When returning synonyms or translation only
-   if ( $part == 'syn' or $part == 'trans' or $part == 'all' ) {
-   if ( !isset( $params['lang'] ) ) {
-   $this->dieUsage( 'parameter lang for adding 
syntrans is missing', 'param lang is missing' );
-   }
-   $options['part'] = $part;
-   }
-
-   if ( $params['e'] ) {
-   $trueOrFalse = getExpressionId( $params['e'], 
$params['lang']);
-   if ( $trueOrFalse == true ) {
-   $options['e'] = $params['e'];
-   }
-   }
-
-   if ( $params['e'] && !isset( $options['e'] ) ) {
-   $this->dieUsage( 'parameter e for adding syntrans does 
not exist', 'param e does not exist' );
-   }
-
-   if ( $params['lang'] ) {
-   $trueOrFalse = LanguageIdExist( $params['lang']);
-   if ( $trueOrFalse == true ) {
-   $options['lang'] = $params['lang'];
-   $defined = $this->defining( $params['dm'], 
$params['lang'], $options, $this->getModuleName() );
-   } else {
-   $this->dieUsage( 'parameter lang for adding 
syntrans does not exist', 'param lang does not exist' );
-   }
-   } else {
-   if ( $part == 'syn' or $part == 'trans' or $part == 
'all' ) {
-   $this->dieUsage( 'parameter lang for adding 
syntrans is empty', 'param lang empty' );
-   }
-   $defined = $this->definingForAnyLanguage( 
$params['dm'], $options, $this->getModuleName() );
-   }
-
-   $defined = $defined[ $this->getModuleName() ];
$this->getResult()->addValue( null, $this->getModuleName(), 
$defined );
return true;
}
 
+   /** Cache the function
+*  Note: dieUsage must be used outside the cache lest the cache will 
return empty the
+*  next time it is accessed.
+*/
+   protected function cacheDefine( $params ) {
+   $defineCacheKey = 'API:ow_define:dm=' . $params['dm'];
+   if ( isset( $params['lang'] ) ) $defineCacheKey .= 
":ver={$params['lang']}";
+   if ( isset( $params['syntrans'] ) ) $defineCacheKey .= 
":ver={$params['syntrans']}";
+   if ( isset( $params['e'] ) ) $defineCacheKey .= 
":ver={$params['e']}";
+   if ( isset( $params['ver'] ) ) $defineCacheKey .= 
":ver={$params['ver']}";
+
+   $cache = new CacheHelper();
+
+   $cache->setCacheKey( array( $defineCacheKey ) );

[MediaWiki-commits] [Gerrit] API ow_express 1.1 initial changes - change (mediawiki...WikiLexicalData)

[Kipcool (Code Review)]

Kipcool has submitted this change and it was merged.

Change subject: API ow_express 1.1 initial changes
..


API ow_express 1.1 initial changes

ver 1.1 displays dmid{$definedMeaningId} instead of defined_{$ctr}

Patch 2: improved (hopefully), readability of the help portion
Patch 3: removed trailing space, tab errors.
Patch 4: added Cache and uses display dm_{$definedMeaningId} instead.
Patch 5: corrected typos

Change-Id: I9df9eb0ef90515ef392995bd243f67b6f4c2ff2a
---
M includes/api/owExpress.php
1 file changed, 63 insertions(+), 18 deletions(-)

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



diff --git a/includes/api/owExpress.php b/includes/api/owExpress.php
index d2e5d89..0dce710 100644
--- a/includes/api/owExpress.php
+++ b/includes/api/owExpress.php
@@ -9,6 +9,9 @@
  * to access OmegaWiki's data that can be easily parsed.
  *
  * HISTORY
+ * - 2014-03-07 cache enabled. displays dm_{$definedMeaningId} instead. dm 
understood as
+ * dmid.
+ * - 2014-03-03 ver 1.1 displays dmid{$definedMeaningId} instead of 
ow_define_{$ctr}
  * - 2013-05-21 Creation Date ~ he
  *
  * TODO
@@ -45,21 +48,16 @@
 
$spelling = $params['search'];
 
+   $options = array();
+   if ( isset( $params['ver'] ) ) {
+   $options['ver'] = $params['ver'];
+   } else {
+   $options['ver'] = null;
+   }
+
// Check if spelling exist
if ( existSpelling( $spelling ) ) {
-   $dmlist = getExpressionMeaningIds( $spelling );
-   $options['e'] = $spelling;
-   // There are duplicates using getExpressionMeaningIds 
!!!
-   $dmlist = array_unique ( $dmlist );
-   $express['expression'] = $spelling;
-   $dmlistCtr = 1;
-   foreach ( $dmlist as $dmrow ) {
-   $defining = $this->definingForAnyLanguage( 
$dmrow, $options );
-   foreach ( $defining as $definingRow) {
-   $express['ow_define_' . $dmlistCtr] = 
$definingRow;
-   }
-   $dmlistCtr += 1;
-   }
+   $express = $this->cacheExpress( $spelling, $options );
$this->getResult()->addValue( null, 
$this->getModuleName(), $express );
 
} else {
@@ -69,6 +67,46 @@
return true;
}
 
+   /** Cache!
+*
+*/
+   protected function cacheExpress( $spelling, $options = array() ) {
+   $expressCacheKey = 'API:ow_express:dm=' . $spelling;
+   if ( isset( $options['ver'] ) ) $expressCacheKey .= 
":ver={$options['ver']}";
+
+   $cache = new CacheHelper();
+
+   $cache->setCacheKey( array( $expressCacheKey ) );
+   $express = $cache->getCachedValue(
+   function ( $spelling, $options = array() ) {
+   $dmlist = getExpressionMeaningIds( $spelling );
+   $options['e'] = $spelling;
+   // There are duplicates using 
getExpressionMeaningIds !!!
+   $dmlist = array_unique ( $dmlist );
+   $express['expression'] = $spelling;
+   $dmlistCtr = 1;
+   foreach ( $dmlist as $dmrow ) {
+   $defining = 
$this->definingForAnyLanguage( $dmrow, $options );
+   foreach ( $defining as $definingRow ) {
+   if ( !$options['ver'] ) {
+   $express['ow_define_' . 
$dmlistCtr] = $definingRow;
+   }
+   if ( $options['ver'] == '1.1' ) 
{
+   $express[ 'dm_' . 
$definingRow['dmid']] = $definingRow;
+   unset( $express[ 'dmid' 
. $definingRow['dmid']]['dmid'] );
+   }
+   }
+   $dmlistCtr += 1;
+   }
+   return $express;
+   }, array( $spelling, $options )
+   );
+   $cache->setExpiry( 10800 ); // 3 hours
+   $cache->saveCache();
+
+   return $express;
+   }
+
// Version
public function getVersion() {
return __CLASS__ . ': $Id$';
@@ -76,7 +114,7 @@
 
// Description
public function getDescription(

[MediaWiki-commits] [Gerrit] mobile: replace iptables with ferm rule - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: mobile: replace iptables with ferm rule
..

mobile: replace iptables with ferm rule

Change-Id: I857b42306c951bcf60a26363c8f8c764b3d89cc7
---
M manifests/mobile.pp
1 file changed, 5 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/117673/1

diff --git a/manifests/mobile.pp b/manifests/mobile.pp
index 1dfb9dd..fa8ea2c 100644
--- a/manifests/mobile.pp
+++ b/manifests/mobile.pp
@@ -1,59 +1,18 @@
 # This file is for mobile classes
-class mobile::vumi::iptables-purges {
-require 'iptables::tables'
-
-# The deny_all rule must always be purged,
-#otherwise ACCEPTs can be placed below it
-iptables_purge_service{ 'deny_all_redis':
-service => 'redis',
-}
-
-# When removing or modifying a rule,
-#place the old rule here, otherwise it won't
-# be purged, and will stay in the iptables forever
-}
-
-class mobile::vumi::iptables-accepts {
-require 'mobile::vumi::iptables-purges'
-
-# Rememeber to place modified or removed rules into purges!
-iptables_add_service{ 'redis_internal':
-source  => '208.80.152.0/22',
-service => 'redis',
-jump=> 'ACCEPT',
-}
-}
-
-class mobile::vumi::iptables-drops {
-require 'mobile::vumi::iptables-accepts'
-
-# Deny by default
-iptables_add_service{ 'deny_all_redis':
-service => 'redis',
-jump=> 'DROP',
-}
-}
-
-class mobile::vumi::iptables  {
+class mobile::vumi::firewall {
+
 if $::realm == 'production' {
-# We use the following requirement chain:
-# iptables -> iptables::drops -> iptables::accepts -> 
iptables::accept-established -> iptables::purges
-# This ensures proper ordering of the rules
-require 'mobile::vumi::iptables-drops'
-
-# This exec should always occur last in the requirement chain.
-iptables_add_exec{ $::hostname:
-service => 'vumi',
+ferm::rule { 'redis_internal':
+ rule => 'proto tcp dport 6379 { saddr $INTERNAL ACCEPT; }',
 }
 }
-
 # Labs has security groups, and as such, doesn't need firewall rules
 }
 
 class mobile::vumi {
 
 include passwords::mobile::vumi,
-mobile::vumi::iptables
+mobile::vumi::firewall
 
 $testvumi_pw  = $passwords::mobile::vumi::wikipedia_xmpp_sms_out
 $vumi_pw  = $passwords::mobile::vumi::wikipedia_xmpp

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

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

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

[MediaWiki-commits] [Gerrit] ResourceLoader::makeLoaderImplementScript: bind args as '$' ... - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: ResourceLoader::makeLoaderImplementScript: bind args as '$' & 
'jQuery'
..

ResourceLoader::makeLoaderImplementScript: bind args as '$' & 'jQuery'

Make the function that wraps ResourceLoader modules bind the first and second
arguments it receives to '$' and 'jQuery'. This patch is a follow-up to change
I0c9edac35, which updated the invocation of mw.loader#implement so that it
passes jQuery as the first and second argument.

Change-Id: I0f0c3a04c3b0e6a28115a10bf11a2a78aca66c21
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/117672/1

diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index 557c1f6..b442a3d 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -903,7 +903,7 @@
 */
public static function makeLoaderImplementScript( $name, $scripts, 
$styles, $messages ) {
if ( is_string( $scripts ) ) {
-   $scripts = new XmlJsCode( "function () 
{\n{$scripts}\n}" );
+   $scripts = new XmlJsCode( "function ( $, jQuery ) 
{\n{$scripts}\n}" );
} elseif ( !is_array( $scripts ) ) {
throw new MWException( 'Invalid scripts error. Array of 
URLs or string of code expected.' );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f0c3a04c3b0e6a28115a10bf11a2a78aca66c21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 09/03/2014 10:00 - change (mediawiki...Wikidata)

[WikidataBuilder (Code Review)]

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 09/03/2014 10:00
..

New Wikidata Build - 09/03/2014 10:00

Change-Id: I7a76def8e7aeb1eff245ba7d8db077eef0b6962f
---
M vendor/autoload.php
M vendor/composer/autoload_real.php
2 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/vendor/autoload.php b/vendor/autoload.php
index d67fc3f..93fddd1 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitabb001e4c1f1a55417a7be26cfd3d1a4::getLoader();
+return ComposerAutoloaderInit17b8520b55e9f5044f84fbedd6927d1c::getLoader();
diff --git a/vendor/composer/autoload_real.php 
b/vendor/composer/autoload_real.php
index c5603fb..a037b16 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitabb001e4c1f1a55417a7be26cfd3d1a4
+class ComposerAutoloaderInit17b8520b55e9f5044f84fbedd6927d1c
 {
 private static $loader;
 
@@ -19,9 +19,9 @@
 return self::$loader;
 }
 
-
spl_autoload_register(array('ComposerAutoloaderInitabb001e4c1f1a55417a7be26cfd3d1a4',
 'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit17b8520b55e9f5044f84fbedd6927d1c',
 'loadClassLoader'), true, true);
 self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitabb001e4c1f1a55417a7be26cfd3d1a4',
 'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit17b8520b55e9f5044f84fbedd6927d1c',
 'loadClassLoader'));
 
 $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
 
 $includeFiles = require __DIR__ . '/autoload_files.php';
 foreach ($includeFiles as $file) {
-composerRequireabb001e4c1f1a55417a7be26cfd3d1a4($file);
+composerRequire17b8520b55e9f5044f84fbedd6927d1c($file);
 }
 
 return $loader;
 }
 }
 
-function composerRequireabb001e4c1f1a55417a7be26cfd3d1a4($file)
+function composerRequire17b8520b55e9f5044f84fbedd6927d1c($file)
 {
 require $file;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a76def8e7aeb1eff245ba7d8db077eef0b6962f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder 

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

[MediaWiki-commits] [Gerrit] statistics: converted iptables to ferm rule - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: statistics: converted iptables to ferm rule
..

statistics: converted iptables to ferm rule

Change-Id: Iba67c80d517afb4861dd4b5e12873789e82088b4
---
M manifests/misc/statistics.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/117670/1

diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index ae09004..10f52b4 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -1,41 +1,11 @@
 # this file is for stat[0-9] statistics servers (per ezachte - RT 2162)
 
-class misc::statistics::iptables-purges {
-require "iptables::tables"
-
-# The deny_all rule must always be purged, otherwise ACCEPTs can be placed 
below it
-iptables_purge_service{ "deny_all_redis": service => "redis" }
-
-# When removing or modifying a rule, place the old rule here, otherwise it 
won't
-# be purged, and will stay in the iptables forever
-}
-
-class misc::statistics::iptables-accepts {
-require "misc::statistics::iptables-purges"
-
-# Rememeber to place modified or removed rules into purges!
-iptables_add_service{ "redis_internal": source => "208.80.152.0/22", 
service => "redis", jump => "ACCEPT" }
-}
-
-class misc::statistics::iptables-drops {
-require "misc::statistics::iptables-accepts"
-
-# Deny by default
-iptables_add_service{ "deny_all_redis": service => "redis", jump => "DROP" 
}
-}
-
-class misc::statistics::iptables  {
-if $realm == "production" {
-# We use the following requirement chain:
-# iptables -> iptables::drops -> iptables::accepts -> 
iptables::accept-established -> iptables::purges
-#
-# This ensures proper ordering of the rules
-require "misc::statistics::iptables-drops"
-
-# This exec should always occur last in the requirement chain.
-iptables_add_exec{ $hostname: service => "statistics" }
+class misc::statistics::firewall {
+if $::realm == 'production' {
+ferm::rule { 'redis_internal':
+rule => 'proto tcp dport 6379 { saddr $INTERNAL ACCEPT; }',
+}
 }
-
 # Labs has security groups, and as such, doesn't need firewall rules
 }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 98eff6f..8446554 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2432,7 +2432,7 @@
 
 include misc::statistics::cron_blog_pageviews
 include misc::statistics::limn::mobile_data_sync
-include misc::statistics::iptables
+include misc::statistics::firewall
 }
 
 node 'stat1001.wikimedia.org' {

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

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

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

[MediaWiki-commits] [Gerrit] bugzilla: remove the new from motd, old is dead - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: bugzilla: remove the new from motd, old is dead
..

bugzilla: remove the new from motd, old is dead

Change-Id: I1a0b6c8ed36c8e6466bcb0cf79a9ba52bcfbdde5
---
M manifests/role/bugzilla.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/role/bugzilla.pp b/manifests/role/bugzilla.pp
index d56ce94..be0ef22 100644
--- a/manifests/role/bugzilla.pp
+++ b/manifests/role/bugzilla.pp
@@ -2,7 +2,7 @@
 
 class role::bugzilla {
 
-system::role { 'role::bugzilla': description => '(new/upcoming) Bugzilla 
server' }
+system::role { 'role::bugzilla': description => 'Bugzilla server' }
 
 class { '::bugzilla':
 db_host => 'db1001.eqiad.wmnet',

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

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

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

[MediaWiki-commits] [Gerrit] When checking whitelist of extensions, only count last exten... - change (mediawiki/core)

[Brian Wolff (Code Review)]

Brian Wolff has uploaded a new change for review.

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

Change subject: When checking whitelist of extensions, only count last 
extension.
..

When checking whitelist of extensions, only count last extension.

When we are doing blacklisted extensions, we count all extensions
as some programs (like apache sometimes) consider extensions that
aren't the final extension. However when doing whitelists we need
to only count the last extension, otherwise people can name files
foo.goodExt.BadExt. For example [[commons:File:Deamado ko.png.bmp]]

I do not believe this represents a security risk as bad files are
still filtered out. However it does allow unwanted files to be
uploaded.

Bug: 62451
Change-Id: Ie27c15f749812710571f432bc5915e498f8017e3
---
M includes/upload/UploadBase.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index db7a24e..6cce4ac 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -786,7 +786,7 @@
return $this->mTitle;
} elseif ( $blackListedExtensions ||
( $wgCheckFileExtensions && 
$wgStrictFileExtensions &&
-   !$this->checkFileExtensionList( $ext, 
$wgFileExtensions ) ) ) {
+   !$this->checkFileExtension( 
$this->mFinalExtension, $wgFileExtensions ) ) ) {
$this->mBlackListedExtensions = $blackListedExtensions;
$this->mTitleError = self::FILETYPE_BADTYPE;
$this->mTitle = null;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie27c15f749812710571f432bc5915e498f8017e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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