date:20160203

[MediaWiki-commits] [Gerrit] Fix cx confirmation token matching - change (mediawiki...ContentTranslation)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix cx confirmation token matching
..


Fix cx confirmation token matching

Avoid doing any title processing because we do not have knowledge
of namespaces of other wikis - and we don't need them either. Just
treat the titles as strings, with some spices on the PHP side to
make it taste less sour.

Bug: T125258
Change-Id: Ib2b27f3efd2f63b7e2a83fb953bb49456cd53616
---
M modules/base/ext.cx.sitemapper.js
M specials/SpecialContentTranslation.php
2 files changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/modules/base/ext.cx.sitemapper.js 
b/modules/base/ext.cx.sitemapper.js
index 5090343..211c01b 100644
--- a/modules/base/ext.cx.sitemapper.js
+++ b/modules/base/ext.cx.sitemapper.js
@@ -173,11 +173,10 @@
 * @param {string} sourceTitle Source title
 */
mw.cx.SiteMapper.prototype.setCXToken = function ( sourceLanguage, 
targetLanguage, sourceTitle ) {
-   var now, slug, name, domain, options;
+   var now, name, domain, options;
 
now = new Date();
-   slug = mw.Title.newFromText( sourceTitle ).getMain();
-   name = [ 'cx', slug, sourceLanguage, targetLanguage ].join( '_' 
);
+   name = [ 'cx', sourceTitle, sourceLanguage, targetLanguage 
].join( '_' );
domain = location.hostname.indexOf( '.' ) > 0 ?
'.' + location.hostname.split( '.' ).splice( 1 ).join( 
'.' ) :
null; // Mostly for domains like "localhost"
diff --git a/specials/SpecialContentTranslation.php 
b/specials/SpecialContentTranslation.php
index 383ebe1..02c038a 100644
--- a/specials/SpecialContentTranslation.php
+++ b/specials/SpecialContentTranslation.php
@@ -61,9 +61,15 @@
return false;
}
 
+   // PHP mangles spaces so that foo%20bar is converted to foo_bar 
and that $_COOKIE['foo bar']
+   // *does not* work. Go figure. It also mangles periods, so that 
foo.bar is converted to
+   // foo_bar, but that *does* work because MediaWiki's getCookie 
transparently maps periods to
+   // underscores. If there is any further bugs reported about 
this, please use base64.
+   $title = strtr( $title, ' ', '_' );
+
$token = implode( '_', array(
'cx',
-   Title::newFromText( $title )->getDBkey(),
+   $title,
$request->getVal( 'from' ),
$request->getVal( 'to' ),
) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2b27f3efd2f63b7e2a83fb953bb49456cd53616
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add User::isSafeToLoad() and ParserOptions::newFromAnon() - change (mediawiki/core)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Add User::isSafeToLoad() and ParserOptions::newFromAnon()
..


Add User::isSafeToLoad() and ParserOptions::newFromAnon()

Useful for avoiding "User::loadFromSession called before the end of
Setup.php".

Bug: T124367
Change-Id: I0b018a623fc833ca95d249ee21667a8f5690d50e
---
M includes/cache/MessageCache.php
M includes/parser/ParserOptions.php
M includes/user/User.php
3 files changed, 22 insertions(+), 4 deletions(-)

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



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 6b938f1..2fae4e3 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -168,14 +168,14 @@
 * @return ParserOptions
 */
function getParserOptions() {
-   global $wgFullyInitialised, $wgContLang;
+   global $wgUser;
 
if ( !$this->mParserOptions ) {
-   if ( !$wgFullyInitialised ) {
+   if ( !$wgUser->isSafeToLoad() ) {
// $wgUser isn't unstubbable yet, so don't try 
to get a
// ParserOptions for it. And don't cache this 
ParserOptions
// either.
-   $po = new ParserOptions( new User, $wgContLang 
);
+   $po = ParserOptions::newFromAnon();
$po->setEditSection( false );
return $po;
}
diff --git a/includes/parser/ParserOptions.php 
b/includes/parser/ParserOptions.php
index e6d5274..0e8d76d 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -600,6 +600,15 @@
}
 
/**
+* Get a ParserOptions object for an anonymous user
+* @return ParserOptions
+*/
+   public static function newFromAnon() {
+   global $wgContLang;
+   return new ParserOptions( new User, $wgContLang );
+   }
+
+   /**
 * Get a ParserOptions object from a given user.
 * Language will be taken from $wgLang.
 *
diff --git a/includes/user/User.php b/includes/user/User.php
index 0fa7d59..8e3b2ec 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -310,6 +310,15 @@
}
 
/**
+* Test if it's safe to load this User object
+* @return bool
+*/
+   public function isSafeToLoad() {
+   global $wgFullyInitialised;
+   return $wgFullyInitialised || $this->mLoadedItems === true || 
$this->mFrom !== 'session';
+   }
+
+   /**
 * Load the user table data for this object from the source given by 
mFrom.
 *
 * @param integer $flags User::READ_* constant bitfield
@@ -327,7 +336,7 @@
$this->queryFlagsUsed = $flags;
 
// If this is called too early, things are likely to break.
-   if ( $this->mFrom === 'session' && empty( $wgFullyInitialised ) 
) {
+   if ( !$wgFullyInitialised && $this->mFrom === 'session' ) {
\MediaWiki\Logger\LoggerFactory::getInstance( 'session' 
)
->warning( 'User::loadFromSession called before 
the end of Setup.php', array(
'exception' => new Exception( 
'User::loadFromSession called before the end of Setup.php' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b018a623fc833ca95d249ee21667a8f5690d50e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Database performance improvements - change (mediawiki...ORES)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Database performance improvements
..


Database performance improvements

Discussed at the bug

Bug: T123795
Change-Id: I48a0f2d578df737cd639445217d284e22c439c19
---
M includes/Cache.php
M includes/Hooks.php
M sql/ores_classification.sql
3 files changed, 16 insertions(+), 5 deletions(-)

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



diff --git a/includes/Cache.php b/includes/Cache.php
index 83b4b8a..4d18cda 100644
--- a/includes/Cache.php
+++ b/includes/Cache.php
@@ -6,7 +6,14 @@
 
 class Cache {
static protected $modelIds;
+   protected $ClassMap;
 
+
+   public function __construct() {
+   $this->ClassMap = array( 'true' => 1, 'false' => 0,
+   'B' => 0, 'C' => 1, 'FA' => 2, 'GA' => 3, 'FA' => 4,
+   'Start' => 5, 'Stub' => 6 );
+   }
/**
 * Save scores to the database
 *
@@ -33,14 +40,18 @@
}
 
$modelId = $this->getModelId( $model );
-
foreach ( $modelOutputs['probability'] as 
$class => $probability ) {
+   $ores_is_predicted = $prediction === 
$class;
+   $class = $this->ClassMap[$class];
+   if ( $class === 0 ) {
+   continue;
+   }
$dbData[] = array(
'oresc_rev' => $revid,
'oresc_model' => $modelId,
'oresc_class' => $class,
'oresc_probability' => 
$probability,
-   'oresc_is_predicted' => ( 
$prediction === $class ),
+   'oresc_is_predicted' => ( 
$ores_is_predicted ),
);
}
}
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 9fba12e..5f5c458 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -84,7 +84,7 @@
$fields[] = 'oresc_probability';
$join_conds['ores_classification'] = array( 'LEFT JOIN',
'rc_this_oldid = oresc_rev ' .
-   'AND oresc_is_predicted = 1 AND oresc_class = \'true\'' 
);
+   'AND oresc_is_predicted = 1 AND oresc_class = 1' );
 
// Add user-based threshold
$fields[] = $threshold . ' AS ores_threshold';
diff --git a/sql/ores_classification.sql b/sql/ores_classification.sql
index c5579d1..ea803ea 100644
--- a/sql/ores_classification.sql
+++ b/sql/ores_classification.sql
@@ -10,9 +10,9 @@
-- Model name (foreign key to ores_model.oresm_id)
oresc_model SMALLINT NOT NULL,
-- Classification title
-   oresc_class VARCHAR(32) NOT NULL,
+   oresc_class TINYINT NOT NULL,
-- Estimated classification probability
-   oresc_probability DECIMAL(10,10) NOT NULL,
+   oresc_probability DECIMAL(3,3) NOT NULL,
-- Whether this classification has been recommended as the most likely
-- candidate.
oresc_is_predicted TINYINT(1) NOT NULL

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48a0f2d578df737cd639445217d284e22c439c19
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Adamw 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Updated language icons - change (mediawiki...ContentTranslation)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Updated language icons
..


Updated language icons

After the language icon was updated, the uses of it in CX
needed an update too to keep them consistent.

Bug: T121977
Change-Id: Ibc658aa7ae43b5fc4e58c10575c01baa8cb0de2a
---
M images/cx-icon-ltr.svg
M images/cx-icon-rtl.svg
M images/cx-notification-green.svg
M modules/campaigns/images/translation.png
M modules/campaigns/images/translation.svg
M modules/dashboard/images/cx-circle.png
M modules/dashboard/images/cx-circle.svg
M modules/entrypoint/images/translation.png
M modules/entrypoint/images/translation.svg
9 files changed, 6 insertions(+), 49 deletions(-)

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



diff --git a/images/cx-icon-ltr.svg b/images/cx-icon-ltr.svg
index 70353b1..9a32e85 100644
--- a/images/cx-icon-ltr.svg
+++ b/images/cx-icon-ltr.svg
@@ -1,14 +1 @@
-
-http://www.w3.org/2000/svg"; viewBox="0 0 264 162" width="264" 
height="162">
-
-
-
-
-
-
-
-
-
-
-
-
+http://www.w3.org/2000/svg"; viewBox="-288 514.5 264 162" width="264" 
height="162">
diff --git a/images/cx-icon-rtl.svg b/images/cx-icon-rtl.svg
index e575504..9c755ec 100644
--- a/images/cx-icon-rtl.svg
+++ b/images/cx-icon-rtl.svg
@@ -1,16 +1 @@
-
-http://www.w3.org/2000/svg"; viewBox="0 0 264 162" width="264" 
height="162">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+http://www.w3.org/2000/svg"; viewBox="-288 514.5 264 162" width="264" 
height="162">
diff --git a/images/cx-notification-green.svg b/images/cx-notification-green.svg
index 4b1aede..1984a40 100644
--- a/images/cx-notification-green.svg
+++ b/images/cx-notification-green.svg
@@ -1,4 +1 @@
-
-http://www.w3.org/2000/svg"; viewBox="0 0 30 30">
-
-
+http://www.w3.org/2000/svg"; viewBox="-405 580.5 30 30">
diff --git a/modules/campaigns/images/translation.png 
b/modules/campaigns/images/translation.png
index c6a7642..277ab47 100644
--- a/modules/campaigns/images/translation.png
+++ b/modules/campaigns/images/translation.png
Binary files differ
diff --git a/modules/campaigns/images/translation.svg 
b/modules/campaigns/images/translation.svg
index c660fbd..1bdd54e 100644
--- a/modules/campaigns/images/translation.svg
+++ b/modules/campaigns/images/translation.svg
@@ -1,4 +1 @@
-
-http://www.w3.org/2000/svg"; viewBox="0 0 24 24" 
enable-background="new 0 0 24 24">
-
-
+http://www.w3.org/2000/svg"; viewBox="0 0 24 24" enable-background="new 0 
0 24 24">
diff --git a/modules/dashboard/images/cx-circle.png 
b/modules/dashboard/images/cx-circle.png
index c7aab70..b0a9644 100644
--- a/modules/dashboard/images/cx-circle.png
+++ b/modules/dashboard/images/cx-circle.png
Binary files differ
diff --git a/modules/dashboard/images/cx-circle.svg 
b/modules/dashboard/images/cx-circle.svg
index c4dd97c..f609e3b 100644
--- a/modules/dashboard/images/cx-circle.svg
+++ b/modules/dashboard/images/cx-circle.svg
@@ -1,7 +1 @@
-
-http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:sketch="http://www.bohemiancoding.com/sketch/ns";>
-
-
-
-
-
+http://www.w3.org/2000/svg"; width="92px" height="92px" viewBox="-374 
549.5 92 92">
diff --git a/modules/entrypoint/images/translation.png 
b/modules/entrypoint/images/translation.png
index 008eabd..277ab47 100644
--- a/modules/entrypoint/images/translation.png
+++ b/modules/entrypoint/images/translation.png
Binary files differ
diff --git a/modules/entrypoint/images/translation.svg 
b/modules/entrypoint/images/translation.svg
index c660fbd..1bdd54e 100644
--- a/modules/entrypoint/images/translation.svg
+++ b/modules/entrypoint/images/translation.svg
@@ -1,4 +1 @@
-
-http://www.w3.org/2000/svg"; viewBox="0 0 24 24" 
enable-background="new 0 0 24 24">
-
-
+http://www.w3.org/2000/svg"; viewBox="0 0 24 24" enable-background="new 0 
0 24 24">

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc658aa7ae43b5fc4e58c10575c01baa8cb0de2a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Pginer 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Reintroduce 'emacs-lisp' as an alias for the Emacs Lisp lexer - change (mediawiki...SyntaxHighlight_GeSHi)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Reintroduce 'emacs-lisp' as an alias for the Emacs Lisp lexer
..


Reintroduce 'emacs-lisp' as an alias for the Emacs Lisp lexer

'emacs-lisp' was an alias for the Emacs Lisp lexer.
It got dropped in Pygments commit 811926b, probably by accident.
So, declare it as a compatability alias until it is restored upstream.
Upstream bug: https://bitbucket.org/birkenfeld/pygments-main/issues/1207

Change-Id: I25c0e75a337c623529705c45bee0dc13dfdfd92c
---
M SyntaxHighlight_GeSHi.compat.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/SyntaxHighlight_GeSHi.compat.php b/SyntaxHighlight_GeSHi.compat.php
index 9f3a409..2d66edb 100644
--- a/SyntaxHighlight_GeSHi.compat.php
+++ b/SyntaxHighlight_GeSHi.compat.php
@@ -113,6 +113,13 @@
 
// bibtex is basically LaTeX
'bibtex' => 'latex',
+
+   // 'emacs-lisp' was an alias for the Emacs Lisp lexer.
+   // It got dropped in Pygments commit 811926b, probably by 
accident.
+   // Declare it here until it is restored upstream.
+   // Upstream bug:
+   //   https://bitbucket.org/birkenfeld/pygments-main/issues/1207
+   'emacs-lisp' => 'elisp',
);
 
public function __construct( $html ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25c0e75a337c623529705c45bee0dc13dfdfd92c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove duplicate values from the lexer list - change (mediawiki...SyntaxHighlight_GeSHi)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Remove duplicate values from the lexer list
..


Remove duplicate values from the lexer list

Update the updateLexerList.php maintenance script so that its output contains
no duplicate values, and remove existing duplicates from the lexer list.

Change-Id: I1ee094bb73f1a3916530e533ba3d151e50b34ce3
---
M SyntaxHighlight_GeSHi.lexers.php
M maintenance/updateLexerList.php
2 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/SyntaxHighlight_GeSHi.lexers.php b/SyntaxHighlight_GeSHi.lexers.php
index 9f26c5b..c1b34d4 100644
--- a/SyntaxHighlight_GeSHi.lexers.php
+++ b/SyntaxHighlight_GeSHi.lexers.php
@@ -132,7 +132,6 @@
'css+jinja',
'css+lasso',
'css+mako',
-   'css+mako',
'css+mozpreproc',
'css+myghty',
'css+php',
@@ -230,7 +229,6 @@
'html+kid',
'html+lasso',
'html+mako',
-   'html+mako',
'html+myghty',
'html+php',
'html+ruby',
@@ -285,7 +283,6 @@
'javascript+jinja',
'javascript+lasso',
'javascript+mako',
-   'javascript+mako',
'javascript+mozpreproc',
'javascript+myghty',
'javascript+php',
@@ -306,7 +303,6 @@
'js+genshitext',
'js+jinja',
'js+lasso',
-   'js+mako',
'js+mako',
'js+myghty',
'js+php',
@@ -359,7 +355,6 @@
'm2',
'make',
'makefile',
-   'mako',
'mako',
'man',
'maql',
@@ -620,7 +615,6 @@
'xml+jinja',
'xml+kid',
'xml+lasso',
-   'xml+mako',
'xml+mako',
'xml+myghty',
'xml+php',
diff --git a/maintenance/updateLexerList.php b/maintenance/updateLexerList.php
index b5a7fc5..414d71e 100644
--- a/maintenance/updateLexerList.php
+++ b/maintenance/updateLexerList.php
@@ -62,6 +62,7 @@
$lexers = array_merge( $lexers, $newLexers );
}
}
+   $lexers = array_unique( $lexers );
sort( $lexers );
 
$code = "https://gerrit.wikimedia.org/r/268339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ee094bb73f1a3916530e533ba3d151e50b34ce3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Added a seperate error message for mkdir failures - change (mediawiki/core)

2016-02-03 Thread PlasmaPower (Code Review)

PlasmaPower has uploaded a new change for review.

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

Change subject: Added a seperate error message for mkdir failures
..

Added a seperate error message for mkdir failures

Bug: T125595
Change-Id: Id2daaad45c594d6f6265120039ca30742472987e
---
M includes/media/SVG.php
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/268350/1

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 1118598..457137b 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -204,7 +204,17 @@
// 
https://git.gnome.org/browse/librsvg/commit/?id=f01aded72c38f0e18bc7ff67dee800e380251c8e
$tmpDir = wfTempDir() . '/svg_' . wfRandomString( 24 );
$lnPath = "$tmpDir/" . basename( $srcPath );
-   $ok = mkdir( $tmpDir, 0771 ) && symlink( $srcPath, $lnPath );
+   $ok = mkdir( $tmpDir, 0771 );
+   if ( !$ok ) {
+   wfDebugLog( 'thumbnail',
+   sprintf( 'Thumbnail failed on %s: could not 
create temporary directory %s',
+   wfHostname(), $tmpDir ) );
+   return new MediaTransformError( 'thumbnail_error',
+   $params['width'], $params['height'],
+   wfMessage( 'thumbnail-temp-create' )->text()
+   );
+   }
+   $ok = symlink( $srcPath, $lnPath );
/** @noinspection PhpUnusedLocalVariableInspection */
$cleaner = new ScopedCallback( function () use ( $tmpDir, 
$lnPath ) {
MediaWiki\suppressWarnings();

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

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

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

[MediaWiki-commits] [Gerrit] Add completion suggester for prefix search hook - change (mediawiki...CirrusSearch)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Add completion suggester for prefix search hook
..


Add completion suggester for prefix search hook

Replace special API with SearchEngine API for completion suggester.
Stop using PrefixSearch hooks and use SearchEngine overrides instead.

Bug: T121430
Change-Id: I5ccbd2257386a6492945dcc796dc90332dd17326
Depends-on: Ie78649591dff94d21b72fad8e4e5eab010a461df
---
M CirrusSearch.php
M autoload.php
M includes/Api/Suggest.php
M includes/CirrusSearch.php
M includes/CompletionSuggester.php
M includes/ElasticsearchIntermediary.php
M includes/Hooks.php
D includes/Search/SearchSuggestion.php
D includes/Search/SearchSuggestionSet.php
M includes/Searcher.php
M tests/browser/features/step_definitions/search_steps.rb
M tests/browser/features/support/cirrus_search_api_helper.rb
D tests/unit/Search/SearchSuggestionSetTest.php
13 files changed, 206 insertions(+), 689 deletions(-)

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



diff --git a/CirrusSearch.php b/CirrusSearch.php
index c665578..4cfcf0e 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -897,7 +897,6 @@
 $wgHooks[ 'UnitTestsList' ][] = 'CirrusSearch\Hooks::onUnitTestsList';
 $wgHooks[ 'ShowSearchHitTitle' ][] = 
'CirrusSearch\Hooks::onShowSearchHitTitle';
 $wgHooks[ 'GetBetaFeaturePreferences' ][] = 
'CirrusSearch\Hooks::getBetaFeaturePreferences';
-$wgHooks[ 'BeforePageDisplay' ][] = 'CirrusSearch\Hooks::onBeforePageDisplay';
 
 /**
  * i18n
diff --git a/autoload.php b/autoload.php
index 2473299..ee26da6 100644
--- a/autoload.php
+++ b/autoload.php
@@ -105,8 +105,6 @@
'CirrusSearch\\Search\\ResultsType' => __DIR__ . 
'/includes/Search/ResultsType.php',
'CirrusSearch\\Search\\ScriptScoreFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\SearchContext' => __DIR__ . 
'/includes/Search/SearchContext.php',
-   'CirrusSearch\\Search\\SearchSuggestion' => __DIR__ . 
'/includes/Search/SearchSuggestion.php',
-   'CirrusSearch\\Search\\SearchSuggestionSet' => __DIR__ . 
'/includes/Search/SearchSuggestionSet.php',
'CirrusSearch\\Search\\SearchTextBaseQueryBuilder' => __DIR__ . 
'/includes/Search/SearchTextQueryBuilders.php',
'CirrusSearch\\Search\\SearchTextCommonTermsQueryBuilder' => __DIR__ . 
'/includes/Search/SearchTextQueryBuilders.php',
'CirrusSearch\\Search\\SearchTextQueryBuilder' => __DIR__ . 
'/includes/Search/SearchTextQueryBuilders.php',
diff --git a/includes/Api/Suggest.php b/includes/Api/Suggest.php
index acf4e70..95685ce 100644
--- a/includes/Api/Suggest.php
+++ b/includes/Api/Suggest.php
@@ -1,8 +1,7 @@
 setNamespaces( array ( NS_MAIN ) );
-
-   $limit = $this->getParameter( 'limit' );
-   $cirrus->setLimitOffset( $limit );
+   $search = \SearchEngine::create();
+   // Force-enable completion suggester
+   
$search->setFeatureData(CirrusSearch::COMPLETION_SUGGESTER_FEATURE, 'enabled' );
+   $search->setNamespaces( array ( NS_MAIN ) );
 
$queryText = $this->getParameter( 'text' );
if ( !$queryText ) {
return;
}
 
-   $suggestions = $cirrus->searchSuggestions( $queryText );
+   $limit = $this->getParameter( 'limit' );
+   $search->setLimitOffset( $limit );
+
+   $suggestions = $search->completionSearchWithVariants( 
$queryText );
// Use the same cache options used by OpenSearch
$this->getMain()->setCacheMaxAge( $this->getConfig()->get( 
'SearchSuggestCacheExpiry' ) );
$this->getMain()->setCacheMode( 'public' );
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index a4bc7b9..ae7d50c 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -6,9 +6,9 @@
 use CirrusSearch\Searcher;
 use CirrusSearch\CompletionSuggester;
 use CirrusSearch\Search\ResultSet;
-use CirrusSearch\Search\SearchSuggestion;
-use CirrusSearch\Search\SearchSuggestionSet;
 use CirrusSearch\SearchConfig;
+use CirrusSearch\Search\FancyTitleResultsType;
+use CirrusSearch\Search\TitleResultsType;
 use MediaWiki\Logger\LoggerFactory;
 
 /**
@@ -36,6 +36,8 @@
const MORE_LIKE_THIS_PREFIX = 'morelike:';
const MORE_LIKE_THIS_JUST_WIKIBASE_PREFIX = 'morelikewithwikibase:';
 
+   const COMPLETION_SUGGESTER_FEATURE = 'completionSuggester';
+
/**
 * @var string The last prefix substituted by replacePrefixes.
 */
@@ -56,10 +58,23 @@
 */
private $connection;
 
+   /**
+* Search configuration.
+* @var SearchConfig
+*/
+   private $config;
+
+   /**
+* Current request.
+*

[MediaWiki-commits] [Gerrit] Fixed handling of search (LIKE) strings containing '&' - change (mediawiki...SemanticDrilldown)

2016-02-03 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Fixed handling of search (LIKE) strings containing '&'
..


Fixed handling of search (LIKE) strings containing '&'

Change-Id: Id1434b7578e0c295ef8c3980746dc723b6e63be5
---
M includes/SD_AppliedFilter.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/SD_AppliedFilter.php b/includes/SD_AppliedFilter.php
index 4e7891a..0b91981 100644
--- a/includes/SD_AppliedFilter.php
+++ b/includes/SD_AppliedFilter.php
@@ -21,7 +21,10 @@
if ( $search_terms != null ) {
$af->search_terms = array();
foreach( $search_terms as $search_term ) {
-   $af->search_terms[] = htmlspecialchars( 
str_replace( '_', ' ', $search_term ) );
+   $search_term = htmlspecialchars( str_replace( 
'_', ' ', $search_term ) );
+   // Ampersands need to be restored - hopefully
+   // this is safe.
+   $af->search_terms[] = str_replace( '&', 
'&', $search_term );
}
}
if ( $lower_date != null ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1434b7578e0c295ef8c3980746dc723b6e63be5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticDrilldown
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixed handling of search (LIKE) strings containing '&' - change (mediawiki...SemanticDrilldown)

2016-02-03 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

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

Change subject: Fixed handling of search (LIKE) strings containing '&'
..

Fixed handling of search (LIKE) strings containing '&'

Change-Id: Id1434b7578e0c295ef8c3980746dc723b6e63be5
---
M includes/SD_AppliedFilter.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticDrilldown 
refs/changes/49/268349/1

diff --git a/includes/SD_AppliedFilter.php b/includes/SD_AppliedFilter.php
index 4e7891a..0b91981 100644
--- a/includes/SD_AppliedFilter.php
+++ b/includes/SD_AppliedFilter.php
@@ -21,7 +21,10 @@
if ( $search_terms != null ) {
$af->search_terms = array();
foreach( $search_terms as $search_term ) {
-   $af->search_terms[] = htmlspecialchars( 
str_replace( '_', ' ', $search_term ) );
+   $search_term = htmlspecialchars( str_replace( 
'_', ' ', $search_term ) );
+   // Ampersands need to be restored - hopefully
+   // this is safe.
+   $af->search_terms[] = str_replace( '&', 
'&', $search_term );
}
}
if ( $lower_date != null ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1434b7578e0c295ef8c3980746dc723b6e63be5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticDrilldown
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] T107481: Steal stopWorker from service-runner - change (mediawiki...parsoid)

2016-02-03 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: T107481: Steal stopWorker from service-runner
..

T107481: Steal stopWorker from service-runner

Change-Id: I3b739a977b0fb8e90f57523c7e835e614aa55634
---
M bin/server.js
1 file changed, 63 insertions(+), 4 deletions(-)


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

diff --git a/bin/server.js b/bin/server.js
index cbd76ea..45531d8 100755
--- a/bin/server.js
+++ b/bin/server.js
@@ -26,6 +26,7 @@
 var cluster = require('cluster');
 var path = require('path');
 var util = require('util');
+var Promise = require('../lib/utils/promise.js');
 
 // process arguments
 var opts = require("yargs")
@@ -107,6 +108,63 @@
 
 var timer = parsoidConfig.performanceTimer;
 
+var compareVersions = function(versionString, atLeast) {
+   var version = versionString.match(/^v(\d+)\.(\d+)\.(\d+)$/);
+   console.assert(Array.isArray(version), 'Cannot determine node 
version.');
+   version = version.slice(1).map(function(d) {
+   return parseInt(d, 10);
+   });
+   for (var i = 0; i < atLeast.length; i++) {
+   if (version[i] > atLeast[i]) {
+   return true;
+   } else if (version[i] === atLeast[i]) {
+   if (i === atLeast.length - 1) {
+   return true;
+   } else {
+   continue;
+   }
+   } else {
+   break;
+   }
+   }
+   return false;
+};
+
+// Workaround for https://github.com/nodejs/node/pull/3510
+var sufficientNodeVersion = compareVersions(process.version, [4, 2, 2]);
+var fixClusterHandleLeak = function(worker) {
+   if (sufficientNodeVersion) { return; }
+   var exitHandler = worker.process.listeners('exit')[0].listener;
+   var disconnectHandler = 
worker.process.listeners('disconnect')[0].listener;
+   worker.process.removeListener('exit', exitHandler);
+   worker.process.once('exit', function() {
+   if (worker.state !== 'disconnected') {
+   disconnectHandler();
+   }
+   exitHandler.apply(this, arguments);
+   });
+};
+
+var stopWorker = function(workerId) {
+   var worker = cluster.workers[workerId];
+   var p = new Promise(function(resolve) {
+   var timeout = setTimeout(function() {
+   // 
https://nodejs.org/api/cluster.html#cluster_worker_kill_signal_sigterm
+   // `worker.kill()` wants `worker.state === 
'disconnected'`.
+   // If that doesn't happen shortly, escalate!
+   process.kill(worker.process.pid, 'SIGKILL');
+   resolve();
+   }, 10 * 1000);
+   worker.on('disconnect', function() {
+   worker.kill('SIGKILL');
+   clearTimeout(timeout);
+   resolve();
+   });
+   });
+   worker.disconnect();
+   return p;
+};
+
 if (cluster.isMaster && argv.n > 0) {
// Master
 
@@ -114,6 +172,7 @@
var timeouts = new Map();
var spawn = function() {
var worker = cluster.fork();
+   fixClusterHandleLeak(worker);
worker.on('message', timeoutHandler.bind(null, worker));
};
 
@@ -137,7 +196,7 @@
msg.location, pid
));
if (timer) { 
timer.count('worker.exit.SIGKILL', ''); }
-   worker.kill("SIGKILL");
+   stopWorker(worker.id);
spawn();
}
}, msg.timeout));
@@ -160,9 +219,9 @@
});
 
var shutdownMaster = function() {
-   processLogger.log("info", "shutting down, killing workers");
-   cluster.disconnect(function() {
-   processLogger.log("info", "exiting");
+   processLogger.log('info', 'shutting down, killing workers');
+   Promise.map(Object.keys(cluster.workers), 
stopWorker).then(function() {
+   processLogger.log('info', 'exiting');
process.exit(0);
});
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b739a977b0fb8e90f57523c7e835e614aa55634
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

___
MediaWiki-commits mailing list
M

[MediaWiki-commits] [Gerrit] Tools: Remove obsolete code - change (operations/puppet)

2016-02-03 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Tools: Remove obsolete code
..

Tools: Remove obsolete code

Change-Id: Ic4316905ae15f780e842f48b41b21ef0d62338ed
---
M modules/toollabs/manifests/proxy.pp
D modules/toollabs/templates/initscripts/proxylistener.systemd.erb
D modules/toollabs/templates/initscripts/proxylistener.upstart.erb
3 files changed, 0 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/268347/1

diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 167ce84..b96ebdb 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -52,27 +52,6 @@
 srange => "@resolve((${proxy_nodes}))",
 }
 
-# TODO: Remove after deployment.
-file { '/usr/local/sbin/proxylistener':
-ensure => absent,
-}
-
-# TODO: Remove after deployment.
-base::service_unit { 'proxylistener':
-ensure  => absent,
-upstart => true,
-systemd => true,
-}
-
-# TODO: Remove after deployment.
-ferm::service { 'proxylistener-port':
-ensure => absent,
-proto  => 'tcp',
-port   => '8282',
-srange => '$INTERNAL',
-desc   => 'Proxylistener port, open to just labs'
-}
-
 file { '/var/www/error/favicon.ico':
 ensure  => file,
 source  => 'puppet:///modules/toollabs/favicon.ico',
diff --git a/modules/toollabs/templates/initscripts/proxylistener.systemd.erb 
b/modules/toollabs/templates/initscripts/proxylistener.systemd.erb
deleted file mode 100644
index 44ae0c7..000
--- a/modules/toollabs/templates/initscripts/proxylistener.systemd.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=ProxyListener
-
-[Service]
-ExecStart=/usr/local/sbin/proxylistener
-
-[Install]
-WantedBy=multi-user.target
diff --git a/modules/toollabs/templates/initscripts/proxylistener.upstart.erb 
b/modules/toollabs/templates/initscripts/proxylistener.upstart.erb
deleted file mode 100644
index b93934a..000
--- a/modules/toollabs/templates/initscripts/proxylistener.upstart.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-# proxylistener - setup routing info in redis for Yuviproxy
-
-description "ProxyListener"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-limit nofile 8192 8192
-respawn
-
-console log
-
-exec /usr/local/sbin/proxylistener

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4316905ae15f780e842f48b41b21ef0d62338ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] Tools: Decommission proxylistener - change (operations/puppet)

2016-02-03 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Tools: Decommission proxylistener
..

Tools: Decommission proxylistener

Change-Id: I2c62dbcc6f18adb0d84ea31a8ee999b44e514963
---
D modules/toollabs/files/proxylistener.py
M modules/toollabs/manifests/proxy.pp
2 files changed, 6 insertions(+), 145 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/268346/1

diff --git a/modules/toollabs/files/proxylistener.py 
b/modules/toollabs/files/proxylistener.py
deleted file mode 100644
index e71712c..000
--- a/modules/toollabs/files/proxylistener.py
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/env python
-#
-#  Copyright (C) 2013 Yuvi Panda 
-#
-#  Permission to use, copy, modify, and/or distribute this software for any
-#  purpose with or without fee is hereby granted, provided that the above
-#  copyright notice and this permission notice appear in all copies.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-#  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-#  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-#  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-#  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-#  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-"""
-Simple TCP server that keeps routes in the Redis db for authenticated requests.
-
-The routes are kept as long as the socket making the request is open, and
-cleaned up right afterwards. identd is used for authentication - while normally
-that is a terrible idea, this is okay in the toollabs environment because we
-only have a limited number of trusted admins. This also allows routes to be
-added only for URLs that are under the URL prefix allocated for the tool making
-the request. For example, a tool named 'testtool' can ask only for URLs that
-start with /testtool/ to be routed to where it wants.
-
-The socket server is a threaded implementation. Python can not be truly
-parallel (hello, GIL!), but for our purposes it is good enough.
-"""
-import logging
-import socket
-import SocketServer
-
-import redis
-
-
-HOST, PORT = "0.0.0.0", 8282
-LOG_FILE = "/var/log/proxylistener"
-LOG_FORMAT = "%(asctime)s %(message)s"
-
-logging.basicConfig(filename=LOG_FILE, format=LOG_FORMAT, level=logging.DEBUG)
-
-with open('/etc/wmflabs-project', 'r') as f:
-projectprefix = f.read().strip() + '.'
-
-
-def get_remote_user(remote_host, remote_port, local_port):
-"""
-Uses RFC1413 (ident protocol) to identify which user is making the request.
-
-Returns username if found, None if there was an error.
-
-This is secure enough for toollabs since we do not have arbitrary admins.
-"""
-s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-s.connect((remote_host, 113))
-
-request = u"%s,%s\n" % (remote_port, local_port)
-
-s.send(request.encode("ascii"))
-resp = s.recv(256)
-s.close()
-
-resp_parts = [r.strip() for r in resp.split(":")]
-if "USERID" not in resp_parts:
-# Some auth error has occured. Abort!
-logging.log(logging.INFO, "Identd auth failed, sent %s got back %s" %
-(request.strip(), resp.strip()))
-return None
-
-return resp_parts[-1]
-
-
-class RouteRequestHandler(SocketServer.StreamRequestHandler):
-"""
-Handles incoming connections from clients asking for routes.
-"""
-def handle(self):
-
-user = get_remote_user(self.client_address[0],
-   self.client_address[1], PORT)
-# For some reason the identd response gave an error or failed otherwise
-# This should usually not happen, so we'll just ask folks to 'Contact
-# an administrator'
-if user is None:
-self.request.send("Identd authentication failed. " +
-  "Please contact an administrator")
-self.request.close()
-return
-
-# Only tool accounts are allowed to ask for routes
-if not user.startswith(projectprefix):
-self.request.send("This service available only to tool accounts")
-self.request.close()
-return
-
-toolname = user[len(projectprefix):]
-
-redis_key = "prefix:%s" % toolname
-
-command = self.rfile.readline().strip()
-route = self.rfile.readline().strip()
-red = redis.Redis()  # Always connect to localhost
-
-if command == 'register':
-destination = self.rfile.readline().strip()
-logging.log(logging.INFO, "Received request from %s for %s to %s",
-toolname, route, destination)
-
-red.hset(redis_key, route, destinatio

[MediaWiki-commits] [Gerrit] [WIP] ores extension as a beta feature - change (mediawiki...ORES)

2016-02-03 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: [WIP] ores extension as a beta feature
..

[WIP] ores extension as a beta feature

Bug: T125762
Change-Id: Ibc890cf4a80d78c381ed04362e00f31df8e8eaeb
---
M extension.json
M includes/Hooks.php
2 files changed, 62 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index 9eae0a2..17833cd 100644
--- a/extension.json
+++ b/extension.json
@@ -31,6 +31,9 @@
"EnhancedChangesListModifyLineData": [
"ORES\\Hooks::onEnhancedChangesListModifyLineData"
],
+   "GetBetaFeaturePreferences": [
+   "ORES\\Hooks::onGetBetaFeaturePreferences"
+   ],
"GetPreferences": [
"ORES\\Hooks::onGetPreferences"
],
diff --git a/includes/Hooks.php b/includes/Hooks.php
index ed0c924..396f833 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -2,6 +2,7 @@
 
 namespace ORES;
 
+use BetaFeatures;
 use ChangesList;
 use ChangesListSpecialPage;
 use DatabaseUpdater;
@@ -55,6 +56,10 @@
 * @param $filters
 */
public static function onChangesListSpecialPageFilters( 
ChangesListSpecialPage $clsp, &$filters ) {
+   if ( self::oresEnabled( $clsp->getUser() ) === false ) {
+   return true;
+   }
+
$filters['hidenondamaging'] = array(
'msg' => 'ores-damaging-filter',
'default' => false,
@@ -78,6 +83,10 @@
$name, array &$tables, array &$fields, array &$conds,
array &$query_options, array &$join_conds, FormOptions $opts
) {
+   if ( self::oresEnabled() === false ) {
+   return true;
+   }
+
$threshold = self::getThreshold();
 
$tables[] = 'ores_classification';
@@ -117,6 +126,10 @@
public static function onEnhancedChangesListModifyLineData( 
EnhancedChangesList $ecl, array &$data,
array $block, RCCacheEntry $rcObj
) {
+   if ( self::oresEnabled( $ecl->getUser() ) === false ) {
+   return true;
+   }
+
self::processRecentChangesList( $rcObj, $data );
 
return true;
@@ -132,6 +145,9 @@
public static function onEnhancedChangesListModifyBlockLineData( 
EnhancedChangesList $ecl,
array &$data, RCCacheEntry $rcObj
) {
+   if ( self::oresEnabled( $ecl->getUser() ) === false ) {
+   return true;
+   }
 
self::processRecentChangesList( $rcObj, $data );
 
@@ -152,6 +168,10 @@
public static function onOldChangesListRecentChangesLine( ChangesList 
&$changesList, &$s,
$rc, &$classes = array()
) {
+   if ( self::oresEnabled( $changesList->getUser() ) === false ) {
+   return true;
+   }
+
$damaging = self::getScoreRecentChangesList( $rc );
if ( $damaging ) {
$separator = ' . 
. ';
@@ -216,6 +236,9 @@
public static function onGetPreferences( $user, &$preferences ) {
global $wgOresDamagingThresholds;
 
+   if ( self::oresEnabled( $user ) === false ) {
+   return true;
+   }
$options = array();
foreach ( $wgOresDamagingThresholds as $case => $value ) {
$text = wfMessage( 'ores-damaging-' . $case )->parse();
@@ -235,7 +258,43 @@
 * Add CSS styles to output page
 */
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin ) {
+   if ( self::oresEnabled( $out->getUser() ) === false ) {
+   return true;
+   }
$out->addModuleStyles( 'ext.ores.styles' );
return true;
}
+
+   /**
+* Make a beta feature
+*/
+   public static function onGetBetaFeaturePreferences( $user, &$prefs ) {
+   global $wgExtensionAssetsPath;
+
+   $prefs['ores-enabled'] = array(
+   'label-message' => 'ores-beta-feature-message',
+   'desc-message' => 'ores-beta-feature-description',
+   //'screenshot' => array(
+   //'ltr' => 
"$wgExtensionAssetsPath/ORES/images/screenshot-ltr.png",
+   //'rtl' => 
"$wgExtensionAssetsPath/ORES/images/screenshot-rtl.png",
+   //),
+   'info-link' => 
'https://www.mediawiki.org/wiki/Extension:ORES',
+   'discussion-link' => 
'ht

[MediaWiki-commits] [Gerrit] Add user agent data retrieval to portal codebase - change (wikimedia...golden)

2016-02-03 Thread OliverKeyes (Code Review)

OliverKeyes has uploaded a new change for review.

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

Change subject: Add user agent data retrieval to portal codebase
..

Add user agent data retrieval to portal codebase

Adds the automated retrieval of any (parsed) user agent with >=0.5%
of users per day.

Bug: T124824
Change-Id: I10d5644e4afa0067195d1f7d0d228ff5ca8d1ad2
---
M config.R
M portal/portal.R
2 files changed, 14 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/44/268344/1

diff --git a/config.R b/config.R
index cbc2d2c..5ce177a 100644
--- a/config.R
+++ b/config.R
@@ -16,4 +16,5 @@
   library(plyr)
   library(magrittr)
   library(survival)
+  library(uaparser)
 })
diff --git a/portal/portal.R b/portal/portal.R
index e16d90c..de457d2 100644
--- a/portal/portal.R
+++ b/portal/portal.R
@@ -9,7 +9,8 @@
  event_destination AS destination,
  event_event_type AS type,
  event_section_used AS section_used,
- timestamp AS ts",
+ timestamp AS ts,
+ userAgent AS user_agent",
  date = date,
  table = table,
  conditionals = "((event_cohort IS NULL) OR (event_cohort 
IN ('null','baseline')))")
@@ -55,10 +56,21 @@
 "United Kingdom", "France", "Germany", "China", 
"Canada", 
 "Australia")
   
+  # Get user agent data
+  olivr::set_proxies() # To allow for the latest YAML to be retrieved.
+  uaparser::update_regexes()
+  ua_data <- as.data.table(uaparser::parse_agents(data$user_agent, fields = 
c("browser","browser_major")))
+  ua_data <- ua_data[,j=list(amount = .N), by = c("browser","browser_major")]
+  ua_data$date <- data$date[1]
+  ua_data$percent <- round((ua_data$amount/sum(ua_data$amount))*100, 2)
+  ua_data <- ua_data[ua_data$percent >= 0.5, c("date", "browser", 
"browser_major", "percent"), with = FALSE]
+  setnames(ua_data, 3, "version")
+  
   conditional_write(clickthrough_data, file.path(base_path, 
"clickthrough_rate.tsv"))
   conditional_write(breakdown_data, file.path(base_path, 
"clickthrough_breakdown.tsv"))
   conditional_write(dwell_output, file.path(base_path, "dwell_metrics.tsv"))
   conditional_write(country_data, file.path(base_path, "country_data.tsv"))
+  conditional_write(ua_data, file.path(base_path, "user_agent_data.tsv"))
   
   return(invisible())
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10d5644e4afa0067195d1f7d0d228ff5ca8d1ad2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: OliverKeyes 

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

[MediaWiki-commits] [Gerrit] Switch list.php to proxymanager's new API - change (labs/toollabs)

2016-02-03 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Switch list.php to proxymanager's new API
..

Switch list.php to proxymanager's new API

Change-Id: I717c8d220625971b169e7a578500e89c69545d74
---
M www/content/list.php
1 file changed, 4 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs 
refs/changes/43/268343/1

diff --git a/www/content/list.php b/www/content/list.php
index 5fb09e6..ef6921d 100644
--- a/www/content/list.php
+++ b/www/content/list.php
@@ -38,18 +38,12 @@
 
 // Query list of active web services.
 $active_proxy = file_get_contents( '/etc/active-proxy' );
-$active_proxies_json = file_get_contents( 'http://' . $active_proxy . 
':8081/list' );
-$tooldyn = array();
+$active_proxies_json = file_get_contents( 'http://' . $active_proxy . 
':8081/v1/proxy-forwards' );
 if ( $active_proxies_json === false ) {
-   error_log( 'Cannot retrieve list of active proxies from http://' . 
$active_proxy . ':8081/list' );
+   error_log( 'Cannot retrieve list of active proxies from http://' . 
$active_proxy . ':8081/v1/proxy-forwards' );
+   $active_proxies = array();
 } else {
$active_proxies = json_decode( $active_proxies_json, true );
-   foreach ( $active_proxies as $key => $value ) {
-   if ( array_key_exists( 'status', $value) &&
-   $value['status'] == 'active' ) {
-   $tooldyn[$key] = 1;
-   }
-   }
 }
 
 $ini = parse_ini_file( '/data/project/admin/replica.my.cnf' );
@@ -81,7 +75,7 @@
 ', htmlspecialchars( $tool ), '';
-   } elseif ( array_key_exists( $tool, $tooldyn ) &&
+   } elseif ( in_array( $tool, $active_proxies ) &&
!array_key_exists( 0, $json )
) {
echo '', 
htmlspecialchars( $tool ), '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I717c8d220625971b169e7a578500e89c69545d74
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] Node.JS services: Use nodejs 4.2 - change (mediawiki/vagrant)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Node.JS services: Use nodejs 4.2
..


Node.JS services: Use nodejs 4.2

We have started running node 4.2 in production, and there are already
some services, like Mathoid and Graphoid, that are not compatible with
nodejs 0.1x any more. This patch adds the nodesource APT repo for Node
4.x and forces a reinstall of the nodejs package.

Note: the PS is rather messy due to various, not-so-sane puppet and apt
dependencies:
- the node 4.2 repo requires HTTPS
- the repo thus needs to be installed *before* an apt-get update, but
  *after* installing the apt-transport-https package
- npm and nodejs-legacy need to be installed before updating nodejs to
  4.2 because the node repo does not provide them, but in trusty their
  dependencies on nodejs are declared in such a way that installing
  nodejs 4.2 first breaks their installation.

Bug: T124996
Change-Id: I765b81e18512ce65f9eecde0b771d835b99d7096
---
M puppet/modules/apt/manifests/init.pp
M puppet/modules/contenttranslation/manifests/cxserver.pp
M puppet/modules/mediawiki/manifests/parsoid.pp
A puppet/modules/npm/files/nodesource-pubkey.asc
A puppet/modules/npm/files/nodesource.sources.list
M puppet/modules/npm/manifests/init.pp
M puppet/modules/service/manifests/node.pp
M puppet/modules/statsd/manifests/init.pp
8 files changed, 113 insertions(+), 13 deletions(-)

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



diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index c177c1a..a9c2e9f 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -10,6 +10,12 @@
 schedule => hourly,
 }
 
+exec { 'ins-apt-transport-https':
+command => '/usr/bin/apt-get update && /usr/bin/apt-get install -y 
--force-yes apt-transport-https',
+environment => 'DEBIAN_FRONTEND=noninteractive',
+unless  => '/usr/bin/dpkg -l apt-transport-https',
+}
+
 file  { '/usr/local/share/wikimedia-pubkey.asc':
 source => 'puppet:///modules/apt/wikimedia-pubkey.asc',
 before => File['/etc/apt/sources.list.d/wikimedia.list'],
diff --git a/puppet/modules/contenttranslation/manifests/cxserver.pp 
b/puppet/modules/contenttranslation/manifests/cxserver.pp
index 2451977..283eaf2 100644
--- a/puppet/modules/contenttranslation/manifests/cxserver.pp
+++ b/puppet/modules/contenttranslation/manifests/cxserver.pp
@@ -84,14 +84,12 @@
 $cert,
 $workers,
 ) {
-require_package( 'nodejs' )
-require_package( 'nodejs-legacy' )
+require ::npm
 
 git::clone { 'mediawiki/services/cxserver/deploy':
 directory => $dir,
 owner => $::share_owner,
 group => $::share_group,
-require   => Package['nodejs', 'nodejs-legacy'],
 }
 
 file { "${dir}/src/config.js":
@@ -101,7 +99,6 @@
 
 file { '/etc/init/cxserver.conf':
 content => template('contenttranslation/cxserver.conf.erb'),
-require => Package['nodejs', 'nodejs-legacy'],
 }
 
 service { 'cxserver':
diff --git a/puppet/modules/mediawiki/manifests/parsoid.pp 
b/puppet/modules/mediawiki/manifests/parsoid.pp
index 626a91e..830d262 100644
--- a/puppet/modules/mediawiki/manifests/parsoid.pp
+++ b/puppet/modules/mediawiki/manifests/parsoid.pp
@@ -44,13 +44,10 @@
 $workers,
 ) {
 include ::mediawiki
-
-require_package( 'nodejs' )
-require_package( 'nodejs-legacy' )
+require ::npm
 
 git::clone { 'mediawiki/services/parsoid/deploy':
 directory => $dir,
-require   => Package['nodejs', 'nodejs-legacy'],
 }
 
 file { 'parsoid-localsettings.js':
@@ -61,7 +58,6 @@
 
 file { '/etc/init/parsoid.conf':
 content => template('mediawiki/parsoid.conf.erb'),
-require => Package['nodejs', 'nodejs-legacy'],
 }
 
 service::gitupdate { 'parsoid':
diff --git a/puppet/modules/npm/files/nodesource-pubkey.asc 
b/puppet/modules/npm/files/nodesource-pubkey.asc
new file mode 100644
index 000..1dc1d10
--- /dev/null
+++ b/puppet/modules/npm/files/nodesource-pubkey.asc
@@ -0,0 +1,52 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+Comment: GPGTools - https://gpgtools.org
+
+mQINBFObJLYBEADkFW8HMjsoYRJQ4nCYC/6Eh0yLWHWfCh+/9ZSIj4w/pOe2V6V+
+W6DHY3kK3a+2bxrax9EqKe7uxkSKf95gfns+I9+R+RJfRpb1qvljURr54y35IZgs
+fMG22Np+TmM2RLgdFCZa18h0+RbH9i0b+ZrB9XPZmLb/h9ou7SowGqQ3wwOtT3Vy
+qmif0A2GCcjFTqWW6TXaY8eZJ9BCEqW3k/0Cjw7K/mSy/utxYiUIvZNKgaG/P8U7
+89QyvxeRxAf93YFAVzMXhoKxu12IuH4VnSwAfb8gQyxKRyiGOUwk0YoBPpqRnMmD
+Dl7SdmY3oQHEJzBelTMjTM8AjbB9mWoPBX5G8t4u47/FZ6PgdfmRg9hsKXhkLJc7
+C1btblOHNgDx19fzASWX+xOjZiKpP6MkEEzq1bilUFul6RDtxkTWsTa5TGixgCB/
+G2fK8I9JL/yQhDc6OGY9mjPOxMb5PgUlT8ox3v8wt25erWj9z30QoEBwfSg4tzLc
+Jq6N/iepQemNfo6Is+TG+JzI6vhXjlsBm/Xmz0ZiFPPObAH/vGCY5I6886vXQ7ft
+qWHYHT8jz/R4tigMGC+tvZ/kcmYBsLCCI5uS

[MediaWiki-commits] [Gerrit] Include completion search into SearchEngine - change (mediawiki/core)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Include completion search into SearchEngine
..


Include completion search into SearchEngine

By default it still uses PrefixSearch and supports PrefixSearchBackend
but it can be deprecated and phased out and SearchEngine extensions used
instead.

New APIs:
- SearchEngine
public function defaultPrefixSearch( $search );
public function completionSearch( $search );
public function completionSearchWithVariants( $search );

Search engines should override:
protected function completionSearchBackend( $search );

Bug: T121430
Change-Id: Ie78649591dff94d21b72fad8e4e5eab010a461df
---
M autoload.php
M includes/PrefixSearch.php
M includes/api/ApiOpenSearch.php
M includes/api/ApiQueryPrefixSearch.php
M includes/search/SearchEngine.php
A includes/search/SearchSuggestion.php
A includes/search/SearchSuggestionSet.php
M includes/specialpage/SpecialPage.php
M includes/specials/SpecialAllPages.php
M includes/specials/SpecialChangeContentModel.php
M includes/specials/SpecialFileDuplicateSearch.php
M includes/specials/SpecialMovepage.php
M includes/specials/SpecialPageLanguage.php
M includes/specials/SpecialPrefixindex.php
M includes/specials/SpecialRecentchangeslinked.php
M includes/specials/SpecialUndelete.php
M includes/specials/SpecialWhatlinkshere.php
A tests/phpunit/includes/search/SearchEnginePrefixTest.php
A tests/phpunit/includes/search/SearchSuggestionSetTest.php
19 files changed, 1,099 insertions(+), 82 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index b055574..03666dc 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1120,6 +1120,8 @@
'SearchResult' => __DIR__ . '/includes/search/SearchResult.php',
'SearchResultSet' => __DIR__ . '/includes/search/SearchResultSet.php',
'SearchSqlite' => __DIR__ . '/includes/search/SearchSqlite.php',
+   'SearchSuggestion' => __DIR__ . '/includes/search/SearchSuggestion.php',
+   'SearchSuggestionSet' => __DIR__ . 
'/includes/search/SearchSuggestionSet.php',
'SearchUpdate' => __DIR__ . '/includes/deferred/SearchUpdate.php',
'SectionProfileCallback' => __DIR__ . 
'/includes/profiler/SectionProfiler.php',
'SectionProfiler' => __DIR__ . '/includes/profiler/SectionProfiler.php',
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index c6f187d..5f36cf5 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -23,6 +23,7 @@
 /**
  * Handles searching prefixes of titles and finding any page
  * names that match. Used largely by the OpenSearch implementation.
+ * @deprecated Since 1.27, Use SearchEngine::prefixSearchSubpages or 
SearchEngine::completionSearch
  *
  * @ingroup Search
  */
@@ -259,14 +260,17 @@
 * @param int $offset Number of items to skip
 * @return array Array of Title objects
 */
-   protected function defaultSearchBackend( $namespaces, $search, $limit, 
$offset ) {
+   public function defaultSearchBackend( $namespaces, $search, $limit, 
$offset ) {
$ns = array_shift( $namespaces ); // support only one namespace
-   if ( in_array( NS_MAIN, $namespaces ) ) {
+   if ( is_null( $ns ) || in_array( NS_MAIN, $namespaces ) ) {
$ns = NS_MAIN; // if searching on many always default 
to main
}
 
-   $t = Title::newFromText( $search, $ns );
+   if ( $ns == NS_SPECIAL ) {
+   return $this->specialSearch( $search, $limit, $offset );
+   }
 
+   $t = Title::newFromText( $search, $ns );
$prefix = $t ? $t->getDBkey() : '';
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'page',
@@ -318,6 +322,7 @@
 
 /**
  * Performs prefix search, returning Title objects
+ * @deprecated Since 1.27, Use SearchEngine::prefixSearchSubpages or 
SearchEngine::completionSearch
  * @ingroup Search
  */
 class TitlePrefixSearch extends PrefixSearch {
@@ -337,6 +342,7 @@
 
 /**
  * Performs prefix search, returning strings
+ * @deprecated Since 1.27, Use SearchEngine::prefixSearchSubpages or 
SearchEngine::completionSearch
  * @ingroup Search
  */
 class StringPrefixSearch extends PrefixSearch {
diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index 5ce43cc..ff5707e 100644
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -123,9 +123,12 @@
 * @param array &$results Put results here. Keys have to be integers.
 */
protected function search( $search, $limit, $namespaces, $resolveRedir, 
&$results ) {
-   // Find matching titles as Title objects
-   $searcher = new TitlePrefixSearch;
-

[MediaWiki-commits] [Gerrit] tools: Replace php5-mysql with php5-mysqlnd - change (operations/puppet)

2016-02-03 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: tools: Replace php5-mysql with php5-mysqlnd
..


tools: Replace php5-mysql with php5-mysqlnd

Claims to be a fully compatible but faster replacement, so
let's give it a shot. Provides functions unavailable to php5-mysql

Bug: T125758
Change-Id: I9646ddf3667f74d90c3f079602378f4f1a1b5e55
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 5087018..c7c4b23 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -146,7 +146,7 @@
 'php5-imagick',# T71078.
 'php5-intl',   # T57652
 'php5-mcrypt',
-'php5-mysql',
+'php5-mysqlnd',
 'php5-pgsql',  # For access to OSM db
 'php5-redis',
 'php5-sqlite',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9646ddf3667f74d90c3f079602378f4f1a1b5e55
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tools: Replace php5-mysql with php5-mysqlnd - change (operations/puppet)

2016-02-03 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Replace php5-mysql with php5-mysqlnd
..

tools: Replace php5-mysql with php5-mysqlnd

Claims to be a fully compatible but faster replacement, so
let's give it a shot. Provides functions unavailable to php5-mysql

Bug: T125758
Change-Id: I9646ddf3667f74d90c3f079602378f4f1a1b5e55
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/268342/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 5087018..c7c4b23 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -146,7 +146,7 @@
 'php5-imagick',# T71078.
 'php5-intl',   # T57652
 'php5-mcrypt',
-'php5-mysql',
+'php5-mysqlnd',
 'php5-pgsql',  # For access to OSM db
 'php5-redis',
 'php5-sqlite',

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

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

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

[MediaWiki-commits] [Gerrit] Add missing & (typo?) - change (operations/puppet)

2016-02-03 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: Add missing & (typo?)
..

Add missing & (typo?)

This hasn't been causing any apparent problems but it's almost
certainly incorrect.

Change-Id: I4b158c8cd88135cf8548200b8cf219609eb1ed02
---
M modules/git/manifests/install.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/268341/1

diff --git a/modules/git/manifests/install.pp b/modules/git/manifests/install.pp
index 86b65c4..ff865d8 100644
--- a/modules/git/manifests/install.pp
+++ b/modules/git/manifests/install.pp
@@ -81,7 +81,7 @@
 command => '/usr/bin/git remote update && git fetch --tags',
 cwd => $directory,
 user=> $owner,
-unless  => "git clean -df & git checkout . && git diff 
HEAD..${git_tag} --exit-code",
+unless  => "git clean -df && git checkout . && git diff 
HEAD..${git_tag} --exit-code",
 path=> '/usr/bin/',
 require => Git::Clone[$title],
 notify  => Exec["git_checkout_${title}"],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b158c8cd88135cf8548200b8cf219609eb1ed02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] Put the phabricator repo lock file on persistent storage - change (operations/puppet)

2016-02-03 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: Put the phabricator repo lock file on persistent storage
..

Put the phabricator repo lock file on persistent storage

After a reboot, the first puppet run screws with the checked out tags.
This is not how it should operate. It should only touch the repos if
a) it's provisioning a phabricator instance for the first time, or
b) the repo lock gets removed by an administrator to intentionally
tell puppet to re-provision the git repos.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/268340/1

diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 355af3a..8afdfa9 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -50,7 +50,7 @@
 serveralias  => $altdom,
 trusted_proxies  => $cache_misc_nodes[$::site],
 git_tag  => $current_tag,
-lock_file=> '/var/run/phab_repo_lock',
+lock_file=> '/srv/phab/phab_repo_lock',
 mysql_admin_user => $role::phabricator::config::mysql_adminuser,
 mysql_admin_pass => $role::phabricator::config::mysql_adminpass,
 sprint_tag   => 'release/2015-07-01',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f4a1c77bfa615f5fd55c8b813f01b4b1c366ff5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] update-oojs-ui: Don't copy across oojs-ui.js, we don't use that - change (VisualEditor/VisualEditor)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: update-oojs-ui: Don't copy across oojs-ui.js, we don't use that
..


update-oojs-ui: Don't copy across oojs-ui.js, we don't use that

Change-Id: Ief51aa4af116989f6f6730c42cd7db46972490cb
---
M bin/update-oojs-ui.sh
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/bin/update-oojs-ui.sh b/bin/update-oojs-ui.sh
index 0b0018c..9617512 100755
--- a/bin/update-oojs-ui.sh
+++ b/bin/update-oojs-ui.sh
@@ -38,7 +38,7 @@
 
 # Copy files
 # - Exclude the minimised distribution files and PNG image assets (VE requires 
SVG support)
-rsync --force --recursive --delete --exclude 'oojs-ui*.min.*' --exclude 
'images/*/*.png' ./node_modules/oojs-ui/dist/ "$REPO_DIR/$TARGET_DIR"
+rsync --force --recursive --delete --exclude 'oojs-ui*.min.*' --exclude 
'oojs-ui.js' --exclude 'images/*/*.png' ./node_modules/oojs-ui/dist/ 
"$REPO_DIR/$TARGET_DIR"
 
 # Clean up temporary area
 rm -rf "$NPM_DIR"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief51aa4af116989f6f6730c42cd7db46972490cb
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove duplicate values from the lexer list - change (mediawiki...SyntaxHighlight_GeSHi)

2016-02-03 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Remove duplicate values from the lexer list
..

Remove duplicate values from the lexer list

Update the updateLexerList.php maintenance script so that its output contains
no duplicate values, and remove existing duplicates from the lexer list.

Change-Id: I1ee094bb73f1a3916530e533ba3d151e50b34ce3
---
M SyntaxHighlight_GeSHi.lexers.php
M maintenance/updateLexerList.php
2 files changed, 1 insertion(+), 6 deletions(-)


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

diff --git a/SyntaxHighlight_GeSHi.lexers.php b/SyntaxHighlight_GeSHi.lexers.php
index 9f26c5b..c1b34d4 100644
--- a/SyntaxHighlight_GeSHi.lexers.php
+++ b/SyntaxHighlight_GeSHi.lexers.php
@@ -132,7 +132,6 @@
'css+jinja',
'css+lasso',
'css+mako',
-   'css+mako',
'css+mozpreproc',
'css+myghty',
'css+php',
@@ -230,7 +229,6 @@
'html+kid',
'html+lasso',
'html+mako',
-   'html+mako',
'html+myghty',
'html+php',
'html+ruby',
@@ -285,7 +283,6 @@
'javascript+jinja',
'javascript+lasso',
'javascript+mako',
-   'javascript+mako',
'javascript+mozpreproc',
'javascript+myghty',
'javascript+php',
@@ -306,7 +303,6 @@
'js+genshitext',
'js+jinja',
'js+lasso',
-   'js+mako',
'js+mako',
'js+myghty',
'js+php',
@@ -359,7 +355,6 @@
'm2',
'make',
'makefile',
-   'mako',
'mako',
'man',
'maql',
@@ -620,7 +615,6 @@
'xml+jinja',
'xml+kid',
'xml+lasso',
-   'xml+mako',
'xml+mako',
'xml+myghty',
'xml+php',
diff --git a/maintenance/updateLexerList.php b/maintenance/updateLexerList.php
index b5a7fc5..414d71e 100644
--- a/maintenance/updateLexerList.php
+++ b/maintenance/updateLexerList.php
@@ -62,6 +62,7 @@
$lexers = array_merge( $lexers, $newLexers );
}
}
+   $lexers = array_unique( $lexers );
sort( $lexers );
 
$code = "https://gerrit.wikimedia.org/r/268339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ee094bb73f1a3916530e533ba3d151e50b34ce3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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] Change bug ID to Phabricator task ID - change (mediawiki/core)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Change bug ID to Phabricator task ID
..


Change bug ID to Phabricator task ID

Change-Id: I8e1fc6ed9434a331eb7c66273305576eebed3125
---
M images/.htaccess
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/images/.htaccess b/images/.htaccess
index 3f3d41e..4e253b6 100644
--- a/images/.htaccess
+++ b/images/.htaccess
@@ -1,4 +1,4 @@
-# Protect against bug 28235
+# Protect against bug T30235
 
RewriteEngine On
RewriteOptions inherit

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

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

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

[MediaWiki-commits] [Gerrit] docs: OO.ui.SelectFileWidget: Minor language change - change (oojs/ui)

2016-02-03 Thread Prtksxna (Code Review)

Prtksxna has uploaded a new change for review.

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

Change subject: docs: OO.ui.SelectFileWidget: Minor language change
..

docs: OO.ui.SelectFileWidget: Minor language change

Change-Id: Ibc5d14190fbe733c4c71ba41f6bfa0bea3c5063c
---
M src/widgets/SelectFileWidget.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/38/268338/1

diff --git a/src/widgets/SelectFileWidget.js b/src/widgets/SelectFileWidget.js
index 4aceae3..ee16f03 100644
--- a/src/widgets/SelectFileWidget.js
+++ b/src/widgets/SelectFileWidget.js
@@ -270,9 +270,9 @@
 };
 
 /**
- * Get the URL of the image if the selected file is one
+ * If the selected file is an image, get its URL and load it.
  *
- * @return {jQuery.Promise} Promise resolves with the image URL
+ * @return {jQuery.Promise} Promise resolves with the image URL after it has 
loaded
  */
 OO.ui.SelectFileWidget.prototype.loadAndGetImageUrl = function () {
var deferred = $.Deferred(),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc5d14190fbe733c4c71ba41f6bfa0bea3c5063c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] Support multiple extension-dir paths to be passed to mergeMe... - change (mediawiki/core)

2016-02-03 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: Support multiple extension-dir paths to be passed to 
mergeMessageFileList
..

Support multiple extension-dir paths to be passed to mergeMessageFileList

If scap is modified to pass the path to both extensions/ and skins/ then
the extension-list file in wmf-config will no longer be needed, eliminating
many headaches. (refs T125678)

Bug: T125678

Change-Id: I4fd0c99d68fa32bf2378691955850a1be2c022df
---
M maintenance/mergeMessageFileList.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/268337/1

diff --git a/maintenance/mergeMessageFileList.php 
b/maintenance/mergeMessageFileList.php
index 20b333e..e924592 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -81,7 +81,12 @@
# Now find out files in a directory
if ( $this->hasOption( 'extensions-dir' ) ) {
$extdir = $this->getOption( 'extensions-dir' );
-   $entries = scandir( $extdir );
+   # Allow multiple directories to be passed with ":" as 
delimiter
+   $extdirs = explode(':', $extdir);
+   $entries = array();
+   foreach($extdirs as $extdir) {
+   $entries = array_merge($entries, scandir( 
$extdir ));
+   }
foreach ( $entries as $extname ) {
if ( $extname == '.' || $extname == '..' || 
!is_dir( "$extdir/$extname" ) ) {
continue;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fd0c99d68fa32bf2378691955850a1be2c022df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] Preprocessor: Don't allow unclosed extension tags (matching ... - change (mediawiki/core)

2016-02-03 Thread Code Review

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

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

Change subject: Preprocessor: Don't allow unclosed extension tags (matching 
until end of input)
..

Preprocessor: Don't allow unclosed extension tags (matching until end of input)

(Previously done in f51d0d9a819f8f1c181350ced2f015ce97985fcc and
reverted in 543f46e9c08e0ff8c5e8b4e917fcc045730ef1bc.)

I think it's saner to treat this as invalid syntax, and output the
mismatched tag code verbatim. The current behavior is particularly
annoying for  tags, which often swallow everything afterwards.

This does not affect HTML tags, though. Assuming Tidy is enabled, they
are still auto-closed at the end of the page content.

Related to T17712 and T58306. I think this brings the PHP parser closer
to Parsoid's interpretation.

It reduces performance somewhat in the worst case, though. Testing with
https://phabricator.wikimedia.org/F3245989 (a 1 MB page starting with
3000 opening tags of 15 different types), parsing time rises from
~0.2 seconds to ~1.1 seconds on my setup. We go from O(N) to O(kN),
where N is bytes of input and k is the number of types of tags present
on the page. Maximum k shouldn't exceed 30 or so in reasonable setups
(depends on installed extensions, it's 20 on English Wikipedia).

To consider:
* Unclosed  tags are now treated as HTML tags, and are still
  displayed as preformatted text, but without suppressing wikitext
  formatting.

TODO:
* Keep previous behavior for unclosed  / .

Change-Id: Ide8b034e464eefb1b7c9e2a48ed06e21a7f8d434
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/PreprocessorTest.php
4 files changed, 31 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/268335/1

diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 4ca3a87..817f153 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -237,6 +237,8 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
+   // Map of tag name => true if there are no more closing tags of 
given type right of $i
+   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -457,17 +459,21 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
+   if (
+   !isset( 
$noMoreClosingTag[$name] ) &&
+   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_OFFSET_CAPTURE, $tagEndPos + 1 )
) {
$inner = substr( $text, 
$tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
$i = $matches[0][1] + strlen( 
$matches[0][0] );
$close = '' . 
htmlspecialchars( $matches[0][0] ) . '';
} else {
-   // No end tag -- let it run out 
to the end of the text.
-   $inner = substr( $text, 
$tagEndPos + 1 );
-   $i = $lengthText;
-   $close = '';
+   // No end tag -- don't match 
the tag, treat opening tag as literal and resume parsing.
+   $i = $tagEndPos + 1;
+   $accum .= htmlspecialchars( 
substr( $text, $tagStartPos, $tagEndPos + 1 - $tagStartPos ) );
+   // Cache results, otherwise we 
have O(N^2) performance for input like ...
+   $noMoreClosingTag[$name] = true;
+   continue;
}
}
//  and  just become 
 tags
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 50eaefb..28c49fd 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -

[MediaWiki-commits] [Gerrit] Change bug ID to Phabricator task ID - change (mediawiki/core)

2016-02-03 Thread Wctaiwan (Code Review)

Wctaiwan has uploaded a new change for review.

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

Change subject: Change bug ID to Phabricator task ID
..

Change bug ID to Phabricator task ID

Change-Id: I8e1fc6ed9434a331eb7c66273305576eebed3125
---
M images/.htaccess
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/268336/1

diff --git a/images/.htaccess b/images/.htaccess
index 3f3d41e..4e253b6 100644
--- a/images/.htaccess
+++ b/images/.htaccess
@@ -1,4 +1,4 @@
-# Protect against bug 28235
+# Protect against bug T30235
 
RewriteEngine On
RewriteOptions inherit

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Preprocessor: Don't allow unclosed extension tags (m... - change (mediawiki/core)

2016-02-03 Thread Code Review

Bartosz Dziewoński has submitted this change and it was merged.

Change subject: Revert "Preprocessor: Don't allow unclosed extension tags 
(matching until end of input)"
..


Revert "Preprocessor: Don't allow unclosed extension tags (matching until end 
of input)"

This reverts commit f51d0d9a819f8f1c181350ced2f015ce97985fcc.

Breaks templates with non-closed  tags, which
were previously acceptable.

Bug: T125754
Change-Id: I8bafb15eefac4e1d3e727c1c84782636d8b82c2b
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/PreprocessorTest.php
4 files changed, 13 insertions(+), 31 deletions(-)

Approvals:
  Bartosz Dziewoński: Verified; Looks good to me, approved



diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 817f153..4ca3a87 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -237,8 +237,6 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
-   // Map of tag name => true if there are no more closing tags of 
given type right of $i
-   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -459,21 +457,17 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if (
-   !isset( 
$noMoreClosingTag[$name] ) &&
-   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
+   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_OFFSET_CAPTURE, $tagEndPos + 1 )
) {
$inner = substr( $text, 
$tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
$i = $matches[0][1] + strlen( 
$matches[0][0] );
$close = '' . 
htmlspecialchars( $matches[0][0] ) . '';
} else {
-   // No end tag -- don't match 
the tag, treat opening tag as literal and resume parsing.
-   $i = $tagEndPos + 1;
-   $accum .= htmlspecialchars( 
substr( $text, $tagStartPos, $tagEndPos + 1 - $tagStartPos ) );
-   // Cache results, otherwise we 
have O(N^2) performance for input like ...
-   $noMoreClosingTag[$name] = true;
-   continue;
+   // No end tag -- let it run out 
to the end of the text.
+   $inner = substr( $text, 
$tagEndPos + 1 );
+   $i = $lengthText;
+   $close = '';
}
}
//  and  just become 
 tags
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 28c49fd..50eaefb 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -160,8 +160,6 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
-   // Map of tag name => true if there are no more closing tags of 
given type right of $i
-   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -382,21 +380,17 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if (
-   !isset( 
$noMoreClosingTag[$name] ) &&
-   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
+   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_

[MediaWiki-commits] [Gerrit] ldap: fix top-scope var without namespace - change (operations/puppet)

2016-02-03 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ldap: fix top-scope var without namespace
..


ldap: fix top-scope var without namespace

./modules/ldap/manifests/role/config.pp
WARNING: top-scope variable being used without an explicit namespace on line 5
WARNING: top-scope variable being used without an explicit namespace on line 10
WARNING: top-scope variable being used without an explicit namespace on line 11
./modules/ldap/manifests/role/client.pp
WARNING: top-scope variable being used without an explicit namespace on line 28

Change-Id: I8fbb141a27ab0873d6cfcf87f6fb93436e016d71
---
M modules/ldap/manifests/role/client.pp
M modules/ldap/manifests/role/config.pp
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/ldap/manifests/role/client.pp 
b/modules/ldap/manifests/role/client.pp
index 68a1e4b..9e7918e 100644
--- a/modules/ldap/manifests/role/client.pp
+++ b/modules/ldap/manifests/role/client.pp
@@ -25,7 +25,7 @@
 #
 if ( $::restricted_from ) {
 security::access::config { 'labs-restrict-from':
-content  => "-:${restricted_from}:ALL\n",
+content  => "-:${::restricted_from}:ALL\n",
 priority => '98',
 }
 }
diff --git a/modules/ldap/manifests/role/config.pp 
b/modules/ldap/manifests/role/config.pp
index 0adbd79..17f73bb 100644
--- a/modules/ldap/manifests/role/config.pp
+++ b/modules/ldap/manifests/role/config.pp
@@ -2,13 +2,13 @@
 include passwords::ldap::labs
 
 $basedn = 'dc=wikimedia,dc=org'
-$servernames = $site ? {
+$servernames = $::site ? {
 'eqiad' => [ 'ldap-labs.eqiad.wikimedia.org', 
'ldap-labs.codfw.wikimedia.org' ],
 'codfw' => [ 'ldap-labs.codfw.wikimedia.org', 
'ldap-labs.eqiad.wikimedia.org' ],
 }
 $sudobasedn = $::realm ? {
-'labtest'   => 
"ou=sudoers,cn=${labsproject},ou=projects,${basedn}",
-'labs'   => "ou=sudoers,cn=${labsproject},ou=projects,${basedn}",
+'labtest'   => 
"ou=sudoers,cn=${::labsproject},ou=projects,${basedn}",
+'labs'   => "ou=sudoers,cn=${::labsproject},ou=projects,${basedn}",
 'production' => "ou=sudoers,${basedn}"
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fbb141a27ab0873d6cfcf87f6fb93436e016d71
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Preprocessor: Don't allow unclosed extension tags (m... - change (mediawiki/core)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Preprocessor: Don't allow unclosed extension tags 
(matching until end of input)"
..


Revert "Preprocessor: Don't allow unclosed extension tags (matching until end 
of input)"

This reverts commit f51d0d9a819f8f1c181350ced2f015ce97985fcc.

Breaks templates with non-closed  tags, which
were previously acceptable.

Bug: T125754
Change-Id: I8bafb15eefac4e1d3e727c1c84782636d8b82c2b
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/PreprocessorTest.php
4 files changed, 13 insertions(+), 31 deletions(-)

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



diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 817f153..4ca3a87 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -237,8 +237,6 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
-   // Map of tag name => true if there are no more closing tags of 
given type right of $i
-   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -459,21 +457,17 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if (
-   !isset( 
$noMoreClosingTag[$name] ) &&
-   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
+   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_OFFSET_CAPTURE, $tagEndPos + 1 )
) {
$inner = substr( $text, 
$tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
$i = $matches[0][1] + strlen( 
$matches[0][0] );
$close = '' . 
htmlspecialchars( $matches[0][0] ) . '';
} else {
-   // No end tag -- don't match 
the tag, treat opening tag as literal and resume parsing.
-   $i = $tagEndPos + 1;
-   $accum .= htmlspecialchars( 
substr( $text, $tagStartPos, $tagEndPos + 1 - $tagStartPos ) );
-   // Cache results, otherwise we 
have O(N^2) performance for input like ...
-   $noMoreClosingTag[$name] = true;
-   continue;
+   // No end tag -- let it run out 
to the end of the text.
+   $inner = substr( $text, 
$tagEndPos + 1 );
+   $i = $lengthText;
+   $close = '';
}
}
//  and  just become 
 tags
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 28c49fd..50eaefb 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -160,8 +160,6 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
-   // Map of tag name => true if there are no more closing tags of 
given type right of $i
-   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -382,21 +380,17 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if (
-   !isset( 
$noMoreClosingTag[$name] ) &&
-   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
+   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_OF

[MediaWiki-commits] [Gerrit] Hygiene: Cleanup history link generation - change (mediawiki...MobileFrontend)

2016-02-03 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Cleanup history link generation
..

Hygiene: Cleanup history link generation

We are computing it twice...

Change-Id: I21a57bc9861ea6eac8acbc1f7fc21e907edc2279
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index f740932..2de6cf3 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -558,16 +558,14 @@
$this->getLanguage()->userTime( $timestamp, 
$user )
)->parse();
}
-   $historyUrl = $this->mobileContext->getMobileUrl( 
$title->getFullURL( 'action=history' ) );
$edit = $mp->getLatestEdit();
$link = array(
'data-timestamp' => $isMainPage ? '' : 
$edit['timestamp'],
-   'href' => $historyUrl,
+   'href' => SpecialPage::getTitleFor( 'History', $title 
)->getLocalURL(),
'text' => $lastModified,
'data-user-name' => $edit['name'],
'data-user-gender' => $edit['gender'],
);
-   $link['href'] = SpecialPage::getTitleFor( 'History', $title 
)->getLocalURL();
return $link;
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Config variable audit - change (mediawiki...MobileFrontend)

2016-02-03 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Config variable audit
..

Hygiene: Config variable audit

* Rename config variables with wgMinerva prefix when they are Minerva specific
* Remove unused wgMFUseCentralAuthToken
* Cleanup Menu creation so it only happens once
* Remove the ability to add Special:Uploads to the left menu. The page is 
accessible
via the user page and not maintaining active support. There is no way to upload
in the mobile skin at current time.

Change-Id: Ib64b9400b088cf256a3795496e358d2dbf8a9172
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/MobileContext.php
M includes/MobileFrontend.hooks.php
M includes/skins/SkinMinerva.php
M includes/specials/SpecialUploads.php
M resources/mobile.mainMenu/MainMenu.js
M resources/mobile.mainMenu/icons.less
D resources/mobile.mainMenu/images/uploads.png
M resources/skins.minerva.scripts.top/init.js
M resources/skins.minerva.scripts/preInit.js
M resources/skins.minerva.tablet.scripts/toc.js
13 files changed, 46 insertions(+), 98 deletions(-)


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

diff --git a/extension.json b/extension.json
index 73fbf09..ff09f3d 100644
--- a/extension.json
+++ b/extension.json
@@ -1987,7 +1987,7 @@
],
"MFUseCentralAuthToken": false,
"MFSpecialCaseMainPage": true,
-   "MFEnableSiteNotice": false,
+   "MinervaEnableSiteNotice": false,
"MFTidyMobileViewSections": true,
"MFMobileHeader": "X-WAP",
"MFRemovableClasses": {
@@ -2026,7 +2026,7 @@
"MFDonationUrl": false,
"MFContentNamespace": 0,
"MFDefaultSkinClass": "SkinMinerva",
-   "MFPageActions": [
+   "MinervaPageActions": [
"edit",
"talk",
"watch"
diff --git a/i18n/en.json b/i18n/en.json
index 755b5f5..06d3c6a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -220,7 +220,6 @@
"mobile-frontend-main-menu-page-title": "Site navigation",
"mobile-frontend-main-menu-settings": "Settings",
"mobile-frontend-main-menu-settings-heading": "Settings",
-   "mobile-frontend-main-menu-upload": "Uploads",
"mobile-frontend-main-menu-watchlist": "Watchlist",
"mobile-frontend-media-details": "Details",
"mobile-frontend-media-license-link": "License information",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1f9b628..0686b94 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -218,7 +218,6 @@
"mobile-frontend-main-menu-page-title": 
"{{doc-special|MobileMenu|unlisted=1}}",
"mobile-frontend-main-menu-settings": "Settings link text in main menu",
"mobile-frontend-main-menu-settings-heading": 
"{{doc-special|MobileOptions|unlisted=1}}\n{{Identical|Settings}}",
-   "mobile-frontend-main-menu-upload": "Uploads link text in main 
menu.\n{{Identical|Upload}}",
"mobile-frontend-main-menu-watchlist": "Text for watchlist link in main 
menu.\n{{Identical|Watchlist}}",
"mobile-frontend-media-details": "Caption for a button leading to the 
details of a media file (e.g. an image) in a preview.\n{{Identical|Detail}}",
"mobile-frontend-media-license-link": "Link to license information in 
media viewer.\n{{Identical|License information}}",
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 66c19a0..804519a 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -198,35 +198,6 @@
}
 
/**
-* Whether the user is allowed to upload
-* @return boolean
-*/
-   public function userCanUpload() {
-   $config = $this->getMFConfig();
-   $user = $this->getUser();
-
-   // check if upload is enabled local or to remote location (to 
commons e.g.)
-   // TODO: what if the user cannot upload to the destination wiki 
in $wgMFPhotoUploadEndpoint?
-   $uploadEnabled = ( UploadBase::isEnabled() &&
-   UploadBase::isallowed( $user )
-   ) || $config->get( 'MFPhotoUploadEndpoint' );
-
-   if ( $uploadEnabled ) {
-   // Make sure the user is either in desktop mode or 
meets the special
-   // conditions necessary for uploading in mobile mode.
-   if ( !$this->shouldDisplayMobileView() ||
-   (
-   $user->isAllowed( 'mf-uploadbutton' ) &&
-   $user->getEditCount() >= $config->get( 
'MFUploadMinEdits' )
-   )
-   ) {
-   return true;
-

[MediaWiki-commits] [Gerrit] Revert "Preprocessor: Don't allow unclosed extension tags (m... - change (mediawiki/core)

2016-02-03 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Revert "Preprocessor: Don't allow unclosed extension tags 
(matching until end of input)"
..

Revert "Preprocessor: Don't allow unclosed extension tags (matching until end 
of input)"

This reverts commit f51d0d9a819f8f1c181350ced2f015ce97985fcc.

Breaks templates with non-closed  tags, which
were previously acceptable.

Bug: T125754
Change-Id: I8bafb15eefac4e1d3e727c1c84782636d8b82c2b
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/PreprocessorTest.php
4 files changed, 13 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/268332/1

diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 817f153..4ca3a87 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -237,8 +237,6 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
-   // Map of tag name => true if there are no more closing tags of 
given type right of $i
-   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -459,21 +457,17 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if (
-   !isset( 
$noMoreClosingTag[$name] ) &&
-   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
+   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_OFFSET_CAPTURE, $tagEndPos + 1 )
) {
$inner = substr( $text, 
$tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
$i = $matches[0][1] + strlen( 
$matches[0][0] );
$close = '' . 
htmlspecialchars( $matches[0][0] ) . '';
} else {
-   // No end tag -- don't match 
the tag, treat opening tag as literal and resume parsing.
-   $i = $tagEndPos + 1;
-   $accum .= htmlspecialchars( 
substr( $text, $tagStartPos, $tagEndPos + 1 - $tagStartPos ) );
-   // Cache results, otherwise we 
have O(N^2) performance for input like ...
-   $noMoreClosingTag[$name] = true;
-   continue;
+   // No end tag -- let it run out 
to the end of the text.
+   $inner = substr( $text, 
$tagEndPos + 1 );
+   $i = $lengthText;
+   $close = '';
}
}
//  and  just become 
 tags
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 28c49fd..50eaefb 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -160,8 +160,6 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
-   // Map of tag name => true if there are no more closing tags of 
given type right of $i
-   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -382,21 +380,17 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if (
-   !isset( 
$noMoreClosingTag[$name] ) &&
-   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
+   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",

[MediaWiki-commits] [Gerrit] Revert "Preprocessor: Don't allow unclosed extension tags (m... - change (mediawiki/core)

2016-02-03 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Revert "Preprocessor: Don't allow unclosed extension tags 
(matching until end of input)"
..

Revert "Preprocessor: Don't allow unclosed extension tags (matching until end 
of input)"

This reverts commit f51d0d9a819f8f1c181350ced2f015ce97985fcc.

Breaks templates with non-closed  tags, which
were previously acceptable.

Bug: T125754
Change-Id: I8bafb15eefac4e1d3e727c1c84782636d8b82c2b
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/PreprocessorTest.php
4 files changed, 13 insertions(+), 31 deletions(-)


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

diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 817f153..4ca3a87 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -237,8 +237,6 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
-   // Map of tag name => true if there are no more closing tags of 
given type right of $i
-   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -459,21 +457,17 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if (
-   !isset( 
$noMoreClosingTag[$name] ) &&
-   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
+   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_OFFSET_CAPTURE, $tagEndPos + 1 )
) {
$inner = substr( $text, 
$tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
$i = $matches[0][1] + strlen( 
$matches[0][0] );
$close = '' . 
htmlspecialchars( $matches[0][0] ) . '';
} else {
-   // No end tag -- don't match 
the tag, treat opening tag as literal and resume parsing.
-   $i = $tagEndPos + 1;
-   $accum .= htmlspecialchars( 
substr( $text, $tagStartPos, $tagEndPos + 1 - $tagStartPos ) );
-   // Cache results, otherwise we 
have O(N^2) performance for input like ...
-   $noMoreClosingTag[$name] = true;
-   continue;
+   // No end tag -- let it run out 
to the end of the text.
+   $inner = substr( $text, 
$tagEndPos + 1 );
+   $i = $lengthText;
+   $close = '';
}
}
//  and  just become 
 tags
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 28c49fd..50eaefb 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -160,8 +160,6 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
-   // Map of tag name => true if there are no more closing tags of 
given type right of $i
-   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -382,21 +380,17 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if (
-   !isset( 
$noMoreClosingTag[$name] ) &&
-   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
+   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",

[MediaWiki-commits] [Gerrit] Bring back testing of testwiki page - change (apps...wikipedia)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Bring back testing of testwiki page
..


Bring back testing of testwiki page

Follow up of Ic5c6aa391e47df1f0707281d0966eeb134a3fd57
Bug: T124124

Change-Id: I1de4b8bfb3f39a9fe6b0cf8769c972cfcfa524e2
---
M app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java 
b/app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
index 07998f8..813a2ba 100644
--- a/app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
+++ b/app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
@@ -22,7 +22,7 @@
 public void testPageFetchWithAmpersand() throws Throwable {
 //final int expectedNumberOfSections = 1;
 // TODO: verify num sections
-loadPageSync("Simon & Garfunkel", EN_SITE);
+loadPageSync("Ampersand & title", TEST_SITE);
 }
 
 @Test

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

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

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

[MediaWiki-commits] [Gerrit] Clean up after Ie161e0f - change (mediawiki/core)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Clean up after Ie161e0f
..


Clean up after Ie161e0f

Ie161e0f was done in a hurry, and so didn't do things in the best ways.
This introduces a new "CachedBagOStuff" that transparently handles all
the logic that had been copy-pasted all over in Ie161e0f.

The differences between CachedBagOStuff and MultiWriteBagOStuff are:
* CachedBagOStuff supports only one "backend".
* There's a flag for writes to only go to the in-memory cache.
* The in-memory cache is always updated.
* Locks go to the backend cache (with MultiWriteBagOStuff, it would wind
  up going to the HashBagOStuff used for the in-memory cache).

Change-Id: Iea494729bd2e8c6c5ab8facf4c241232e31e8215
---
M autoload.php
M includes/libs/objectcache/BagOStuff.php
A includes/libs/objectcache/CachedBagOStuff.php
M includes/session/SessionBackend.php
M includes/session/SessionManager.php
A tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
M tests/phpunit/includes/session/CookieSessionProviderTest.php
M tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php
M tests/phpunit/includes/session/PHPSessionHandlerTest.php
M tests/phpunit/includes/session/SessionBackendTest.php
M tests/phpunit/includes/session/SessionManagerTest.php
M tests/phpunit/includes/session/TestBagOStuff.php
12 files changed, 242 insertions(+), 106 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 9073005..c9e3b60 100644
--- a/autoload.php
+++ b/autoload.php
@@ -190,6 +190,7 @@
'CacheHelper' => __DIR__ . '/includes/cache/CacheHelper.php',
'CacheTime' => __DIR__ . '/includes/parser/CacheTime.php',
'CachedAction' => __DIR__ . '/includes/actions/CachedAction.php',
+   'CachedBagOStuff' => __DIR__ . 
'/includes/libs/objectcache/CachedBagOStuff.php',
'CachingSiteStore' => __DIR__ . '/includes/site/CachingSiteStore.php',
'CapsCleanup' => __DIR__ . '/maintenance/cleanupCaps.php',
'Category' => __DIR__ . '/includes/Category.php',
diff --git a/includes/libs/objectcache/BagOStuff.php 
b/includes/libs/objectcache/BagOStuff.php
index b9be43d..3736103 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -69,6 +69,7 @@
const READ_VERIFIED = 2; // promise that caller can tell when keys are 
stale
/** Bitfield constants for set()/merge() */
const WRITE_SYNC = 1; // synchronously write to all locations for 
replicated stores
+   const WRITE_CACHE_ONLY = 2; // Only change state of the in-memory cache
 
public function __construct( array $params = array() ) {
if ( isset( $params['logger'] ) ) {
diff --git a/includes/libs/objectcache/CachedBagOStuff.php 
b/includes/libs/objectcache/CachedBagOStuff.php
new file mode 100644
index 000..fc15618
--- /dev/null
+++ b/includes/libs/objectcache/CachedBagOStuff.php
@@ -0,0 +1,114 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Cache
+ */
+
+use Psr\Log\LoggerInterface;
+
+/**
+ * Wrapper around a BagOStuff that caches data in memory
+ *
+ * The differences between CachedBagOStuff and MultiWriteBagOStuff are:
+ * * CachedBagOStuff supports only one "backend".
+ * * There's a flag for writes to only go to the in-memory cache.
+ * * The in-memory cache is always updated.
+ * * Locks go to the backend cache (with MultiWriteBagOStuff, it would wind
+ *   up going to the HashBagOStuff used for the in-memory cache).
+ *
+ * @ingroup Cache
+ */
+class CachedBagOStuff extends HashBagOStuff {
+   /** @var BagOStuff */
+   protected $backend;
+
+   /**
+* @param BagOStuff $backend Permanent backend to use
+* @param array $params Parameters for HashBagOStuff
+*/
+   function __construct( BagOStuff $backend, $params = array() ) {
+   $this->backend = $backend;
+   parent::__construct( $params );
+   }
+
+   protected function doGet( $key, $flags = 0 ) {
+   $ret = parent::doGet( $key, $flags );
+   if ( $ret === false ) {
+   $ret = $this->backend->doGet( $key, $flags );
+   if ( $ret !== false ) {
+   $this->set( $key, $ret, 0, 
self::WRITE_CACHE_ONLY );
+   }
+   }
+   return $ret;
+   }
+
+   public function set( $key, $value, $exptime = 0, $flags = 0 ) {
+   parent::set( $key, $value, $exptime, $flags );
+   if ( !( $flags & self::WRITE_CACHE_ONLY ) ) {
+   $this->backend->set( $key, $value, $exptime, $flags & 
~self::WRITE_CACHE_ONLY );
+   }
+   return true;
+   }
+
+   public function delete( $key, $flags = 0 ) {
+   unset( $this->bag[$key] );

[MediaWiki-commits] [Gerrit] Revert "Remove SessionManager, temporarily" - change (mediawiki/core)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Remove SessionManager, temporarily"
..


Revert "Remove SessionManager, temporarily"

This reverts commit 823db5d63dd5200d04c63da50ba6bf16f928e70b.

Change-Id: Ibb3e023e4eb6715295586dea87d0725c344a8271
---
M RELEASE-NOTES-1.27
M autoload.php
M composer.json
M docs/hooks.txt
M includes/DefaultSettings.php
M includes/DerivativeRequest.php
M includes/FauxRequest.php
M includes/GlobalFunctions.php
M includes/MediaWiki.php
M includes/OutputPage.php
M includes/Setup.php
M includes/WebRequest.php
M includes/actions/RawAction.php
M includes/actions/SubmitAction.php
M includes/api/ApiBase.php
M includes/api/ApiCheckToken.php
M includes/api/ApiCreateAccount.php
M includes/api/ApiLogin.php
M includes/api/ApiLogout.php
M includes/api/ApiMain.php
M includes/api/ApiQueryTokens.php
M includes/api/ApiTokens.php
M includes/cache/MessageCache.php
M includes/context/RequestContext.php
M includes/installer/MysqlUpdater.php
M includes/installer/PostgresUpdater.php
M includes/installer/SqliteUpdater.php
D includes/objectcache/ObjectCacheSessionHandler.php
A includes/session/BotPasswordSessionProvider.php
A includes/session/CookieSessionProvider.php
A includes/session/ImmutableSessionProviderWithCookie.php
A includes/session/PHPSessionHandler.php
A includes/session/Session.php
A includes/session/SessionBackend.php
A includes/session/SessionId.php
A includes/session/SessionInfo.php
A includes/session/SessionManager.php
A includes/session/SessionManagerInterface.php
A includes/session/SessionProvider.php
A includes/session/SessionProviderInterface.php
A includes/session/Token.php
A includes/session/UserInfo.php
M includes/specialpage/SpecialPageFactory.php
A includes/specials/SpecialBotPasswords.php
M includes/specials/SpecialChangePassword.php
M includes/specials/SpecialUserlogin.php
M includes/specials/SpecialUserlogout.php
A includes/user/BotPassword.php
A includes/user/LoggedOutEditToken.php
M includes/user/User.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M languages/messages/MessagesEn.php
A maintenance/archives/patch-bot_passwords.sql
A maintenance/postgres/archives/patch-bot_passwords.sql
M maintenance/postgres/tables.sql
M maintenance/tables.sql
M tests/TestsAutoLoader.php
M tests/phpunit/MediaWikiTestCase.php
A tests/phpunit/includes/TestLogger.php
M tests/phpunit/includes/api/ApiCreateAccountTest.php
M tests/phpunit/includes/api/ApiLoginTest.php
M tests/phpunit/includes/api/ApiTestCase.php
M tests/phpunit/includes/api/ApiTestCaseUpload.php
M tests/phpunit/includes/context/RequestContextTest.php
A tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
A tests/phpunit/includes/session/CookieSessionProviderTest.php
A tests/phpunit/includes/session/ImmutableSessionProviderWithCookieTest.php
A tests/phpunit/includes/session/PHPSessionHandlerTest.php
A tests/phpunit/includes/session/SessionBackendTest.php
A tests/phpunit/includes/session/SessionIdTest.php
A tests/phpunit/includes/session/SessionInfoTest.php
A tests/phpunit/includes/session/SessionManagerTest.php
A tests/phpunit/includes/session/SessionProviderTest.php
A tests/phpunit/includes/session/SessionTest.php
A tests/phpunit/includes/session/TestBagOStuff.php
A tests/phpunit/includes/session/TestUtils.php
A tests/phpunit/includes/session/TokenTest.php
A tests/phpunit/includes/session/UserInfoTest.php
M tests/phpunit/includes/upload/UploadFromUrlTest.php
A tests/phpunit/includes/user/BotPasswordTest.php
M tests/phpunit/includes/user/UserTest.php
A tests/phpunit/mocks/session/DummySessionBackend.php
A tests/phpunit/mocks/session/DummySessionProvider.php
M tests/phpunit/phpunit.php
85 files changed, 12,331 insertions(+), 754 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb3e023e4eb6715295586dea87d0725c344a8271
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jjanes 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/jobrunner: fix top-scope var without namespace - change (operations/puppet)

2016-02-03 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: mediawiki/jobrunner: fix top-scope var without namespace
..


mediawiki/jobrunner: fix top-scope var without namespace

./modules/mediawiki/manifests/jobrunner.pp
WARNING: top-scope variable being used without an explicit namespace on line 27

Change-Id: I8b82c2218b0103acdc7358d126864f5159868df5
---
M modules/mediawiki/manifests/jobrunner.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/mediawiki/manifests/jobrunner.pp 
b/modules/mediawiki/manifests/jobrunner.pp
index cd65bda..713bf91 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -24,7 +24,7 @@
 notify   => Service['jobrunner'],
 }
 
-$dispatcher = 
template("mediawiki/jobrunner/dispatchers/${lsbdistcodename}.erb")
+$dispatcher = 
template("mediawiki/jobrunner/dispatchers/${::lsbdistcodename}.erb")
 
 file { '/etc/default/jobrunner':
 content => template('mediawiki/jobrunner/jobrunner.default.erb'),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b82c2218b0103acdc7358d126864f5159868df5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bring back testing of testwiki page - change (apps...wikipedia)

2016-02-03 Thread BearND (Code Review)

BearND has uploaded a new change for review.

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

Change subject: Bring back testing of testwiki page
..

Bring back testing of testwiki page

Follow up of Ic5c6aa391e47df1f0707281d0966eeb134a3fd57
Bug: T124124

Change-Id: I1de4b8bfb3f39a9fe6b0cf8769c972cfcfa524e2
---
M app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java 
b/app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
index 07998f8..813a2ba 100644
--- a/app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
+++ b/app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
@@ -22,7 +22,7 @@
 public void testPageFetchWithAmpersand() throws Throwable {
 //final int expectedNumberOfSections = 1;
 // TODO: verify num sections
-loadPageSync("Simon & Garfunkel", EN_SITE);
+loadPageSync("Ampersand & title", TEST_SITE);
 }
 
 @Test

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

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

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

[MediaWiki-commits] [Gerrit] Add index to civicrm_financial_item - change (wikimedia...crm)

2016-02-03 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Add index to civicrm_financial_item
..


Add index to civicrm_financial_item

(Depends on patch to civicrm repo).

Add an index to improve performance in an upgrade-proof manner

Change-Id: I8a865c99a3212b0fa8a3985078bc5d0d701d2451
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 4e3a7d8..0204d85 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -45,6 +45,7 @@
 wmf_civicrm_update_7063();
 wmf_civicrm_update_7064();
 wmf_civicrm_update_7080();
+wmf_civicrm_update_7090();
 }
 
 /**
@@ -1651,3 +1652,21 @@
   $tables = array('civicrm_financial_trxn' => array('trxn_id'));
   CRM_Core_BAO_SchemaHandler::createIndexes($tables);
 }
+
+/**
+ * T122947 add index to civicrm_financial item.
+ *
+ * The existing one does not start with entity_id so the queries that omit
+ * entity_table dont' use it. It is also logically the wrong way around as the
+ * one with more variation should lead.
+ *
+ * The upstream patch (CRM-17775) removes indexes as well. I have not ported 
that part
+ * back at this stage as I'm viewing it as tidy up rather than a performance
+ * fix and leaving 4.7.2 upgrade to catch it.
+ */
+function wmf_civicrm_update_7090() {
+  civicrm_initialize();
+  CRM_Core_BAO_SchemaHandler::createIndexes(array(
+'civicrm_financial_item' => array(array('entity_id', 'entity_table')),
+  ));
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a865c99a3212b0fa8a3985078bc5d0d701d2451
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Try to fix some other broken-looking legacy maintenance scri... - change (mediawiki/core)

2016-02-03 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Try to fix some other broken-looking legacy maintenance script 
options
..

Try to fix some other broken-looking legacy maintenance script options

Change-Id: I2004d9b1fd7389623a3f2da6682f9007efd679dc
---
M maintenance/language/checkDupeMessages.php
M maintenance/language/checkLanguage.php
M maintenance/language/transstat.php
M maintenance/mcc.php
M maintenance/preprocessorFuzzTest.php
M maintenance/storage/checkStorage.php
M maintenance/storage/moveToExternal.php
7 files changed, 13 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/268328/1

diff --git a/maintenance/language/checkDupeMessages.php 
b/maintenance/language/checkDupeMessages.php
index 5d48244..6e29a41 100644
--- a/maintenance/language/checkDupeMessages.php
+++ b/maintenance/language/checkDupeMessages.php
@@ -21,6 +21,7 @@
  * @ingroup MaintenanceLanguage
  */
 
+$optionsWithoutArgs = array( 'lang', 'clang', 'mode' );
 require_once __DIR__ . '/../commandLine.inc';
 $messagesDir = __DIR__ . '/../../languages/messages/';
 $runTest = false;
diff --git a/maintenance/language/checkLanguage.php 
b/maintenance/language/checkLanguage.php
index bd9f9af..cde5c15 100644
--- a/maintenance/language/checkLanguage.php
+++ b/maintenance/language/checkLanguage.php
@@ -21,6 +21,10 @@
  * @ingroup MaintenanceLanguage
  */
 
+$optionsWithoutArgs = array(
+   'help', 'lang', 'level', 'links', 'noexif', 'blacklist', 'easy', 
'whitelist',
+   'wikilang', 'output', 'duplicate', 'prefix', 'all'
+);
 require_once __DIR__ . '/../commandLine.inc';
 require_once 'checkLanguage.inc';
 require_once 'languages.inc';
diff --git a/maintenance/language/transstat.php 
b/maintenance/language/transstat.php
index 4a853b0..16d6560 100644
--- a/maintenance/language/transstat.php
+++ b/maintenance/language/transstat.php
@@ -27,6 +27,7 @@
  * https://www.mediawiki.org/wiki/Localisation_statistics
  */
 $optionsWithArgs = array( 'output' );
+$optionsWithoutArgs = array( 'help' );
 
 require_once __DIR__ . '/../commandLine.inc';
 require_once 'languages.inc';
diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index 6b8487f..bd69627 100644
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -22,10 +22,11 @@
  * @ingroup Maintenance
  */
 
-/** */
+$optionsWithArgs = array( 'cache' );
+$optionsWithoutArgs = array(
+   'debug', 'help'
+);
 require_once __DIR__ . '/commandLine.inc';
-
-$options = getopt( '', array( 'debug', 'help', 'cache:' ) );
 
 $debug = isset( $options['debug'] );
 $help = isset( $options['help'] );
diff --git a/maintenance/preprocessorFuzzTest.php 
b/maintenance/preprocessorFuzzTest.php
index 4d38710..11ba168 100644
--- a/maintenance/preprocessorFuzzTest.php
+++ b/maintenance/preprocessorFuzzTest.php
@@ -21,6 +21,7 @@
  * @ingroup Maintenance
  */
 
+$optionsWithoutArgs = array( 'verbose' );
 require_once __DIR__ . '/commandLine.inc';
 
 $wgHooks['BeforeParserFetchTemplateAndtitle'][] = 'PPFuzzTester::templateHook';
diff --git a/maintenance/storage/checkStorage.php 
b/maintenance/storage/checkStorage.php
index c0f6c7b..86d26ea 100644
--- a/maintenance/storage/checkStorage.php
+++ b/maintenance/storage/checkStorage.php
@@ -22,6 +22,7 @@
  */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
+   $optionsWithoutArgs = array( 'fix' );
require_once __DIR__ . '/../commandLine.inc';
 
$cs = new CheckStorage;
diff --git a/maintenance/storage/moveToExternal.php 
b/maintenance/storage/moveToExternal.php
index ab59cb8..eebd40f 100644
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -24,6 +24,7 @@
 define( 'REPORTING_INTERVAL', 1 );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
+   $optionsWithoutArgs = array( 'e', 's' );
require_once __DIR__ . '/../commandLine.inc';
require_once 'resolveStubs.php';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2004d9b1fd7389623a3f2da6682f9007efd679dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Make mobile-beta an available platform - change (operations/puppet)

2016-02-03 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Make mobile-beta an available platform
..

Make mobile-beta an available platform

The mobile beta site varies drastically from the stable site so let's
track navigation timing results in a separate bucket

Change-Id: Idb452b6081d392261a40054f159c4995d887d58a
---
M modules/webperf/files/navtiming.py
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/modules/webperf/files/navtiming.py 
b/modules/webperf/files/navtiming.py
old mode 100644
new mode 100755
index 7c74882..8824ab0
--- a/modules/webperf/files/navtiming.py
+++ b/modules/webperf/files/navtiming.py
@@ -155,7 +155,10 @@
 if minuend in event and subtrahend in event:
 metrics[difference] = event[minuend] - event[subtrahend]
 
-site = 'mobile' if 'mobileMode' in event else 'desktop'
+if 'mobileMode' in event:
+site = 'mobile' if event.get('mobileMode') == 'stable' else 
'mobile-beta'
+else:
+site = 'desktop'
 auth = 'anonymous' if event.get('isAnon') else 'authenticated'
 
 # Currently unused:

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

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

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

[MediaWiki-commits] [Gerrit] Add index to creditnote_id field to mitigate speed issue on ... - change (wikimedia...crm)

2016-02-03 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Add index to creditnote_id field to mitigate speed issue on 
doing refunds
..


Add index to creditnote_id field to mitigate speed issue on doing refunds

I had previously improved the query but it's still taking 7 seconds due to the 
missing index

I've also added in the index on financial_item.trxn_id which I had previous 
added to 4.7.

These have been added to core in an 'upgrade friendly way', meaning adding them 
now won't cause us
to hit problems when we later upgrade to 4.7.

https://issues.civicrm.org/jira/browse/CRM-17881
https://issues.civicrm.org/jira/browse/CRM-17882

Bug: T123305

Change-Id: If9a8a1c7360bc8a42bf2d3517abbd5ce3499f5f7
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 24 insertions(+), 0 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 3180053..4e3a7d8 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -44,6 +44,7 @@
 wmf_civicrm_update_7062();
 wmf_civicrm_update_7063();
 wmf_civicrm_update_7064();
+wmf_civicrm_update_7080();
 }
 
 /**
@@ -1627,3 +1628,26 @@
   civicrm_api3('OptionValue', 'delete', array('id' => 
$expectedRedundantType['id']));
   civicrm_api3('OptionValue', 'create', array('id' => 
$options['values'][0]['id'], 'is_reserved' => TRUE));
 }
+
+/**
+ * Add indexes that are missing from CiviCRM 4.6.
+ *
+ * These indexes have been added to 4.7 using the same php function.
+ *
+ * This function checks the index does not already exist before adding it.
+ * This ensures that we will not hit a problem on upgrade as a result of 
adding them now.
+ *
+ * Note this could be a slow update.
+ *
+ * https://github.com/civicrm/civicrm-core/pull/7672
+ * https://github.com/civicrm/civicrm-core/pull/7678
+ * https://github.com/civicrm/civicrm-core/pull/7673
+ */
+function wmf_civicrm_update_7080() {
+  civicrm_initialize();
+  $tables = array('civicrm_contribution' => array('creditnote_id'));
+  CRM_Core_BAO_SchemaHandler::createIndexes($tables);
+
+  $tables = array('civicrm_financial_trxn' => array('trxn_id'));
+  CRM_Core_BAO_SchemaHandler::createIndexes($tables);
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If9a8a1c7360bc8a42bf2d3517abbd5ce3499f5f7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] group1 wikis to 1.27.0-wmf.12 - change (operations/mediawiki-config)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: group1 wikis to 1.27.0-wmf.12
..


group1 wikis to 1.27.0-wmf.12

Change-Id: Icb298349ba118ba8310ff2e147ce81c34016e81d
---
M php
M w/static/current/extensions
M w/static/current/resources
M w/static/current/skins
M wikiversions.json
5 files changed, 599 insertions(+), 599 deletions(-)

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



diff --git a/php b/php
index 0b27d2c..4c863da 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.27.0-wmf.10
\ No newline at end of file
+php-1.27.0-wmf.12
\ No newline at end of file
diff --git a/w/static/current/extensions b/w/static/current/extensions
index 98682a4..97fd164 12
--- a/w/static/current/extensions
+++ b/w/static/current/extensions
@@ -1 +1 @@
-/srv/mediawiki/php-1.27.0-wmf.10/extensions
\ No newline at end of file
+/srv/mediawiki/php-1.27.0-wmf.12/extensions
\ No newline at end of file
diff --git a/w/static/current/resources b/w/static/current/resources
index d38eb22..91abae6 12
--- a/w/static/current/resources
+++ b/w/static/current/resources
@@ -1 +1 @@
-/srv/mediawiki/php-1.27.0-wmf.10/resources
\ No newline at end of file
+/srv/mediawiki/php-1.27.0-wmf.12/resources
\ No newline at end of file
diff --git a/w/static/current/skins b/w/static/current/skins
index 8a33e77..4d21d01 12
--- a/w/static/current/skins
+++ b/w/static/current/skins
@@ -1 +1 @@
-/srv/mediawiki/php-1.27.0-wmf.10/skins
\ No newline at end of file
+/srv/mediawiki/php-1.27.0-wmf.12/skins
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 6a324e1..01f412f 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,896 +1,896 @@
 {
 "aawiki": "php-1.27.0-wmf.10",
-"aawikibooks": "php-1.27.0-wmf.10",
-"aawiktionary": "php-1.27.0-wmf.10",
+"aawikibooks": "php-1.27.0-wmf.12",
+"aawiktionary": "php-1.27.0-wmf.12",
 "abwiki": "php-1.27.0-wmf.10",
-"abwiktionary": "php-1.27.0-wmf.10",
+"abwiktionary": "php-1.27.0-wmf.12",
 "acewiki": "php-1.27.0-wmf.10",
-"advisorywiki": "php-1.27.0-wmf.10",
+"advisorywiki": "php-1.27.0-wmf.12",
 "afwiki": "php-1.27.0-wmf.10",
-"afwikibooks": "php-1.27.0-wmf.10",
-"afwikiquote": "php-1.27.0-wmf.10",
-"afwiktionary": "php-1.27.0-wmf.10",
+"afwikibooks": "php-1.27.0-wmf.12",
+"afwikiquote": "php-1.27.0-wmf.12",
+"afwiktionary": "php-1.27.0-wmf.12",
 "akwiki": "php-1.27.0-wmf.10",
-"akwikibooks": "php-1.27.0-wmf.10",
-"akwiktionary": "php-1.27.0-wmf.10",
+"akwikibooks": "php-1.27.0-wmf.12",
+"akwiktionary": "php-1.27.0-wmf.12",
 "alswiki": "php-1.27.0-wmf.10",
-"alswikibooks": "php-1.27.0-wmf.10",
-"alswikiquote": "php-1.27.0-wmf.10",
-"alswiktionary": "php-1.27.0-wmf.10",
+"alswikibooks": "php-1.27.0-wmf.12",
+"alswikiquote": "php-1.27.0-wmf.12",
+"alswiktionary": "php-1.27.0-wmf.12",
 "amwiki": "php-1.27.0-wmf.10",
-"amwikiquote": "php-1.27.0-wmf.10",
-"amwiktionary": "php-1.27.0-wmf.10",
+"amwikiquote": "php-1.27.0-wmf.12",
+"amwiktionary": "php-1.27.0-wmf.12",
 "angwiki": "php-1.27.0-wmf.10",
-"angwikibooks": "php-1.27.0-wmf.10",
-"angwikiquote": "php-1.27.0-wmf.10",
-"angwikisource": "php-1.27.0-wmf.10",
-"angwiktionary": "php-1.27.0-wmf.10",
+"angwikibooks": "php-1.27.0-wmf.12",
+"angwikiquote": "php-1.27.0-wmf.12",
+"angwikisource": "php-1.27.0-wmf.12",
+"angwiktionary": "php-1.27.0-wmf.12",
 "anwiki": "php-1.27.0-wmf.10",
-"anwiktionary": "php-1.27.0-wmf.10",
+"anwiktionary": "php-1.27.0-wmf.12",
 "arbcom_dewiki": "php-1.27.0-wmf.10",
 "arbcom_enwiki": "php-1.27.0-wmf.10",
 "arbcom_fiwiki": "php-1.27.0-wmf.10",
 "arbcom_nlwiki": "php-1.27.0-wmf.10",
 "arcwiki": "php-1.27.0-wmf.10",
 "arwiki": "php-1.27.0-wmf.10",
-"arwikibooks": "php-1.27.0-wmf.10",
-"arwikimedia": "php-1.27.0-wmf.10",
-"arwikinews": "php-1.27.0-wmf.10",
-"arwikiquote": "php-1.27.0-wmf.10",
-"arwikisource": "php-1.27.0-wmf.10",
-"arwikiversity": "php-1.27.0-wmf.10",
-"arwiktionary": "php-1.27.0-wmf.10",
+"arwikibooks": "php-1.27.0-wmf.12",
+"arwikimedia": "php-1.27.0-wmf.12",
+"arwikinews": "php-1.27.0-wmf.12",
+"arwikiquote": "php-1.27.0-wmf.12",
+"arwikisource": "php-1.27.0-wmf.12",
+"arwikiversity": "php-1.27.0-wmf.12",
+"arwiktionary": "php-1.27.0-wmf.12",
 "arzwiki": "php-1.27.0-wmf.10",
 "astwiki": "php-1.27.0-wmf.10",
-"astwikibooks": "php-1.27.0-wmf.10",
-"astwikiquote": "php-1.27.0-wmf.10",
-"astwiktionary": "php-1.27.0-wmf.10",
+"astwikibooks": "php-1.27.0-wmf.12",
+"astwikiquote": "php-1.27.0-wmf.12",
+"astwiktionary": "php-1.27.0-wmf.12",
 "aswiki": "php-1.27.0-wmf.10",
-"aswikibooks": "php-1.27.0-wmf.10",
-"aswikisource": "php-1.27.0-wmf.10",
-"aswiktionary": "ph

[MediaWiki-commits] [Gerrit] group1 wikis to 1.27.0-wmf.12 - change (operations/mediawiki-config)

2016-02-03 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review.

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

Change subject: group1 wikis to 1.27.0-wmf.12
..

group1 wikis to 1.27.0-wmf.12

Change-Id: Icb298349ba118ba8310ff2e147ce81c34016e81d
---
M php
M w/static/current/extensions
M w/static/current/resources
M w/static/current/skins
M wikiversions.json
5 files changed, 599 insertions(+), 599 deletions(-)


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

diff --git a/php b/php
index 0b27d2c..4c863da 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.27.0-wmf.10
\ No newline at end of file
+php-1.27.0-wmf.12
\ No newline at end of file
diff --git a/w/static/current/extensions b/w/static/current/extensions
index 98682a4..97fd164 12
--- a/w/static/current/extensions
+++ b/w/static/current/extensions
@@ -1 +1 @@
-/srv/mediawiki/php-1.27.0-wmf.10/extensions
\ No newline at end of file
+/srv/mediawiki/php-1.27.0-wmf.12/extensions
\ No newline at end of file
diff --git a/w/static/current/resources b/w/static/current/resources
index d38eb22..91abae6 12
--- a/w/static/current/resources
+++ b/w/static/current/resources
@@ -1 +1 @@
-/srv/mediawiki/php-1.27.0-wmf.10/resources
\ No newline at end of file
+/srv/mediawiki/php-1.27.0-wmf.12/resources
\ No newline at end of file
diff --git a/w/static/current/skins b/w/static/current/skins
index 8a33e77..4d21d01 12
--- a/w/static/current/skins
+++ b/w/static/current/skins
@@ -1 +1 @@
-/srv/mediawiki/php-1.27.0-wmf.10/skins
\ No newline at end of file
+/srv/mediawiki/php-1.27.0-wmf.12/skins
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 6a324e1..01f412f 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,896 +1,896 @@
 {
 "aawiki": "php-1.27.0-wmf.10",
-"aawikibooks": "php-1.27.0-wmf.10",
-"aawiktionary": "php-1.27.0-wmf.10",
+"aawikibooks": "php-1.27.0-wmf.12",
+"aawiktionary": "php-1.27.0-wmf.12",
 "abwiki": "php-1.27.0-wmf.10",
-"abwiktionary": "php-1.27.0-wmf.10",
+"abwiktionary": "php-1.27.0-wmf.12",
 "acewiki": "php-1.27.0-wmf.10",
-"advisorywiki": "php-1.27.0-wmf.10",
+"advisorywiki": "php-1.27.0-wmf.12",
 "afwiki": "php-1.27.0-wmf.10",
-"afwikibooks": "php-1.27.0-wmf.10",
-"afwikiquote": "php-1.27.0-wmf.10",
-"afwiktionary": "php-1.27.0-wmf.10",
+"afwikibooks": "php-1.27.0-wmf.12",
+"afwikiquote": "php-1.27.0-wmf.12",
+"afwiktionary": "php-1.27.0-wmf.12",
 "akwiki": "php-1.27.0-wmf.10",
-"akwikibooks": "php-1.27.0-wmf.10",
-"akwiktionary": "php-1.27.0-wmf.10",
+"akwikibooks": "php-1.27.0-wmf.12",
+"akwiktionary": "php-1.27.0-wmf.12",
 "alswiki": "php-1.27.0-wmf.10",
-"alswikibooks": "php-1.27.0-wmf.10",
-"alswikiquote": "php-1.27.0-wmf.10",
-"alswiktionary": "php-1.27.0-wmf.10",
+"alswikibooks": "php-1.27.0-wmf.12",
+"alswikiquote": "php-1.27.0-wmf.12",
+"alswiktionary": "php-1.27.0-wmf.12",
 "amwiki": "php-1.27.0-wmf.10",
-"amwikiquote": "php-1.27.0-wmf.10",
-"amwiktionary": "php-1.27.0-wmf.10",
+"amwikiquote": "php-1.27.0-wmf.12",
+"amwiktionary": "php-1.27.0-wmf.12",
 "angwiki": "php-1.27.0-wmf.10",
-"angwikibooks": "php-1.27.0-wmf.10",
-"angwikiquote": "php-1.27.0-wmf.10",
-"angwikisource": "php-1.27.0-wmf.10",
-"angwiktionary": "php-1.27.0-wmf.10",
+"angwikibooks": "php-1.27.0-wmf.12",
+"angwikiquote": "php-1.27.0-wmf.12",
+"angwikisource": "php-1.27.0-wmf.12",
+"angwiktionary": "php-1.27.0-wmf.12",
 "anwiki": "php-1.27.0-wmf.10",
-"anwiktionary": "php-1.27.0-wmf.10",
+"anwiktionary": "php-1.27.0-wmf.12",
 "arbcom_dewiki": "php-1.27.0-wmf.10",
 "arbcom_enwiki": "php-1.27.0-wmf.10",
 "arbcom_fiwiki": "php-1.27.0-wmf.10",
 "arbcom_nlwiki": "php-1.27.0-wmf.10",
 "arcwiki": "php-1.27.0-wmf.10",
 "arwiki": "php-1.27.0-wmf.10",
-"arwikibooks": "php-1.27.0-wmf.10",
-"arwikimedia": "php-1.27.0-wmf.10",
-"arwikinews": "php-1.27.0-wmf.10",
-"arwikiquote": "php-1.27.0-wmf.10",
-"arwikisource": "php-1.27.0-wmf.10",
-"arwikiversity": "php-1.27.0-wmf.10",
-"arwiktionary": "php-1.27.0-wmf.10",
+"arwikibooks": "php-1.27.0-wmf.12",
+"arwikimedia": "php-1.27.0-wmf.12",
+"arwikinews": "php-1.27.0-wmf.12",
+"arwikiquote": "php-1.27.0-wmf.12",
+"arwikisource": "php-1.27.0-wmf.12",
+"arwikiversity": "php-1.27.0-wmf.12",
+"arwiktionary": "php-1.27.0-wmf.12",
 "arzwiki": "php-1.27.0-wmf.10",
 "astwiki": "php-1.27.0-wmf.10",
-"astwikibooks": "php-1.27.0-wmf.10",
-"astwikiquote": "php-1.27.0-wmf.10",
-"astwiktionary": "php-1.27.0-wmf.10",
+"astwikibooks": "php-1.27.0-wmf.12",
+"astwikiquote": "php-1.27.0-wmf.12",
+"astwiktionary": "php-1.27.0-wmf.12",
 "aswiki": "php-1.27.0-wmf.10",
-"aswikibooks": "php-1.27.0-wmf.10",
-"aswikis

[MediaWiki-commits] [Gerrit] parsoid-vd-client: Add missing PATH environment var to script - change (operations/puppet)

2016-02-03 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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

Change subject: parsoid-vd-client: Add missing PATH environment var to script
..

parsoid-vd-client: Add missing PATH environment var to script

Change-Id: Ifeea9cc1fa68dffb130815a6ea9283aee87aa1c9
---
M modules/testreduce/files/parsoid-vd-client.systemd.service
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/testreduce/files/parsoid-vd-client.systemd.service 
b/modules/testreduce/files/parsoid-vd-client.systemd.service
index 3a587b5..b53f23c 100644
--- a/modules/testreduce/files/parsoid-vd-client.systemd.service
+++ b/modules/testreduce/files/parsoid-vd-client.systemd.service
@@ -5,6 +5,8 @@
 [Service]
 User=testreduce
 Group=testreduce
+
+Environment=PATH=/srv/visualdiff/node_modules/phantomjs/bin:/sbin:/usr/sbin:/bin:/usr/bin
 WorkingDirectory=/srv/testreduce/client
 ExecStart=/usr/bin/nodejs rtclient-cluster.js -c 4 
/etc/testreduce/parsoid-vd-client.config.js
 StandardOutput=journal

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeea9cc1fa68dffb130815a6ea9283aee87aa1c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] Switch keystone to mysql assignment from ldap. - change (operations/puppet)

2016-02-03 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Switch keystone to mysql assignment from ldap.
..

Switch keystone to mysql assignment from ldap.

This needs to be merged during a migration window.

Bug: T115029
Change-Id: I4d9f44a8015529b9fb3a71ab3320487efb04c298
---
M modules/openstack/templates/kilo/keystone/keystone.conf.erb
1 file changed, 12 insertions(+), 23 deletions(-)


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

diff --git a/modules/openstack/templates/kilo/keystone/keystone.conf.erb 
b/modules/openstack/templates/kilo/keystone/keystone.conf.erb
index f53b21f..3e16967 100644
--- a/modules/openstack/templates/kilo/keystone/keystone.conf.erb
+++ b/modules/openstack/templates/kilo/keystone/keystone.conf.erb
@@ -66,6 +66,9 @@
 [identity]
 driver = keystone.identity.backends.ldap.Identity
 
+[assignment]
+driver = keystone.assignment.backends.sql.Assignment
+
 [catalog]
 # dynamic, sql-based backend (supports API/CLI-based management commands)
 driver = keystone.catalog.backends.sql.Catalog
@@ -119,35 +122,21 @@
 url = ldap://<%= @keystoneconfig["ldap_host"] %>
 tree_dn = <%= @keystoneconfig["ldap_base_dn"] %>
 user_tree_dn = ou=people,<%= @keystoneconfig["ldap_base_dn"] %>
-tenant_tree_dn = ou=projects,<%= @keystoneconfig["ldap_base_dn"] %>
 user_id_attribute = <%= @keystoneconfig["ldap_user_id_attribute"] %>
-tenant_id_attribute = <%= @keystoneconfig["ldap_tenant_id_attribute"] %>
 user_name_attribute = <%= @keystoneconfig["ldap_user_name_attribute"] %>
-tenant_name_attribute = <%= @keystoneconfig["ldap_tenant_name_attribute"] %>
 user = <%= @keystoneconfig["ldap_user_dn"] %>
 password = <%= @keystoneconfig["ldap_user_pass"] %>
-# url = ldap://localhost
-# user = dc=Manager,dc=example,dc=com
-# password = None
-# suffix = cn=example,cn=com
-# use_dumb_member = False
 
-# user_tree_dn = ou=Users,dc=example,dc=com
-# user_objectclass = inetOrgPerson
-# user_id_attribute = cn
-# user_name_attribute = sn
+# former ldap-assignment settings:
+#tenant_tree_dn = ou=projects,<%= @keystoneconfig["ldap_base_dn"] %>
+#tenant_id_attribute = <%= @keystoneconfig["ldap_tenant_id_attribute"] %>
+#tenant_name_attribute = <%= @keystoneconfig["ldap_tenant_name_attribute"] %>
 
-# tenant_tree_dn = ou=Groups,dc=example,dc=com
-# tenant_objectclass = groupOfNames
-# tenant_id_attribute = cn
-# tenant_member_attribute = member
-# tenant_name_attribute = ou
-
-role_tree_dn = ou=roles,<%= @keystoneconfig["ldap_base_dn"] %>
-role_objectclass = organizationalRole
-role_id_attribute = cn
-role_name_attribute = cn
-role_member_attribute = roleOccupant
+#role_tree_dn = ou=roles,<%= @keystoneconfig["ldap_base_dn"] %>
+#role_objectclass = organizationalRole
+#role_id_attribute = cn
+#role_name_attribute = cn
+#role_member_attribute = roleOccupant
 
 [filter:debug]
 paste.filter_factory = keystone.common.wsgi:Debug.factory

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

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

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

[MediaWiki-commits] [Gerrit] updates to 6bb24e1d0cbd76573c7dbd0fcb95f9959acfd9ab 03.02.2016 - change (phabricator...Sprint)

2016-02-03 Thread Christopher Johnson (WMDE) (Code Review)

Christopher Johnson (WMDE) has uploaded a new change for review.

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

Change subject: updates to 6bb24e1d0cbd76573c7dbd0fcb95f9959acfd9ab 03.02.2016
..

updates to 6bb24e1d0cbd76573c7dbd0fcb95f9959acfd9ab 03.02.2016

Change-Id: I052b2cc894e3605619cd921fa362b1a3485db6ae
---
M rsrc/behavior-events-table.js
M rsrc/behavior-sprint-boards.js
M rsrc/behavior-sprint-history-table.js
M rsrc/behavior-tasks-table.js
M rsrc/dataTables.css
M rsrc/phui-workboard-view.css
M src/__phutil_library_map__.php
M src/controller/SprintProjectController.php
M src/controller/SprintProjectProfileController.php
M src/controller/board/SprintBoardMoveController.php
M src/controller/board/SprintBoardViewController.php
R src/profilepanel/SprintProjectDetailsProfilePanel.php
M src/profilepanel/SprintProjectWorkboardProfilePanel.php
M src/query/SprintQuery.php
M src/storage/SprintListDataProvider.php
M src/storage/TaskTableDataProvider.php
M src/view/SprintBoardTaskCard.php
M src/view/SprintUIObjectBoxView.php
18 files changed, 309 insertions(+), 215 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint 
refs/changes/24/268324/1

diff --git a/rsrc/behavior-events-table.js b/rsrc/behavior-events-table.js
index 071b41b..38a6b09 100644
--- a/rsrc/behavior-events-table.js
+++ b/rsrc/behavior-events-table.js
@@ -12,7 +12,7 @@
 ],
 "dom": 'T<"clear">lfrtip',
 "tableTools": {
-"sSwfPath": "/rsrc/sprint/copy_csv_xls.swf",
+"sSwfPath": "webroot-static/copy_csv_xls.swf",
 "aButtons": [
 {
 "sExtends": "copy",
diff --git a/rsrc/behavior-sprint-boards.js b/rsrc/behavior-sprint-boards.js
index df13207..13432f1 100644
--- a/rsrc/behavior-sprint-boards.js
+++ b/rsrc/behavior-sprint-boards.js
@@ -227,7 +227,9 @@
 
 for (ii = 0; ii < cols.length; ii++) {
 var list = new JX.DraggableList('project-card', cols[ii])
-.setFindItemsHandler(JX.bind(null, finditems, cols[ii]));
+.setFindItemsHandler(JX.bind(null, finditems, cols[ii]))
+.setOuterContainer(JX.$(config.boardID))
+.setCanDragX(true);
 
 list.listen('didSend', JX.bind(list, onupdate, cols[ii]));
 list.listen('didReceive', JX.bind(list, onupdate, cols[ii]));
@@ -245,6 +247,9 @@
 for (ii = 0; ii < lists.length; ii++) {
 lists[ii].setGroup(lists);
 }
+}
+
+function setup() {
 
 JX.Stratcom.listen(
 'click',
@@ -332,6 +337,9 @@
 statics.boardID = new_config.boardID;
 }
 update_statics(new_config);
+if (data.fromServer) {
+init_board();
+}
 });
 return true;
 }
diff --git a/rsrc/behavior-sprint-history-table.js 
b/rsrc/behavior-sprint-history-table.js
index 7e9161c..a44c8fd 100644
--- a/rsrc/behavior-sprint-history-table.js
+++ b/rsrc/behavior-sprint-history-table.js
@@ -17,7 +17,7 @@
 ],
 "dom": 'T<"clear">lfrtip',
 "tableTools": {
-"sSwfPath": "/rsrc/sprint/copy_csv_xls.swf",
+"sSwfPath": "webroot-static/copy_csv_xls.swf",
 "aButtons": [
 {
 "sExtends": "copy",
diff --git a/rsrc/behavior-tasks-table.js b/rsrc/behavior-tasks-table.js
index dfa0d25..def2857 100644
--- a/rsrc/behavior-tasks-table.js
+++ b/rsrc/behavior-tasks-table.js
@@ -20,7 +20,7 @@
 ],
 "dom": 'T<"clear">lfrtip',
 "tableTools": {
-"sSwfPath": "/rsrc/sprint/copy_csv_xls.swf",
+"sSwfPath": "webroot-static/copy_csv_xls.swf",
 "aButtons": [
 {
 "sExtends": "copy",
diff --git a/rsrc/dataTables.css b/rsrc/dataTables.css
index cfc48c6..61c4a41 100644
--- a/rsrc/dataTables.css
+++ b/rsrc/dataTables.css
@@ -40,19 +40,19 @@
 *cursor: hand;
 }
 table.dataTable thead .sorting {
-background: url(/rsrc/sprint/sort_both.png) no-repeat center right;
+background: url('webroot-static/sort_both.png') no-repeat center right;
 }
 table.dataTable thead .sorting_asc {
-background: url(/rsrc/sprint/sort_asc.png) no-repeat center right;
+background: url('webroot-static/sort_asc.png') no-repeat center right;
 }
 table.dataTable thead .sorting_desc {
-background: url(/rsrc/sprint/sort_desc.png) no-repeat center right;
+background: url('webroot-static/sort_desc.png') no-repeat center right;
 }
 table.dataTable thead .sorting_asc_disabled {
-background: url(/rsrc/sprint/sort_asc_disabled.png) no-repeat center right;
+background: url('webroot-static/sort_asc_disabled.png') no-repeat center 
right;
 }
 table.dataTable thead .sortin

[MediaWiki-commits] [Gerrit] Hygiene: update database and JSON Java packaging - change (apps...wikipedia)

2016-02-03 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

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

Change subject: Hygiene: update database and JSON Java packaging
..

Hygiene: update database and JSON Java packaging

No functional changes.

• Move Database, DatabaseTable, DatabaseClient, and
  SQLiteContentProvider from org.wikipedia.data to
  org.wikipedia.database.
• Move GsonMarshaller, GsonUnmarshaller, GsonUtil,
  SessionUnmarshaller, and TabUnmarshaller from org.wikipedia.data to
  org.wikipedia.json.

Change-Id: I1e3e10d742bda36e70a31877ee5c07d3d2b6823b
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
R app/src/main/java/org/wikipedia/database/Database.java
R app/src/main/java/org/wikipedia/database/DatabaseClient.java
R app/src/main/java/org/wikipedia/database/DatabaseTable.java
R app/src/main/java/org/wikipedia/database/SQLiteContentProvider.java
M 
app/src/main/java/org/wikipedia/editing/summaries/EditSummaryContentProvider.java
M 
app/src/main/java/org/wikipedia/editing/summaries/EditSummaryDatabaseTable.java
M app/src/main/java/org/wikipedia/history/HistoryEntryContentProvider.java
M app/src/main/java/org/wikipedia/history/HistoryEntryDatabaseTable.java
M app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
R app/src/main/java/org/wikipedia/json/GsonMarshaller.java
R app/src/main/java/org/wikipedia/json/GsonUnmarshaller.java
R app/src/main/java/org/wikipedia/json/GsonUtil.java
R app/src/main/java/org/wikipedia/json/SessionUnmarshaller.java
R app/src/main/java/org/wikipedia/json/TabUnmarshaller.java
M app/src/main/java/org/wikipedia/page/Section.java
M app/src/main/java/org/wikipedia/pageimages/PageImageContentProvider.java
M app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java
M app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageContentProvider.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
M app/src/main/java/org/wikipedia/search/RecentSearchContentProvider.java
M app/src/main/java/org/wikipedia/search/RecentSearchDatabaseTable.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
25 files changed, 28 insertions(+), 28 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index e6030b8..05339bd 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -22,8 +22,8 @@
 import org.wikipedia.analytics.SessionFunnel;
 import org.wikipedia.crash.CrashReporter;
 import org.wikipedia.crash.hockeyapp.HockeyAppCrashReporter;
-import org.wikipedia.data.DatabaseClient;
-import org.wikipedia.data.Database;
+import org.wikipedia.database.DatabaseClient;
+import org.wikipedia.database.Database;
 import org.wikipedia.drawable.DrawableUtil;
 import org.wikipedia.editing.EditTokenStorage;
 import org.wikipedia.editing.summaries.EditSummary;
diff --git a/app/src/main/java/org/wikipedia/data/Database.java 
b/app/src/main/java/org/wikipedia/database/Database.java
similarity index 97%
rename from app/src/main/java/org/wikipedia/data/Database.java
rename to app/src/main/java/org/wikipedia/database/Database.java
index 9e0a5e2..234536c 100644
--- a/app/src/main/java/org/wikipedia/data/Database.java
+++ b/app/src/main/java/org/wikipedia/database/Database.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.database;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/org/wikipedia/data/DatabaseClient.java 
b/app/src/main/java/org/wikipedia/database/DatabaseClient.java
similarity index 98%
rename from app/src/main/java/org/wikipedia/data/DatabaseClient.java
rename to app/src/main/java/org/wikipedia/database/DatabaseClient.java
index 82f85d3..c2bcd5e 100644
--- a/app/src/main/java/org/wikipedia/data/DatabaseClient.java
+++ b/app/src/main/java/org/wikipedia/database/DatabaseClient.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.database;
 
 import android.content.ContentProviderClient;
 import android.content.Context;
diff --git a/app/src/main/java/org/wikipedia/data/DatabaseTable.java 
b/app/src/main/java/org/wikipedia/database/DatabaseTable.java
similarity index 99%
rename from app/src/main/java/org/wikipedia/data/DatabaseTable.java
rename to app/src/main/java/org/wikipedia/database/DatabaseTable.java
index 92fb897..1736bee 100644
--- a/app/src/main/java/org/wikipedia/data/DatabaseTable.java
+++ b/app/src/main/java/org/wikipedia/database/DatabaseTable.java
@@ -1,4 +1,4 @@
-package org.wikipedia.data;
+package org.wikipedia.database;
 
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
diff

[MediaWiki-commits] [Gerrit] Sort language names for the dropdown case-insensitively - change (mediawiki...UploadWizard)

2016-02-03 Thread Code Review

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

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

Change subject: Sort language names for the dropdown case-insensitively
..

Sort language names for the dropdown case-insensitively

Bug: T121625
Change-Id: I10f928b965f6793d160bbebe5453ed4ca678c1ea
---
M UploadWizard.config.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/UploadWizard.config.php b/UploadWizard.config.php
index c86e3ef..9323c10 100644
--- a/UploadWizard.config.php
+++ b/UploadWizard.config.php
@@ -55,7 +55,7 @@
}
}
// Sort the list by the language name
-   natsort( $uwLanguages );
+   natcasesort( $uwLanguages );
// Cache the list for 1 day
$wgMemc->set( $cacheKey, $uwLanguages, 60 * 60 * 24 );
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10f928b965f6793d160bbebe5453ed4ca678c1ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Hygiene: remove ContentPersister subclasses - change (apps...wikipedia)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: remove ContentPersister subclasses
..


Hygiene: remove ContentPersister subclasses

No functional changes intended.

• Move ContentProviderClient acquisition logic to PersistenceHelper.
• Remove ContentPersister subclasses. The only value these classes had
  was in their constructors but is now in the subclasses of
  PersistenceHelper.
• Replace duplicate
  context.getContentResolver().acquireContentProviderClient() logic with
  calls to the new PersistenceHelper.acquireClient() method.
• Replace raw types in Wikipedia.persisters and getPersister() with
  parameterized types.

Change-Id: Ibe3f9c9ca984c4ccb1f5055c64a4ff2f73a001cb
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/data/ContentPersister.java
M app/src/main/java/org/wikipedia/data/DBOpenHelper.java
M app/src/main/java/org/wikipedia/data/PersistenceHelper.java
M app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
D app/src/main/java/org/wikipedia/editing/summaries/EditSummaryPersister.java
M app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
D app/src/main/java/org/wikipedia/history/HistoryEntryPersister.java
M 
app/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
D app/src/main/java/org/wikipedia/pageimages/PageImagePersister.java
M app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
D app/src/main/java/org/wikipedia/savedpages/SavedPagePersister.java
M app/src/main/java/org/wikipedia/search/RecentSearchPersistenceHelper.java
D app/src/main/java/org/wikipedia/search/RecentSearchPersister.java
15 files changed, 55 insertions(+), 104 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 7ee4544..aa8339f 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -18,20 +18,18 @@
 import com.squareup.otto.Bus;
 
 import org.mediawiki.api.json.Api;
-import org.wikipedia.crash.CrashReporter;
-import org.wikipedia.crash.hockeyapp.HockeyAppCrashReporter;
 import org.wikipedia.analytics.FunnelManager;
 import org.wikipedia.analytics.SessionFunnel;
+import org.wikipedia.crash.CrashReporter;
+import org.wikipedia.crash.hockeyapp.HockeyAppCrashReporter;
 import org.wikipedia.data.ContentPersister;
 import org.wikipedia.data.DBOpenHelper;
 import org.wikipedia.drawable.DrawableUtil;
 import org.wikipedia.editing.EditTokenStorage;
 import org.wikipedia.editing.summaries.EditSummary;
-import org.wikipedia.editing.summaries.EditSummaryPersister;
 import org.wikipedia.events.ChangeTextSizeEvent;
 import org.wikipedia.events.ThemeChangeEvent;
 import org.wikipedia.history.HistoryEntry;
-import org.wikipedia.history.HistoryEntryPersister;
 import org.wikipedia.interlanguage.AcceptLanguageUtil;
 import org.wikipedia.interlanguage.AppLanguageState;
 import org.wikipedia.login.UserInfoStorage;
@@ -40,19 +38,14 @@
 import org.wikipedia.onboarding.PrefsOnboardingStateMachine;
 import org.wikipedia.page.PageCache;
 import org.wikipedia.pageimages.PageImage;
-import org.wikipedia.pageimages.PageImagePersister;
 import org.wikipedia.savedpages.SavedPage;
-import org.wikipedia.savedpages.SavedPagePersister;
 import org.wikipedia.search.RecentSearch;
-import org.wikipedia.search.RecentSearchPersister;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.theme.Theme;
 import org.wikipedia.util.ApiUtil;
 import org.wikipedia.util.ReleaseUtil;
 import org.wikipedia.util.log.L;
 import org.wikipedia.zero.WikipediaZeroHandler;
-
-import retrofit.RequestInterceptor;
 
 import java.text.SimpleDateFormat;
 import java.util.Collections;
@@ -64,9 +57,11 @@
 import java.util.TimeZone;
 import java.util.UUID;
 
+import retrofit.RequestInterceptor;
+
 import static org.wikipedia.util.DimenUtil.getFontSizeFromSp;
-import static org.wikipedia.util.StringUtil.emptyIfNull;
 import static org.wikipedia.util.ReleaseUtil.getChannel;
+import static org.wikipedia.util.StringUtil.emptyIfNull;
 
 public class WikipediaApp extends Application {
 private static final String HTTPS_PROTOCOL = "https";
@@ -91,7 +86,7 @@
 private final RemoteConfig remoteConfig = new RemoteConfig();
 private final UserInfoStorage userInfoStorage = new UserInfoStorage();
 private final MccMncStateHandler mccMncStateHandler = new 
MccMncStateHandler();
-private final Map persisters = 
Collections.synchronizedMap(new HashMap());
+private final Map> persisters = 
Collections.synchronizedMap(new HashMap>());
 private final Map apis = new HashMap<>();
 private AppLanguageSta

[MediaWiki-commits] [Gerrit] group0 to wmf.12 - change (operations/mediawiki-config)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: group0 to wmf.12
..


group0 to wmf.12

Change-Id: I81d13b4e2232c270a6c2350fd4283da035b69e2c
---
M wikiversions.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index f2c7eb8..6a324e1 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -476,7 +476,7 @@
 "maiwiki": "php-1.27.0-wmf.10",
 "map_bmswiki": "php-1.27.0-wmf.10",
 "mdfwiki": "php-1.27.0-wmf.10",
-"mediawikiwiki": "php-1.27.0-wmf.10",
+"mediawikiwiki": "php-1.27.0-wmf.12",
 "metawiki": "php-1.27.0-wmf.10",
 "mgwiki": "php-1.27.0-wmf.10",
 "mgwikibooks": "php-1.27.0-wmf.10",
@@ -745,7 +745,7 @@
 "tenwiki": "php-1.27.0-wmf.10",
 "test2wiki": "php-1.27.0-wmf.12",
 "testwiki": "php-1.27.0-wmf.12",
-"testwikidatawiki": "php-1.27.0-wmf.10",
+"testwikidatawiki": "php-1.27.0-wmf.12",
 "tetwiki": "php-1.27.0-wmf.10",
 "tewiki": "php-1.27.0-wmf.10",
 "tewikibooks": "php-1.27.0-wmf.10",
@@ -875,7 +875,7 @@
 "zawikiquote": "php-1.27.0-wmf.10",
 "zawiktionary": "php-1.27.0-wmf.10",
 "zeawiki": "php-1.27.0-wmf.10",
-"zerowiki": "php-1.27.0-wmf.10",
+"zerowiki": "php-1.27.0-wmf.12",
 "zh_classicalwiki": "php-1.27.0-wmf.10",
 "zh_min_nanwiki": "php-1.27.0-wmf.10",
 "zh_min_nanwikibooks": "php-1.27.0-wmf.10",

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

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

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

[MediaWiki-commits] [Gerrit] group0 to wmf.12 - change (operations/mediawiki-config)

2016-02-03 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review.

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

Change subject: group0 to wmf.12
..

group0 to wmf.12

Change-Id: I81d13b4e2232c270a6c2350fd4283da035b69e2c
---
M wikiversions.json
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index f2c7eb8..6a324e1 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -476,7 +476,7 @@
 "maiwiki": "php-1.27.0-wmf.10",
 "map_bmswiki": "php-1.27.0-wmf.10",
 "mdfwiki": "php-1.27.0-wmf.10",
-"mediawikiwiki": "php-1.27.0-wmf.10",
+"mediawikiwiki": "php-1.27.0-wmf.12",
 "metawiki": "php-1.27.0-wmf.10",
 "mgwiki": "php-1.27.0-wmf.10",
 "mgwikibooks": "php-1.27.0-wmf.10",
@@ -745,7 +745,7 @@
 "tenwiki": "php-1.27.0-wmf.10",
 "test2wiki": "php-1.27.0-wmf.12",
 "testwiki": "php-1.27.0-wmf.12",
-"testwikidatawiki": "php-1.27.0-wmf.10",
+"testwikidatawiki": "php-1.27.0-wmf.12",
 "tetwiki": "php-1.27.0-wmf.10",
 "tewiki": "php-1.27.0-wmf.10",
 "tewikibooks": "php-1.27.0-wmf.10",
@@ -875,7 +875,7 @@
 "zawikiquote": "php-1.27.0-wmf.10",
 "zawiktionary": "php-1.27.0-wmf.10",
 "zeawiki": "php-1.27.0-wmf.10",
-"zerowiki": "php-1.27.0-wmf.10",
+"zerowiki": "php-1.27.0-wmf.12",
 "zh_classicalwiki": "php-1.27.0-wmf.10",
 "zh_min_nanwiki": "php-1.27.0-wmf.10",
 "zh_min_nanwikibooks": "php-1.27.0-wmf.10",

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

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

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

[MediaWiki-commits] [Gerrit] varnish: fix top-scope var without namespace - change (operations/puppet)

2016-02-03 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: varnish: fix top-scope var without namespace
..


varnish: fix top-scope var without namespace

./modules/varnish/manifests/common/directors.pp
WARNING: top-scope variable being used without an explicit namespace on line 37

Change-Id: Ibfc3b406665c1fd82652f20b236ff6a80d06f099
---
M modules/varnish/manifests/common/directors.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/varnish/manifests/common/directors.pp 
b/modules/varnish/manifests/common/directors.pp
index a4708e7..54ce8a7 100644
--- a/modules/varnish/manifests/common/directors.pp
+++ b/modules/varnish/manifests/common/directors.pp
@@ -34,7 +34,7 @@
 }
 
 # usual old trick
-$group = hiera('cluster', $cluster)
+$group = hiera('cluster', $::cluster)
 $def_service = 'varnish-be'
 
 $keyspaces_str = inline_template("<%= @directors.values.map{ |v| 
\"#{@conftool_namespace}/#{v['dc'] || @def_dc}/#{@group}/#{v['service'] || 
@def_service}\" }.join('|') %>")

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

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

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

[MediaWiki-commits] [Gerrit] Create kafka role and utilize it from CirrusSearch - change (mediawiki/vagrant)

2016-02-03 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged.

Change subject: Create kafka role and utilize it from CirrusSearch
..


Create kafka role and utilize it from CirrusSearch

This isn't the best possible implementation, but it seems to get
the job done to allow me to easily test messages produced in
avro and shipped to kafka.

It would be nice if this wasn't on by default, but i didn't really
want to make another role cirrussearch-kafka or some such. Open
to ideas.

A kafka role might also be useful for integrating things necessary
to test EventBus in mw-vagrant

Change-Id: I2d9da7ee61be8008137b1f2c30b3bcc23198416c
---
M puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
A puppet/modules/kafka/files/default
A puppet/modules/kafka/manifests/init.pp
M puppet/modules/role/manifests/cirrussearch.pp
A puppet/modules/role/manifests/kafka.pp
A puppet/modules/role/settings/kafka.yaml
6 files changed, 107 insertions(+), 1 deletion(-)

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



diff --git a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb 
b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
index 6afe0cb..c3520cb 100644
--- a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
+++ b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
@@ -1,2 +1,34 @@
+#  array( 'kafka' ),
+   'processors' => array(),
+   'calls' => array()
+);
+
+$wgMWLoggerDefaultSpi['args'][0]['handlers']['kafka'] = array(
+   'factory' => '\\MediaWiki\\Logger\\Monolog\\KafkaHandler::factory',
+   'args' => array(
+   array( 'localhost:9092' ),
+   array(
+   'alias' => array(),
+   'swallowExceptions' => false,
+   'logExceptions' => null,
+   )
+   ),
+   'formatter' => 'avro',
+);
+
+$wgMWLoggerDefaultSpi['args'][0]['formatters']['avro'] = array(
+   'class' => '\\MediaWiki\\Logger\\Monolog\\AvroFormatter',
+   'args' => array(
+   array(
+   'CirrusSearchRequestSet' => file_get_contents(
+   "<%= scope['::service::root_dir'] 
%>/event-schemas/avro/mediawiki/CirrusSearchRequestSet/111448028943.avsc"
+   ),
+   ),
+   ),
+);
diff --git a/puppet/modules/kafka/files/default 
b/puppet/modules/kafka/files/default
new file mode 100644
index 000..783cb5d
--- /dev/null
+++ b/puppet/modules/kafka/files/default
@@ -0,0 +1,5 @@
+KAFKA_START=yes
+KAFKA_USER=kafka
+KAFKA_GROUP=kafka
+KAFKA_CONFIG=/etc/kafka
+KAFKA_HEAP_OPTS="-Xmx64M -Xmx64M"
diff --git a/puppet/modules/kafka/manifests/init.pp 
b/puppet/modules/kafka/manifests/init.pp
new file mode 100644
index 000..18f5d3f
--- /dev/null
+++ b/puppet/modules/kafka/manifests/init.pp
@@ -0,0 +1,51 @@
+# == Class: Kafka
+#
+class kafka {
+require ::service
+
+require_package('zookeeper-server')
+require_package('kafka-server')
+require_package('kafka-cli')
+require_package('kafkacat')
+
+exec { 'zookeeper-server-init':
+command => '/usr/bin/service zookeeper-server init',
+unless  => '/usr/bin/test -d /var/lib/zookeeper/version-2',
+require => Package['zookeeper-server']
+}
+
+service { 'zookeeper-server':
+ensure  => 'running',
+enable  => true,
+require => Exec['zookeeper-server-init'],
+}
+
+file { '/etc/default/kafka':
+source  => 'puppet:///modules/kafka/default',
+require => Package['kafka-server'],
+owner   => 'root',
+group   => 'root',
+}
+
+service { 'kafka':
+ensure  => 'running',
+enable  => true,
+require => [
+File['/etc/default/kafka'],
+Package['zookeeper-server']
+],
+}
+
+# If kafka starts before zookeeper it fails
+exec { 'kafka-after-zookeper':
+command => 'update-rc.d -f kafka remove && update-rc.d kafka defaults 
30',
+unless  => 'test -f /etc/rc3.d/S30kafka',
+require => Package['kafka-server'],
+}
+
+git::clone { 'mediawiki/event-schemas':
+directory => "${::service::root_dir}/event-schemas"
+}
+
+service::gitupdate { 'event-schemas': }
+}
diff --git a/puppet/modules/role/manifests/cirrussearch.pp 
b/puppet/modules/role/manifests/cirrussearch.pp
index 65876a5..d87e261 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -7,8 +7,13 @@
 include ::role::pdfhandler
 include ::role::cite
 include ::elasticsearch
+# Utilized as part of cirrus logging infrastructure
+include ::role::psr3
+include ::role::kafka
 # not strictly required for cirrussearch, but used in the tests
 include ::role::svg
+# necessary for CirrusSearch.php.erb to point to service root dir
+require ::service

[MediaWiki-commits] [Gerrit] Hygiene: make db feature version callback abstract - change (apps...wikipedia)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: make db feature version callback abstract
..


Hygiene: make db feature version callback abstract

PersistenceHelper.getDBVersionIntroducedAt() defaulted to 1. This was
used implicitly by two subclasses but could accidentally be used by new
subclasses. Make this method abstract. No functional changes intended.

Change-Id: Ie8e57c8a554e31860dd932aefae01b84e61b2ecf
---
M app/src/main/java/org/wikipedia/data/PersistenceHelper.java
M app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
M app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
3 files changed, 13 insertions(+), 5 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/data/PersistenceHelper.java 
b/app/src/main/java/org/wikipedia/data/PersistenceHelper.java
index 4a3c6c0..71d590a 100644
--- a/app/src/main/java/org/wikipedia/data/PersistenceHelper.java
+++ b/app/src/main/java/org/wikipedia/data/PersistenceHelper.java
@@ -15,7 +15,7 @@
 import static org.wikipedia.util.StringUtil.removeNulls;
 
 public abstract class PersistenceHelper {
-
+protected static final int INITIAL_DB_VERSION = 1;
 private static final int MIN_VERSION_NORMALIZED_TITLES = 8;
 
 public static class Column{
@@ -85,9 +85,7 @@
  */
 protected abstract String[] getUnfilteredPrimaryKeySelectionArgs(@NonNull 
T obj);
 
-protected int getDBVersionIntroducedAt() {
-return 1;
-}
+protected abstract int getDBVersionIntroducedAt();
 
 public List getElements(int fromVersion, int toVersion) {
  List columns = new ArrayList<>();
@@ -141,4 +139,4 @@
 }
 return baseContentURI;
 }
-}
+}
\ No newline at end of file
diff --git 
a/app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java 
b/app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
index 635295e..f31d744 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryEntryPersistenceHelper.java
@@ -90,6 +90,11 @@
 }
 
 @Override
+protected int getDBVersionIntroducedAt() {
+return INITIAL_DB_VERSION;
+}
+
+@Override
 protected void convertAllTitlesToUnderscores(SQLiteDatabase db) {
 Cursor cursor = db.query(getTableName(), null, null, null, null, null, 
null);
 int idIndex = cursor.getColumnIndex("_id");
diff --git 
a/app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java 
b/app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
index e064f01..4a60ca3 100644
--- a/app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
+++ b/app/src/main/java/org/wikipedia/pageimages/PageImagePersistenceHelper.java
@@ -106,6 +106,11 @@
 }
 
 @Override
+protected int getDBVersionIntroducedAt() {
+return INITIAL_DB_VERSION;
+}
+
+@Override
 protected void convertAllTitlesToUnderscores(SQLiteDatabase db) {
 Cursor cursor = db.query(getTableName(), null, null, null, null, null, 
null);
 int idIndex = cursor.getColumnIndex("_id");

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: rename ContentPersister to DatabaseClient - change (apps...wikipedia)

2016-02-03 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

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

Change subject: Hygiene: rename ContentPersister to DatabaseClient
..

Hygiene: rename ContentPersister to DatabaseClient

• The app interacts with the database's tables through clients of type
  ContentPersister. Rename ContentPersister to DatabaseClient.
• Rename DBOpenHelper to Database. DBOpenHelper is a subclass of
  SQLiteOpenHelper, however, "Helper" is too generic a term and
  "Database" makes it clear there should only be one instance, and that 
DatabaseTable and DatabaseClient are closely related.
• Change WikipediaApp.getDatabaseClient() to use classes themselves
  instead of Class.getCanonicalName() for the keys.

Change-Id: I0a6adbf067ff34248b1bab743e5eb8967c7b6e59
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
R app/src/main/java/org/wikipedia/data/Database.java
R app/src/main/java/org/wikipedia/data/DatabaseClient.java
M app/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
M app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
M app/src/main/java/org/wikipedia/history/DeleteAllHistoryTask.java
M app/src/main/java/org/wikipedia/history/HistoryEntryContentProvider.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java
M app/src/main/java/org/wikipedia/savedpages/DeleteAllSavedPagesTask.java
M app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageContentProvider.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
M app/src/main/java/org/wikipedia/search/DeleteAllRecentSearchesTask.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
18 files changed, 52 insertions(+), 52 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 9e522ec..e6030b8 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -22,8 +22,8 @@
 import org.wikipedia.analytics.SessionFunnel;
 import org.wikipedia.crash.CrashReporter;
 import org.wikipedia.crash.hockeyapp.HockeyAppCrashReporter;
-import org.wikipedia.data.ContentPersister;
-import org.wikipedia.data.DBOpenHelper;
+import org.wikipedia.data.DatabaseClient;
+import org.wikipedia.data.Database;
 import org.wikipedia.drawable.DrawableUtil;
 import org.wikipedia.editing.EditTokenStorage;
 import org.wikipedia.editing.summaries.EditSummary;
@@ -86,13 +86,13 @@
 private final RemoteConfig remoteConfig = new RemoteConfig();
 private final UserInfoStorage userInfoStorage = new UserInfoStorage();
 private final MccMncStateHandler mccMncStateHandler = new 
MccMncStateHandler();
-private final Map> persisters = 
Collections.synchronizedMap(new HashMap>());
+private final Map, DatabaseClient> databaseClients = 
Collections.synchronizedMap(new HashMap, DatabaseClient>());
 private final Map apis = new HashMap<>();
 private AppLanguageState appLanguageState;
 private FunnelManager funnelManager;
 private SessionFunnel sessionFunnel;
 
-private DBOpenHelper dbOpenHelper;
+private Database database;
 private EditTokenStorage editTokenStorage;
 private SharedPreferenceCookieManager cookieManager;
 private String userAgent;
@@ -180,7 +180,7 @@
 sessionFunnel = new SessionFunnel(this);
 editTokenStorage = new EditTokenStorage(this);
 cookieManager = new SharedPreferenceCookieManager();
-dbOpenHelper = new DBOpenHelper(this);
+database = new Database(this);
 
 enableWebViewDebugging();
 
@@ -316,30 +316,30 @@
 return appLanguageState.getAppLanguageCanonicalName(code);
 }
 
-public DBOpenHelper getDbOpenHelper() {
-return dbOpenHelper;
+public Database getDatabase() {
+return database;
 }
 
-public  ContentPersister getPersister(Class cls) {
-if (!persisters.containsKey(cls.getCanonicalName())) {
-ContentPersister persister;
+public  DatabaseClient getDatabaseClient(Class cls) {
+if (!databaseClients.containsKey(cls)) {
+DatabaseClient client;
 if (cls.equals(HistoryEntry.class)) {
-persister = new ContentPersister<>(this, 
HistoryEntry.DATABASE_TABLE);
+client = new DatabaseClient<>(this, 
HistoryEntry.DATABASE_TABLE);
 } else if (cls.equals(PageImage.class)) {
-persister = new ContentPersister<>(this, 
Pa

[MediaWiki-commits] [Gerrit] dataset: fix top-scope var without namespace - change (operations/puppet)

2016-02-03 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: dataset: fix top-scope var without namespace
..


dataset: fix top-scope var without namespace

./modules/dataset/manifests/nfs.pp
WARNING: top-scope variable being used without an explicit namespace on line 25

./modules/dataset/manifests/cron/rsync/peers.pp
WARNING: top-scope variable being used without an explicit namespace on line 12

The second one looks like a mistake, you meant $enabled here, not $absent, 
right?

Change-Id: I43b22198c16602a14bcbb553821aff6474b53f2f
---
M modules/dataset/manifests/cron/rsync/peers.pp
M modules/dataset/manifests/nfs.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/dataset/manifests/cron/rsync/peers.pp 
b/modules/dataset/manifests/cron/rsync/peers.pp
index b077443..d313ea8 100644
--- a/modules/dataset/manifests/cron/rsync/peers.pp
+++ b/modules/dataset/manifests/cron/rsync/peers.pp
@@ -9,7 +9,7 @@
 }
 
 file { '/usr/local/bin/rsync-dumps.sh':
-ensure => $absent,
+ensure => $ensure,
 }
 
 file { '/usr/local/bin/rsync-dumps.py':
diff --git a/modules/dataset/manifests/nfs.pp b/modules/dataset/manifests/nfs.pp
index bb28134..813bd13 100644
--- a/modules/dataset/manifests/nfs.pp
+++ b/modules/dataset/manifests/nfs.pp
@@ -22,7 +22,7 @@
 }
 
 service { 'nfs-kernel-server':
-ensure  => $nfs_ensure,
+ensure  => $::nfs_ensure,
 require => [
 Package['nfs-kernel-server'],
 File['/etc/exports'],

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

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

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

[MediaWiki-commits] [Gerrit] Include elasticsearch url in coordinator name - change (wikimedia...analytics)

2016-02-03 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Include elasticsearch url in coordinator name
..

Include elasticsearch url in coordinator name

This will make it easier to tell the difference between the
eqiad and codfw jobs when looking at currently running
coordinators and spark jobs.

Change-Id: I2fc7ad8da8c80c0189ecce1daf05306a0c243a32
---
M oozie/transfer_to_es/coordinator.xml
M oozie/transfer_to_es/transferToES.py
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/analytics 
refs/changes/19/268319/1

diff --git a/oozie/transfer_to_es/coordinator.xml 
b/oozie/transfer_to_es/coordinator.xml
index 4a8edfe..230f7f9 100644
--- a/oozie/transfer_to_es/coordinator.xml
+++ b/oozie/transfer_to_es/coordinator.xml
@@ -1,6 +1,6 @@
 
 https://gerrit.wikimedia.org/r/268319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fc7ad8da8c80c0189ecce1daf05306a0c243a32
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/analytics
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] Fix "Uncaught TypeError: $.cookie is not a function" - change (mediawiki...VisualEditor)

2016-02-03 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Fix "Uncaught TypeError: $.cookie is not a function"
..

Fix "Uncaught TypeError: $.cookie is not a function"

Was being thrown on all read pages and caused VE to no longer
load properly.

Three places make use of $.cookie():
* ve.init.mw.DesktopArticleTarget.init.js
* ve.init.mw.DesktopArticleTarget.js
* ve.ui.MWEducationPopupTool.js

Presumably this worked by luck previously due to another extension
or core module depending on it and loading earlier but no more.

Change-Id: I6b00822f1d5d17add3e298cbd77f4790899aaec2
(cherry picked from commit 7099ae0eef7ce8531db724b4e73e588ed41859ce)
---
M extension.json
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index 541e0d8..814fb52 100644
--- a/extension.json
+++ b/extension.json
@@ -266,6 +266,7 @@
},
"dependencies": [
"jquery.client",
+   "jquery.cookie",
"mediawiki.page.startup",
"mediawiki.Title",
"mediawiki.Uri",
@@ -336,6 +337,7 @@
"ext.visualEditor.base",
"ext.visualEditor.mediawiki",
"ext.visualEditor.core.desktop",
+   "jquery.cookie",
"mediawiki.jqueryMsg",
"mediawiki.util"
],
@@ -1101,6 +1103,7 @@
"mediawiki.user",
"mediawiki.util",
"mediawiki.jqueryMsg",
+   "jquery.cookie",
"jquery.byteLimit",
"mediawiki.skinning.content.parsoid",
"mediawiki.language.specialCharacters",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b00822f1d5d17add3e298cbd77f4790899aaec2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Krinkle 

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

[MediaWiki-commits] [Gerrit] osm: fix top-scope var without namespace, rm cruft - change (operations/puppet)

2016-02-03 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: osm: fix top-scope var without namespace, rm cruft
..


osm: fix top-scope var without namespace, rm cruft

./modules/osm/manifests/planet_import.pp
WARNING: top-scope variable being used without an explicit namespace on line 25

removing the entire line that is not used anymore

Change-Id: Ib941673a231f1de31a2f39346c3a15c6287f2f90
---
M modules/osm/manifests/planet_import.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/osm/manifests/planet_import.pp 
b/modules/osm/manifests/planet_import.pp
index 1f87513..56a9cf7 100644
--- a/modules/osm/manifests/planet_import.pp
+++ b/modules/osm/manifests/planet_import.pp
@@ -22,7 +22,6 @@
 
 # Check if our db tables exist
 $tables_exist = "/usr/bin/psql -d ${name} --tuples-only -c \'SELECT 
table_name FROM information_schema.tables;\' | /bin/grep \'planet_osm\'"
-$shapelines_exist = "/usr/bin/psql -d ${name} --tuples-only -c \'SELECT 
table_name FROM information_schema.tables;\' | /bin/grep \'${shape_table}\'"
 
 # Note. This is not needed anymore with osm2pgsql 0.81
 exec { "load_900913-${name}":

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib941673a231f1de31a2f39346c3a15c6287f2f90
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Only keep testwiki test2wiki 1.20.7-wmf.12 - change (operations/mediawiki-config)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Only keep testwiki test2wiki 1.20.7-wmf.12
..


Only keep testwiki test2wiki 1.20.7-wmf.12

I rolled .12 to testwiki and test2wiki but it is incredibly slow with
empty pages taking up to 10 seconds to render on the backend.

So rolling back from all wiki (never got pushed) and only keep
test/test2wiki.

This *partialy* reverts commit 9144722bfb7d45509553bac7395d78c14dd8e397.

Bug: T125727
Change-Id: Ife9d961007b2063927675f07b6f29bc3924f4955
---
M wikiversions.json
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index bec4971..f2c7eb8 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -476,7 +476,7 @@
 "maiwiki": "php-1.27.0-wmf.10",
 "map_bmswiki": "php-1.27.0-wmf.10",
 "mdfwiki": "php-1.27.0-wmf.10",
-"mediawikiwiki": "php-1.27.0-wmf.12",
+"mediawikiwiki": "php-1.27.0-wmf.10",
 "metawiki": "php-1.27.0-wmf.10",
 "mgwiki": "php-1.27.0-wmf.10",
 "mgwikibooks": "php-1.27.0-wmf.10",
@@ -745,7 +745,7 @@
 "tenwiki": "php-1.27.0-wmf.10",
 "test2wiki": "php-1.27.0-wmf.12",
 "testwiki": "php-1.27.0-wmf.12",
-"testwikidatawiki": "php-1.27.0-wmf.12",
+"testwikidatawiki": "php-1.27.0-wmf.10",
 "tetwiki": "php-1.27.0-wmf.10",
 "tewiki": "php-1.27.0-wmf.10",
 "tewikibooks": "php-1.27.0-wmf.10",
@@ -875,7 +875,7 @@
 "zawikiquote": "php-1.27.0-wmf.10",
 "zawiktionary": "php-1.27.0-wmf.10",
 "zeawiki": "php-1.27.0-wmf.10",
-"zerowiki": "php-1.27.0-wmf.12",
+"zerowiki": "php-1.27.0-wmf.10",
 "zh_classicalwiki": "php-1.27.0-wmf.10",
 "zh_min_nanwiki": "php-1.27.0-wmf.10",
 "zh_min_nanwikibooks": "php-1.27.0-wmf.10",
@@ -893,4 +893,4 @@
 "zuwiki": "php-1.27.0-wmf.10",
 "zuwikibooks": "php-1.27.0-wmf.10",
 "zuwiktionary": "php-1.27.0-wmf.10"
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife9d961007b2063927675f07b6f29bc3924f4955
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Thcipriani 
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 issues with pointer overlay - change (mediawiki...Gather)

2016-02-03 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Fix issues with pointer overlay
..

Fix issues with pointer overlay

Clear localStorage to test with Gather installed.
This patch fixes the following issues:
* WatchstarPageActionOverlay doesn't pass options which can cause issues if none
are explicitly given resulting in JS errors.
* The message in the main menu is empty

Change-Id: I30f9ccca41504532386cad63022189da0d6dfafa
---
M extension.json
M resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
2 files changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather 
refs/changes/17/268317/1

diff --git a/extension.json b/extension.json
index 5dd391b..23f8a4d 100644
--- a/extension.json
+++ b/extension.json
@@ -384,14 +384,9 @@
]
},
"ext.gather.init.minerva": {
-   "class": "MFResourceLoaderParsedMessageModule",
"targets": [
"mobile"
],
-   "messages": {
-   "gather-main-menu-new-feature": [ "parse" ],
-   "gather-menu-guider": "gather-menu-guider"
-   },
"dependencies": [
"ext.gather.init",
"ext.gather.menu.icon",
@@ -399,10 +394,15 @@
]
},
"ext.gather.init": {
+   "class": "MFResourceLoaderParsedMessageModule",
"targets": [
"mobile",
"desktop"
],
+   "messages": {
+   "gather-main-menu-new-feature": [ "parse" ],
+   "gather-menu-guider": "gather-menu-guider"
+   },
"dependencies": [
"mediawiki.experiments",
"mobile.watchstar",
diff --git a/resources/ext.gather.watchstar/WatchstarPageActionOverlay.js 
b/resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
index ce940c3..07ec224 100644
--- a/resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
+++ b/resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
@@ -7,9 +7,10 @@
/**
 * @class WatchstarPageActionOverlay
 * @extends PageActionOverlay
+* @param {Object} options
 */
-   function WatchstarPageActionOverlay() {
-   PageActionOverlay.call( this );
+   function WatchstarPageActionOverlay( options ) {
+   PageActionOverlay.call( this, options );
}
 
OO.mfExtend( WatchstarPageActionOverlay, PageActionOverlay, {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f9ccca41504532386cad63022189da0d6dfafa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
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] ipsec: fix top-scope var without namespace - change (operations/puppet)

2016-02-03 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ipsec: fix top-scope var without namespace
..


ipsec: fix top-scope var without namespace

./manifests/role/ipsec.pp
WARNING: top-scope variable being used without an explicit namespace on line 36

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

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



diff --git a/manifests/role/ipsec.pp b/manifests/role/ipsec.pp
index 7f6c01b..a5ff47d 100644
--- a/manifests/role/ipsec.pp
+++ b/manifests/role/ipsec.pp
@@ -33,7 +33,7 @@
 $cluster_nodes['codfw']
 )
 }
-} elsif $hostname =~ /^kafka10/ {
+} elsif $::hostname =~ /^kafka10/ {
 # kafka brokers (only in eqiad for now) associate with all 
tier-two caches
 $text= hiera('cache::ipsec::text::nodes')
 $misc= hiera('cache::ipsec::misc::nodes')

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

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

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

[MediaWiki-commits] [Gerrit] Fix importImages options - change (mediawiki/core)

2016-02-03 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Fix importImages options
..

Fix importImages options

Change-Id: Ia3ba7ed221a4cf7fcf78a6c64f5a59109a1b886d
---
M maintenance/commandLine.inc
M maintenance/importImages.php
2 files changed, 14 insertions(+), 1 deletion(-)


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

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 1a05907..a905ebe 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -25,20 +25,27 @@
 
 // @codingStandardsIgnoreStart 
MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
 global $optionsWithArgs;
+global $optionsWithoutArgs;
 // @codingStandardsIgnoreEnd
 if ( !isset( $optionsWithArgs ) ) {
$optionsWithArgs = array();
+}
+if ( !isset( $optionsWithoutArgs ) ) {
+   $optionsWithoutArgs = array();
 }
 
 class CommandLineInc extends Maintenance {
public function __construct() {
// @codingStandardsIgnoreStart 
MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
-   global $optionsWithArgs;
+   global $optionsWithArgs, $optionsWithoutArgs;
// @codingStandardsIgnoreEnd
parent::__construct();
foreach ( $optionsWithArgs as $name ) {
$this->addOption( $name, '', false, true );
}
+   foreach ( $optionsWithoutArgs as $name ) {
+   $this->addOption( $name, '', false, false );
+   }
}
 
/**
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 701af62..631e687 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -36,6 +36,12 @@
'extensions', 'comment', 'comment-file', 'comment-ext', 'summary', 
'user',
'license', 'sleep', 'limit', 'from', 'source-wiki-url', 'timestamp',
 );
+
+$optionsWithoutArgs = array(
+   'protect', 'unprotect', 'search-recursively', 'check-userblock', 
'overwrite',
+   'skip-dupes', 'dry'
+);
+
 require_once __DIR__ . '/commandLine.inc';
 require_once __DIR__ . '/importImages.inc';
 $processed = $added = $ignored = $skipped = $overwritten = $failed = 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3ba7ed221a4cf7fcf78a6c64f5a59109a1b886d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Only keep testwiki test2wiki 1.20.7-wmf.12 - change (operations/mediawiki-config)

2016-02-03 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Only keep testwiki test2wiki 1.20.7-wmf.12
..

Only keep testwiki test2wiki 1.20.7-wmf.12

I rolled .12 to testwiki and test2wiki but it is incredibly slow with
empty pages taking up to 10 seconds to render on the backend.

So rolling back from all wiki (never got pushed) and only keep
test/test2wiki.

This *partialy* reverts commit 9144722bfb7d45509553bac7395d78c14dd8e397.

Bug: T125727
Change-Id: Ife9d961007b2063927675f07b6f29bc3924f4955
---
M wikiversions.json
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index bec4971..f2c7eb8 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -476,7 +476,7 @@
 "maiwiki": "php-1.27.0-wmf.10",
 "map_bmswiki": "php-1.27.0-wmf.10",
 "mdfwiki": "php-1.27.0-wmf.10",
-"mediawikiwiki": "php-1.27.0-wmf.12",
+"mediawikiwiki": "php-1.27.0-wmf.10",
 "metawiki": "php-1.27.0-wmf.10",
 "mgwiki": "php-1.27.0-wmf.10",
 "mgwikibooks": "php-1.27.0-wmf.10",
@@ -745,7 +745,7 @@
 "tenwiki": "php-1.27.0-wmf.10",
 "test2wiki": "php-1.27.0-wmf.12",
 "testwiki": "php-1.27.0-wmf.12",
-"testwikidatawiki": "php-1.27.0-wmf.12",
+"testwikidatawiki": "php-1.27.0-wmf.10",
 "tetwiki": "php-1.27.0-wmf.10",
 "tewiki": "php-1.27.0-wmf.10",
 "tewikibooks": "php-1.27.0-wmf.10",
@@ -875,7 +875,7 @@
 "zawikiquote": "php-1.27.0-wmf.10",
 "zawiktionary": "php-1.27.0-wmf.10",
 "zeawiki": "php-1.27.0-wmf.10",
-"zerowiki": "php-1.27.0-wmf.12",
+"zerowiki": "php-1.27.0-wmf.10",
 "zh_classicalwiki": "php-1.27.0-wmf.10",
 "zh_min_nanwiki": "php-1.27.0-wmf.10",
 "zh_min_nanwikibooks": "php-1.27.0-wmf.10",
@@ -893,4 +893,4 @@
 "zuwiki": "php-1.27.0-wmf.10",
 "zuwikibooks": "php-1.27.0-wmf.10",
 "zuwiktionary": "php-1.27.0-wmf.10"
-}
\ No newline at end of file
+}

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Do not create Skin's in Gather - change (mediawiki...Gather)

2016-02-03 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Do not create Skin's in Gather
..

Hygiene: Do not create Skin's in Gather

Due to race conditions it's currently possible to create two
Skin classes. This is confusing and messy and only seems to be here
to support the PointerOverlay so let us not do that.

Additional changes:
* Pass options to WatchstarPageActionOverlay
* Ship messages with correct module so PointerOverlay has correct
text when main menu is opened

Depends-On: I02a8237bdc909b8d8613a6d2a833051dfae1a2b
Bug: T125688
Change-Id: I5f3a15441dccb63007422ae3e8697f546e2bc613
---
M extension.json
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.collections.list/CollectionsList.js
M resources/ext.gather.collections.list/CreateCollectionButton.js
M resources/ext.gather.init/init.js
M resources/ext.gather.routes/routes.js
M resources/ext.gather.special.usercollections/init.js
M resources/ext.gather.watchstar/WatchstarPageActionOverlay.js
8 files changed, 12 insertions(+), 55 deletions(-)


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

diff --git a/extension.json b/extension.json
index 5dd391b..23f8a4d 100644
--- a/extension.json
+++ b/extension.json
@@ -384,14 +384,9 @@
]
},
"ext.gather.init.minerva": {
-   "class": "MFResourceLoaderParsedMessageModule",
"targets": [
"mobile"
],
-   "messages": {
-   "gather-main-menu-new-feature": [ "parse" ],
-   "gather-menu-guider": "gather-menu-guider"
-   },
"dependencies": [
"ext.gather.init",
"ext.gather.menu.icon",
@@ -399,10 +394,15 @@
]
},
"ext.gather.init": {
+   "class": "MFResourceLoaderParsedMessageModule",
"targets": [
"mobile",
"desktop"
],
+   "messages": {
+   "gather-main-menu-new-feature": [ "parse" ],
+   "gather-menu-guider": "gather-menu-guider"
+   },
"dependencies": [
"mediawiki.experiments",
"mobile.watchstar",
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js 
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index ab385e4..342a359 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -60,10 +60,8 @@
 * @inheritdoc
 * @cfg {Object} defaults Default options hash.
 * @cfg {mw.Api} defaults.api
-* @cfg {Skin} defaults.skin the skin the overlay is operating 
in
 */
defaults: $.extend( {}, Overlay.prototype.defaults, {
-   skin: undefined,
clearIcon: new Icon( {
name: 'clear',
label: mw.msg( 
'gather-edit-collection-clear-label' ),
@@ -176,8 +174,7 @@
if ( self.options.showTutorial ) {
self.searchTutorialOverlay = new 
SearchTutorialOverlay( {
appendToElement: self.$el,
-   target: self.$( 
'.mw-ui-icon-search' ),
-   skin: self.options.skin
+   target: self.$( 
'.mw-ui-icon-search' )
} );
self.searchTutorialOverlay.show();
// Refresh pointer otherwise it is not 
positioned
diff --git a/resources/ext.gather.collections.list/CollectionsList.js 
b/resources/ext.gather.collections.list/CollectionsList.js
index 4cc28f1..e357824 100644
--- a/resources/ext.gather.collections.list/CollectionsList.js
+++ b/resources/ext.gather.collections.list/CollectionsList.js
@@ -29,12 +29,10 @@
/**
 * @inheritdoc
 * @cfg {Object} defaults Default options hash.
-* @cfg {Skin} defaults.skin the skin the overlay is operating 
in
 * @cfg {mw.Api} defaults.api
 * @cfg {String} defaults.userIconClass user profile icon
 */
defa

[MediaWiki-commits] [Gerrit] IME tests: Add failing Korean IME test - change (VisualEditor/VisualEditor)

2016-02-03 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: IME tests: Add failing Korean IME test
..

IME tests: Add failing Korean IME test

Bug: T120156
Change-Id: I19a38a6244b9ee52d1cdec1de585fba73f30e81b
---
M build/modules.json
A tests/ce/imetests/input-chrome-mac-native-korean.js
A tests/ce/imetests/input-firefox-mac-native-korean.js
A tests/ce/imetests/input-safari-mac-native-korean.js
M tests/index.html
5 files changed, 207 insertions(+), 0 deletions(-)


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

diff --git a/build/modules.json b/build/modules.json
index 181e0db..db74cde 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -620,6 +620,7 @@
"tests/ce/imetests/home-firefox-win7-none.js",

"tests/ce/imetests/input-chrome-mac-native-japanese-hiragana.js",

"tests/ce/imetests/input-chrome-mac-native-japanese-katakana.js",
+   "tests/ce/imetests/input-chrome-mac-native-korean.js",

"tests/ce/imetests/input-chrome-win7-chinese-traditional-handwriting.js",
"tests/ce/imetests/input-chrome-win7-greek.js",
"tests/ce/imetests/input-chrome-win7-polish.js",
@@ -631,6 +632,7 @@

"tests/ce/imetests/input-chromium-ubuntu-ibus-malayalam-swanalekha.js",

"tests/ce/imetests/input-firefox-mac-native-japanese-hiragana.js",

"tests/ce/imetests/input-firefox-mac-native-japanese-katakana.js",
+   "tests/ce/imetests/input-firefox-mac-native-korean.js",

"tests/ce/imetests/input-firefox-ubuntu-ibus-chinese-cantonese.js",

"tests/ce/imetests/input-firefox-ubuntu-ibus-japanese-anthy--hiraganaonly.js",

"tests/ce/imetests/input-firefox-ubuntu-ibus-japanese-mozc.js",
@@ -646,6 +648,7 @@
"tests/ce/imetests/input-ie11-win8.1-korean.js",

"tests/ce/imetests/input-safari-mac-native-japanese-hiragana.js",

"tests/ce/imetests/input-safari-mac-native-japanese-katakana.js",
+   "tests/ce/imetests/input-safari-mac-native-korean.js",
"tests/ce/imetests/leftarrow-chromium-ubuntu-none.js",
"tests/ce/imetests/leftarrow-firefox-ubuntu-none.js",
"tests/ce/imetests/leftarrow-ie9-win7-none.js"
diff --git a/tests/ce/imetests/input-chrome-mac-native-korean.js 
b/tests/ce/imetests/input-chrome-mac-native-korean.js
new file mode 100644
index 000..b2dabda
--- /dev/null
+++ b/tests/ce/imetests/input-chrome-mac-native-korean.js
@@ -0,0 +1,84 @@
+/*!
+ * VisualEditor IME test for Chrome on Mac OS X in Korean using OS native "New 
Romansing" IME.
+ *
+ * @copyright 2011-2016 VisualEditor Team and others; see 
http://ve.mit-license.org
+ */
+
+ve.ce.imetests.push( [ 'input-chrome-mac-native-korean', [
+   { imeIdentifier: 'OS X "New Romansing" OS Korean IME on Chrome', 
userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_0) AppleWebKit/537.36 
(KHTML, like Gecko) Chrome/47.0.2526.80 Safari/537.36', startDom: '' },
+   { seq: 0, time: 6.009, action: 'sendEvent', args: [ 'keydown', { 
keyCode: 229 } ] },
+   { seq: 1, time: 6.011, action: 'sendEvent', args: [ 'compositionstart', 
{} ] },
+   { seq: 2, time: 6.012, action: 'changeText', args: [ 'ㄱ' ] },
+   { seq: 3, time: 6.012, action: 'changeSel', args: [ 0, 1 ] },
+   { seq: 4, time: 6.012, action: 'sendEvent', args: [ 'input', {} ] },
+   { seq: 5, time: 6.016, action: 'changeSel', args: [ 1, 1 ] },
+   { seq: 6, time: 6.016, action: 'endLoop', args: [] },
+   { seq: 7, time: 6.091, action: 'sendEvent', args: [ 'keyup', { keyCode: 
71 } ] },
+   { seq: 8, time: 6.094, action: 'endLoop', args: [] },
+   { seq: 9, time: 6.28, action: 'sendEvent', args: [ 'keydown', { 
keyCode: 229 } ] },
+   { seq: 10, time: 6.281, action: 'changeText', args: [ '가' ] },
+   { seq: 11, time: 6.281, action: 'changeSel', args: [ 0, 1 ] },
+   { seq: 12, time: 6.281, action: 'sendEvent', args: [ 'input', {} ] },
+   { seq: 13, time: 6.285, action: 'changeSel', args: [ 1, 1 ] },
+   { seq: 14, time: 6.285, action: 'endLoop', args: [] },
+   { seq: 15, time: 6.317, action: 'sendEvent', args: [ 'keyup', { 
keyCode: 65 } ] },
+   { seq: 16, time: 6.32, action: 'endLoop', args: [] },
+   { seq: 17, time: 6.571, action: 'sendEvent', args: [ 'keydown', { 
keyCode: 229 } ] },
+   { seq: 18, time: 6.572, action: 'changeText', args: [ '간' ] },
+   { seq: 19, time: 6.572, action: 'changeSel', args: [ 0, 1 ] },
+   { seq: 20, time: 6.572, action: 'sendEvent', args: [ 'input', {} ] },
+

[MediaWiki-commits] [Gerrit] PointerOverlays can now work without Skin object - change (mediawiki...MobileFrontend)

2016-02-03 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: PointerOverlays can now work without Skin object
..

PointerOverlays can now work without Skin object

This was causing lots of problems including double initialisation
of a Skin class due to Gather.

Instead of usign the Skin class simply add a global window debounced
resize event for the sake of repositioning pointers

Bug: T125688
Change-Id: I02a8237bdc909b8d8613a6d2a833051dfae1a2b4
---
M resources/mobile.contentOverlays/PointerOverlay.js
M resources/mobile.mainMenu/MainMenu.js
A resources/skins.minerva.scripts/Skin.js
M resources/skins.minerva.watchstar/init.js
4 files changed, 200 insertions(+), 10 deletions(-)


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

diff --git a/resources/mobile.contentOverlays/PointerOverlay.js 
b/resources/mobile.contentOverlays/PointerOverlay.js
index a00af7f..68477cb 100644
--- a/resources/mobile.contentOverlays/PointerOverlay.js
+++ b/resources/mobile.contentOverlays/PointerOverlay.js
@@ -31,7 +31,6 @@
/**
 * @inheritdoc
 * @cfg {Object} defaults Default options hash.
-* @cfg {Skin} defaults.skin class
 * @cfg {String} defaults.summary Message describing thing 
being pointed to.
 * @cfg {String} defaults.cancelMsg Cancel message.
 * @cfg {String} defaults.appendToElement Where pointer overlay 
should be appended to.
@@ -40,7 +39,6 @@
 * @cfg {String} [defaults.confirmMsg] Label for a confirm 
message.
 */
defaults: $.extend( {}, Overlay.prototype.defaults, {
-   skin: undefined,
summary: undefined,
cancelMsg: mw.msg( 'mobile-frontend-pointer-dismiss' ),
appendToElement: undefined,
@@ -110,8 +108,11 @@
top: -10,
left: left
} ).appendTo( this.$el );
-   this.options.skin.on( 'changed', $.proxy( this, 
'refreshPointerArrow', this.options.target ) );
-   M.on( 'resize', $.proxy( this, 'refreshPointerArrow', 
this.options.target ) );
+
+   // Since the positioning of this overlay is dependent 
on the current viewport it makes sense to
+   // use a global window event so that on resizes it is 
correctly positioned.
+   $( window )
+   .on( 'resize', $.debounce( 100, $.proxy( this, 
'refreshPointerArrow', this.options.target ) ) );
}
} );
 
diff --git a/resources/mobile.mainMenu/MainMenu.js 
b/resources/mobile.mainMenu/MainMenu.js
index 15d6de4..cef1c08 100644
--- a/resources/mobile.mainMenu/MainMenu.js
+++ b/resources/mobile.mainMenu/MainMenu.js
@@ -31,11 +31,10 @@
 * Advertise a new feature in the main menu.
 * @param {String} selector to an element inside the main menu
 * @param {String} msg a message to show in the pointer
-* @param {Skin} skin that the feature lives in, will allow 
pointer to update when skin gets redrawn.
 * @returns {jQuery.Deferred} with the PointerOverlay as the 
only argument.
 * @throws exception when you try to advertise more than one 
feature.
 */
-   advertiseNewFeature: function ( selector, msg, skin ) {
+   advertiseNewFeature: function ( selector, msg ) {
var d = $.Deferred(),
self = this;
if ( this._hasNewFeature ) {
@@ -54,7 +53,6 @@
po = new PointerOverlay( {
appendToElement: 
self.$el.parent(),
alignment: 'left',
-   skin: skin,
summary: msg,
target: self.$( 
selector )
} );
diff --git a/resources/skins.minerva.scripts/Skin.js 
b/resources/skins.minerva.scripts/Skin.js
new file mode 100644
index 000..c2a06d1
--- /dev/null
+++ b/resources/skins.minerva.scripts/Skin.js
@@ -0,0 +1,193 @@
+( function ( M, $ ) {
+
+   var browser = M.require( 'mobile.browser/browser' ),
+   View = M.require( 'mobile.view/View' );
+
+   /**
+* Representation of the current skin being rendered.
+*
+* @class Skin
+* @extends View
+* @uses Browser
+* @uses Page
+*/
+   function Skin( options )

[MediaWiki-commits] [Gerrit] dhcp: switch mc1004/1005 to jessie installer - change (operations/puppet)

2016-02-03 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: dhcp: switch mc1004/1005 to jessie installer
..

dhcp: switch mc1004/1005 to jessie installer

Example change, switching the first 2 memcached
standard cache nodes over to use the jessie installer
once they get PXE booted.

Bug:T123711
Change-Id: Ifb67c7f8053f185201cc987f39ce79653dc27b4d
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 92ff499..d48a1cb 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3048,11 +3048,15 @@
 host mc1004 {
hardware ethernet 00:1b:21:7a:88:9b;
fixed-address mc1004.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1005 {
hardware ethernet 00:1b:21:7a:88:61;
fixed-address mc1005.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1006 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb67c7f8053f185201cc987f39ce79653dc27b4d
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] jsduck: Remove broken url from custom_tags.rb - change (mediawiki/core)

2016-02-03 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: jsduck: Remove broken url from custom_tags.rb
..

jsduck: Remove broken url from custom_tags.rb

This link no longer exists. It used to have a list of all built-in
tags which is now at https://github.com/senchalabs/jsduck/wiki#syntax.

Either way, that list isn't relevant to this file.

Change-Id: Idb072d0b5677a7031bc6ed08dc60425620df4b7d
---
M maintenance/jsduck/custom_tags.rb
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/268310/1

diff --git a/maintenance/jsduck/custom_tags.rb 
b/maintenance/jsduck/custom_tags.rb
index cc8069d..33008d1 100644
--- a/maintenance/jsduck/custom_tags.rb
+++ b/maintenance/jsduck/custom_tags.rb
@@ -1,6 +1,5 @@
 # Custom tags for JSDuck 5.x
 # See also:
-# - https://github.com/senchalabs/jsduck/wiki/Tags
 # - https://github.com/senchalabs/jsduck/wiki/Custom-tags
 # - 
https://github.com/senchalabs/jsduck/wiki/Custom-tags/7f5c32e568eab9edc8e3365e935bcb836cb11f1d
 require 'jsduck/tag/tag'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb072d0b5677a7031bc6ed08dc60425620df4b7d
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] Remove caesium from DNS Bug:T125165 - change (operations/dns)

2016-02-03 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Remove caesium from DNS Bug:T125165
..


Remove caesium from DNS
Bug:T125165

Change-Id: Ia8d31b53bd695c08d1f79df67fa2af2c4f841327
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index e45bf80..e3c8d94 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -818,7 +818,6 @@
 142 1H IN PTR   elastic1010.eqiad.wmnet.
 143 1H IN PTR   elastic1011.eqiad.wmnet.
 144 1H IN PTR   elastic1012.eqiad.wmnet.
-145 1H IN PTR   caesium.eqiad.wmnet.
 146 1H IN PTR   osmium.eqiad.wmnet.
 147 1H IN PTR   hp1001.eqiad.wmnet.
 148 1H IN PTR   rcs1001.eqiad.wmnet.
@@ -1928,7 +1927,6 @@
 123 1H  IN PTR  wmf4078.mgmt.eqiad.wmnet.
 123 1H  IN PTR  xenon.mgmt.eqiad.wmnet.
 124 1H  IN PTR  wmf4079.mgmt.eqiad.wmnet.
-124 1H  IN PTR  caesium.mgmt.eqiad.wmnet.
 125 1H  IN PTR  wmf4080.mgmt.eqiad.wmnet.
 125 1H  IN PTR  cerium.mgmt.eqiad.wmnet.
 126 1H  IN PTR  wmf4081.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 080f844..1bd3b27 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -153,7 +153,6 @@
 berkelium1H IN A 10.64.0.169
  1H IN  2620:0:861:101:10:64:0:169
 bohrium  1H IN A 10.64.32.71 ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
-caesium  1H IN A 10.64.32.145
 cerium   1H IN A 10.64.16.147
 cerium-a 1H IN A 10.64.16.153 ; cassandra instance
 cerium-b 1H IN A 10.64.16.154 ; cassandra instance
@@ -1944,7 +1943,6 @@
 WMF4078 1H  IN A10.65.3.123
 xenon   1H  IN A10.65.3.123
 WMF4079 1H  IN A10.65.3.124
-caesium 1H  IN A10.65.3.124
 WMF4080 1H  IN A10.65.3.125
 cerium  1H  IN A10.65.3.125
 WMF4081 1H  IN A10.65.3.126

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8d31b53bd695c08d1f79df67fa2af2c4f841327
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Papaul 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Reintroduce 'emacs-lisp' as an alias for the Emacs Lisp lexer - change (mediawiki...SyntaxHighlight_GeSHi)

2016-02-03 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Reintroduce 'emacs-lisp' as an alias for the Emacs Lisp lexer
..

Reintroduce 'emacs-lisp' as an alias for the Emacs Lisp lexer

'emacs-lisp' was an alias for the Emacs Lisp lexer.
It got dropped in Pygments commit 811926b, probably by accident.
So, declare it as a compatability alias until it is restored upstream.
Upstream bug: https://bitbucket.org/birkenfeld/pygments-main/issues/1207

Change-Id: I25c0e75a337c623529705c45bee0dc13dfdfd92c
---
M SyntaxHighlight_GeSHi.compat.php
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/SyntaxHighlight_GeSHi.compat.php b/SyntaxHighlight_GeSHi.compat.php
index 9f3a409..2d66edb 100644
--- a/SyntaxHighlight_GeSHi.compat.php
+++ b/SyntaxHighlight_GeSHi.compat.php
@@ -113,6 +113,13 @@
 
// bibtex is basically LaTeX
'bibtex' => 'latex',
+
+   // 'emacs-lisp' was an alias for the Emacs Lisp lexer.
+   // It got dropped in Pygments commit 811926b, probably by 
accident.
+   // Declare it here until it is restored upstream.
+   // Upstream bug:
+   //   https://bitbucket.org/birkenfeld/pygments-main/issues/1207
+   'emacs-lisp' => 'elisp',
);
 
public function __construct( $html ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25c0e75a337c623529705c45bee0dc13dfdfd92c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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] Update DonationInterface submodule - change (mediawiki/core)

2016-02-03 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

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

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 99c236f..86bf587 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 99c236f31977b6e1e002416516af5312106f9fc6
+Subproject commit 86bf5874e48b71c6a266ea384b6f6a6e32ebd16c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf80f39d2552d1bbafbe2a47d253a7df84c91cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 

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

[MediaWiki-commits] [Gerrit] Update DonationInterface submodule - change (mediawiki/core)

2016-02-03 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Update DonationInterface submodule
..

Update DonationInterface submodule

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


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

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 99c236f..86bf587 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit 99c236f31977b6e1e002416516af5312106f9fc6
+Subproject commit 86bf5874e48b71c6a266ea384b6f6a6e32ebd16c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf80f39d2552d1bbafbe2a47d253a7df84c91cae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (mediawiki...DonationInterface)

2016-02-03 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

f84573c Fix typo

Change-Id: Ib2229f600931a37b580790ca60dbfb9db802783e
---
0 files changed, 0 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2229f600931a37b580790ca60dbfb9db802783e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 

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

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (mediawiki...DonationInterface)

2016-02-03 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Merge master into deployment
..

Merge master into deployment

f84573c Fix typo

Change-Id: Ib2229f600931a37b580790ca60dbfb9db802783e
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

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

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

[MediaWiki-commits] [Gerrit] Temporarily disable unit tests and autoloading autoload.php ... - change (mediawiki...Wikidata)

2016-02-03 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Temporarily disable unit tests and autoloading autoload.php 
from composer
..

Temporarily disable unit tests and autoloading autoload.php from composer

Since this test is failing REL1_25 branch and others and wasent even
testing because it uses an old config lets turn it off temporarily for
REL1_25 branch. Until a hack can be created.

Change-Id: I9fd6fb136e763dd8339d3d10d40a95a8fb547265
---
M Wikidata.php
1 file changed, 10 insertions(+), 2 deletions(-)


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

diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..64d34af 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -10,6 +10,8 @@
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
 
+   /* Hack for REL1_25 since it is failing */
+   $wmgUseWikibaseVendor = true;
$wmgUseWikibaseRepo = true;
$wmgUseWikibaseClient = true;
 }
@@ -18,7 +20,11 @@
 $wgEnableWikibaseRepo = false;
 $wgEnableWikibaseClient = false;
 
-include_once __DIR__ . '/vendor/autoload.php';
+if ( !empty( $wmgUseWikibaseVendor ) ) {
+   if ( file_exists(  __DIR__ . '/vendor/autoload.php' ) ) {
+   include_once __DIR__ . '/vendor/autoload.php';
+   }
+}
 
 if ( !empty( $wmgUseWikibaseRepo ) ) {
include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
@@ -32,7 +38,9 @@
include_once __DIR__ . '/WikibaseClient.settings.php';
 }
 
-$wgHooks['UnitTestsList'][] = '\Wikidata\WikidataHooks::onUnitTestsList';
+if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+   $wgHooks['UnitTestsList'][] = 
'\Wikidata\WikidataHooks::onUnitTestsList';
+}
 
 $wgExtensionCredits['wikibase'][] = array(
'path' => __FILE__,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fd6fb136e763dd8339d3d10d40a95a8fb547265
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Fix typo - change (mediawiki...DonationInterface)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix typo
..


Fix typo

isset, not is_set

Change-Id: Ie23c37989bb42ab07b499023eac9a77151b55f12
---
M globalcollect_gateway/globalcollect_resultswitcher.body.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/globalcollect_gateway/globalcollect_resultswitcher.body.php 
b/globalcollect_gateway/globalcollect_resultswitcher.body.php
index bc8d2c9..490d008 100644
--- a/globalcollect_gateway/globalcollect_resultswitcher.body.php
+++ b/globalcollect_gateway/globalcollect_resultswitcher.body.php
@@ -89,7 +89,7 @@
if ( $this->adapter->getData_Unstaged_Escaped( 
'payment_method') === 'cc' ) {
$sessionOrders = $req->getSessionData( 
'order_status' );
if ( !is_array( $sessionOrders )
-   || !is_set( 
$sessionOrders[$this->qs_oid] )
+   || !isset( 
$sessionOrders[$this->qs_oid] )
|| !is_array( 
$sessionOrders[$this->qs_oid] ) ) {
 
$result = 
$this->adapter->do_transaction( 'Confirm_CreditCard' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie23c37989bb42ab07b499023eac9a77151b55f12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] After KeyDown, call checkUnicorns before polling the surface... - change (VisualEditor/VisualEditor)

2016-02-03 Thread Divec (Code Review)

Divec has uploaded a new change for review.

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

Change subject: After KeyDown, call checkUnicorns before polling the 
surfaceObserver
..

After KeyDown, call checkUnicorns before polling the surfaceObserver

Also allow calling checkUnicorns before the model is in sync with the view

Bug: T123430
Change-Id: I1accf88439bdfa2d0251562a600a46036d1119de
---
M src/ce/ve.ce.Surface.js
1 file changed, 45 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/05/268305/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index e288175..e9f092e 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1126,7 +1126,8 @@
  */
 ve.ce.Surface.prototype.afterDocumentKeyDown = function ( e ) {
var direction, focusableNode, startOffset, endOffset, offsetDiff, 
dmFocus, dmSelection,
-   inNonSlug, ceSelection, ceNode, range, fixupCursorForUnicorn, 
matrix, col, row, $focusNode,
+   inNonSlug, ceSelection, ceNode, range, fixupCursorForUnicorn, 
matrix, col, row,
+   $focusNode, removedUnicorns,
surface = this,
isArrow = (
e.keyCode === OO.ui.Keys.UP ||
@@ -1350,48 +1351,55 @@
// (it was set by setLinearSelection calling onModelSelect)
}
 
+   if ( direction === undefined ) {
+   direction = getDirection();
+   }
+
fixupCursorForUnicorn = (
!e.shiftKey &&
( e.keyCode === OO.ui.Keys.LEFT || e.keyCode === 
OO.ui.Keys.RIGHT )
);
-   this.incRenderLock();
-   try {
-   this.surfaceObserver.pollOnce();
-   } finally {
-   this.decRenderLock();
-   }
-   this.checkUnicorns( fixupCursorForUnicorn );
-   if ( direction === undefined ) {
-   direction = getDirection();
+   removedUnicorns = this.checkUnicorns( fixupCursorForUnicorn );
+   if ( removedUnicorns ) {
+   this.surfaceObserver.pollOnceNoCallback();
+   } else {
+   this.incRenderLock();
+   try {
+   this.surfaceObserver.pollOnce();
+   } finally {
+   this.decRenderLock();
+   }
}
this.fixupCursorPosition( direction, e.shiftKey );
 };
 
 /**
- * Check whether the selection has moved out of the unicorned area (i.e. is 
not currently between
- * two unicorns) and if so, destroy the unicorns. If there are no active 
unicorns, this function
- * does nothing.
+ * Check whether the DOM selection has moved out of the unicorned area (i.e. 
is not currently
+ * between two unicorns) and if so, set the model selection from the DOM 
selection, destroy the
+ * unicorns and return true. If there are no active unicorns, this function 
does nothing and
+ * returns false.
  *
  * If the unicorns are destroyed as a consequence of the user moving the 
cursor across a unicorn
- * with the arrow keys, the cursor will have to be moved again to produce the 
cursor movement
- * the user expected. Set the fixupCursor parameter to true to enable this 
behavior.
+ * with the left/rightarrow keys, the cursor will have to be moved again to 
produce the cursor
+ * movement the user expected. Set the fixupCursor parameter to true to enable 
this behavior.
  *
- * @param {boolean} fixupCursor If destroying unicorns, fix the cursor 
position for expected movement
+ * @param {boolean} fixupCursor If destroying unicorns, fix up left/rightarrow 
cursor position
+ * @return {boolean} Whether unicorns have been destroyed
  */
 ve.ce.Surface.prototype.checkUnicorns = function ( fixupCursor ) {
var preUnicorn, postUnicorn, range, node, fixup;
if ( !this.unicorningNode || !this.unicorningNode.unicorns ) {
-   return;
+   return false;
}
preUnicorn = this.unicorningNode.unicorns[ 0 ];
postUnicorn = this.unicorningNode.unicorns[ 1 ];
if ( !this.$document[ 0 ].contains( preUnicorn ) ) {
-   return;
+   return false;
}
 
if ( this.nativeSelection.rangeCount === 0 ) {
// XXX do we want to clear unicorns in this case?
-   return;
+   return false;
}
range = this.nativeSelection.getRangeAt( 0 );
 
@@ -1405,7 +1413,7 @@
node = node.previousSibling;
}
if ( node === preUnicorn ) {
-   return;
+   return false;
}
 
// Selection endpoint is not between unicorns.
@@ -1422,16 +1430,23 @@
// at or after the pre-unicorn (actually must be after the 
post-unicorn)
fixup = 1;
}
-   if ( fixupCursor ) {
-   this.incRenderLock();
-   try {
+
+   // Apply the DOM se

[MediaWiki-commits] [Gerrit] Hygiene: rename PersistenceHelper to DatabaseTable - change (apps...wikipedia)

2016-02-03 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review.

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

Change subject: Hygiene: rename PersistenceHelper to DatabaseTable
..

Hygiene: rename PersistenceHelper to DatabaseTable

There's a clear line of distinction between a ContentPersister and a
PersistenceHelper. A ContentPersister uses a ContentProviderClient to
interact with the underlying database table. A PersistenceHelper
interacts directly with the database to, for example, create a specific
table, upgrade a specific table, operate on a specific table's rows and
columns, and defines a Column nested class and the version of the
database that the table was added. Rename PersistenceHelper to
DatabaseTable so it's clear it has a lot to do with a specific table in
the database. No functional changes intended.

Change-Id: If80d7ea792a907b278e0894cf23c9694b605037d
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/data/ContentPersister.java
M app/src/main/java/org/wikipedia/data/DBOpenHelper.java
R app/src/main/java/org/wikipedia/data/DatabaseTable.java
M app/src/main/java/org/wikipedia/data/SQLiteContentProvider.java
M app/src/main/java/org/wikipedia/editing/summaries/EditSummary.java
M 
app/src/main/java/org/wikipedia/editing/summaries/EditSummaryContentProvider.java
R 
app/src/main/java/org/wikipedia/editing/summaries/EditSummaryDatabaseTable.java
M app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
M app/src/main/java/org/wikipedia/history/HistoryEntry.java
M app/src/main/java/org/wikipedia/history/HistoryEntryContentProvider.java
R app/src/main/java/org/wikipedia/history/HistoryEntryDatabaseTable.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/history/SaveHistoryTask.java
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M 
app/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
M app/src/main/java/org/wikipedia/pageimages/PageImage.java
M app/src/main/java/org/wikipedia/pageimages/PageImageContentProvider.java
R app/src/main/java/org/wikipedia/pageimages/PageImageDatabaseTable.java
M app/src/main/java/org/wikipedia/savedpages/DeleteSavedPageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavePageTask.java
M app/src/main/java/org/wikipedia/savedpages/SavedPage.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageCheckTask.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageContentProvider.java
R app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
M app/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
M app/src/main/java/org/wikipedia/search/RecentSearch.java
M app/src/main/java/org/wikipedia/search/RecentSearchContentProvider.java
R app/src/main/java/org/wikipedia/search/RecentSearchDatabaseTable.java
M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
31 files changed, 95 insertions(+), 93 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index aa8339f..9e522ec 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -324,15 +324,15 @@
 if (!persisters.containsKey(cls.getCanonicalName())) {
 ContentPersister persister;
 if (cls.equals(HistoryEntry.class)) {
-persister = new ContentPersister<>(this, 
HistoryEntry.PERSISTENCE_HELPER);
+persister = new ContentPersister<>(this, 
HistoryEntry.DATABASE_TABLE);
 } else if (cls.equals(PageImage.class)) {
-persister = new ContentPersister<>(this, 
PageImage.PERSISTENCE_HELPER);
+persister = new ContentPersister<>(this, 
PageImage.DATABASE_TABLE);
 } else if (cls.equals(RecentSearch.class)) {
-persister = new ContentPersister<>(this, 
RecentSearch.PERSISTENCE_HELPER);
+persister = new ContentPersister<>(this, 
RecentSearch.DATABASE_TABLE);
 } else if (cls.equals(SavedPage.class)) {
-persister = new ContentPersister<>(this, 
SavedPage.PERSISTENCE_HELPER);
+persister = new ContentPersister<>(this, 
SavedPage.DATABASE_TABLE);
 } else if (cls.equals(EditSummary.class)) {
-persister = new ContentPersister<>(this, 
EditSummary.PERSISTENCE_HELPER);
+persister = new ContentPersister<>(this, 
EditSummary.DATABASE_TABLE);
 } else {
 throw new RuntimeException("No persister found for class " + 
cls.getCanonicalName());
 }
diff --git a/app/src/main/java/org/wikipedia/data/ContentPersister.java 
b/app/src/main/java/org

[MediaWiki-commits] [Gerrit] Fix typo - change (mediawiki...DonationInterface)

2016-02-03 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: Fix typo
..

Fix typo

isset, not is_set

Change-Id: Ie23c37989bb42ab07b499023eac9a77151b55f12
---
M globalcollect_gateway/globalcollect_resultswitcher.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/globalcollect_gateway/globalcollect_resultswitcher.body.php 
b/globalcollect_gateway/globalcollect_resultswitcher.body.php
index bc8d2c9..490d008 100644
--- a/globalcollect_gateway/globalcollect_resultswitcher.body.php
+++ b/globalcollect_gateway/globalcollect_resultswitcher.body.php
@@ -89,7 +89,7 @@
if ( $this->adapter->getData_Unstaged_Escaped( 
'payment_method') === 'cc' ) {
$sessionOrders = $req->getSessionData( 
'order_status' );
if ( !is_array( $sessionOrders )
-   || !is_set( 
$sessionOrders[$this->qs_oid] )
+   || !isset( 
$sessionOrders[$this->qs_oid] )
|| !is_array( 
$sessionOrders[$this->qs_oid] ) ) {
 
$result = 
$this->adapter->do_transaction( 'Confirm_CreditCard' );

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

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

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki...Wikidata)

2016-02-03 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: I005483667fdf3fd95d9f6d7c30a528bc1207ffcc
---
M Wikidata.php
M composer.json
2 files changed, 43 insertions(+), 37 deletions(-)


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

diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..2aae403 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -10,6 +10,8 @@
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
 
+   /* Hack for REL1_25 since it is failing */
+   $wmgUseWikibaseVendor = true;
$wmgUseWikibaseRepo = true;
$wmgUseWikibaseClient = true;
 }
@@ -18,7 +20,11 @@
 $wgEnableWikibaseRepo = false;
 $wgEnableWikibaseClient = false;
 
-include_once __DIR__ . '/vendor/autoload.php';
+if ( !empty( $wmgUseWikibaseVendor ) ) {
+   if ( file_exists(  __DIR__ . '/vendor/autoload.php' ) ) {
+   include_once __DIR__ . '/vendor/autoload.php';
+   }
+}
 
 if ( !empty( $wmgUseWikibaseRepo ) ) {
include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
diff --git a/composer.json b/composer.json
index 23a8058..62ce305 100644
--- a/composer.json
+++ b/composer.json
@@ -1,38 +1,38 @@
 {
-"name": "wikidata/wikidata",
-"description": "Wikidata build, including related components used for 
wikidata.org.",
-"license": "GPL-2.0+",
-"repositories": [
-{
-"type": "vcs",
-"url": "https://github.com/wmde/Wikidata.org.git";
-},
-{
-"type": "vcs",
-"url": "https://github.com/wmde/WikimediaBadges.git";
-}
-],
-"require": {
-"php": ">=5.3.0",
-"propertysuggester/property-suggester": "~2.1.0",
-"wikibase/wikibase": "dev-master",
-"wikibase/wikimedia-badges": "dev-master",
-"wikibase/Wikidata.org": "dev-master"
-},
-"autoload": {
-"psr-4": {
-"Wikidata\\": "src/"
-}
-},
-"scripts": {
-"post-install-cmd": 
"Wikidata\\SettingsFileGenerator::generateDefaultSettings",
-"post-update-cmd": 
"Wikidata\\SettingsFileGenerator::generateDefaultSettings"
-},
-"config": {
-"github-oauth":{
-"github.com":"845d568f46a682fbf7fc5f92ed9397fc4ebdc072"
-},
-"prepend-autoloader": false,
-"preferred-install": "dist"
-}
+   "name": "wikidata/wikidata",
+   "description": "Wikidata build, including related components used for 
wikidata.org.",
+   "license": "GPL-2.0+",
+   "repositories": [
+   {
+   "type": "vcs",
+   "url": "https://github.com/wmde/Wikidata.org.git";
+   },
+   {
+   "type": "vcs",
+   "url": "https://github.com/wmde/WikimediaBadges.git";
+   }
+   ],
+   "require": {
+   "php": ">=5.3.0",
+   "propertysuggester/property-suggester": "~2.1.0",
+   "wikibase/wikibase": "dev-REL1_25",
+   "wikibase/wikimedia-badges": "dev-REL1_25",
+   "wikibase/Wikidata.org": "dev-REL1_25"
+   },
+   "autoload": {
+   "psr-4": {
+   "Wikidata\\": "src/"
+   }
+   },
+   "scripts": {
+   "post-install-cmd": 
"Wikidata\\SettingsFileGenerator::generateDefaultSettings",
+   "post-update-cmd": 
"Wikidata\\SettingsFileGenerator::generateDefaultSettings"
+   },
+   "config": {
+   "github-oauth":{
+   "github.com":"845d568f46a682fbf7fc5f92ed9397fc4ebdc072"
+   },
+   "prepend-autoloader": false,
+   "preferred-install": "dist"
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 665731e..622ca08 - change (mediawiki/extensions)

2016-02-03 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 665731e..622ca08
..


Syncronize VisualEditor: 665731e..622ca08

Change-Id: I365935dc2e21a4b93de574e95340db55d19af845
---
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 665731e..622ca08 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 665731e552b55df79362e91e821e322463147d2a
+Subproject commit 622ca082ca72b985de58e835eea1919319325cd1

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

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

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

[MediaWiki-commits] [Gerrit] Bring back user-rights lego messages - change (mediawiki...Echo)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Bring back user-rights lego messages
..


Bring back user-rights lego messages

'notification-user-rights-add' and 'notification-user-rights-add'
were removed in I8386429a36182dbc44b45990506a42cbeef115ad
but they are still used by the email formatter.

They should be removed when the emails are formatted
using the presentation models.

Bug: T125584
Change-Id: I1453c9b0c05bf898c72d098dfb6d2d07135d3fac
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index cd785e3..941285c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -92,6 +92,8 @@
"notification-header-mention-agent-talkpage-nosection": "$1 
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on {{GENDER:$2|his|her|their}} talk 
page.",
"notification-header-mention-article-talkpage": "$1 
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the '''$4''' talk page in \"$5\".",
"notification-header-mention-article-talkpage-nosection": "$1 
{{GENDER:$2|mentioned}} {{GENDER:$3|you}} on the '''$4''' talk page.",
+   "notification-user-rights-add": "You are now a member of 
{{PLURAL:$2|this group|these groups}}: $1",
+   "notification-user-rights-remove": "You are no longer a member of 
{{PLURAL:$2|this group|these groups}}: $1",
"notification-user-rights": "Your user rights 
[[Special:Log/rights/$1|were {{GENDER:$1|changed}}]] by [[User:$1|$1]]. $2. 
[[Special:ListGroupRights|Learn more]]",
"notification-header-user-rights-add-only": "{{GENDER:$4|Your}} user 
rights were {{GENDER:$1|changed}}: You are now a member of the $2 
{{PLURAL:$3|group|groups}}.",
"notification-header-user-rights-remove-only": "{{GENDER:$4|Your}} user 
rights were {{GENDER:$1|changed}}: You are no longer a member of the $2 
{{PLURAL:$3|group|groups}}.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a374263..c23fef3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -113,6 +113,8 @@
"notification-header-mention-agent-talkpage-nosection": "Header text 
for a notification when you are mentioned by another user on their talk 
page.\n* $1 - user's name (not suitable for GENDER).\n* $2 - user's name for 
use in GENDER.\n* $3 - name of the user viewing the notification, can be used 
for GENDER",
"notification-header-mention-article-talkpage": "Header text for a 
notification when you are mentioned by another user in a section on an article 
talk page.\n* $1 - user's name (not suitable for GENDER).\n* $2 - user's name 
for use in GENDER.\n* $3 - name of the user viewing the notification, can be 
used for GENDER\n* $4 - name of the article whose talk page you are mentioned 
in (without namespace).\n* $5 - name of the section they were mentioned in",
"notification-header-mention-article-talkpage-nosection": "Header text 
for a notification when you are mentioned by another user on an article talk 
page.\n* $1 - user's name (not suitable for GENDER).\n* $2 - user's name for 
use in GENDER.\n* $3 - name of the user viewing the notification, can be used 
for GENDER\n* $4 - name of the article whose talk page you are mentioned in 
(without namespace)",
+   "notification-user-rights-add": "Message indicating that a user was 
added to a user group.  Parameters:\n* $1 - a comma separated list of user 
group names\n* $2 - the number of user groups, this is used for PLURAL 
support\nSee also:\n* {{msg-mw|Notification-user-rights-remove}}",
+   "notification-user-rights-remove": "Message indicating that a user was 
removed from a user group. Parameters:\n* $1 - a comma separated list of user 
group names\n* $2 - the number of user groups, this is used for PLURAL 
support\nSee also:\n* {{msg-mw|Notification-user-rights-add}}",
"notification-user-rights": "Format for displaying notifications of a 
user right change in notification page.\n\nParameters:\n* $1 - the username of 
the person who made the user right change. Can be used for GENDER support.\n* 
$2 - a semicolon separated list of {{msg-mw|Notification-user-rights-add}}, 
{{msg-mw|Notification-user-rights-remove}}",
"notification-header-user-rights-add-only": "Notifications header 
message when a user is added to groups.  Parameters:\n* $1 - the raw username 
of the person who made the user rights change, can be used for GENDER 
support\n* $2 - a localized list of the groups that were added\n* $3 - the 
number of groups that were added, can be used for PLURAL\n* $4 - name of the 
user viewing the notification, can be used for GENDER",
"notification-header-user-rights-remove-only": "Notifications header 
message when a user is removed from groups.  Parameters:\n* $1 - the raw 
username of the person who made the user rights change, can be used for GENDER 
support\

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 665731e..622ca08 - change (mediawiki/extensions)

2016-02-03 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 665731e..622ca08
..

Syncronize VisualEditor: 665731e..622ca08

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/00/268300/1

diff --git a/VisualEditor b/VisualEditor
index 665731e..622ca08 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 665731e552b55df79362e91e821e322463147d2a
+Subproject commit 622ca082ca72b985de58e835eea1919319325cd1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I365935dc2e21a4b93de574e95340db55d19af845
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] Tools: Switch portgrabber and portreleaser to proxymanager - change (operations/puppet)

2016-02-03 Thread Tim Landscheidt (Code Review)

Tim Landscheidt has uploaded a new change for review.

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

Change subject: Tools: Switch portgrabber and portreleaser to proxymanager
..

Tools: Switch portgrabber and portreleaser to proxymanager

Change-Id: I844bd7561a2a50bf5e37d742608fc616a1d1b656
---
M modules/toollabs/files/portgrabber.py
1 file changed, 25 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/268279/1

diff --git a/modules/toollabs/files/portgrabber.py 
b/modules/toollabs/files/portgrabber.py
index 8d32a08..8d8674d 100644
--- a/modules/toollabs/files/portgrabber.py
+++ b/modules/toollabs/files/portgrabber.py
@@ -1,5 +1,9 @@
-import sys
+import json
+import os
+import pwd
+import requests
 import socket
+import sys
 
 
 def get_active_proxy():
@@ -21,31 +25,29 @@
 return port
 
 
+def get_tool_name():
+"""Return the tool part of the current user name."""
+with open('/etc/wmflabs-project', 'r') as f:
+tools_prefix = f.read().rstrip('\n') + '.'
+user_name = pwd.getpwuid(os.getuid()).pw_name
+if user_name[0:len(tools_prefix)] != tools_prefix:
+raise ValueError(user_name, ' does not start with ', tools_prefix)
+return user_name[len(tools_prefix):]
+
+
+def get_proxy_forward_entry_manage_url():
+"""Return the URL to manage proxy forward entry."""
+return 'http://%s:8081/v1/proxy-forwards/%s' % (get_active_proxy(), 
get_tool_name())
+
+
 def register(port):
 """Register with the master proxy."""
-proxy = get_active_proxy()
-sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-try:
-sock.connect((proxy, 8282))
-sock.sendall("register\n.*\nhttp://%s:%u\n"; % (socket.getfqdn(), port))
-res = sock.recv(1024)
-if res != 'ok':
-sys.stderr.write('port registration failed!')
-sys.exit(-1)
-finally:
-sock.close()
+r = requests.put(get_proxy_forward_entry_manage_url(),
+ data=json.dumps({'.*': 'http://%s:%u' % 
(socket.getfqdn(), port)}))
+r.raise_for_status()
 
 
 def unregister():
 """Unregister with the master proxy."""
-proxy = get_active_proxy()
-sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-try:
-sock.connect((proxy, 8282))
-sock.sendall("unregister\n.*\n")
-res = sock.recv(1024)
-if res != 'ok':
-sys.stderr.write('port unregistration failed!')
-sys.exit(-1)
-finally:
-sock.close()
+r = requests.delete(get_proxy_forward_entry_manage_url())
+r.raise_for_status()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I844bd7561a2a50bf5e37d742608fc616a1d1b656
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] Fix link - change (wikimedia...wonderbolt)

2016-02-03 Thread OliverKeyes (Code Review)

OliverKeyes has submitted this change and it was merged.

Change subject: Fix link
..


Fix link

Change-Id: Ie95d0df7bf0e67791c400856ae1b9e28cec458d6
---
M tab_documentation/traffic_byengine.md
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tab_documentation/traffic_byengine.md 
b/tab_documentation/traffic_byengine.md
index 7191de5..ec57eb8 100644
--- a/tab_documentation/traffic_byengine.md
+++ b/tab_documentation/traffic_byengine.md
@@ -3,7 +3,7 @@
 
 A key metric in understanding the role external search engines play in 
Wikipedia's readership and content discovery processes is a very direct one - 
how many pageviews we get from them. This can be discovered very simply by 
looking at our request logs.
 
-This dashboard simply breaks down the 
[http://discovery.wmflabs.org/external/#traffic_summary](summary data) to 
investigate how much traffic is coming from each search engine, individually. 
As you can see, Google dominates, which is why we've included the option of 
log-scaling
+This dashboard simply breaks down the [summary 
data](http://discovery.wmflabs.org/external/#traffic_summary) to investigate 
how much traffic is coming from each search engine, individually. As you can 
see, Google dominates, which is why we've included the option of log-scaling
 the traffic.
 
 General trends

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie95d0df7bf0e67791c400856ae1b9e28cec458d6
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wonderbolt
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: OliverKeyes 

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

[MediaWiki-commits] [Gerrit] Remove direct insertions of JS into the page HTML - change (mediawiki...SemanticForms)

2016-02-03 Thread Foxtrott (Code Review)

Foxtrott has uploaded a new change for review.

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

Change subject: Remove direct insertions of JS into the page HTML
..

Remove direct insertions of JS into the page HTML

This prevents calls to jQuery when it is not yet available.

Change-Id: Ie9238c1bc6a134166c31b2cc3ed3099c05dd86ff
---
M includes/forminputs/SF_FormInput.php
M libs/SemanticForms.js
2 files changed, 41 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/44/268244/1

diff --git a/includes/forminputs/SF_FormInput.php 
b/includes/forminputs/SF_FormInput.php
index e391aa1..e753d2d 100644
--- a/includes/forminputs/SF_FormInput.php
+++ b/includes/forminputs/SF_FormInput.php
@@ -116,6 +116,23 @@
}
 
/**
+* @param $key
+* @param $configVars
+* @param $functionData
+* @param $input_id
+* @return array
+*/
+   private static function updateFormInputJsFunctionData( $key, 
&$configVars, $functionData, $input_id ) {
+   if ( array_key_exists( $key, $configVars ) ) {
+   $functionDataArray = $configVars[ $key ];
+   } else {
+   $functionDataArray = array();
+   }
+   $functionDataArray[ $input_id ] = $functionData;
+   return $functionDataArray;
+   }
+
+   /**
 * Return an array of the default parameters for this input where the
 * parameter name is the key while the parameter value is the value.
 *
@@ -337,31 +354,18 @@
$output->addModuleScripts( $modules );
}
 
-   // create calls to JS initialization and validation
-   // TODO: This data should be transferred as a JSON blob and 
then be evaluated from a dedicated JS file
if ( $input->getJsInitFunctionData() || 
$input->getJsValidationFunctionData() ) {
 
-   $jstext = '';
$input_id = $input_name == 'sf_free_text' ? 
'sf_free_text' : "input_$sfgFieldNum";
+   $configVars = $output->getJsConfigVars();
 
-   foreach ( $input->getJsInitFunctionData() as 
$jsInitFunctionData ) {
-   $jstext .= 
"jQuery('#$input_id').SemanticForms_registerInputInit({$jsInitFunctionData['name']},
 {$jsInitFunctionData['param']} );";
-   }
+   $initFunctionData = 
self::updateFormInputJsFunctionData( 'ext.sf.initFunctionData', $configVars, 
$input->getJsInitFunctionData(), $input_id );
+   $validationFunctionData = 
self::updateFormInputJsFunctionData( 'ext.sf.validationFunctionData', 
$configVars, $input->getJsValidationFunctionData(), $input_id );
 
-   foreach ( $input->getJsValidationFunctionData() as 
$jsValidationFunctionData ) {
-   $jstext .= 
"jQuery('#$input_id').SemanticForms_registerInputValidation( 
{$jsValidationFunctionData['name']}, {$jsValidationFunctionData['param']});";
-   }
-
-   if ( $modules !== null ) {
-   $jstext = 'mediaWiki.loader.using(' . 
json_encode( $modules )
-   . ',function(){' . $jstext
-   . '},function(e,module){alert(module+": 
"+e);});';
-   }
-
-   $jstext = 'jQuery(function(){' . $jstext . '});';
-
-   // write JS code directly to the page's code
-   $output->addHeadItem( Html::inlineScript( $jstext ) );
+   $output->addJsConfigVars( array(
+   'ext.sf.initFunctionData' => $initFunctionData,
+   'ext.sf.validationFunctionData' => 
$validationFunctionData
+   ) );
}
 
return $input->getHtmlText();
diff --git a/libs/SemanticForms.js b/libs/SemanticForms.js
index bfb0a64..4896410 100644
--- a/libs/SemanticForms.js
+++ b/libs/SemanticForms.js
@@ -482,7 +482,7 @@
 // Used for handling 'show on select' for the 'checkbox' input.
 jQuery.fn.showIfCheckedCheckbox = function(partOfMultiple, initPage) {
var sfgShowOnSelect = mediaWiki.config.get( 'sfgShowOnSelect' );
-   
+
if (partOfMultiple) {
var divIDs = sfgShowOnSelect[this.attr("data-origID")];
var instanceWrapperDiv = 
this.closest(".multipleTemplateInstance");
@@ -1358,6 +1358,22 @@
return;
}
 
+   // register init functions
+   initFunctionData = mw.config.get( 'ext.sf.initFunctionData' );
+   for ( var inputID in initFunctionData ) {
+   for ( var i in initFunctionData[inputID] ) {
+   jQuery( '#' + input

[MediaWiki-commits] [Gerrit] End A/B test of showing vs. hiding tooltips for highlighting... - change (apps...wikipedia)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: End A/B test of showing vs. hiding tooltips for highlighting 
text.
..


End A/B test of showing vs. hiding tooltips for highlighting text.

We've seen that our tooltips are effective at helping user engagement with
new features, such as share-a-fact. There's no further need to A/B test
this functionality.

Change-Id: I2e6c08b1c0807c618c94d718cd228a38e06293c9
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/xml/developer_preferences.xml
7 files changed, 5 insertions(+), 43 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 7ee4544..840e84b 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -396,17 +396,6 @@
 return EVENT_LOG_TESTING_ID;
 }
 
-public boolean isFeatureSelectTextAndShareTutorialEnabled() {
-boolean enabled;
-if (Prefs.hasFeatureSelectTextAndShareTutorial()) {
-enabled = Prefs.isFeatureSelectTextAndShareTutorialEnabled();
-} else {
-enabled = new Random().nextInt(2) == 0;
-Prefs.setFeatureSelectTextAndShareTutorialEnabled(enabled);
-}
-return enabled;
-}
-
 public boolean isFeatureReadMoreSearchOpeningTextEnabled() {
 boolean enabled;
 if (Prefs.hasFeatureReadMoreSearchOpeningText()) {
diff --git a/app/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
index db305cf..56c7e26 100644
--- a/app/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
@@ -31,7 +31,7 @@
 
 @Override
 protected JSONObject preprocessData(@NonNull JSONObject eventData) {
-preprocessData(eventData, "tutorialFeatureEnabled", 
Prefs.isFeatureSelectTextAndShareTutorialEnabled());
+preprocessData(eventData, "tutorialFeatureEnabled", true);
 preprocessData(eventData, "tutorialShown", calculateTutorialsShown());
 return super.preprocessData(eventData);
 }
@@ -89,14 +89,6 @@
 }
 
 private int calculateTutorialsShown() {
-if (Prefs.isFeatureSelectTextAndShareTutorialEnabled()) {
-if (!Prefs.isShareTutorialEnabled()) {
-return 2;
-}
-if (!Prefs.isSelectTextTutorialEnabled()) {
-return 1;
-}
-}
-return 0;
+return !Prefs.isShareTutorialEnabled() ? 2 : 
!Prefs.isSelectTextTutorialEnabled() ? 1 : 0;
 }
 }
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 3811b45..6b215f3 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -1108,9 +1108,8 @@
 }
 
 private void checkAndShowSelectTextOnboarding() {
-if (app.isFeatureSelectTextAndShareTutorialEnabled()
-&&  model.getPage().isArticle()
-&&  app.getOnboardingStateMachine().isSelectTextTutorialEnabled()) {
+if (model.getPage().isArticle()
+&&  
app.getOnboardingStateMachine().isSelectTextTutorialEnabled()) {
 showSelectTextOnboarding();
 }
 }
diff --git a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java 
b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
index 8621d51..4b8b925 100755
--- a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -184,8 +184,7 @@
 }
 
 private void handleSelection(Menu menu, MenuItem shareItem) {
-if 
(WikipediaApp.getInstance().isFeatureSelectTextAndShareTutorialEnabled()
-&& 
WikipediaApp.getInstance().getOnboardingStateMachine().isShareTutorialEnabled())
 {
+if 
(WikipediaApp.getInstance().getOnboardingStateMachine().isShareTutorialEnabled())
 {
 showShareOnboarding(shareItem);
 
WikipediaApp.getInstance().getOnboardingStateMachine().setShareTutorial();
 }
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 2a6f395..29f89c2 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -334,18 +334,6 @@

[MediaWiki-commits] [Gerrit] Fix special extensions branching - change (mediawiki/core)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: Fix special extensions branching
..


Fix special extensions branching

CentralNotice  origin/wmf_deploy
SemanticMediaWiki  origin/1.8.x
SemanticResultFormats  origin/1.8.x
Validator  origin/0.5.x

Update .gitmodules branch=

WikiData got bumped in an earlier commit.

Change-Id: I60b00f19987fc16b2a585f940c0a45a5a1ce3b77
---
M .gitmodules
M extensions/CentralNotice
M extensions/SemanticMediaWiki
M extensions/SemanticResultFormats
M extensions/Validator
5 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index 71125bd..bd66fc7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,22 @@
 [submodule "extensions/CentralNotice"]
path = extensions/CentralNotice
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CentralNotice.git
+   branch = wmf_deploy
 [submodule "extensions/Wikidata"]
path = extensions/Wikidata
url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Wikidata.git
 [submodule "extensions/SemanticMediaWiki"]
path = extensions/SemanticMediaWiki
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticMediaWiki.git
+   branch = 1.8.x
 [submodule "extensions/SemanticResultFormats"]
path = extensions/SemanticResultFormats
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticResultFormats.git
+   branch = 1.8.x
 [submodule "extensions/Validator"]
path = extensions/Validator
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Validator.git
+   branch = 0.5.x
 [submodule "extensions/AbuseFilter"]
path = extensions/AbuseFilter
url = 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AbuseFilter.git
diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 469e213..b48299a 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 469e213b89462e0254d54ecce8c2c4457d36ad2c
+Subproject commit b48299a02bddd6847c533dabeabb3f59b84f0ac5
diff --git a/extensions/SemanticMediaWiki b/extensions/SemanticMediaWiki
index 0fafd95..fc88186 16
--- a/extensions/SemanticMediaWiki
+++ b/extensions/SemanticMediaWiki
-Subproject commit 0fafd954b944c3fc20d505ef6df94f5cf0bcc763
+Subproject commit fc8818634ccae143df65f8be040ed91ef56a3809
diff --git a/extensions/SemanticResultFormats b/extensions/SemanticResultFormats
index 6b7f785..ff87847 16
--- a/extensions/SemanticResultFormats
+++ b/extensions/SemanticResultFormats
-Subproject commit 6b7f785a525ff77dcf8570786c0d888a5dfcdbd9
+Subproject commit ff8784732ebd44fb79791416a4fff339d3140eb4
diff --git a/extensions/Validator b/extensions/Validator
index 2257c7f..1a49880 16
--- a/extensions/Validator
+++ b/extensions/Validator
-Subproject commit 2257c7f2552c2a9202c4cf8f195f7aa1afca0790
+Subproject commit 1a49880cf68c8a890ca688156a53d19fc1a84ac3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60b00f19987fc16b2a585f940c0a45a5a1ce3b77
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Dduvall 
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] resources: Load OOjs UI from its four parts - change (mediawiki/core)

2016-02-03 Thread jenkins-bot (Code Review)

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

Change subject: resources: Load OOjs UI from its four parts
..


resources: Load OOjs UI from its four parts

See the task for more details. This is a backwards-compatible change.
If your script only needs a subset of OOjs UI functionality, you can
use one of the new smaller modules instead of the old big one.

New modules:
  oojs-ui-core
The core JavaScript library.
  oojs-ui-widgets
Additional widgets and layouts module.
  oojs-ui-toolbars
Toolbar and tools module.
  oojs-ui-windows
Windows and dialogs module.

Changed modules:
  oojs-ui.styles
Now correctly only loads the styles needed by OOjs UI PHP.
  oojs-ui
Now just loads core+widgets+toolbars+windows as dependencies.

Using the new modules in I58799e22f9c0a2f78c1b4a02c4b7af576157883a.

Bug: T113677
Change-Id: I0a3bf8fb25fb82325705a473cebd883e20b3ab8d
---
M includes/OutputPage.php
M maintenance/resources/update-oojs-ui.sh
M resources/ResourcesOOUI.php
D resources/lib/oojs-ui/oojs-ui-apex-noimages.css
A resources/lib/oojs-ui/oojs-ui-core-apex.css
A resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
A resources/lib/oojs-ui/oojs-ui-core.js
D resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
A resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
A resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
A resources/lib/oojs-ui/oojs-ui-toolbars.js
A resources/lib/oojs-ui/oojs-ui-widgets-apex.css
A resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
A resources/lib/oojs-ui/oojs-ui-widgets.js
A resources/lib/oojs-ui/oojs-ui-windows-apex.css
A resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
A resources/lib/oojs-ui/oojs-ui-windows.js
D resources/lib/oojs-ui/oojs-ui.js
18 files changed, 26,543 insertions(+), 26,503 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a3bf8fb25fb82325705a473cebd883e20b3ab8d
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] maps DNS 2/2: enable geodns routing - change (operations/dns)

2016-02-03 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: maps DNS 2/2: enable geodns routing
..

maps DNS 2/2: enable geodns routing

Do not merge until service is actually working at all sites, which
requires a bunch of puppet changes and deployment steps!

Bug: T109162
Change-Id: I06039857fddceb8882ae2fb58b7a565f8c1bbd1f
---
M config-geo
M templates/wikimedia.org
2 files changed, 15 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/40/268240/1

diff --git a/config-geo b/config-geo
index d1b254e..878dfba 100644
--- a/config-geo
+++ b/config-geo
@@ -273,6 +273,16 @@
 ulsfo => { addrs_v4 => 198.35.26.108,  addrs_v6 => 
2620:0:863:ed1a::1:c }
 }
 }
+maps-addrs {
+map => generic-map
+service_types => up
+dcmap => {
+eqiad => { addrs_v4 => 208.80.154.244, addrs_v6 => 
2620:0:861:ed1a::2:d }
+codfw => { addrs_v4 => 208.80.153.244, addrs_v6 => 
2620:0:860:ed1a::2:d }
+esams => { addrs_v4 => 91.198.174.209, addrs_v6 => 
2620:0:862:ed1a::2:d }
+ulsfo => { addrs_v4 => 198.35.26.113,  addrs_v6 => 
2620:0:863:ed1a::2:d }
+}
+}
 misc-addrs => {
 map => generic-map
 service_types => up
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 34f9409..9f17bd0 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -78,9 +78,7 @@
 text-lb 600 DYNA geoip!text-addrs
 bits600 DYNA geoip!text-addrs
 upload  600 DYNA geoip!upload-addrs
-; XXX temporary, should be DYNA geoip!maps-addrs
-maps1H  IN A208.80.154.244
-1H  IN  2620:0:861:ed1a::2:d
+maps600 DYNA geoip!maps-addrs
 m   600 DYNA geoip!mobile-addrs
 misc-web-lb 600 DYNA geoip!misc-addrs
 geoiplookup 600 DYNA geoip!geoiplookup-addrs
@@ -206,9 +204,7 @@
 text-lb.eqiad   600 IN DYNA geoip!text-addrs/eqiad
 upload-lb.eqiad 600 IN DYNA geoip!upload-addrs/eqiad
 mobile-lb.eqiad 600 IN DYNA geoip!mobile-addrs/eqiad
-; XXX temporary, should be DYNA geoip!maps-addrs/eqiad
-maps-lb.eqiad   1H  IN A208.80.154.244
-1H  IN  2620:0:861:ed1a::2:d
+maps-lb.eqiad   600 IN DYNA geoip!maps-addrs/eqiad
 misc-web-lb.eqiad   600 IN DYNA geoip!misc-addrs/eqiad
 donate-lb.eqiad 600 IN DYNA geoip!text-addrs/eqiad
 IN MX 10 mx1001.wikimedia.org.
@@ -242,9 +238,7 @@
 text-lb.ulsfo   600 IN DYNA geoip!text-addrs/ulsfo
 upload-lb.ulsfo 600 IN DYNA geoip!upload-addrs/ulsfo
 mobile-lb.ulsfo 600 IN DYNA geoip!mobile-addrs/ulsfo
-; XXX temporary, should be DYNA geoip!maps-addrs/ulsfo
-maps-lb.ulsfo   1H  IN A198.35.26.113
-1H  IN  2620:0:863:ed1a::2:d
+maps-lb.ulsfo   600 IN DYNA geoip!maps-addrs/ulsfo
 misc-web-lb.ulsfo   600 IN DYNA geoip!misc-addrs/ulsfo
 geoiplookup-lb.ulsfo600 IN DYNA geoip!geoiplookup-addrs/ulsfo
 donate-lb.ulsfo 600 IN DYNA geoip!text-addrs/ulsfo
@@ -257,9 +251,7 @@
 text-lb.codfw   600 IN DYNA geoip!text-addrs/codfw
 upload-lb.codfw 600 IN DYNA geoip!upload-addrs/codfw
 mobile-lb.codfw 600 IN DYNA geoip!mobile-addrs/codfw
-; XXX temporary, should be DYNA geoip!maps-addrs/codfw
-maps-lb.codfw   1H  IN A208.80.153.244
-1H  IN  2620:0:860:ed1a::2:d
+maps-lb.codfw   600 IN DYNA geoip!maps-addrs/codfw
 misc-web-lb.codfw   600 IN DYNA geoip!misc-addrs/codfw
 donate-lb.codfw 600 IN DYNA geoip!text-addrs/codfw
 geoiplookup-lb.codfw600 IN DYNA geoip!geoiplookup-addrs/codfw
@@ -783,9 +775,7 @@
 text-lb   600 IN DYNA geoip!text-addrs/esams
 upload-lb 600 IN DYNA geoip!upload-addrs/esams
 mobile-lb 600 IN DYNA geoip!mobile-addrs/esams
-; XXX temporary, should be DYNA geoip!maps-addrs/esams
-maps-lb   1H  IN A91.198.174.209
-  1H  IN  2620:0:862:ed1a::2:d
+maps-lb   600 IN DYNA geoip!maps-addrs/esams
 misc-web-lb   600 IN DYNA geoip!misc-addrs/esams
 geoiplookup-lb600 IN DYNA geoip!geoiplookup-addrs/esams
 donate-lb 600 IN DYNA geoip!text-addrs/esams

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06039857fddceb8882ae2fb58b7a565f8c1bbd1f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] Update DonationInterface submodule - change (mediawiki/core)

2016-02-03 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

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

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index cbd3f2c..99c236f 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit cbd3f2cc524b4b51a4b1bdf29eb2798c480b537d
+Subproject commit 99c236f31977b6e1e002416516af5312106f9fc6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7a856cee0d37779442326bdc31143f227243a2d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] cache_maps: remove cp104[34] test caches - change (operations/puppet)

2016-02-03 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: cache_maps: remove cp104[34] test caches
..

cache_maps: remove cp104[34] test caches

Bug: T109162
Change-Id: Id1ecd23083330d080a5d8b178e7797a60590d6e2
---
M conftool-data/nodes/eqiad.yaml
M hieradata/common/cache/ipsec/maps.yaml
M hieradata/common/cache/maps.yaml
M manifests/site.pp
4 files changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/268237/1

diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 3f9b881..00f8701 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -244,8 +244,6 @@
   cp1074.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp1099.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
 cache_maps:
-  cp1043.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp1044.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp1046.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp1047.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp1059.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
diff --git a/hieradata/common/cache/ipsec/maps.yaml 
b/hieradata/common/cache/ipsec/maps.yaml
index c1db15a..c1c3d13 100644
--- a/hieradata/common/cache/ipsec/maps.yaml
+++ b/hieradata/common/cache/ipsec/maps.yaml
@@ -5,8 +5,6 @@
 - 'cp2015.codfw.wmnet'
 - 'cp2021.codfw.wmnet'
   eqiad:
-- 'cp1043.eqiad.wmnet'
-- 'cp1044.eqiad.wmnet'
 - 'cp1046.eqiad.wmnet'
 - 'cp1047.eqiad.wmnet'
 - 'cp1059.eqiad.wmnet'
diff --git a/hieradata/common/cache/maps.yaml b/hieradata/common/cache/maps.yaml
index c1db15a..c1c3d13 100644
--- a/hieradata/common/cache/maps.yaml
+++ b/hieradata/common/cache/maps.yaml
@@ -5,8 +5,6 @@
 - 'cp2015.codfw.wmnet'
 - 'cp2021.codfw.wmnet'
   eqiad:
-- 'cp1043.eqiad.wmnet'
-- 'cp1044.eqiad.wmnet'
 - 'cp1046.eqiad.wmnet'
 - 'cp1047.eqiad.wmnet'
 - 'cp1059.eqiad.wmnet'
diff --git a/manifests/site.pp b/manifests/site.pp
index a4b374a..cf58a03 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -338,9 +338,10 @@
 interface::add_ip6_mapped { 'main': }
 }
 
+# to be decommed shortly!
 node /^cp104[34]\.eqiad\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role cache::maps, ipsec
+include standard
 }
 
 node 'cp1045.eqiad.wmnet', 'cp1058.eqiad.wmnet' {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1ecd23083330d080a5d8b178e7797a60590d6e2
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] cache_maps: add all sites in LVS - change (operations/puppet)

2016-02-03 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: cache_maps: add all sites in LVS
..

cache_maps: add all sites in LVS

Bug: T109162
Change-Id: If0ced5f4e59314e92b8033ba417ced17098149e7
---
M hieradata/common/lvs/configuration.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/268238/1

diff --git a/hieradata/common/lvs/configuration.yaml 
b/hieradata/common/lvs/configuration.yaml
index 5912f7d..b642d47 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -235,7 +235,10 @@
 description: "Maps service maps-lb.%{::site}.wikimedia.org"
 class: high-traffic2
 sites:
+- codfw
 - eqiad
+- esams
+- ulsfo
 ip: *ip_block003
 bgp: 'yes'
 depool-threshold: '.5'
@@ -250,7 +253,10 @@
 description: "Maps service maps-lb.%{::site}.wikimedia.org"
 class: high-traffic2
 sites:
+- codfw
 - eqiad
+- esams
+- ulsfo
 ip: *ip_block003
 port: 443
 scheduler: sh

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0ced5f4e59314e92b8033ba417ced17098149e7
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] maps DNS 1/2: define at all DCs - change (operations/dns)

2016-02-03 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: maps DNS 1/2: define at all DCs
..

maps DNS 1/2: define at all DCs

Note this is "safe" and doesn't change anything for maps.wm.o yet.
Followup dependent commit configures geoip and removes all the XXX

Bug: T109162
Change-Id: I77736ef613d9396ecdb3030b8be790029d09c220
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/153.80.208.in-addr.arpa
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/26.35.198.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
7 files changed, 22 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/39/268239/1

diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 01f6931..bc22a6b 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -195,6 +195,7 @@
 $ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
 b.0.0.0 1H IN PTR   upload-lb.codfw.wikimedia.org.
+d.0.0.0 1H IN PTR   maps-lb.codfw.wikimedia.org.
 
 ; - - 2620:0:860:ed1a::3:0/112 (::3:0 - ::3:) LVS Misc
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index 1a026ef..76a680a 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -151,6 +151,8 @@
 
 240 1H  IN PTR  upload-lb.codfw.wikimedia.org.
 
+244 1H  IN PTR  maps-lb.codfw.wikimedia.org.
+
 ; - - 208.80.153.248/29 (248-255) LVS Misc
 
 248  1H  IN PTR misc-web-lb.codfw.wikimedia.org.
diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index 0cdbe83..7582b72 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -57,6 +57,7 @@
 ; - - 91.198.174.208/29 (208-215) LVS Multimedia
 
 208 1H IN PTR   upload-lb.esams.wikimedia.org.
+209 1H IN PTR   maps-lb.esams.wikimedia.org.
 
 ; - - 91.198.174.216/29 (216-223) LVS Misc
 
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 05d5d74..e22d8df 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -115,6 +115,7 @@
 $ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
 b.0.0.0 1H IN PTR   upload-lb.esams.wikimedia.org.
+d.0.0.0 1H IN PTR   maps-lb.esams.wikimedia.org.
 
 ; - - 2620:0:862:ed1a::3:0/112 (::3:0 - ::3:) LVS Misc
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index 433c3be..d595fab 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -44,6 +44,7 @@
 ; - - 198.35.26.112/29 (112-119) LVS Multimedia
 
 112 1H IN PTR   upload-lb.ulsfo.wikimedia.org.
+113 1H IN PTR   maps-lb.ulsfo.wikimedia.org.
 
 ; - - 198.35.26.120/29 (120-127) LVS Misc
 
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index b8564d1..1cd1742 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -140,6 +140,7 @@
 $ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
 b.0.0.0 1H IN PTR   upload-lb.ulsfo.wikimedia.org.
+d.0.0.0 1H IN PTR   maps-lb.ulsfo.wikimedia.org.
 
 ; - - 2620:0:863:ed1a::3:0/112 (::3:0 - ::3:) LVS Misc
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index f22ebb6..34f9409 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -78,6 +78,9 @@
 text-lb 600 DYNA geoip!text-addrs
 bits600 DYNA geoip!text-addrs
 upload  600 DYNA geoip!upload-addrs
+; XXX temporary, should be DYNA geoip!maps-addrs
+maps1H  IN A208.80.154.244
+1H  IN  2620:0:861:ed1a::2:d
 m   600 DYNA geoip!mobile-addrs
 misc-web-lb 600 DYNA geoip!misc-addrs
 geoiplookup 600 DYNA geoip!geoiplookup-addrs
@@ -203,6 +206,9 @@
 text-lb.eqiad   600 IN DYNA geoip!text-addrs/eqiad
 upload-lb.eqiad 600 IN DYNA geoip!upload-addrs/eqiad
 mobile-lb.eqiad 600 IN DYNA geoip!mobile-addrs/eqiad
+; XXX temporary, should be DYNA geoip!maps-addrs/eqiad
+maps-lb.eqiad   1H  IN A208.80.154.244
+1H  IN  2620:0:861:ed1a::2:d
 misc-web-lb.eqiad   600 IN DYNA geoip!misc-addrs/eqiad
 donate-lb.eqiad 600 IN DYNA geoip!text-addrs/eqiad
 IN MX 10 mx1001.wikimedia.org.
@@ -210,10 +216,6 @@
 ;;; ns0 208.80.154.238
 dns-rec-lb.eqiad1H  IN A208.80.154.239

[MediaWiki-commits] [Gerrit] parsoid-rt-client: Have testreduce clients use global parsoi... - change (operations/puppet)

2016-02-03 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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

Change subject: parsoid-rt-client: Have testreduce clients use global parsoid 
service
..

parsoid-rt-client: Have testreduce clients use global parsoid service

* Instead of spinning up a private 1-worker parsoid service per
  testreduce client, have the clients talk to a global 4-worker
  parsoid service.

  This eliminates the testreduce failures we have encountered
  with node 4.2 that doesn't restart failed workers on the same
  port as it was running on.

* Also using only 4 workers for the 8 testreduce clients to stress
  the parsoid service a bit more than usual to test memory behavior
  on node 4.2

Change-Id: I0febb9e26d10b0cd324e404e294053f760318b22
---
M files/misc/parsoid_testing.systemd.service
M manifests/role/parsoid.pp
M modules/testreduce/files/parsoid-rt-client.config.js
3 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/268230/1

diff --git a/files/misc/parsoid_testing.systemd.service 
b/files/misc/parsoid_testing.systemd.service
index 841ecf0..9b11621 100644
--- a/files/misc/parsoid_testing.systemd.service
+++ b/files/misc/parsoid_testing.systemd.service
@@ -7,10 +7,11 @@
 Group=parsoid
 LimitNOFILE=1
 
-# 1 worker is sufficient -- we aren't going to hit this service much.
-Environment=NODE_PATH=/usr/lib/parsoid/node_modules VCAP_APP_PORT=8000
+# Start up 4 workers bound to port 8142
+# This parsoid instance is going to be used by testreduce clients
+Environment=PORT=8142 NODE_PATH=/usr/lib/parsoid/node_modules 
VCAP_APP_PORT=8000
 WorkingDirectory=/usr/lib/parsoid/src
-ExecStart=/usr/bin/nodejs bin/server.js -n 1 -c 
/usr/lib/parsoid/src/localsettings.js
+ExecStart=/usr/bin/nodejs bin/server.js -n 4 -c 
/usr/lib/parsoid/src/localsettings.js
 StandardInput=null
 StandardOutput=journal
 StandardError=journal
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 79e7fd9..26e856f 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -302,11 +302,12 @@
 before => Service['parsoid'],
 }
 
-# Use the default settings file for the parsoid service.
-# Can tweak this later if necessary.
+# Use this parsoid instance for parsoid rt-testing
 file { '/usr/lib/parsoid/src/localsettings.js':
-ensure => link,
-target => '/usr/lib/parsoid/src/localsettings.js.example',
+source => 
'puppet:///modules/testreduce/parsoid-rt-client.rttest.localsettings.js',
+owner  => 'root',
+group  => 'wikidev',
+mode   => '0444',
 before => Service['parsoid'],
 }
 
diff --git a/modules/testreduce/files/parsoid-rt-client.config.js 
b/modules/testreduce/files/parsoid-rt-client.config.js
index 4e730c2..b9004bd 100644
--- a/modules/testreduce/files/parsoid-rt-client.config.js
+++ b/modules/testreduce/files/parsoid-rt-client.config.js
@@ -18,11 +18,9 @@
clientName: 'Parsoid RT testing client',
 
opts: {
-   // By default, use the same configuration as 
the testing Parsoid server.
-   parsoidConfig: 
'/usr/lib/parsoid/src/tests/testreduce/parsoid-rt-client.rttest.localsettings.js',
-
-   // The parsoid API to use. If null, create our 
own server
-   parsoidURL: null,
+   // Talk to the existing Parsoid service.
+   // No need to spin up our own private Parsoid 
service.
+   parsoidURL: 'http://localhost:8142',
},
 
runTest: 
require('/usr/lib/parsoid/src/tests/testreduce/rtTestWrapper.js').runRoundTripTest,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0febb9e26d10b0cd324e404e294053f760318b22
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 

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

1 2 3 4 5 >

1 - 100 of 420 matches

Mail list logo