date:20170623

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add getDesiredBound() for Labels

2017-06-23 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361200 )

Change subject: Add getDesiredBound() for Labels
..

Add getDesiredBound() for Labels

This may make it easier for Optimizer to deal with it

Change-Id: I66cf4a2d5e29b8b14859f7727e77159b46c12778
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
M 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/AbstractRandomizedBlazegraphTestBase.java
M 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
M 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java
M pom.xml
5 files changed, 110 insertions(+), 29 deletions(-)


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

diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
index 42c909e..18710c3 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.openrdf.model.Literal;
@@ -34,11 +35,13 @@
 import com.bigdata.rdf.sparql.ast.service.BigdataServiceCall;
 import com.bigdata.rdf.sparql.ast.service.IServiceOptions;
 import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
+import com.bigdata.rdf.sparql.ast.service.ServiceNode;
 import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
 import com.bigdata.rdf.spo.ISPO;
 import com.bigdata.rdf.store.AbstractTripleStore;
 import com.bigdata.rdf.store.BD;
 import com.bigdata.striterator.IChunkedOrderedIterator;
+import com.google.common.collect.ImmutableSet;
 
 import cutthecrap.utils.striterators.ICloseableIterator;
 import static org.wikidata.query.rdf.blazegraph.BigdataValuesHelper.makeIV;
@@ -96,7 +99,7 @@
 /**
  * URI for service language parameter.
  */
-private static final URIImpl LANGUAGE_PARAM = new 
URIImpl(Ontology.NAMESPACE + "language");
+public static final URIImpl LANGUAGE_PARAM = new 
URIImpl(Ontology.NAMESPACE + "language");
 
 /**
  * Register the service so it is recognized by Blazegraph.
@@ -177,9 +180,16 @@
 /**
  * Create the resolutions list from the service call parameters.
  */
-@SuppressFBWarnings(value = "EC_UNRELATED_CLASS_AND_INTERFACE", 
justification = "equals() is actually correct for some subtypes of 
BigdataValue")
 private List findResolutions(ServiceCallCreateParams params) {
-JoinGroupNode g = (JoinGroupNode) 
params.getServiceNode().getGraphPattern();
+return findResolutions(params.getServiceNode());
+}
+
+/**
+ * Create the resolutions list from the service call parameters.
+ */
+@SuppressFBWarnings(value = "EC_UNRELATED_CLASS_AND_INTERFACE", 
justification = "equals() is actually correct for some subtypes of 
BigdataValue")
+private List findResolutions(final ServiceNode params) {
+JoinGroupNode g = (JoinGroupNode) params.getGraphPattern();
 List resolutions = new ArrayList<>(g.args().size());
 for (BOp st : g.args()) {
 StatementPatternNode sn = (StatementPatternNode) st;
@@ -576,4 +586,14 @@
 return mock(new LiteralImpl(b.toString(), language));
 }
 }
+
+@Override
+public Set getDesiredBound(final ServiceNode serviceNode) {
+final List res = findResolutions(serviceNode);
+return res.stream()
+.filter(resolution -> resolution.subject() instanceof IVariable)
+.map(resolution -> (IVariable)resolution.subject())
+.collect(ImmutableSet.toImmutableSet());
+}
+
 }
diff --git 
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/AbstractRandomizedBlazegraphTestBase.java
 
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/AbstractRandomizedBlazegraphTestBase.java
index c05adad..ff13c76 100644
--- 
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/AbstractRandomizedBlazegraphTestBase.java
+++ 
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/AbstractRandomizedBlazegraphTestBase.java
@@ -15,9 +15,13 @@
 import org.wikidata.query.rdf.common.uri.WikibaseUris;
 import org.wikidata.query.rdf.common.uri.WikibaseUris.PropertyType;
 
+import com.bigdata.rdf.model.BigdataLiteral;
 import com.bigdata.rdf.model.BigdataStatement;
+import com.bigdata.rdf.model.BigdataURI;
 import com.bigdata.rdf.sail.sparql.Bigdata2ASTSPARQLParser;
 import com.bigdata.rdf.sparql.ast.ASTContainer;
+import com.bigdata.rdf.sparql.ast.DummyConstantNode;
+import

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: registration: Support conditionally registered namespaces

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361199 )

Change subject: registration: Support conditionally registered namespaces
..

registration: Support conditionally registered namespaces

Some extensions (e.g. EventLogging) conditionally register a namespace
depending upon the wiki's configuration using the CanonicalNamespaces
hook. Since the "namespaces" key automatically registers the namespace,
we need an option to not register it and let the extension take care of
that manually using the hook.

All of the other namespace related settings are safe to unconditionally
set since they won't do anything if the namespace doesn't actually
exist.

Bug: T141604
Change-Id: Ie8c217fdc8bd783b30f98210309ea56fef39c0da
---
M docs/extension.schema.json
M includes/registration/ExtensionProcessor.php
2 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/361199/1

diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 1d2b2f0..5995975 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -579,6 +579,11 @@
"capitallinkoverride": {
"type": "boolean",
"description": "Set 
$wgCapitalLinks on a per-namespace basis"
+   },
+   "conditional": {
+   "type": "boolean",
+   "description": "Whether the 
namespace is conditional upon configuration and should not be registered 
(requires separate registration via a hook)",
+   "default": false
}
},
"required": ["id", "constant", "name"]
diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index 78f9370..3763960 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -233,7 +233,10 @@
foreach ( $info['namespaces'] as $ns ) {
$id = $ns['id'];
$this->defines[$ns['constant']] = $id;
-   $this->attributes['ExtensionNamespaces'][$id] = 
$ns['name'];
+   if ( !( isset( $ns['conditional'] ) && 
$ns['conditional'] ) ) {
+   // If it is not conditional, register it
+   
$this->attributes['ExtensionNamespaces'][$id] = $ns['name'];
+   }
if ( isset( $ns['gender'] ) ) {

$this->globals['wgExtraGenderNamespaces'][$id] = $ns['gender'];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8c217fdc8bd783b30f98210309ea56fef39c0da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Remove support for deprecated ParserLimitReport hook

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361198 )

Change subject: Remove support for deprecated ParserLimitReport hook
..

Remove support for deprecated ParserLimitReport hook

It was deprecated in 1.22, which Scribunto no longer supports.

Change-Id: I0e8e1d56062f0cba1749d2a3e64df400d6a46f27
---
M Scribunto.php
M common/Base.php
M common/Hooks.php
M engines/LuaSandbox/Engine.php
M engines/LuaStandalone/LuaStandaloneEngine.php
5 files changed, 0 insertions(+), 71 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/98/361198/1

diff --git a/Scribunto.php b/Scribunto.php
index 0a7d4e8..429767f 100644
--- a/Scribunto.php
+++ b/Scribunto.php
@@ -62,7 +62,6 @@
 $wgHooks['SoftwareInfo'][] = 'ScribuntoHooks::getSoftwareInfo';
 
 $wgHooks['ParserFirstCallInit'][] = 'ScribuntoHooks::setupParserHook';
-$wgHooks['ParserLimitReport']['scribunto'] = 'ScribuntoHooks::reportLimits';
 $wgHooks['ParserLimitReportPrepare'][] = 'ScribuntoHooks::reportLimitData';
 $wgHooks['ParserLimitReportFormat'][] = 'ScribuntoHooks::formatLimitData';
 $wgHooks['ParserClearState'][] = 'ScribuntoHooks::clearState';
diff --git a/common/Base.php b/common/Base.php
index 0493a41..4f49d03 100644
--- a/common/Base.php
+++ b/common/Base.php
@@ -275,16 +275,6 @@
}
 
/**
-* Get text for the limit report, old style
-*
-* @deprecated
-* @return string
-*/
-   public function getLimitReport() {
-   return '';
-   }
-
-   /**
 * Add limit report data to a ParserOutput object
 *
 * @param $output ParserOutput ParserOutput object in which to add 
limit data
diff --git a/common/Hooks.php b/common/Hooks.php
index b256ad4..2d6c42d 100644
--- a/common/Hooks.php
+++ b/common/Hooks.php
@@ -273,31 +273,11 @@
/**
 * Adds report of number of evaluations by the single wikitext page.
 *
-* @deprecated
-* @param Parser $parser
-* @param string $report
-* @return bool
-*/
-   public static function reportLimits( Parser $parser, &$report ) {
-   if ( Scribunto::isParserEnginePresent( $parser ) ) {
-   $engine = Scribunto::getParserEngine( $parser );
-   $report .= $engine->getLimitReport();
-   }
-   return true;
-   }
-
-   /**
-* Adds report of number of evaluations by the single wikitext page.
-*
 * @param Parser $parser
 * @param ParserOutput $output
 * @return bool
 */
public static function reportLimitData( Parser $parser, ParserOutput 
$output ) {
-   // Unhook the deprecated hook, since the new one exists.
-   global $wgHooks;
-   unset( $wgHooks['ParserLimitReport']['scribunto'] );
-
if ( Scribunto::isParserEnginePresent( $parser ) ) {
$engine = Scribunto::getParserEngine( $parser );
$engine->reportLimitData( $output );
diff --git a/engines/LuaSandbox/Engine.php b/engines/LuaSandbox/Engine.php
index 963adef..86748f6 100644
--- a/engines/LuaSandbox/Engine.php
+++ b/engines/LuaSandbox/Engine.php
@@ -106,23 +106,6 @@
return $ret;
}
 
-   public function getLimitReport() {
-   $data = $this->getLimitReportData();
-   $lang = Language::factory( 'en' );
-
-   $t = $this->interpreter->getCPUUsage();
-   $s = 'Lua time usage: ' . sprintf( "%.3f", 
$data['scribunto-limitreport-timeusage'] ) . "s\n" .
-   'Lua memory usage: ' . $lang->formatSize( 
$data['scribunto-limitreport-memusage'] ) . "\n";
-   if ( isset( $data['scribunto-limitreport-profile'] ) ) {
-   $s .= "Lua Profile:\n";
-   $format = "%-59s %8.0f ms %8.1f%%\n";
-   foreach ( $data['scribunto-limitreport-profile'] as 
$line ) {
-   $s .= sprintf( $format, $line[0], $line[1], 
$line[2] );
-   }
-   }
-   return $s;
-   }
-
public function reportLimitData( ParserOutput $output ) {
$data = $this->getLimitReportData();
foreach ( $data as $k => $v ) {
diff --git a/engines/LuaStandalone/LuaStandaloneEngine.php 
b/engines/LuaStandalone/LuaStandaloneEngine.php
index 3f1c994..9736c80 100644
--- a/engines/LuaStandalone/LuaStandaloneEngine.php
+++ b/engines/LuaStandalone/LuaStandaloneEngine.php
@@ -20,29 +20,6 @@
];
}
 
-   /**
-* @return string
-*/
-   function getLimitReport() {
-   try {
-   $this->load();
-   } catch ( Exception $e ) {
-   return '';
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Parser: Emit deprecation warnings for ParserLimitReport hook

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361197 )

Change subject: Parser: Emit deprecation warnings for ParserLimitReport hook
..

Parser: Emit deprecation warnings for ParserLimitReport hook

Change-Id: I351f0867132acf8d5cc9ee51b57575b28b77
---
M includes/parser/Parser.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index d8722ba..5256733 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -550,7 +550,8 @@
// Since we're not really outputting HTML, decode the 
entities and
// then re-encode the things that need hiding inside 
HTML comments.
$limitReport = htmlspecialchars_decode( $limitReport );
-   Hooks::run( 'ParserLimitReport', [ $this, &$limitReport 
] );
+   // Run deprecated hook
+   Hooks::run( 'ParserLimitReport', [ $this, &$limitReport 
], '1.22' );
 
// Sanitize for comment. Note '‐' in the replacement is 
U+2010,
// which looks much like the problematic '-'.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.Title: Remove needless $.type() and minor clean up

2017-06-23 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361196 )

Change subject: mediawiki.Title: Remove needless $.type() and minor clean up
..

mediawiki.Title: Remove needless $.type() and minor clean up

* Use typeof instead of $.type() for primitives.
* Remove needless type check before instanceof.
* Use early-return pattern.

Change-Id: Ibfdbc3912961fd017cefb7115951f07b92f6d435
---
M resources/src/mediawiki/mediawiki.Title.js
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/361196/1

diff --git a/resources/src/mediawiki/mediawiki.Title.js 
b/resources/src/mediawiki/mediawiki.Title.js
index 6765270..253e0ef 100644
--- a/resources/src/mediawiki/mediawiki.Title.js
+++ b/resources/src/mediawiki/mediawiki.Title.js
@@ -699,22 +699,21 @@
 */
Title.exists = function ( title ) {
var match,
-   type = $.type( title ),
obj = Title.exist.pages;
 
-   if ( type === 'string' ) {
+   if ( typeof title === 'string' ) {
match = obj[ title ];
-   } else if ( type === 'object' && title instanceof Title ) {
+   } else if ( title instanceof Title ) {
match = obj[ title.toString() ];
} else {
throw new Error( 'mw.Title.exists: title must be a 
string or an instance of Title' );
}
 
-   if ( typeof match === 'boolean' ) {
-   return match;
+   if ( typeof match !== 'boolean' ) {
+   return null;
}
 
-   return null;
+   return match;
};
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfdbc3912961fd017cefb7115951f07b92f6d435
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] operations...fonts[master]: Adding font files and license

2017-06-23 Thread Foks (Code Review)

Foks has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361195 )

Change subject: Adding font files and license
..

Adding font files and license

Bug: T168757
Change-Id: I6f79d9a9b384427c2a1adcc9b5005b33c5bcdb3a
---
A Montserrat-Italic.ttf
A Montserrat-Medium.ttf
A Montserrat-MediumItalic.ttf
A Montserrat-Regular.ttf
A OFL.txt
5 files changed, 92 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config/fonts 
refs/changes/95/361195/1

diff --git a/Montserrat-Italic.ttf b/Montserrat-Italic.ttf
new file mode 100755
index 000..c5a36e5
--- /dev/null
+++ b/Montserrat-Italic.ttf
Binary files differ
diff --git a/Montserrat-Medium.ttf b/Montserrat-Medium.ttf
new file mode 100755
index 000..88d70b8
--- /dev/null
+++ b/Montserrat-Medium.ttf
Binary files differ
diff --git a/Montserrat-MediumItalic.ttf b/Montserrat-MediumItalic.ttf
new file mode 100755
index 000..225fd18
--- /dev/null
+++ b/Montserrat-MediumItalic.ttf
Binary files differ
diff --git a/Montserrat-Regular.ttf b/Montserrat-Regular.ttf
new file mode 100755
index 000..626355a
--- /dev/null
+++ b/Montserrat-Regular.ttf
Binary files differ
diff --git a/OFL.txt b/OFL.txt
new file mode 100755
index 000..90ed815
--- /dev/null
+++ b/OFL.txt
@@ -0,0 +1,92 @@
+Copyright 2011 The Montserrat Project Authors (julieta.ulanov...@gmail.com)
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+---
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+---
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: IllegalSingleLineCommentSniff: Check return value of strrpos...

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361194 )

Change subject: IllegalSingleLineCommentSniff: Check return value of strrpos 
strictly
..

IllegalSingleLineCommentSniff: Check return value of strrpos strictly

0 is an OK value and shouldn't be considered falsey in this case.

Change-Id: I583ee36dcedead4fd4cad3733517b888b431009b
---
M MediaWiki/Sniffs/Commenting/IllegalSingleLineCommentSniff.php
M MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
M MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed
3 files changed, 10 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/94/361194/1

diff --git a/MediaWiki/Sniffs/Commenting/IllegalSingleLineCommentSniff.php 
b/MediaWiki/Sniffs/Commenting/IllegalSingleLineCommentSniff.php
index 4359da3..4d6327d 100644
--- a/MediaWiki/Sniffs/Commenting/IllegalSingleLineCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/IllegalSingleLineCommentSniff.php
@@ -39,7 +39,7 @@
for ( $i = $stackPtr + 1; $i < $numOfTokens; 
$i++ ) {
$token = $tokens[$i];
if ( strpos( $token['content'], '/*' ) 
=== false &&
-   strrpos( $token['content'], 
'*/' )
+   strrpos( $token['content'], 
'*/' ) !== false
) {
return;
}
diff --git a/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect 
b/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
index aa62fff..66d8b68 100644
--- a/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
+++ b/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
@@ -1,10 +1,8 @@
-  7 | WARNING | [x] Invalid start of a single line comment
-| | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart)
-  8 | WARNING | [x] Invalid start of a single line comment
-| | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart)
-  9 | WARNING | [x] Invalid end of a single line comment
-| | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd)
- 24 | ERROR   | [x] Missing proper ending of a single line comment
-| | 
(MediaWiki.Commenting.IllegalSingleLineComment.MissingCommentEndding)
+ 7 | WARNING | [x] Invalid start of a single line comment
+   | | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart)
+ 8 | WARNING | [x] Invalid start of a single line comment
+   | | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart)
+ 9 | WARNING | [x] Invalid end of a single line comment
+   | | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd)
 
-PHPCBF CAN FIX THE 4 MARKED SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX THE 3 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed 
b/MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed
index 09c6230..573db1e 100644
--- a/MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed
+++ b/MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed
@@ -21,7 +21,8 @@
 /*
  * One asterisk, aligned properly
  */
-/** One asterisk, misaligned
+/*
+* One asterisk, misaligned
 */
 /**
  * Two asterisks, aligned properly

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I583ee36dcedead4fd4cad3733517b888b431009b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add some more test cases documenting IllegalSingleLineCommen...

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361193 )

Change subject: Add some more test cases documenting 
IllegalSingleLineCommentSniff fixes
..

Add some more test cases documenting IllegalSingleLineCommentSniff fixes

This just documents the status quo, will be fixed in a follow-up.

Change-Id: If1c33f2a701b18123f533af43d15df6349838e55
---
M MediaWiki/Tests/files/Commenting/comment_single_line.php
M MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
M MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed
3 files changed, 35 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/93/361193/1

diff --git a/MediaWiki/Tests/files/Commenting/comment_single_line.php 
b/MediaWiki/Tests/files/Commenting/comment_single_line.php
index db8f175..148b56a 100644
--- a/MediaWiki/Tests/files/Commenting/comment_single_line.php
+++ b/MediaWiki/Tests/files/Commenting/comment_single_line.php
@@ -17,3 +17,16 @@
/** This is valid */
/** @var This is valid */
 }
+
+/*
+ * One asterisk, aligned properly
+ */
+/*
+* One asterisk, misaligned
+*/
+/**
+ * Two asterisks, aligned properly
+ */
+/**
+* Two asterisks, misaligned
+*/
diff --git a/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect 
b/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
index b358daf..aa62fff 100644
--- a/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
+++ b/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
@@ -1,7 +1,10 @@
- 7 | WARNING | [x] Invalid start of a single line comment
-   | | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart)
- 8 | WARNING | [x] Invalid start of a single line comment
-   | | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart)
- 9 | WARNING | [x] Invalid end of a single line comment
-   | | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd)
-PHPCBF CAN FIX THE 3 MARKED SNIFF VIOLATIONS AUTOMATICALLY
\ No newline at end of file
+  7 | WARNING | [x] Invalid start of a single line comment
+| | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart)
+  8 | WARNING | [x] Invalid start of a single line comment
+| | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart)
+  9 | WARNING | [x] Invalid end of a single line comment
+| | 
(MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd)
+ 24 | ERROR   | [x] Missing proper ending of a single line comment
+| | 
(MediaWiki.Commenting.IllegalSingleLineComment.MissingCommentEndding)
+
+PHPCBF CAN FIX THE 4 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed 
b/MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed
index d6057f0..09c6230 100644
--- a/MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed
+++ b/MediaWiki/Tests/files/Commenting/comment_single_line.php.fixed
@@ -17,3 +17,15 @@
/** This is valid */
/** @var This is valid */
 }
+
+/*
+ * One asterisk, aligned properly
+ */
+/** One asterisk, misaligned
+*/
+/**
+ * Two asterisks, aligned properly
+ */
+/**
+* Two asterisks, misaligned
+*/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1c33f2a701b18123f533af43d15df6349838e55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: Update css and templates to be modern look

2017-06-23 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361190 )

Change subject: planet: Update css and templates to be modern look
..

planet: Update css and templates to be modern look

We are using https://github.com/joshaw/Rawdog

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/361190/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d878ba41f8ecf2b6142b28696e8928876ea3528
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "hieradata: shift all ores traffic to codfw"

2017-06-23 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361192 )

Change subject: Revert "hieradata: shift all ores traffic to codfw"
..


Revert "hieradata: shift all ores traffic to codfw"

This reverts commit fb5532021196c66900bd55e790bbefdd66628fa6.

Change-Id: Ibf81c2b45abd3d1c13e8118302e0d4264be4d651
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 24c9799..b900d14 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -133,7 +133,7 @@
 be_opts:
   port: 8081
 backends:
-  #eqiad: 'ores.svc.eqiad.wmnet'
+  eqiad: 'ores.svc.eqiad.wmnet'
   codfw: 'ores.svc.codfw.wmnet'
 cache::req_handling:
   15.wikipedia.org:

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "hieradata: shift all ores traffic to codfw"

2017-06-23 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361192 )

Change subject: Revert "hieradata: shift all ores traffic to codfw"
..

Revert "hieradata: shift all ores traffic to codfw"

This reverts commit fb5532021196c66900bd55e790bbefdd66628fa6.

Change-Id: Ibf81c2b45abd3d1c13e8118302e0d4264be4d651
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 24c9799..b900d14 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -133,7 +133,7 @@
 be_opts:
   port: 8081
 backends:
-  #eqiad: 'ores.svc.eqiad.wmnet'
+  eqiad: 'ores.svc.eqiad.wmnet'
   codfw: 'ores.svc.codfw.wmnet'
 cache::req_handling:
   15.wikipedia.org:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf81c2b45abd3d1c13e8118302e0d4264be4d651
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1002: add smokeping role

2017-06-23 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361191 )

Change subject: netmon1002: add smokeping role
..

netmon1002: add smokeping role

Bug: T159756
Change-Id: I82f70cbfe86c9dc0abd4a3b00d4c95aefd9f4a7e
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 530af0e..90b9c57 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1916,7 +1916,7 @@
 # network monitoring tool server - replacement server (T125020)
 node 'netmon1002.wikimedia.org' {
 # role(rancid, librenms, servermon::wmf, torrus, smokeping)
-role(rancid)
+role(rancid, smokeping)
 
 include ::passwords::network
 include ::base::firewall

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82f70cbfe86c9dc0abd4a3b00d4c95aefd9f4a7e
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] mediawiki...MinervaNeue[master]: Placeholder to avoid failing browser tests

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361188 )

Change subject: Placeholder to avoid failing browser tests
..


Placeholder to avoid failing browser tests

Change-Id: I694a28b364a6baadc948d0465db5f4ee91cebb61
---
A Gemfile
A Gemfile.lock
A tests/browser/README.txt
A tests/browser/features/README.txt
4 files changed, 118 insertions(+), 0 deletions(-)

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



diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000..144b926
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'chunky_png', '~> 1.3.4'
+gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.3'
+gem 'page-object', '1.1.0'
+gem 'rake', '~> 10.4', '>= 10.4.2'
+gem 'rubocop', '~> 0.29.1', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000..0b46fb7
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,109 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+ast (2.2.0)
+astrolabe (1.3.1)
+  parser (~> 2.2)
+builder (3.2.2)
+childprocess (0.5.9)
+  ffi (~> 1.0, >= 1.0.11)
+chunky_png (1.3.5)
+cucumber (1.3.20)
+  builder (>= 2.1.2)
+  diff-lcs (>= 1.1.3)
+  gherkin (~> 2.12)
+  multi_json (>= 1.7.5, < 2.0)
+  multi_test (>= 0.1.2)
+data_magic (0.22)
+  faker (>= 1.1.2)
+  yml_reader (>= 0.6)
+diff-lcs (1.2.5)
+domain_name (0.5.20161129)
+  unf (>= 0.0.5, < 1.0.0)
+faker (1.6.3)
+  i18n (~> 0.5)
+faraday (0.10.0)
+  multipart-post (>= 1.2, < 3)
+faraday-cookie_jar (0.0.6)
+  faraday (>= 0.7.4)
+  http-cookie (~> 1.0.0)
+faraday_middleware (0.10.1)
+  faraday (>= 0.7.4, < 1.0)
+ffi (1.9.10)
+gherkin (2.12.2)
+  multi_json (~> 1.3)
+headless (2.3.1)
+http-cookie (1.0.3)
+  domain_name (~> 0.5)
+i18n (0.7.0)
+json (1.8.3)
+mediawiki_api (0.7.0)
+  faraday (~> 0.9, >= 0.9.0)
+  faraday-cookie_jar (~> 0.0, >= 0.0.6)
+  faraday_middleware (~> 0.10, >= 0.10.0)
+mediawiki_selenium (1.7.3)
+  cucumber (~> 1.3, >= 1.3.20)
+  headless (~> 2.0, >= 2.1.0)
+  json (~> 1.8, >= 1.8.1)
+  mediawiki_api (~> 0.7, >= 0.7.0)
+  page-object (~> 1.0)
+  rest-client (~> 1.6, >= 1.6.7)
+  rspec-core (~> 2.14, >= 2.14.4)
+  rspec-expectations (~> 2.14, >= 2.14.4)
+  selenium-webdriver (< 3)
+  syntax (~> 1.2, >= 1.2.0)
+  thor (~> 0.19, >= 0.19.1)
+mime-types (2.99.3)
+multi_json (1.12.1)
+multi_test (0.1.2)
+multipart-post (2.0.0)
+netrc (0.11.0)
+page-object (1.1.0)
+  page_navigation (>= 0.9)
+  selenium-webdriver (>= 2.44.0)
+  watir-webdriver (>= 0.6.11)
+page_navigation (0.9)
+  data_magic (>= 0.14)
+parser (2.3.0.7)
+  ast (~> 2.2)
+powerpack (0.1.1)
+rainbow (2.1.0)
+rake (10.5.0)
+rest-client (1.8.0)
+  http-cookie (>= 1.0.2, < 2.0)
+  mime-types (>= 1.16, < 3.0)
+  netrc (~> 0.7)
+rspec-core (2.99.2)
+rspec-expectations (2.99.2)
+  diff-lcs (>= 1.1.3, < 2.0)
+rubocop (0.29.1)
+  astrolabe (~> 1.3)
+  parser (>= 2.2.0.1, < 3.0)
+  powerpack (~> 0.1)
+  rainbow (>= 1.99.1, < 3.0)
+  ruby-progressbar (~> 1.4)
+ruby-progressbar (1.8.0)
+rubyzip (1.2.0)
+selenium-webdriver (2.53.0)
+  childprocess (~> 0.5)
+  rubyzip (~> 1.0)
+  websocket (~> 1.0)
+syntax (1.2.1)
+thor (0.19.4)
+unf (0.1.4)
+  unf_ext
+unf_ext (0.0.7.2)
+watir-webdriver (0.9.1)
+  selenium-webdriver (>= 2.46.2)
+websocket (1.2.3)
+yml_reader (0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  chunky_png (~> 1.3.4)
+  mediawiki_selenium (~> 1.7, >= 1.7.3)
+  page-object (= 1.1.0)
+  rake (~> 10.4, >= 10.4.2)
+  rubocop (~> 0.29.1)
diff --git a/tests/browser/README.txt b/tests/browser/README.txt
new file mode 100644
index 000..563d823
--- /dev/null
+++ b/tests/browser/README.txt
@@ -0,0 +1 @@
+Coming soon...!
diff --git a/tests/browser/features/README.txt 
b/tests/browser/features/README.txt
new file mode 100644
index 000..483b313
--- /dev/null
+++ b/tests/browser/features/README.txt
@@ -0,0 +1 @@
+This will be filled as part of the migration of Minerva to MobileFrontend.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I694a28b364a6baadc948d0465db5f4ee91cebb61
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Disable letsecnrypt temp

2017-06-23 Thread Paladox (Code Review)

Paladox has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361189 )

Change subject: Disable letsecnrypt temp
..


Disable letsecnrypt temp

Change-Id: I5a895d0a5c2d9fc79aeb16fe33479b1187869d23
---
M manifests/web.pp
1 file changed, 21 insertions(+), 11 deletions(-)

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



diff --git a/manifests/web.pp b/manifests/web.pp
index fcef2bb..50e1da3 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -18,12 +18,22 @@
 ) {
 include ::icinga2
 
-apt::repository { 'icingaweb2':
-uri=> 'http://packages.icinga.com/debian',
-dist   => 'icinga-jessie',
-components => 'main',
-source => false,
-keyfile=> 'puppet:///modules/icinga2/icingaweb2.gpg',
+if os_version('debian >= stretch') {
+apt::repository { 'icingaweb2':
+uri=> 'http://packages.icinga.com/debian',
+dist   => 'icinga-stretch',
+components => 'main',
+source => false,
+keyfile=> 'puppet:///modules/icinga2/icingaweb2.gpg',
+}
+} else {
+apt::repository { 'icingaweb2':
+uri=> 'http://packages.icinga.com/debian',
+dist   => 'icinga-jessie',
+components => 'main',
+source => false,
+keyfile=> 'puppet:///modules/icinga2/icingaweb2.gpg',
+}
 }
 
 package { 'icingaweb2':
@@ -97,11 +107,11 @@
 include ::apache::mod::headers
 
 
-letsencrypt::cert::integrated { 'gerrit-icinga':
- subjects   => 'gerrit-icinga.wmflabs.org',
- puppet_svc => 'apache2',
- system_svc => 'apache2',
-}
+#letsencrypt::cert::integrated { 'gerrit-icinga':
+# subjects   => 'gerrit-icinga.wmflabs.org',
+# puppet_svc => 'apache2',
+# system_svc => 'apache2',
+#}
 
 $ssl_settings = ssl_ciphersuite('apache', 'mid', true)
 # letsencrypt::cert::integrated { 'icinga2':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a895d0a5c2d9fc79aeb16fe33479b1187869d23
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Disable letsecnrypt temp

2017-06-23 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361189 )

Change subject: Disable letsecnrypt temp
..

Disable letsecnrypt temp

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/89/361189/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a895d0a5c2d9fc79aeb16fe33479b1187869d23
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
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] mediawiki...MinervaNeue[master]: Placeholder to avoid failing browser tests

2017-06-23 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361188 )

Change subject: Placeholder to avoid failing browser tests
..

Placeholder to avoid failing browser tests

Change-Id: I694a28b364a6baadc948d0465db5f4ee91cebb61
---
A tests/browser/README.txt
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/88/361188/1

diff --git a/tests/browser/README.txt b/tests/browser/README.txt
new file mode 100644
index 000..563d823
--- /dev/null
+++ b/tests/browser/README.txt
@@ -0,0 +1 @@
+Coming soon...!

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I694a28b364a6baadc948d0465db5f4ee91cebb61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
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] mediawiki...MobileFrontend[master]: Hygiene: SkinStyles should be arrays

2017-06-23 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361187 )

Change subject: Hygiene: SkinStyles should be arrays
..

Hygiene: SkinStyles should be arrays

This shouldn't work even though it does. Fixing.

Change-Id: Icc1c9c69ea54a45c33071da1fd33546f3be45d71
---
M extension.json
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/extension.json b/extension.json
index 6a4cdcb..2186a1d 100644
--- a/extension.json
+++ b/extension.json
@@ -1588,12 +1588,12 @@
"@note3": "Otherwise their own customizations are overridden. 
(T167216)",
"ResourceModuleSkinStyles": {
"minerva": {
-   "mobile.search": {
-   "minerva": 
"skinStyles/mobile.search/SearchOverlay.less"
-   },
-   "mobile.languages.structured": {
-   "minerva": 
"skinStyles/mobile.languages.structured/LanguageOverlay.less"
-   },
+   "mobile.search": [
+   "skinStyles/mobile.search/SearchOverlay.less"
+   ],
+   "mobile.languages.structured": [
+   
"skinStyles/mobile.languages.structured/LanguageOverlay.less"
+   ],
"mobile.toggle": [
"skinStyles/mobile.toggle/minerva.less"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc1c9c69ea54a45c33071da1fd33546f3be45d71
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] mediawiki/core[master]: [wip] RCFilters: Add range group filters - limit and days

2017-06-23 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361186 )

Change subject: [wip] RCFilters: Add range group filters - limit and days
..

[wip] RCFilters: Add range group filters - limit and days

Bug: T162784
Bug: T162786
Change-Id: I8068a7cc411eef40ddb8af4eef1d4f1e5f2a2b82
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/361186/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index d542a52..b6d003e 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -95,6 +95,28 @@
};
}
 
+   // Add parameter range operations
+   views.range = {
+   groups: [
+   {
+   name: 'limit',
+   type: 'single_option',
+   title: 'Limit', // TODO: i18n
+   hidden: true,
+   default: 50,
+   filters: 
createFilterItemFromNumberArray( [ 50, 100, 250, 500 ] )
+   },
+   {
+   name: 'days',
+   type: 'single_option',
+   title: 'Days', // TODO: i18n
+   hidden: true,
+   default: 7,
+   filters: 
createFilterItemFromNumberArray( [ 1, 3, 7, 14, 30 ] )
+   }
+   ]
+   };
+
// Initialize the model
this.filtersModel.initializeFilters( filterStructure, views );
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Use correct notation for UTF-8

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361128 )

Change subject: Use correct notation for UTF-8
..


Use correct notation for UTF-8

Clean up phpcs.xml

Change-Id: I17e688de49c97311bfcfbb673fe753350969bcf8
---
M README.md
M phpcs.xml
2 files changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/README.md b/README.md
index c61d96a..c2d477b 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,10 @@
 ```
 
 
-   
+   
.

-   
+   
vendor
 
 ```
diff --git a/phpcs.xml b/phpcs.xml
index 10ada90..2d92d4a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,9 @@
-
+
 
-   
+   
.

-   
+   
vendor
+   */Tests/files/*
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17e688de49c97311bfcfbb673fe753350969bcf8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Addshore 
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] operations/puppet[production]: planet: fix one more content/template syntax issue

2017-06-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361185 )

Change subject: planet: fix one more content/template syntax issue
..


planet: fix one more content/template syntax issue

Change-Id: I5d0c702928c6b2259b7124d7c59d6cfca3bd3427
---
M modules/planet/manifests/theme.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/planet/manifests/theme.pp 
b/modules/planet/manifests/theme.pp
index 47a1b0c..c0d0e28 100644
--- a/modules/planet/manifests/theme.pp
+++ b/modules/planet/manifests/theme.pp
@@ -19,8 +19,8 @@
 ensure  => 'directory',
 }
 file { "/var/www/planet/${title}/style.css":
-ensure  => 'present',
-content => 'puppet:///modules/planet/theme/rawdog_style.css';
+ensure => 'present',
+source => 'puppet:///modules/planet/theme/rawdog_style.css';
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_page.tmpl":
 ensure  => 'present',
@@ -35,8 +35,8 @@
 content => template('planet/html/rd_feedlist.html.tmpl.erb');
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_feeditem.tmpl":
-ensure => 'present',
-source => template('planet/html/rd_feeditem.html.tmpl.erb');
+ensure  => 'present',
+content => template('planet/html/rd_feeditem.html.tmpl.erb');
 }
 } else {
 $theme_path = '/usr/share/planet-venus/theme/wikimedia'

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: fix one more content/template syntax issue

2017-06-23 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361185 )

Change subject: planet: fix one more content/template syntax issue
..

planet: fix one more content/template syntax issue

Change-Id: I5d0c702928c6b2259b7124d7c59d6cfca3bd3427
---
M modules/planet/manifests/theme.pp
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/planet/manifests/theme.pp 
b/modules/planet/manifests/theme.pp
index 47a1b0c..c0d0e28 100644
--- a/modules/planet/manifests/theme.pp
+++ b/modules/planet/manifests/theme.pp
@@ -19,8 +19,8 @@
 ensure  => 'directory',
 }
 file { "/var/www/planet/${title}/style.css":
-ensure  => 'present',
-content => 'puppet:///modules/planet/theme/rawdog_style.css';
+ensure => 'present',
+source => 'puppet:///modules/planet/theme/rawdog_style.css';
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_page.tmpl":
 ensure  => 'present',
@@ -35,8 +35,8 @@
 content => template('planet/html/rd_feedlist.html.tmpl.erb');
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_feeditem.tmpl":
-ensure => 'present',
-source => template('planet/html/rd_feeditem.html.tmpl.erb');
+ensure  => 'present',
+content => template('planet/html/rd_feeditem.html.tmpl.erb');
 }
 } else {
 $theme_path = '/usr/share/planet-venus/theme/wikimedia'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d0c702928c6b2259b7124d7c59d6cfca3bd3427
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] operations/puppet[production]: planet: fix syntax error, source vs. content with templates

2017-06-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361184 )

Change subject: planet: fix syntax error, source vs. content with templates
..


planet: fix syntax error, source vs. content with templates

Change-Id: I1de85b5db8f53fa8925d620bfa06f8764812df2b
---
M modules/planet/manifests/theme.pp
1 file changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/modules/planet/manifests/theme.pp 
b/modules/planet/manifests/theme.pp
index a7f6705..47a1b0c 100644
--- a/modules/planet/manifests/theme.pp
+++ b/modules/planet/manifests/theme.pp
@@ -19,20 +19,20 @@
 ensure  => 'directory',
 }
 file { "/var/www/planet/${title}/style.css":
-ensure => 'present',
-source => 'puppet:///modules/planet/theme/rawdog_style.css';
+ensure  => 'present',
+content => 'puppet:///modules/planet/theme/rawdog_style.css';
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_page.tmpl":
-ensure => 'present',
-source => template('planet/html/rd_page.html.tmpl.erb');
+ensure  => 'present',
+content => template('planet/html/rd_page.html.tmpl.erb');
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_item.tmpl":
-ensure => 'present',
-source => template('planet/html/rd_item.html.tmpl.erb');
+ensure  => 'present',
+content => template('planet/html/rd_item.html.tmpl.erb');
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_feedlist.tmpl":
-ensure => 'present',
-source => template('planet/html/rd_feedlist.html.tmpl.erb');
+ensure  => 'present',
+content => template('planet/html/rd_feedlist.html.tmpl.erb');
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_feeditem.tmpl":
 ensure => 'present',

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

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

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix support for stretch

2017-06-23 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361183 )

Change subject: Fix support for stretch
..

Fix support for stretch

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/83/361183/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8d02f76be423e9f13299f6b45a8360321bd1a15
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
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] labs/icinga2[master]: Fix support for stretch

2017-06-23 Thread Paladox (Code Review)

Paladox has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361183 )

Change subject: Fix support for stretch
..


Fix support for stretch

Change-Id: Ia8d02f76be423e9f13299f6b45a8360321bd1a15
---
M manifests/web.pp
1 file changed, 27 insertions(+), 19 deletions(-)

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



diff --git a/manifests/web.pp b/manifests/web.pp
index 2f8f828..fcef2bb 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -35,7 +35,9 @@
 }
 
 include ::apache
-include ::apache::mod::php5
+if os_version('debian == jessie') {
+include ::apache::mod::php5
+}
 include ::apache::mod::ssl
 include ::apache::mod::headers
 include ::apache::mod::cgi
@@ -49,9 +51,15 @@
   port  => 80,
 }
 
-require_package('php5')
-require_package('php5-dev')
-require_package('php5-gd')
+if os_version('debian >= stretch') {
+require_package('php7.0')
+require_package('php7.0-dev')
+require_package('php7.0-gd')
+} else {
+require_package('php5')
+require_package('php5-dev')
+require_package('php5-gd')
+}
 
 file { '/etc/icingaweb2':
 ensure => 'directory',
@@ -73,29 +81,29 @@
 owner  => 'www-data',
 group  => 'icingaweb2',
 }
-  
+
 include ::passwords::ldap::wmf_cluster
 $proxypass = $passwords::ldap::wmf_cluster::proxypass
 
 # install the Icinga Apache site
 include ::apache::mod::rewrite
 include ::apache::mod::authnz_ldap
- include ::apache::mod::rewrite
- 
- include ::apache::mod::proxy
- 
- include ::apache::mod::proxy_http
- 
- include ::apache::mod::headers
+include ::apache::mod::rewrite
+
+include ::apache::mod::proxy
+
+include ::apache::mod::proxy_http
+
+include ::apache::mod::headers
 
 
-letsencrypt::cert::integrated { 'gerrit-icinga':
- subjects   => 'gerrit-icinga.wmflabs.org',
- puppet_svc => 'apache2',
- system_svc => 'apache2',
- }
-
-$ssl_settings = ssl_ciphersuite('apache', 'mid', true)
+letsencrypt::cert::integrated { 'gerrit-icinga':
+ subjects   => 'gerrit-icinga.wmflabs.org',
+ puppet_svc => 'apache2',
+ system_svc => 'apache2',
+}
+
+$ssl_settings = ssl_ciphersuite('apache', 'mid', true)
 # letsencrypt::cert::integrated { 'icinga2':
 #subjects   => hiera('icinga2_apache_host', 'icinga.wmflabs.org'),
 #puppet_svc => 'apache2',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8d02f76be423e9f13299f6b45a8360321bd1a15
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: fix syntax error, source vs. content with templates

2017-06-23 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361184 )

Change subject: planet: fix syntax error, source vs. content with templates
..

planet: fix syntax error, source vs. content with templates

Change-Id: I1de85b5db8f53fa8925d620bfa06f8764812df2b
---
M modules/planet/manifests/theme.pp
1 file changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/modules/planet/manifests/theme.pp 
b/modules/planet/manifests/theme.pp
index a7f6705..47a1b0c 100644
--- a/modules/planet/manifests/theme.pp
+++ b/modules/planet/manifests/theme.pp
@@ -19,20 +19,20 @@
 ensure  => 'directory',
 }
 file { "/var/www/planet/${title}/style.css":
-ensure => 'present',
-source => 'puppet:///modules/planet/theme/rawdog_style.css';
+ensure  => 'present',
+content => 'puppet:///modules/planet/theme/rawdog_style.css';
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_page.tmpl":
-ensure => 'present',
-source => template('planet/html/rd_page.html.tmpl.erb');
+ensure  => 'present',
+content => template('planet/html/rd_page.html.tmpl.erb');
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_item.tmpl":
-ensure => 'present',
-source => template('planet/html/rd_item.html.tmpl.erb');
+ensure  => 'present',
+content => template('planet/html/rd_item.html.tmpl.erb');
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_feedlist.tmpl":
-ensure => 'present',
-source => template('planet/html/rd_feedlist.html.tmpl.erb');
+ensure  => 'present',
+content => template('planet/html/rd_feedlist.html.tmpl.erb');
 }
 file { "/etc/rawdog/theme/wikimedia/${title}/rd_feeditem.tmpl":
 ensure => 'present',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1de85b5db8f53fa8925d620bfa06f8764812df2b
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] operations/puppet[production]: planet: add HTML page/item/feed templates for rawdog

2017-06-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361180 )

Change subject: planet: add HTML page/item/feed templates for rawdog
..


planet: add HTML page/item/feed templates for rawdog

Add page,item,feedlist,feeditem HTML templates to be used
by rawdog. For nicer design than the defaults.

Bug: T168490
Change-Id: I91624618794f24c5078259f45350169622ebc23d
---
M modules/planet/manifests/theme.pp
M modules/planet/templates/feeds_rawdog/ar_config.erb
M modules/planet/templates/feeds_rawdog/bg_config.erb
M modules/planet/templates/feeds_rawdog/cs_config.erb
M modules/planet/templates/feeds_rawdog/de_config.erb
M modules/planet/templates/feeds_rawdog/el_config.erb
M modules/planet/templates/feeds_rawdog/en_config.erb
M modules/planet/templates/feeds_rawdog/es_config.erb
M modules/planet/templates/feeds_rawdog/fr_config.erb
M modules/planet/templates/feeds_rawdog/gmq_config.erb
M modules/planet/templates/feeds_rawdog/id_config.erb
M modules/planet/templates/feeds_rawdog/it_config.erb
M modules/planet/templates/feeds_rawdog/pl_config.erb
M modules/planet/templates/feeds_rawdog/pt_config.erb
M modules/planet/templates/feeds_rawdog/ro_config.erb
M modules/planet/templates/feeds_rawdog/ru_config.erb
M modules/planet/templates/feeds_rawdog/sq_config.erb
M modules/planet/templates/feeds_rawdog/uk_config.erb
M modules/planet/templates/feeds_rawdog/zh_config.erb
A modules/planet/templates/html/rd_feeditem.html.tmpl.erb
A modules/planet/templates/html/rd_feedlist.html.tmpl.erb
A modules/planet/templates/html/rd_item.html.tmpl.erb
A modules/planet/templates/html/rd_page.html.tmpl.erb
23 files changed, 160 insertions(+), 91 deletions(-)

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



diff --git a/modules/planet/manifests/theme.pp 
b/modules/planet/manifests/theme.pp
index 8ae1854..a7f6705 100644
--- a/modules/planet/manifests/theme.pp
+++ b/modules/planet/manifests/theme.pp
@@ -14,33 +14,47 @@
 default => 'planet.css',
 }
 
-
 if os_version('debian == stretch') {
-$theme_path = '/etc/rawdog/theme/wikimedia'
-# style sheet for rawdog
+file { "/etc/rawdog/theme/wikimedia/${title}":
+ensure  => 'directory',
+}
 file { "/var/www/planet/${title}/style.css":
 ensure => 'present',
 source => 'puppet:///modules/planet/theme/rawdog_style.css';
 }
+file { "/etc/rawdog/theme/wikimedia/${title}/rd_page.tmpl":
+ensure => 'present',
+source => template('planet/html/rd_page.html.tmpl.erb');
+}
+file { "/etc/rawdog/theme/wikimedia/${title}/rd_item.tmpl":
+ensure => 'present',
+source => template('planet/html/rd_item.html.tmpl.erb');
+}
+file { "/etc/rawdog/theme/wikimedia/${title}/rd_feedlist.tmpl":
+ensure => 'present',
+source => template('planet/html/rd_feedlist.html.tmpl.erb');
+}
+file { "/etc/rawdog/theme/wikimedia/${title}/rd_feeditem.tmpl":
+ensure => 'present',
+source => template('planet/html/rd_feeditem.html.tmpl.erb');
+}
 } else {
 $theme_path = '/usr/share/planet-venus/theme/wikimedia'
-}
-
-# theme directory
-file { "${theme_path}/${title}":
-ensure  => 'directory',
-}
-# index.html template
-file { "${theme_path}/${title}/index.html.tmpl":
-ensure  => 'present',
-content => template('planet/html/index.html.tmpl.erb');
-}
-# theme config file
-file { "${theme_path}/${title}/config.ini":
-source  => 'puppet:///modules/planet/theme/config.ini';
-}
-# style sheet for planet-venus
-file { "${theme_path}/${title}/planet.css":
-source  => "puppet:///modules/planet/theme/${css_file}";
+file { "${theme_path}/${title}":
+ensure  => 'directory',
+}
+# index.html template
+file { "${theme_path}/${title}/index.html.tmpl":
+ensure  => 'present',
+content => template('planet/html/index.html.tmpl.erb');
+}
+# theme config file
+file { "${theme_path}/${title}/config.ini":
+source  => 'puppet:///modules/planet/theme/config.ini';
+}
+# style sheet for planet-venus
+file { "${theme_path}/${title}/planet.css":
+source  => "puppet:///modules/planet/theme/${css_file}";
+}
 }
 }
diff --git a/modules/planet/templates/feeds_rawdog/ar_config.erb 
b/modules/planet/templates/feeds_rawdog/ar_config.erb
index 1776a45..13f451f 100644
--- a/modules/planet/templates/feeds_rawdog/ar_config.erb
+++ b/modules/planet/templates/feeds_rawdog/ar_config.erb
@@ -14,10 +14,10 @@
 timeformat %H:%M
 datetimeformat %Y-%m-%d %H:%M
 
-pagetemplate default
-itemtemplate default
-feedlisttemplate default
-feeditemtemplate default

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove unused resources

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361074 )

Change subject: Hygiene: remove unused resources
..


Hygiene: remove unused resources

Change-Id: Ic5566d47ef3c98c1e87e1da263edd026b5c8c882
---
D app/src/main/res/anim/slide_in_bottom.xml
D app/src/main/res/anim/slide_out_bottom.xml
M app/src/main/res/layout/include_crash_report.xml
M app/src/main/res/layout/view_card_announcement.xml
M app/src/main/res/layout/view_onboarding.xml
D app/src/main/res/menu/menu_history_context.xml
M app/src/main/res/values-af/strings.xml
M app/src/main/res/values-ar/strings.xml
M app/src/main/res/values-as/strings.xml
M app/src/main/res/values-ast/strings.xml
M app/src/main/res/values-azb/strings.xml
M app/src/main/res/values-b+be+tarask/strings.xml
M app/src/main/res/values-b+kk+Cyrl/strings.xml
M app/src/main/res/values-b+tg+Cyrl/strings.xml
M app/src/main/res/values-ba/strings.xml
M app/src/main/res/values-be/strings.xml
M app/src/main/res/values-bn/strings.xml
M app/src/main/res/values-br/strings.xml
M app/src/main/res/values-bs/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-ce/strings.xml
M app/src/main/res/values-ckb/strings.xml
M app/src/main/res/values-cnh/strings.xml
M app/src/main/res/values-cs/strings.xml
M app/src/main/res/values-cu/strings.xml
M app/src/main/res/values-cy/strings.xml
M app/src/main/res/values-da/strings.xml
M app/src/main/res/values-de/strings.xml
M app/src/main/res/values-diq/strings.xml
M app/src/main/res/values-el/strings.xml
M app/src/main/res/values-eo/strings.xml
M app/src/main/res/values-es/strings.xml
M app/src/main/res/values-eu/strings.xml
M app/src/main/res/values-fa/strings.xml
M app/src/main/res/values-fi/strings.xml
M app/src/main/res/values-fo/strings.xml
M app/src/main/res/values-fr/strings.xml
M app/src/main/res/values-gl/strings.xml
M app/src/main/res/values-gu/strings.xml
M app/src/main/res/values-hi/strings.xml
M app/src/main/res/values-hr/strings.xml
M app/src/main/res/values-hu/strings.xml
M app/src/main/res/values-hy/strings.xml
M app/src/main/res/values-ia/strings.xml
M app/src/main/res/values-in/strings.xml
M app/src/main/res/values-is/strings.xml
M app/src/main/res/values-it/strings.xml
M app/src/main/res/values-iw/strings.xml
M app/src/main/res/values-ja/strings.xml
M app/src/main/res/values-ji/strings.xml
M app/src/main/res/values-jv/strings.xml
M app/src/main/res/values-ka/strings.xml
M app/src/main/res/values-km/strings.xml
M app/src/main/res/values-kn/strings.xml
M app/src/main/res/values-ko/strings.xml
M app/src/main/res/values-ksh/strings.xml
M app/src/main/res/values-ku/strings.xml
M app/src/main/res/values-kw/strings.xml
M app/src/main/res/values-ky/strings.xml
M app/src/main/res/values-lb/strings.xml
M app/src/main/res/values-lt/strings.xml
M app/src/main/res/values-lv/strings.xml
M app/src/main/res/values-mk/strings.xml
M app/src/main/res/values-ml/strings.xml
M app/src/main/res/values-mr/strings.xml
M app/src/main/res/values-ms/strings.xml
M app/src/main/res/values-mt/strings.xml
M app/src/main/res/values-my/strings.xml
M app/src/main/res/values-nb/strings.xml
M app/src/main/res/values-ne/strings.xml
M app/src/main/res/values-nl/strings.xml
M app/src/main/res/values-oc/strings.xml
M app/src/main/res/values-olo/strings.xml
M app/src/main/res/values-om/strings.xml
M app/src/main/res/values-or/strings.xml
M app/src/main/res/values-pa/strings.xml
M app/src/main/res/values-pl/strings.xml
M app/src/main/res/values-ps/strings.xml
M app/src/main/res/values-pt-rBR/strings.xml
M app/src/main/res/values-pt/strings.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values-ro/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-sa/strings.xml
M app/src/main/res/values-sah/strings.xml
M app/src/main/res/values-sd/strings.xml
M app/src/main/res/values-shn/strings.xml
M app/src/main/res/values-si/strings.xml
M app/src/main/res/values-sk/strings.xml
M app/src/main/res/values-sq/strings.xml
M app/src/main/res/values-sr/strings.xml
M app/src/main/res/values-su/strings.xml
M app/src/main/res/values-sv/strings.xml
M app/src/main/res/values-sw/strings.xml
M app/src/main/res/values-ta/strings.xml
M app/src/main/res/values-tcy/strings.xml
M app/src/main/res/values-te/strings.xml
M app/src/main/res/values-th/strings.xml
M app/src/main/res/values-tl/strings.xml
M app/src/main/res/values-tr/strings.xml
M app/src/main/res/values-uk/strings.xml
M app/src/main/res/values-ur/strings.xml
M app/src/main/res/values-uz/strings.xml
M app/src/main/res/values-vi/strings.xml
M app/src/main/res/values-xmf/strings.xml
M app/src/main/res/values-zh-rTW/strings.xml
M app/src/main/res/values-zh/strings.xml
M app/src/main/res/values/colors.xml
M app/src/main/res/values/strings.xml
109 files changed, 1 insertion(+), 129 deletions(-)

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



diff --git

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: API: Fix capitalization of SpecialRecentChanges* classes

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361096 )

Change subject: API: Fix capitalization of SpecialRecentChanges* classes
..


API: Fix capitalization of SpecialRecentChanges* classes

And use the magic ::class instead of plain strings.

Noticed by logging added for T166759.

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

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



diff --git a/includes/api/ApiFeedRecentChanges.php 
b/includes/api/ApiFeedRecentChanges.php
index 0b04c8c..2a80dd5 100644
--- a/includes/api/ApiFeedRecentChanges.php
+++ b/includes/api/ApiFeedRecentChanges.php
@@ -63,8 +63,8 @@
 
$feedFormat = $this->params['feedformat'];
$specialClass = $this->params['target'] !== null
-   ? 'SpecialRecentchangeslinked'
-   : 'SpecialRecentchanges';
+   ? SpecialRecentChangesLinked::class
+   : SpecialRecentChanges::class;
 
$formatter = $this->getFeedObject( $feedFormat, $specialClass );
 
@@ -90,12 +90,12 @@
 * Return a ChannelFeed object.
 *
 * @param string $feedFormat Feed's format (either 'rss' or 'atom')
-* @param string $specialClass Relevant special page name (either 
'SpecialRecentchanges' or
-* 'SpecialRecentchangeslinked')
+* @param string $specialClass Relevant special page name (either 
'SpecialRecentChanges' or
+* 'SpecialRecentChangesLinked')
 * @return ChannelFeed
 */
public function getFeedObject( $feedFormat, $specialClass ) {
-   if ( $specialClass === 'SpecialRecentchangeslinked' ) {
+   if ( $specialClass === SpecialRecentChangesLinked::class ) {
$title = Title::newFromText( $this->params['target'] );
if ( !$title ) {
$this->dieWithError( [ 'apierror-invalidtitle', 
wfEscapeWikiText( $this->params['target'] ) ] );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7694c272c255b5b1f7455e55e70ecc240a4ba61c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Krinkle 
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...FundraisingEmailUnsubscribe[master]: Use short array syntax in alias file

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361182 )

Change subject: Use short array syntax in alias file
..

Use short array syntax in alias file

Change-Id: I28ccffd34e48f1856b55325c6840577aa18f9e1e
---
M FundraisingEmailUnsubscribe.alias.php
1 file changed, 4 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FundraisingEmailUnsubscribe
 refs/changes/82/361182/1

diff --git a/FundraisingEmailUnsubscribe.alias.php 
b/FundraisingEmailUnsubscribe.alias.php
index 29f329a..9bdbeb0 100644
--- a/FundraisingEmailUnsubscribe.alias.php
+++ b/FundraisingEmailUnsubscribe.alias.php
@@ -5,11 +5,10 @@
  * @file
  * @ingroup Extensions
  */
-// @codingStandardsIgnoreFile
 
-$specialPageAliases = array();
+$specialPageAliases = [];
 
 /** English (English) */
-$specialPageAliases['en'] = array(
-   'FundraiserUnsubscribe' => array( 'FundraiserUnsubscribe' ),
-);
+$specialPageAliases['en'] = [
+   'FundraiserUnsubscribe' => [ 'FundraiserUnsubscribe' ],
+];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28ccffd34e48f1856b55325c6840577aa18f9e1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FundraisingEmailUnsubscribe
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Introduce app-wide onboarding screens.

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359432 )

Change subject: Introduce app-wide onboarding screens.
..


Introduce app-wide onboarding screens.

This builds on the previous patches that generalized our onboarding
capabilities, and brings a new app-wide initial onboarding workflow:

- Three screens through which the user can flip, that talk about the Feed,
  syncing of reading lists, and anonymous event logging.
- The generic onboarding view has been expanded to support clickable links
  inside the secondary text view.
- In the "reading list" onboarding screen, the user can click a link to
  log in to their account, and if successful, it will come back to the
  onboarding and advance the page automatically.
- The large images used in the onboarding screens are PNG files, since
  it's still nearly impossible to import SVG files of nontrivial
  complexity.  However, I'm using a medium-res version of the PNG files,
  and I didn't place them in a specific dpi folder. This will allow
  devices to scale the image themselves, with a tiny performance cost, but
  a big space gain.

Bug: T166393
Change-Id: Idd3b646d6a4be454935f95a7ea0eeae56264822c
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/analytics/LoginFunnel.java
M app/src/main/java/org/wikipedia/main/MainActivity.java
A app/src/main/java/org/wikipedia/onboarding/InitialOnboardingActivity.java
A app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
M app/src/main/java/org/wikipedia/onboarding/OnboardingPageView.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
A app/src/main/res/drawable/illustration_onboarding_analytics.png
A app/src/main/res/drawable/illustration_onboarding_explore.png
A app/src/main/res/drawable/illustration_onboarding_sync_lists.png
A app/src/main/res/layout/inflate_initial_onboarding_page_one.xml
A app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
A app/src/main/res/layout/inflate_initial_onboarding_page_two.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/xml/developer_preferences.xml
17 files changed, 354 insertions(+), 1 deletion(-)

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



diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 252607e..73278b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -180,6 +180,10 @@
 
 
+
+
 
 implements MainFragment.Callback {
@@ -17,6 +22,17 @@
 return new Intent(context, MainActivity.class);
 }
 
+@Override
+public void onCreate(@Nullable Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+
+//TODO: remove pre-beta feature flag when ready.
+if (ReleaseUtil.isPreBetaRelease()
+&& Prefs.isInitialOnboardingEnabled() && savedInstanceState == 
null) {
+startActivity(InitialOnboardingActivity.newIntent(this));
+}
+}
+
 @Override protected MainFragment createFragment() {
 return MainFragment.newInstance();
 }
diff --git 
a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingActivity.java 
b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingActivity.java
new file mode 100644
index 000..fe58d5c
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingActivity.java
@@ -0,0 +1,42 @@
+package org.wikipedia.onboarding;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+import org.wikipedia.R;
+import org.wikipedia.activity.SingleFragmentActivity;
+import org.wikipedia.settings.Prefs;
+
+public class InitialOnboardingActivity
+extends SingleFragmentActivity
+implements InitialOnboardingFragment.Callback {
+
+@NonNull public static Intent newIntent(@NonNull Context context) {
+return new Intent(context, InitialOnboardingActivity.class);
+}
+
+@Override public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+setStatusBarColor(R.color.dark_blue);
+}
+
+@Override public void onComplete() {
+setResult(RESULT_OK);
+Prefs.setInitialOnboardingEnabled(false);
+finish();
+}
+
+@Override
+public void onBackPressed() {
+if (getFragment().onBackPressed()) {
+return;
+}
+finish();
+}
+
+@Override protected InitialOnboardingFragment createFragment() {
+return InitialOnboardingFragment.newInstance();
+}
+}
diff --git 
a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java 
b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
new file

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update design and onboarding in Login and CreateAccount scre...

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360643 )

Change subject: Update design and onboarding in Login and CreateAccount screens.
..


Update design and onboarding in Login and CreateAccount screens.

- Butter up LoginActivity and CreateAccountActivity.
- Add onboarding bullet points.
- Add "forgot password" link when logging in (goes to mobile web).

Bug: T162720
Bug: T159450
Change-Id: I547d9abce5c75b1226de613736373295da3bc14d
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
M app/src/main/res/layout/activity_create_account.xml
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/layout/group_captcha.xml
A app/src/main/res/layout/inflate_create_account_onboarding.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
10 files changed, 390 insertions(+), 218 deletions(-)

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



diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 73278b6..4e5d28d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -134,12 +134,12 @@
 />
 
 
 
 http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
+xmlns:tools="http://schemas.android.com/tools;
 android:layout_width="match_parent"
 android:layout_height="match_parent"
 android:background="?attr/window_background_color">
@@ -17,82 +18,83 @@
 android:id="@+id/create_account_primary_container"
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
-android:orientation="vertical"
-android:padding="16dp">
+android:orientation="vertical">
 
-
+
+
-
+
+
-
+android:hint="@string/create_account_username_hint">
+
+
 
-
-
-
-
-
-
-
+android:layout_marginTop="8dp"
+app:passwordToggleEnabled="true"
+android:hint="@string/login_password_hint" />
 
-
+
 
-
+
+
+
 
-
+
+
+
+
+
 
 
-
+
 
 
 
diff --git a/app/src/main/res/layout/activity_login.xml 
b/app/src/main/res/layout/activity_login.xml
index 364895a..d5a49a4 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,87 +1,10 @@
 
 http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
+xmlns:tools="http://schemas.android.com/tools;
 android:layout_width="match_parent"
 android:layout_height="match_parent"
 android:background="?attr/window_background_color">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
diff --git a/app/src/main/res/layout/group_captcha.xml 
b/app/src/main/res/layout/group_captcha.xml
index 459ebf8..e766a7d 100644
--- a/app/src/main/res/layout/group_captcha.xml
+++ b/app/src/main/res/layout/group_captcha.xml
@@ -68,8 +68,9 @@
 
 
+http://schemas.android.com/apk/res/android;
+xmlns:app="http://schemas.android.com/apk/res-auto;
+android:layout_width="match_parent"
+android:layout_height="wrap_content"
+android:paddingTop="8dp"
+android:background="@color/base80"
+android:gravity="center_horizontal"
+android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values-qq/strings.xml

[MediaWiki-commits] [Gerrit] mediawiki...WebPlatformAuth[master]: Remove empty vendor folder

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361181 )

Change subject: Remove empty vendor folder
..

Remove empty vendor folder

Change-Id: I878ded0fe9a8a107b25c4ec3141aaf04f516a112
---
M .gitignore
D vendor/.gitkeep
2 files changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/.gitignore b/.gitignore
index 95894af..55602f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 node_modules/
+vendor/
+/composer.lock
 
 .svn
 *~
 *.kate-swp
 .*.swp
-vendor/*
diff --git a/vendor/.gitkeep b/vendor/.gitkeep
deleted file mode 100644
index e69de29..000
--- a/vendor/.gitkeep
+++ /dev/null

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I878ded0fe9a8a107b25c4ec3141aaf04f516a112
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WebPlatformAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: add HTML page/item/feed templates for rawdog

2017-06-23 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361180 )

Change subject: planet: add HTML page/item/feed templates for rawdog
..

planet: add HTML page/item/feed templates for rawdog

Change-Id: I91624618794f24c5078259f45350169622ebc23d
---
M modules/planet/manifests/theme.pp
M modules/planet/templates/feeds_rawdog/ar_config.erb
M modules/planet/templates/feeds_rawdog/bg_config.erb
M modules/planet/templates/feeds_rawdog/cs_config.erb
M modules/planet/templates/feeds_rawdog/de_config.erb
M modules/planet/templates/feeds_rawdog/el_config.erb
M modules/planet/templates/feeds_rawdog/en_config.erb
M modules/planet/templates/feeds_rawdog/es_config.erb
M modules/planet/templates/feeds_rawdog/fr_config.erb
M modules/planet/templates/feeds_rawdog/gmq_config.erb
M modules/planet/templates/feeds_rawdog/id_config.erb
M modules/planet/templates/feeds_rawdog/it_config.erb
M modules/planet/templates/feeds_rawdog/pl_config.erb
M modules/planet/templates/feeds_rawdog/pt_config.erb
M modules/planet/templates/feeds_rawdog/ro_config.erb
M modules/planet/templates/feeds_rawdog/ru_config.erb
M modules/planet/templates/feeds_rawdog/sq_config.erb
M modules/planet/templates/feeds_rawdog/uk_config.erb
M modules/planet/templates/feeds_rawdog/zh_config.erb
A modules/planet/templates/html/rd_feeditem.html.tmpl.erb
A modules/planet/templates/html/rd_feedlist.html.tmpl.erb
A modules/planet/templates/html/rd_item.html.tmpl.erb
A modules/planet/templates/html/rd_page.html.tmpl.erb
23 files changed, 158 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/361180/1

diff --git a/modules/planet/manifests/theme.pp 
b/modules/planet/manifests/theme.pp
index 8ae1854..d2066d0 100644
--- a/modules/planet/manifests/theme.pp
+++ b/modules/planet/manifests/theme.pp
@@ -14,6 +14,10 @@
 default => 'planet.css',
 }
 
+# theme directory
+file { "${theme_path}/${title}":
+ensure  => 'directory',
+}
 
 if os_version('debian == stretch') {
 $theme_path = '/etc/rawdog/theme/wikimedia'
@@ -22,25 +26,36 @@
 ensure => 'present',
 source => 'puppet:///modules/planet/theme/rawdog_style.css';
 }
+file { "/etc/rawdog/theme/wikimedia/${title}/rd_page.tmpl":
+ensure => 'present',
+source => 'template('planet/html/rd_page.html.tmpl.erb');
+}
+file { "/etc/rawdog/theme/wikimedia/${title}/rd_item.tmpl":
+ensure => 'present',
+source => 'template('planet/html/rd_item.html.tmpl.erb');
+}
+file { "/etc/rawdog/theme/wikimedia/${title}/rd_feedlist.tmpl":
+ensure => 'present',
+source => 'template('planet/html/rd_feedlist.html.tmpl.erb');
+}
+file { "/etc/rawdog/theme/wikimedia/${title}/rd_feeditem.tmpl":
+ensure => 'present',
+source => 'template('planet/html/rd_feeditem.html.tmpl.erb');
+}
 } else {
 $theme_path = '/usr/share/planet-venus/theme/wikimedia'
-}
-
-# theme directory
-file { "${theme_path}/${title}":
-ensure  => 'directory',
-}
-# index.html template
-file { "${theme_path}/${title}/index.html.tmpl":
-ensure  => 'present',
-content => template('planet/html/index.html.tmpl.erb');
-}
-# theme config file
-file { "${theme_path}/${title}/config.ini":
-source  => 'puppet:///modules/planet/theme/config.ini';
-}
-# style sheet for planet-venus
-file { "${theme_path}/${title}/planet.css":
-source  => "puppet:///modules/planet/theme/${css_file}";
+# index.html template
+file { "${theme_path}/${title}/index.html.tmpl":
+ensure  => 'present',
+content => template('planet/html/index.html.tmpl.erb');
+}
+# theme config file
+file { "${theme_path}/${title}/config.ini":
+source  => 'puppet:///modules/planet/theme/config.ini';
+}
+# style sheet for planet-venus
+file { "${theme_path}/${title}/planet.css":
+source  => "puppet:///modules/planet/theme/${css_file}";
+}
 }
 }
diff --git a/modules/planet/templates/feeds_rawdog/ar_config.erb 
b/modules/planet/templates/feeds_rawdog/ar_config.erb
index 1776a45..13f451f 100644
--- a/modules/planet/templates/feeds_rawdog/ar_config.erb
+++ b/modules/planet/templates/feeds_rawdog/ar_config.erb
@@ -14,10 +14,10 @@
 timeformat %H:%M
 datetimeformat %Y-%m-%d %H:%M
 
-pagetemplate default
-itemtemplate default
-feedlisttemplate default
-feeditemtemplate default
+pagetemplate /etc/rawdog/theme/wikimedia/ar/rd_page.tmpl
+itemtemplate /etc/rawdog/theme/wikimedia/ar/rd_item.tmpl
+feedlisttemplate /etc/rawdog/theme/wikimedia/ar/rd_feedlist.tmpl
+feeditemtemplate /etc/rawdog/theme/wikimedia/ar/rd_feeditem.tmpl
 
 outputfile

[MediaWiki-commits] [Gerrit] mediawiki...Html2Wiki[master]: Remove composer.lock

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361179 )

Change subject: Remove composer.lock
..

Remove composer.lock

Change-Id: I18728fd0e5ca30cbe8d5047e6fc20127707d00d1
---
D composer.lock
1 file changed, 0 insertions(+), 194 deletions(-)


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

diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 7b4ee4c..000
--- a/composer.lock
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-"_readme": [
-"This file locks the dependencies of your project to a known state",
-"Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
-"This file is @generated automatically"
-],
-"content-hash": "0d3468f516943c19bd229bc991c1fb54",
-"packages": [
-{
-"name": "querypath/querypath",
-"version": "3.0.3",
-"source": {
-"type": "git",
-"url": "https://github.com/technosophos/querypath.git;,
-"reference": "13224745f7348e099d2dde9e555bc8972c21a810"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/technosophos/querypath/zipball/13224745f7348e099d2dde9e555bc8972c21a810;,
-"reference": "13224745f7348e099d2dde9e555bc8972c21a810",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.0"
-},
-"type": "library",
-"autoload": {
-"psr-0": {
-"QueryPath": "src/"
-},
-"files": [
-"src/qp_functions.php"
-]
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"description": "HTML/XML querying (CSS 4 or XPath) and processing 
(like jQuery)",
-"homepage": "https://github.com/technosophos/querypath;,
-"keywords": [
-"css",
-"html",
-"jquery",
-"xml",
-"xslt"
-],
-"time": "2014-09-23T19:04:19+00:00"
-}
-],
-"packages-dev": [
-{
-"name": "jakub-onderka/php-console-color",
-"version": "0.1",
-"source": {
-"type": "git",
-"url": "https://github.com/JakubOnderka/PHP-Console-Color.git;,
-"reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1;,
-"reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.2"
-},
-"require-dev": {
-"jakub-onderka/php-code-style": "1.0",
-"jakub-onderka/php-parallel-lint": "0.*",
-"jakub-onderka/php-var-dump-check": "0.*",
-"phpunit/phpunit": "3.7.*",
-"squizlabs/php_codesniffer": "1.*"
-},
-"type": "library",
-"autoload": {
-"psr-0": {
-"JakubOnderka\\PhpConsoleColor": "src/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"BSD-2-Clause"
-],
-"authors": [
-{
-"name": "Jakub Onderka",
-"email": "jakub.onde...@gmail.com",
-"homepage": "http://www.acci.cz;
-}
-],
-"time": "2014-04-08T15:00:19+00:00"
-},
-{
-"name": "jakub-onderka/php-console-highlighter",
-"version": "v0.3.2",
-"source": {
-"type": "git",
-"url": 
"https://github.com/JakubOnderka/PHP-Console-Highlighter.git;,
-"reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5;,
-"reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5",
-"shasum": ""
-},
-"require": {
-"jakub-onderka/php-console-color": "~0.1",
-"php": ">=5.3.0"
-},
-"require-dev": {
-"jakub-onderka/php-code-style": "~1.0",
-

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Generalize onboarding activity and views.

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359431 )

Change subject: Generalize onboarding activity and views.
..


Generalize onboarding activity and views.

This generalizes the DescriptionEditTutorial activity that was being used
for the specific purpose of description edit onboarding, so that we can
reuse it for the upcoming "main" app onboarding, and possibly for future
onboarding workflows. This does all of the following:

- Add a landscape version of the onboarding layout, and never force the
  screen orientation into Portrait.
- Add a "Skip" button at the top, for the user to skip the entire
  workflow, which should always be an option.
- Rejigger the view hierarchy a bit, to accommodate longer onboarding
  text and additional components.
- Add an optional "Switch" component, to be used as a general selector for
  an onboarding step, e.g. "Send usage data".

Change-Id: I8c60c0067d13f3769c5070eaf5c4bb6e5b6b23de
---
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_TWO.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_ONE.png
M 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_TWO.png
M 
app/src/androidTest/java/org/wikipedia/descriptions/DescriptionEditTutorialPageViewTest.java
M app/src/main/AndroidManifest.xml
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialActivity.java
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialFragment.java
D 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialPageView.java
M 
app/src/main/java/org/wikipedia/descriptions/DescriptionEditTutorialPagerAdapter.java
A app/src/main/java/org/wikipedia/onboarding/OnboardingPageView.java
R app/src/main/res/drawable/onboarding_gradient_background.xml
A app/src/main/res/layout-land/view_onboarding_page.xml
R app/src/main/res/layout/fragment_single_pager.xml
M app/src/main/res/layout/inflate_description_edit_tutorial_page_one.xml
M app/src/main/res/layout/inflate_description_edit_tutorial_page_two.xml
D app/src/main/res/layout/view_description_edit_tutorial_page.xml
A app/src/main/res/layout/view_onboarding_page.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/colors.xml
M app/src/main/res/values/strings.xml
38 files changed, 467 insertions(+), 225

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add kbpwiki - Kabiye WP

2017-06-23 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361142 )

Change subject: Add kbpwiki - Kabiye WP
..


Add kbpwiki - Kabiye WP

Bug: T160868
Change-Id: I78821f69c1f48cfb7de8ba8eeb37c26f413492e9
---
M scap/vars.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved
  Ppchelko: Looks good to me, but someone else must approve



diff --git a/scap/vars.yaml b/scap/vars.yaml
index 9ed0f5d..4b9ce11 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -180,6 +180,7 @@
 kaa.wikipedia.org: default_project
 kab.wikipedia.org: default_project
 kbd.wikipedia.org: default_project
+kbp.wikipedia.org: default_project
 kg.wikipedia.org: default_project
 ki.wikipedia.org: default_project
 kk.wikipedia.org: default_project

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78821f69c1f48cfb7de8ba8eeb37c26f413492e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add kbpwiki - Kabiye WP

2017-06-23 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361142 )

Change subject: Add kbpwiki - Kabiye WP
..

Add kbpwiki - Kabiye WP

Bug: T160868
Change-Id: I78821f69c1f48cfb7de8ba8eeb37c26f413492e9
---
M scap/vars.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/42/361142/1

diff --git a/scap/vars.yaml b/scap/vars.yaml
index 9ed0f5d..4b9ce11 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -180,6 +180,7 @@
 kaa.wikipedia.org: default_project
 kab.wikipedia.org: default_project
 kbd.wikipedia.org: default_project
+kbp.wikipedia.org: default_project
 kg.wikipedia.org: default_project
 ki.wikipedia.org: default_project
 kk.wikipedia.org: default_project

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78821f69c1f48cfb7de8ba8eeb37c26f413492e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: Add PNG and MathPlayer fallback for Wikidata user

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/355798 )

Change subject: Add PNG and MathPlayer fallback for Wikidata user
..


Add PNG and MathPlayer fallback for Wikidata user

In MathML rendering mode custom javascript is executed
to check if the brower has MathPlayer installed. In addition
it's checked if the browser supports SVG rendering. This
functionality was broken in Wikidata, since the scripts were
loaded as styles and not as JS modules.

Change-Id: I5fd8eafc89e01c6ec10cf0f3b71e885ec3a4399c
---
M MathWikidataHook.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/MathWikidataHook.php b/MathWikidataHook.php
index cc14635..5f79bdc 100644
--- a/MathWikidataHook.php
+++ b/MathWikidataHook.php
@@ -42,6 +42,7 @@
'formatter-factory-callback' => function( $format, 
FormatterOptions $options ) {
global $wgOut;
$wgOut->addModuleStyles( [ 'ext.math.styles' ] 
);
+   $wgOut->addModules( [ 'ext.math.scripts' ] );
return new MathFormatter( $format );
},
'rdf-builder-factory-callback' => function (
@@ -71,6 +72,7 @@
'formatter-factory-callback' => function( $format, 
FormatterOptions $options ) {
global $wgOut;
$wgOut->addModuleStyles( [ 'ext.math.styles' ] 
);
+   $wgOut->addModules( [ 'ext.math.scripts' ] );
return new MathFormatter( $format );
},
];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5fd8eafc89e01c6ec10cf0f3b71e885ec3a4399c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Use correct notation for UTF-8

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361128 )

Change subject: Use correct notation for UTF-8
..

Use correct notation for UTF-8

Clean up phpcs.xml

Change-Id: I17e688de49c97311bfcfbb673fe753350969bcf8
---
M README.md
M phpcs.xml
2 files changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/28/361128/1

diff --git a/README.md b/README.md
index c61d96a..c2d477b 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,10 @@
 ```
 
 
-   
+   
.

-   
+   
vendor
 
 ```
diff --git a/phpcs.xml b/phpcs.xml
index 10ada90..2d92d4a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,9 @@
-
+
 
-   
+   
.

-   
+   
vendor
+   */Tests/files/*
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17e688de49c97311bfcfbb673fe753350969bcf8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Fix capitalization of Xml class

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361098 )

Change subject: Fix capitalization of Xml class
..


Fix capitalization of Xml class

Change-Id: I43e50f892cab8719d792b8d87f964eb93c86dda8
---
M frontend/specialpages/actions/Stabilization_body.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/frontend/specialpages/actions/Stabilization_body.php 
b/frontend/specialpages/actions/Stabilization_body.php
index 195b12b..a8c2f06 100644
--- a/frontend/specialpages/actions/Stabilization_body.php
+++ b/frontend/specialpages/actions/Stabilization_body.php
@@ -215,7 +215,7 @@
 
$s .= ' 
' .
-   xml::label( $this->msg( 
'stabilization-comment' )->text(),
+   Xml::label( $this->msg( 
'stabilization-comment' )->text(),
'wpReasonSelection' ) .
'
' .

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43e50f892cab8719d792b8d87f964eb93c86dda8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeReview[master]: Fix capitalization of Xml class

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361097 )

Change subject: Fix capitalization of Xml class
..


Fix capitalization of Xml class

Change-Id: I7bd50ac0b2e133c8c1e81fb09a176a1278f031d5
---
M ui/CodeRevisionView.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/ui/CodeRevisionView.php b/ui/CodeRevisionView.php
index 7ae6da3..f9d245c 100644
--- a/ui/CodeRevisionView.php
+++ b/ui/CodeRevisionView.php
@@ -421,7 +421,7 @@
if ( $wgUser->isAllowed( 'codereview-set-status' ) ) {
return Xml::openElement( 'select', [ 'name' => 
'wpStatus' ] ) .
self::buildStatusList( $this->mStatus, $this ) .
-   xml::closeElement( 'select' );
+   Xml::closeElement( 'select' );
} else {
return htmlspecialchars( $this->statusDesc( 
$this->mRev->getStatus() ) );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bd50ac0b2e133c8c1e81fb09a176a1278f031d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeReview
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Fix capitalization of Xml class

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361099 )

Change subject: Fix capitalization of Xml class
..


Fix capitalization of Xml class

Change-Id: I5c781be9843d1fdbb19a9e18513749f2e09a93c7
---
M TimedTextPage.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/TimedTextPage.php b/TimedTextPage.php
index d7a8a73..82642d2 100644
--- a/TimedTextPage.php
+++ b/TimedTextPage.php
@@ -99,12 +99,12 @@
 
// Get the video with with a max of 600 pixel page
$out->addHTML(
-   xml::tags( 'table', [ 'style'=> 'border:none' ],
-   xml::tags( 'tr', null,
-   xml::tags( 'td', [ 'valign' => 'top',  
'width' => self::$videoWidth ],
+   Xml::tags( 'table', [ 'style'=> 'border:none' ],
+   Xml::tags( 'tr', null,
+   Xml::tags( 'td', [ 'valign' => 'top',  
'width' => self::$videoWidth ],
$this->getVideoHTML( 
$videoTitle )
) .
-   xml::tags( 'td', [ 'valign' => 'top' ], 
$this->getTimedTextHTML( $languageName ) )
+   Xml::tags( 'td', [ 'valign' => 'top' ], 
$this->getTimedTextHTML( $languageName ) )
)
)
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c781be9843d1fdbb19a9e18513749f2e09a93c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add scap configuration

2017-06-23 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/357640 )

Change subject: Add scap configuration
..


Add scap configuration

Bug: T148128
Change-Id: I9bb4e7cf0460aabe1ce111d31d76f2314b2282aa
---
A scap/betacluster
A scap/checks.yaml
A scap/config-files.yaml
A scap/recommendation-api
A scap/recommendation-api-canary
A scap/scap.cfg
A scap/templates/config.yaml.j2
A scap/vars.yaml
8 files changed, 199 insertions(+), 0 deletions(-)

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



diff --git a/scap/betacluster b/scap/betacluster
new file mode 100644
index 000..f62e6b6
--- /dev/null
+++ b/scap/betacluster
@@ -0,0 +1,3 @@
+deployment-sca01.deployment-prep.eqiad.wmflabs
+deployment-sca02.deployment-prep.eqiad.wmflabs
+
diff --git a/scap/checks.yaml b/scap/checks.yaml
new file mode 100644
index 000..beb30f0
--- /dev/null
+++ b/scap/checks.yaml
@@ -0,0 +1,14 @@
+checks:
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_recomendation_api
+  depool:
+type: command
+stage: promote
+command: depool-recomendation_api
+  repool:
+type: command
+stage: restart_service
+command: pool-recomendation_api
+
diff --git a/scap/config-files.yaml b/scap/config-files.yaml
new file mode 100644
index 000..a1c742c
--- /dev/null
+++ b/scap/config-files.yaml
@@ -0,0 +1,6 @@
+---
+/etc/recommendation_api/config.yaml:
+  template: config.yaml.j2
+  erb_syntax: True
+  remote_vars: /etc/recommendation_api/config-vars.yaml
+
diff --git a/scap/recommendation-api b/scap/recommendation-api
new file mode 100644
index 000..fb6ab10
--- /dev/null
+++ b/scap/recommendation-api
@@ -0,0 +1,10 @@
+scb1001.eqiad.wmnet
+scb1002.eqiad.wmnet
+scb1003.eqiad.wmnet
+scb1004.eqiad.wmnet
+scb2002.codfw.wmnet
+scb2003.codfw.wmnet
+scb2004.codfw.wmnet
+scb2005.codfw.wmnet
+scb2006.codfw.wmnet
+
diff --git a/scap/recommendation-api-canary b/scap/recommendation-api-canary
new file mode 100644
index 000..8d1e9a8
--- /dev/null
+++ b/scap/recommendation-api-canary
@@ -0,0 +1,2 @@
+scb2001.codfw.wmnet
+
diff --git a/scap/scap.cfg b/scap/scap.cfg
new file mode 100644
index 000..21a994a
--- /dev/null
+++ b/scap/scap.cfg
@@ -0,0 +1,19 @@
+[global]
+git_repo: recommendation-api/deploy
+git_deploy_dir: /srv/deployment
+git_repo_user: deploy-service
+ssh_user: deploy-service
+server_groups: canary, default
+canary_dsh_targets: recommendation-api-canary
+dsh_targets: recommendation-api
+group_size: 2
+git_submodules: True
+service_name: recommendation_api
+service_port: 9632
+lock_file: /tmp/scap.recommendation-api.lock
+config_deploy: True
+
+[deployment-prep.eqiad.wmflabs]
+environment: beta
+server_groups: default
+dsh_targets: betacluster
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
new file mode 100644
index 000..3dfcfc4
--- /dev/null
+++ b/scap/templates/config.yaml.j2
@@ -0,0 +1,124 @@
+# Number of worker processes to spawn.
+# Set to 0 to run everything in a single process without clustering.
+# Use 'ncpu' to run as many workers as there are CPU units
+num_workers: <%= num_workers %>
+
+# Log error messages and gracefully restart a worker if v8 reports that it
+# uses more heap (note: not RSS) than this many mb.
+worker_heap_limit_mb: <%= worker_heap_limit_mb %>
+
+# The maximum interval in ms that can pass between two beat messages
+# sent by each worker to the master before it is killed
+worker_heartbeat_timeout: <%= worker_heartbeat_timeout %>
+
+# Logger info
+logging:
+  level: warn
+  name: <%= log_name %>
+  streams:
+- host: <%= logstash_host %>
+  port: <%= logstash_port %>
+  type: gelf
+- level: info
+  path: <%= log_file %>
+  type: file
+
+# Statsd metrics reporter
+metrics:
+  name: <%= metrics_name %>
+  host: <%= metrics_host %>
+  port: <%= metrics_port %>
+  type: statsd
+
+services:
+  - name: <%= name %>
+# a relative path or the name of an npm package, if different from name
+module: ./src/app.js
+# per-service config
+conf:
+  port: <%= port %>
+  # interface: localhost # uncomment to only listen on localhost
+  # more per-service config settings
+  # the location of the spec, defaults to spec.yaml if not specified
+  # spec: ./spec.template.yaml
+  # allow cross-domain requests to the API (default '*')
+  cors: '*'
+  # to disable use:
+  # cors: false
+  # to restrict to a particular domain, use:
+  # cors: restricted.domain.org
+  # content for the CSP headers
+  # csp: false  # uncomment this line to disable sending them
+  # URL of the outbound proxy to use (complete with protocol)
+  proxy: <%= proxy if proxy else '' %>
+  # the list of domains for which not to use the proxy defined above
+  # no_proxy_list:
+  #   - domain1.com
+  #   - domain2.org
+  # the list of incoming

[MediaWiki-commits] [Gerrit] mediawiki...VectorV2[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361113 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ie6489c84c576fe4f0162f5c39e0100dc9c83f90f
---
M .gitignore
M VectorV2Template.php
M composer.json
M phpcs.xml
4 files changed, 26 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/VectorV2 
refs/changes/13/361113/1

diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
+/node_modules
 
 # Composer
 /vendor
diff --git a/VectorV2Template.php b/VectorV2Template.php
index 9b203aa..5aeec5f 100644
--- a/VectorV2Template.php
+++ b/VectorV2Template.php
@@ -114,7 +114,7 @@
if ( $this->data['title'] != '' ) {
?>
html( 'title' )
+   $this->html( 'title' )
?>

@@ -322,7 +322,8 @@

renderAfterPortlet( $name );
@@ -520,17 +521,18 @@
makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden( 
'title', $this->get( 'searchtitle' ) );
-   // We construct two 
buttons (for 'go' and 'fulltext' search modes),
-   // but only one will be 
visible and actionable at a time (they are
-   // overlaid on top of 
each other in CSS).
-   // * Browsers will use 
the 'fulltext' one by default (as it's the
-   //   first in 
tree-order), which is desirable when they are unable
-   //   to show search 
suggestions (either due to being broken or
-   //   having JavaScript 
turned off).
-   // * The 
mediawiki.searchSuggest module, after doing tests for the
-   //   broken browsers, 
removes the 'fulltext' button and handles
-   //   'fulltext' search 
itself; this will reveal the 'go' button and
-   //   cause it to be 
used.
+   /* We construct two 
buttons (for 'go' and 'fulltext' search modes),
+* but only one will be 
visible and actionable at a time (they are
+* overlaid on top of 
each other in CSS).
+* * Browsers will use 
the 'fulltext' one by default (as it's the
+*   first in 
tree-order), which is desirable when they are unable
+*   to show search 
suggestions (either due to being broken or
+*   having JavaScript 
turned off).
+* * The 
mediawiki.searchSuggest module, after doing tests for the
+*   broken browsers, 
removes the 'fulltext' button and handles
+*   'fulltext' search 
itself; this will reveal the 'go' button and
+*   cause it to be 
used.
+*/
echo 
$this->makeSearchButton(
'fulltext',
[ 'id' => 
'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' ]
diff --git a/composer.json b/composer.json
index fe15d13..7e889a4 100644
--- a/composer.json
+++ b/composer.json
@@ -34,14 +34,14 @@
"installer-name": "VectorV2"
},
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9.*",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/36 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ie27658bb7e8bb8bfc26b52f33fed796f8bfa2fda
---
M .gitignore
M Timeless.skin.php
M TimelessTemplate.php
M composer.json
M phpcs.xml
5 files changed, 20 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/11/36/1

diff --git a/.gitignore b/.gitignore
index 47e36d5..db8a779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/node_modules/
-/vendor/
+/node_modules
+/vendor
 /composer.lock
diff --git a/Timeless.skin.php b/Timeless.skin.php
index d5e4618..f76e670 100644
--- a/Timeless.skin.php
+++ b/Timeless.skin.php
@@ -9,7 +9,7 @@
$template = 'TimelessTemplate', $useHeadElement = true;
 
/**
-* @param $out OutputPage
+* @param OutputPage $out
 */
public function initPage( OutputPage $out ) {
parent::initPage( $out );
@@ -33,7 +33,7 @@
/**
 * Add CSS via ResourceLoader
 *
-* @param $out OutputPage
+* @param OutputPage $out
 */
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
diff --git a/TimelessTemplate.php b/TimelessTemplate.php
index 6a45282..f22e5d5 100644
--- a/TimelessTemplate.php
+++ b/TimelessTemplate.php
@@ -338,9 +338,12 @@
$sidebar = $this->getSidebar();
$html = '';
 
-   $sidebar['SEARCH'] = false; // Already hardcoded into header
-   $sidebar['TOOLBOX'] = false; // Parsed as part of pageTools
-   $sidebar['LANGUAGES'] = false; // Forcibly removed to separate 
chunk
+   // Already hardcoded into header
+   $sidebar['SEARCH'] = false;
+   // Parsed as part of pageTools
+   $sidebar['TOOLBOX'] = false;
+   // Forcibly removed to separate chunk
+   $sidebar['LANGUAGES'] = false;
 
foreach ( $sidebar as $name => $content ) {
if ( $content === false ) {
@@ -647,7 +650,8 @@
] ) ) {
$currentSet = 'page-secondary';
} else {
-   $currentSet = 'page-primary'; // Catch random 
extension ones?
+   // Catch random extension ones?
+   $currentSet = 'page-primary';
}
$sortedPileOfTools[$currentSet][$navKey] = $navBlock;
}
@@ -822,7 +826,6 @@
$variants = '';
}
if ( $this->data['language_urls'] !== false ) {
-
$html .= $this->getSidebarChunk(
'other-languages',
'timeless-languages',
diff --git a/composer.json b/composer.json
index f5a983a..b0d45ec 100644
--- a/composer.json
+++ b/composer.json
@@ -31,14 +31,14 @@
"installer-name": "Timeless"
},
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9.*",
-   "mediawiki/mediawiki-codesniffer": "0.7.2",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"fix": "phpcbf",
"test": [
-   "parallel-lint . --exclude vendor",
+   "parallel-lint . --exclude node_modules --exclude 
vendor",
"phpcs -p -s"
]
}
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..eecaea2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,11 @@
 
 
-   
+   
+   
+   
.

-   
+   
vendor
+   node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie27658bb7e8bb8bfc26b52f33fed796f8bfa2fda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361112 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I5d9643f9a0dc33c05b7404a88209d244b4badae3
---
M VectorTemplate.php
M composer.json
M phpcs.xml
3 files changed, 26 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/12/361112/1

diff --git a/VectorTemplate.php b/VectorTemplate.php
index 932f636..234e015 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -322,7 +322,8 @@

renderAfterPortlet( $name );
@@ -499,18 +500,16 @@
msg( 'personaltools' ) ?>
>
getSkin()->getUser()->isLoggedIn() &&
-   
User::groupHasPermission( '*', 'edit' ) ){
-
+   
User::groupHasPermission( '*', 'edit' )
+   ) {
$notLoggedIn =

Html::rawElement( 'li',

[ 'id' => 'pt-anonuserpage' ],

$this->getMsg( 'notloggedin' )->escaped()
);
-
}
 
$personalTools = 
$this->getPersonalTools();
@@ -551,17 +550,18 @@
makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden( 
'title', $this->get( 'searchtitle' ) );
-   // We construct two 
buttons (for 'go' and 'fulltext' search modes),
-   // but only one will be 
visible and actionable at a time (they are
-   // overlaid on top of 
each other in CSS).
-   // * Browsers will use 
the 'fulltext' one by default (as it's the
-   //   first in 
tree-order), which is desirable when they are unable
-   //   to show search 
suggestions (either due to being broken or
-   //   having JavaScript 
turned off).
-   // * The 
mediawiki.searchSuggest module, after doing tests for the
-   //   broken browsers, 
removes the 'fulltext' button and handles
-   //   'fulltext' search 
itself; this will reveal the 'go' button and
-   //   cause it to be 
used.
+   /* We construct two 
buttons (for 'go' and 'fulltext' search modes),
+* but only one will be 
visible and actionable at a time (they are
+* overlaid on top of 
each other in CSS).
+* * Browsers will use 
the 'fulltext' one by default (as it's the
+*   first in 
tree-order), which is desirable when they are unable
+*   to show search 
suggestions (either due to being broken or
+*   having JavaScript 
turned off).
+* * The 
mediawiki.searchSuggest module, after doing tests for the
+*   broken browsers, 
removes the 'fulltext' button and handles
+*   'fulltext' search 
itself; this will reveal the 'go' button and
+*   cause it to be 
used.
+*/
echo 
$this->makeSearchButton(
'fulltext',

[MediaWiki-commits] [Gerrit] mediawiki...Nostalgia[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361110 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I8cd65a3255123e33b993099717a6473b469a24fa
---
M .gitignore
M Nostalgia_body.php
M composer.json
M phpcs.xml
4 files changed, 15 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nostalgia 
refs/changes/10/361110/1

diff --git a/.gitignore b/.gitignore
index c2658d7..db8a779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-node_modules/
+/node_modules
+/vendor
+/composer.lock
diff --git a/Nostalgia_body.php b/Nostalgia_body.php
index 2d0857c..7911f0c 100644
--- a/Nostalgia_body.php
+++ b/Nostalgia_body.php
@@ -31,7 +31,7 @@
 
/**
 * Add skin specific stylesheets
-* @param $out OutputPage
+* @param OutputPage $out
 */
function setupSkinUserCss( OutputPage $out ) {
$out->addModuleStyles( 'mediawiki.legacy.shared' );
@@ -386,14 +386,16 @@
$title = $skin->getTitle();
 
$s[] = $this->printableLink();
-   $disclaimer = $skin->disclaimerLink(); # may be empty
+   $disclaimer = $skin->disclaimerLink();
 
+   # may be empty
if ( $disclaimer ) {
$s[] = $disclaimer;
}
 
-   $privacy = $skin->privacyLink(); # may be empty too
+   $privacy = $skin->privacyLink();
 
+   # may be empty too
if ( $privacy ) {
$s[] = $privacy;
}
diff --git a/composer.json b/composer.json
index b8f68fb..5243c66 100644
--- a/composer.json
+++ b/composer.json
@@ -2,12 +2,12 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   "mediawiki/mediawiki-codesniffer": "0.9.0"
},
"scripts": {
"fix": "phpcbf",
"test": [
-   "parallel-lint . --exclude vendor",
+   "parallel-lint . --exclude node_modules --exclude 
vendor",
"phpcs -p -s"
]
}
diff --git a/phpcs.xml b/phpcs.xml
index ede6c5d..0903898 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,12 @@
 
 
-   
+   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cd65a3255123e33b993099717a6473b469a24fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...MonoBook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361109 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
---
M .gitignore
M MonoBookTemplate.php
M composer.json
M phpcs.xml
4 files changed, 17 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook 
refs/changes/09/361109/1

diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
+/node_modules
 
 # Composer
 /vendor
diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index 6625e52..ac6aae6 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -72,7 +72,7 @@
data['undelete'] ) { 
?>
html( 'undelete' ) ?>
data['newtalk'] ) {
?>
@@ -117,7 +117,6 @@

>
getPersonalTools();
 
if ( array_key_exists( 'uls', 
$personalTools ) ) {
@@ -126,8 +125,8 @@
}
 
if ( 
!$this->getSkin()->getUser()->isLoggedIn() &&
-   
User::groupHasPermission( '*', 'edit' ) ) {
-
+   
User::groupHasPermission( '*', 'edit' )
+   ) {
echo Html::rawElement( 
'li', [
'id' => 
'pt-anonuserpage'
], $this->getMsg( 
'notloggedin' )->escaped() );
@@ -159,7 +158,8 @@

getFooterIcons( 'icononly' );
-   $validFooterLinks = $this->getFooterLinks( 'flat' ); // 
Additional footer links
+   // Additional footer links
+   $validFooterLinks = $this->getFooterLinks( 'flat' );
 
if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 
0 ) {
?>
@@ -177,7 +177,7 @@
getSkin()->makeFooterIcon( $icon ); ?>
 




@@ -331,7 +328,6 @@
Hooks::run( 'MonoBookAfterToolbox' );
}
 
-   
/*/
function languageBox() {
if ( $this->data['language_urls'] !== false ) {
?>
@@ -344,7 +340,7 @@
makeListItem( $key, $langLink ); ?>
 


 
@@ -355,7 +351,6 @@
}
}
 
-   
/*/
/**
 * @param string $bar
 * @param array|string $cont
@@ -402,4 +397,4 @@


 
-   
+   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...Modern[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361108 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I8974e665b6b96e90b4ab832fea356bcee5773ed9
---
M SkinModern.php
M composer.json
M phpcs.xml
3 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Modern 
refs/changes/08/361108/1

diff --git a/SkinModern.php b/SkinModern.php
index 331a6b6..423df66 100644
--- a/SkinModern.php
+++ b/SkinModern.php
@@ -198,5 +198,5 @@

 

 
-   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8974e665b6b96e90b4ab832fea356bcee5773ed9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...CologneBlue[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361106 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: If7f5a59d83910c444f5108c022eb4f08c1fd
---
M .gitignore
M composer.json
M phpcs.xml
3 files changed, 12 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/CologneBlue 
refs/changes/06/361106/1

diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
 sftp-config.json
 
 # Building & testing
-node_modules/
+/node_modules
 
 # Composer
 /vendor
diff --git a/composer.json b/composer.json
index 1ef4ea4..5243c66 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9",
+   "jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   "mediawiki/mediawiki-codesniffer": "0.9.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index ede6c5d..e7b9854 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,16 @@
 
 
-   
+   
+   
+   
+   
+   
+   
+   
+   
.

-   
+   
vendor
node_modules
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7f5a59d83910c444f5108c022eb4f08c1fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/CologneBlue
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...Metrolook[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361107 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I8a0430a2f8c1ab286ea0e6203d67b61fb70f3e2c
---
M MetrolookTemplate.php
M SkinMetrolook.php
M composer.json
M phpcs.xml
4 files changed, 29 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/07/361107/1

diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 4dcfd90..3939df5 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -99,7 +99,8 @@
);
 
if ( $this->config->get( 'MetrolookDisableAvatar' ) ) {
-   if ( class_exists( 'wAvatar' ) ) { // SocialProfile is 
installed
+   if ( class_exists( 'wAvatar' ) ) {
+   // SocialProfile is installed
$avatar = new wAvatar( 
$skin->getUser()->getId(), 'l' );
$avatarImage = $avatar->getAvatarURL( [
'width' => (int)$width,
@@ -445,8 +446,7 @@
if (
isset( 
$this->data['nav_urls']['upload']['href'] ) &&

$this->data['nav_urls']['upload']['href']
-   )
-   {
+   ) {
$uploadURL = 
$this->data['nav_urls']['upload']['href'];
} else {
$upURL = 
SpecialPage::getTitleFor( 'Upload' )->getFullURL();
@@ -638,7 +638,8 @@

renderAfterPortlet( $name );
@@ -835,17 +836,18 @@
makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden( 
'title', $this->get( 'searchtitle' ) );
-   // We construct two 
buttons (for 'go' and 'fulltext' search modes),
-   // but only one will be 
visible and actionable at a time (they are
-   // overlaid on top of 
each other in CSS).
-   // * Browsers will use 
the 'fulltext' one by default (as it's the
-   //   first in 
tree-order), which is desirable when they are unable
-   //   to show search 
suggestions (either due to being broken or
-   //   having JavaScript 
turned off).
-   // * The 
mediawiki.searchSuggest module, after doing tests for the
-   //   broken browsers, 
removes the 'fulltext' button and handles
-   //   'fulltext' search 
itself; this will reveal the 'go' button and
-   //   cause it to be 
used.
+   /* We construct two 
buttons (for 'go' and 'fulltext' search modes),
+* but only one will be 
visible and actionable at a time (they are
+* overlaid on top of 
each other in CSS).
+* * Browsers will use 
the 'fulltext' one by default (as it's the
+*   first in 
tree-order), which is desirable when they are unable
+*   to show search 
suggestions (either due to being broken or
+*   having JavaScript 
turned off).
+* * The 
mediawiki.searchSuggest module, after doing tests for the
+*   broken browsers, 
removes the 'fulltext' button and handles
+*   'fulltext' search 
itself; this will reveal the 'go' button and
+*   cause it to be 
used.
+*/
echo 
$this->makeSearchButton(

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

2017-06-23 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361105 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: I516a69a4f3c2b4c564e20042669a4eb27c969524
---
M .gitignore
M ApexTemplate.php
M SkinApex.php
M composer.json
M phpcs.xml
5 files changed, 21 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/05/361105/1

diff --git a/.gitignore b/.gitignore
index 8ec4b92..db8a779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-node_modules/
-vendor/
-composer.lock
+/node_modules
+/vendor
+/composer.lock
diff --git a/ApexTemplate.php b/ApexTemplate.php
index 76f468f..08dd169 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -117,13 +117,13 @@


>
-   renderNavigation( array( 'SEARCH', 
'PERSONAL' ) ); ?>
+   renderNavigation( [ 'SEARCH', 'PERSONAL' ] 
); ?>


-   renderNavigation( array( 
'NAMESPACES', 'VARIANTS' ) ); ?>
+   renderNavigation( [ 
'NAMESPACES', 'VARIANTS' ] ); ?>


-   renderNavigation( array( 
'VIEWS', 'ACTIONS' ) ); ?>
+   renderNavigation( [ 
'VIEWS', 'ACTIONS' ] ); ?>



@@ -224,7 +224,7 @@
 

@@ -248,7 +248,7 @@
// If only one element was given, wrap it in an array, allowing 
more
// flexible arguments
if ( !is_array( $elements ) ) {
-   $elements = array( $elements );
+   $elements = [ $elements ];
// If there's a series of elements, reverse them when in RTL 
mode
} elseif ( $this->data['rtl'] ) {
$elements = array_reverse( $elements );
@@ -349,8 +349,8 @@
>msg( 'search' ) ?>


-   makeSearchInput( array( 'id' => 
'searchInput', 'type' => 'text' ) ); ?>
-   makeSearchButton( 'image', array( 
'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 
'images/icons/search.png' ), 'width' => '12', 'height' => '13' ) ); ?>
+   makeSearchInput( [ 'id' => 
'searchInput', 'type' => 'text' ] ); ?>
+   makeSearchButton( 'image', [ 'id' => 
'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 
'images/icons/search.png' ), 'width' => '12', 'height' => '13' ] ); ?>



diff --git a/SkinApex.php b/SkinApex.php
index 6d384b3..6f5f23e 100644
--- a/SkinApex.php
+++ b/SkinApex.php
@@ -6,7 +6,7 @@
  */
 class SkinApex extends SkinTemplate {
 
-   protected static $bodyClasses = array( 'apex-animateLayout' );
+   protected static $bodyClasses = [ 'apex-animateLayout' ];
 
var $skinname = 'apex', $stylename = 'apex',
$template = 'ApexTemplate', $useHeadElement = true;
@@ -44,10 +44,10 @@
 */
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
-   $out->addModuleStyles( array(
+   $out->addModuleStyles( [
'mediawiki.skinning.interface',
'skins.apex'
-   ) );
+   ] );
}
 
/**
diff --git a/composer.json b/composer.json
index 56f1655..10da5b6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "0.5.1",
+   "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"fix": "phpcbf",
"test": [
-   "parallel-lint . --exclude vendor",
+   "parallel-lint . --exclude node_modules --exclude 
vendor",
"phpcs -p -s"
]
}
diff --git a/phpcs.xml b/phpcs.xml
index f136dc2..517e590 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
 
 
-   
+   



@@ -11,9 +11,13 @@


 
+   
+   
+   

.

-   
+   
vendor
+   node_modules
 

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Migrate from FloatingMenuSelectWidget (deprecated) to MenuSe...

2017-06-23 Thread Catrope (Code Review)

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361102 )

Change subject: Migrate from FloatingMenuSelectWidget (deprecated) to 
MenuSelectWidget
..

Migrate from FloatingMenuSelectWidget (deprecated) to MenuSelectWidget

Bug: T168679
Change-Id: I987a4b12560d03cc5eec7f8a57020a3e726a040f
---
M modules/ui/mw.echo.ui.ActionMenuPopupWidget.js
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/ui/mw.echo.ui.ActionMenuPopupWidget.js 
b/modules/ui/mw.echo.ui.ActionMenuPopupWidget.js
index f435f7b..70c0795 100644
--- a/modules/ui/mw.echo.ui.ActionMenuPopupWidget.js
+++ b/modules/ui/mw.echo.ui.ActionMenuPopupWidget.js
@@ -4,7 +4,7 @@
 *
 * We don't currently have anything that properly answers the complete
 * design for our popup menus in OOUI, so this widget serves two 
purposes:
-* 1. The FloatingMenuSelectWidget is intended to deliver a menu that 
relates
+* 1. The MenuSelectWidget is intended to deliver a menu that relates
 *directly to its anchor, so its sizing is dictated by whatever 
anchors
 *it. This is not what we require, so we have to override the 
'click' event
 *to reset the width of the menu.
@@ -31,8 +31,8 @@
this.menuWidth = config.menuWidth || 300;
 
// Menu
-   this.menu = new OO.ui.FloatingMenuSelectWidget( {
-   $container: this.$element,
+   this.menu = new OO.ui.MenuSelectWidget( {
+   $floatableContainer: this.$element,
classes: [ 'mw-echo-ui-actionMenuPopupWidget-menu' ],
widget: this
} );
@@ -81,7 +81,7 @@
/**
 * Get the widget's action menu
 *
-* @return {OO.ui.FloatingMenuSelectWidget} Menu
+* @return {OO.ui.MenuSelectWidget} Menu
 */
mw.echo.ui.ActionMenuPopupWidget.prototype.getMenu = function () {
return this.menu;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...FileImporter[master]: Fix button formatting

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361058 )

Change subject: Fix button formatting
..


Fix button formatting

Bug: T161615
Change-Id: I90482bc5fa163b117c9aeedbe2e6701960074ddb
---
M modules/ext.FileImporter.Special.css
M src/Html/ImportPreviewPage.php
2 files changed, 43 insertions(+), 13 deletions(-)

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



diff --git a/modules/ext.FileImporter.Special.css 
b/modules/ext.FileImporter.Special.css
index b645ea0..6100f93 100644
--- a/modules/ext.FileImporter.Special.css
+++ b/modules/ext.FileImporter.Special.css
@@ -22,11 +22,27 @@
 padding: 1em 1em 1.5em 1em;
 }
 
-.mw-importfile-rightAlign {
-float: right;
+.mw-importfile-header {
+margin: 1em 0 0.25em 0;
+padding-bottom: 0.2em;
+border-bottom: 1px solid #a2a9b1;
+overflow: auto;
+position: relative;
 }
 
-.mw-importfile-edit-button span.oo-ui-labelElement-label {
-font-family: sans-serif;
-font-size: 0.875em;
-}
\ No newline at end of file
+.mw-importfile-header-title {
+display: inline-block;
+position: absolute;
+border: none;
+bottom: 0;
+}
+
+#mw-importfile-header-title {
+margin: 0;
+}
+
+.mw-importfile-rightAlign {
+position: relative;
+bottom: 0;
+float: right;
+}
diff --git a/src/Html/ImportPreviewPage.php b/src/Html/ImportPreviewPage.php
index 1942420..d5b36d3 100644
--- a/src/Html/ImportPreviewPage.php
+++ b/src/Html/ImportPreviewPage.php
@@ -65,9 +65,16 @@
( new Message( 'fileimporter-previewnote' ) )->parse()
) .
Html::rawElement(
-   'h2',
-   [],
-   $this->title->getPrefixedText() .
+   'div',
+   [ 'class' => 'mw-importfile-header' ],
+   Html::element(
+   'h2',
+   [
+   'class' => 'mw-importfile-header-title',
+   'id' => 'mw-importfile-header-title'
+   ],
+   $this->title->getPrefixedText()
+   ) .
Html::openElement(
'form',
[
@@ -100,9 +107,16 @@
$this->title->getPrefixedText()
) .
Html::rawElement(
-   'h2',
-   [],
-   ( new Message( 'fileimporter-heading-fileinfo' ) 
)->plain() .
+   'div',
+   [ 'class' => 'mw-importfile-header' ],
+   Html::element(
+   'h2',
+   [
+   'class' => 'mw-importfile-header-title',
+   'id' => 'mw-importfile-header-title'
+   ],
+   ( new Message( 'fileimporter-heading-fileinfo' 
) )->plain()
+   ).
Html::openElement(
'form',
[
@@ -129,7 +143,7 @@
]
) .
Html::closeElement( 'form' )
-   ) .
+   ).
Html::rawElement(
'div',
[ 'class' => 'mw-importfile-parsedContent' ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90482bc5fa163b117c9aeedbe2e6701960074ddb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FileImporter
Gerrit-Branch: master
Gerrit-Owner: Andrew-WMDE 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
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...Echo[master]: Convert gen-autoload.php to maintenance script to fix error

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359375 )

Change subject: Convert gen-autoload.php to maintenance script to fix error
..


Convert gen-autoload.php to maintenance script to fix error

Same solution I used for Flow.

See Ibbc95c2bdd0e7012cf05a6c9196869aed1e99989

Change-Id: Id0a99b61226faee63d5e655a816b687747c7e671
---
M scripts/gen-autoload.php
1 file changed, 36 insertions(+), 23 deletions(-)

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



diff --git a/scripts/gen-autoload.php b/scripts/gen-autoload.php
index 8b3421d..dd7229f 100644
--- a/scripts/gen-autoload.php
+++ b/scripts/gen-autoload.php
@@ -1,32 +1,45 @@
 readDir( $base . '/' . $dir );
-   }
-   foreach ( glob( $base . '/*.php' ) as $file ) {
-   $generator->readFile( $file );
+require_once getenv( 'MW_INSTALL_PATH' ) !== false
+   ? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
+   : __DIR__ . '/../../../maintenance/Maintenance.php';
+
+/**
+ * Generates Echo autoload info
+ */
+
+class GenerateEchoAutoload extends Maintenance {
+   public function __construct() {
+   $this->mDescription = 'Generates Echo autoload data';
}
 
-   $target = $generator->getTargetFileInfo();
+   public function execute() {
+   $base = dirname( __DIR__ );
+   $generator = new AutoloadGenerator( $base );
+   $dirs = [
+   'includes',
+   'tests',
+   'maintenance',
+   ];
+   foreach ( $dirs as $dir ) {
+   $generator->readDir( $base . '/' . $dir );
+   }
+   foreach ( glob( $base . '/*.php' ) as $file ) {
+   $generator->readFile( $file );
+   }
 
-   file_put_contents(
-   $target['filename'],
-   $generator->getAutoload( basename( __DIR__ ) . '/' . basename( 
__FILE__ ) )
-   );
+   $target = $generator->getTargetFileInfo();
 
-   echo "Done.\n\n";
+   file_put_contents(
+   $target['filename'],
+   $generator->getAutoload( basename( __DIR__ ) . '/' . 
basename( __FILE__ ) )
+   );
+
+   echo "Done.\n\n";
+   }
 }
 
-main();
+$maintClass = "GenerateEchoAutoload";
+require_once RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0a99b61226faee63d5e655a816b687747c7e671
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Foxy brown 
Gerrit-Reviewer: Mooeypoo 
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...deploy[master]: Revert "Temporary disable ORES rules"

2017-06-23 Thread Ppchelko (Code Review)

Ppchelko has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361100 )

Change subject: Revert "Temporary disable ORES rules"
..


Revert "Temporary disable ORES rules"

This reverts commit 1f45faee4f7d4066ed60a718966c540b2049a95d.

Change-Id: Iaae4f8e63ea8874473be0cc8651f111e7b791a33
---
M scap/templates/config.yaml.j2
1 file changed, 254 insertions(+), 254 deletions(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index af98b26..7ca082d 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -335,260 +335,260 @@
   uri: 
'/sys/links/transcludes/{message.original_event.page_title}'
   body: '{{globals.message}}'
 
-#  # ORES caching updates
-#  <%- if ores_uris is not defined -%>
-#<%- set ores_uris = [ ores_uri ] -%>
-#  <%- endif %>
-#  <%- for ores_uri in ores_uris %>
-#  ores_cache_<%= loop.index %>:
-#topic: mediawiki.revision-create
-#concurrency: 15
-#ignore:
-#  status:
-#- 503
-#cases:
-#  - match:
-#  meta:
-#domain: ar.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/arwiki/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: cs.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/cswiki/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: en.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/enwiki/'
-#  query:
-#models: 'reverted|damaging|goodfaith'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: en.wiktionary.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/enwiktionary/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: es.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/eswiki/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: et.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/etwiki/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: fa.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/fawiki/'
-#  query:
-#models: 'reverted|damaging|goodfaith'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: fr.wikipedia.org
-#

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Revert "Temporary disable ORES rules"

2017-06-23 Thread Ppchelko (Code Review)

Hello Mobrovac, Alexandros Kosiaris, Ladsgroup,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Temporary disable ORES rules"
..

Revert "Temporary disable ORES rules"

This reverts commit 1f45faee4f7d4066ed60a718966c540b2049a95d.

Change-Id: Iaae4f8e63ea8874473be0cc8651f111e7b791a33
---
M scap/templates/config.yaml.j2
1 file changed, 254 insertions(+), 254 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/00/361100/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index af98b26..7ca082d 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -335,260 +335,260 @@
   uri: 
'/sys/links/transcludes/{message.original_event.page_title}'
   body: '{{globals.message}}'
 
-#  # ORES caching updates
-#  <%- if ores_uris is not defined -%>
-#<%- set ores_uris = [ ores_uri ] -%>
-#  <%- endif %>
-#  <%- for ores_uri in ores_uris %>
-#  ores_cache_<%= loop.index %>:
-#topic: mediawiki.revision-create
-#concurrency: 15
-#ignore:
-#  status:
-#- 503
-#cases:
-#  - match:
-#  meta:
-#domain: ar.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/arwiki/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: cs.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/cswiki/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: en.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/enwiki/'
-#  query:
-#models: 'reverted|damaging|goodfaith'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: en.wiktionary.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/enwiktionary/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: es.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/eswiki/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: et.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/etwiki/'
-#  query:
-#models: 'reverted'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#  - match:
-#  meta:
-#domain: fa.wikipedia.org
-#  performer:
-#user_is_bot: false
-#exec:
-#  uri: '<%= ores_uri %>/v2/scores/fawiki/'
-#  query:
-#models: 'reverted|damaging|goodfaith'
-#revids: '{{message.rev_id}}'
-#precache: true
-#format: 'json'
-#

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Planet-fr: Add frwiki Wikimag bulletin

2017-06-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361078 )

Change subject: Planet-fr: Add frwiki Wikimag bulletin
..


Planet-fr: Add frwiki Wikimag bulletin

Bug: T168005
Change-Id: Iab8a8d16186cb123ad1aed83b1edbecc959a84c1
---
M modules/planet/templates/feeds/fr_config.erb
M modules/planet/templates/feeds_rawdog/fr_config.erb
2 files changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/planet/templates/feeds/fr_config.erb 
b/modules/planet/templates/feeds/fr_config.erb
index a53c7bc..435b3af 100644
--- a/modules/planet/templates/feeds/fr_config.erb
+++ b/modules/planet/templates/feeds/fr_config.erb
@@ -193,3 +193,6 @@
 
 [http://wikitraits.tumblr.com/rss]
 name=Wikitraits
+
+[https://fr.wikipedia.org/w/api.php?action=featuredfeed=wikimag=atom]
+name=Wikimag
diff --git a/modules/planet/templates/feeds_rawdog/fr_config.erb 
b/modules/planet/templates/feeds_rawdog/fr_config.erb
index fd57c8e..d0d2682 100644
--- a/modules/planet/templates/feeds_rawdog/fr_config.erb
+++ b/modules/planet/templates/feeds_rawdog/fr_config.erb
@@ -100,3 +100,5 @@
 feed 1h https://medbachounda.blogspot.be/feeds/posts/default/-/Wiki-fr/
 feed 1h https://blog.ash.bzh/fr/feed/
 feed 1h http://wikitraits.tumblr.com/rss
+feed 1h 
https://fr.wikipedia.org/w/api.php?action=featuredfeed=wikimag=atom
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab8a8d16186cb123ad1aed83b1edbecc959a84c1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Framawiki 
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] mediawiki...AbuseFilter[master]: Improve tag name validation

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/197315 )

Change subject: Improve tag name validation
..


Improve tag name validation

Various pieces of the tagging system will break if the tag name contains
slashes or commas, so that should be checked for.

MediaWiki core (as of Ic5d75432) contains a method for doing just that,
so use it if possible.

Also require that tag names be either:
* Intended for reuse (canAddTagsAccompanyingChange)
* Already in use
* Creatable

This prevents the use of software-defined tags (unless whitelisted)
or tags that are blocked from creation (e.g. OAuth reserved tag
prefixes)

Add caching for tag lookup since it's used more often now.

Bug: T92956
Bug: T27151
Depends-On: Ic5d754323cbfd2c2b54c4df1245767946ebb1821
Change-Id: Ibc3095879f276a5436362f471b885e64f338522e
---
M AbuseFilter.hooks.php
M Views/AbuseFilterViewEdit.php
M i18n/en.json
3 files changed, 148 insertions(+), 44 deletions(-)

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



diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index 7fb0d5c..3b88509 100644
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -4,6 +4,8 @@
 use MediaWiki\MediaWikiServices;
 
 class AbuseFilterHooks {
+   const FETCH_ALL_TAGS_KEY = 'abusefilter-fetch-all-tags';
+
public static $successful_action_vars = false;
/** @var WikiPage|Article|bool */
public static $last_edit_page = false; // make sure edit filter & edit 
save hooks match
@@ -477,53 +479,90 @@
}
 
/**
+* Purge all cache related to tags, both within AbuseFilter and in core
+*/
+   public static function purgeTagCache() {
+   ChangeTags::purgeTagCacheAll();
+
+   $services = MediaWikiServices::getInstance();
+   $cache = $services->getMainWANObjectCache();
+
+   $cache->delete(
+   $cache->makeKey( self::FETCH_ALL_TAGS_KEY, 0 )
+   );
+
+   $cache->delete(
+   $cache->makeKey( self::FETCH_ALL_TAGS_KEY, 1 )
+   );
+   }
+
+   /**
 * @param array $tags
 * @param bool $enabled
 * @return bool
 */
private static function fetchAllTags( array &$tags, $enabled ) {
-   global $wgAbuseFilterCentralDB, $wgAbuseFilterIsCentral;
+   $services = MediaWikiServices::getInstance();
+   $cache = $services->getMainWANObjectCache();
 
-   # This is a pretty awful hack.
-   $dbr = wfGetDB( DB_SLAVE );
+   $tags = $cache->getWithSetCallback(
+   // Key to store the cached value under
+   $cache->makeKey( self::FETCH_ALL_TAGS_KEY, (int) 
$enabled ),
 
-   $where = [ 'afa_consequence' => 'tag', 'af_deleted' => false ];
-   if ( $enabled ) {
-   $where['af_enabled'] = true;
-   }
-   $res = $dbr->select(
-   [ 'abuse_filter_action', 'abuse_filter' ],
-   'afa_parameters',
-   $where,
-   __METHOD__,
-   [],
-   [ 'abuse_filter' => [ 'INNER JOIN', 'afa_filter=af_id' 
] ]
-   );
+   // Time-to-live (in seconds)
+   $cache::TTL_MINUTE,
 
-   foreach ( $res as $row ) {
-   $tags = array_filter(
-   array_merge( explode( "\n", 
$row->afa_parameters ), $tags )
-   );
-   }
+   // Function that derives the new key value
+   function ( $oldValue, &$ttl, array &$setOpts ) use ( 
$enabled, $tags ) {
+   global $wgAbuseFilterCentralDB, 
$wgAbuseFilterIsCentral;
 
-   if ( $wgAbuseFilterCentralDB && !$wgAbuseFilterIsCentral ) {
-   $dbr = wfGetDB( DB_SLAVE, [], $wgAbuseFilterCentralDB );
-   $where['af_global'] = 1;
-   $res = $dbr->select(
-   [ 'abuse_filter_action', 'abuse_filter' ],
-   'afa_parameters',
-   $where,
-   __METHOD__,
-   [],
-   [ 'abuse_filter' => [ 'INNER JOIN', 
'afa_filter=af_id' ] ]
-   );
+   $dbr = wfGetDB( DB_REPLICA );
+   // Account for any snapshot/replica DB lag
+   $setOpts += Database::getCacheSetOptions( $dbr 
);
 
-   foreach ( $res as $row ) {
-   $tags = array_filter(
-

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Fix capitalization of Xml class

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361099 )

Change subject: Fix capitalization of Xml class
..

Fix capitalization of Xml class

Change-Id: I5c781be9843d1fdbb19a9e18513749f2e09a93c7
---
M TimedTextPage.php
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/TimedTextPage.php b/TimedTextPage.php
index d7a8a73..82642d2 100644
--- a/TimedTextPage.php
+++ b/TimedTextPage.php
@@ -99,12 +99,12 @@
 
// Get the video with with a max of 600 pixel page
$out->addHTML(
-   xml::tags( 'table', [ 'style'=> 'border:none' ],
-   xml::tags( 'tr', null,
-   xml::tags( 'td', [ 'valign' => 'top',  
'width' => self::$videoWidth ],
+   Xml::tags( 'table', [ 'style'=> 'border:none' ],
+   Xml::tags( 'tr', null,
+   Xml::tags( 'td', [ 'valign' => 'top',  
'width' => self::$videoWidth ],
$this->getVideoHTML( 
$videoTitle )
) .
-   xml::tags( 'td', [ 'valign' => 'top' ], 
$this->getTimedTextHTML( $languageName ) )
+   Xml::tags( 'td', [ 'valign' => 'top' ], 
$this->getTimedTextHTML( $languageName ) )
)
)
);

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SpecialContributions: Fix capitalization of DateInputWidget ...

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361095 )

Change subject: SpecialContributions: Fix capitalization of DateInputWidget 
class
..


SpecialContributions: Fix capitalization of DateInputWidget class

The namespace was improperly capitalized, move it to a "use" statement
while we're at it so it's only included once.

Noticed by the logging added for T166759.

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

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



diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index e2fa8a3..40706ac 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -21,6 +21,8 @@
  * @ingroup SpecialPage
  */
 
+use MediaWiki\Widget\DateInputWidget;
+
 /**
  * Special:Contributions, show user contributions in a paged list
  *
@@ -665,7 +667,7 @@
'div',
[],
Xml::label( wfMessage( 'date-range-from' )->text(), 
'mw-date-start' ) . ' ' .
-   new \Mediawiki\Widget\DateInputWidget( [
+   new DateInputWidget( [
'infusable' => true,
'id' => 'mw-date-start',
'name' => 'start',
@@ -673,7 +675,7 @@
'longDisplayFormat' => true,
] ) . '' .
Xml::label( wfMessage( 'date-range-to' )->text(), 
'mw-date-end' ) . ' ' .
-   new \Mediawiki\Widget\DateInputWidget( [
+   new DateInputWidget( [
'infusable' => true,
'id' => 'mw-date-end',
'name' => 'end',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fe6533a0f06dcbc37017361679dad9e77808830
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
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...FlaggedRevs[master]: Fix capitalization of Xml class

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361098 )

Change subject: Fix capitalization of Xml class
..

Fix capitalization of Xml class

Change-Id: I43e50f892cab8719d792b8d87f964eb93c86dda8
---
M frontend/specialpages/actions/Stabilization_body.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/98/361098/1

diff --git a/frontend/specialpages/actions/Stabilization_body.php 
b/frontend/specialpages/actions/Stabilization_body.php
index 195b12b..a8c2f06 100644
--- a/frontend/specialpages/actions/Stabilization_body.php
+++ b/frontend/specialpages/actions/Stabilization_body.php
@@ -215,7 +215,7 @@
 
$s .= ' 
' .
-   xml::label( $this->msg( 
'stabilization-comment' )->text(),
+   Xml::label( $this->msg( 
'stabilization-comment' )->text(),
'wpReasonSelection' ) .
'
' .

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeReview[master]: Fix capitalization of Xml class

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361097 )

Change subject: Fix capitalization of Xml class
..

Fix capitalization of Xml class

Change-Id: I7bd50ac0b2e133c8c1e81fb09a176a1278f031d5
---
M ui/CodeRevisionView.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeReview 
refs/changes/97/361097/1

diff --git a/ui/CodeRevisionView.php b/ui/CodeRevisionView.php
index 7ae6da3..f9d245c 100644
--- a/ui/CodeRevisionView.php
+++ b/ui/CodeRevisionView.php
@@ -421,7 +421,7 @@
if ( $wgUser->isAllowed( 'codereview-set-status' ) ) {
return Xml::openElement( 'select', [ 'name' => 
'wpStatus' ] ) .
self::buildStatusList( $this->mStatus, $this ) .
-   xml::closeElement( 'select' );
+   Xml::closeElement( 'select' );
} else {
return htmlspecialchars( $this->statusDesc( 
$this->mRev->getStatus() ) );
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: API: Fix capitalization of SpecialRecentChanges* classes

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361096 )

Change subject: API: Fix capitalization of SpecialRecentChanges* classes
..

API: Fix capitalization of SpecialRecentChanges* classes

And use the magic ::class instead of plain strings.

Noticed by logging added for T166759.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/361096/1

diff --git a/includes/api/ApiFeedRecentChanges.php 
b/includes/api/ApiFeedRecentChanges.php
index 0b04c8c..2a80dd5 100644
--- a/includes/api/ApiFeedRecentChanges.php
+++ b/includes/api/ApiFeedRecentChanges.php
@@ -63,8 +63,8 @@
 
$feedFormat = $this->params['feedformat'];
$specialClass = $this->params['target'] !== null
-   ? 'SpecialRecentchangeslinked'
-   : 'SpecialRecentchanges';
+   ? SpecialRecentChangesLinked::class
+   : SpecialRecentChanges::class;
 
$formatter = $this->getFeedObject( $feedFormat, $specialClass );
 
@@ -90,12 +90,12 @@
 * Return a ChannelFeed object.
 *
 * @param string $feedFormat Feed's format (either 'rss' or 'atom')
-* @param string $specialClass Relevant special page name (either 
'SpecialRecentchanges' or
-* 'SpecialRecentchangeslinked')
+* @param string $specialClass Relevant special page name (either 
'SpecialRecentChanges' or
+* 'SpecialRecentChangesLinked')
 * @return ChannelFeed
 */
public function getFeedObject( $feedFormat, $specialClass ) {
-   if ( $specialClass === 'SpecialRecentchangeslinked' ) {
+   if ( $specialClass === SpecialRecentChangesLinked::class ) {
$title = Title::newFromText( $this->params['target'] );
if ( !$title ) {
$this->dieWithError( [ 'apierror-invalidtitle', 
wfEscapeWikiText( $this->params['target'] ) ] );

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuSelectWidget: Fix item hiding when menu contents change

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358499 )

Change subject: MenuSelectWidget: Fix item hiding when menu contents change
..


MenuSelectWidget: Fix item hiding when menu contents change

updateItemVisibility() adds a CSS class to hide the menu when
it hides all items, but that means it should also reevaluate whether
all items are hidden when new items are added. Lookup-style widgets
can add items to menus dynamically, and those items should immediately
be hidden if they don't match the search string, or cause the
menu to be unhidden if they do match.

Add updateItemVisibility() calls to addItems() and removeItems().
Also make updateItemVisibility() the function that should generally
be called when things change, which means making it safe to call
if there is no input or input filtering, and using it to clip
instead of calling clip() directly.

Change-Id: Iec3c6757c7ab5d8866dfb4d5769008a34fb52fb6
---
M src/widgets/MenuSelectWidget.js
1 file changed, 41 insertions(+), 40 deletions(-)

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



diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index 808c535..1ea6e32 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -150,54 +150,58 @@
 };
 
 /**
- * Update menu item visibility after input changes.
+ * Update menu item visibility and clipping after input changes (if 
filterFromInput is enabled)
+ * or after items were added/removed (always).
  *
  * @protected
  */
 OO.ui.MenuSelectWidget.prototype.updateItemVisibility = function () {
-   var i, item, visible, section, sectionEmpty,
+   var i, item, visible, section, sectionEmpty, filter, exactFilter,
firstItemFound = false,
anyVisible = false,
len = this.items.length,
showAll = !this.isVisible(),
-   filter = showAll ? null : this.getItemMatcher( 
this.$input.val() ),
-   exactFilter = this.getItemMatcher( this.$input.val(), true ),
exactMatch = false;
 
-   // Hide non-matching options, and also hide section headers if all 
options
-   // in their section are hidden.
-   for ( i = 0; i < len; i++ ) {
-   item = this.items[ i ];
-   if ( item instanceof OO.ui.MenuSectionOptionWidget ) {
-   if ( section ) {
-   // If the previous section was empty, hide its 
header
-   section.toggle( showAll || !sectionEmpty );
-   }
-   section = item;
-   sectionEmpty = true;
-   } else if ( item instanceof OO.ui.OptionWidget ) {
-   visible = showAll || filter( item );
-   exactMatch = exactMatch || exactFilter( item );
-   anyVisible = anyVisible || visible;
-   sectionEmpty = sectionEmpty && !visible;
-   item.toggle( visible );
-   if ( this.highlightOnFilter && visible && 
!firstItemFound ) {
-   // Highlight the first item in the list
-   this.highlightItem( item );
-   firstItemFound = true;
+   if ( this.$input && this.filterFromInput ) {
+   filter = showAll ? null : this.getItemMatcher( 
this.$input.val() );
+   exactFilter = this.getItemMatcher( this.$input.val(), true );
+
+   // Hide non-matching options, and also hide section headers if 
all options
+   // in their section are hidden.
+   for ( i = 0; i < len; i++ ) {
+   item = this.items[ i ];
+   if ( item instanceof OO.ui.MenuSectionOptionWidget ) {
+   if ( section ) {
+   // If the previous section was empty, 
hide its header
+   section.toggle( showAll || 
!sectionEmpty );
+   }
+   section = item;
+   sectionEmpty = true;
+   } else if ( item instanceof OO.ui.OptionWidget ) {
+   visible = showAll || filter( item );
+   exactMatch = exactMatch || exactFilter( item );
+   anyVisible = anyVisible || visible;
+   sectionEmpty = sectionEmpty && !visible;
+   item.toggle( visible );
+   if ( this.highlightOnFilter && visible && 
!firstItemFound ) {
+   // Highlight the first item in the list
+   this.highlightItem(

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: SpecialContributions: Fix capitalization of DateInputWidget ...

2017-06-23 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361095 )

Change subject: SpecialContributions: Fix capitalization of DateInputWidget 
class
..

SpecialContributions: Fix capitalization of DateInputWidget class

The namespace was improperly capitalized, move it to a "use" statement
while we're at it so it's only included once.

Noticed by the logging added for T166759.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/361095/1

diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index e2fa8a3..40706ac 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -21,6 +21,8 @@
  * @ingroup SpecialPage
  */
 
+use MediaWiki\Widget\DateInputWidget;
+
 /**
  * Special:Contributions, show user contributions in a paged list
  *
@@ -665,7 +667,7 @@
'div',
[],
Xml::label( wfMessage( 'date-range-from' )->text(), 
'mw-date-start' ) . ' ' .
-   new \Mediawiki\Widget\DateInputWidget( [
+   new DateInputWidget( [
'infusable' => true,
'id' => 'mw-date-start',
'name' => 'start',
@@ -673,7 +675,7 @@
'longDisplayFormat' => true,
] ) . '' .
Xml::label( wfMessage( 'date-range-to' )->text(), 
'mw-date-end' ) . ' ' .
-   new \Mediawiki\Widget\DateInputWidget( [
+   new DateInputWidget( [
'infusable' => true,
'id' => 'mw-date-end',
'name' => 'end',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: GalleryDialog: Re-order and make margins even

2017-06-23 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361094 )

Change subject: GalleryDialog: Re-order and make margins even
..

GalleryDialog: Re-order and make margins even

Move image inside filename fieldset, and make
margins between fieldsets and button 1em.

Change-Id: I7f6789043f873f9da4e960c94e22a7ee096a352f
---
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
2 files changed, 5 insertions(+), 11 deletions(-)


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

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 8696e56..2ca281b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -125,6 +125,7 @@
} );
this.$highlightedImage = $( '' )
.addClass( 've-ui-mwGalleryDialog-highlighted-image' );
+   this.filenameFieldset.$element.append( this.$highlightedImage );
// TODO: make into a ve.ui.MWTargetWidget once Parsoid handles galleries
this.highlightedCaptionInput = new OO.ui.TextInputWidget( {
placeholder: ve.msg( 
'visualeditor-mwgallerydialog-image-caption-placeholder' ),
@@ -133,8 +134,7 @@
} );
this.highlightedCaptionFieldset = new OO.ui.FieldsetLayout( {
label: ve.msg( 'visualeditor-dialog-media-content-section' ),
-   icon: 'parameter',
-   classes: [ 've-ui-mwGalleryDialog-caption-fieldset' ]
+   icon: 'parameter'
} );
this.highlightedCaptionFieldset.$element.append( 
this.highlightedCaptionInput.$element );
this.removeButton = new OO.ui.ButtonWidget( {
@@ -255,7 +255,6 @@
);
menuLayout.$content.append(
this.editPanel.$element.append(
-   this.$highlightedImage,
this.filenameFieldset.$element,
this.highlightedCaptionFieldset.$element,
this.removeButton.$element
diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
index 2c2b547..b4a58af 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
@@ -24,9 +24,9 @@
box-shadow: inset 0 0 0 0.1em #36c;
 }
 
-/* HACK: Override ooui specific 2em top margin */
-.ve-ui-mwGalleryDialog-caption-fieldset.oo-ui-labelElement.oo-ui-fieldsetLayout
 {
-   margin-top: 0;
+.ve-ui-mwGalleryDialog .oo-ui-fieldsetLayout + .oo-ui-fieldsetLayout,
+.ve-ui-mwGalleryDialog-remove-button {
+   margin-top: 1em;
 }
 
 .ve-ui-mwGalleryDialog-highlighted-image {
@@ -37,11 +37,6 @@
background-repeat: no-repeat;
background-position: 50% 50%;
background-size: contain;
-   margin-bottom: 0.5em;
-}
-
-.ve-ui-mwGalleryDialog-remove-button {
-   margin-top: 0.5em;
 }
 
 .ve-ui-mwGalleryDialog-menuLayout > .oo-ui-menuLayout-menu {

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...ortiz[master]: Add syntax checking as test

2017-06-23 Thread Bearloga (Code Review)

Bearloga has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361093 )

Change subject: Add syntax checking as test
..


Add syntax checking as test

Change-Id: I12c18cd5376e3d4127d9dfb1e70f2d1559c93f25
---
M .Rbuildignore
M .gitignore
A .lintr
M DESCRIPTION
M R/RcppExports.R
M R/dwell.R
M man/dwell_time.Rd
M man/ortiz.Rd
M ortiz.Rproj
D src/.gitignore
M src/RcppExports.cpp
M tests/testthat/test-dwelltime.R
A tests/testthat/test-syntax.R
13 files changed, 61 insertions(+), 23 deletions(-)

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



diff --git a/.Rbuildignore b/.Rbuildignore
index d17ba1a..cfe2a82 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,7 +1,13 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
-^Makefile$
-^README.Rmd$
-^.travis.yml$
+^\.Rhistory$
+^man-roxygen$
+^data-raw$
+^cran-comments\.md$
+^README.Rmd
+^CONDUCT\.md$
+^README_cache$
+^\.travis.yml$
 ^appveyor.yml$
 ^.*\.gitreview$
+^\.lintr$
diff --git a/.gitignore b/.gitignore
index 0a74739..4d060ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 src/*.o
 src/*.so
 src/*.dll
+src/*.rds
diff --git a/.lintr b/.lintr
new file mode 100644
index 000..37cf271
--- /dev/null
+++ b/.lintr
@@ -0,0 +1,5 @@
+linters: with_defaults(line_length_linter(120), object_usage_linter = NULL, 
T_and_F_symbol_linter)
+exclusions: list("R/RcppExports.R")
+exclude: "# Exclude Linting"
+exclude_start: "# Begin Exclude Linting"
+exclude_end: "# End Exclude Linting"
diff --git a/DESCRIPTION b/DESCRIPTION
index 0f7ace9..30a7073 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ortiz
 Title: Speedy User Satisfaction Computations
-Version: 0.0.2
+Version: 0.0.3
 Author: Oliver Keyes
 Maintainer: Mikhail Popov 
 Description: Speedily computes various user satisfaction-related metrics for
@@ -13,5 +13,7 @@
 LinkingTo: Rcpp
 Imports:
 Rcpp
-RoxygenNote: 5.0.1
-Suggests: testthat
+RoxygenNote: 6.0.1
+Suggests:
+testthat,
+lintr
diff --git a/R/RcppExports.R b/R/RcppExports.R
index 9263b78..638ce0c 100644
--- a/R/RcppExports.R
+++ b/R/RcppExports.R
@@ -1,4 +1,4 @@
-# This file was generated by Rcpp::compileAttributes
+# Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 dwell_time_ <- function(timestamps) {
diff --git a/R/dwell.R b/R/dwell.R
index ff2ff79..3b5e705 100644
--- a/R/dwell.R
+++ b/R/dwell.R
@@ -17,14 +17,14 @@
 #'
 #'@export
 dwell_time <- function(data, id_col, ts_col, dwell_threshold = 100) {
-  
+
   # Check type. We need timestamps to end up as numeric seconds 
representations,
   # which we can trivially convert to if they're POSIX (or if they're already)
   # formatted) but can't handle consistently otherwise.
   data <- numeric_check(data, ts_col)
-  
+
   # Split the data up per unique session/user ID.
   split_data <- split(x = data[, ts_col], f = data[, id_col])
-  
+
   return(dwell_time_(split_data) > dwell_threshold)
 }
diff --git a/man/dwell_time.Rd b/man/dwell_time.Rd
index e5acc1c..989f413 100644
--- a/man/dwell_time.Rd
+++ b/man/dwell_time.Rd
@@ -23,4 +23,3 @@
 to be one in which the user was satisfied. \code{dwell_time} calculates
 that for a data.frame of user sessions.
 }
-
diff --git a/man/ortiz.Rd b/man/ortiz.Rd
index af75927..0ce6e92 100644
--- a/man/ortiz.Rd
+++ b/man/ortiz.Rd
@@ -8,4 +8,3 @@
 \description{
 Speedily computes various user satisfaction-related metrics for Search.
 }
-
diff --git a/ortiz.Rproj b/ortiz.Rproj
index 4d263d7..f0d6187 100644
--- a/ortiz.Rproj
+++ b/ortiz.Rproj
@@ -13,6 +13,7 @@
 LaTeX: pdfLaTeX
 
 AutoAppendNewline: Yes
+StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageUseDevtools: Yes
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 22034c4..000
--- a/src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.o
-*.so
-*.dll
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index dda9989..79d00ef 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -1,4 +1,4 @@
-// This file was generated by Rcpp::compileAttributes
+// Generated by using Rcpp::compileAttributes() -> do not edit by hand
 // Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 #include 
@@ -9,10 +9,20 @@
 std::vector < unsigned int > dwell_time_(std::list < std::vector < int > > 
timestamps);
 RcppExport SEXP ortiz_dwell_time_(SEXP timestampsSEXP) {
 BEGIN_RCPP
-Rcpp::RObject __result;
-Rcpp::RNGScope __rngScope;
+Rcpp::RObject rcpp_result_gen;
+Rcpp::RNGScope rcpp_rngScope_gen;
 Rcpp::traits::input_parameter< std::list < std::vector < int > > >::type 
timestamps(timestampsSEXP);
-__result = Rcpp::wrap(dwell_time_(timestamps));
-return __result;
+rcpp_result_gen = Rcpp::wrap(dwell_time_(timestamps));
+return rcpp_result_gen;
 END_RCPP
 }
+
+static const R_CallMethodDef CallEntries[] = {
+{"ortiz_dwell_time_", (DL_FUNC)

[MediaWiki-commits] [Gerrit] wikimedia...ortiz[master]: Add syntax checking as test

2017-06-23 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361093 )

Change subject: Add syntax checking as test
..

Add syntax checking as test

Change-Id: I12c18cd5376e3d4127d9dfb1e70f2d1559c93f25
---
M .Rbuildignore
M .gitignore
A .lintr
M DESCRIPTION
M R/RcppExports.R
M R/dwell.R
M man/dwell_time.Rd
M man/ortiz.Rd
M ortiz.Rproj
D src/.gitignore
M src/RcppExports.cpp
M tests/testthat/test-dwelltime.R
A tests/testthat/test-syntax.R
13 files changed, 61 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/ortiz 
refs/changes/93/361093/1

diff --git a/.Rbuildignore b/.Rbuildignore
index d17ba1a..cfe2a82 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,7 +1,13 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
-^Makefile$
-^README.Rmd$
-^.travis.yml$
+^\.Rhistory$
+^man-roxygen$
+^data-raw$
+^cran-comments\.md$
+^README.Rmd
+^CONDUCT\.md$
+^README_cache$
+^\.travis.yml$
 ^appveyor.yml$
 ^.*\.gitreview$
+^\.lintr$
diff --git a/.gitignore b/.gitignore
index 0a74739..4d060ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 src/*.o
 src/*.so
 src/*.dll
+src/*.rds
diff --git a/.lintr b/.lintr
new file mode 100644
index 000..37cf271
--- /dev/null
+++ b/.lintr
@@ -0,0 +1,5 @@
+linters: with_defaults(line_length_linter(120), object_usage_linter = NULL, 
T_and_F_symbol_linter)
+exclusions: list("R/RcppExports.R")
+exclude: "# Exclude Linting"
+exclude_start: "# Begin Exclude Linting"
+exclude_end: "# End Exclude Linting"
diff --git a/DESCRIPTION b/DESCRIPTION
index 0f7ace9..30a7073 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ortiz
 Title: Speedy User Satisfaction Computations
-Version: 0.0.2
+Version: 0.0.3
 Author: Oliver Keyes
 Maintainer: Mikhail Popov 
 Description: Speedily computes various user satisfaction-related metrics for
@@ -13,5 +13,7 @@
 LinkingTo: Rcpp
 Imports:
 Rcpp
-RoxygenNote: 5.0.1
-Suggests: testthat
+RoxygenNote: 6.0.1
+Suggests:
+testthat,
+lintr
diff --git a/R/RcppExports.R b/R/RcppExports.R
index 9263b78..638ce0c 100644
--- a/R/RcppExports.R
+++ b/R/RcppExports.R
@@ -1,4 +1,4 @@
-# This file was generated by Rcpp::compileAttributes
+# Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 dwell_time_ <- function(timestamps) {
diff --git a/R/dwell.R b/R/dwell.R
index ff2ff79..3b5e705 100644
--- a/R/dwell.R
+++ b/R/dwell.R
@@ -17,14 +17,14 @@
 #'
 #'@export
 dwell_time <- function(data, id_col, ts_col, dwell_threshold = 100) {
-  
+
   # Check type. We need timestamps to end up as numeric seconds 
representations,
   # which we can trivially convert to if they're POSIX (or if they're already)
   # formatted) but can't handle consistently otherwise.
   data <- numeric_check(data, ts_col)
-  
+
   # Split the data up per unique session/user ID.
   split_data <- split(x = data[, ts_col], f = data[, id_col])
-  
+
   return(dwell_time_(split_data) > dwell_threshold)
 }
diff --git a/man/dwell_time.Rd b/man/dwell_time.Rd
index e5acc1c..989f413 100644
--- a/man/dwell_time.Rd
+++ b/man/dwell_time.Rd
@@ -23,4 +23,3 @@
 to be one in which the user was satisfied. \code{dwell_time} calculates
 that for a data.frame of user sessions.
 }
-
diff --git a/man/ortiz.Rd b/man/ortiz.Rd
index af75927..0ce6e92 100644
--- a/man/ortiz.Rd
+++ b/man/ortiz.Rd
@@ -8,4 +8,3 @@
 \description{
 Speedily computes various user satisfaction-related metrics for Search.
 }
-
diff --git a/ortiz.Rproj b/ortiz.Rproj
index 4d263d7..f0d6187 100644
--- a/ortiz.Rproj
+++ b/ortiz.Rproj
@@ -13,6 +13,7 @@
 LaTeX: pdfLaTeX
 
 AutoAppendNewline: Yes
+StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageUseDevtools: Yes
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 22034c4..000
--- a/src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.o
-*.so
-*.dll
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index dda9989..79d00ef 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -1,4 +1,4 @@
-// This file was generated by Rcpp::compileAttributes
+// Generated by using Rcpp::compileAttributes() -> do not edit by hand
 // Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 #include 
@@ -9,10 +9,20 @@
 std::vector < unsigned int > dwell_time_(std::list < std::vector < int > > 
timestamps);
 RcppExport SEXP ortiz_dwell_time_(SEXP timestampsSEXP) {
 BEGIN_RCPP
-Rcpp::RObject __result;
-Rcpp::RNGScope __rngScope;
+Rcpp::RObject rcpp_result_gen;
+Rcpp::RNGScope rcpp_rngScope_gen;
 Rcpp::traits::input_parameter< std::list < std::vector < int > > >::type 
timestamps(timestampsSEXP);
-__result = Rcpp::wrap(dwell_time_(timestamps));
-return __result;
+rcpp_result_gen = Rcpp::wrap(dwell_time_(timestamps));
+return rcpp_result_gen;
 END_RCPP
 }
+
+static const R_CallMethodDef CallEntries[] = {
+

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix playback of audio files.

2017-06-23 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361092 )

Change subject: Fix playback of audio files.
..

Fix playback of audio files.

Here's where my research on this has led:
Something is not quite right with the way we pass the InputStream from the
OkHttp response to the WebView callback.  Right now we're simply feeding
it the byteStream() that we get from the response body. However, this
doesn't seem to work correctly when the stream is used by the embedded
audio player in the WebView.

As an experiment, I tried to take the full bytes() array that's also
offered by the response body, and wrap it in a ByteArrayInputStream, and
pass that back to the WebView, and it actually worked for audio playback.
This leads me to suspect that the sequential InputStream provided by the
byteStream() method isn't compatible with what the audio player expects.

Unfortunately the above experiment can't really be a viable solution
because that would imply that we need to read the full response into
memory (in the VM heap) before passing it to the WebView.

So, for the time being, until we understand why our stream logic isn't
working in these cases, I added a check whereby OGG-type requests will be
handled directly by the WebView, instead of being intercepted by us.

p.s. This seems to be a problem only in Lollipop+.

Bug: T164520
Change-Id: I1aa424d43ac4dcfbb18787da41f53e0a55ac9b0a
---
M app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java 
b/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
index 066830c..1d58782 100644
--- a/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
+++ b/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
@@ -38,6 +38,7 @@
 private static final String HEADER_CONTENT_TYPE = "content-type";
 private static final String HEADER_CONTENT_ENCODING = "content-encoding";
 private static final String CONTENT_TYPE_SVG = "image/svg+xml";
+private static final String CONTENT_TYPE_OGG = "application/ogg";
 
 @SuppressWarnings("deprecation") @Override
 public WebResourceResponse shouldInterceptRequest(WebView view, String 
url) {
@@ -64,6 +65,13 @@
 
 try {
 Response rsp = request(request.getUrl().toString());
+
+if (CONTENT_TYPE_OGG.equals(rsp.header(HEADER_CONTENT_TYPE))) {
+// Let the WebView handle downloading these file types on its 
own.
+// TODO: figure out why this needs to be done (T164520).
+return null;
+}
+
 return new WebResourceResponse(rsp.header(HEADER_CONTENT_TYPE),
 rsp.header(HEADER_CONTENT_ENCODING), rsp.code(),
 StringUtils.defaultIfBlank(rsp.message(), "Unknown error"),

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: BookletLayout: Workaround for horizontal scrollbars on menu ...

2017-06-23 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361091 )

Change subject: BookletLayout: Workaround for horizontal scrollbars on menu 
when editable
..

BookletLayout: Workaround for horizontal scrollbars on menu when editable

Bug: T161798
Change-Id: Ifb968dcd5fb3dd54a794ab8484ca735de5286b15
---
M src/layouts/BookletLayout.js
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/91/361091/1

diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index 973ddc1..ca22153 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -274,10 +274,19 @@
  * @chainable
  */
 OO.ui.BookletLayout.prototype.toggleOutline = function ( show ) {
+   var booklet = this;
+
if ( this.outlined ) {
show = show === undefined ? !this.outlineVisible : !!show;
this.outlineVisible = show;
this.toggleMenu( show );
+   if ( show && this.editable ) {
+   // HACK: When the sidebar stops animating, kill dumb 
scrollbars (T161798). Only necessary when
+   // outline controls are present, The delay matches 
transition on .oo-ui-menuLayout-menu.
+   setTimeout( function () {
+   OO.ui.Element.static.reconsiderScrollbars( 
booklet.outlinePanel.$element[ 0 ] );
+   }, 200 );
+   }
}
 
return this;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb968dcd5fb3dd54a794ab8484ca735de5286b15
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] oojs/ui[master]: Rewrite all styling for "outline controls"

2017-06-23 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361090 )

Change subject: Rewrite all styling for "outline controls"
..

Rewrite all styling for "outline controls"

Bug: T168740
Change-Id: I9f6433f2ddb3ccc1b94e4f620c8fae9fe366605c
---
M src/styles/layouts/BookletLayout.less
M src/styles/widgets/OutlineControlsWidget.less
M src/themes/apex/widgets.less
M src/themes/wikimediaui/layouts.less
M src/themes/wikimediaui/widgets.less
5 files changed, 21 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/90/361090/1

diff --git a/src/styles/layouts/BookletLayout.less 
b/src/styles/layouts/BookletLayout.less
index 20c6fad..aa5303c 100644
--- a/src/styles/layouts/BookletLayout.less
+++ b/src/styles/layouts/BookletLayout.less
@@ -15,11 +15,12 @@
 
&-outlinePanel {
&-editable > .oo-ui-outlineSelectWidget {
+   height: auto;
position: absolute;
top: 0;
left: 0;
right: 0;
-   bottom: 3em;
+   bottom: 2.5em;
overflow: auto;
}
 
@@ -28,6 +29,7 @@
bottom: 0;
left: 0;
right: 0;
+   height: 2.5em;
}
}
 
diff --git a/src/styles/widgets/OutlineControlsWidget.less 
b/src/styles/widgets/OutlineControlsWidget.less
index 751e084..8164c68 100644
--- a/src/styles/widgets/OutlineControlsWidget.less
+++ b/src/styles/widgets/OutlineControlsWidget.less
@@ -1,6 +1,9 @@
 @import '../common';
 
 .oo-ui-outlineControlsWidget {
+   // Without this, in Apex theme the widget sometimes gets a horizontal 
scrollbar, no idea why.
+   overflow: hidden;
+
&-items,
&-movers {
float: left;
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index ccea3bb..7d0c0c3 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -516,20 +516,20 @@
 }
 
 .theme-oo-ui-outlineControlsWidget () {
-   height: 3em;
background-color: @background-color-main;
 
&-items,
&-movers {
-   height: 2em;
-   margin: 0.5em 0.5em 0.5em 0;
-   padding: 0;
+   > .oo-ui-buttonWidget {
+   height: 2.5em;
+   width: 2.5em;
+   // There's a lot of weird specific margins with weird 
specific selectors
+   margin: 0 !important; /* stylelint-disable-line 
declaration-no-important */
+   }
}
 
> .oo-ui-iconElement-icon {
-   width: 1.5em;
-   height: 2em;
-   margin: 0.5em 0 0.5em 0.5em;
+   height: 2.5em;
opacity: 0.2;
}
 }
diff --git a/src/themes/wikimediaui/layouts.less 
b/src/themes/wikimediaui/layouts.less
index d007030..51d54ed 100644
--- a/src/themes/wikimediaui/layouts.less
+++ b/src/themes/wikimediaui/layouts.less
@@ -13,7 +13,7 @@
border-right: 1px solid #ddd;
 
> .oo-ui-outlineControlsWidget {
-   box-shadow: @box-shadow-dialog;
+   border-top: @border-dialog-bar;
}
}
 }
diff --git a/src/themes/wikimediaui/widgets.less 
b/src/themes/wikimediaui/widgets.less
index 9919bbc..14f6083 100644
--- a/src/themes/wikimediaui/widgets.less
+++ b/src/themes/wikimediaui/widgets.less
@@ -873,20 +873,20 @@
 }
 
 .theme-oo-ui-outlineControlsWidget () {
-   height: 3em;
background-color: @background-color-default;
 
&-items,
&-movers {
-   height: 2em;
-   margin: 0.5em 0.5em 0.5em 0;
-   padding: 0;
+   > .oo-ui-buttonWidget {
+   height: @size-default;
+   width: @size-default;
+   // There's a lot of weird specific margins with weird 
specific selectors
+   margin: 0 !important; /* stylelint-disable-line 
declaration-no-important */
+   }
}
 
> .oo-ui-iconElement-icon {
-   width: 1.5em;
-   height: 2em;
-   margin: 0.5em 0 0.5em 0.5em;
+   height: @size-default;
opacity: 0.2;
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f6433f2ddb3ccc1b94e4f620c8fae9fe366605c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Remove DraggableElement styles

2017-06-23 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361089 )

Change subject: Remove DraggableElement styles
..

Remove DraggableElement styles

Similar styles could be added back to the demo widget,
but it's just to demonstrate functionality so not a
high priority.

Bug: T168745
Change-Id: Ic1dd6c305aaeb1c1990ff1048d5171fe3e7c92cd
---
M src/themes/wikimediaui/elements.less
1 file changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/89/361089/1

diff --git a/src/themes/wikimediaui/elements.less 
b/src/themes/wikimediaui/elements.less
index 547c87a..d23e54f 100644
--- a/src/themes/wikimediaui/elements.less
+++ b/src/themes/wikimediaui/elements.less
@@ -406,15 +406,7 @@
 
 .theme-oo-ui-clippableElement () {}
 
-.theme-oo-ui-draggableElement () {
-   padding: @padding-menu-large;
-
-   &-handle.oo-ui-widget-enabled:focus {
-   border-radius: @border-radius-default;
-   box-shadow: @box-shadow-widget-focus, 0 0 0 1px 
@color-progressive;
-   outline: 0;
-   }
-}
+.theme-oo-ui-draggableElement () {}
 
 .theme-oo-ui-draggableGroupElement () {}
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base: add psmisc to standard_packages

2017-06-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360789 )

Change subject: base: add psmisc to standard_packages
..


base: add psmisc to standard_packages

I would like to suggest adding the "psmisc" package
to standard packages in base.

Reason is i recently _really_ missed 'killall -u '.

Also 'fuser' is super common and i just expect it but (nowadays?)
it needs to be installed from here.

Description-en: utilities that use the proc file system
 This package contains miscellaneous utilities that use the proc FS:
 .
  - fuser: identifies processes that are using files or sockets.
  - killall: kills processes by name (e.g. "killall -HUP named").
  - peekfd: shows the data traveling over a file descriptor.
  - pstree: shows currently running processes as a tree.
  - prtstat: print the contents of /proc//stat

Tag: admin::monitoring, implemented-in::c, interface::commandline,
 interface::text-mode, role::program, scope::utility,
 uitoolkit::ncurses, use::checking, use::monitor,
 works-with::software:running

Change-Id: I745089a2b6ef77c106889bf30ddb4289d60c5250
Section: admin
---
M modules/base/manifests/standard_packages.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/base/manifests/standard_packages.pp 
b/modules/base/manifests/standard_packages.pp
index 122ca51..4df83fc 100644
--- a/modules/base/manifests/standard_packages.pp
+++ b/modules/base/manifests/standard_packages.pp
@@ -29,6 +29,7 @@
 'ncdu',
 'ngrep',
 'pv',
+'psmisc',
 'quickstack',
 'screen',
 'strace',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I745089a2b6ef77c106889bf30ddb4289d60c5250
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Volans 
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...Kartographer[master]: Sidebar: Fix marker coordinates for outer resources

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/357238 )

Change subject: Sidebar: Fix marker coordinates for outer resources
..


Sidebar: Fix marker coordinates for outer resources

Use the initial coordinates of the center of the map
when rendering the external services.

Bug: T160782
Change-Id: Idab15df52f50afbdb9679a112266b07018379479
---
M modules/dialog-sidebar/sidebar.js
1 file changed, 12 insertions(+), 8 deletions(-)

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



diff --git a/modules/dialog-sidebar/sidebar.js 
b/modules/dialog-sidebar/sidebar.js
index 0558987..14486f2 100644
--- a/modules/dialog-sidebar/sidebar.js
+++ b/modules/dialog-sidebar/sidebar.js
@@ -18,6 +18,11 @@
/**
 * @property {Object}
 */
+   this.initialMapPosition = 
this.dialog.map.getInitialMapPosition();
+
+   /**
+* @property {Object}
+*/
this.metadata = mw.config.get( 
'wgKartographerExternalLinks' );
this.parseExternalLinks();
},
@@ -31,10 +36,10 @@
 * @return {string}
 */
SideBar.prototype.formatLink = function ( url ) {
-   var scale = Math.round( Math.pow( 2, Math.min( 3, Math.max( 0, 
18 - this.mapPosition.zoom ) ) ) * 1000 );
-   url = url.replace( new RegExp( '{latitude}', 'g' ), 
this.mapPosition.center.lat );
-   url = url.replace( new RegExp( '{longitude}', 'g' ), 
this.mapPosition.center.lng );
-   url = url.replace( new RegExp( '{zoom}', 'g' ), 
this.mapPosition.zoom );
+   var scale = Math.round( Math.pow( 2, Math.min( 3, Math.max( 0, 
18 - this.initialMapPosition.zoom ) ) ) * 1000 );
+   url = url.replace( new RegExp( '{latitude}', 'g' ), 
this.initialMapPosition.center.lat );
+   url = url.replace( new RegExp( '{longitude}', 'g' ), 
this.initialMapPosition.center.lng );
+   url = url.replace( new RegExp( '{zoom}', 'g' ), 
this.initialMapPosition.zoom );
url = url.replace( new RegExp( '{title}', 'g' ), mw.config.get( 
'wgTitle' ) );
url = url.replace( new RegExp( '{language}', 'g' ), 
mw.config.get( 'wgContentLanguage' ) || mw.config.get( 'wgUserLanguage' ) );
url = url.replace( new RegExp( '{scale}', 'g' ), scale );
@@ -139,7 +144,6 @@
this.mapPosition = this.dialog.map.getMapPosition( { scaled: 
true } );
 
this.renderMapDetails();
-   this.renderExternalServices();
}, 350 );
 
/**
@@ -230,9 +234,9 @@
LBL_EXTERNAL_SERVICES: mw.msg( 
'kartographer-sidebar-externalservices' ),
LBL_SERVICE: mw.msg( 
'kartographer-sidebar-service' ),
services: featured.concat( regular ),
-   latitude: sidebar.mapPosition.center.lat,
-   longitude: sidebar.mapPosition.center.lng,
-   zoom: sidebar.mapPosition.zoom
+   latitude: sidebar.initialMapPosition.center.lat,
+   longitude: 
sidebar.initialMapPosition.center.lng,
+   zoom: sidebar.initialMapPosition.zoom
}
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idab15df52f50afbdb9679a112266b07018379479
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: 0x010C 
Gerrit-Reviewer: 0x010C 
Gerrit-Reviewer: Debt 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: Yurik 
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...VisualEditor[master]: GalleryDialog: Downstream fix for DraggableElement padding

2017-06-23 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361088 )

Change subject: GalleryDialog: Downstream fix for DraggableElement padding
..

GalleryDialog: Downstream fix for DraggableElement padding

Bug: T168745
Change-Id: I95e6f5cd2126878c4f973285fceece1d5a03c4eb
---
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
index 2c2b547..1432195 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
@@ -22,6 +22,9 @@
 .ve-ui-mwGalleryDialog .ve-ui-mwGalleryDialog-image-container-highlighted {
border-color: #36c;
box-shadow: inset 0 0 0 0.1em #36c;
+   /* Override default padding of DraggableElement */
+   /* TODO: Remove once T168745 is resolved */
+   padding: 0;
 }
 
 /* HACK: Override ooui specific 2em top margin */

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: give higher priority to English Apache site

2017-06-23 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361087 )

Change subject: planet: give higher priority to English Apache site
..


planet: give higher priority to English Apache site

The English site is the one with by far the most feeds.

For debugging purposes it's useful to have it as the
default Apache site, when accessing a labs instance or prod
server using the IP address, due to NameBased virtual hosts.

Change-Id: Iec500411071311aa8fcfe72dd95821f9ef097d04
---
M modules/planet/manifests/apachesite.pp
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/modules/planet/manifests/apachesite.pp 
b/modules/planet/manifests/apachesite.pp
index e9c2c5e..939017e 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -1,8 +1,15 @@
 # defined type: an apache site config for a planet-venus language version
 define planet::apachesite {
 
+if $title == 'en' {
+$priority = '10'
+} else {
+$priority = '50'
+}
+
 apache::site { "${title}.planet.${planet::planet_domain_name}":
-content => template('planet/apache/planet-language.erb'),
+content  => template('planet/apache/planet-language.erb'),
+priority => $priority,
 }
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Unify reading filters by views and adjust unit tests

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361018 )

Change subject: RCFilters: Unify reading filters by views and adjust unit tests
..


RCFilters: Unify reading filters by views and adjust unit tests

- Have the initialization method read filters by views and treat
  all filters, regardless of their views, the exact same, including
  evaluating their subsets and conflicts.
- Clean up unit test file and make pass with the new initialization.

Change-Id: I200720ffde8ad8ff7a63d0cd82615d358e74949a
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
4 files changed, 352 insertions(+), 767 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index d3fb66e..c1a936d 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -89,13 +89,13 @@
identifiers: filter.identifiers
} );
 
-   filter.subset = filter.subset || [];
-   filter.subset = filter.subset.map( function ( el ) {
-   return el.filter;
-   } );
-
if ( filter.subset ) {
+   filter.subset = filter.subset.map( function ( 
el ) {
+   return el.filter;
+   } );
+
subsetNames = [];
+
filter.subset.forEach( function ( 
subsetFilterName ) { // eslint-disable-line no-loop-func
// Subsets (unlike conflicts) are 
always inside the same group
// We can re-map the names of the 
filters we are getting from
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index ad0794e..527b96d 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -206,7 +206,7 @@
 * Set filters and preserve a group relationship based on
 * the definition given by an object
 *
-* @param {Array} filters Filters definition
+* @param {Array} filterGroups Filters definition
 * @param {Object} [views] Extra views definition
 *  Expected in the following format:
 *  {
@@ -217,21 +217,20 @@
 * {
 *// Group info
 *name: 'namespaces' // Parameter name
-*definition: {
-*   title: 'namespaces' // Message key
-*   type: 'string_options',
-*   separator: ';',
-*   labelPrefixKey: { 'default': 
'rcfilters-tag-prefix-namespace', inverted: 
'rcfilters-tag-prefix-namespace-inverted' },
-*   fullCoverage: true
-*},
+*title: 'namespaces' // Message key
+*type: 'string_options',
+*separator: ';',
+*labelPrefixKey: { 'default': 
'rcfilters-tag-prefix-namespace', inverted: 
'rcfilters-tag-prefix-namespace-inverted' },
+*fullCoverage: true
 *items: []
 * }
 *   ]
 * }
 *  }
 */
-   mw.rcfilters.dm.FiltersViewModel.prototype.initializeFilters = function 
( filters, views ) {
-   var filterItem, filterConflictResult, groupConflictResult,
+   mw.rcfilters.dm.FiltersViewModel.prototype.initializeFilters = function 
( filterGroups, views ) {
+   var filterConflictResult, groupConflictResult,
+   allViews = {},
model = this,
items = [],
groupConflictMap = {},
@@ -299,28 +298,22 @@
this.groups = {};
this.views = {};
 
-   views = views || {};
+   // Clone
+   filterGroups = OO.copy( filterGroups );
 
-   // Filters
-   this.views.default = { name: 'default', label: mw.msg( 
'rcfilters-filterlist-title' ) };
-   filters.forEach( function ( data ) {
-   var i,
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Change the input icon on interaction

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359508 )

Change subject: RCFilters: Change the input icon on interaction
..


RCFilters: Change the input icon on interaction

Bug: T166917
Change-Id: I72ed88c25d2dfbbafa35cd802d2b9718aa7ba6c8
---
M resources/Resources.php
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index 575ff5a..c6a228b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1859,6 +1859,7 @@
'oojs-ui.styles.icons-editing-styling',
'oojs-ui.styles.icons-interactions',
'oojs-ui.styles.icons-content',
+   'oojs-ui.styles.icons-layout',
],
],
'mediawiki.special' => [
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 268138f..27b6ea1 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -56,7 +56,7 @@
)
},
input: {
-   icon: 'search',
+   icon: 'menu',
placeholder: mw.msg( 
'rcfilters-search-placeholder' )
}
}, config ) );
@@ -221,6 +221,8 @@
this.input.setValue( '' );
}
}
+
+   this.input.setIcon( isVisible ? 'search' : 'menu' );
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72ed88c25d2dfbbafa35cd802d2b9718aa7ba6c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: give higher priority to English Apache site

2017-06-23 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361087 )

Change subject: planet: give higher priority to English Apache site
..

planet: give higher priority to English Apache site

The English site is the one with by far the most feeds,
and for debugging purposes it's useful to have it as the
default Apache site when accessing a labs instance or prod
server using the IP address, due to NameBased virtual hosts.

Change-Id: Iec500411071311aa8fcfe72dd95821f9ef097d04
---
M modules/planet/manifests/apachesite.pp
1 file changed, 8 insertions(+), 1 deletion(-)


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

diff --git a/modules/planet/manifests/apachesite.pp 
b/modules/planet/manifests/apachesite.pp
index e9c2c5e..d97ac4b 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -1,8 +1,15 @@
 # defined type: an apache site config for a planet-venus language version
 define planet::apachesite {
 
+if $title == "en" {
+$priority = "10"
+} else {
+$priority = "50"
+}
+
 apache::site { "${title}.planet.${planet::planet_domain_name}":
-content => template('planet/apache/planet-language.erb'),
+content  => template('planet/apache/planet-language.erb'),
+priority => $priority,
 }
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec500411071311aa8fcfe72dd95821f9ef097d04
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] wikidata...rdf[master]: Make tail poller not to use backoff

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361005 )

Change subject: Make tail poller not to use backoff
..


Make tail poller not to use backoff

Should not influence anything except removing some useless messages.

Change-Id: I22318e77102874879290b7573ae4436a4967
---
M 
tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
M 
tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
2 files changed, 16 insertions(+), 2 deletions(-)

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



diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
 
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
index 1970c8d..cb67259 100644
--- 
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
+++ 
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
@@ -85,6 +85,11 @@
  */
 private TailingChangesPoller tailPoller;
 
+/**
+ * Whether to use backoff.
+ */
+private boolean useBackoff = true;
+
 @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "TODO: move 
to LocalDateTime")
 public RecentChangesPoller(WikibaseRepository wikibase, Date 
firstStartTime,
 int batchSize, Map seenIDs, int tailSeconds) {
@@ -103,6 +108,13 @@
 this(wikibase, firstStartTime, batchSize, createSeenMap(), 
tailSeconds);
 }
 
+/**
+ * Whether to use backoff.
+ * @param useBackoff
+ */
+public void setBackoff(boolean useBackoff) {
+this.useBackoff = useBackoff;
+}
 /**
  * Create map of seen IDs.
  * @return
@@ -149,6 +161,7 @@
 log.info("Started trailing poller with gap of {} seconds", 
tailSeconds);
 // Create new poller starting back tailSeconds and same IDs map.
 final RecentChangesPoller poller = new 
RecentChangesPoller(wikibase, DateUtils.addSeconds(new Date(), -tailSeconds), 
batchSize, seenIDs, -1);
+poller.setBackoff(false);
 tailPoller = new TailingChangesPoller(poller, queue, tailSeconds);
 tailPoller.start();
 } else {
@@ -248,7 +261,7 @@
  * @throws RetryableException on fetch failure
  */
 private JSONObject fetchRecentChanges(Date lastNextStartTime, Batch 
lastBatch) throws RetryableException {
-if (changeIsRecent(lastNextStartTime)) {
+if (useBackoff && changeIsRecent(lastNextStartTime)) {
 return wikibase.fetchRecentChangesByTime(
 DateUtils.addSeconds(lastNextStartTime, -BACKOFF_TIME),
 batchSize);
@@ -321,7 +334,7 @@
 nextStartTime = Math.max(nextStartTime, timestamp.getTime());
 }
 ImmutableList changes = 
ImmutableList.copyOf(changesByTitle.values());
-if (changes.size() == 0 && result.size() >= batchSize) {
+if (useBackoff && changes.size() == 0 && result.size() >= 
batchSize) {
 // We have a problem here - due to backoff, we did not fetch 
any new items
 // Try to advance one second, even though we risk to lose a 
change
 log.info("Backoff overflow, advancing one second");
diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
 
b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
index 70d58b0..75d9d5b 100644
--- 
a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
+++ 
b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
@@ -469,6 +469,7 @@
  *
  * @param startTime the first date to poll from - usually if
  *continueObject isn't null this is ignored by wikibase
+ * @param continueObject Continue object from the last request
  * @param batchSize maximum number of results we want back from 
wikibase
  */
 public URI recentChanges(Date startTime, JSONObject continueObject, 
int batchSize) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22318e77102874879290b7573ae4436a4967
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: fixing typo in dhcpd lease file

2017-06-23 Thread RobH (Code Review)

RobH has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361086 )

Change subject: fixing typo in dhcpd lease file
..


fixing typo in dhcpd lease file

i introduced a typo

Bug:T165366
Change-Id: Ib97f25b99cfe481482b99f617f4bdee8732c1a01
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 1 insertion(+), 1 deletion(-)

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



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 c777486..dbf6980 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6085,7 +6085,7 @@
 }
 
 host stat1006 {
-hardware ethernet 130:E1:71:51:54:48;
+hardware ethernet 30:e1:71:51:54:48;
 fixed-address stat1006.eqiad.wmnet;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib97f25b99cfe481482b99f617f4bdee8732c1a01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
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] operations/puppet[production]: fixing typo in dhcpd lease file

2017-06-23 Thread RobH (Code Review)

RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361086 )

Change subject: fixing typo in dhcpd lease file
..

fixing typo in dhcpd lease file

i introduced a typo

Bug:T165366
Change-Id: Ib97f25b99cfe481482b99f617f4bdee8732c1a01
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/361086/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 c777486..dbf6980 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6085,7 +6085,7 @@
 }
 
 host stat1006 {
-hardware ethernet 130:E1:71:51:54:48;
+hardware ethernet 30:e1:71:51:54:48;
 fixed-address stat1006.eqiad.wmnet;
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: stat1006 install params

2017-06-23 Thread RobH (Code Review)

RobH has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361085 )

Change subject: stat1006 install params
..


stat1006 install params

updating dhcp and netboot

Bug:T165366
Change-Id: Ie995d3e634dcd16b3ebd1629968e63cad0819234
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 520b41e..780b409 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -75,7 +75,7 @@
 elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
 elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
-labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat1005) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
+labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat100[56]) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
 
acrab|acrux|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|releases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 4fa54b9..c777486 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6084,6 +6084,11 @@
 fixed-address stat1005.eqiad.wmnet;
 }
 
+host stat1006 {
+hardware ethernet 130:E1:71:51:54:48;
+fixed-address stat1006.eqiad.wmnet;
+}
+
 host subra {
 hardware ethernet D4:AE:52:AD:62:75;
 fixed-address subra.codfw.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie995d3e634dcd16b3ebd1629968e63cad0819234
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
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] operations/puppet[production]: stat1006 install params

2017-06-23 Thread RobH (Code Review)

RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361085 )

Change subject: stat1006 install params
..

stat1006 install params

updating dhcp and netboot

Bug:T165366
Change-Id: Ie995d3e634dcd16b3ebd1629968e63cad0819234
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 520b41e..780b409 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -75,7 +75,7 @@
 elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
 elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
-labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat1005) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
+labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat100[56]) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
 
acrab|acrux|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|releases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 4fa54b9..c777486 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6084,6 +6084,11 @@
 fixed-address stat1005.eqiad.wmnet;
 }
 
+host stat1006 {
+hardware ethernet 130:E1:71:51:54:48;
+fixed-address stat1006.eqiad.wmnet;
+}
+
 host subra {
 hardware ethernet D4:AE:52:AD:62:75;
 fixed-address subra.codfw.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Quiz extension on huwikibooks

2017-06-23 Thread Framawiki (Code Review)

Framawiki has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361084 )

Change subject: Enable Quiz extension on huwikibooks
..

Enable Quiz extension on huwikibooks

Bug: T168471
Change-Id: Icd13fed94eb6984d0cc5915d4cc2352c6f40fced
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4a9c0a3..ea6f6fa 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11822,6 +11822,7 @@
'nlwikibooks' => true,
'plwikibooks' => true,
'ptwikibooks' => true,
+   'huwikibooks' => true, // T168471
'svwiki' => true,
'viwikibooks' => true, // T40361
'zhwiki' => true,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add sniff to prevent against using PHP 7's Unicode escape sy...

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360987 )

Change subject: Add sniff to prevent against using PHP 7's Unicode escape syntax
..


Add sniff to prevent against using PHP 7's Unicode escape syntax

Bug: T168669
Change-Id: I2c41e31d7749cd98f86089eb0af0d45354ac5091
---
A MediaWiki/Sniffs/AlternativeSyntax/PHP7UnicodeSyntaxSniff.php
A MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php
A MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php.expect
A MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php.fixed
4 files changed, 103 insertions(+), 0 deletions(-)

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



diff --git a/MediaWiki/Sniffs/AlternativeSyntax/PHP7UnicodeSyntaxSniff.php 
b/MediaWiki/Sniffs/AlternativeSyntax/PHP7UnicodeSyntaxSniff.php
new file mode 100644
index 000..ed38020
--- /dev/null
+++ b/MediaWiki/Sniffs/AlternativeSyntax/PHP7UnicodeSyntaxSniff.php
@@ -0,0 +1,65 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+namespace MediaWiki\Sniffs\AlternativeSyntax;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Prevent usage of the new PHP 7 unicode escape syntax
+ *
+ * @see https://wiki.php.net/rfc/unicode_escape
+ */
+class PHP7UnicodeSyntaxSniff implements Sniff {
+   /**
+* @return array
+*/
+   public function register() {
+   return [
+   T_CONSTANT_ENCAPSED_STRING,
+   T_DOUBLE_QUOTED_STRING,
+   T_HEREDOC
+   ];
+   }
+
+   /**
+* @param File $phpcsFile File object.
+* @param int $stackPtr The current token index.
+* @return void
+*/
+   public function process( File $phpcsFile, $stackPtr ) {
+   $tokens = $phpcsFile->getTokens();
+   $info = $tokens[$stackPtr];
+   if ( $info['code'] == T_CONSTANT_ENCAPSED_STRING && 
$info['content'][0] === "'" ) {
+   // Single quoted string
+   return;
+   }
+
+   $matched = preg_match( '/\\\u\{[0-9A-Fa-f]*\}/', 
$info['content'] );
+   if ( $matched ) {
+   $phpcsFile->addError(
+   'PHP 7 Unicode escape syntax not allowed',
+   $stackPtr,
+   'NotAllowed'
+   );
+   }
+   }
+}
diff --git a/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php 
b/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php
new file mode 100644
index 000..05d9549
--- /dev/null
+++ b/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php
@@ -0,0 +1,13 @@
+\u{0303}
+HTML;
diff --git 
a/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php.expect 
b/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php.expect
new file mode 100644
index 000..005e292
--- /dev/null
+++ b/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php.expect
@@ -0,0 +1,12 @@
+  3 | ERROR | PHP 7 Unicode escape syntax not allowed
+|   | (MediaWiki.AlternativeSyntax.PHP7UnicodeSyntax.NotAllowed)
+  4 | ERROR | PHP 7 Unicode escape syntax not allowed
+|   | (MediaWiki.AlternativeSyntax.PHP7UnicodeSyntax.NotAllowed)
+  5 | ERROR | PHP 7 Unicode escape syntax not allowed
+|   | (MediaWiki.AlternativeSyntax.PHP7UnicodeSyntax.NotAllowed)
+  6 | ERROR | PHP 7 Unicode escape syntax not allowed
+|   | (MediaWiki.AlternativeSyntax.PHP7UnicodeSyntax.NotAllowed)
+  7 | ERROR | PHP 7 Unicode escape syntax not allowed
+|   | (MediaWiki.AlternativeSyntax.PHP7UnicodeSyntax.NotAllowed)
+ 12 | ERROR | PHP 7 Unicode escape syntax not allowed
+|   | (MediaWiki.AlternativeSyntax.PHP7UnicodeSyntax.NotAllowed)
diff --git 
a/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php.fixed 
b/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php.fixed
new file mode 100644
index 000..05d9549
--- /dev/null
+++ b/MediaWiki/Tests/files/AlternativeSyntax/php7unicodesyntax.php.fixed
@@ -0,0 +1,13 @@
+\u{0303}
+HTML;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c41e31d7749cd98f86089eb0af0d45354ac5091
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Umherirrender

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Include sniff warning/error codes in test output

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360938 )

Change subject: Include sniff warning/error codes in test output
..


Include sniff warning/error codes in test output

This is more like how PHPCS is run (phpcs -sp), and it makes it easier
for us to spot poorly named error codes.

While we're at it, remove the extraneous output PHPCS that we normally
strip in the test runner anyways since it's not useful.

Change-Id: Id09a0a78db344f3a319c9594ea7744e15149cecc
---
M MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax.php.expect
M MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
M 
MediaWiki/Tests/files/ControlStructures/assignment_in_control_structures.php.expect
M MediaWiki/Tests/files/ControlStructures/if_else_structure.php.expect
M 
MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php.expect
M 
MediaWiki/Tests/files/ExtraCharacters/parenthesis_after_keyword_tag_fail.php.expect
M 
MediaWiki/Tests/files/ExtraCharacters/valid_shebang_before_phpopen_tag_fail.php.expect
M MediaWiki/Tests/files/NamingConventions/case_global_name.php.expect
M MediaWiki/Tests/files/NamingConventions/function_name.php.expect
M MediaWiki/Tests/files/NamingConventions/wf_global_function.php.expect
M MediaWiki/Tests/files/Usage/dbr_query_usage.php.expect
M MediaWiki/Tests/files/Usage/dir_usage.php.expect
M MediaWiki/Tests/files/Usage/extend_class_usage.php.expect
M MediaWiki/Tests/files/Usage/goto_usage.php.expect
M MediaWiki/Tests/files/Usage/super_globals_usage.php.expect
M MediaWiki/Tests/files/VariableAnalysis/used_global_variables.php.expect
M MediaWiki/Tests/files/WhiteSpace/empty_line_begin_function.php.expect
M MediaWiki/Tests/files/WhiteSpace/multiple_empty_lines.php.expect
M MediaWiki/Tests/files/WhiteSpace/space_after_closure.php.expect
M MediaWiki/Tests/files/WhiteSpace/space_before_class_brace.php.expect
M MediaWiki/Tests/files/WhiteSpace/space_before_parens.php.expect
M MediaWiki/Tests/files/WhiteSpace/space_before_singleline_comment.php.expect
M MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php.expect
M MediaWiki/Tests/files/generic_fail.php.expect
M TestHelper.php
26 files changed, 116 insertions(+), 252 deletions(-)

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



diff --git 
a/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax.php.expect 
b/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax.php.expect
index a588cba..c036217 100644
--- a/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax.php.expect
+++ b/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax.php.expect
@@ -1,20 +1,17 @@
-
-FILE: ...r/MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax.php
---
-FOUND 0 ERRORS AND 6 WARNINGS AFFECTING 6 LINES
---
  10 | WARNING | Alternative syntax such as "enddeclare" should not be
 | | used
+| | 
(MediaWiki.AlternativeSyntax.AlternativeSyntax.AlternativeSyntax)
  14 | WARNING | Alternative syntax such as "endfor" should not be
 | | used
+| | 
(MediaWiki.AlternativeSyntax.AlternativeSyntax.AlternativeSyntax)
  18 | WARNING | Alternative syntax such as "endforeach" should not be
 | | used
+| | 
(MediaWiki.AlternativeSyntax.AlternativeSyntax.AlternativeSyntax)
  24 | WARNING | Alternative syntax such as "endif" should not be used
+| | 
(MediaWiki.AlternativeSyntax.AlternativeSyntax.AlternativeSyntax)
  30 | WARNING | Alternative syntax such as "endswitch" should not be
 | | used
+| | 
(MediaWiki.AlternativeSyntax.AlternativeSyntax.AlternativeSyntax)
  34 | WARNING | Alternative syntax such as "endwhile" should not be
 | | used
---
-
-Time: 23ms; Memory: 4Mb
-
+| | 
(MediaWiki.AlternativeSyntax.AlternativeSyntax.AlternativeSyntax)
\ No newline at end of file
diff --git a/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect 
b/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
index cb897a4..b358daf 100644
--- a/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
+++ b/MediaWiki/Tests/files/Commenting/comment_single_line.php.expect
@@ -1,14 +1,7 @@
-
-FILE: ...sniffer/MediaWiki/Tests/files/Commenting/comment_single_line.php
---
-FOUND 0 ERRORS AND 3 WARNINGS AFFECTING 3 LINES
---
  7 | WARNING | [x] Invalid start of a single line comment
+   | |

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Remove code relating to pointer overlays in main menu

2017-06-23 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361083 )

Change subject: Hygiene: Remove code relating to pointer overlays in main menu
..

Hygiene: Remove code relating to pointer overlays in main menu

It's not being used (since Gather) and has been
neglected and cannot be trusted.
We can revisit and come up with a more generic solution if we need
to use the pointer overlay inside the menu again.

Change-Id: I52bf15ea45bdad954822a0d91aef0f7661524de3
---
M skinStyles/mobile.pointerOverlay/minerva.less
1 file changed, 0 insertions(+), 7 deletions(-)


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

diff --git a/skinStyles/mobile.pointerOverlay/minerva.less 
b/skinStyles/mobile.pointerOverlay/minerva.less
index 9bfcc54..508bb1f 100644
--- a/skinStyles/mobile.pointerOverlay/minerva.less
+++ b/skinStyles/mobile.pointerOverlay/minerva.less
@@ -89,10 +89,3 @@
}
}
 }
-
-.navigation-drawer {
-   .pointer-overlay {
-   right: auto;
-   width: @menuWidth;
-   }
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52bf15ea45bdad954822a0d91aef0f7661524de3
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] operations/puppet[production]: stat1005 needs jessie

2017-06-23 Thread RobH (Code Review)

RobH has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361082 )

Change subject: stat1005 needs jessie
..


stat1005 needs jessie

not stretch

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

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



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 dcfc84d..4fa54b9 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6082,8 +6082,6 @@
 host stat1005 {
 hardware ethernet 18:66:DA:FA:0B:C4;
 fixed-address stat1005.eqiad.wmnet;
-option pxelinux.pathprefix "stretch-installer/";
-filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host subra {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49a98f4eb45a8a923a22d9fba9054553dee57b66
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
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] mediawiki...CommentStreams[master]: Bug fixes: deletion of comments with replies and notifications

2017-06-23 Thread Cicalese (Code Review)

Cicalese has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361077 )

Change subject: Bug fixes: deletion of comments with replies and notifications
..


Bug fixes: deletion of comments with replies and notifications

Change-Id: I0eb57c61fef6acc8a3f0c434dac2fbc20fc3600a
---
M extension.json
M includes/ApiCSDeleteComment.php
M includes/ApiCSPostComment.php
M includes/Comment.php
M includes/EchoCSPresentationModel.php
5 files changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/extension.json b/extension.json
index 4416d20..7df4da3 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "CommentStreams",
-   "version": "3.8",
+   "version": "3.9",
"author": [
"[http://www.mediawiki.org/wiki/User:Jji Jason Ji]",
"[http://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]"
diff --git a/includes/ApiCSDeleteComment.php b/includes/ApiCSDeleteComment.php
index 0943912..460038c 100644
--- a/includes/ApiCSDeleteComment.php
+++ b/includes/ApiCSDeleteComment.php
@@ -43,7 +43,8 @@
}
 
if ( $this->getUser()->getId() ===
-   
$this->comment->getWikiPage()->getOldestRevision()->getUser() ) {
+   
$this->comment->getWikiPage()->getOldestRevision()->getUser() &&
+   $this->comment->getNumReplies() === 0 ) {
$action = 'edit'; // need edit but not delete to delete 
a comment
} else {
$action = 'cs-moderator-delete';
diff --git a/includes/ApiCSPostComment.php b/includes/ApiCSPostComment.php
index e95df31..e191e57 100644
--- a/includes/ApiCSPostComment.php
+++ b/includes/ApiCSPostComment.php
@@ -170,7 +170,8 @@
}
 
$extra = [
-   'comment' => $comment->getId(),
+   'comment_id' => $comment->getId(),
+   'parent_id' => $comment->getParentId(),
'comment_author_username' => $comment->getUsername(),
'comment_author_display_name' => 
$comment->getUserDisplayNameUnlinked(),
'comment_title' => $comment_title,
diff --git a/includes/Comment.php b/includes/Comment.php
index 4dfa05f..84bf186 100644
--- a/includes/Comment.php
+++ b/includes/Comment.php
@@ -945,7 +945,7 @@
 * @return array array mapping user id to User object
 */
public static function locateUsersWatchingComment( $event ) {
-   $id = $event->getExtraParam( 'comment' );
+   $id = $event->getExtraParam( 'parent_id' );
$wikipage = WikiPage::newFromId( $id );
if ( !is_null( $wikipage ) ) {
$comment = Comment::newFromWikiPage( $wikipage );
diff --git a/includes/EchoCSPresentationModel.php 
b/includes/EchoCSPresentationModel.php
index 66d0b71..c95657c 100644
--- a/includes/EchoCSPresentationModel.php
+++ b/includes/EchoCSPresentationModel.php
@@ -37,7 +37,7 @@
 *['url' => (string) url, 'label' => (string) link 
text (non-escaped)]
 */
public function getPrimaryLink() {
-   $id = $this->event->getExtraParam( 'comment' );
+   $id = $this->event->getExtraParam( 'comment_id' );
return [
'url' => $this->event->getTitle()->getFullURL() . 
'#cs-comment-' . $id,
'label' => $this->msg( 
"notification-link-label-{$this->type}" )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0eb57c61fef6acc8a3f0c434dac2fbc20fc3600a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommentStreams
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: stat1005 needs jessie

2017-06-23 Thread RobH (Code Review)

RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361082 )

Change subject: stat1005 needs jessie
..

stat1005 needs jessie

not stretch

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/361082/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 dcfc84d..4fa54b9 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6082,8 +6082,6 @@
 host stat1005 {
 hardware ethernet 18:66:DA:FA:0B:C4;
 fixed-address stat1005.eqiad.wmnet;
-option pxelinux.pathprefix "stretch-installer/";
-filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host subra {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWTransclusionDialog: fix conditions for "show options" butt...

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/358984 )

Change subject: MWTransclusionDialog: fix conditions for "show options" button 
disabling
..


MWTransclusionDialog: fix conditions for "show options" button disabling

As I understand it, the button should be enabled whenever there's more than
one option in the sidebar, and disabled otherwise. The previously chosen
conditions weren't perfectly proxying this, and the button would be disabled
whenever editing an already-existing transclusion.

Bug: T167710
Change-Id: Id303b680c072642ae7b66066e28ecc9f1dc90fd7
---
M lib/ve
M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
2 files changed, 27 insertions(+), 7 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index a25e5de..19942cc 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit a25e5de6740217a0c5f1efedc885815f5af0148f
+Subproject commit 19942cca31c585ec58de8bbdf034fae497bbb760
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
index d742924..7ac6395 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
@@ -244,7 +244,7 @@
this.setSize( single ? 'medium' : 'large' );
this.bookletLayout.toggleOutline( !single );
this.updateTitle();
-   this.updateModeActionLabel();
+   this.updateModeActionState();
 
// HACK blur any active input so that its dropdown will be 
hidden and won't end
// up being mispositioned
@@ -265,10 +265,11 @@
 };
 
 /**
- * Update the label for the 'mode' action
+ * Update the state of the 'mode' action
  */
-ve.ui.MWTransclusionDialog.prototype.updateModeActionLabel = function () {
-   var mode = this.mode;
+ve.ui.MWTransclusionDialog.prototype.updateModeActionState = function () {
+   var parts = this.transclusionModel && this.transclusionModel.getParts(),
+   mode = this.mode;
this.actions.forEach( { actions: [ 'mode' ] }, function ( action ) {
action.setLabel(
mode === 'single' ?
@@ -276,6 +277,26 @@
ve.msg( 
'visualeditor-dialog-transclusion-single-mode' )
);
} );
+
+   // Decide whether the button should be enabled or not. It needs to be:
+   // * disabled when we're in the initial add-new-template phase, because 
it's
+   //   meaningless
+   // * disabled if we're in a multi-part transclusion, because the 
sidebar's
+   //   forced open
+   // * enabled if we're in a single-part transclusion, because the 
sidebar's
+   //   closed but can be opened to add more parts
+   if ( parts ) {
+   if ( parts.length === 1 && parts[ 0 ] instanceof 
ve.dm.MWTemplatePlaceholderModel ) {
+   // Initial new-template phase: button is meaningless
+   this.actions.setAbilities( { mode: false } );
+   } else if ( !this.isSingleTemplateTransclusion() ) {
+   // Multi-part transclusion: button disabled because 
sidebar forced-open
+   this.actions.setAbilities( { mode: false } );
+   } else {
+   // Single-part transclusion: button enabled because 
sidebar is optional
+   this.actions.setAbilities( { mode: true } );
+   }
+   }
 };
 
 /**
@@ -358,8 +379,7 @@
return ve.ui.MWTransclusionDialog.super.prototype.getSetupProcess.call( 
this, data )
.next( function () {
this.setMode( 'single' );
-   this.updateModeActionLabel();
-   this.actions.setAbilities( { mode: false } );
+   this.updateModeActionState();
}, this );
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id303b680c072642ae7b66066e28ecc9f1dc90fd7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Reconcile synced reading lists when a different user logs in.

2017-06-23 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361081 )

Change subject: Reconcile synced reading lists when a different user logs in.
..

Reconcile synced reading lists when a different user logs in.

Bug: T162763
Change-Id: I50f6815a745de942bfb4f368d7bbd2c790e76435
---
M app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values/preference_keys.xml
3 files changed, 31 insertions(+), 3 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java 
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
index 503f5aa..b9d3055 100644
--- 
a/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
+++ 
b/app/src/main/java/org/wikipedia/readinglist/sync/ReadingListSynchronizer.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.os.Handler;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.auth.AccountUtil;
@@ -26,6 +27,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -79,7 +81,13 @@
 }
 }
 
-if ((remoteReadingLists == null) || 
(remoteReadingLists.rev() < localRev)) {
+if (Prefs.hasReadingListsCurrentUser()
+&& 
!Prefs.isReadingListsCurrentUser(AccountUtil.getUserName())) {
+reconcileAsRightJoin(remoteReadingLists);
+if (remoteReadingLists != null) {
+
Prefs.setReadingListSyncRev(remoteReadingLists.rev());
+}
+} else if ((remoteReadingLists == null) || 
(remoteReadingLists.rev() < localRev)) {
 if (localRev == 0) {
 // If this is the first time we're syncing, 
bump the rev explicitly.
 bumpRev();
@@ -99,6 +107,7 @@
 deleteRemoteReadingLists();
 }
 }
+
Prefs.setReadingListsCurrentUser(AccountUtil.getUserName());
 }
 syncSavedPages();
 
@@ -141,9 +150,10 @@
 Prefs.setReadingListSyncRev(Prefs.getReadingListSyncRev() + 1);
 }
 
-private void reconcileAsRightJoin(@NonNull RemoteReadingLists 
remoteReadingLists) {
+private void reconcileAsRightJoin(@Nullable RemoteReadingLists 
remoteReadingLists) {
 List localLists = 
ReadingListData.instance().queryMruLists(null);
-List remoteLists = remoteReadingLists.lists();
+List remoteLists = remoteReadingLists == null
+? Collections.emptyList() : 
remoteReadingLists.lists();
 
 // Remove any pages that already exist in local lists from remote 
lists.
 // At the end of this loop, whatever is left in remoteLists will be 
added.
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index ec3c998..3ea3eeb 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -4,6 +4,7 @@
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 
 import com.google.gson.reflect.TypeToken;
 
@@ -19,6 +20,7 @@
 import org.wikipedia.page.tabs.Tab;
 import org.wikipedia.theme.Theme;
 import org.wikipedia.util.ReleaseUtil;
+import org.wikipedia.util.StringUtil;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -499,5 +501,20 @@
 
setBoolean(R.string.preference_key_reading_lists_remote_delete_pending, 
pending);
 }
 
+public static void setReadingListsCurrentUser(@Nullable String userName) {
+setString(R.string.preference_key_reading_lists_current_user_hash,
+TextUtils.isEmpty(userName) ? "" : 
StringUtil.md5string(userName));
+}
+
+public static boolean hasReadingListsCurrentUser() {
+return 
!TextUtils.isEmpty(getString(R.string.preference_key_reading_lists_current_user_hash,
 ""));
+}
+
+public static boolean isReadingListsCurrentUser(@Nullable String userName) 
{
+return !TextUtils.isEmpty(userName)
+&& 
getString(R.string.preference_key_reading_lists_current_user_hash, "")
+.equals(StringUtil.md5string(userName));
+}
+
 private Prefs() { }
 }
diff

[MediaWiki-commits] [Gerrit] operations/puppet[production]: stat1005 install module update

2017-06-23 Thread RobH (Code Review)

RobH has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361079 )

Change subject: stat1005 install module update
..


stat1005 install module update

updating dhcp and netboot for stat1005 installation

Bug:T165368
Change-Id: Ibd73058989c8b3769903c48a3ce96009e1eee69f
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 5e8d922..520b41e 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -75,7 +75,7 @@
 elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
 elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
-labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
+labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat1005) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
 
acrab|acrux|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|releases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 7dfac79..dcfc84d 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6079,6 +6079,13 @@
 fixed-address stat1004.eqiad.wmnet;
 }
 
+host stat1005 {
+hardware ethernet 18:66:DA:FA:0B:C4;
+fixed-address stat1005.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host subra {
 hardware ethernet D4:AE:52:AD:62:75;
 fixed-address subra.codfw.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd73058989c8b3769903c48a3ce96009e1eee69f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
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] mediawiki...deploy[master]: Temporary disable ORES rules

2017-06-23 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361080 )

Change subject: Temporary disable ORES rules
..


Temporary disable ORES rules

Change-Id: Ifd89a9cf911e505cf3a8b3d88047561365ccb6db
---
M scap/templates/config.yaml.j2
1 file changed, 254 insertions(+), 254 deletions(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 7ca082d..af98b26 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -335,260 +335,260 @@
   uri: 
'/sys/links/transcludes/{message.original_event.page_title}'
   body: '{{globals.message}}'
 
-  # ORES caching updates
-  <%- if ores_uris is not defined -%>
-<%- set ores_uris = [ ores_uri ] -%>
-  <%- endif %>
-  <%- for ores_uri in ores_uris %>
-  ores_cache_<%= loop.index %>:
-topic: mediawiki.revision-create
-concurrency: 15
-ignore:
-  status:
-- 503
-cases:
-  - match:
-  meta:
-domain: ar.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/arwiki/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: cs.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/cswiki/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: en.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/enwiki/'
-  query:
-models: 'reverted|damaging|goodfaith'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: en.wiktionary.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/enwiktionary/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: es.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/eswiki/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: et.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/etwiki/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: fa.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/fawiki/'
-  query:
-models: 'reverted|damaging|goodfaith'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: fr.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/frwiki/'
-  query:
-

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Temporary disable ORES rules

2017-06-23 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361080 )

Change subject: Temporary disable ORES rules
..

Temporary disable ORES rules

Change-Id: Ifd89a9cf911e505cf3a8b3d88047561365ccb6db
---
M scap/templates/config.yaml.j2
1 file changed, 254 insertions(+), 254 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/80/361080/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 7ca082d..af98b26 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -335,260 +335,260 @@
   uri: 
'/sys/links/transcludes/{message.original_event.page_title}'
   body: '{{globals.message}}'
 
-  # ORES caching updates
-  <%- if ores_uris is not defined -%>
-<%- set ores_uris = [ ores_uri ] -%>
-  <%- endif %>
-  <%- for ores_uri in ores_uris %>
-  ores_cache_<%= loop.index %>:
-topic: mediawiki.revision-create
-concurrency: 15
-ignore:
-  status:
-- 503
-cases:
-  - match:
-  meta:
-domain: ar.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/arwiki/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: cs.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/cswiki/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: en.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/enwiki/'
-  query:
-models: 'reverted|damaging|goodfaith'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: en.wiktionary.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/enwiktionary/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: es.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/eswiki/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: et.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/etwiki/'
-  query:
-models: 'reverted'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: fa.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri %>/v2/scores/fawiki/'
-  query:
-models: 'reverted|damaging|goodfaith'
-revids: '{{message.rev_id}}'
-precache: true
-format: 'json'
-  - match:
-  meta:
-domain: fr.wikipedia.org
-  performer:
-user_is_bot: false
-exec:
-  uri: '<%= ores_uri

[MediaWiki-commits] [Gerrit] operations/puppet[production]: stat1005 install module update

2017-06-23 Thread RobH (Code Review)

RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361079 )

Change subject: stat1005 install module update
..

stat1005 install module update

updating dhcp and netboot for stat1005 installation

Bug:T165368
Change-Id: Ibd73058989c8b3769903c48a3ce96009e1eee69f
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 8 insertions(+), 1 deletion(-)


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

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 5e8d922..520b41e 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -75,7 +75,7 @@
 elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \
 elastic103[2-9]|elastic104[0-9]|elastic105[0-2]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
 elastic20[0-2][0-9]|elastic203[0-6]) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg ;; \
-labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
+labmon1001|mwlog[12]001|relforge100[12]|scb200[1-6]|stat1005) echo 
partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
 analytics1003|cobalt|thorium) echo partman/raid10-gpt-srv-lvm-ext4.cfg 
;; \
 
acrab|acrux|aluminium|argon|chlorine|bromine|bohrium|darmstadtium|dbmonitor[12]001|dubnium|etcd100[1-6]|etherpad[12]001|fermium|hassaleh|hassium|krypton|kubetcd[12]00[1-3]|meitnerium|mendelevium|mwdebug100[12]|releases1001|nihal|nitrogen|planet[12]001|pollux|roentgenium|rutherfordium|sca[12]00[34]|seaborgium|serpens|tureis|alsafi|kraz|install[12]00[12]|ununpentium|zosma)
 echo partman/flat.cfg virtual.cfg ;; \
 kubestagetcd100[123]|neon) echo partman/flat.cfg virtual.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 7dfac79..dcfc84d 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6079,6 +6079,13 @@
 fixed-address stat1004.eqiad.wmnet;
 }
 
+host stat1005 {
+hardware ethernet 18:66:DA:FA:0B:C4;
+fixed-address stat1005.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host subra {
 hardware ethernet D4:AE:52:AD:62:75;
 fixed-address subra.codfw.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...webplatform[master]: Ditch #mw-js-message, not needed anymore

2017-06-23 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360915 )

Change subject: Ditch #mw-js-message, not needed anymore
..


Ditch #mw-js-message, not needed anymore

Years ago this was needed by the AJAX page watching functionality, but not
anymore.

Change-Id: Iec7dcc331b14f40dce980aa4bead5bf00105fc7f
---
M WebPlatformTemplate.class.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/WebPlatformTemplate.class.php b/WebPlatformTemplate.class.php
index cce0c0b..e882c18 100644
--- a/WebPlatformTemplate.class.php
+++ b/WebPlatformTemplate.class.php
@@ -124,7 +124,6 @@

 

-   html( 'userlangattributes' ) ?>>
data['sitenotice'] ): ?>

html( 'sitenotice' ) ?>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec7dcc331b14f40dce980aa4bead5bf00105fc7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/webplatform
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
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] operations/puppet[production]: Planet-fr: Add frwiki Wikimag bulletin

2017-06-23 Thread Framawiki (Code Review)

Framawiki has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/361078 )

Change subject: Planet-fr: Add frwiki Wikimag bulletin
..

Planet-fr: Add frwiki Wikimag bulletin

Bug: T168005
Change-Id: Iab8a8d16186cb123ad1aed83b1edbecc959a84c1
---
M modules/planet/templates/feeds/fr_config.erb
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/planet/templates/feeds/fr_config.erb 
b/modules/planet/templates/feeds/fr_config.erb
index a53c7bc..435b3af 100644
--- a/modules/planet/templates/feeds/fr_config.erb
+++ b/modules/planet/templates/feeds/fr_config.erb
@@ -193,3 +193,6 @@
 
 [http://wikitraits.tumblr.com/rss]
 name=Wikitraits
+
+[https://fr.wikipedia.org/w/api.php?action=featuredfeed=wikimag=atom]
+name=Wikimag

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

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

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

1 2 3 >

1 - 100 of 203 matches

Mail list logo