[MediaWiki-commits] [Gerrit] Hygine: remove leftover config from previous templating - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Hygine: remove leftover config from previous templating
..


Hygine: remove leftover config from previous templating

Change-Id: Iad5bd7164b680044b506dab2c04081f429082990
---
M container.php
1 file changed, 0 insertions(+), 15 deletions(-)

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



diff --git a/container.php b/container.php
index 51473d9..11bd0d5 100644
--- a/container.php
+++ b/container.php
@@ -79,21 +79,6 @@
$wgFlowServerCompileTemplates
);
 } );
-$c['templating.namespaces'] = array(
-   'flow' => __DIR__ . '/templates',
-);
-
-$c['templating.global_variables'] = $c->share( function( $c ) {
-   global $wgFlowMaxThreadingDepth;
-
-   $user = $c['user'];
-   return array(
-   'user' => $user,
-   'editToken' => $user->getEditToken(),
-   'maxThreadingDepth' => $wgFlowMaxThreadingDepth,
-   'permissions' => $c['permissions'],
-   );
-} );
 
 $c['templating'] = $c->share( function( $c ) {
return new Flow\Templating(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad5bd7164b680044b506dab2c04081f429082990
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: SG 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Hygine: Remove unused method - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Hygine: Remove unused method
..


Hygine: Remove unused method

This method was only used once, and it wasn't doing anything
usefull there.  Permissions checks happen in the block not inside
the revision object itself, as such delete this code.

Change-Id: I2856e121454729061f107d5b63e789520fcb7008
---
M includes/Model/AbstractRevision.php
1 file changed, 0 insertions(+), 26 deletions(-)

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



diff --git a/includes/Model/AbstractRevision.php 
b/includes/Model/AbstractRevision.php
index 825f5da..266925d 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -305,11 +305,6 @@
return null;
}
 
-   // double check if user has permissions for moderation action
-   if ( !$this->isAllowed( $user, $changeType ) ) {
-   return null;
-   }
-
$obj = $this->newNullRevision( $user );
$obj->changeType = $changeType;
 
@@ -347,27 +342,6 @@
 */
public function getRevisionId() {
return $this->revId;
-   }
-
-   /**
-* Is the user allowed to perform a certain action on this revision?
-*
-* Uses permissions defined in FlowActions.
-*
-* @param User|null $user The user requesting access.  When null 
assumes a user with no permissions.
-* @param string $action Action to check if allowed.
-* @return boolean True when the user is allowed to see the current 
revision
-*/
-   protected function isAllowed( User $user = null, $action ) {
-   // if no user specified, assume anonymous user
-   if ( !$user instanceof User ) {
-   $user = new User;
-   }
-
-   $actions = Container::get( 'flow_actions' );
-   $permissions = new RevisionActionPermissions( $actions, $user );
-
-   return $permissions->isAllowed( $this, $action );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2856e121454729061f107d5b63e789520fcb7008
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: SG 
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 doc for GlobalBlocking::getRangeCondition() - change (mediawiki...GlobalBlocking)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Fix doc for GlobalBlocking::getRangeCondition()
..

Fix doc for GlobalBlocking::getRangeCondition()

Change-Id: I4c1a7691fc2805dffb35e68a599387c480561116
---
M GlobalBlocking.class.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/GlobalBlocking.class.php b/GlobalBlocking.class.php
index 3297278..bdea754 100644
--- a/GlobalBlocking.class.php
+++ b/GlobalBlocking.class.php
@@ -145,8 +145,7 @@
/**
 * Get a database range condition for an IP address
 * @param string $ip The IP address
-* @param boolean $anon Get anon blocks only
-* @return string a SQL condition
+* @return array a SQL condition
 */
static function getRangeCondition( $ip ) {
$dbr = GlobalBlocking::getGlobalBlockingSlave();

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

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

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

[MediaWiki-commits] [Gerrit] Document use of stat1001.wikimedia.org's default site - change (operations/puppet)

[QChris (Code Review)]

QChris has uploaded a new change for review.

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

Change subject: Document use of stat1001.wikimedia.org's default site
..

Document use of stat1001.wikimedia.org's default site

Change-Id: Ib25fc14c00d1baf67576238004f837f0dcd3f323
---
M manifests/role/statistics.pp
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index cf7fe04..2286b5a 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -50,6 +50,10 @@
 # reportcard.wikimedia.org
 include misc::statistics::sites::reportcard
 # default public file vhost
+# This default site get's used for example for public datasets at
+#   http://stat1001.wikimedia.org/public-datasets/
+# and private datasets like geowiki's private part at
+#   https://stats.wikimedia.org/geowiki-private/
 include misc::statistics::sites::default
 # rsync public datasets from stat1003 hourly
 include misc::statistics::public_datasets

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

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

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

[MediaWiki-commits] [Gerrit] $wgUseTwoButtonForm is set to false by default - change (mediawiki/core)

[Rohan013 (Code Review)]

Rohan013 has uploaded a new change for review.

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

Change subject: $wgUseTwoButtonForm is set to false by default
..

$wgUseTwoButtonForm is set to false by default

The form shows "Search" button instead of "Go" button when
only one button is shown

Bug: 40622
Change-Id: I2ba3b1bcb8dfab087220e253f6d1cf752533844a
---
M includes/DefaultSettings.php
M skins/MonoBook/MonoBookTemplate.php
2 files changed, 11 insertions(+), 11 deletions(-)


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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 96ef14f..c09c006 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5380,9 +5380,9 @@
 /**
  * Search form behavior.
  * - true = use Go & Search buttons
- * - false = use Go button & Advanced search link
+ * - false = use Search button & Advanced search link
  */
-$wgUseTwoButtonsSearchForm = true;
+$wgUseTwoButtonsSearchForm = false;
 
 /**
  * Array of namespaces to generate a Google sitemap for when the
diff --git a/skins/MonoBook/MonoBookTemplate.php 
b/skins/MonoBook/MonoBookTemplate.php
index 373c004..856be3e 100644
--- a/skins/MonoBook/MonoBookTemplate.php
+++ b/skins/MonoBook/MonoBookTemplate.php
@@ -228,22 +228,22 @@



-   makeSearchInput( 
array( "id" => "searchInput" ) ); ?>
-
-   makeSearchButton(
-   "go",
-   array( "id" => 
"searchGoButton", "class" => "searchButton" )
-   );
+   makeSearchInput( 
array( "id" => "searchInput" ) );
 
if ( $wgUseTwoButtonsSearchForm ) {
-   ?> 
+   echo $this->makeSearchButton(
+   "go",
+   array( "id" => 
"searchGoButton", "class" => "searchButton" )
+   ); ?> 
makeSearchButton(
"fulltext",
array( "id" => 
"mw-searchButton", "class" => "searchButton" )
);
} else {
-   ?>
+   echo $this->makeSearchButton(
+   "fulltext",
+   array( "id" => 
"searchButton", "class" => "searchButton" )
+   ); ?>
 
https://gerrit.wikimedia.org/r/145517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] Add tests for coding standards - change (mediawiki...GoogleCustomWikiSearch)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Add tests for coding standards
..

Add tests for coding standards

Added basic tests (on basis from MobileFrontend) to cehck coding conventions.

Change-Id: If0827ad31cebb103f6336663b518e0a38c612a30
---
M .gitignore
A Makefile
A composer.json
A composer.lock
A dev-scripts/phpcheck.sh
A dev-scripts/phplint.sh
A dev-scripts/pre-commit
7 files changed, 158 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..35fdc62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 *~
 *.kate-swp
 .*.swp
+composer.phar
+vendor/*
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..96b12e3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,10 @@
+phpcheck:
+   @dev-scripts/phpcheck.sh
+
+phplint: phpcheck
+   @dev-scripts/phplint.sh
+
+tests: phplint
+
+installhooks:
+   ln -sf ${PWD}/dev-scripts/pre-commit .git/hooks/pre-commit
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..aff630b
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+"require-dev": {
+"squizlabs/php_codesniffer": "1.*"
+}
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000..30dd701
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,101 @@
+{
+"_readme": [
+"This file locks the dependencies of your project to a known state",
+"Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
+"This file is @generated automatically"
+],
+"hash": "b6f8674efff7c052a6d1a62583adf1a4",
+"packages": [
+
+],
+"packages-dev": [
+{
+"name": "squizlabs/php_codesniffer",
+"version": "1.5.3",
+"source": {
+"type": "git",
+"url": "https://github.com/squizlabs/PHP_CodeSniffer.git";,
+"reference": "396178ada8499ec492363587f037125bf7b07fcc"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/396178ada8499ec492363587f037125bf7b07fcc";,
+"reference": "396178ada8499ec492363587f037125bf7b07fcc",
+"shasum": ""
+},
+"require": {
+"ext-tokenizer": "*",
+"php": ">=5.1.2"
+},
+"suggest": {
+"phpunit/php-timer": "dev-master"
+},
+"bin": [
+"scripts/phpcs"
+],
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-phpcs-fixer": "2.0.x-dev"
+}
+},
+"autoload": {
+"classmap": [
+"CodeSniffer.php",
+"CodeSniffer/CLI.php",
+"CodeSniffer/Exception.php",
+"CodeSniffer/File.php",
+"CodeSniffer/Report.php",
+"CodeSniffer/Reporting.php",
+"CodeSniffer/Sniff.php",
+"CodeSniffer/Tokens.php",
+"CodeSniffer/Reports/",
+"CodeSniffer/CommentParser/",
+"CodeSniffer/Tokenizers/",
+"CodeSniffer/DocGenerators/",
+"CodeSniffer/Standards/AbstractPatternSniff.php",
+"CodeSniffer/Standards/AbstractScopeSniff.php",
+"CodeSniffer/Standards/AbstractVariableSniff.php",
+"CodeSniffer/Standards/IncorrectPatternException.php",
+"CodeSniffer/Standards/Generic/Sniffs/",
+"CodeSniffer/Standards/MySource/Sniffs/",
+"CodeSniffer/Standards/PEAR/Sniffs/",
+"CodeSniffer/Standards/PSR1/Sniffs/",
+"CodeSniffer/Standards/PSR2/Sniffs/",
+"CodeSniffer/Standards/Squiz/Sniffs/",
+"CodeSniffer/Standards/Zend/Sniffs/"
+]
+},
+"notification-url": "https://packagist.org/downloads/";,
+"license": [
+"BSD-3-Clause"
+],
+"authors": [
+{
+"name": "Greg Sherwood",
+"role": "lead"
+}
+],
+"description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS 
files and detects violations of a defined set of coding standards.",
+"homepage": "http://www.squizlabs.com/php-codesniffer";,
+"keywords": [
+"phpcs",
+"standards"
+],
+"time": "2014-05-0

[MediaWiki-commits] [Gerrit] Added $wgMessagesDirs to some extensions - change (mediawiki...BlueSpiceExtensions)

[Tweichart (Code Review)]

Tweichart has submitted this change and it was merged.

Change subject: Added $wgMessagesDirs to some extensions
..


Added $wgMessagesDirs to some extensions

For better MW 1.23+ support

Change-Id: Ic1611e7a3f8351af43be338ef1968def35fd5067
---
M Dashboards/Dashboards.setup.php
M ExtendedSearch/ExtendedSearch.setup.php
M InsertFile/InsertFile.setup.php
M SaferEdit/SaferEdit.setup.php
M WhoIsOnline/WhoIsOnline.setup.php
5 files changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/Dashboards/Dashboards.setup.php b/Dashboards/Dashboards.setup.php
index 08dd0e9..7c292e8 100644
--- a/Dashboards/Dashboards.setup.php
+++ b/Dashboards/Dashboards.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('Dashboards', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
 
+$wgMessagesDirs['Dashboards'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['Dashboards'] = __DIR__ . 
'/languages/Dashboards.i18n.php';
 $wgExtensionMessagesFiles['DashboardsAlias'] = 
__DIR__.'/languages/Dashboards.alias.php';
 
@@ -29,7 +31,6 @@
 
 $aResourceModuleTemplate = array(
'localBasePath' => 
$IP.'/extensions/BlueSpiceExtensions/Dashboards/resources',
-   //'remoteBasePath' => &$GLOBALS['wgScriptPath'],
'remoteExtPath' => 'BlueSpiceExtensions/Dashboards/resources',
 );
 
diff --git a/ExtendedSearch/ExtendedSearch.setup.php 
b/ExtendedSearch/ExtendedSearch.setup.php
index 639bf98..17e3575 100644
--- a/ExtendedSearch/ExtendedSearch.setup.php
+++ b/ExtendedSearch/ExtendedSearch.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension( 'ExtendedSearch', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE );
 
+$wgMessagesDirs['ExtendedSearch'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['ExtendedSearch'] = __DIR__ . 
'/languages/ExtendedSearch.i18n.php';
 
 $aResourceModuleTemplate = array(
diff --git a/InsertFile/InsertFile.setup.php b/InsertFile/InsertFile.setup.php
index 5f3b8b1..d13d235 100644
--- a/InsertFile/InsertFile.setup.php
+++ b/InsertFile/InsertFile.setup.php
@@ -2,6 +2,8 @@
 
 BsExtensionManager::registerExtension('InsertFile', 
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_ON_API);
 
+$wgMessagesDirs['InsertFile'] = __DIR__ . '/i18n';
+
 $wgExtensionMessagesFiles['InsertFile'] = __DIR__ . 
'/languages/InsertFile.i18n.php';
 
 $wgAutoloadClasses['JsonLicenses']  = __DIR__ . 
'/includes/JsonLicenses.php';
diff --git a/SaferEdit/SaferEdit.setup.php b/SaferEdit/SaferEdit.setup.php
index d49fb0f..2e30574 100644
--- a/SaferEdit/SaferEdit.setup.php
+++ b/SaferEdit/SaferEdit.setup.php
@@ -1,6 +1,8 @@
 https://gerrit.wikimedia.org/r/145324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1611e7a3f8351af43be338ef1968def35fd5067
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pigpen 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Swidmann 
Gerrit-Reviewer: Tweichart 

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

[MediaWiki-commits] [Gerrit] Add monolog/monolog 1.9.1 - change (mediawiki...vendor)

[jenkins-bot (Code Review)]

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

Change subject: Add monolog/monolog 1.9.1
..


Add monolog/monolog 1.9.1

Add the monolog logging library.

Needed by: I5c822995a181a38c844f4a13cb172297827e0031
Change-Id: I25505d6a3c41ca07bf80eb359e80d1559fcb336b
---
M autoload.php
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_psr4.php
M composer/autoload_real.php
M composer/installed.json
A monolog/monolog/CHANGELOG.mdown
A monolog/monolog/LICENSE
A monolog/monolog/README.mdown
A monolog/monolog/composer.json
A monolog/monolog/doc/extending.md
A monolog/monolog/doc/sockets.md
A monolog/monolog/doc/usage.md
A monolog/monolog/phpunit.xml.dist
A monolog/monolog/src/Monolog/ErrorHandler.php
A monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
A monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
A monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
A monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
A monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
A monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
A monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
A monolog/monolog/src/Monolog/Formatter/LineFormatter.php
A monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
A monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
A monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
A monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
A monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
A monolog/monolog/src/Monolog/Handler/AbstractHandler.php
A monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
A monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
A monolog/monolog/src/Monolog/Handler/AmqpHandler.php
A monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
A monolog/monolog/src/Monolog/Handler/BufferHandler.php
A monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
A monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
A monolog/monolog/src/Monolog/Handler/CubeHandler.php
A monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php
A monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
A monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
A monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
A monolog/monolog/src/Monolog/Handler/FilterHandler.php
A 
monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
A 
monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
A 
monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
A monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
A monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
A monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
A monolog/monolog/src/Monolog/Handler/GelfHandler.php
A monolog/monolog/src/Monolog/Handler/GroupHandler.php
A monolog/monolog/src/Monolog/Handler/HandlerInterface.php
A monolog/monolog/src/Monolog/Handler/HipChatHandler.php
A monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
A monolog/monolog/src/Monolog/Handler/LogglyHandler.php
A monolog/monolog/src/Monolog/Handler/MailHandler.php
A monolog/monolog/src/Monolog/Handler/MissingExtensionException.php
A monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
A monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
A monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
A monolog/monolog/src/Monolog/Handler/NullHandler.php
A monolog/monolog/src/Monolog/Handler/PushoverHandler.php
A monolog/monolog/src/Monolog/Handler/RavenHandler.php
A monolog/monolog/src/Monolog/Handler/RedisHandler.php
A monolog/monolog/src/Monolog/Handler/RollbarHandler.php
A monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
A monolog/monolog/src/Monolog/Handler/SocketHandler.php
A monolog/monolog/src/Monolog/Handler/StreamHandler.php
A monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
A monolog/monolog/src/Monolog/Handler/SyslogHandler.php
A monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
A monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
A monolog/monolog/src/Monolog/Handler/TestHandler.php
A monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
A monolog/monolog/src/Monolog/Logger.php
A monolog/monolog/src/Monolog/Processor/GitProcessor.php
A monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
A monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
A monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
A monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
A monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
A monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
A monolog/monolog/src/Monolog/Processor/TagProcessor.php
A monolog/monolog/src/Monolog/Processor/UidProcessor.php
A monolog/monolog/src/Monolog/Processor/WebProcessor.php
A monolog

[MediaWiki-commits] [Gerrit] Add psr/log 1.0.0 - change (mediawiki...vendor)

[jenkins-bot (Code Review)]

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

Change subject: Add psr/log 1.0.0
..


Add psr/log 1.0.0

Add the PSR-3 interface library.

Needed by: I5c822995a181a38c844f4a13cb172297827e0031
Change-Id: Ib54cf206eb3aabeeafbc5efbcdcaa31d4e88bd13
---
A autoload.php
M composer.json
A composer.lock
A composer/ClassLoader.php
A composer/autoload_classmap.php
A composer/autoload_namespaces.php
A composer/autoload_psr4.php
A composer/autoload_real.php
A composer/installed.json
A psr/log/.gitignore
A psr/log/LICENSE
A psr/log/Psr/Log/AbstractLogger.php
A psr/log/Psr/Log/InvalidArgumentException.php
A psr/log/Psr/Log/LogLevel.php
A psr/log/Psr/Log/LoggerAwareInterface.php
A psr/log/Psr/Log/LoggerAwareTrait.php
A psr/log/Psr/Log/LoggerInterface.php
A psr/log/Psr/Log/LoggerTrait.php
A psr/log/Psr/Log/NullLogger.php
A psr/log/Psr/Log/Test/LoggerInterfaceTest.php
A psr/log/README.md
A psr/log/composer.json
22 files changed, 1,234 insertions(+), 1 deletion(-)

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



diff --git a/autoload.php b/autoload.php
new file mode 100644
index 000..9676c79
--- /dev/null
+++ b/autoload.php
@@ -0,0 +1,7 @@
+=5.3.2"
+   "php": ">=5.3.2",
+   "psr/log": "1.0.0"
},
"prefer-stable": true,
"config": {
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000..239ffea
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,64 @@
+{
+"_readme": [
+"This file locks the dependencies of your project to a known state",
+"Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
+"This file is @generated automatically"
+],
+"hash": "5792bd983f9910b47fd15bb97939159e",
+"packages": [
+{
+"name": "psr/log",
+"version": "1.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/php-fig/log.git";,
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b";,
+"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+"shasum": ""
+},
+"type": "library",
+"autoload": {
+"psr-0": {
+"Psr\\Log\\": ""
+}
+},
+"notification-url": "https://packagist.org/downloads/";,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "PHP-FIG",
+"homepage": "http://www.php-fig.org/";
+}
+],
+"description": "Common interface for logging libraries",
+"keywords": [
+"log",
+"psr",
+"psr-3"
+],
+"time": "2012-12-21 11:40:51"
+}
+],
+"packages-dev": [
+
+],
+"aliases": [
+
+],
+"minimum-stability": "stable",
+"stability-flags": [
+
+],
+"platform": {
+"php": ">=5.3.2"
+},
+"platform-dev": [
+
+]
+}
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
new file mode 100644
index 000..a710555
--- /dev/null
+++ b/composer/ClassLoader.php
@@ -0,0 +1,378 @@
+
+ * Jordi Boggiano 
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0 class loader
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ *
+ * $loader = new \Composer\Autoload\ClassLoader();
+ *
+ * // register classes with namespaces
+ * $loader->add('Symfony\Component', __DIR__.'/component');
+ * $loader->add('Symfony',   __DIR__.'/framework');
+ *
+ * // activate the autoloader
+ * $loader->register();
+ *
+ * // to enable searching the include path (eg. for PEAR packages)
+ * $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier 
+ * @author Jordi Boggiano 
+ */
+class ClassLoader
+{
+// PSR-4
+private $prefixLengthsPsr4 = array();
+private $prefixDirsPsr4 = array();
+private $fallbackDirsPsr4 = array();
+
+// PSR-0
+private $prefixesPsr0 = array();
+ 

[MediaWiki-commits] [Gerrit] Hygine: unreachable logging statement - change (mediawiki...Flow)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Hygine: unreachable logging statement
..

Hygine: unreachable logging statement

the condition $title === null would only be met when
$workflow->getArticleTitle() returns null, but not
in the case that a workflow couldn't be located.

Correct the code to match the comments and write to debug
log when the wrong title is detected.

Change-Id: I8da1df751de732e2d8c5f5a55d55ee74c44cd009
---
M includes/Log/Logger.php
1 file changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/includes/Log/Logger.php b/includes/Log/Logger.php
index a6a7d61..e5b35a2 100644
--- a/includes/Log/Logger.php
+++ b/includes/Log/Logger.php
@@ -67,10 +67,13 @@
$workflow = Container::get( 'storage.workflow' )->get( 
$workflowId );
if ( $workflow ) {
$title = $workflow->getArticleTitle();
-   } else {
+   }
+   $error = false;
+   if ( !$title ) {
// We dont want to fail logging due to this, so repoint 
it at Main_Page which
// will probably be noticed, also log it below once we 
know the logId
$title = Title::newMainPage();
+   $error = true;
}
 
// insert logging entry
@@ -81,9 +84,9 @@
$logEntry->setComment( $reason );
$logId = $logEntry->insert();
 
-   if ( $title === null ) {
+   if ( $error ) {
wfDebugLog( 'Flow', __METHOD__ . ': Could not map 
workflowId to workflow object for ' . $workflowId->getAlphadecimal() . " log 
entry $logId defaulted to Main_Page");
-   }
+   i
 
return $logId;
}

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

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

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

[MediaWiki-commits] [Gerrit] Hygine: RecentChangesQuery doesnt really depend on a user - change (mediawiki...Flow)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Hygine: RecentChangesQuery doesnt really depend on a user
..

Hygine: RecentChangesQuery doesnt really depend on a user

Change-Id: Iebe22b914251fe0519ada64651f4405f8ff76711
---
M container.php
M includes/Formatter/RecentChangesQuery.php
2 files changed, 16 insertions(+), 10 deletions(-)


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

diff --git a/container.php b/container.php
index 11bd0d5..97eff50 100644
--- a/container.php
+++ b/container.php
@@ -700,12 +700,14 @@
);
 } );
 $c['query.recentchanges'] = $c->share( function( $c ) {
-   return new Flow\Formatter\RecentChangesQuery(
+   $query = new Flow\Formatter\RecentChangesQuery(
$c['storage'],
$c['repository.tree'],
-   $c['flow_actions'],
-   $c['user']
+   $c['flow_actions']
);
+   $query->setExtendWatchlist( $c['user']->getOption( 'extendwatchlist' ) 
);
+
+   return $query;
 } );
 $c['query.postsummary'] = $c->share( function( $c ) {
return new Flow\Formatter\PostSummaryQuery(
diff --git a/includes/Formatter/RecentChangesQuery.php 
b/includes/Formatter/RecentChangesQuery.php
index b997876..572dce7 100644
--- a/includes/Formatter/RecentChangesQuery.php
+++ b/includes/Formatter/RecentChangesQuery.php
@@ -26,16 +26,20 @@
protected $actions;
 
/**
-* User of the current session
-*
-* @var User
+* @var bool
 */
-   protected $user;
+   protected $extendWatchlist = false;
 
-   public function __construct( ManagerGroup $storage, TreeRepository 
$treeRepo, FlowActions $actions, User $user ) {
+   public function __construct( ManagerGroup $storage, TreeRepository 
$treeRepo, FlowActions $actions ) {
parent::__construct( $storage, $treeRepo );
$this->actions = $actions;
-   $this->user = $user;
+   }
+
+   /**
+* @param bool $extend
+*/
+   public function setExtendWatchist( $extend ) {
+   $this->extendWatchlist = (bool)$extend;
}
 
/**
@@ -142,7 +146,7 @@
 * Determines if a flow record should be displayed in Special:Watchlist
 */
protected function isRecordHidden( array $changeData ) {
-   if ( $this->user->getOption( 'extendwatchlist' ) ) {
+   if ( $this->extendWatchlist ) {
return false;
}
// Check for legacy action names and convert it

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

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

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

[MediaWiki-commits] [Gerrit] Hygine: remove leftover config from previous templating - change (mediawiki...Flow)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Hygine: remove leftover config from previous templating
..

Hygine: remove leftover config from previous templating

Change-Id: Iad5bd7164b680044b506dab2c04081f429082990
---
M container.php
1 file changed, 0 insertions(+), 15 deletions(-)


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

diff --git a/container.php b/container.php
index 51473d9..11bd0d5 100644
--- a/container.php
+++ b/container.php
@@ -79,21 +79,6 @@
$wgFlowServerCompileTemplates
);
 } );
-$c['templating.namespaces'] = array(
-   'flow' => __DIR__ . '/templates',
-);
-
-$c['templating.global_variables'] = $c->share( function( $c ) {
-   global $wgFlowMaxThreadingDepth;
-
-   $user = $c['user'];
-   return array(
-   'user' => $user,
-   'editToken' => $user->getEditToken(),
-   'maxThreadingDepth' => $wgFlowMaxThreadingDepth,
-   'permissions' => $c['permissions'],
-   );
-} );
 
 $c['templating'] = $c->share( function( $c ) {
return new Flow\Templating(

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

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

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

[MediaWiki-commits] [Gerrit] Hygine: Remove unused method - change (mediawiki...Flow)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Hygine: Remove unused method
..

Hygine: Remove unused method

This method was only used once, and it wasn't doing anything
usefull there.  Permissions checks happen in the block not inside
the revision object itself, as such delete this code.

Change-Id: I2856e121454729061f107d5b63e789520fcb7008
---
M includes/Model/AbstractRevision.php
1 file changed, 0 insertions(+), 26 deletions(-)


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

diff --git a/includes/Model/AbstractRevision.php 
b/includes/Model/AbstractRevision.php
index 825f5da..266925d 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -305,11 +305,6 @@
return null;
}
 
-   // double check if user has permissions for moderation action
-   if ( !$this->isAllowed( $user, $changeType ) ) {
-   return null;
-   }
-
$obj = $this->newNullRevision( $user );
$obj->changeType = $changeType;
 
@@ -347,27 +342,6 @@
 */
public function getRevisionId() {
return $this->revId;
-   }
-
-   /**
-* Is the user allowed to perform a certain action on this revision?
-*
-* Uses permissions defined in FlowActions.
-*
-* @param User|null $user The user requesting access.  When null 
assumes a user with no permissions.
-* @param string $action Action to check if allowed.
-* @return boolean True when the user is allowed to see the current 
revision
-*/
-   protected function isAllowed( User $user = null, $action ) {
-   // if no user specified, assume anonymous user
-   if ( !$user instanceof User ) {
-   $user = new User;
-   }
-
-   $actions = Container::get( 'flow_actions' );
-   $permissions = new RevisionActionPermissions( $actions, $user );
-
-   return $permissions->isAllowed( $this, $action );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] Login check in Special:Confirmemail was removed - change (mediawiki/core)

[Rohan013 (Code Review)]

Rohan013 has uploaded a new change for review.

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

Change subject: Login check in Special:Confirmemail was removed
..

Login check in Special:Confirmemail was removed

The user doesn't need to be logged in to confirm his/her email.

Bug: 60434
Change-Id: Idf3f9827daaac87f5c57617f4e5d42ca9569839d
---
M includes/specials/SpecialConfirmemail.php
1 file changed, 15 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/145511/1

diff --git a/includes/specials/SpecialConfirmemail.php 
b/includes/specials/SpecialConfirmemail.php
index d771589..ec74462 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -45,8 +45,6 @@
$this->checkReadOnly();
$this->checkPermissions();
 
-   $this->requireLogin( 'confirmemail_needlogin' );
-
// This could also let someone check the current email address, 
so
// require both permissions.
if ( !$this->getUser()->isAllowed( 'viewmyprivateinfo' ) ) {
@@ -54,10 +52,22 @@
}
 
if ( $code === null || $code === '' ) {
-   if ( Sanitizer::validateEmail( 
$this->getUser()->getEmail() ) ) {
-   $this->showRequestForm();
+   if ( $this->getUser()->isLoggedIn() ) {
+   if ( Sanitizer::validateEmail( 
$this->getUser()->getEmail() ) ) {
+   $this->showRequestForm();
+   } else {
+   $this->getOutput()->addWikiMsg( 
'confirmemail_noemail' );
+   }
} else {
-   $this->getOutput()->addWikiMsg( 
'confirmemail_noemail' );
+   $llink = Linker::linkKnown(
+   SpecialPage::getTitleFor( 'Userlogin' ),
+   $this->msg( 'loginreqlink' )->escaped(),
+   array(),
+   array( 'returnto' => 
$this->getTitle()->getPrefixedText() )
+   );
+   $this->getOutput()->addHTML(
+   $this->msg( 'confirmemail_needlogin' 
)->rawParams( $llink )->parse()
+   );
}
} else {
$this->attemptConfirm( $code );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki: move SSHD nice override from web.pp to init.pp - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: mediawiki: move SSHD nice override from web.pp to init.pp
..

mediawiki: move SSHD nice override from web.pp to init.pp

It's a bit bizarre for SSHD to be nice'd -10 on the web appservers but not the
rest. Applying it across all app servers makes things more uniform.

::ssh::server is already included on all servers because it's part of ::base.

Change-Id: I37694e4ab186d2ac9ca60c4b1fcd75e38ad9bbd8
---
M modules/mediawiki/manifests/init.pp
M modules/mediawiki/manifests/web.pp
2 files changed, 10 insertions(+), 12 deletions(-)


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

diff --git a/modules/mediawiki/manifests/init.pp 
b/modules/mediawiki/manifests/init.pp
index 47c28b8..4dfd171 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -3,6 +3,7 @@
 include ::mediawiki::sync
 include ::mediawiki::cgroup
 include ::mediawiki::packages
+include ::ssh::server
 
 file { '/etc/cluster':
 owner   => 'root',
@@ -44,4 +45,13 @@
 class { '::nutcracker':
 server_list => $mw_mc_server_list,
 }
+
+# Increase scheduling priority of SSHD
+file { '/etc/init/ssh.override':
+content => "nice -10\n",
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+notify  => Service['ssh'],
+}
 }
diff --git a/modules/mediawiki/manifests/web.pp 
b/modules/mediawiki/manifests/web.pp
index d8f91f2..f22e07a 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -5,7 +5,6 @@
 include ::mediawiki::monitoring::webserver
 include ::mediawiki::web::config
 
-
 file { '/usr/local/apache':
 ensure => directory,
 }
@@ -23,16 +22,5 @@
 command => '/bin/true',
 unless  => '/bin/ps -C apache2',
 notify  => Exec['mw-sync'],
-}
-
-
-
-# Has to be less than apache, and apache has to be nice 0 or less to be
-# blue in ganglia.
-file { '/etc/init/ssh.override':
-content => "nice -10\n",
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37694e4ab186d2ac9ca60c4b1fcd75e38ad9bbd8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Ensure MariaDB event logging statements are deterministic. - change (operations/software)

[Springle (Code Review)]

Springle has submitted this change and it was merged.

Change subject: Ensure MariaDB event logging statements are deterministic.
..


Ensure MariaDB event logging statements are deterministic.

Change-Id: I0cb6d51fc817e680f8a33583391e88b8518c24c3
---
M dbtools/events_coredb_slave.sql
M dbtools/events_labsdb.sql
2 files changed, 31 insertions(+), 17 deletions(-)

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



diff --git a/dbtools/events_coredb_slave.sql b/dbtools/events_coredb_slave.sql
index 037a950..e9290a5 100644
--- a/dbtools/events_coredb_slave.sql
+++ b/dbtools/events_coredb_slave.sql
@@ -13,8 +13,7 @@
 -- Remember, table is replicated!
 -- https://wikitech.wikimedia.org/wiki/MariaDB#Schema_Changes
 
-drop table if exists event_log;
-create table event_log (
+create table if not exists event_log (
   server_id int unsigned  not null,
   stamp datetime  not null,
   event varchar(100)  not null,
@@ -39,12 +38,11 @@
 
 do begin
 
--- If using statement based replication the @@server_id is unsafe. 
Convert it to a constant.
-set @sql := concat(
-'delete from event_log where stamp < now() - interval 1 day and 
server_id = ', @@server_id
-);
+declare sid int;
 
-prepare stmt from @sql; execute stmt; deallocate prepare stmt;
+set sid := @@server_id;
+
+delete from event_log where stamp < now() - interval 1 day and 
server_id = sid;
 
 end ;;
 
@@ -64,6 +62,7 @@
 
 do begin
 
+declare sid int;
 declare all_done int default 0;
 declare thread_id bigint default null;
 declare thread_query varchar(100);
@@ -82,6 +81,8 @@
 
 declare continue handler for not found set all_done = 1;
 
+set sid := @@server_id;
+
 if (get_lock('wmf_slave_wikiuser_slow', 1) = 0) then
 signal sqlstate value '45000' set message_text = 'get_lock';
 end if;
@@ -95,7 +96,7 @@
 
 kill thread_id;
 
-insert into event_log values (@@server_id, now(), 
'wmf_slave_wikiuser_slow',
+insert into event_log values (sid, now(), 
'wmf_slave_wikiuser_slow',
 concat('kill ',thread_id, '; ',thread_query)
 );
 
@@ -124,6 +125,7 @@
 
 do begin
 
+declare sid int;
 declare all_done int default 0;
 declare thread_id bigint default null;
 
@@ -142,6 +144,8 @@
 signal sqlstate value '45000' set message_text = 'get_lock';
 end if;
 
+set sid := @@server_id;
+
 set all_done = 0;
 open threads_sleeping;
 
@@ -151,7 +155,7 @@
 
 kill thread_id;
 
-insert into event_log values (@@server_id, now(), 
'wmf_slave_wikiuser_sleep',
+insert into event_log values (sid, now(), 
'wmf_slave_wikiuser_sleep',
 concat('kill ',thread_id)
 );
 
@@ -179,6 +183,7 @@
 
 do begin
 
+declare sid int;
 declare all_done int default 0;
 declare thread_id bigint default null;
 declare thread_query varchar(100);
@@ -203,6 +208,8 @@
 signal sqlstate value '45000' set message_text = 'get_lock';
 end if;
 
+set sid := @@server_id;
+
 set active_count := (
 select count(ps.id)
 from information_schema.processlist ps
@@ -225,7 +232,7 @@
 
 kill thread_id;
 
-insert into event_log values (@@server_id, now(), 
'wmf_slave_overload (300)',
+insert into event_log values (sid, now(), 
'wmf_slave_overload (300)',
 concat('kill ',thread_id,'; ',thread_query)
 );
 
diff --git a/dbtools/events_labsdb.sql b/dbtools/events_labsdb.sql
index 71adfb2..96c9784 100644
--- a/dbtools/events_labsdb.sql
+++ b/dbtools/events_labsdb.sql
@@ -3,6 +3,9 @@
 set @cache_sql_log_bin := @@session.sql_log_bin;
 set @@session.sql_log_bin = 1;
 
+set @cache_event_scheduler := @@global.event_scheduler;
+set @@global.event_scheduler = 0;
+
 create database if not exists ops;
 
 use ops;
@@ -10,8 +13,7 @@
 -- Remember, table is replicated!
 -- https://wikitech.wikimedia.org/wiki/MariaDB#Schema_Changes
 
-drop table if exists event_log;
-create table event_log (
+create table if not exists event_log (
   server_id int unsigned  not null,
   stamp datetime  not null,
   event varchar(100)  not null,
@@ -36,10 +38,11 @@
 
 do begin
 
-delete from event_log
-where stamp < now() - interval 1 day
-and server_id = @@server_id
-limit 1000;
+declare sid int;
+
+set sid := @@server_id;
+
+delete from event_log where stamp < now() - interval 1 day and 
server_id = sid;
 
 end ;;
 
@@ -56,6 +59,7 @@
 
 do begin
 
+declare sid int;
 declare thread_id bi

[MediaWiki-commits] [Gerrit] Ensure MariaDB event logging statements are deterministic. - change (operations/software)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: Ensure MariaDB event logging statements are deterministic.
..

Ensure MariaDB event logging statements are deterministic.

Change-Id: I0cb6d51fc817e680f8a33583391e88b8518c24c3
---
M dbtools/events_coredb_slave.sql
M dbtools/events_labsdb.sql
2 files changed, 31 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/09/145509/1

diff --git a/dbtools/events_coredb_slave.sql b/dbtools/events_coredb_slave.sql
index 037a950..e9290a5 100644
--- a/dbtools/events_coredb_slave.sql
+++ b/dbtools/events_coredb_slave.sql
@@ -13,8 +13,7 @@
 -- Remember, table is replicated!
 -- https://wikitech.wikimedia.org/wiki/MariaDB#Schema_Changes
 
-drop table if exists event_log;
-create table event_log (
+create table if not exists event_log (
   server_id int unsigned  not null,
   stamp datetime  not null,
   event varchar(100)  not null,
@@ -39,12 +38,11 @@
 
 do begin
 
--- If using statement based replication the @@server_id is unsafe. 
Convert it to a constant.
-set @sql := concat(
-'delete from event_log where stamp < now() - interval 1 day and 
server_id = ', @@server_id
-);
+declare sid int;
 
-prepare stmt from @sql; execute stmt; deallocate prepare stmt;
+set sid := @@server_id;
+
+delete from event_log where stamp < now() - interval 1 day and 
server_id = sid;
 
 end ;;
 
@@ -64,6 +62,7 @@
 
 do begin
 
+declare sid int;
 declare all_done int default 0;
 declare thread_id bigint default null;
 declare thread_query varchar(100);
@@ -82,6 +81,8 @@
 
 declare continue handler for not found set all_done = 1;
 
+set sid := @@server_id;
+
 if (get_lock('wmf_slave_wikiuser_slow', 1) = 0) then
 signal sqlstate value '45000' set message_text = 'get_lock';
 end if;
@@ -95,7 +96,7 @@
 
 kill thread_id;
 
-insert into event_log values (@@server_id, now(), 
'wmf_slave_wikiuser_slow',
+insert into event_log values (sid, now(), 
'wmf_slave_wikiuser_slow',
 concat('kill ',thread_id, '; ',thread_query)
 );
 
@@ -124,6 +125,7 @@
 
 do begin
 
+declare sid int;
 declare all_done int default 0;
 declare thread_id bigint default null;
 
@@ -142,6 +144,8 @@
 signal sqlstate value '45000' set message_text = 'get_lock';
 end if;
 
+set sid := @@server_id;
+
 set all_done = 0;
 open threads_sleeping;
 
@@ -151,7 +155,7 @@
 
 kill thread_id;
 
-insert into event_log values (@@server_id, now(), 
'wmf_slave_wikiuser_sleep',
+insert into event_log values (sid, now(), 
'wmf_slave_wikiuser_sleep',
 concat('kill ',thread_id)
 );
 
@@ -179,6 +183,7 @@
 
 do begin
 
+declare sid int;
 declare all_done int default 0;
 declare thread_id bigint default null;
 declare thread_query varchar(100);
@@ -203,6 +208,8 @@
 signal sqlstate value '45000' set message_text = 'get_lock';
 end if;
 
+set sid := @@server_id;
+
 set active_count := (
 select count(ps.id)
 from information_schema.processlist ps
@@ -225,7 +232,7 @@
 
 kill thread_id;
 
-insert into event_log values (@@server_id, now(), 
'wmf_slave_overload (300)',
+insert into event_log values (sid, now(), 
'wmf_slave_overload (300)',
 concat('kill ',thread_id,'; ',thread_query)
 );
 
diff --git a/dbtools/events_labsdb.sql b/dbtools/events_labsdb.sql
index 71adfb2..96c9784 100644
--- a/dbtools/events_labsdb.sql
+++ b/dbtools/events_labsdb.sql
@@ -3,6 +3,9 @@
 set @cache_sql_log_bin := @@session.sql_log_bin;
 set @@session.sql_log_bin = 1;
 
+set @cache_event_scheduler := @@global.event_scheduler;
+set @@global.event_scheduler = 0;
+
 create database if not exists ops;
 
 use ops;
@@ -10,8 +13,7 @@
 -- Remember, table is replicated!
 -- https://wikitech.wikimedia.org/wiki/MariaDB#Schema_Changes
 
-drop table if exists event_log;
-create table event_log (
+create table if not exists event_log (
   server_id int unsigned  not null,
   stamp datetime  not null,
   event varchar(100)  not null,
@@ -36,10 +38,11 @@
 
 do begin
 
-delete from event_log
-where stamp < now() - interval 1 day
-and server_id = @@server_id
-limit 1000;
+declare sid int;
+
+set sid := @@server_id;
+
+delete from event_log where stamp < now() - interval 1 day and 
server_id = sid;
 
 end ;;
 
@@ -56,6 +59,7 @@
 
 do begin
 
+  

[MediaWiki-commits] [Gerrit] Use MariaDB event scheduler to automatically delay dbstore10... - change (operations/software)

[Springle (Code Review)]

Springle has submitted this change and it was merged.

Change subject: Use MariaDB event scheduler to automatically delay dbstore1001. 
This saves running separate pt-slave-delay processes, plus is easy to disable 
single channels, or all of them, by:
..


Use MariaDB event scheduler to automatically delay dbstore1001.
This saves running separate pt-slave-delay processes, plus is easy
to disable single channels, or all of them, by:

a) STOP SLAVE 'sX' IO_THREAD
b) SET GLOBAL event_scheduler=0;

Change-Id: I1a218f741a3797a36fbdf19619535c79984861c5
---
A dbtools/events_dbstore_delayed.sql
1 file changed, 160 insertions(+), 0 deletions(-)

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



diff --git a/dbtools/events_dbstore_delayed.sql 
b/dbtools/events_dbstore_delayed.sql
new file mode 100644
index 000..f18b902
--- /dev/null
+++ b/dbtools/events_dbstore_delayed.sql
@@ -0,0 +1,160 @@
+-- Events for dbstore1001
+
+set @cache_sql_log_bin := @@session.sql_log_bin;
+set @@session.sql_log_bin = 1;
+
+set @cache_event_scheduler := @@global.event_scheduler;
+set @@global.event_scheduler = 0;
+
+create database if not exists ops;
+
+use ops;
+
+-- Remember, table is replicated!
+-- https://wikitech.wikimedia.org/wiki/MariaDB#Schema_Changes
+
+create table if not exists event_log (
+  server_id int unsigned  not null,
+  stamp datetime  not null,
+  event varchar(100)  not null,
+  content   varchar(1024) not null,
+  index server_stamp (server_id, stamp)
+) engine=innodb default charset=binary;
+
+create table if not exists slave_status
+engine=connect default charset=binary
+connection='mysql://status:status@localhost/test'
+table_type='mysql' srcdef='show all slaves status';
+
+create table if not exists slave_delay (
+  server_id int unsigned  not null,
+  stamp datetime  not null,
+  con   varchar(5)not null,
+  lag   int,
+  primary key (server_id, con)
+) engine=InnoDB default charset=binary;
+
+-- Avoid replicating event DDL. Delayed events should only be created
+-- on dbstore1001 though they may rely on replicated tables like event_log.
+
+set @@session.sql_log_bin = 0;
+
+delimiter ;;
+
+-- Housekeeping
+
+drop event if exists wmf_dbstore_purge;;
+
+create event wmf_dbstore_purge
+
+on schedule every 15 minute starts date(now())
+
+do begin
+
+declare sid int;
+
+set sid := @@server_id;
+
+delete from event_log where stamp < now() - interval 1 day and 
server_id = sid;
+
+end ;;
+
+drop event if exists wmf_dbstore_delay;;
+
+create event wmf_dbstore_delay
+
+on schedule every 5 second starts date(now())
+
+do begin
+
+declare sid   int;
+declare all_done  int default 0;
+declare con_name  varchar(10);
+declare io_state  varchar(5);
+declare sql_state varchar(5);
+declare sql_error int;
+declare lag_secs  int;
+declare sd_stamp  datetime;
+declare sd_lagint;
+
+declare sql_threads cursor for
+select
+ss.Connection_Name,
+ss.Slave_IO_Running,
+ss.Slave_SQL_Running,
+ss.Last_SQL_Errno,
+ss.Seconds_Behind_Master,
+sd.stamp,
+sd.lag
+from slave_status ss
+left join slave_delay sd
+on ss.Connection_Name = sd.con
+and sd.server_id = @@server_id;
+
+declare continue handler for not found set all_done = 1;
+
+set sid := @@server_id;
+
+if (get_lock('wmf_dbstore_delay', 1) = 0) then
+signal sqlstate value '45000' set message_text = 'get_lock';
+end if;
+
+set all_done = 0;
+open sql_threads;
+
+repeat fetch sql_threads into con_name, io_state, sql_state, 
sql_error, lag_secs, sd_stamp, sd_lag;
+
+if (con_name is not null and io_state = 'Yes' and sql_error = 0) 
then
+
+if (sql_state = 'Yes' and lag_secs is not null) then
+
+replace into slave_delay values (sid, now(), con_name, 
lag_secs);
+
+if (lag_secs < 86400) then
+
+set @sql := concat(
+'stop slave "', con_name, '" sql_thread'
+);
+
+prepare stmt from @sql; execute stmt; deallocate 
prepare stmt;
+
+insert into event_log values (sid, now(), 
'wmf_dbstore_delay',
+concat(@sql)
+);
+
+end if;
+
+end if;
+
+if (sql_state = 'No' and (sd_stamp is null or sd_lag is null 
or sd_stamp < now() - interval 5 minute or sd_lag > 87400)) then
+
+set @sql := concat(
+'start slave "', con_name, '" sql_thread'
+);
+
+  

[MediaWiki-commits] [Gerrit] Tolerate server addresses w/o a port number - change (mediawiki...jobrunner)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Tolerate server addresses w/o a port number
..

Tolerate server addresses w/o a port number

Silence an annoying "Notice: Undefined offset: 1" message.

Change-Id: I058182e46080baecaf594af0b394b27b5bba8c14
---
M redisJobRunnerService
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/jobrunner 
refs/changes/08/145508/1

diff --git a/redisJobRunnerService b/redisJobRunnerService
index a7f5ed8..73212a5 100755
--- a/redisJobRunnerService
+++ b/redisJobRunnerService
@@ -819,7 +819,12 @@
 
try {
$conn = new Redis();
-   list( $host, $port ) = explode( ':', $server ); // IPv4
+   if ( strpos( $server, ':' ) === false ) {
+   $host = $server;
+   $port = null;
+   } else {
+   list( $host, $port ) = explode( ':', $server );
+   }
$result = $conn->connect( $host, $port, 5 );
if ( !$result ) {
// Mark server down for some time to avoid 
further timeouts

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I058182e46080baecaf594af0b394b27b5bba8c14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/jobrunner
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] Use MariaDB event scheduler to automatically delay dbstore10... - change (operations/software)

[Springle (Code Review)]

Springle has uploaded a new change for review.

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

Change subject: Use MariaDB event scheduler to automatically delay dbstore1001. 
This saves running separate pt-slave-delay processes, plus is easy to disable 
single channels, or all of them, by:
..

Use MariaDB event scheduler to automatically delay dbstore1001.
This saves running separate pt-slave-delay processes, plus is easy
to disable single channels, or all of them, by:

a) STOP SLAVE 'sX' IO_THREAD
b) SET GLOBAL event_scheduler=0;

Change-Id: I1a218f741a3797a36fbdf19619535c79984861c5
---
A dbtools/events_dbstore_delayed.sql
1 file changed, 160 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/07/145507/1

diff --git a/dbtools/events_dbstore_delayed.sql 
b/dbtools/events_dbstore_delayed.sql
new file mode 100644
index 000..f18b902
--- /dev/null
+++ b/dbtools/events_dbstore_delayed.sql
@@ -0,0 +1,160 @@
+-- Events for dbstore1001
+
+set @cache_sql_log_bin := @@session.sql_log_bin;
+set @@session.sql_log_bin = 1;
+
+set @cache_event_scheduler := @@global.event_scheduler;
+set @@global.event_scheduler = 0;
+
+create database if not exists ops;
+
+use ops;
+
+-- Remember, table is replicated!
+-- https://wikitech.wikimedia.org/wiki/MariaDB#Schema_Changes
+
+create table if not exists event_log (
+  server_id int unsigned  not null,
+  stamp datetime  not null,
+  event varchar(100)  not null,
+  content   varchar(1024) not null,
+  index server_stamp (server_id, stamp)
+) engine=innodb default charset=binary;
+
+create table if not exists slave_status
+engine=connect default charset=binary
+connection='mysql://status:status@localhost/test'
+table_type='mysql' srcdef='show all slaves status';
+
+create table if not exists slave_delay (
+  server_id int unsigned  not null,
+  stamp datetime  not null,
+  con   varchar(5)not null,
+  lag   int,
+  primary key (server_id, con)
+) engine=InnoDB default charset=binary;
+
+-- Avoid replicating event DDL. Delayed events should only be created
+-- on dbstore1001 though they may rely on replicated tables like event_log.
+
+set @@session.sql_log_bin = 0;
+
+delimiter ;;
+
+-- Housekeeping
+
+drop event if exists wmf_dbstore_purge;;
+
+create event wmf_dbstore_purge
+
+on schedule every 15 minute starts date(now())
+
+do begin
+
+declare sid int;
+
+set sid := @@server_id;
+
+delete from event_log where stamp < now() - interval 1 day and 
server_id = sid;
+
+end ;;
+
+drop event if exists wmf_dbstore_delay;;
+
+create event wmf_dbstore_delay
+
+on schedule every 5 second starts date(now())
+
+do begin
+
+declare sid   int;
+declare all_done  int default 0;
+declare con_name  varchar(10);
+declare io_state  varchar(5);
+declare sql_state varchar(5);
+declare sql_error int;
+declare lag_secs  int;
+declare sd_stamp  datetime;
+declare sd_lagint;
+
+declare sql_threads cursor for
+select
+ss.Connection_Name,
+ss.Slave_IO_Running,
+ss.Slave_SQL_Running,
+ss.Last_SQL_Errno,
+ss.Seconds_Behind_Master,
+sd.stamp,
+sd.lag
+from slave_status ss
+left join slave_delay sd
+on ss.Connection_Name = sd.con
+and sd.server_id = @@server_id;
+
+declare continue handler for not found set all_done = 1;
+
+set sid := @@server_id;
+
+if (get_lock('wmf_dbstore_delay', 1) = 0) then
+signal sqlstate value '45000' set message_text = 'get_lock';
+end if;
+
+set all_done = 0;
+open sql_threads;
+
+repeat fetch sql_threads into con_name, io_state, sql_state, 
sql_error, lag_secs, sd_stamp, sd_lag;
+
+if (con_name is not null and io_state = 'Yes' and sql_error = 0) 
then
+
+if (sql_state = 'Yes' and lag_secs is not null) then
+
+replace into slave_delay values (sid, now(), con_name, 
lag_secs);
+
+if (lag_secs < 86400) then
+
+set @sql := concat(
+'stop slave "', con_name, '" sql_thread'
+);
+
+prepare stmt from @sql; execute stmt; deallocate 
prepare stmt;
+
+insert into event_log values (sid, now(), 
'wmf_dbstore_delay',
+concat(@sql)
+);
+
+end if;
+
+end if;
+
+if (sql_state = 'No' and (sd_stamp is null or sd_lag is null 
or sd_stamp < now() - interval 5 minute or sd_lag > 87400)) then
+
+set @sql := concat(
+'start slave "', con_name, '" sql_t

[MediaWiki-commits] [Gerrit] mw.Debug.profile: Tweak support check to handle PhantomJS - change (mediawiki/core)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: mw.Debug.profile: Tweak support check to handle PhantomJS
..

mw.Debug.profile: Tweak support check to handle PhantomJS

* Latest PhantomJS (1.9.7) supports Array.prototype.map,
  Array.prototype.reduce, Array.prototype.filter, and
  document.createElementNS, but not Function.prototype.bind
* Check all of these in the init function, and if they're available
  continue (unless there's no profiling data) and initialize
  this.createSvgElement (previously done inline).

Change-Id: I86fa085a390c425c1c420b87544ce449d3350aff
---
M resources/src/mediawiki/mediawiki.debug.profile.js
1 file changed, 16 insertions(+), 8 deletions(-)


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

diff --git a/resources/src/mediawiki/mediawiki.debug.profile.js 
b/resources/src/mediawiki/mediawiki.debug.profile.js
index 64ec6c3..df167af 100644
--- a/resources/src/mediawiki/mediawiki.debug.profile.js
+++ b/resources/src/mediawiki/mediawiki.debug.profile.js
@@ -37,11 +37,21 @@
// only drop events if requested
dropThresholdPx = dropThresholdPx || 0;
 
-   if ( !Array.prototype.map || !Array.prototype.reduce || 
!Array.prototype.filter ) {
-   profile.container = profile.buildRequiresES5();
+   if (
+   !Array.prototype.map ||
+   !Array.prototype.reduce ||
+   !Array.prototype.filter ||
+   !document.createElementNS ||
+   !document.createElementNS.bind
+   ) {
+   profile.container = 
profile.buildRequiresBrowserFeatures();
} else if ( data.length === 0 ) {
profile.container = profile.buildNoData();
} else {
+   // Initialize createSvgElement (now that we 
know we have
+   // document.createElementNS and bind)
+   this.createSvgElement = 
document.createElementNS.bind( document, 'http://www.w3.org/2000/svg' );
+
// generate a flyout
profile.data = new ProfileData( data, 
profile.width, mergeThresholdPx, dropThresholdPx );
// draw it
@@ -52,9 +62,9 @@
return profile.container;
},
 
-   buildRequiresES5: function () {
+   buildRequiresBrowserFeatures: function () {
return $( '' )
-   .text( 'An ES5 compatible javascript engine is 
required for the profile visualization.' )
+   .text( 'Certain browser features, including 
parts of ECMAScript 5 and document.createElementNS, are required for the 
profile visualization.' )
.get( 0 );
},
 
@@ -66,14 +76,12 @@
 
/**
 * Creates DOM nodes appropriately namespaced for SVG.
+* Initialized in init after checking support
 *
 * @param string tag to create
 * @return DOMElement
 */
-   createSvgElement: document.createElementNS
-   ? document.createElementNS.bind( document, 
'http://www.w3.org/2000/svg' )
-   // throw a error for browsers which does not support 
document.createElementNS (IE<8)
-   : function () { throw new Error( 
'document.createElementNS not supported' ); },
+   createSvgElement: null,
 
/**
 * @param DOMElement|undefined

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

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

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

[MediaWiki-commits] [Gerrit] Avoid race condition in GlobalBlocking::insertBlock - change (mediawiki...GlobalBlocking)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Avoid race condition in GlobalBlocking::insertBlock
..

Avoid race condition in GlobalBlocking::insertBlock

Bug: 67815
Change-Id: Ied16ff8258a8869be1721d90e44eb04d8e2fc582
---
M GlobalBlocking.class.php
1 file changed, 17 insertions(+), 6 deletions(-)


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

diff --git a/GlobalBlocking.class.php b/GlobalBlocking.class.php
index 3297278..5f930ee 100644
--- a/GlobalBlocking.class.php
+++ b/GlobalBlocking.class.php
@@ -239,13 +239,19 @@
}
 
/**
-* @param $ip string
+* @param string $ip
+* @param int $dbtype either DB_SLAVE or DB_MASTER
 * @return int
 */
-   static function getGlobalBlockId( $ip ) {
-   $dbr = GlobalBlocking::getGlobalBlockingSlave();
+   static function getGlobalBlockId( $ip, $dbtype = DB_SLAVE ) {
+   if ( $dbtype === DB_MASTER ) {
+   $db = GlobalBlocking::getGlobalBlockingMaster();
+   } else {
+   $db = GlobalBlocking::getGlobalBlockingSlave();
+   }
 
-   if ( !( $row = $dbr->selectRow( 'globalblocks', 'gb_id', array( 
'gb_address' => $ip ), __METHOD__ ) ) ) {
+
+   if ( !( $row = $db->selectRow( 'globalblocks', 'gb_id', array( 
'gb_address' => $ip ), __METHOD__ ) ) ) {
return 0;
}
 
@@ -385,7 +391,8 @@
$ip = IP::sanitizeRange( $ip );
}
 
-   $existingBlock = GlobalBlocking::getGlobalBlockId( $ip );
+   // Check for an existing block in the master database
+   $existingBlock = GlobalBlocking::getGlobalBlockId( $ip, 
DB_MASTER );
if ( !$modify && $existingBlock ) {
$errors[] = array( 
'globalblocking-block-alreadyblocked', $ip );
}
@@ -413,7 +420,11 @@
$row['gb_expiry'] = $dbw->encodeExpiry( $expiry, $dbw );
list( $row['gb_range_start'], $row['gb_range_end'] ) = array( 
$range_start, $range_end );
 
-   $dbw->insert( 'globalblocks', $row, __METHOD__ );
+   $dbw->insert( 'globalblocks', $row, __METHOD__, array( 'IGNORE' 
) );
+   if ( !$dbw->affectedRows() ) {
+   // Race condition, the IP is already blocked (bug 67815)
+   return array( array( 
'globalblocking-block-alreadyblocked', $ip ) );
+   }
 
return array();
}

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

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

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

[MediaWiki-commits] [Gerrit] Reduce dependence upon global objects - change (mediawiki...GlobalBlocking)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Reduce dependence upon global objects
..

Reduce dependence upon global objects

Change-Id: I875029e9cc65fa93b7bf069dd84cdf68ff94414c
---
M ApiGlobalBlock.php
M GlobalBlocking.class.php
M SpecialGlobalBlock.php
M SpecialGlobalBlockList.php
M SpecialGlobalBlockStatus.php
M SpecialRemoveGlobalBlock.php
6 files changed, 32 insertions(+), 30 deletions(-)


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

diff --git a/ApiGlobalBlock.php b/ApiGlobalBlock.php
index 93d4de9..bc8ce2e 100644
--- a/ApiGlobalBlock.php
+++ b/ApiGlobalBlock.php
@@ -25,6 +25,7 @@
$this->getParameter( 'target' ),
$this->getParameter( 'reason' ),
$this->getParameter( 'expiry' ),
+   $this->getUser(),
$options
);
 
diff --git a/GlobalBlocking.class.php b/GlobalBlocking.class.php
index 5f930ee..a08da79 100644
--- a/GlobalBlocking.class.php
+++ b/GlobalBlocking.class.php
@@ -350,14 +350,14 @@
}
 
/**
-* @param $address string
-* @param $reason string
-* @param $expiry string|bool
-* @param $options array
+* @param string $address
+* @param string $reason
+* @param string|bool $expiry
+* @param User $blocker
+* @param array $options
 * @return array
 */
-   static function insertBlock( $address, $reason, $expiry, $options = 
array() ) {
-   global $wgUser;
+   static function insertBlock( $address, $reason, $expiry, $blocker, 
$options = array() ) {
$errors = array();
 
## Purge expired blocks.
@@ -412,7 +412,7 @@
 
$row = array();
$row['gb_address'] = $ip;
-   $row['gb_by'] = $wgUser->getName();
+   $row['gb_by'] = $blocker->getName();
$row['gb_by_wiki'] = wfWikiId();
$row['gb_reason'] = $reason;
$row['gb_timestamp'] = $dbw->timestamp( wfTimestampNow() );
@@ -430,17 +430,18 @@
}
 
/**
-* @param $address string
-* @param $reason string
-* @param $expiry string
-* @param $options array
+* @param string $address
+* @param string $reason
+* @param string $expiry
+* @param User $blocker
+* @param array $options
 * @return array
 */
-   static function block( $address, $reason, $expiry, $options = array() ) 
{
+   static function block( $address, $reason, $expiry, $blocker, $options = 
array() ) {
global $wgContLang;
 
$expiry = SpecialBlock::parseExpiryInput( $expiry );
-   $errors = self::insertBlock( $address, $reason, $expiry, 
$options );
+   $errors = self::insertBlock( $address, $reason, $expiry, 
$blocker, $options );
 
if ( count( $errors ) > 0 ) {
return $errors;
@@ -521,44 +522,43 @@
 
/**
 * Build links to other global blocking special pages, shown in the 
subtitle
-* @param string $pagetype The calling special page name
+* @param SpecialPage $sp SpecialPage instance for context
 * @return string links to special pages
 */
-   static function buildSubtitleLinks( $pagetype ) {
-   global $wgUser, $wgLang;
-
+   static function buildSubtitleLinks( SpecialPage $sp ) {
// Add a few useful links
$links = array();
+   $pagetype = $sp->getName();
 
// Don't show a link to a special page on the special page 
itself.
// Show the links only if the user has sufficient rights
if ( $pagetype != 'GlobalBlockList' ) {
$title = SpecialPage::getTitleFor( 'GlobalBlockList' );
-   $links[] = Linker::linkKnown( $title, wfMessage( 
'globalblocklist' )->escaped() );
+   $links[] = Linker::linkKnown( $title, $sp->msg( 
'globalblocklist' )->escaped() );
}
-   $canBlock = $wgUser->isAllowed( 'globalblock' );
+   $canBlock = $sp->getUser()->isAllowed( 'globalblock' );
if ( $pagetype != 'GlobalBlock' && $canBlock ) {
$title = SpecialPage::getTitleFor( 'GlobalBlock' );
-   $links[] = Linker::linkKnown( $title, wfMessage( 
'globalblocking-goto-block' )->escaped() );
+   $links[] = Linker::linkKnown( $title, $sp->msg( 
'globalblocking-goto-block' )->escaped() );
}
if ( $pagetype != 'RemoveGlobalBlock' && $canBlock ) {
  

[MediaWiki-commits] [Gerrit] Convert SpecialRemoveGlobalBlock to use FormSpecialPage - change (mediawiki...GlobalBlocking)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Convert SpecialRemoveGlobalBlock to use FormSpecialPage
..

Convert SpecialRemoveGlobalBlock to use FormSpecialPage

Change-Id: Iba244036df9875c44c39de924e6236e7fe58c34a
---
M SpecialRemoveGlobalBlock.php
1 file changed, 30 insertions(+), 80 deletions(-)


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

diff --git a/SpecialRemoveGlobalBlock.php b/SpecialRemoveGlobalBlock.php
index d4327ae..beef43f 100644
--- a/SpecialRemoveGlobalBlock.php
+++ b/SpecialRemoveGlobalBlock.php
@@ -1,17 +1,12 @@
 setHeaders();
-
-   $this->loadParameters();
-
+   parent::execute( $par );
$out = $this->getOutput();
 
$out->setPageTitle( $this->msg( 'globalblocking-unblock' ) );
@@ -19,57 +14,11 @@
$out->setRobotPolicy( "noindex,nofollow" );
$out->setArticleRelated( false );
$out->enableClientCache( false );
-
-   if ( !$this->userCanExecute( $this->getUser() ) ) {
-   $this->displayRestrictionError();
-   return;
-   }
-
-   $errors = '';
-
-   $request = $this->getRequest();
-   if ( $request->wasPosted() && $this->getUser()->matchEditToken( 
$request->getVal( 'wpEditToken' ) ) ) {
-   // They want to submit. Let's have a look.
-   $errors = $this->trySubmit();
-   if ( !$errors ) {
-   // Success!
-   return;
-   }
-   }
-
-   $out->addWikiMsg( 'globalblocking-unblock-intro' );
-
-   if ( is_array( $errors ) && count( $errors ) > 0 ) {
-   $errorstr = '';
-
-   foreach ( $errors as $error ) {
-   if ( is_array( $error ) ) {
-   $msg = array_shift( $error );
-   } else {
-   $msg = $error;
-   $error = array();
-   }
-   $errorstr .= Xml::tags( 'li', null, $this->msg( 
$msg, $error )->parse() );
-   }
-
-   $errorstr = Xml::tags( 'ul', array( 'class' => 'error' 
), $errorstr );
-   $errorstr = $this->msg( 'globalblocking-unblock-errors' 
)->numParams( count( $errors ) )->parseAsBlock() . $errorstr;
-   $errorstr = Xml::tags( 'div', array( 'class' => 'error' 
), $errorstr );
-   $out->addHTML( $errorstr );
-   }
-
-   $this->form();
}
 
-   function loadParameters() {
-   $this->mUnblockIP = trim( $this->getRequest()->getText( 
'address' ) );
-   $this->mReason = $this->getRequest()->getText( 'wpReason' );
-   $this->mEditToken = $this->getRequest()->getText( 'wpEditToken' 
);
-   }
-
-   function trySubmit() {
+   function onSubmit( array $data ) {
$errors = array();
-   $ip = $this->mUnblockIP;
+   $ip = $data['ipaddress'];
if ( !IP::isIPAddress( $ip ) && strlen( $ip ) ) {
$errors[] = array( 'globalblocking-unblock-ipinvalid', 
$ip );
$ip = '';
@@ -88,7 +37,7 @@
$dbw->delete( 'globalblocks', array( 'gb_id' => $id ), 
__METHOD__ );
 
$page = new LogPage( 'gblblock' );
-   $page->addEntry( 'gunblock', Title::makeTitleSafe( NS_USER, $ip 
), $this->mReason );
+   $page->addEntry( 'gunblock', Title::makeTitleSafe( NS_USER, $ip 
), $data['reason'] );
 
$successmsg = $this->msg( 'globalblocking-unblock-unblocked', 
$ip, $id )->parseAsBlock();
$out->addHTML( $successmsg );
@@ -101,32 +50,33 @@
 
$out->setSubtitle( $this->msg( 
'globalblocking-unblock-successsub' ) );
 
-   return array();
+   return true;
}
 
-   function form() {
-   global $wgScript;
+   protected function alterForm( HTMLForm $form ) {
+   $form->setWrapperLegendMsg( 'globalblocking-unblock-legend' );
+   $form->setSubmitTextMsg( 'globalblocking-unblock-submit' );
+   $form->setPreText( $this->msg( 'globalblocking-unblock-intro' 
)->parse() );
+   }
 
-   $form = '';
-
-   $form .= Xml::openElement( 'fieldset' ) . Xml::element( 
'legend', null, $this->msg( 'globalblocking-unblock-legend' )->text() );
-   $form .= Xml::openElement( 'form', array( 'method' => 'post', 
'action' => $wgScript, 'name' => 'global

[MediaWiki-commits] [Gerrit] DO NOT MERGE: Remove wikiLink and explicitly set type - change (mediawiki...GettingStarted)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: DO NOT MERGE: Remove wikiLink and explicitly set type
..

DO NOT MERGE: Remove wikiLink and explicitly set type

It's not a wikiLink, and practically speaking this causes problems to.
It results in a self-link since mw.util.getUrl( undefined )
returns a self-link, which can then be styled as "visited link", etc.

I was going to use type: '', knowing that was not a recognized type
and thinking it would default to '' for the class.

However, '' is falsy, so that doesn't work.  This is kind of a hack,
in that it looks reasonable but doesn't work how you expect.

Perhaps we should enshrine neutral as an actual type (with class '')
or figure another way to do this.

Change-Id: I47bb227f74008d72c5bff3faa2099e263a8fe888
---
M resources/tours/anonymouseditoracquisitionpreeditv2.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted 
refs/changes/02/145502/1

diff --git a/resources/tours/anonymouseditoracquisitionpreeditv2.js 
b/resources/tours/anonymouseditoracquisitionpreeditv2.js
index f281ab1..3e5c600 100644
--- a/resources/tours/anonymouseditoracquisitionpreeditv2.js
+++ b/resources/tours/anonymouseditoracquisitionpreeditv2.js
@@ -26,7 +26,7 @@
onclick: function () {

mw.gettingStarted.anonymousEditorAcquisition.handleContinue();
},
-   action: 'wikiLink'
+   type: 'neutral'
},
 
// "Sign up"

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

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

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

[MediaWiki-commits] [Gerrit] rm unused Icinga checkcommands.cfg.erb - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: rm unused Icinga checkcommands.cfg.erb
..

rm unused Icinga checkcommands.cfg.erb

there are 2 copies of this, one in the
(otherwise empty) module and one in ./templates

and just this is used:
manifests/misc/icinga.pp:content => 
template('icinga/checkcommands.cfg.erb'),

Change-Id: Ib4bf87a6862f4f88fc632c899a8787b6299f2bfc
---
D templates/icinga/checkcommands.cfg.erb
1 file changed, 0 insertions(+), 521 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/145501/1

diff --git a/templates/icinga/checkcommands.cfg.erb 
b/templates/icinga/checkcommands.cfg.erb
deleted file mode 100644
index d0db41a..000
--- a/templates/icinga/checkcommands.cfg.erb
+++ /dev/null
@@ -1,521 +0,0 @@
-
-# Sample object config file for Nagios
-#
-# Read the documentation for more information on this configuration file.  I've
-# provided some comments here, but things may not be so clear without further
-# explanation, so make sure to read the HTML documentation!
-#
-# Last Modified: 12-15-2005
-#
-
-
-
-
-# COMMAND DEFINITIONS
-#
-# SYNTAX:
-#
-#  define command{
-#   template  
-#  name  
-#   command_name  
-#   command_line  
-#   }
-#
-# WHERE:
-#
-#  = object name of another command definition that should be
-#  used as a template for this definition (optional)
-#= object name of command definition, referenced by other
-#  command definitions that use it as a template (optional)
-#   = name of the command, as recognized/used by Nagios
-#   = command line
-#
-
-
-
-
-
-
-#
-# SAMPLE SERVICE CHECK COMMANDS
-#
-# These are some example service check commands.  They may or may not work on
-# your system, as they must be modified for your plugins.  See the HTML
-# documentation on the plugins for examples of how to configure command 
definitions.
-#
-
-
-
-# 'check_dns' command definition
-define command{
-command_namecheck_dns
-command_line$USER1$/check_dns -H $ARG1$ -s $HOSTADDRESS$
-}
-
-
-# 'check_ftp' command definition
-define command{
-command_namecheck_ftp
-command_line$USER1$/check_ftp -H $HOSTADDRESS$
-}
-
-
-# 'check_hpjd' command definition
-define command{
-command_namecheck_hpjd
-command_line$USER1$/check_hpjd -H $HOSTADDRESS$ -C public
-}
-
-
-# 'check_http' command definition
-define command{
-command_namecheck_http
-command_line$USER1$/check_http -H $HOSTADDRESS$
-}
-
-# 'check_http' command definition
-define command{
-command_namecheck_http_on_port
-command_line$USER1$/check_http -H $HOSTADDRESS$ -p $ARG1$
-}
-
-define command{
-command_namecheck_https_port_status
-command_line$USER1$/check_http -S -H $HOSTADDRESS$ -p $ARG1$ -e 
$ARG2$
-}
-
-# Example usage:  check_solr!500:1000|5
-define command{
-   command_namecheck_solr
-   command_line$USER1$/check_solr -a $ARG1$ -t $ARG2$ $HOSTADDRESS$
-   }
-
-# Example usage:  check_replicated_solr!500:1000|5
-define command{
-   command_namecheck_replicated_solr
-   command_line$USER1$/check_solr -r -a $ARG1$ -t $ARG2$ $HOSTADDRESS$
-   }
-
-# 'check_ssl_cert'
-# Verify a SSL certificate is not going to expire in the next 14 days
-# Example usage:  check_ssl_cert!secure.wikimedia.org
-define command{
-   command_namecheck_ssl_cert
-   command_line$USER1$/check_ssl_cert --rootcert /etc/ssl/certs/ 
--critical 90 -H $HOSTADDRESS$ --cn $ARG1$
-   }
-
-# 'check_local_disk' command definition
-define command{
-command_namecheck_local_disk
-command_line$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
-}
-
-
-# 'check_local_load' command definition
-define command{
-command_namecheck_local_load
-command_line$USER1$/check_load -w $ARG1$ -c $ARG2$
-}
-
-
-# 'check_local_procs' command definition
-define command{
-command_namecheck_local_procs
-command_line$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
-}
-
-
-# 'check_local_users' command definition
-define command{
-command_namecheck_local_users
-command_line$U

[MediaWiki-commits] [Gerrit] Temporary fix for LocalSettings being continuously overwritten - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Temporary fix for LocalSettings being continuously overwritten
..


Temporary fix for LocalSettings being continuously overwritten

If HHVM is broken (bug 67831), chain reaction causes LocalSettings.php
to be regenerated on every puppet run.

Change-Id: Icbfce2a5f8a7feb0f5aeda7451314bf6e2fb9183
---
M puppet/modules/mediawiki/manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 1cc67c4..4dd7b2a 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -90,7 +90,8 @@
 command => "rm -f ${dir}/LocalSettings.php",
 notify  => Exec['mediawiki setup'],
 require => [ Package['php5'], Git::Clone['mediawiki/core'], 
Service['mysql'] ],
-unless  => "/usr/bin/php ${dir}/maintenance/sql.php  "/usr/bin/php5 ${dir}/maintenance/sql.php https://gerrit.wikimedia.org/r/145476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbfce2a5f8a7feb0f5aeda7451314bf6e2fb9183
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: BryanDavis 
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] StrictTransportSecurity for lists.wm.org - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: StrictTransportSecurity for lists.wm.org
..

StrictTransportSecurity for lists.wm.org

this is a bit different because lists.wm.org
uses lighttpd instead of Apache

Bug: 38516
Change-Id: I53f27e7d82b720b5557f42ceef7d7bb26c95590c
---
M files/lighttpd/50-mailman.conf
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/145500/1

diff --git a/files/lighttpd/50-mailman.conf b/files/lighttpd/50-mailman.conf
index fb92d5e..5a212f3 100644
--- a/files/lighttpd/50-mailman.conf
+++ b/files/lighttpd/50-mailman.conf
@@ -6,6 +6,9 @@
 # Enable mod_redirect
 server.modules  += ( "mod_redirect" )
 
+# Enable mod_setenv (to set headers for STS)
+server.modules += ( "mod_setenv" )
+
 alias.url = (
"/mailman/" => "/usr/lib/cgi-bin/mailman/",
"/pipermail/"   => "/var/lib/mailman/archives/public/",
@@ -81,3 +84,8 @@
 $HTTP["useragent"] =~ "ArchiveTeam ArchiveBot" {
url.access-deny = ( "" )
 }
+
+# Strict Transport Security
+$HTTP["scheme"] == "https" {
+setenv.add-response-header  = ( "Strict-Transport-Security" => 
"max-age=604800")
+}

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

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

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

[MediaWiki-commits] [Gerrit] delete stat1001.wm.org Apache site - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: delete stat1001.wm.org Apache site
..

delete stat1001.wm.org Apache site

installed in manifests/misc/statistics.pp, but:

http://stat1001.wikimedia.org/  is currently just
-> It works!

is that a bug and it should show something different,
or is this file not needed anymore?

Change-Id: I639de269a201b555742662965676b5a8fd557058
---
D files/apache/sites/stat1001.wikimedia.org
1 file changed, 0 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/145499/1

diff --git a/files/apache/sites/stat1001.wikimedia.org 
b/files/apache/sites/stat1001.wikimedia.org
deleted file mode 100644
index 5a5107a..000
--- a/files/apache/sites/stat1001.wikimedia.org
+++ /dev/null
@@ -1,18 +0,0 @@
-NameVirtualHost *:80
-
-  ServerName stat1001.wikimedia.org
-
-  DocumentRoot /var/www
-
-  
-Options Indexes FollowSymLinks MultiViews
-AllowOverride None
-Order allow,deny
-allow from all
-  
-
-  LogLevel warn
-  ErrorLog /var/log/apache2/default_error.log
-  CustomLog /var/log/apache2/default_access.log combined
-  ServerSignature Off
-

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

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

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

[MediaWiki-commits] [Gerrit] delete mobile.wp.org Apache config - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: delete mobile.wp.org Apache config
..

delete mobile.wp.org Apache config

i don't see this being used by a puppet class

can be deleted?

mobile.wikipedia.org is an alias for m.wikimedia.org.

Change-Id: Ic4d9556cafce5529b0db3deff3f6350c5bb7b851
---
D files/apache/sites/mobile.wikipedia.org
1 file changed, 0 insertions(+), 34 deletions(-)


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

diff --git a/files/apache/sites/mobile.wikipedia.org 
b/files/apache/sites/mobile.wikipedia.org
deleted file mode 100644
index ef8d07c..000
--- a/files/apache/sites/mobile.wikipedia.org
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/mobile.wikipedia.org
-#
-# vim: filetype=apache
-
-
-
-   ServerAdmin r...@wikimedia.org
-   ServerName mobile.wikipedia.org
-   ServerAlias *.mobile.wikipedia.org 
-   
-   DocumentRoot /srv/mobile.wikipedia.org
-   
-   Options FollowSymLinks
-   AllowOverride None
-   
-   
-   Options Indexes FollowSymLinks MultiViews
-   AllowOverride None
-   Order allow,deny
-   allow from all
-   
-
-   ErrorLog /var/log/apache2/error.log
-
-   # Possible values include: debug, info, notice, warn, error, crit,
-   # alert, emerg.
-   LogLevel warn
-
-   CustomLog /var/log/apache2/access.log combined
-   ServerSignature On
-
-

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

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

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

[MediaWiki-commits] [Gerrit] delete unused download.wm.org Apache site - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: delete unused download.wm.org Apache site
..

delete unused download.wm.org Apache site

Ariel, this does not appear to be used.
Generated by module instead?

Change-Id: I755fba6adda93e5d013078a70269060d174037ae
---
D files/apache/sites/download.wikimedia.org
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/145497/1

diff --git a/files/apache/sites/download.wikimedia.org 
b/files/apache/sites/download.wikimedia.org
deleted file mode 100644
index 911c0cb..000
--- a/files/apache/sites/download.wikimedia.org
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/apache/sites/download.wikimedia.org
-#
-# vim: filetype=apache
-
-
-ServerName download.mediawiki.org
-DocumentRoot /srv/org/mediawiki/download
-DirectoryIndex index.php
-php_admin_flag engine On
-

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

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

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

[MediaWiki-commits] [Gerrit] delete unused bugzilla apache config - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: delete unused bugzilla apache config
..

delete unused bugzilla apache config

what? i did not delete that yet after
converting to module?

this should totally be replaced by template in module

Change-Id: Iaa5fa7721967a2844bedf06a0c619046f01852f5
---
D files/apache/sites/bugzilla.wikimedia.org
1 file changed, 0 insertions(+), 158 deletions(-)


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

diff --git a/files/apache/sites/bugzilla.wikimedia.org 
b/files/apache/sites/bugzilla.wikimedia.org
deleted file mode 100644
index 2be0b49..000
--- a/files/apache/sites/bugzilla.wikimedia.org
+++ /dev/null
@@ -1,158 +0,0 @@
-NameVirtualHost *:80
-NameVirtualHost *:443
-
-
-   ServerAdmin webmas...@wikimedia.org
-   ServerName bugzilla.wikimedia.org
-   Redirect permanent / https://bugzilla.wikimedia.org/
-   RewriteEngine On
-   RewriteCond %{HTTPS} off
-   RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
-
-
-
-   ServerAdmin webmas...@wikimedia.org
-   ServerName bugs.wikimedia.org
-   Redirect permanent / https://bugzilla.wikimedia.org/
-   RewriteEngine On
-   RewriteCond %{HTTPS} off
-   RewriteRule (.*) https://bugzilla.wikimedia.org%{REQUEST_URI}
-
-
-
-   ServerAdmin webmas...@wikimedia.org
-   ServerName bugs.wikipedia.org
-   Redirect permanent / https://bugzilla.wikimedia.org/
-   RewriteEngine On
-   RewriteCond %{HTTPS} off
-   RewriteRule (.*) https://bugzilla.wikimedia.org%{REQUEST_URI}
-
-
-
-   ServerAdmin webmas...@wikimedia.org
-   ServerName bugzilla.wikipedia.org
-   Redirect permanent / https://bugzilla.wikimedia.org/
-   RewriteEngine On
-   RewriteCond %{HTTPS} off
-   RewriteRule (.*) https://bugzilla.wikimedia.org%{REQUEST_URI}
-
-
-
-   ServerAdmin webmas...@wikimedia.org
-   ServerName bugs.wikimedia.org
-   Redirect permanent / https://bugzilla.wikimedia.org/
-   SSLEngine On
-   SSLProtocol -ALL +SSLv3 +TLSv1
-   SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
-   SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/bugzilla.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/bugzilla.wikimedia.org.key
-   SSLCACertificatePath /etc/ssl/certs/
-
-   RewriteEngine On
-   RewriteRule (.*) https://bugzilla.wikimedia.org%{REQUEST_URI}
-
-
-
-   ServerAdmin webmas...@wikimedia.org
-   ServerName bugzilla.wikimedia.org
-   DocumentRoot /srv/org/wikimedia/bugzilla/
-   SSLEngine On
-   SSLProtocol -ALL +SSLv3 +TLSv1
-   SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
-   SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/bugzilla.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/bugzilla.wikimedia.org.key
-   SSLCACertificatePath /etc/ssl/certs/
-
-   
-   Options FollowSymLinks
-   AllowOverride None
-   
-
-   
-   BrowserMatchNoCase spider nobots
-   BrowserMatchNoCase bot nobots
-   Options Indexes FollowSymLinks MultiViews
-   AllowOverride None
-   Order allow,deny
-   Deny from env=nobots
-   allow from all
-   # This directive allows us to have apache2's default start page
-   # in /apache2-default/, but still have / go to the right place
-   #RedirectMatch ^/$ /apache2-default/
-
-   # For bugzilla
-   AddHandler cgi-script .cgi
-   Options +ExecCGI +FollowSymLinks
-   AllowOverride Limit FileInfo Indexes
-   DirectoryIndex index.cgi index.html
-   
-
-   ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-
-   
-   AllowOverride None
-   Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-   Order allow,deny
-   Allow from all
-   
-
-ErrorLog /var/log/apache2/error.log
-
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-LogLevel warn
-
-CustomLog /var/log/apache2/access.log combined
-ServerSignature On
-
-RewriteEngine On
-RewriteRule ^/(\d+)$ https://bugzilla.wikimedia.org/show_bug.cgi?id=$1 [R]
-
-RewriteCond %{QUERY_STRING} ^(id=bug-writing.html)$
-RewriteRule /page\.cgi$ https://www.mediawiki.org/wiki/How_to_report_a_bug? 
[R=303]
-
-RewriteCond %{QUERY_STRING} ^(id=fields.html)$
-RewriteRule /page\.cgi$ https://www.mediawiki.org/wiki/Bugzilla/Fields? [R=303]
-
-
-
-
-   ServerName bug-attachment.wikimedia.org
-   DocumentRoot /srv/org/wikimedia/bugzilla/
-
-   
-   Order Allow,Deny
-   Deny from all
-   
-
-   ScriptAlias /attachment.c

[MediaWiki-commits] [Gerrit] StrictTransportSecurity for OTRS - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: StrictTransportSecurity for OTRS
..

StrictTransportSecurity for OTRS

Bug 38516

Change-Id: I895a06f34869a5d66cb7ceefa0c13781156361d0
---
M files/apache/sites/ticket.wikimedia.org
M manifests/role/otrs.pp
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/145495/1

diff --git a/files/apache/sites/ticket.wikimedia.org 
b/files/apache/sites/ticket.wikimedia.org
index b8e6802..648c2ed 100644
--- a/files/apache/sites/ticket.wikimedia.org
+++ b/files/apache/sites/ticket.wikimedia.org
@@ -26,6 +26,7 @@
 SSLCertificateKeyFile /etc/ssl/private/ticket.wikimedia.org.key
 SSLCACertificatePath /etc/ssl/certs/
 
+Header append Strict-Transport-Security "max-age=604800"
 
 # Make an access log, so we know when people abuse OTRS's insecure 
interface
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" 
combined
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index c43ce71..52282a5 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -135,6 +135,7 @@
 include ::apache::mod::perl
 include ::apache::mod::rewrite
 include ::apache::mod::ssl
+include ::apache::mod::headers
 
 include clamav
 class { 'spamassassin':

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

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

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

[MediaWiki-commits] [Gerrit] retab OTRS Apache config file - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: retab OTRS Apache config file
..

retab OTRS Apache config file

Change-Id: I7fa215188e26f7b239abf464f98898b341d9e3d7
---
M files/apache/sites/ticket.wikimedia.org
1 file changed, 80 insertions(+), 80 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/145494/1

diff --git a/files/apache/sites/ticket.wikimedia.org 
b/files/apache/sites/ticket.wikimedia.org
index 7ff1763..b8e6802 100644
--- a/files/apache/sites/ticket.wikimedia.org
+++ b/files/apache/sites/ticket.wikimedia.org
@@ -1,108 +1,108 @@
 # ticket.wikimedia.org http -> https
 
-   ServerName ticket.wikimedia.org
-   RewriteEngine On
-   RewriteRule ^.*$ https://ticket.wikimedia.org/ [R]
+ServerName ticket.wikimedia.org
+RewriteEngine On
+RewriteRule ^.*$ https://ticket.wikimedia.org/ [R]
 
 
 # otrs-test.wikimedia.org -> nowhere
 
-   ServerName otrs-test.wikimedia.org
-   
-   Order allow,deny
-   
+ServerName otrs-test.wikimedia.org
+
+Order allow,deny
+
 
 
 # https://ticket.wikimedia.org
 
-   ServerName ticket.wikimedia.org
-   ServerAlias iodine.wikimedia.org
+ServerName ticket.wikimedia.org
+ServerAlias iodine.wikimedia.org
 
-   SSLEngine On
-   SSLProtocol -ALL +SSLv3 +TLSv1
-   SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
-   SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/ticket.wikimedia.org.chained.pem
-   SSLCertificateKeyFile /etc/ssl/private/ticket.wikimedia.org.key
-   SSLCACertificatePath /etc/ssl/certs/
+SSLEngine On
+SSLProtocol -ALL +SSLv3 +TLSv1
+SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
+SSLHonorCipherOrder on
+SSLCertificateFile /etc/ssl/certs/ticket.wikimedia.org.chained.pem
+SSLCertificateKeyFile /etc/ssl/private/ticket.wikimedia.org.key
+SSLCACertificatePath /etc/ssl/certs/
 
 
-   # Make an access log, so we know when people abuse OTRS's insecure 
interface
-   LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" 
\"%{User-agent}i\"" combined
-   CustomLog /var/log/apache2/otrs-access.log combined
+# Make an access log, so we know when people abuse OTRS's insecure 
interface
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" 
combined
+CustomLog /var/log/apache2/otrs-access.log combined
 
-   ScriptAlias /otrs/ "/opt/otrs/bin/cgi-bin/"
-   Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/"
+ScriptAlias /otrs/ "/opt/otrs/bin/cgi-bin/"
+Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/"
 
-   # Setup environment and preload modules
-   PerlRequire /opt/otrs/scripts/apache2-perl-startup.pl
+# Setup environment and preload modules
+PerlRequire /opt/otrs/scripts/apache2-perl-startup.pl
 
-   # Reload Perl modules when changed on disk
-   PerlModule Apache2::Reload
-   PerlInitHandler Apache2::Reload
+# Reload Perl modules when changed on disk
+PerlModule Apache2::Reload
+PerlInitHandler Apache2::Reload
 
-   # general mod_perl2 options
-   
-   ErrorDocument 403 /otrs/index.pl
-   SetHandler  perl-script
-   PerlResponseHandler ModPerl::Registry
-   Options +ExecCGI
-   PerlOptions +ParseHeaders
-   PerlOptions +SetupEnv
-   Order allow,deny
-   Allow from all
-   
+# general mod_perl2 options
+
+ErrorDocument 403 /otrs/index.pl
+SetHandler  perl-script
+PerlResponseHandler ModPerl::Registry
+Options +ExecCGI
+PerlOptions +ParseHeaders
+PerlOptions +SetupEnv
+Order allow,deny
+Allow from all
+
 
-   # mod_perl2 options for GenericInterface
-   
-   PerlOptions -ParseHeaders
-   
+# mod_perl2 options for GenericInterface
+
+PerlOptions -ParseHeaders
+
 
-   
-   AllowOverride None
-   Options +ExecCGI -Includes
-   Order allow,deny
-   Allow from all
+
+AllowOverride None
+Options +ExecCGI -Includes
+Order allow,deny
+Allow from all
 
-   
-   AddOutputFilterByType DEFLATE text/html text/javascript 
text/css text/xml application/json text/json
-   
-   
+
+AddOutputFilterByType DEFLATE text/html text/javascript text/css 
text/xml application/json text/json
+
+
 
-   
-   AllowOverride None
-   Order allow,deny
-   Allow from all
+
+AllowOverride None
+Order allow,deny
+Allow from all
 
-   
-   AddOutputFilt

[MediaWiki-commits] [Gerrit] wikitech apache erb - qualify vars - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: wikitech apache erb - qualify vars
..

wikitech apache erb - qualify vars

Change-Id: I650d60f2f863db65cf6ca66c9f72c59fc7f7fc7b
---
M templates/apache/sites/wikitech.wikimedia.org.erb
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/145493/1

diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb 
b/templates/apache/sites/wikitech.wikimedia.org.erb
index 809a905..d35258b 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -6,7 +6,7 @@
 
 
 ServerAdmin n...@wikimedia.org
-ServerName <%= webserver_hostname %>
+ServerName <%= @webserver_hostname %>
 ServerAlias wmflabs.org www.wmflabs.org
 
 DocumentRoot /var/www
@@ -37,24 +37,24 @@
 
 
 ServerAdmin n...@wikimedia.org
-ServerName <%= webserver_hostname %>
+ServerName <%= @webserver_hostname %>
 
 SSLEngine on
 SSLProtocol -ALL +SSLv3 +TLSv1
 SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
 SSLHonorCipherOrder on
 SSLCertificateFile /etc/ssl/certs/<%= certificate %>.pem
-SSLCertificateKeyFile /etc/ssl/private/<%= certificate %>.key
+SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
 SSLCACertificatePath /etc/ssl/certs/
 
 Header append Strict-Transport-Security "max-age=604800"
 
-RedirectMatch ^/$ https://<%= webserver_hostname %>/wiki/
+RedirectMatch ^/$ https://<%= @webserver_hostname %>/wiki/
 
 RewriteEngine on
-RewriteRule ^/view/(.*)$ https://<%= webserver_hostname %>/wiki/$1 [L,R]
-RewriteCond %{HTTP_HOST}   !^<%= webserver_hostname.gsub(%r[\.],'\\.') %> 
[NC]
-RewriteRule ^/(.*) https://<%= webserver_hostname %>/$1 [L,R]
+RewriteRule ^/view/(.*)$ https://<%= @webserver_hostname %>/wiki/$1 [L,R]
+RewriteCond %{HTTP_HOST}   !^<%= @webserver_hostname.gsub(%r[\.],'\\.') %> 
[NC]
+RewriteRule ^/(.*) https://<%= @webserver_hostname %>/$1 [L,R]
 
 DocumentRoot /var/www
 

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

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

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

[MediaWiki-commits] [Gerrit] retab wikitech.wikimedia.org.erb - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: retab wikitech.wikimedia.org.erb
..

retab wikitech.wikimedia.org.erb

Change-Id: If06efe55e88f31496f1c63c57e416d87363aef5f
---
M templates/apache/sites/wikitech.wikimedia.org.erb
1 file changed, 69 insertions(+), 69 deletions(-)


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

diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb 
b/templates/apache/sites/wikitech.wikimedia.org.erb
index 670b974..786f098 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -5,92 +5,92 @@
 # vim: filetype=apache
 
 
-   ServerAdmin n...@wikimedia.org
-   ServerName <%= webserver_hostname %>
-   ServerAlias wmflabs.org www.wmflabs.org
+ServerAdmin n...@wikimedia.org
+ServerName <%= webserver_hostname %>
+ServerAlias wmflabs.org www.wmflabs.org
 
-   DocumentRoot /var/www
-   
-   Options FollowSymLinks
-   AllowOverride None
-   
-   
-   Options Indexes FollowSymLinks MultiViews
-   AllowOverride None
-   Order allow,deny
-   allow from all
-   
+DocumentRoot /var/www
+
+Options FollowSymLinks
+AllowOverride None
+
+
+Options Indexes FollowSymLinks MultiViews
+AllowOverride None
+Order allow,deny
+allow from all
+
 
-   RewriteEngine on
-   RewriteCond %{SERVER_PORT} !^443$
-   RewriteRule ^/(.*)$ https://<%= webserver_hostname %>/$1 [L,R]
+RewriteEngine on
+RewriteCond %{SERVER_PORT} !^443$
+RewriteRule ^/(.*)$ https://<%= webserver_hostname %>/$1 [L,R]
 
-   ErrorLog /var/log/apache2/error.log
+ErrorLog /var/log/apache2/error.log
 
-   # Possible values include: debug, info, notice, warn, error, crit,
-   # alert, emerg.
-   LogLevel warn
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+LogLevel warn
 
-   CustomLog /var/log/apache2/access.log combined
-   ServerSignature Off
+CustomLog /var/log/apache2/access.log combined
+ServerSignature Off
 
 
 
-   ServerAdmin n...@wikimedia.org 
-   ServerName <%= webserver_hostname %>
+ServerAdmin n...@wikimedia.org 
+ServerName <%= webserver_hostname %>
 
-   SSLEngine on
-   SSLProtocol -ALL +SSLv3 +TLSv1
-   SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
-   SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/<%= certificate %>.pem
-   SSLCertificateKeyFile /etc/ssl/private/<%= certificate %>.key
-   SSLCACertificatePath /etc/ssl/certs/
+SSLEngine on
+SSLProtocol -ALL +SSLv3 +TLSv1
+SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
+SSLHonorCipherOrder on
+SSLCertificateFile /etc/ssl/certs/<%= certificate %>.pem
+SSLCertificateKeyFile /etc/ssl/private/<%= certificate %>.key
+SSLCACertificatePath /etc/ssl/certs/
 
 Header append Strict-Transport-Security "max-age=604800"
 
-   RedirectMatch ^/$ https://<%= webserver_hostname %>/wiki/
+RedirectMatch ^/$ https://<%= webserver_hostname %>/wiki/
 
-   RewriteEngine on
-   RewriteRule ^/view/(.*)$ https://<%= webserver_hostname %>/wiki/$1 [L,R]
-   RewriteCond %{HTTP_HOST}   !^<%= webserver_hostname.gsub(%r[\.],'\\.') 
%> [NC]
-   RewriteRule ^/(.*) https://<%= webserver_hostname %>/$1 [L,R]
+RewriteEngine on
+RewriteRule ^/view/(.*)$ https://<%= webserver_hostname %>/wiki/$1 [L,R]
+RewriteCond %{HTTP_HOST}   !^<%= webserver_hostname.gsub(%r[\.],'\\.') %> 
[NC]
+RewriteRule ^/(.*) https://<%= webserver_hostname %>/$1 [L,R]
 
-   DocumentRoot /var/www
-   
-   Options FollowSymLinks
-   AllowOverride None
-   
-   
-   Options Indexes FollowSymLinks MultiViews
-   AllowOverride None
-   Order allow,deny
-   allow from all
-   
-   
-   php_flag engine off
-   
+DocumentRoot /var/www
+
+Options FollowSymLinks
+AllowOverride None
+
+
+Options Indexes FollowSymLinks MultiViews
+AllowOverride None
+Order allow,deny
+allow from all
+
+
+php_flag engine off
+
 
-   Alias /w/images /srv/org/wikimedia/controller/wikis/images
-   Alias /w /srv/org/wikimedia/controller/wikis/w
-   Alias /wiki /srv/org/wikimedia/controller/wikis/w/index.php
-   Alias /dumps /a/backup/public
-   <% if realm == "labs" %>
-   # Add additional wikis for development
-   Alias /w2 /srv/org/wikimedia/controller/wikis/w2
-   Alias /wiki2 /srv/org/wikimedia/controll

[MediaWiki-commits] [Gerrit] StrictTransportSecurity for wikitech - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: StrictTransportSecurity for wikitech
..

StrictTransportSecurity for wikitech

enable STS on Wikitech, just like we recently did on Bugzilla

Change-Id: If8d97284cafb72c062e74221540e5a101c7c04ba
---
M manifests/openstack.pp
M templates/apache/sites/wikitech.wikimedia.org.erb
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/145491/1

diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 29229a6..088f56b 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -515,6 +515,7 @@
 
 
 include ::apache::mod::rewrite
+include ::apache::mod::headers
 
 include backup::host
 backup::set {'a-backup': }
diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb 
b/templates/apache/sites/wikitech.wikimedia.org.erb
index 1807806..670b974 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -47,6 +47,8 @@
SSLCertificateKeyFile /etc/ssl/private/<%= certificate %>.key
SSLCACertificatePath /etc/ssl/certs/
 
+Header append Strict-Transport-Security "max-age=604800"
+
RedirectMatch ^/$ https://<%= webserver_hostname %>/wiki/
 
RewriteEngine on

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

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

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

[MediaWiki-commits] [Gerrit] Use MariaDB event scheduler on coredb slaves. - change (operations/software)

[Springle (Code Review)]

Springle has submitted this change and it was merged.

Change subject: Use MariaDB event scheduler on coredb slaves.
..


Use MariaDB event scheduler on coredb slaves.

The first jobs monitor, log, and potentially kill:

1. slow wikiuser queries running over 300s
2. sleeping wikiuser uncommitted transactions over 300s
3. unsustainable max_connections traffic spikes over 10s

They shall not touch wikiadmin, root, system users, or anything
running legitimate slow queries (dumps, etc), plus they shall be
conservative by default. 300s is an initial starting bar so that
we tread softly; it should realistically be dropped to 60s or
less. #3 is the biggest stick and only likely to come into play
during an outage.

The functionality has previously been a combination of pt-kill and
custom scripts, or Opsen responding during an outage with manual
KILL carnage. Those options all rely on a server being accessible
for one or more new connections during an outage, and that the
reserved mysqld SUPER connection slot is not in use or blocked.

Using the built-in event scheduler:

- Removes the need for separate cron jobs or polling services
- Improves the chances of an overloaded box recovering itself
- Reduces system load, network activity, use-of-perl, etc
- Is cool :-)

Change-Id: I8546406267887b073a81e713aa3dd38afce9c849
---
A dbtools/events_coredb_slave.sql
1 file changed, 251 insertions(+), 0 deletions(-)

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



diff --git a/dbtools/events_coredb_slave.sql b/dbtools/events_coredb_slave.sql
new file mode 100644
index 000..037a950
--- /dev/null
+++ b/dbtools/events_coredb_slave.sql
@@ -0,0 +1,251 @@
+-- Events for s[1-7] slaves
+
+set @cache_sql_log_bin := @@session.sql_log_bin;
+set @@session.sql_log_bin = 1;
+
+set @cache_event_scheduler := @@global.event_scheduler;
+set @@global.event_scheduler = 0;
+
+create database if not exists ops;
+
+use ops;
+
+-- Remember, table is replicated!
+-- https://wikitech.wikimedia.org/wiki/MariaDB#Schema_Changes
+
+drop table if exists event_log;
+create table event_log (
+  server_id int unsigned  not null,
+  stamp datetime  not null,
+  event varchar(100)  not null,
+  content   varchar(1024) not null,
+  index server_stamp (server_id, stamp)
+) engine=innodb default charset=binary;
+
+-- Avoid replicating event DDL. Coredb events should only be created
+-- on s[1-7] though they may rely on replicated tables like event_log.
+
+set @@session.sql_log_bin = 0;
+
+delimiter ;;
+
+-- Housekeeping
+
+drop event if exists wmf_slave_purge;;
+
+create event wmf_slave_purge
+
+on schedule every 15 minute starts date(now())
+
+do begin
+
+-- If using statement based replication the @@server_id is unsafe. 
Convert it to a constant.
+set @sql := concat(
+'delete from event_log where stamp < now() - interval 1 day and 
server_id = ', @@server_id
+);
+
+prepare stmt from @sql; execute stmt; deallocate prepare stmt;
+
+end ;;
+
+-- NOTE: information_schema.processlist
+-- MariaDB must generate information_schema.processlist every time it is 
accessed.
+-- That involves various locks which start to matter during high traffic, so 
stagger
+-- events appropriately, at least several seconds apart.
+
+-- wikiuser slow queries get killed at 300s
+-- time < 100 mariadb 5.5 bug allows new connections to be 2147483647 
briefly
+
+drop event if exists wmf_slave_wikiuser_slow;;
+
+create event wmf_slave_wikiuser_slow
+
+on schedule every 30 second starts date(now()) + interval 3 second
+
+do begin
+
+declare all_done int default 0;
+declare thread_id bigint default null;
+declare thread_query varchar(100);
+
+declare slow_queries cursor for
+select ps.id, substring(info,1,100)
+from information_schema.processlist ps
+where ps.command = 'Query'
+and ps.user = 'wikiuser'
+and ps.time between 300 and 100
+and ps.info is not null
+and lower(ps.info) regexp '^[[:space:]]*select'
+and not lower(ps.info) regexp 'wikiexporter'
+and not lower(ps.info) regexp 'master_pos_wait'
+order by ps.time desc;
+
+declare continue handler for not found set all_done = 1;
+
+if (get_lock('wmf_slave_wikiuser_slow', 1) = 0) then
+signal sqlstate value '45000' set message_text = 'get_lock';
+end if;
+
+set all_done = 0;
+open slow_queries;
+
+repeat fetch slow_queries into thread_id, thread_query;
+
+if (thread_id is not null) then
+
+kill thread_id;
+
+insert into event_log values (@@server_id, now(), 
'wmf_slave_wikiuser_slow',
+concat('kill ',thread_id, '; ',thread_query)
+);
+
+end 

[MediaWiki-commits] [Gerrit] Use i18n message in handlebar language helper function - change (mediawiki...Flow)

[Bsitu (Code Review)]

Bsitu has uploaded a new change for review.

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

Change subject: Use i18n message in handlebar language helper function
..

Use i18n message in handlebar language helper function

issues:

{{PLURAL:$1|0=xxx|1=yyy}} is outputting the conditional "1="

Change-Id: I3409147c1fbf3d289d5a3089a3c187a12918bd18
---
M modules/new/flow-handlebars.js
1 file changed, 23 insertions(+), 10 deletions(-)


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

diff --git a/modules/new/flow-handlebars.js b/modules/new/flow-handlebars.js
index c095d40..f824f5b 100644
--- a/modules/new/flow-handlebars.js
+++ b/modules/new/flow-handlebars.js
@@ -127,23 +127,36 @@
var parameters = Array.prototype.slice.call( arguments, 1 ),
strings = ( {
"Reply": "Reply", // TODO: pass in and parse 
$author['gender']
-   "Topics_n": function ( count, options ) {
-   return "Topics (" + count + ")";
+   "Topics_n": function ( context, options ) {
+   return mw.message( 'flow-topic-count' 
).params(
+   [
+   context.roots.length
+   ]
+   );
},
 
-   // @todo - use real i18n message keys instead 
of cancatenation
"started_with_participants": function ( 
context, options ) {
-   return context.creator.name + " started 
this topic" +
-   ( context.author_count > 1 ? (
-   ", with " + ( 
context.author_count - 1 ) + " other participant" +
-   ( context.author_count 
> 2 ? 's' : '' )
-   ) : '' );
+   return mw.message( 
'flow-topic-participants-second-try' ).params(
+   [
+   context.creator.name,
+   context.author_count - 1
+   ]
+   );
},
"topic_count_sidebar": function ( context, 
options ) {
-   return "Showing " + 
context.topics.length + " of " + context.topic_count + " topics attached to 
this page";
+   return mw.message( 
'flow-topic-count-sidebar' ).params(
+   [
+   context.topics.length,
+   context.topic_count
+   ]
+   );
},
"comment_count": function ( context, options ) {
-   return context.reply_count + " 
comment" + ( !context.reply_count || context.reply_count > 1 ? 's' : '' );
+   return mw.message( 
'flow-topic-comment-count' ).params(
+   [
+   context.reply_count
+   ]
+   );
},
"post_moderation_state": function( type, 
replyToId, name ) {
var str;

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

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

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

[MediaWiki-commits] [Gerrit] Bugzilla: use 'header append' vs. 'header add' - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: Bugzilla: use 'header append' vs. 'header add'
..

Bugzilla: use 'header append' vs. 'header add'

append:

"The response header is appended to any existing
header of the same name.
When a new value is merged onto an existing header
it is separated from the existing header with a comma.

This is the HTTP standard way of giving a header multiple values."

--

add:

"The response header is added to the existing set of headers,
even if this header already exists.
This can result in two (or more) headers having the same name.
This can lead to unforeseen consequences, and in general set, append
or merge should be used instead."

Change-Id: I3b28b72518c80d201126d6e7758c68133d95d6e0
from: http://httpd.apache.org/docs/2.2/mod/mod_headers.html
---
M modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/145489/1

diff --git a/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb 
b/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
index 3824723..953e903 100644
--- a/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
+++ b/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
@@ -73,7 +73,7 @@
SSLCertificateKeyFile /etc/ssl/private/<%= @svc_name %>.key
SSLCACertificatePath /etc/ssl/certs/
 
-   Header add Strict-Transport-Security "max-age=604800"
+   Header append Strict-Transport-Security "max-age=604800"
 

Options FollowSymLinks

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

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

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

[MediaWiki-commits] [Gerrit] Refactored code and allow variable # of stars - change (mediawiki...SemanticRating)

[Cicalese (Code Review)]

Cicalese has uploaded a new change for review.

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

Change subject: Refactored code and allow variable # of stars
..

Refactored code and allow variable # of stars

Change-Id: Ie4bae092dc142b6df041ef119574f7632d6f36ef
---
A EditSemanticRating.class.php
A RenderSemanticRating.class.php
D SemanticRating.class.php
M SemanticRating.i18n.magic.php
M SemanticRating.php
M i18n/en.json
M scripts/SemanticRating.js
7 files changed, 209 insertions(+), 150 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticRating 
refs/changes/88/145488/1

diff --git a/EditSemanticRating.class.php b/EditSemanticRating.class.php
new file mode 100644
index 000..87be130
--- /dev/null
+++ b/EditSemanticRating.class.php
@@ -0,0 +1,111 @@
+mOtherArgs)) {
+   $this->mMax = $this->mOtherArgs['max'];
+   } else {
+   $this->mMax = 5;
+   }
+   }
+
+   public static function getName() {
+   return 'rating';
+   }
+
+   public function getHtmlText() {
+
+   global $wgServer, $wgScriptPath;
+   $imagepath = $wgServer . $wgScriptPath .
+   "/extensions/SemanticRating/images/";
+
+   if (!is_numeric($this->mCurrentValue) || $this->mCurrentValue < 
0 ||
+   $this->mCurrentValue > $this->mMax) {
+   $this->mCurrentValue = 0;
+   }
+   
+   $output =
+   Html::openElement('table', array('style' => 
'display:inline;')) .
+   Html::openElement('td');
+   
+   global $sfgFieldNum;
+   $input_id = "input_$sfgFieldNum";
+   $output .= Html::element('input', array(
+   'type' => 'hidden',
+   'id' => $input_id,
+   'name' => $this->mInputName,
+   'value' => $this->mCurrentValue
+   ));
+   
+   $i = 1;
+   
+   $src =  $imagepath . 'yellowstar.png';
+   while ($i < $this->mCurrentValue + 1) {
+   $output .= Html::element('img', array(
+   'src' => $src,
+   'id' => $input_id . '_s_' . $i,
+   'onclick' => 'setrating(' . $i . ",'" . 
$input_id . "'," .
+   $this->mMax . ');'
+   ));
+   $i++;
+   }
+   
+   $src =  $imagepath . 'greystar.png';
+   while ($i <= $this->mMax) {
+   $output .= Html::element('img', array(
+   'src' => $src,
+   'id' => $input_id . '_s_' . $i,
+   'onclick' => 'setrating(' . $i . ",'" . 
$input_id . "'," .
+   $this->mMax . ');'
+   ));
+   $i++;
+   }
+   
+   $output .=
+   Html::closeElement('td') .
+   Html::closeElement('table');
+   
+   return $output;
+   }
+
+   public static function getParameters() {
+   $params = parent::getParameters();
+   $params[] = array(
+   'name' => 'max',
+   'type' => 'int',
+   'description' => wfMessage('semanticrating-max')->text()
+   );
+   return $params;
+   }
+
+   public function getResourceModuleNames() {
+   return array(
+   'ext.SemanticRating'
+   );
+   }
+}
diff --git a/RenderSemanticRating.class.php b/RenderSemanticRating.class.php
new file mode 100644
index 000..115e784
--- /dev/null
+++ b/RenderSemanticRating.class.php
@@ -0,0 +1,80 @@
+ 1) {
+   $rating = $params[1];
+   } else {
+   $rating = 0;
+   }
+   if (count($params) > 2) {
+   $max = $params[2];
+   } else {
+   global $SemanticRating_DefaultMax;
+   $max = $SemanticRating_DefaultMax;
+   }
+
+   global $wgServer, $wgScriptPath;
+   $imagepath = $wgServer . $wgScriptPath .
+   "/extensions/SemanticRating/images/";
+
+   $output = Html::openElement('span');
+
+   if ($rating < 0) {
+   $rating = 0;
+   } else if ($rating > $max) {
+   $rating = $max;
+   }
+
+   $i = 1;
+   while ($i <= $rating) {
+   $output .=
+  

[MediaWiki-commits] [Gerrit] Don't actually show guiders in unit tests - change (mediawiki...GuidedTour)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Don't actually show guiders in unit tests
..

Don't actually show guiders in unit tests

Bug: 63579
Change-Id: I883ca95dbfd003a40b1b2fe92bb32f26b11e804d
---
M tests/ext.guidedTour.lib.tests.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour 
refs/changes/87/145487/1

diff --git a/tests/ext.guidedTour.lib.tests.js 
b/tests/ext.guidedTour.lib.tests.js
index 88804d8..419b364 100644
--- a/tests/ext.guidedTour.lib.tests.js
+++ b/tests/ext.guidedTour.lib.tests.js
@@ -56,6 +56,8 @@
otherTourStepBuilder = otherTourBuilder.step( {
name: 'filename'
} );
+
+   this.stub( mw.libs.guiders, 'show' );
},
teardown: function () {
window.ve = originalVE;
@@ -1511,8 +1513,6 @@
expectedTransitionEvent,
'Calls checkTransition with expected event'
);
-
-   gt.endTour();
} );
 
QUnit.test( 'Tour.start', 2, function ( assert ) {

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

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

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

[MediaWiki-commits] [Gerrit] Fix indentation to May's liking - change (mediawiki...Flow)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Fix indentation to May's liking
..

Fix indentation to May's liking

This lines up the placeholder test of reply box with topic title
and with the posts.

Change-Id: Id830cf834e2a2ba6e5b75982feac5c5a4a7071fc
---
M modules/new/styles/board/topic/post.less
M modules/new/styles/flow.less/flow.variables.less
2 files changed, 8 insertions(+), 6 deletions(-)


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

diff --git a/modules/new/styles/board/topic/post.less 
b/modules/new/styles/board/topic/post.less
index 103eb85..8386ed5 100644
--- a/modules/new/styles/board/topic/post.less
+++ b/modules/new/styles/board/topic/post.less
@@ -4,10 +4,14 @@
 @import 'flow.variables';
 
 // Comments
+form.flow-post {
+   margin-left: @topicIndent - (@textareaPadding * 2);
+}
+
 .flow-post {
position: relative;
/* left margin provided by highlighting zone */
-   margin: 0;
+   margin: 1em 0 0 @topicIndent;
margin-top: 1em;
padding: 0;
color: @colorText;
@@ -32,11 +36,8 @@
}
}
 
-   // Wraps flow-post-content
-   .flow-post-main,
-   .flow-reply-form,
-   .flow-edit-post-form {
-   padding-left: @topicIndent;
+   .flow-post-main {
+   margin-left: 0.1em;
}
 
// Highlights a post (no IE6 support, but acceptable degradation)
diff --git a/modules/new/styles/flow.less/flow.variables.less 
b/modules/new/styles/flow.less/flow.variables.less
index 3436bef..29bcae7 100644
--- a/modules/new/styles/flow.less/flow.variables.less
+++ b/modules/new/styles/flow.less/flow.variables.less
@@ -1 +1,2 @@
 @topicIndent: 1.5em;
+@textareaPadding: .3em;

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

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

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

[MediaWiki-commits] [Gerrit] Fix MathDatabaseTest - change (mediawiki...Math)

[jenkins-bot (Code Review)]

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

Change subject: Fix MathDatabaseTest
..


Fix MathDatabaseTest

The test used an unnecessary call to
setupTestDB. This might have caused
that the unittest_math table was deleted
twice during the setup routine of the
unittest.

Bug: 67148
Change-Id: I4a414900c1c2d97b759ef1755e53e82c5c2e8e14
---
M tests/MathDatabaseTest.php
1 file changed, 14 insertions(+), 13 deletions(-)

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



diff --git a/tests/MathDatabaseTest.php b/tests/MathDatabaseTest.php
index be913af..fcd946c 100644
--- a/tests/MathDatabaseTest.php
+++ b/tests/MathDatabaseTest.php
@@ -1,10 +1,11 @@
 tablesUsed[] = 'math';
+*$this->tablesUsed[] = 'math';
 * }
 * was not sufficient.
 */
@@ -33,8 +34,8 @@
// Create a new instance of MathSource
$this->renderer = new MathTexvc( self::SOME_TEX );
$this->tablesUsed[] = 'math';
-   self::setupTestDB( $this->db, "mathtest" );
-}
+   }
+
/**
 * Checks the tex and hash functions
 * @covers MathRenderer::getInputHash()
@@ -52,8 +53,9 @@
$this->renderer->setTex( self::SOME_TEX );
$this->renderer->setMathml( self::SOME_MATHML );
$this->renderer->setHtml( self::SOME_HTML );
-   $this->renderer->setOutputHash( self::SOME_OUTPUTHASH);
+   $this->renderer->setOutputHash( self::SOME_OUTPUTHASH );
}
+
/**
 * Checks database access. Writes an entry and reads it back.
 * @covers MathRenderer::writeDatabaseEntry()
@@ -71,7 +73,6 @@
}
 
 
-
/**
 * Checks the creation of the math table without debugging enabled.
 * @covers MathHooks::onLoadExtensionSchemaUpdates
@@ -86,7 +87,7 @@
$this->renderer->writeToDatabase();
$res = $this->db->select( "math", "*" );
$row = $res->fetchRow();
-   $this->assertEquals( 10,  sizeof( $row ) );
+   $this->assertEquals( 10, sizeof( $row ) );
}
 
/*
@@ -100,8 +101,8 @@
$this->assertTrue( $this->renderer->writeCache(), "Write new 
entry" );
$res = $this->db->selectField( "math", "math_inputhash",
array( "math_inputhash" => $inputHash ) );
-   $this->assertTrue( $res !== false , "Check database entry");
-   $this->assertTrue( $this->renderer->readFromDatabase() , "Read 
entry from database");
+   $this->assertTrue( $res !== false, "Check database entry" );
+   $this->assertTrue( $this->renderer->readFromDatabase(), "Read 
entry from database" );
$this->assertFalse( $this->renderer->isChanged() );
// modify the database entry manually
$this->db->delete( "math", array( "math_inputhash" => 
$inputHash ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a414900c1c2d97b759ef1755e53e82c5c2e8e14
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Content is missing when clicking on 'Edit title' - change (mediawiki...Flow)

[Bsitu (Code Review)]

Bsitu has uploaded a new change for review.

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

Change subject: Content is missing when clicking on 'Edit title'
..

Content is missing when clicking on 'Edit title'

Change-Id: I425e7f1908224201783d95e1287b3713d7ebf33f
---
M modules/new/components/flow-board.js
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/modules/new/components/flow-board.js 
b/modules/new/components/flow-board.js
index 3462c7d..d533ae4 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -1233,7 +1233,9 @@
'url' : 
$link.attr( 'href' )
}
},
-   'content' : $title.data( 
'title' ),
+   'content': {
+   'content' : 
$title.data( 'title' )
+   },
'revisionId' : 
linkParams.etrevId
}
) ).children();

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

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

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

[MediaWiki-commits] [Gerrit] Allow mixing of non-JC pages in the same namespace - change (mediawiki...JsonConfig)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Allow mixing of non-JC pages in the same namespace
..

Allow mixing of non-JC pages in the same namespace

* If you set nsname=false in configs, you can now share
the namespace between JC-controlled and non-JC pages.
* Fix: 'model'=>null now works in configs
* Fix: null model automatically use default JCContent,
without requiring $wgJsonConfigModels['JsonConfig'] definition.

* This configuration might be too ugly and may need
to be changed, e.g. "allowNsSharing"=true, or possibly
do it automagically - if namespace is defined already,
share it, if not - fully own it.  TBD, and won't affect
this patch much.

Change-Id: Ia912486c693cba2b46403d42017adba26bf8a180
---
M includes/JCSingleton.php
1 file changed, 43 insertions(+), 16 deletions(-)


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

diff --git a/includes/JCSingleton.php b/includes/JCSingleton.php
index bab8365..46aa44e 100644
--- a/includes/JCSingleton.php
+++ b/includes/JCSingleton.php
@@ -26,8 +26,9 @@
static $titleMap = array();
 
/**
-* @var array containing all the namespaces handled by JsonConfig
-* Maps namespace id (int) => namespace name (string)
+* @var string[]|false[] containing all the namespaces handled by 
JsonConfig
+* Maps namespace id (int) => namespace name (string).
+* If false, presumes the namespace has been registered by core or 
another extension
 */
static $namespaces = array();
 
@@ -60,11 +61,15 @@
continue; // warned inside the function
}
 
-   $modelId = isset( $conf->model ) ? ( $conf->model ? : 
$defaultModelId ) : $confId;
-   if ( !array_key_exists( $modelId, $wgJsonConfigModels ) 
&& $modelId !== $defaultModelId ) {
-   wfLogWarning( "JsonConfig: Invalid 
\$wgJsonConfigs['$confId']: " .
- "Model '$modelId' is not defined 
in \$wgJsonConfigModels" );
-   continue;
+   $modelId = property_exists( $conf, 'model' ) ? ( 
$conf->model ? : $defaultModelId ) : $confId;
+   if ( !array_key_exists( $modelId, $wgJsonConfigModels ) 
) {
+   if ( $modelId === $defaultModelId ) {
+   $wgJsonConfigModels[$defaultModelId] = 
null;
+   } else {
+   wfLogWarning( "JsonConfig: Invalid 
\$wgJsonConfigs['$confId']: " .
+ "Model '$modelId' is not 
defined in \$wgJsonConfigModels" );
+   continue;
+   }
}
if ( array_key_exists( $modelId, $wgContentHandlers ) ) 
{
wfLogWarning( "JsonConfig: Invalid 
\$wgJsonConfigs['$confId']: Model '$modelId' is " .
@@ -93,6 +98,7 @@
self::getConfVal( $conf, 'cacheExp', 24 * 60 * 60 );
self::getConfVal( $conf, 'cacheKey', '' );
self::getConfVal( $conf, 'flaggedRevs', false );
+   $isSharedNs = false;
 
// Decide if matching configs should be stored on this 
wiki
$storeHere = $islocal || property_exists( $conf, 
'store' );
@@ -150,8 +156,14 @@
if ( $storeHere ) {
// If nsName is given, add it to the list, 
together with the talk page
// Otherwise, create a placeholder for it
-   if ( isset( $conf->nsName ) ) {
-   if ( $ns === NS_CONFIG ) {
+   if ( property_exists( $conf, 'nsName' ) ) {
+   if ( $conf->nsName === false ) {
+   // Non JC-specific namespace, 
don't register it
+   if ( !array_key_exists( $ns, 
self::$namespaces ) ) {
+   self::$namespaces[$ns] 
= false;
+   }
+   $isSharedNs = true;
+   } elseif ( $ns === NS_CONFIG ) {
wfLogWarning( "JsonConfig: 
Parameter 'nsName' in \$wgJsonConfigs['$confId'] is not " .
  'supported for 
namespace == NS_CONFIG (' . NS_CONFIG . ')' );
} else {
@@ -171,7 +183,7 @@
 

[MediaWiki-commits] [Gerrit] Remove $wgFileStore - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Remove $wgFileStore
..


Remove $wgFileStore

Change-Id: I58cf67ac1f2754a472b49b0b6d7f2b289deb2d4a
---
M RELEASE-NOTES-1.24
M includes/DefaultSettings.php
M includes/Setup.php
3 files changed, 3 insertions(+), 14 deletions(-)

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



diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index f4acc37..bdbd611 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -33,6 +33,8 @@
   of search, you should use something like CirrusSearch instead of built in
   search.
 * Users in the 'sysop' group have access to Special:MergeHistory by default.
+* $wgFileStore was removed after having been deprecated in 1.17. Alternative
+  configurations are $wgDeletedDirectory and $wgHashedUploadDirectory.
 
 === New features in 1.24 ===
 * Added a new hook, "WhatLinksHereProps", to allow extensions to annotate
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 51ebd57..96ef14f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -356,11 +356,6 @@
 $wgIllegalFileChars = ":";
 
 /**
- * @deprecated since 1.17 use $wgDeletedDirectory
- */
-$wgFileStore = array();
-
-/**
  * What directory to place deleted uploads in.
  * Defaults to "{$wgUploadDirectory}/deleted".
  */
diff --git a/includes/Setup.php b/includes/Setup.php
index 145f55a..38a16c5 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -110,10 +110,6 @@
$wgGitInfoCacheDirectory = "{$wgCacheDirectory}/gitinfo";
 }
 
-if ( isset( $wgFileStore['deleted']['directory'] ) ) {
-   $wgDeletedDirectory = $wgFileStore['deleted']['directory'];
-}
-
 if ( isset( $wgFooterIcons['copyright'] )
&& isset( $wgFooterIcons['copyright']['copyright'] )
&& $wgFooterIcons['copyright']['copyright'] === array()
@@ -173,11 +169,7 @@
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
 if ( !$wgLocalFileRepo ) {
-   if ( isset( $wgFileStore['deleted']['hash'] ) ) {
-   $deletedHashLevel = $wgFileStore['deleted']['hash'];
-   } else {
-   $deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0;
-   }
+   $deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0;
$wgLocalFileRepo = array(
'class' => 'LocalRepo',
'name' => 'local',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58cf67ac1f2754a472b49b0b6d7f2b289deb2d4a
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Withoutaname 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: devunt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] QUnit: Throw if environment has pending effects or ajax requ... - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: QUnit: Throw if environment has pending effects or ajax requests
..

QUnit: Throw if environment has pending effects or ajax requests

Change-Id: I1dba146a6795887c23c806f292c6425662ea4aad
---
M tests/qunit/data/testrunner.js
1 file changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index 50e89da..f3f884a 100644
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -240,6 +240,18 @@
// As a convenience feature, 
automatically restore warnings if they're
// still suppressed by the end of the 
test.
restoreWarnings();
+
+   // Check for (and clean up, if 
possible) incomplete animations/requests/etc.
+   if ( $.timers && $.timers.length !== 0 
) {
+   // Test may need to use fake 
timers, wait for animations or
+   // call $.fx.stop().
+   throw new Error( 'Unfinished 
animations: ' + $.timers.length );
+   }
+   if ( $.active !== undefined && $.active 
!== 0 ) {
+   // Test may need to use fake 
XHR, wait for requests or
+   // call abort().
+   throw new Error( 'Unfinished 
AJAX requests: ' + $.active );
+   }
}
};
};

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

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

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

[MediaWiki-commits] [Gerrit] (FR #1771) Always round money before handing off to Civi - change (wikimedia...crm)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: (FR #1771) Always round money before handing off to Civi
..

(FR #1771) Always round money before handing off to Civi

Change-Id: I9c3363437219a8e11d04b0f3da2036ca799af34c
TODO: look up significant decimals in CLDR
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/81/145481/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 9d45137..7991e2d 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -650,13 +650,19 @@
 throw new WmfException( 'INVALID_MESSAGE', "UNKNOWN_CURRENCY: 
'{$msg['original_currency']}': " . $ex->getMessage() );
 }
 
-// round the amounts and do exchange rate conversion
-$msg['fee'] = round( $msg['fee'] * $settlement_convert, 2 );
-$msg['gross'] = round( $msg['gross'] * $settlement_convert, 2 );
-$msg['net'] = round( $msg['net'] * $settlement_convert, 2 );
+// Do exchange rate conversion
 $msg['currency'] = $settlement_currency;
+$msg['fee'] = $msg['fee'] * $settlement_convert;
+$msg['gross'] = $msg['gross'] * $settlement_convert;
+$msg['net'] = $msg['net'] * $settlement_convert;
 }
 
+// TODO: Lookup by currency
+$significantDecimals = 2;
+$msg['fee'] = round( $msg['fee'], $significantDecimals );
+$msg['gross'] = round( $msg['gross'], $significantDecimals );
+$msg['net'] = round( $msg['net'], $significantDecimals );
+
 return $msg;
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Slightly stronger assertion during contrib amount normalization - change (wikimedia...crm)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Slightly stronger assertion during contrib amount normalization
..

Slightly stronger assertion during contrib amount normalization

Only copy original_amount/currency to gateway settled field as a
pair, never one without the other.

Change-Id: I9e4abae01a75145147737ac8c0022403b1ce4937
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/82/145482/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 7991e2d..df76316 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -622,11 +622,9 @@
 return $msg;
 }
 
-if ( empty( $msg['original_gross'] ) ) {
-$msg['original_gross'] = $msg['gross'];
-}
-if ( empty( $msg['original_currency'] ) ) {
+if ( empty( $msg['original_currency'] ) && empty( $msg['original_gross'] ) 
) {
 $msg['original_currency'] = $msg['currency'];
+$msg['original_gross'] = $msg['gross'];
 }
 
 if ( !array_key_exists('fee', $msg) && !array_key_exists('net', $msg) ) {

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

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

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

[MediaWiki-commits] [Gerrit] Logging; whitespace - change (wikimedia...crm)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Logging; whitespace
..

Logging; whitespace

Change-Id: I5f3b1ef0c9356134f37b4bb5f063495ecfbd9dd2
---
M sites/all/modules/queue2civicrm/recurring/recurring.module
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 11 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/80/145480/1

diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module 
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index fe64484..42806a3 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -493,7 +493,7 @@
 
   //Seeing as we're in the recurring module...
   $msg[ 'recurring' ] = true;
-  
+
   $msg = wmf_civicrm_normalize_msg( $msg );
   return $msg;
 }
@@ -516,7 +516,6 @@
 
   $timestamp = ( !isset( $msg[ 'payment_date' ] ) || !strlen( $msg[ 
'payment_date' ] )) ? strtotime( "now" ) : strtotime( $msg[ 'payment_date' ] );
 
-  
   // the subscription id
   $msg_normalized[ 'subscr_id' ] = $msg[ 'subscr_id' ];
   $msg_normalized[ 'txn_type' ] = $msg[ 'txn_type' ];
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 95c781b..9d45137 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -62,6 +62,7 @@
 /**
  * Determines the settlement currency for a given donation.
  * Argument is a queue message or a civicrm contribution array.
+ * TODO: implement hook to determine our actual settlement currency.
  */
 function wmf_civicrm_get_settlement_currency($transaction)
 {
@@ -616,6 +617,8 @@
 and ( empty( $msg['original_gross'] ) or empty( 
$msg['original_currency'] ) )
 ) {
 // just... don't
+watchdog( 'wmf_civicrm', 'Not freaking out about non-monetary message.'
+NULL, WATCHDOG_INFO );
 return $msg;
 }
 
@@ -637,6 +640,9 @@
 
 $settlement_currency = wmf_civicrm_get_settlement_currency($msg);
 if ( $msg['currency'] !== $settlement_currency ) {
+watchdog( 'wmf_civicrm', 'Converting to settlement currency: %old -> 
%new',
+array( '%old' => $msg['currency'], '%new' => $settlement_currency 
),
+WATCHDOG_INFO );
 try {
 $settlement_convert = 
exchange_rate_convert($msg['original_currency'], 1, $msg['date']) / 
exchange_rate_convert($settlement_currency, 1, $msg['date']);
 }
@@ -1050,7 +1056,10 @@
 //if they don't exist (even if they're blank).
 // FIXME: don't use defaults.  Access msg properties using a functional 
interface.
 $defaults = array(
-'date' => time(), //defaulting to now. @fixme: if you can think of a 
better thing to do in the name of historical exchange rates.
+// FIXME: Default to now. If you can think of a better thing to do in
+// the name of historical exchange rates.  Searching ts and
+// source_enqueued_time is a good start.
+'date' => time(),
 'first_name' => '',
 'middle_name' => '',
 'last_name' => '',

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

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

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

[MediaWiki-commits] [Gerrit] Fix spurious QUnit failures related to fake timers - change (mediawiki/core)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Fix spurious QUnit failures related to fake timers
..

Fix spurious QUnit failures related to fake timers

There were two root issues:

* jQuery uses a setInterval to run part of the effects queue.  The ID
  from this was not being cleared between modules.  Thus, even though
  setInterval itself switched to the fake timer implementation, the
  new (fake) setInterval was non-deterministically not called.

  That meant that the callback would not be called sychronously when
  Sinon's tick was called, but only later and asynchronously
  (resulting in "Expected 1 assertions, but 0 were run").

  This is fixed by calling $.fx.stop() to force jQuery to call clearInterval
  and discard its timerId.  It will call the fake setInterval when/if
  it needs to add something to the effects queue during a fake timer
  test.

* Animations could get a stale startTime (due to cached fxNow).
  Due to a large (real-time) startTime, a small duration, and a small
  (fake) currentTime:

  remaining Math.max( 0, animation.startTime + animation.duration - currentTime 
)

  would indicate a remaining animation time far in the future
  (essentially, it would never terminate).

  This is fixed by starting the fake timers at the current time when
  animation is used, so a past (cached) fxNow is still in the past.

Bug: 63579
Change-Id: Ibada489a582958f8c04d348825ce4eb49cfa59a6
---
M tests/qunit/data/testrunner.js
M tests/qunit/suites/resources/jquery/jquery.color.test.js
M tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
3 files changed, 19 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/145479/1

diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index 50e89da..d2082b1 100644
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -104,6 +104,23 @@
teardown: function () {
this.sandbox.verifyAndRestore();
 
+   // Tells jQuery to clearInterval on the 
interval it uses for
+   // effects.
+   //
+   // This is necessary to ensure the next 
module calls the
+   // correct setInterval, which may be 
sinonjs's fake one,
+   // rather than wrongly relying on a 
stale timerId.
+   //
+   // This is done unconditionally 
(regardless of whether the
+   // current module uses fake timers).
+   //
+   // This means the effects queue will 
not progress
+   // unless/until jQuery.fx.start happens 
to be called again
+   // The test is being torn down, so any 
further actions in
+   // the effects queue will not affect 
the test results for
+   // this test.
+   $.fx.stop();
+
if ( localEnv.teardown ) {
localEnv.teardown.call( this );
}
diff --git a/tests/qunit/suites/resources/jquery/jquery.color.test.js 
b/tests/qunit/suites/resources/jquery/jquery.color.test.js
index c8e8ac7..59a7242 100644
--- a/tests/qunit/suites/resources/jquery/jquery.color.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.color.test.js
@@ -1,7 +1,7 @@
 ( function ( $ ) {
QUnit.module( 'jquery.color', QUnit.newMwEnvironment( {
setup: function () {
-   this.clock = this.sandbox.useFakeTimers();
+   this.clock = this.sandbox.useFakeTimers( +new Date() );
}
} ) );
 
diff --git a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js 
b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
index 8040581..a3ee51f 100644
--- a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
@@ -3,7 +3,7 @@
 
QUnit.module( 'jquery.makeCollapsible', QUnit.newMwEnvironment( {
setup: function () {
-   this.clock = this.sandbox.useFakeTimers();
+   this.clock = this.sandbox.useFakeTimers( +new Date() );
}
} ) );
 

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

Gerrit-MessageTyp

[MediaWiki-commits] [Gerrit] beta: apply mediawiki::jobrunner on jobrunners - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: beta: apply mediawiki::jobrunner on jobrunners
..

beta: apply mediawiki::jobrunner on jobrunners

Will cause the jobrunners in deployment-prep to apply the new jobrunner class.

Change-Id: I459cb389a169d9a868ec52c62d01a2e418679190
---
M manifests/role/beta.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/145478/1

diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index 1afb87a..cbe516d 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -136,5 +136,6 @@
 
 class role::beta::jobrunner {
 include role::beta::scap_target
-include role::mediawiki::jobrunner
+include role::mediawiki::common
+include ::mediawiki::jobrunner
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I459cb389a169d9a868ec52c62d01a2e418679190
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Add subcommand to easily import a wiki dump - change (mediawiki/vagrant)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Add subcommand to easily import a wiki dump
..

Add subcommand to easily import a wiki dump

Drop the dump into your vagrant root, then run
  `vagrant import-dump `

Change-Id: I86ff70898512be98ebd99dbfbf180f98f09cf5c0
---
M lib/mediawiki-vagrant.rb
A lib/mediawiki-vagrant/import-dump.rb
A puppet/modules/mediawiki/files/import-mediawiki-dump
M puppet/modules/mediawiki/manifests/init.pp
4 files changed, 26 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/77/145477/1

diff --git a/lib/mediawiki-vagrant.rb b/lib/mediawiki-vagrant.rb
index 138ca6f..7092a0c 100644
--- a/lib/mediawiki-vagrant.rb
+++ b/lib/mediawiki-vagrant.rb
@@ -37,6 +37,11 @@
 DisableRole
 end
 
+command 'import-dump' do
+require 'mediawiki-vagrant/import-dump'
+ImportDump
+end
+
 action_hook(self::ALL_ACTIONS) do |hook|
 require 'mediawiki-vagrant/middleware'
 hook.before(Vagrant::Action::Builtin::Provision, Middleware)
diff --git a/lib/mediawiki-vagrant/import-dump.rb 
b/lib/mediawiki-vagrant/import-dump.rb
new file mode 100644
index 000..cac73b9
--- /dev/null
+++ b/lib/mediawiki-vagrant/import-dump.rb
@@ -0,0 +1,12 @@
+class ImportDump < Vagrant.plugin(2, :command)
+def execute
+if ['-h', '--help'].include? @argv.first
+@env.ui.info "Usage: vagrant run-tests dumpfile.xml [-h]"
+return 0
+end
+opts = { extra_args: @argv.unshift('import-mediawiki-dump') }
+with_target_vms(nil, :single_target => true) do |vm|
+vm.action :ssh, ssh_opts: opts
+end
+end
+end
diff --git a/puppet/modules/mediawiki/files/import-mediawiki-dump 
b/puppet/modules/mediawiki/files/import-mediawiki-dump
new file mode 100644
index 000..ec01ea3
--- /dev/null
+++ b/puppet/modules/mediawiki/files/import-mediawiki-dump
@@ -0,0 +1,4 @@
+#!/bin/bash
+. /etc/profile.d/set_MW_INSTALL_PATH.sh
+cd "$MW_INSTALL_PATH"
+php maintenance/importDump.php "/vagrant/$1"
diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 1cc67c4..92b014f 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -147,6 +147,11 @@
 mode=> '0755',
 }
 
+file { '/usr/local/bin/import-mediawiki-dump':
+source  => 'puppet:///modules/mediawiki/import-mediawiki-dump',
+mode=> '0755',
+}
+
 exec { 'update database':
 command => "/usr/bin/php ${dir}/maintenance/update.php --quick",
 refreshonly => true,

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

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

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

[MediaWiki-commits] [Gerrit] Temporary fix for LocalSettings being continuously overwritten - change (mediawiki/vagrant)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Temporary fix for LocalSettings being continuously overwritten
..

Temporary fix for LocalSettings being continuously overwritten

If HHVM is broken (bug 67831), chain reaction causes LocalSettings.php
to be regenerated on every puppet run.

Change-Id: Icbfce2a5f8a7feb0f5aeda7451314bf6e2fb9183
---
M puppet/modules/mediawiki/manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/76/145476/1

diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 1cc67c4..4dd7b2a 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -90,7 +90,8 @@
 command => "rm -f ${dir}/LocalSettings.php",
 notify  => Exec['mediawiki setup'],
 require => [ Package['php5'], Git::Clone['mediawiki/core'], 
Service['mysql'] ],
-unless  => "/usr/bin/php ${dir}/maintenance/sql.php  "/usr/bin/php5 ${dir}/maintenance/sql.php https://gerrit.wikimedia.org/r/145476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] Add CSS to make approved rev more visible - change (mediawiki...ApprovedRevs)

[Jamesmontalvo3 (Code Review)]

Jamesmontalvo3 has uploaded a new change for review.

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

Change subject: Add CSS to make approved rev more visible
..

Add CSS to make approved rev more visible

Also includes CSS for pending v1.0 patch.

Change-Id: I39f9ec08f7406c13c2713ff557d4273dfb594c1b
---
M ApprovedRevs.css
1 file changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs 
refs/changes/75/145475/1

diff --git a/ApprovedRevs.css b/ApprovedRevs.css
index 630740d..6d16795 100644
--- a/ApprovedRevs.css
+++ b/ApprovedRevs.css
@@ -13,3 +13,24 @@
 span.approvedRevNotLatest {
font-style: italic;
 }
+.approved-revision {
+   background-color: #dfd !important;
+}
+li.approved-revision {
+   border-color: green !important;
+}
+tr.approved-revision td {
+   border-top: solid green 2px !important;
+   border-bottom: solid green 2px !important;
+}
+tr.approved-revision td:first-child {
+   border-left: solid green 2px !important;
+}
+tr.approved-revision td:last-child {
+   border-right: solid green 2px !important;
+}
+.specialapprovedrevs-header{
+   background-color:#ddd;
+   border:solid #aaa 1px;
+   padding: 3px 8px;
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39f9ec08f7406c13c2713ff557d4273dfb594c1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Jamesmontalvo3 

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

[MediaWiki-commits] [Gerrit] Provide way for users to find articles with the automatic

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Provide way for users to find articles with the automatic 

..

Provide way for users to find articles with the automatic 

By adding a tracking category

Bug: 67700
Change-Id: I62584de085ae7a849a099e127bd950692a0dff8a
---
M Cite_body.php
M i18n/core/en.json
M i18n/core/qqq.json
3 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite 
refs/changes/74/145474/1

diff --git a/Cite_body.php b/Cite_body.php
index f88919f..778e583 100644
--- a/Cite_body.php
+++ b/Cite_body.php
@@ -1069,6 +1069,7 @@
}
if ( $group == CITE_DEFAULT_GROUP ) {
$text .= $this->referencesFormat( $group, '', 
'' );
+   $parser->addTrackingCategory( 
'cite_error_refs_without_references_category' );
} else {
$text .= "\n" . $this->error( 
'cite_error_group_refs_without_references', htmlspecialchars( $group ) );
}
diff --git a/i18n/core/en.json b/i18n/core/en.json
index c5aa5be..b8f950c 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -36,5 +36,6 @@
 "cite_references_link_accessibility_label": "Jump up",
 "cite_references_link_many_accessibility_label": "Jump up to:",
 "cite_references_prefix": "",
-"cite_references_suffix": ""
+"cite_references_suffix": "",
+"cite_error_refs_without_references_category": "-"
 }
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index 79464bb..d1f63da 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -50,5 +50,6 @@
"cite_references_link_accessibility_label": "Text for screen readers to 
describe the jump to citation link (\"↑\").\n\nSee also:\n* {{msg-mw|Cite 
references link many accessibility label}} - if the citation is used multiple 
times",
"cite_references_link_many_accessibility_label": "Text for screen 
readers to describe the jump to citation links (a b c ...) for citations which 
are used in multiple places.\n\nThis is going to be prepended to the first 
link, the following ones will just be read by screen readers as they are 
visible.\n\nSee also:\n* {{msg-mw|Cite references link accessibility label}} - 
if the citation is used one time",
"cite_references_prefix": "{{notranslate}}",
-   "cite_references_suffix": "{{notranslate}}"
+   "cite_references_suffix": "{{notranslate}}",
+   "cite_error_refs_without_references_category": "Name of 
[[mw:Special:MyLanguage/Help:Tracking categories|tracking category]] where 
pages that have s but not  are listed.",
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62584de085ae7a849a099e127bd950692a0dff8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Use new UserResetAllOptions hook for new users - change (mediawiki...Echo)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Use new UserResetAllOptions hook for new users
..

Use new UserResetAllOptions hook for new users

So they can keep their different default options

Bug: 47895
Change-Id: I305a3ea58e81f46ec20de262dc7793d393134bb2
---
M Echo.php
M Hooks.php
2 files changed, 29 insertions(+), 6 deletions(-)


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

diff --git a/Echo.php b/Echo.php
index 2568095..b6d737b 100644
--- a/Echo.php
+++ b/Echo.php
@@ -131,6 +131,7 @@
 $wgHooks['UserRights'][] = 'EchoHooks::onUserRights';
 $wgHooks['UserLoadOptions'][] = 'EchoHooks::onUserLoadOptions';
 $wgHooks['UserSaveOptions'][] = 'EchoHooks::onUserSaveOptions';
+$wgHooks['UserResetAllOptions'][] = 'EchoHooks::onUserResetAllOptions';
 $wgHooks['UserClearNewTalkNotification'][] = 
'EchoHooks::onUserClearNewTalkNotification';
 $wgHooks['ParserTestTables'][] = 'EchoHooks::onParserTestTables';
 
@@ -551,6 +552,17 @@
 $wgDefaultUserOptions['echo-subscriptions-email-user-rights'] = true;
 $wgDefaultUserOptions['echo-subscriptions-web-article-linked'] = false;
 
+/**
+ * Defaults that should be applied to new users
+ */
+$wgEchoDefaultNewUserOptions = array(
+   'echo-subscriptions-web-reverted' => false,
+   'echo-subscriptions-email-reverted' => false,
+   'echo-subscriptions-web-article-linked' => true,
+   'echo-subscriptions-email-mention' => true,
+   'echo-subscriptions-email-article-linked' => true,
+);
+
 // Echo Configuration for EventLogging
 $wgEchoConfig = array(
'version' => '1.5',
diff --git a/Hooks.php b/Hooks.php
index 68ab9e8..21f2e0e 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -522,14 +522,15 @@
 * @return bool
 */
public static function onAccountCreated( $user, $byEmail ) {
+   global $wgEchoDefaultNewUserOptions;
 
// new users get echo preferences set that are not the default 
settings for existing users
-   $user->setOption( 'echo-subscriptions-web-reverted', false );
-   $user->setOption( 'echo-subscriptions-email-reverted', false );
-   $user->setOption( 'echo-subscriptions-web-article-linked', true 
);
-   $user->setOption( 'echo-subscriptions-email-mention', true );
-   $user->setOption( 'echo-subscriptions-email-article-linked', 
true );
-   $user->saveSettings();
+   if ( $wgEchoDefaultNewUserOptions ) {
+   foreach ( $wgEchoDefaultNewUserOptions as $opt => $val 
) {
+   $user->setOption( $opt, $val );
+   }
+   $user->saveSettings();
+   }
 
EchoEvent::create( array(
'type' => 'welcome',
@@ -539,6 +540,16 @@
return true;
}
 
+   public static function onUserResetAllOptions( User $user, &$newOptions, 
$oldOptions, $resetKinds ) {
+   global $wgEchoDefaultNewUserOptions;
+
+   if ( $user->getRegistration() > "20140710230941" ) {
+   $newOptions = array_merge( $newOptions, 
$wgEchoDefaultNewUserOptions );
+   }
+
+   return true;
+   }
+
/**
 * Handler for UserRights hook.
 * @see http://www.mediawiki.org/wiki/Manual:Hooks/UserRights

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

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

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

[MediaWiki-commits] [Gerrit] turn icinga into module pt1. separate classes - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: turn icinga into module pt1. separate classes
..

turn icinga into module pt1. separate classes

for Yuvi :)

turn icinga into module. this will require more work.

but the very first step is to separate
the classes from one huge misc/file into separate .pp
files

i wonder why we already had an empty /modules/icinga/

WIP ...won't work yet at all

Change-Id: Ic52822905fbc97d8ece301589b0f64fb0f0f3e55
---
A modules/icinga/manifests/apache.pp
A modules/icinga/manifests/check.pp
A modules/icinga/manifests/checkpaging.pp
A modules/icinga/manifests/configfiles.pp
A modules/icinga/manifests/configvariables.pp
A modules/icinga/manifests/firewall.pp
A modules/icinga/manifests/ganglios.pp
A modules/icinga/manifests/init.pp
A modules/icinga/manifests/logrotate.pp
A modules/icinga/manifests/miscfiles.pp
A modules/icinga/manifests/monitor.pp
A modules/icinga/manifests/monitorservice.pp
A modules/icinga/manifests/naggen.pp
A modules/icinga/manifests/nsca.pp
A modules/icinga/manifests/nsca_daemon.pp
A modules/icinga/manifests/packages.pp
A modules/icinga/manifests/plugins.pp
A modules/icinga/manifests/snmp.pp
A modules/icinga/manifests/user.pp
19 files changed, 911 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/145472/1

diff --git a/modules/icinga/manifests/apache.pp 
b/modules/icinga/manifests/apache.pp
new file mode 100644
index 000..675ee0e
--- /dev/null
+++ b/modules/icinga/manifests/apache.pp
@@ -0,0 +1,46 @@
+
+class icinga::monitor::apache {
+class {'webserver::php5': ssl => true,}
+ferm::service { 'icinga-https':
+  proto => 'tcp',
+  port  => 443,
+}
+ferm::service { 'icinga-http':
+  proto => 'tcp',
+  port  => 80,
+}
+
+include webserver::php5-gd
+
+include passwords::ldap::wmf_cluster
+$proxypass = $passwords::ldap::wmf_cluster::proxypass
+
+file { '/usr/share/icinga/htdocs/images/logos/ubuntu.png':
+source => 'puppet:///files/icinga/ubuntu.png',
+owner  => 'root',
+group  => 'root',
+mode   => '0644',
+}
+
+# install the Icinga Apache site
+file { '/etc/apache2/sites-enabled/icinga.wikimedia.org':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template('apache/sites/icinga.wikimedia.org.erb'),
+}
+
+# remove icinga default config
+file { '/etc/icinga/apache2.conf':
+ensure => absent,
+}
+file { '/etc/apache2/conf.d/icinga.conf':
+ensure => absent,
+}
+
+install_certificate{ 'icinga.wikimedia.org': ca => 'RapidSSL_CA.pem' }
+install_certificate{ 'icinga-admin.wikimedia.org': ca => 'RapidSSL_CA.pem' 
}
+
+}
+
diff --git a/modules/icinga/manifests/check.pp 
b/modules/icinga/manifests/check.pp
new file mode 100644
index 000..4d5007b
--- /dev/null
+++ b/modules/icinga/manifests/check.pp
@@ -0,0 +1,23 @@
+
+# == Class icinga::ganglia::check
+#
+# Installs check_ganglia package and sets up symlink into
+# /usr/lib/nagios/plugins.
+#
+# check_ganglia allows arbitrary values to be queried from ganglia and checked
+# for nagios/icinga.  This is better than ganglios, as it queries gmetad's xml
+# query interfaces directly, rather than downloading and mangling xmlfiles from
+# each aggregator.
+#
+class icinga::ganglia::check {
+package { 'check-ganglia':
+ensure  => 'installed',
+}
+
+file { '/usr/lib/nagios/plugins/check_ganglia':
+ensure  => 'link',
+target  => '/usr/bin/check_ganglia',
+require => Package['check-ganglia'],
+}
+}
+
diff --git a/modules/icinga/manifests/checkpaging.pp 
b/modules/icinga/manifests/checkpaging.pp
new file mode 100644
index 000..66f586a
--- /dev/null
+++ b/modules/icinga/manifests/checkpaging.pp
@@ -0,0 +1,22 @@
+
+class icinga::monitor::checkpaging {
+
+require icinga::monitor::packages
+
+file {'/usr/lib/nagios/plugins/check_to_check_nagios_paging':
+source => 'puppet:///files/icinga/check_to_check_nagios_paging',
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
+monitor_service { 'check_to_check_nagios_paging':
+description   => 'check_to_check_nagios_paging',
+check_command => 'check_to_check_nagios_paging',
+normal_check_interval => 1,
+retry_check_interval  => 1,
+contact_group => 'pager_testing',
+critical  => false
+}
+}
+
diff --git a/modules/icinga/manifests/configfiles.pp 
b/modules/icinga/manifests/configfiles.pp
new file mode 100644
index 000..c9cadea
--- /dev/null
+++ b/modules/icinga/manifests/configfiles.pp
@@ -0,0 +1,92 @@
+
+class icinga::monitor::configuration::files {
+
+# For all files dealing with 

[MediaWiki-commits] [Gerrit] Clean up css selectors for moderated titles - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Clean up css selectors for moderated titles
..


Clean up css selectors for moderated titles

flow-moderated-topic-title is no longer an h2
Move to titlebar.less since these appear in the title bar
of a topic

Change-Id: I1cd5b745e3db1e90fc4026578b220f70b798029d
---
M modules/new/styles/board/topic/titlebar.less
M modules/new/styles/common.less
2 files changed, 19 insertions(+), 28 deletions(-)

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



diff --git a/modules/new/styles/board/topic/titlebar.less 
b/modules/new/styles/board/topic/titlebar.less
index c08330a..d86c3ee 100644
--- a/modules/new/styles/board/topic/titlebar.less
+++ b/modules/new/styles/board/topic/titlebar.less
@@ -28,6 +28,25 @@
}
 }
 
+.flow-moderated-topic-title,
+// Override default Vector styles
+div#content h2.flow-topic-title {
+   padding: 0;
+   margin: 0 0 .33em;
+   border-bottom: none;
+   font-family: sans-serif;
+   font-weight: bold;
+   word-break: break-word;
+   word-wrap: break-word;
+   overflow: visible;
+}
+
+// Override default Vector heading styles
+div#content h2.flow-topic-title {
+   font-size: 1.75em;
+}
+
+
 // MEDIA QUERIES
 @media (max-width: 700px) and (min-device-width: 700px), (max-device-width: 
700px) {
.flow-topic-titlebar {
diff --git a/modules/new/styles/common.less b/modules/new/styles/common.less
index 8f788df..547bf45 100644
--- a/modules/new/styles/common.less
+++ b/modules/new/styles/common.less
@@ -45,34 +45,6 @@
padding: 1.5em 0;
 }
 
-// Topic title itself
-// Needs additional specificity to override `div#content h2`
-div#bodyContent {
-   // FIXME: are h2's needed?
-   h2.flow-topic-title,
-   h2.flow-moderated-topic-title,
-   .flow-moderated-topic-title,
-   .flow-topic-title {
-   padding: 0;
-   margin: 0 0 .33em;
-   border-bottom: none;
-   font-family: sans-serif;
-   font-weight: bold;
-   word-break: break-word;
-   word-wrap: break-word;
-   overflow: visible;
-   }
-
-   .flow-moderated-topic-title {
-   font-size: 1em;
-   }
-
-   h2.flow-topic-title,
-   .flow-topic-title {
-   font-size: 1.75em;
-   }
-}
-
 // Revision view
 .flow-revision-content {
background: none repeat scroll 0 0 #EDEDED;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cd5b745e3db1e90fc4026578b220f70b798029d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: SG 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WIP: Hide load more button with JavaScript when infinite scr... - change (mediawiki...Flow)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: WIP: Hide load more button with JavaScript when infinite scroll 
supports
..

WIP: Hide load more button with JavaScript when infinite scroll supports

This seems to kill the load more functionality..

Change-Id: I29e90edd96ee040922f89ce1ec0baf29a02ad0d5
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_load_more.handlebars
M modules/new/styles/js.less
3 files changed, 17 insertions(+), 2 deletions(-)


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

diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php 
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 72590a8..fc750c4 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -394,7 +394,7 @@

 
'.((LCRun3::ifvar($cx, ((is_array($in['links']['pagination']) && 
isset($in['links']['pagination']['fwd'])) ? $in['links']['pagination']['fwd'] : 
null))) ? '
-   
+   



diff --git a/handlebars/flow_load_more.handlebars 
b/handlebars/flow_load_more.handlebars
index 5fa4759..c3d6475 100644
--- a/handlebars/flow_load_more.handlebars
+++ b/handlebars/flow_load_more.handlebars
@@ -1,5 +1,5 @@
 {{#if links.pagination.fwd}}
-   
+   

{{!-- placeholder for javascript injected errors --}}

diff --git a/modules/new/styles/js.less b/modules/new/styles/js.less
index 6950e9f..354e163 100644
--- a/modules/new/styles/js.less
+++ b/modules/new/styles/js.less
@@ -4,6 +4,21 @@
 
 // @todo: Find better home for this css
 .client-js {
+
+   /*
+   Fallback elements
+
+   Fallback elements are invisible when JavaScript is enabled. They only 
exist when JavaScript does not run.
+
+   Markup:
+   
+
+   Styleguide X.
+   */
+   .flow-ui-fallback-element {
+   display: none;
+   }
+
// API interaction indicator
.flow-api-inprogress {
opacity: 0.5;

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Include missing less file - change (mediawiki...Flow)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Include missing less file
..

Hygiene: Include missing less file

Lost in refactor.

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


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

diff --git a/Resources.php b/Resources.php
index 1e3706e..f87ab63 100644
--- a/Resources.php
+++ b/Resources.php
@@ -187,6 +187,7 @@
'new/styles/board/moderated.less',
'new/styles/board/timestamps.less',
'new/styles/board/replycount.less',
+   'new/styles/js.less',
),
),
'ext.flow.board.topic.styles' => $flowResourceTemplate + array(

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

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

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

[MediaWiki-commits] [Gerrit] perms fix for file_mover? - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: perms fix for file_mover?
..

perms fix for file_mover?

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/145471/1

diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index fc6c048..9770b0c 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -411,14 +411,14 @@
 ensure => directory,
 owner => 'file_mover',
 group => 'file_mover',
-mode => '0775',
+mode => '0755',
 }
 
 file { '/var/lib/file_mover/.ssh':
 ensure => directory,
 owner => 'file_mover',
 group => 'file_mover',
-mode => '0550',
+mode => '0700',
 }
 
 ssh_authorized_key {

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

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

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

[MediaWiki-commits] [Gerrit] perms fix for file_mover? - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: perms fix for file_mover?
..


perms fix for file_mover?

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

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



diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index fc6c048..9770b0c 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -411,14 +411,14 @@
 ensure => directory,
 owner => 'file_mover',
 group => 'file_mover',
-mode => '0775',
+mode => '0755',
 }
 
 file { '/var/lib/file_mover/.ssh':
 ensure => directory,
 owner => 'file_mover',
 group => 'file_mover',
-mode => '0550',
+mode => '0700',
 }
 
 ssh_authorized_key {

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

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

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

[MediaWiki-commits] [Gerrit] fix file_mover .ssh dir - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: fix file_mover .ssh dir
..


fix file_mover .ssh dir

Change-Id: I819ebae96366c532a71a158f0aafec2716888775
---
M manifests/role/logging.pp
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index cde9496..fc6c048 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -414,11 +414,19 @@
 mode => '0775',
 }
 
+file { '/var/lib/file_mover/.ssh':
+ensure => directory,
+owner => 'file_mover',
+group => 'file_mover',
+mode => '0550',
+}
+
 ssh_authorized_key {
 "file_mover":
 ensure => present,
 user   => 'file_mover',
 type   => 'ssh-rsa',
 key=> 
'B3NzaC1yc2EBIwAAAQEA7c29cQHB7hbBwvp1aAqnzkfjJpkpiLo3gwpv73DAZ2FVhDR4PBCoksA4GvUwoG8s7tVn2Xahj4p/jRF67XLudceY92xUTjisSHWYrqCqHrrlcbBFjhqAul09Zwi4rojckTyreABBywq76eVj5yWIenJ6p/gV+vmRRNY3iJjWkddmWbwhfWag53M/gCv05iceKK8E7DjMWGznWFa1Q8IUvfI3kq1XC4EY6REL53U3SkRaCW/HFU0raalJEwNZPoGUaT7RZQsaKI6ec8i2EqTmDwqiN4oq/LDmnCxrO9vMknBSOJG2gCBoA/DngU276zYLg2wsElTPumN8/jVjTnjgtw==',
+require => File['/var/lib/file_mover/.ssh'],
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Redesign main page to employ sidebar - change (wikimedia...dash)

[Ssmith (Code Review)]

Ssmith has uploaded a new change for review.

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

Change subject: Redesign main page to employ sidebar
..

Redesign main page to employ sidebar

Replaces top nav. Experimenting with the look of collapsibility. WIP

Change-Id: I7e2a5cccb9986fc24df4d2c8f24d5b36ba3946e9
---
A npm-debug.log
M public/css/style.css
A public/javascripts/vendor/fontawesome/.bower.json
A public/javascripts/vendor/fontawesome/.gitignore
A public/javascripts/vendor/fontawesome/.npmignore
A public/javascripts/vendor/fontawesome/css/font-awesome.css
A public/javascripts/vendor/fontawesome/css/font-awesome.min.css
A public/javascripts/vendor/fontawesome/fonts/FontAwesome.otf
A public/javascripts/vendor/fontawesome/fonts/fontawesome-webfont.eot
A public/javascripts/vendor/fontawesome/fonts/fontawesome-webfont.svg
A public/javascripts/vendor/fontawesome/fonts/fontawesome-webfont.ttf
A public/javascripts/vendor/fontawesome/fonts/fontawesome-webfont.woff
A public/javascripts/vendor/fontawesome/less/bordered-pulled.less
A public/javascripts/vendor/fontawesome/less/core.less
A public/javascripts/vendor/fontawesome/less/extras.less
A public/javascripts/vendor/fontawesome/less/fixed-width.less
A public/javascripts/vendor/fontawesome/less/font-awesome.less
A public/javascripts/vendor/fontawesome/less/icons.less
A public/javascripts/vendor/fontawesome/less/larger.less
A public/javascripts/vendor/fontawesome/less/list.less
A public/javascripts/vendor/fontawesome/less/mixins.less
A public/javascripts/vendor/fontawesome/less/path.less
A public/javascripts/vendor/fontawesome/less/rotated-flipped.less
A public/javascripts/vendor/fontawesome/less/spinning.less
A public/javascripts/vendor/fontawesome/less/stacked.less
A public/javascripts/vendor/fontawesome/less/variables.less
A public/javascripts/vendor/fontawesome/scss/_bordered-pulled.scss
A public/javascripts/vendor/fontawesome/scss/_core.scss
A public/javascripts/vendor/fontawesome/scss/_extras.scss
A public/javascripts/vendor/fontawesome/scss/_fixed-width.scss
A public/javascripts/vendor/fontawesome/scss/_icons.scss
A public/javascripts/vendor/fontawesome/scss/_larger.scss
A public/javascripts/vendor/fontawesome/scss/_list.scss
A public/javascripts/vendor/fontawesome/scss/_mixins.scss
A public/javascripts/vendor/fontawesome/scss/_path.scss
A public/javascripts/vendor/fontawesome/scss/_rotated-flipped.scss
A public/javascripts/vendor/fontawesome/scss/_spinning.scss
A public/javascripts/vendor/fontawesome/scss/_stacked.scss
A public/javascripts/vendor/fontawesome/scss/_variables.scss
A public/javascripts/vendor/fontawesome/scss/font-awesome.scss
M public/views/nav.js
M public/views/templates/index.jade
M public/views/templates/library.html
M public/views/templates/mainNav.html
M public/views/templates/welcome.html
45 files changed, 4,909 insertions(+), 153 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash 
refs/changes/68/145468/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e2a5cccb9986fc24df4d2c8f24d5b36ba3946e9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith 

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

[MediaWiki-commits] [Gerrit] fix file_mover .ssh dir - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: fix file_mover .ssh dir
..

fix file_mover .ssh dir

Change-Id: I819ebae96366c532a71a158f0aafec2716888775
---
M manifests/role/logging.pp
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/145467/1

diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index cde9496..fc6c048 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -414,11 +414,19 @@
 mode => '0775',
 }
 
+file { '/var/lib/file_mover/.ssh':
+ensure => directory,
+owner => 'file_mover',
+group => 'file_mover',
+mode => '0550',
+}
+
 ssh_authorized_key {
 "file_mover":
 ensure => present,
 user   => 'file_mover',
 type   => 'ssh-rsa',
 key=> 
'B3NzaC1yc2EBIwAAAQEA7c29cQHB7hbBwvp1aAqnzkfjJpkpiLo3gwpv73DAZ2FVhDR4PBCoksA4GvUwoG8s7tVn2Xahj4p/jRF67XLudceY92xUTjisSHWYrqCqHrrlcbBFjhqAul09Zwi4rojckTyreABBywq76eVj5yWIenJ6p/gV+vmRRNY3iJjWkddmWbwhfWag53M/gCv05iceKK8E7DjMWGznWFa1Q8IUvfI3kq1XC4EY6REL53U3SkRaCW/HFU0raalJEwNZPoGUaT7RZQsaKI6ec8i2EqTmDwqiN4oq/LDmnCxrO9vMknBSOJG2gCBoA/DngU276zYLg2wsElTPumN8/jVjTnjgtw==',
+require => File['/var/lib/file_mover/.ssh'],
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Add explicit homedirs for file_mover + pybal-check - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Add explicit homedirs for file_mover + pybal-check
..


Add explicit homedirs for file_mover + pybal-check

Puppet's user => managehome is mostly a broken feature;
it only creates a home directory when it's creating
the actual user from scratch.  It never checks/creates the
homedir if the user already exists (this has caused us
related puppet execution failures in these two cases).

Change-Id: I06ea68359fbbdc1d889074b20d17a272ff906d57
---
M manifests/role/logging.pp
M modules/mediawiki/manifests/users.pp
2 files changed, 15 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index f03ad64..cde9496 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -407,11 +407,18 @@
 system => true,
 }
 
+file { '/var/lib/file_mover':
+ensure => directory,
+owner => 'file_mover',
+group => 'file_mover',
+mode => '0775',
+}
+
 ssh_authorized_key {
 "file_mover":
 ensure => present,
 user   => 'file_mover',
 type   => 'ssh-rsa',
-key=> 
'B3NzaC1yc2EBIwAAAQEA7c29cQHB7hbBwvp1aAqnzkfjJpkpiLo3gwpv73DAZ2FVhDR4PBCoksA4GvUwoG8s7tVn2Xahj4p/jRF67XLudceY92xUTjisSHWYrqCqHrrlcbBFjhqAul09Zwi4rojckTyreABBywq76eVj5yWIenJ6p/gV+vmRRNY3iJjWkddmWbwhfWag53M/gCv05iceKK8E7DjMWGznWFa1Q8IUvfI3kq1XC4EY6REL53U3SkRaCW/HFU0raalJEwNZPoGUaT7RZQsaKI6ec8i2EqTmDwqiN4oq/LDmnCxrO9vMknBSOJG2gCBoA/DngU276zYLg2wsElTPumN8/jVjTnjgtw==',
+key=> 
'B3NzaC1yc2EBIwAAAQEA7c29cQHB7hbBwvp1aAqnzkfjJpkpiLo3gwpv73DAZ2FVhDR4PBCoksA4GvUwoG8s7tVn2Xahj4p/jRF67XLudceY92xUTjisSHWYrqCqHrrlcbBFjhqAul09Zwi4rojckTyreABBywq76eVj5yWIenJ6p/gV+vmRRNY3iJjWkddmWbwhfWag53M/gCv05iceKK8E7DjMWGznWFa1Q8IUvfI3kq1XC4EY6REL53U3SkRaCW/HFU0raalJEwNZPoGUaT7RZQsaKI6ec8i2EqTmDwqiN4oq/LDmnCxrO9vMknBSOJG2gCBoA/DngU276zYLg2wsElTPumN8/jVjTnjgtw==',
 }
 }
diff --git a/modules/mediawiki/manifests/users.pp 
b/modules/mediawiki/manifests/users.pp
index 14aafbd..a9ac719 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -109,6 +109,13 @@
 managehome => true,
 }
 
+file { '/var/lib/pybal-check':
+ensure  => directory,
+owner   => 'pybal-check',
+group   => 'pybal-check',
+mode=> '0755',
+}
+
 file { '/var/lib/pybal-check/.ssh':
 ensure  => directory,
 owner   => 'pybal-check',

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

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

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

[MediaWiki-commits] [Gerrit] Improve design of collapsed states in small topic view - change (mediawiki...Flow)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Improve design of collapsed states in small topic view
..

Improve design of collapsed states in small topic view

Sat down with May.

Change-Id: Iee762e3fb908d93327bf4d7b9d48c33bc666fe54
---
M modules/new/styles/board/collapser.less
M modules/new/styles/common.less
2 files changed, 18 insertions(+), 2 deletions(-)


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

diff --git a/modules/new/styles/board/collapser.less 
b/modules/new/styles/board/collapser.less
index 3864677..6f820ed 100644
--- a/modules/new/styles/board/collapser.less
+++ b/modules/new/styles/board/collapser.less
@@ -64,6 +64,23 @@
}
}
 
+   // Truncate text
+   .flow-topic-title {
+   white-space: nowrap;
+   overflow: hidden;
+   -webkit-text-overflow: ellipsis;
+   text-overflow: ellipsis;
+   }
+
+   .flow-topic-expanded {
+   .flow-topic-title {
+   overflow: visible;
+   white-space: normal;
+   }
+   }
+
+   .flow-moderated-topic-title,
+   .flow-topic-summary,
.flow-post,
.flow-reply-form {
display: none;
diff --git a/modules/new/styles/common.less b/modules/new/styles/common.less
index 8f788df..fd0720c 100644
--- a/modules/new/styles/common.less
+++ b/modules/new/styles/common.less
@@ -54,13 +54,12 @@
.flow-moderated-topic-title,
.flow-topic-title {
padding: 0;
-   margin: 0 0 .33em;
+   margin: 0 2.5em .33em 0;
border-bottom: none;
font-family: sans-serif;
font-weight: bold;
word-break: break-word;
word-wrap: break-word;
-   overflow: visible;
}
 
.flow-moderated-topic-title {

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

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

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

[MediaWiki-commits] [Gerrit] End tour if saving before preview - change (mediawiki...GuidedTour)

[Robmoen (Code Review)]

Robmoen has uploaded a new change for review.

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

Change subject: End tour if saving before preview
..

End tour if saving before preview

Bug: 66743
Change-Id: I3aea99e5ff1bf8a4f85df36f2614465f2b7c4033
---
M modules/tours/firstedit.js
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour 
refs/changes/64/145464/1

diff --git a/modules/tours/firstedit.js b/modules/tours/firstedit.js
index bde2e2e..b495287 100644
--- a/modules/tours/firstedit.js
+++ b/modules/tours/firstedit.js
@@ -75,6 +75,8 @@
.transition( function () {
if ( gt.isReviewing() ) {
return 'save';
+   } else if ( !gt.isEditing() ) {
+   return gt.TransitionAction.HIDE;
}
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aea99e5ff1bf8a4f85df36f2614465f2b7c4033
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Robmoen 

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

[MediaWiki-commits] [Gerrit] remove license talk from CREDITS - change (mediawiki...UploadWizard)

[Neilk (Code Review)]

Neilk has uploaded a new change for review.

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

Change subject: remove license talk from CREDITS
..

remove license talk from CREDITS

Change-Id: Ibd7696147d1389127669f226a3f0884af1663ef0
---
M CREDITS
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/65/145465/1

diff --git a/CREDITS b/CREDITS
index b42d366..5d556ef 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,8 +1,5 @@
-MediaWiki UploadWizard is a collaborative project released under the
-GNU General Public License v2. We would like to recognize the
-following names for their contribution to the product.
-
-For further details on licensing, see the COPYING file.
+We would like to recognize the following names for their 
+contribution to this extension. 
 
 == Developers ==
 * Neil Kandalgaonkar

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd7696147d1389127669f226a3f0884af1663ef0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Neilk 

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

[MediaWiki-commits] [Gerrit] Add explicit homedirs for file_mover + pybal-check - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Add explicit homedirs for file_mover + pybal-check
..

Add explicit homedirs for file_mover + pybal-check

Puppet's user => managehome is mostly a broken feature;
it only creates a home directory when it's creating
the actual user from scratch.  It never checks/creates the
homedir if the user already exists (this has caused us
related puppet execution failures in these two cases).

Change-Id: I06ea68359fbbdc1d889074b20d17a272ff906d57
---
M manifests/role/logging.pp
M modules/mediawiki/manifests/users.pp
2 files changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/145463/1

diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index f03ad64..cde9496 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -407,11 +407,18 @@
 system => true,
 }
 
+file { '/var/lib/file_mover':
+ensure => directory,
+owner => 'file_mover',
+group => 'file_mover',
+mode => '0775',
+}
+
 ssh_authorized_key {
 "file_mover":
 ensure => present,
 user   => 'file_mover',
 type   => 'ssh-rsa',
-key=> 
'B3NzaC1yc2EBIwAAAQEA7c29cQHB7hbBwvp1aAqnzkfjJpkpiLo3gwpv73DAZ2FVhDR4PBCoksA4GvUwoG8s7tVn2Xahj4p/jRF67XLudceY92xUTjisSHWYrqCqHrrlcbBFjhqAul09Zwi4rojckTyreABBywq76eVj5yWIenJ6p/gV+vmRRNY3iJjWkddmWbwhfWag53M/gCv05iceKK8E7DjMWGznWFa1Q8IUvfI3kq1XC4EY6REL53U3SkRaCW/HFU0raalJEwNZPoGUaT7RZQsaKI6ec8i2EqTmDwqiN4oq/LDmnCxrO9vMknBSOJG2gCBoA/DngU276zYLg2wsElTPumN8/jVjTnjgtw==',
+key=> 
'B3NzaC1yc2EBIwAAAQEA7c29cQHB7hbBwvp1aAqnzkfjJpkpiLo3gwpv73DAZ2FVhDR4PBCoksA4GvUwoG8s7tVn2Xahj4p/jRF67XLudceY92xUTjisSHWYrqCqHrrlcbBFjhqAul09Zwi4rojckTyreABBywq76eVj5yWIenJ6p/gV+vmRRNY3iJjWkddmWbwhfWag53M/gCv05iceKK8E7DjMWGznWFa1Q8IUvfI3kq1XC4EY6REL53U3SkRaCW/HFU0raalJEwNZPoGUaT7RZQsaKI6ec8i2EqTmDwqiN4oq/LDmnCxrO9vMknBSOJG2gCBoA/DngU276zYLg2wsElTPumN8/jVjTnjgtw==',
 }
 }
diff --git a/modules/mediawiki/manifests/users.pp 
b/modules/mediawiki/manifests/users.pp
index 14aafbd..a9ac719 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -109,6 +109,13 @@
 managehome => true,
 }
 
+file { '/var/lib/pybal-check':
+ensure  => directory,
+owner   => 'pybal-check',
+group   => 'pybal-check',
+mode=> '0755',
+}
+
 file { '/var/lib/pybal-check/.ssh':
 ensure  => directory,
 owner   => 'pybal-check',

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

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

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

[MediaWiki-commits] [Gerrit] Upgrade e5-shim to v4.0.0 - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Upgrade e5-shim to v4.0.0
..


Upgrade e5-shim to v4.0.0

Source code:
 https://github.com/es-shims/es5-shim/blob/v4.0.0/es5-shim.js

Follows-up 61c81de, dcdca49, and ea307ea.

Notable changes;
* Removes breaking polyfill for Array#splice
  https://github.com/es-shims/es5-shim/issues/255

Change-Id: Id1bf4b5f35fed05817f77e087cd489aed719ecd5
---
M RELEASE-NOTES-1.24
M resources/lib/es5-shim/es5-shim.js
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index ec31355..f4acc37 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -110,6 +110,7 @@
 * Upgrade Moment.js to v2.7.0.
 * (bug 67042) Added support for the HTML5  tag for East Asian typography.
 * Upgrade Sinon.JS to 1.10.3.
+* Added the es5-shim polyfill for older or non-compliant javascript engines.
 
 === Bug fixes in 1.24 ===
 * (bug 49116) Footer copyright notice is now always displayed in user language
diff --git a/resources/lib/es5-shim/es5-shim.js 
b/resources/lib/es5-shim/es5-shim.js
index d20aa1b..4595994 100644
--- a/resources/lib/es5-shim/es5-shim.js
+++ b/resources/lib/es5-shim/es5-shim.js
@@ -366,7 +366,6 @@
 ArrayPrototype.splice.call(obj, 0, 0, 1);
 return obj.length === 1;
 }());
-var omittingSecondSpliceArgIsNoop = [1].splice(0).length === 0;
 defineProperties(ArrayPrototype, {
 splice: function splice(start, deleteCount) {
 if (arguments.length === 0) { return []; }
@@ -375,14 +374,14 @@
 if (arguments.length > 0 && typeof deleteCount !== 'number') {
 args = _Array_slice_.call(arguments);
 if (args.length < 2) {
-args.push(toInteger(deleteCount));
+args.push(this.length - start);
 } else {
 args[1] = toInteger(deleteCount);
 }
 }
 return array_splice.apply(this, args);
 }
-}, !omittingSecondSpliceArgIsNoop || !spliceWorksWithEmptyObject);
+}, !spliceWorksWithEmptyObject);
 
 // ES5 15.4.4.12
 // http://es5.github.com/#x15.4.4.13

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1bf4b5f35fed05817f77e087cd489aed719ecd5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
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] Bump GuidedTour to tip of release branch - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Bump GuidedTour to tip of release branch
..


Bump GuidedTour to tip of release branch

Change-Id: I1cc9c75d8d82cfec30c5a9a4c1e814a7d1a323eb
---
M extensions/GuidedTour
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/GuidedTour b/extensions/GuidedTour
index 166f951..16081e7 16
--- a/extensions/GuidedTour
+++ b/extensions/GuidedTour
-Subproject commit 166f95191ff9b6dd201a3629000ae14617ec3670
+Subproject commit 16081e7ca1bda0cbc4f3d6cc20b0b491bc45d962

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cc9c75d8d82cfec30c5a9a4c1e814a7d1a323eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf13
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: Robmoen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Updating VE to branch head - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Updating VE to branch head
..


Updating VE to branch head

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 8275d0b..a5e669a 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 8275d0b2c7e95bd9f0503b31f17cbf487eb4e4b0
+Subproject commit a5e669a0a6932b53fa40e8d9d369f338282135c2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib30cf1c47543702f9e1ccdabdeb84f5c92c77e94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf13
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update es5-shim to latest master (40181d720e07) - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update es5-shim to latest master (40181d720e07)
..


Update es5-shim to latest master (40181d720e07)

Includes a fix for .
The bug makes es5-shim unusable in the browsers we are most interested
in using it for: old versions of IE.

Source code:
 https://github.com/es-shims/es5-shim/blob/40181d720e/es5-shim.js

Bug: 67565
Change-Id: Iee964bea6fcc1071871e457643b77ffd452e1040
(cherry picked from commit 61c81de8aadaea7c0d50206835b3e3964292a24c)
---
M resources/lib/es5-shim/es5-shim.js
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/resources/lib/es5-shim/es5-shim.js 
b/resources/lib/es5-shim/es5-shim.js
index 02048c0..d20aa1b 100644
--- a/resources/lib/es5-shim/es5-shim.js
+++ b/resources/lib/es5-shim/es5-shim.js
@@ -674,7 +674,7 @@
 // ES5 15.4.4.14
 // http://es5.github.com/#x15.4.4.14
 // 
https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-var hasFirefox2IndexOfBug = [0, 1].indexOf(1, 2) !== -1;
+var hasFirefox2IndexOfBug = Array.prototype.indexOf && [0, 1].indexOf(1, 2) 
!== -1;
 defineProperties(ArrayPrototype, {
 indexOf: function indexOf(sought /*, fromIndex */ ) {
 var self = splitString && isString(this) ? this.split('') : 
toObject(this),
@@ -703,7 +703,7 @@
 // ES5 15.4.4.15
 // http://es5.github.com/#x15.4.4.15
 // 
https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-var hasFirefox2LastIndexOfBug = [0, 1].lastIndexOf(0, -3) !== -1;
+var hasFirefox2LastIndexOfBug = Array.prototype.lastIndexOf && [0, 
1].lastIndexOf(0, -3) !== -1;
 defineProperties(ArrayPrototype, {
 lastIndexOf: function lastIndexOf(sought /*, fromIndex */) {
 var self = splitString && isString(this) ? this.split('') : 
toObject(this),
@@ -1082,7 +1082,7 @@
 // http://es5.github.com/#x15.7.4.5
 var hasToFixedBugs = NumberPrototype.toFixed && (
   (0.8).toFixed(3) !== '0.000'
-  || (0.9).toFixed(0) === '0'
+  || (0.9).toFixed(0) !== '1'
   || (1.255).toFixed(2) !== '1.25'
   || (1000128).toFixed(0) !== "1000128"
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee964bea6fcc1071871e457643b77ffd452e1040
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf13
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: PleaseStand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Setup script and commands for installation and configuration - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Setup script and commands for installation and configuration
..


Setup script and commands for installation and configuration

Implemented a setup script to install recommended Vagrant plugins,
build/install the bundled mediawiki-vagrant plugin, and interactively
configure required settings (the only truly required setting is git_user
at the moment).

Settings are defined through a basic DSL that allow for helpful
descriptions, default values, and value coercion (enforcing min/max
values, etc.).

Additional commands `vagrant config` and `vagrant forward-port` were
implemented to provide a command-line interface to defined settings and
forwarded ports, respectfully.

Removed esoteric settings box_name, box_uri, and puppet_debug. Puppet
debugging can now enabled by defining a PUPPET_DEBUG environment
variable.

Change-Id: I748655162214e05adc101e626b11b7fd91a29f22
---
M README.md
M Vagrantfile
M lib/mediawiki-vagrant.rb
A lib/mediawiki-vagrant/config.rb
A lib/mediawiki-vagrant/forward_port.rb
M lib/mediawiki-vagrant/plugin_environment.rb
A lib/mediawiki-vagrant/setting.rb
A lib/mediawiki-vagrant/settings.rb
A lib/mediawiki-vagrant/settings/definitions.rb
A lib/mediawiki-vagrant/settings_definer.rb
A lib/mediawiki-vagrant/settings_plugin.rb
A lib/mediawiki-vagrant/setup.rb
M lib/mediawiki-vagrant/version.rb
D lib/settings.rb
A setup.bat
A setup.sh
A support/setup.rb
17 files changed, 845 insertions(+), 105 deletions(-)

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



diff --git a/README.md b/README.md
index ad46228..7f0d139 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
  * (Optional) For better performance on non-Windows hosts, install NFS.  For
Debian-based systems (including Ubuntu), run:
 
-   sudo apt-get install nfs-kernel-server portmap
+sudo apt-get install nfs-kernel-server portmap
 
 Next, you'll need a copy of the mediawiki-vagrant project files.
 
@@ -42,14 +42,9 @@
 command-prompt, and change your working directory to the location of the
 extracted (or git-cloned) files.
 
-If you're using Vagrant version 1.6 or higher and want to make use of
-additional MediaWiki-Vagrant features such as roles (see Extend below), you'll
-need to install the bundled mediawiki-vagrant plugin. Users of 1.5 and below
-can skip this step, as the plugin will be loaded automatically from within the
-Vagrantfile.
-
-gem build mediawiki-vagrant.gemspec
-vagrant plugin install mediawiki-vagrant-[version].gem
+Run the appropriate setup script for your platform. For Windows, run
+`setup.bat`. For Linux and OS X, run `setup.sh`. Some extra Vagrant plugins,
+including the bundled mediawiki-vagrant plugin, will be installed.
 
 From there, run `vagrant up` to provision and boot the virtual machine.
 
@@ -84,13 +79,14 @@
 with the vagrant files run `git pull` and then `vagrant reload`.  The latter
 will restart the VM.
 
+
 ## Extend
 
 You can add roles to MediaWiki-Vagrant! A 'role' represents a set of software
 configurations required for giving this machine some special function. Vagrant
 has several commands to manage enabled roles:
 
- * vagrant disable-role
+ * disable-role
  * enable-role
  * list-roles
  * reset-roles
@@ -100,10 +96,12 @@
 by adding a role file to puppet/manifests/roles and submitting it as a patch to
 the Mediawiki-Vagrant project.
 
+
 ## Settings
 
 For information about settings, see settings.d/README.
 
+
 ## Troubleshoot
 
 Stuck? Here's where to get help.
diff --git a/Vagrantfile b/Vagrantfile
index def4d08..40887a6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,9 +17,8 @@
 # loaded. In case of conflict, values in the 'extra' file will superceded
 # any values in this file. 'Vagrantfile-extra.rb' is ignored by git.
 #
-# Simple configuration changes can be made by creating a file named
-# ".settings.yaml" in the same directory in this file. See the configuration
-# settings section below for the values that may be specified.
+# Simple configuration changes can be made by running the setup script (see
+# README.md for details).
 #
 # Please report bugs in this file on Wikimedia's Bugzilla:
 # https://bugzilla.wikimedia.org/enter_bug.cgi?product=MediaWiki-Vagrant
@@ -27,70 +26,49 @@
 # Patches and contributions are welcome!
 # http://www.mediawiki.org/wiki/How_to_become_a_MediaWiki_hacker
 #
-$DIR = File.expand_path('..', __FILE__); $: << File.join($DIR, 'lib')
-require 'settings'
+$DIR = File.expand_path('..', __FILE__)
 
-# In Vagrant versions 1.6 and up, plugins are loaded early and must be
-# installed before executing the Vagrantfile. In earlier versions, we can
-# simply load the plugin here.
-if Gem::Version.new(Vagrant::VERSION) < Gem::Version.new('1.6')
-require 'mediawiki-vagrant'
-else
-# Check mediawiki-vagrant plugin version
-require_relative 'lib/mediawiki-vagrant/version'

[MediaWiki-commits] [Gerrit] Update es5-shim to latest master (40181d720e07) - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update es5-shim to latest master (40181d720e07)
..


Update es5-shim to latest master (40181d720e07)

Includes a fix for .
The bug makes es5-shim unusable in the browsers we are most interested
in using it for: old versions of IE.

Source code:
 https://github.com/es-shims/es5-shim/blob/40181d720e/es5-shim.js

Bug: 67565
Change-Id: Iee964bea6fcc1071871e457643b77ffd452e1040
(cherry picked from commit 61c81de8aadaea7c0d50206835b3e3964292a24c)
---
M resources/lib/es5-shim/es5-shim.js
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/resources/lib/es5-shim/es5-shim.js 
b/resources/lib/es5-shim/es5-shim.js
index 02048c0..d20aa1b 100644
--- a/resources/lib/es5-shim/es5-shim.js
+++ b/resources/lib/es5-shim/es5-shim.js
@@ -674,7 +674,7 @@
 // ES5 15.4.4.14
 // http://es5.github.com/#x15.4.4.14
 // 
https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-var hasFirefox2IndexOfBug = [0, 1].indexOf(1, 2) !== -1;
+var hasFirefox2IndexOfBug = Array.prototype.indexOf && [0, 1].indexOf(1, 2) 
!== -1;
 defineProperties(ArrayPrototype, {
 indexOf: function indexOf(sought /*, fromIndex */ ) {
 var self = splitString && isString(this) ? this.split('') : 
toObject(this),
@@ -703,7 +703,7 @@
 // ES5 15.4.4.15
 // http://es5.github.com/#x15.4.4.15
 // 
https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-var hasFirefox2LastIndexOfBug = [0, 1].lastIndexOf(0, -3) !== -1;
+var hasFirefox2LastIndexOfBug = Array.prototype.lastIndexOf && [0, 
1].lastIndexOf(0, -3) !== -1;
 defineProperties(ArrayPrototype, {
 lastIndexOf: function lastIndexOf(sought /*, fromIndex */) {
 var self = splitString && isString(this) ? this.split('') : 
toObject(this),
@@ -1082,7 +1082,7 @@
 // http://es5.github.com/#x15.7.4.5
 var hasToFixedBugs = NumberPrototype.toFixed && (
   (0.8).toFixed(3) !== '0.000'
-  || (0.9).toFixed(0) === '0'
+  || (0.9).toFixed(0) !== '1'
   || (1.255).toFixed(2) !== '1.25'
   || (1000128).toFixed(0) !== "1000128"
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee964bea6fcc1071871e457643b77ffd452e1040
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf12
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: PleaseStand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Updating VE to branch head - change (mediawiki/core)

[Mwalker (Code Review)]

Mwalker has uploaded a new change for review.

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

Change subject: Updating VE to branch head
..

Updating VE to branch head

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/145462/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 8275d0b..a5e669a 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 8275d0b2c7e95bd9f0503b31f17cbf487eb4e4b0
+Subproject commit a5e669a0a6932b53fa40e8d9d369f338282135c2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib30cf1c47543702f9e1ccdabdeb84f5c92c77e94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf13
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Fix cite/template dialogs - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Fix cite/template dialogs
..


Fix cite/template dialogs

I1a7fc7f2 broke cite/template dialog - onDescriptionClick is not defined.
I can't find it anywhere in the VE-MW or OOUI source.
Before my change, it was simply a no-op. But now we try to bind it in a way
that breaks everything. This commit just removes that line since it was
apparently not doing anything.

Bug: 67814
Change-Id: I0b9c3318b3de8530e0ba9e355cd73eb7f70a6b5a
---
M modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js
index 83c45cd..22b18bb 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js
@@ -85,7 +85,6 @@
 
// Events
this.$label.on( 'click', this.onLabelClick.bind( this ) );
-   this.$description.on( 'click', this.onDescriptionClick.bind( this ) );
 
// Initialization
this.$info

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b9c3318b3de8530e0ba9e355cd73eb7f70a6b5a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.24wmf13
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump GuidedTour to tip of release branch - change (mediawiki/core)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Bump GuidedTour to tip of release branch
..

Bump GuidedTour to tip of release branch

Change-Id: I1cc9c75d8d82cfec30c5a9a4c1e814a7d1a323eb
---
M extensions/GuidedTour
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/145460/1

diff --git a/extensions/GuidedTour b/extensions/GuidedTour
index 166f951..16081e7 16
--- a/extensions/GuidedTour
+++ b/extensions/GuidedTour
-Subproject commit 166f95191ff9b6dd201a3629000ae14617ec3670
+Subproject commit 16081e7ca1bda0cbc4f3d6cc20b0b491bc45d962

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cc9c75d8d82cfec30c5a9a4c1e814a7d1a323eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf13
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] Move 'language' tool from the insert to the styling menu, li... - change (VisualEditor/VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Move 'language' tool from the insert to the styling menu, like 
in VE-MW
..

Move 'language' tool from the insert to the styling menu, like in VE-MW

Change-Id: I26befde69077c4f66b667f95641cedd820d59591
---
M modules/ve/init/ve.init.Target.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/58/145458/1

diff --git a/modules/ve/init/ve.init.Target.js 
b/modules/ve/init/ve.init.Target.js
index c54a27b..0247840 100644
--- a/modules/ve/init/ve.init.Target.js
+++ b/modules/ve/init/ve.init.Target.js
@@ -92,9 +92,9 @@
'type': 'list',
'indicator': 'down',
'icon': 'text-style',
-   'include': [ { 'group': 'textStyle' }, 'clear' ],
+   'include': [ { 'group': 'textStyle' }, 'language', 'clear' ],
'promote': [ 'bold', 'italic' ],
-   'demote': [ 'strikethrough', 'code',  'underline', 'clear' ]
+   'demote': [ 'strikethrough', 'code', 'underline', 'language', 
'clear' ]
},
// Link
{

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26befde69077c4f66b667f95641cedd820d59591
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Remove label from 'insert' menu, and instead use a large plu... - change (VisualEditor/VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Remove label from 'insert' menu, and instead use a large plus 
icon
..

Remove label from 'insert' menu, and instead use a large plus icon

Change-Id: I8b57aac151d27b28f7349d3e93f88b08f88f29ec
---
M modules/ve/init/ve.init.Target.js
A modules/ve/ui/styles/images/icons/big-add-item.svg
M modules/ve/ui/styles/ve.ui.Icons.css
3 files changed, 18 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/59/145459/1

diff --git a/modules/ve/init/ve.init.Target.js 
b/modules/ve/init/ve.init.Target.js
index 0247840..1a913fb 100644
--- a/modules/ve/init/ve.init.Target.js
+++ b/modules/ve/init/ve.init.Target.js
@@ -82,6 +82,7 @@
'header': OO.ui.deferMsg( 
'visualeditor-toolbar-paragraph-format' ),
'type': 'menu',
'indicator': 'down',
+   'title': OO.ui.deferMsg( 'visualeditor-toolbar-format-tooltip' 
),
'include': [ { 'group': 'format' } ],
'promote': [ 'paragraph' ],
'demote': [ 'preformatted' ]
@@ -92,6 +93,7 @@
'type': 'list',
'indicator': 'down',
'icon': 'text-style',
+   'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
'include': [ { 'group': 'textStyle' }, 'language', 'clear' ],
'promote': [ 'bold', 'italic' ],
'demote': [ 'strikethrough', 'code', 'underline', 'language', 
'clear' ]
@@ -113,12 +115,14 @@
// Insert
{
'header': OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
-   'include': '*',
+   'type': 'list',
+   'icon': 'big-add-item',
+   'label': '',
+   'title': OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
'indicator': 'down',
-   'label': OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
+   'include': '*',
'demote': [ 'specialcharacter' ]
}
-
 ];
 
 ve.init.Target.static.surfaceCommands = [
diff --git a/modules/ve/ui/styles/images/icons/big-add-item.svg 
b/modules/ve/ui/styles/images/icons/big-add-item.svg
new file mode 100644
index 000..066d038
--- /dev/null
+++ b/modules/ve/ui/styles/images/icons/big-add-item.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
diff --git a/modules/ve/ui/styles/ve.ui.Icons.css 
b/modules/ve/ui/styles/ve.ui.Icons.css
index fbadd6b..bdcd0c9 100644
--- a/modules/ve/ui/styles/ve.ui.Icons.css
+++ b/modules/ve/ui/styles/ve.ui.Icons.css
@@ -21,6 +21,11 @@
background-image: url(images/icons/align-float-right.svg);
 }
 
+.oo-ui-icon-big-add-item {
+   /* @embed */
+   background-image: url(images/icons/big-add-item.svg);
+}
+
 .oo-ui-icon-bold-a {
/* @embed */
background-image: url(images/icons/bold-a.svg);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b57aac151d27b28f7349d3e93f88b08f88f29ec
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Per team discussion, change flagType property name to type - change (mediawiki...GuidedTour)

[jenkins-bot (Code Review)]

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

Change subject: Per team discussion, change flagType property name to type
..


Per team discussion, change flagType property name to type

Removed deprecated mw-ui-primary type

Change-Id: If74b14c003d433be6078cf178560c8a02bbca7bb
(cherry picked from commit ee1cc5abb890c000b16cd12f0cc8d2f8eaa65c25)
---
M modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
M modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
M modules/tours/test.js
M tests/ext.guidedTour.lib.tests.js
4 files changed, 11 insertions(+), 12 deletions(-)

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



diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index 9c96b1d..48daa9b 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -232,7 +232,7 @@
 * Returns button type class.  Allows for flagging button type in
 * tour specification to override default button styles.
 * Currently all buttons aside from back and link have a 
defaultButtonClass
-* unless otherwise flagged with button.flagType.
+* unless otherwise flagged with button.type.
 *
 * @private
 *
@@ -242,17 +242,16 @@
 */
function getButtonTypeClass( button ) {
var buttonTypes = {
-   primary: 'mw-ui-primary',
progressive: 'mw-ui-progressive',
constructive: 'mw-ui-constructive',
destructive: 'mw-ui-destructive'
};
// Button have a flagged type?
// TODO: rmoen 7/7/14 in the future it might be nice to have
-   // flagType optionally an array so we can add additional 
classes here.
+   // type optionally an array so we can add additional classes 
here.
// example: mw-ui-quiet
-   if ( button.flagType ) {
-   return buttonTypes[button.flagType] || '';
+   if ( button.type ) {
+   return buttonTypes[button.type] || '';
} else if ( button.action === 'back' ||
button.action === 'wikiLink' ||
button.action === 'externalLink'
diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
index f6ab219..aa23bda 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
@@ -165,8 +165,8 @@
 *  the wikiLink action
 * @param {string} stepSpec.buttons.url URL to link to, only for the
 *  externalLink action
-* @param {string} stepSpec.buttons.flagType string to add button type
-*  class.  Currently supports: primary, progressive, constructive, 
destructive.
+* @param {string} stepSpec.buttons.type string to add button type
+*  class.  Currently supports: progressive, constructive, destructive.
 * @param {string} [stepSpec.buttons.classString] Space-separated list 
of
 *  additional class names
 *
diff --git a/modules/tours/test.js b/modules/tours/test.js
index cffebff..279b18a 100644
--- a/modules/tours/test.js
+++ b/modules/tours/test.js
@@ -57,7 +57,7 @@
action: 'wikiLink',
page: pageName,
namemsg: 'guidedtour-tour-test-go-description-page',
-   flagType: 'progressive'
+   type: 'progressive'
}, {
action: 'end'
} ]
diff --git a/tests/ext.guidedTour.lib.tests.js 
b/tests/ext.guidedTour.lib.tests.js
index e7bde70..88804d8 100644
--- a/tests/ext.guidedTour.lib.tests.js
+++ b/tests/ext.guidedTour.lib.tests.js
@@ -1080,8 +1080,8 @@
 
QUnit.test( 'Step.getButtons', 6, function ( assert ) {
var buttons = [
-   { flagType: 'destructive' },
-   { action: 'wikiLink', flagType: 'constructive' 
},
+   { type: 'destructive' },
+   { action: 'wikiLink', type: 'constructive' },
{ action: 'externalLink' },
{ action: 'back' },
{ action: 'okay', onclick: function() {} },
@@ -1099,11 +1099,11 @@
assert.ok(
returnedButtons[0].html['class'].indexOf( 
'mw-ui-destructive' ) &&
returnedButtons[0].html['class'].indexOf( 
'mw-ui-button' ) !== -1,
-   'Custom button flagged as 

[MediaWiki-commits] [Gerrit] Per team discussion, change flagType property name to type - change (mediawiki...GuidedTour)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Per team discussion, change flagType property name to type
..

Per team discussion, change flagType property name to type

Removed deprecated mw-ui-primary type

Change-Id: If74b14c003d433be6078cf178560c8a02bbca7bb
(cherry picked from commit ee1cc5abb890c000b16cd12f0cc8d2f8eaa65c25)
---
M modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
M modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
M modules/tours/test.js
M tests/ext.guidedTour.lib.tests.js
4 files changed, 11 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour 
refs/changes/57/145457/1

diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index 9c96b1d..48daa9b 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -232,7 +232,7 @@
 * Returns button type class.  Allows for flagging button type in
 * tour specification to override default button styles.
 * Currently all buttons aside from back and link have a 
defaultButtonClass
-* unless otherwise flagged with button.flagType.
+* unless otherwise flagged with button.type.
 *
 * @private
 *
@@ -242,17 +242,16 @@
 */
function getButtonTypeClass( button ) {
var buttonTypes = {
-   primary: 'mw-ui-primary',
progressive: 'mw-ui-progressive',
constructive: 'mw-ui-constructive',
destructive: 'mw-ui-destructive'
};
// Button have a flagged type?
// TODO: rmoen 7/7/14 in the future it might be nice to have
-   // flagType optionally an array so we can add additional 
classes here.
+   // type optionally an array so we can add additional classes 
here.
// example: mw-ui-quiet
-   if ( button.flagType ) {
-   return buttonTypes[button.flagType] || '';
+   if ( button.type ) {
+   return buttonTypes[button.type] || '';
} else if ( button.action === 'back' ||
button.action === 'wikiLink' ||
button.action === 'externalLink'
diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
index f6ab219..aa23bda 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
@@ -165,8 +165,8 @@
 *  the wikiLink action
 * @param {string} stepSpec.buttons.url URL to link to, only for the
 *  externalLink action
-* @param {string} stepSpec.buttons.flagType string to add button type
-*  class.  Currently supports: primary, progressive, constructive, 
destructive.
+* @param {string} stepSpec.buttons.type string to add button type
+*  class.  Currently supports: progressive, constructive, destructive.
 * @param {string} [stepSpec.buttons.classString] Space-separated list 
of
 *  additional class names
 *
diff --git a/modules/tours/test.js b/modules/tours/test.js
index cffebff..279b18a 100644
--- a/modules/tours/test.js
+++ b/modules/tours/test.js
@@ -57,7 +57,7 @@
action: 'wikiLink',
page: pageName,
namemsg: 'guidedtour-tour-test-go-description-page',
-   flagType: 'progressive'
+   type: 'progressive'
}, {
action: 'end'
} ]
diff --git a/tests/ext.guidedTour.lib.tests.js 
b/tests/ext.guidedTour.lib.tests.js
index e7bde70..88804d8 100644
--- a/tests/ext.guidedTour.lib.tests.js
+++ b/tests/ext.guidedTour.lib.tests.js
@@ -1080,8 +1080,8 @@
 
QUnit.test( 'Step.getButtons', 6, function ( assert ) {
var buttons = [
-   { flagType: 'destructive' },
-   { action: 'wikiLink', flagType: 'constructive' 
},
+   { type: 'destructive' },
+   { action: 'wikiLink', type: 'constructive' },
{ action: 'externalLink' },
{ action: 'back' },
{ action: 'okay', onclick: function() {} },
@@ -1099,11 +1099,11 @@
assert.ok(
returnedButtons[0].html['class'].indexOf( 
'mw-ui-destructive' ) &&
returnedButtons[0].html['class'].indexOf( 
'mw-ui-button' ) !

[MediaWiki-commits] [Gerrit] Update lightncandy - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Update lightncandy
..


Update lightncandy

This matches upstream trunk at 131696af11 [1]. This solves a double
encoding issue in with subexpressions, which is exposed in
the topic reply placeholder text.

[1] https://github.com/zordius/lightncandy/commit/
  131696af113056dcec74693d18aa947d642c5e57

Change-Id: I7adf717157677d5dcd5546e4a84b02662c8c60de
---
M handlebars/Makefile
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_header.handlebars.php
M handlebars/compiled/flow_block_header_diff_view.handlebars.php
M handlebars/compiled/flow_block_header_edit.handlebars.php
M handlebars/compiled/flow_block_header_single_view.handlebars.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_close.handlebars.php
M handlebars/compiled/flow_block_topic_diff_view.handlebars.php
M handlebars/compiled/flow_block_topic_edit_post.handlebars.php
M handlebars/compiled/flow_block_topic_edit_title.handlebars.php
M handlebars/compiled/flow_block_topic_history.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_block_topic_reply.handlebars.php
M handlebars/compiled/flow_block_topic_single_view.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_block_topicsummary_close.handlebars.php
M handlebars/compiled/flow_block_topicsummary_diff_view.handlebars.php
M handlebars/compiled/flow_block_topicsummary_edit.handlebars.php
M handlebars/compiled/flow_block_topicsummary_single_view.handlebars.php
M handlebars/compiled/flow_board.handlebars.php
M handlebars/compiled/flow_board_collapsers_subcomponent.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/compiled/flow_preview_button.handlebars.php
M handlebars/compiled/flow_tooltip.handlebars.php
M handlebars/compiled/timestamp.handlebars.php
M includes/TemplateHelper.php
M vendor/lightncandy.php
29 files changed, 2,571 insertions(+), 2,163 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7adf717157677d5dcd5546e4a84b02662c8c60de
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: SG 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Added more error message calls - change (mediawiki...jobrunner)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Added more error message calls
..

Added more error message calls

Change-Id: I21b440d934364788e1055d2892cbef048d2e9f16
---
M redisJobRunnerService
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/jobrunner 
refs/changes/56/145456/1

diff --git a/redisJobRunnerService b/redisJobRunnerService
index a7f5ed8..dace5c1 100755
--- a/redisJobRunnerService
+++ b/redisJobRunnerService
@@ -728,9 +728,14 @@
}
$res = $this->redisCmd( $qConn, 'exec' 
);
 
+   $failed = 0;
$now = time();
$mapSet = array(); // map of (queue 
name => timestamp)
foreach ( $res as $i => $result ) {
+   if ( !$result ) {
+   ++$failed;
+   continue;
+   }
$tasksRun += array_sum( $result 
);
list( $released, $abandoned, 
$pruned, $undelayed ) = $result;
if ( $released > 0 || 
$undelayed > 0 ) {
@@ -745,10 +750,15 @@
unset( $this->conns[$qServer] );
}
 
+   if ( $failed > 0 ) {
+   $this->error( "Failed to do periodic 
tasks for $failed queue(s)." );
+   }
+
$this->redisCmd( $aConn, 'hMSet', array( 
$this->getReadyQueueKey(), $mapSet ) );
}
} catch ( RedisException $e ) {
unset( $this->conns[$aServer] );
+   $this->error( "Failed to do periodic tasks for all 
queue(s)." );
}
 
return $tasksRun;
@@ -822,6 +832,7 @@
list( $host, $port ) = explode( ':', $server ); // IPv4
$result = $conn->connect( $host, $port, 5 );
if ( !$result ) {
+   $this->error( "Could not connect to Redis 
server $host:$port." );
// Mark server down for some time to avoid 
further timeouts
$this->downSrvs[$server] = time() + 30;
 
@@ -857,6 +868,7 @@
$conn->clearLastError();
$res = call_user_func_array( array( $conn, $cmd ), $args );
if ( $conn->getLastError() ) {
+   $this->error( "Redis error: " . $conn->getLastError() );
// Make all errors be exceptions instead of "most but 
not all".
// This will let the caller know to reset the 
connection to be safe.
throw new RedisException( $conn->getLastError() );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21b440d934364788e1055d2892cbef048d2e9f16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/jobrunner
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] varnish: remove default Content-Type coercion - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: varnish: remove default Content-Type coercion
..


varnish: remove default Content-Type coercion

There were two reasons we thought we might need to preserve this behavior:

(a) We were worried that backend responses without a content-type were
prevalent (but masked by DefaultType), and that removing the default
content-type header would break things in ways that were hard to anticipate.
(b) We were worried that an attacker could somehow craft requests that trigger
responses that compromise users' browsers.

Ten days' worth of logs indicate that responses without a default type occur
very rarely. (In fact, we've only seen them for ,
which was not previously setting a default type at all.) So (a) is no longer
a credible worry.

Where does that leave (b)? If the threat is immaterial, it'd be good to remove
this hack and conform to standards.

The backend responses that were logged as not having a content-type are listed
here: 
(The ommission of the host name is accidental, but it can be determined from
the path that they are all for doc.wikimedia.org.)

Change-Id: If0c4fc8fd0eedb0df01949fda9a420bddfbb0068
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 0 insertions(+), 14 deletions(-)

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



diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index d1861a9..3481627 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -370,20 +370,6 @@
}
}
 
-   /* If no Content-Type header is present in the response, set a default
-* Content-Type header with a value of "application/octet-stream".
-* This was formerly handled by Apache via the DefaultType directive
-* but had to be moved to the Varnish layer due to Apache 2.4 dropping
-* support for DefaultType. (RT #7700)
-*/
-   if ((resp.status == 200 || resp.status == 201 || resp.status == 202 || 
resp.status == 203 || resp.status == 206) && !resp.http.Content-Type && 
resp.http.Server ~ "Apache") {
-   set resp.http.Content-Type = "application/octet-stream";
-
-   /* Log to syslog so we can determine how prevalent such 
responses are.
-* This is temporary. -- OL, 23-Jun-2014 */
-   std.syslog(9, "DefaultType: " + req.url);
-   }
-
/* Function vcl_deliver in <%= vcl %>.inc.vcl will be appended here */
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0c4fc8fd0eedb0df01949fda9a420bddfbb0068
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Updating for CLDR database v.25, also fixing rebuild script - change (mediawiki...cldr)

[Kaldari (Code Review)]

Kaldari has uploaded a new change for review.

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

Change subject: Updating for CLDR database v.25, also fixing rebuild script
..

Updating for CLDR database v.25, also fixing rebuild script

Change-Id: I7f4baea18dd6db8dfbc0a0e44e5ec3db757fafb7
---
M CldrCurrency/Symbols.php
M CldrNames/CldrNamesAf.php
M CldrNames/CldrNamesAm.php
M CldrNames/CldrNamesAr.php
M CldrNames/CldrNamesAz.php
M CldrNames/CldrNamesBe.php
M CldrNames/CldrNamesBg.php
M CldrNames/CldrNamesBn.php
M CldrNames/CldrNamesBr.php
M CldrNames/CldrNamesBs.php
M CldrNames/CldrNamesCa.php
M CldrNames/CldrNamesCs.php
M CldrNames/CldrNamesCy.php
M CldrNames/CldrNamesDa.php
M CldrNames/CldrNamesDe.php
M CldrNames/CldrNamesDz.php
M CldrNames/CldrNamesEe.php
M CldrNames/CldrNamesEl.php
M CldrNames/CldrNamesEn.php
M CldrNames/CldrNamesEo.php
M CldrNames/CldrNamesEs.php
M CldrNames/CldrNamesEt.php
M CldrNames/CldrNamesEu.php
M CldrNames/CldrNamesFa.php
M CldrNames/CldrNamesFi.php
M CldrNames/CldrNamesFo.php
M CldrNames/CldrNamesFr.php
M CldrNames/CldrNamesFur.php
M CldrNames/CldrNamesGa.php
M CldrNames/CldrNamesGd.php
M CldrNames/CldrNamesGl.php
M CldrNames/CldrNamesGsw.php
M CldrNames/CldrNamesGu.php
M CldrNames/CldrNamesHa.php
M CldrNames/CldrNamesHe.php
M CldrNames/CldrNamesHi.php
M CldrNames/CldrNamesHr.php
M CldrNames/CldrNamesHu.php
M CldrNames/CldrNamesHy.php
M CldrNames/CldrNamesIa.php
M CldrNames/CldrNamesId.php
M CldrNames/CldrNamesIs.php
M CldrNames/CldrNamesIt.php
M CldrNames/CldrNamesJa.php
M CldrNames/CldrNamesKa.php
M CldrNames/CldrNamesKk_cyrl.php
M CldrNames/CldrNamesKm.php
M CldrNames/CldrNamesKn.php
M CldrNames/CldrNamesKo.php
M CldrNames/CldrNamesKs.php
M CldrNames/CldrNamesKy.php
M CldrNames/CldrNamesLo.php
M CldrNames/CldrNamesLt.php
M CldrNames/CldrNamesLv.php
M CldrNames/CldrNamesMk.php
M CldrNames/CldrNamesMl.php
M CldrNames/CldrNamesMn.php
M CldrNames/CldrNamesMr.php
M CldrNames/CldrNamesMs.php
M CldrNames/CldrNamesMt.php
M CldrNames/CldrNamesMy.php
M CldrNames/CldrNamesNb.php
M CldrNames/CldrNamesNe.php
M CldrNames/CldrNamesNl.php
M CldrNames/CldrNamesNn.php
M CldrNames/CldrNamesOm.php
M CldrNames/CldrNamesOr.php
M CldrNames/CldrNamesOs.php
M CldrNames/CldrNamesPa.php
M CldrNames/CldrNamesPl.php
M CldrNames/CldrNamesPs.php
M CldrNames/CldrNamesPt.php
M CldrNames/CldrNamesPt_br.php
M CldrNames/CldrNamesRm.php
M CldrNames/CldrNamesRo.php
M CldrNames/CldrNamesRu.php
M CldrNames/CldrNamesRw.php
M CldrNames/CldrNamesSe.php
M CldrNames/CldrNamesSk.php
M CldrNames/CldrNamesSl.php
M CldrNames/CldrNamesSo.php
M CldrNames/CldrNamesSq.php
M CldrNames/CldrNamesSr_ec.php
M CldrNames/CldrNamesSt.php
M CldrNames/CldrNamesSv.php
M CldrNames/CldrNamesSw.php
M CldrNames/CldrNamesTa.php
M CldrNames/CldrNamesTe.php
M CldrNames/CldrNamesTg_cyrl.php
M CldrNames/CldrNamesTh.php
M CldrNames/CldrNamesTi.php
M CldrNames/CldrNamesTn.php
M CldrNames/CldrNamesTo.php
M CldrNames/CldrNamesTr.php
M CldrNames/CldrNamesUk.php
M CldrNames/CldrNamesUr.php
M CldrNames/CldrNamesVi.php
M CldrNames/CldrNamesXh.php
M CldrNames/CldrNamesYo.php
M CldrNames/CldrNamesZh_hans.php
M CldrNames/CldrNamesZh_hant.php
M CldrNames/CldrNamesZu.php
M CldrSupplemental/Supplemental.php
M rebuild.php
104 files changed, 4,208 insertions(+), 330 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/cldr 
refs/changes/55/145455/1


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

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

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

[MediaWiki-commits] [Gerrit] Per team discussion, change flagType property name to type - change (mediawiki...GuidedTour)

[jenkins-bot (Code Review)]

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

Change subject: Per team discussion, change flagType property name to type
..


Per team discussion, change flagType property name to type

Removed deprecated mw-ui-primary type

Change-Id: If74b14c003d433be6078cf178560c8a02bbca7bb
---
M modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
M modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
M modules/tours/test.js
M tests/ext.guidedTour.lib.tests.js
4 files changed, 11 insertions(+), 12 deletions(-)

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



diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index 9c96b1d..48daa9b 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -232,7 +232,7 @@
 * Returns button type class.  Allows for flagging button type in
 * tour specification to override default button styles.
 * Currently all buttons aside from back and link have a 
defaultButtonClass
-* unless otherwise flagged with button.flagType.
+* unless otherwise flagged with button.type.
 *
 * @private
 *
@@ -242,17 +242,16 @@
 */
function getButtonTypeClass( button ) {
var buttonTypes = {
-   primary: 'mw-ui-primary',
progressive: 'mw-ui-progressive',
constructive: 'mw-ui-constructive',
destructive: 'mw-ui-destructive'
};
// Button have a flagged type?
// TODO: rmoen 7/7/14 in the future it might be nice to have
-   // flagType optionally an array so we can add additional 
classes here.
+   // type optionally an array so we can add additional classes 
here.
// example: mw-ui-quiet
-   if ( button.flagType ) {
-   return buttonTypes[button.flagType] || '';
+   if ( button.type ) {
+   return buttonTypes[button.type] || '';
} else if ( button.action === 'back' ||
button.action === 'wikiLink' ||
button.action === 'externalLink'
diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
index f6ab219..aa23bda 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
@@ -165,8 +165,8 @@
 *  the wikiLink action
 * @param {string} stepSpec.buttons.url URL to link to, only for the
 *  externalLink action
-* @param {string} stepSpec.buttons.flagType string to add button type
-*  class.  Currently supports: primary, progressive, constructive, 
destructive.
+* @param {string} stepSpec.buttons.type string to add button type
+*  class.  Currently supports: progressive, constructive, destructive.
 * @param {string} [stepSpec.buttons.classString] Space-separated list 
of
 *  additional class names
 *
diff --git a/modules/tours/test.js b/modules/tours/test.js
index cffebff..279b18a 100644
--- a/modules/tours/test.js
+++ b/modules/tours/test.js
@@ -57,7 +57,7 @@
action: 'wikiLink',
page: pageName,
namemsg: 'guidedtour-tour-test-go-description-page',
-   flagType: 'progressive'
+   type: 'progressive'
}, {
action: 'end'
} ]
diff --git a/tests/ext.guidedTour.lib.tests.js 
b/tests/ext.guidedTour.lib.tests.js
index e7bde70..88804d8 100644
--- a/tests/ext.guidedTour.lib.tests.js
+++ b/tests/ext.guidedTour.lib.tests.js
@@ -1080,8 +1080,8 @@
 
QUnit.test( 'Step.getButtons', 6, function ( assert ) {
var buttons = [
-   { flagType: 'destructive' },
-   { action: 'wikiLink', flagType: 'constructive' 
},
+   { type: 'destructive' },
+   { action: 'wikiLink', type: 'constructive' },
{ action: 'externalLink' },
{ action: 'back' },
{ action: 'okay', onclick: function() {} },
@@ -1099,11 +1099,11 @@
assert.ok(
returnedButtons[0].html['class'].indexOf( 
'mw-ui-destructive' ) &&
returnedButtons[0].html['class'].indexOf( 
'mw-ui-button' ) !== -1,
-   'Custom button flagged as destructive'
+   'Destructive Custom button'

[MediaWiki-commits] [Gerrit] Using analytics-flex.cfg for analytics dell 720s that have 2... - change (operations/puppet)

[Cmjohnson (Code Review)]

Cmjohnson has submitted this change and it was merged.

Change subject: Using analytics-flex.cfg for analytics dell 720s that have 2 x 
2.5 drives in flex bays
..


Using analytics-flex.cfg for analytics dell 720s that have 2 x 2.5 drives in 
flex bays

Change-Id: I359b9ad41b7d45bd287c50437c7ddf62ea7c850e
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/analytics-flex.cfg
2 files changed, 48 insertions(+), 1 deletion(-)

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



diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 94dee0b..c1ccf09 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -42,8 +42,9 @@
amssq3[1-9]|amssq4[0-9]|amssq[56][0-9]) echo 
partman/raid1-varnish.cfg ;; \
amssq*|sq[6][7-9]|sq70) echo partman/raid1-squid.cfg ;; \
analytics100[1-9]) echo partman/analytics-cisco.cfg ;; \
-   
analytics101[1-9]|analytics102[0-2]|analytics102[8-9]|analytics103[0-9]|analytics104[0-1])
 echo partman/raid1-30G.cfg ;; \
+   analytics101[1-9]|analytics102[0-2]) echo partman/raid1-30G.cfg 
;; \
analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
+   analytics102[8-9]|analytics103[0-9]|analytics104[0-1]) echo 
partman/analytics-flex.cfg ;; \

db[0-8][0-9]|db10[0-7][0-9]|dbstore100[1-9]|es10[0-2][0-9]|es[0-9]|es1[0-9]) 
echo partman/db.cfg ;; \
netmon1001|stat1002|tungsten) echo partman/db.cfg ;; \
bast*) echo partman/lvm.cfg ;; \
diff --git 
a/modules/install-server/files/autoinstall/partman/analytics-flex.cfg 
b/modules/install-server/files/autoinstall/partman/analytics-flex.cfg
new file mode 100644
index 000..72ab9fb
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/analytics-flex.cfg
@@ -0,0 +1,46 @@
+# Configuration to create:
+#  * Hardware RAID1 on 2.5 drives in flex bays mounted at /dev/sda
+#  * 300M on /boot outside of LVM
+#  * the rest formatted with LVM:
+#  ** 30G /
+#  ** 1G swap
+
+d-ipartman-auto/method string  lvm
+d-ipartman-auto/disk   string  /dev/sda
+
+# the install makes sure we want to wipe the lvm
+d-ipartman-lvm/device_remove_lvm   boolean true
+d-ipartman-lvm/confirm boolean true
+d-ipartman-lvm/confirm_nooverwrite true
+
+d-ipartman/confirm_nooverwrite true
+d-ipartman/choose_partitionselect  finish
+
+d-ipartman-auto/expert_recipe  string  lvm ::  \
+   40 300 300 ext4 \
+   $primary{ } \
+   $bootable{ }\
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   mountpoint{ /boot } \
+   .   \
+   3 3 3 ext4  \
+   $lvmok{ }   \
+   method{ format }\
+   format{ }   \
+   use_filesystem{ }   \
+   filesystem{ ext4 }  \
+   mountpoint{ / } \
+   .   \
+   1000 1000 1000 linux-swap   \
+   method{ swap }  \
+   $lvmok{ }   \
+   format{ }   \
+   .
+
+d-ipartman-auto-lvm/guided_sizestring  80%
+
+d-ipartman-auto/choose_recipe  lvm
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I359b9ad41b7d45bd287c50437c7ddf62ea7c850e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Cmjohnson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] doc.wikimedia.org: specify additional media-types & set a de... - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: doc.wikimedia.org: specify additional media-types & set a 
default
..


doc.wikimedia.org: specify additional media-types & set a default

Along with auto-generated Puppet documentation, this site mirrors some Puppet
source code files, which are not declared in the default /etc/mime.types.
This patch adds the correct mime-type for common Puppet code files as well as
.war and .ipa files.

See 

and 


Change-Id: Id346878ee44ea8a0c366c5a615d84d799732e51b
---
M modules/contint/files/apache/doc.wikimedia.org
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/contint/files/apache/doc.wikimedia.org 
b/modules/contint/files/apache/doc.wikimedia.org
index 45406fd..11666ee 100644
--- a/modules/contint/files/apache/doc.wikimedia.org
+++ b/modules/contint/files/apache/doc.wikimedia.org
@@ -35,4 +35,11 @@
 RewriteEngine On
 RewriteRule ^/favicon\.ico$ /favicon.php [L]
 
+
+  AddType application/x-zip .war
+  AddType application/octet-stream .ipa
+  AddType text/plain .pp .erb .conf .yaml
+
+DefaultType application/octet-stream
+
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id346878ee44ea8a0c366c5a615d84d799732e51b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] doc.wikimedia.org: specify additional media-types & set a de... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: doc.wikimedia.org: specify additional media-types & set a 
default
..

doc.wikimedia.org: specify additional media-types & set a default

Along with auto-generated Puppet documentation, this site mirrors some Puppet
source code files, which are not declared in the default /etc/mime.types.
This patch adds the correct mime-type for common Puppet code files as well as
.war and .ipa files.

See 

and 


Change-Id: Id346878ee44ea8a0c366c5a615d84d799732e51b
---
M modules/contint/files/apache/doc.wikimedia.org
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/145454/1

diff --git a/modules/contint/files/apache/doc.wikimedia.org 
b/modules/contint/files/apache/doc.wikimedia.org
index 45406fd..11666ee 100644
--- a/modules/contint/files/apache/doc.wikimedia.org
+++ b/modules/contint/files/apache/doc.wikimedia.org
@@ -35,4 +35,11 @@
 RewriteEngine On
 RewriteRule ^/favicon\.ico$ /favicon.php [L]
 
+
+  AddType application/x-zip .war
+  AddType application/octet-stream .ipa
+  AddType text/plain .pp .erb .conf .yaml
+
+DefaultType application/octet-stream
+
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id346878ee44ea8a0c366c5a615d84d799732e51b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Add default display options - change (mediawiki...Math)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Add default display options
..

Add default display options

In some caseses for example if the vagrant role
mobilefrontend is enabled the stylesheets are not
processed on mobile devices.
Without a default setting for the display attribute
all elements are displayed at the same time.

Change-Id: Ic0e95effaf0b413ec4c5878e1cfd5c269daa44c3
---
M MathMathML.php
M modules/ext.math.css
2 files changed, 6 insertions(+), 4 deletions(-)


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

diff --git a/MathMathML.php b/MathMathML.php
index 94ec085..2d3dd9a 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -381,14 +381,16 @@
$attribs = array();
if ( $classOverride === false ) { // $class = '' suppresses 
class attribute
$class = $this->getClassName( true, $png );
+   $style = $png ? 'display: none;' : '';
} else {
$class  = $classOverride;
+   $style = '';
}
-   $style = '';
 
if ( !$png ) {
$this->correctSvgStyle( $this->getSvg(), $style , 
$attribs );
}
+
if ( $class ) { $attribs['class'] = $class; }
if ( $style ) { $attribs['style'] = $style; }
// an alternative for svg might be an object with 
type="image/svg+xml"
@@ -445,7 +447,7 @@
if ( $this->getMathStyle() == MW_MATHSTYLE_DISPLAY ) {
$mml = preg_replace( '/ 
$this->getClassName() ), $mml );
+   $output .= Xml::tags( $element, array( 'class' => 
$this->getClassName(), 'style' => 'display: none;'  ), $mml );
$output .= $this->getFallbackImage( $this->getMode() ) . "\n";
$output .= $this->getFallbackImage( MW_MATH_PNG ) . "\n";
$output .= HTML::closeElement( $element );
diff --git a/modules/ext.math.css b/modules/ext.math.css
index b427a16..9043caf 100644
--- a/modules/ext.math.css
+++ b/modules/ext.math.css
@@ -47,8 +47,8 @@
 @-moz-document url-prefix() {
 /* For Gecko browsers, hide the SVG fallback and show the MathML instead.
We override the style for SVG and MathML above */
-.mwe-math-mathml-inline { display: inline; }
-.mwe-math-mathml-display { display: block; }
+.mwe-math-mathml-inline { display: inline !important; }
+.mwe-math-mathml-display { display: block !important; }
 :root * > .mwe-math-mathml-inline + img.mwe-math-fallback-svg-inline,
 :root * > .mwe-math-mathml-display + img.mwe-math-fallback-svg-display { 
display: none; }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0e95effaf0b413ec4c5878e1cfd5c269daa44c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

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

[MediaWiki-commits] [Gerrit] Also fix path to set_MW_INSTALL_PATH un run-mediawiki-tests - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Also fix path to set_MW_INSTALL_PATH un run-mediawiki-tests
..


Also fix path to set_MW_INSTALL_PATH un run-mediawiki-tests

Change-Id: I008b9d4ea6a2bb3640e730ee6cec5649ba8a0fc8
---
M puppet/modules/mediawiki/files/run-mediawiki-tests
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/mediawiki/files/run-mediawiki-tests 
b/puppet/modules/mediawiki/files/run-mediawiki-tests
index fff0dc3..90b3ed1 100644
--- a/puppet/modules/mediawiki/files/run-mediawiki-tests
+++ b/puppet/modules/mediawiki/files/run-mediawiki-tests
@@ -1,4 +1,4 @@
 #!/bin/bash
-. /etc/profile.d/set_MW_INSTALL_PATH
+. /etc/profile.d/set_MW_INSTALL_PATH.sh
 cd "$MW_INSTALL_PATH"
 php tests/phpunit/phpunit.php --testdox "$@"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I008b9d4ea6a2bb3640e730ee6cec5649ba8a0fc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Also fix path to set_MW_INSTALL_PATH un run-mediawiki-tests - change (mediawiki/vagrant)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Also fix path to set_MW_INSTALL_PATH un run-mediawiki-tests
..

Also fix path to set_MW_INSTALL_PATH un run-mediawiki-tests

Change-Id: I008b9d4ea6a2bb3640e730ee6cec5649ba8a0fc8
---
M puppet/modules/mediawiki/files/run-mediawiki-tests
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/52/145452/1

diff --git a/puppet/modules/mediawiki/files/run-mediawiki-tests 
b/puppet/modules/mediawiki/files/run-mediawiki-tests
index fff0dc3..90b3ed1 100644
--- a/puppet/modules/mediawiki/files/run-mediawiki-tests
+++ b/puppet/modules/mediawiki/files/run-mediawiki-tests
@@ -1,4 +1,4 @@
 #!/bin/bash
-. /etc/profile.d/set_MW_INSTALL_PATH
+. /etc/profile.d/set_MW_INSTALL_PATH.sh
 cd "$MW_INSTALL_PATH"
 php tests/phpunit/phpunit.php --testdox "$@"

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

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

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

[MediaWiki-commits] [Gerrit] zuul: remove /var/lib/git from server - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: zuul: remove /var/lib/git from server
..


zuul: remove /var/lib/git from server

/var/lib/git was used as a Gerrit replication destination. This is now
done on /srv/ssd/gerrit and the repositories have been cleaned up
manually a few months ago when we removed the replication.

Change-Id: Ia7ca383dea207d5283a4e0e35d1629c64ce0b4f5
---
M manifests/role/zuul.pp
1 file changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index a682ef1..dfbd5bc 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -73,13 +73,6 @@
 include role::gerrit::production::replicationdest
 include contint::proxy_zuul
 
-file { '/var/lib/git':
-ensure => 'directory',
-owner  => 'gerritslave',
-group  => 'root',
-mode   => '0755',
-}
-
 class { '::zuul':
 git_source_branch => 'master',
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7ca383dea207d5283a4e0e35d1629c64ce0b4f5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix path to /etc/profile.d/set_MW_INSTALL_PATH.sh - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Fix path to /etc/profile.d/set_MW_INSTALL_PATH.sh
..


Fix path to /etc/profile.d/set_MW_INSTALL_PATH.sh

Change-Id: I6ef1a67f607687654428a6c460e720e5c4c532a1
---
M puppet/modules/mediawiki/files/run-git-update
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/mediawiki/files/run-git-update 
b/puppet/modules/mediawiki/files/run-git-update
index 32625fe..ce3cd1f 100644
--- a/puppet/modules/mediawiki/files/run-git-update
+++ b/puppet/modules/mediawiki/files/run-git-update
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Update local git repositories
 
-. /etc/profile.d/set_MW_INSTALL_PATH
+. /etc/profile.d/set_MW_INSTALL_PATH.sh
 
 set -u
 declare -a UPDATE_ERRORS

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ef1a67f607687654428a6c460e720e5c4c532a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3acca7c..8b25cb9 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 3acca7c..8b25cb9
..

Syncronize VisualEditor: 3acca7c..8b25cb9

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/49/145449/1

diff --git a/VisualEditor b/VisualEditor
index 3acca7c..8b25cb9 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3acca7cdf54941193d3e8eb74ad98f1497d5
+Subproject commit 8b25cb97172d51cfd1995012c934fd31106f2764

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3005d3ecb7594ea2ec1b6d3e0d897c172c29d30
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: 3acca7c..8b25cb9 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 3acca7c..8b25cb9
..


Syncronize VisualEditor: 3acca7c..8b25cb9

Change-Id: Ic3005d3ecb7594ea2ec1b6d3e0d897c172c29d30
---
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 3acca7c..8b25cb9 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3acca7cdf54941193d3e8eb74ad98f1497d5
+Subproject commit 8b25cb97172d51cfd1995012c934fd31106f2764

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3005d3ecb7594ea2ec1b6d3e0d897c172c29d30
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