[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fixing member list-related bug

[Harej (Code Review)]

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

Change subject: Fixing member list-related bug
..

Fixing member list-related bug

If you tried to delete a member in the "inactive" column of a member
list it led to an error caused by column 1 being a pseudcolumn. This
patch fixes that.

Change-Id: If89c9990d427d61f44517afb4db2df14afa9fe32
---
M modules/ext.CollaborationKit.list.edit.js
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/ext.CollaborationKit.list.edit.js 
b/modules/ext.CollaborationKit.list.edit.js
index a768ce5..c90269a 100644
--- a/modules/ext.CollaborationKit.list.edit.js
+++ b/modules/ext.CollaborationKit.list.edit.js
@@ -29,6 +29,11 @@
title = $item.data( 'collabkit-item-title' ),
colId = getColId( $item );
 
+   if ( mw.config.get( 'wgCollaborationKitIsMemberList' ) ) {
+   // Member lists' Column 1 is a pseudocolumn
+   colId = 0;
+   }
+
$spinner = $.createSpinner( {
size: 'small',
type: 'inline'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If89c9990d427d61f44517afb4db2df14afa9fe32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: pagegenerators_tests.py: Length of newpages can be zero

[Dalba (Code Review)]

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

Change subject: pagegenerators_tests.py: Length of newpages can be zero
..

pagegenerators_tests.py: Length of newpages can be zero

Recent changes table holds only the edits of the last 30 days on Wikimedia
sites.[1] Beta Wikisource has not had any edits in this period, therefore
the test was failing.

[1]: https://goo.gl/JHwrD4

Bug: T159029
Change-Id: I8580a0475153faa76ad5964d473dacaaa6d40a6f
---
M tests/pagegenerators_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/10/339810/1

diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 133caf8..109c60a 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -851,7 +851,7 @@
 gen = gf.getCombinedGenerator()
 self.assertIsNotNone(gen)
 pages = set(gen)
-self.assertGreater(len(pages), 0)
+self.assertGreaterEqual(len(pages), 0)
 self.assertLessEqual(len(pages), 60)
 
 def test_newpages_ns_default(self):

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: Improving RTL layout

[jenkins-bot (Code Review)]

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

Change subject: Improving RTL layout
..


Improving RTL layout

In lieu of cssjanus, converting footer elements
to use inline block for layout instead of floats to
better support RTL languages. Also slightly
improving typeahead by setting text-align:initial.
Typeahead thumbnails are still floated left, but
that shouldn't impare readability.

Bug: T129771

Change-Id: I9377d85a53d8b3d0cf99d9b032e7a9aa9ff458d6
---
M dev/wikipedia.org/assets/postcss/_footer.css
M dev/wikipedia.org/assets/postcss/_wm-portal.css
M dev/wikipedia.org/assets/postcss/_wm-typeahead.css
3 files changed, 10 insertions(+), 12 deletions(-)

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



diff --git a/dev/wikipedia.org/assets/postcss/_footer.css 
b/dev/wikipedia.org/assets/postcss/_footer.css
index 15168ad..d69d5db 100644
--- a/dev/wikipedia.org/assets/postcss/_footer.css
+++ b/dev/wikipedia.org/assets/postcss/_footer.css
@@ -7,6 +7,8 @@
 margin: 0 auto;
 padding: 2.6rem 1em 1em 1em;
 font-size: 0.8rem;
+overflow: hidden;
+max-width: 100%;
 }
 .footer:before,
 .footer:after {
@@ -16,11 +18,6 @@
 
 .footer:after {
 clear: both;
-}
-
-.footer a,
-.footer a:focus {
-white-space: normal;
 }
 
 .footer-sidebar {
@@ -74,14 +71,13 @@
 .other-project-link {
 display: inline-block;
 min-height: 50px;
+white-space: nowrap;
+max-width: 100%;
 }
 
 .other-project-icon {
-position: absolute;
-display: block;
+display: inline-block;
 width: 50px;
-top: 0;
-left: 0;
 text-align: center;
 }
 
@@ -90,8 +86,10 @@
 }
 
 .other-project-text {
-margin-left: 60px;
-margin-right: 20px;
+display: inline-block;
+vertical-align: top;
+white-space: normal;
+max-width: 70%; /* approximating the 50px width of the icon */
 }
 
 .other-project-title,
diff --git a/dev/wikipedia.org/assets/postcss/_wm-portal.css 
b/dev/wikipedia.org/assets/postcss/_wm-portal.css
index 13b0315..2d475d8 100644
--- a/dev/wikipedia.org/assets/postcss/_wm-portal.css
+++ b/dev/wikipedia.org/assets/postcss/_wm-portal.css
@@ -18,7 +18,6 @@
 a:active,
 a:focus {
 unicode-bidi: embed;
-white-space: nowrap;
 outline: 0;
 color: var( --color-primary );
 text-decoration: none;
diff --git a/dev/wikipedia.org/assets/postcss/_wm-typeahead.css 
b/dev/wikipedia.org/assets/postcss/_wm-typeahead.css
index a49bd41..0e9f2a2 100644
--- a/dev/wikipedia.org/assets/postcss/_wm-typeahead.css
+++ b/dev/wikipedia.org/assets/postcss/_wm-typeahead.css
@@ -27,6 +27,7 @@
 padding: 10px 10px 10px 85px;
 text-decoration: none;
 white-space: normal;
+text-align: initial;
 }
 
 .suggestion-link.active {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9377d85a53d8b3d0cf99d9b032e7a9aa9ff458d6
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/portals
Gerrit-Branch: master
Gerrit-Owner: Jdrewniak 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Mxn 
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...parsoid[master]: T156296: Update baseconfigs, this time including enwiki

[jenkins-bot (Code Review)]

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

Change subject: T156296: Update baseconfigs, this time including enwiki
..


T156296: Update baseconfigs, this time including enwiki

 * Replace the "Wikipedia" namespace w/ "Base MW" in parserTests for
   extlinks.

 * Adjust one parserTests for the rearranging of thumbnail.

Change-Id: I885ab8ef245d7ec47c4607a16ed8e717f7ca99a7
---
M bin/parserTests.js
M lib/config/baseconfig/be-taraskwiki.json
M lib/config/baseconfig/cawiki.json
M lib/config/baseconfig/cswiki.json
M lib/config/baseconfig/dewiki.json
M lib/config/baseconfig/enwiki.json
M lib/config/baseconfig/eswiki.json
M lib/config/baseconfig/fawiki.json
M lib/config/baseconfig/fiwiki.json
M lib/config/baseconfig/frwiki.json
M lib/config/baseconfig/iswiki.json
M lib/config/baseconfig/kaawiki.json
M lib/config/baseconfig/lnwiki.json
M lib/config/baseconfig/nlwiki.json
M lib/config/baseconfig/srwiki.json
M lib/config/baseconfig/trwiki.json
M lib/config/baseconfig/zhwiki.json
M tests/parserTests.txt
M tests/parserTests.utils.js
M tests/timedMediaHandlerParserTests-blacklist.js
M tools/sync-baseconfig.js
21 files changed, 7,484 insertions(+), 1,301 deletions(-)

Approvals:
  C. Scott Ananian: Looks good to me, approved
  jenkins-bot: Verified




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I885ab8ef245d7ec47c4607a16ed8e717f7ca99a7
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix typos in parserTests.txt

[jenkins-bot (Code Review)]

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

Change subject: Fix typos in parserTests.txt
..


Fix typos in parserTests.txt

Change-Id: I893d5dd78fe7603ebb080e2ef1083c64de32fde3
---
M tests/parserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  C. Scott Ananian: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 01eb218..01afbd6 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -24140,7 +24140,7 @@
 !! test
 4. No escaping needed
 !! options
-options=html2wt
+parsoid=html2wt
 !! html/parsoid
 'bar'
 'bar'
@@ -24277,7 +24277,7 @@
 !! test
 4. Leading whitespace in indent-pre suppressing contexts should not be escaped
 !! options
-options=html2wt
+parsoid=html2wt
 !! html/parsoid
  caption
 !! wikitext

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I893d5dd78fe7603ebb080e2ef1083c64de32fde3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T156295: Make tests php only

[jenkins-bot (Code Review)]

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

Change subject: T156295: Make  tests php only
..


T156295: Make  tests php only

Change-Id: I7c4699a6b5ac1f2d1c891f0d66b3e1cc7d0bd5fa
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 3 insertions(+), 17 deletions(-)

Approvals:
  C. Scott Ananian: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index ad16405..dc5b9cb 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -240,9 +240,6 @@
 add("wt2html", "formatdate parser function, with default format and on a page 
of which the content language is always English and different from the wiki 
content language", "Parser
 function implementation for pf_#formatdate missing in Parsoid.");
 add("wt2html", "Bad images - basic functionality", "");
 add("wt2html", "Bad images - T18039: text after bad image disappears", "Foo bar\n\nBar
 foo");
-add("wt2html", "Page status indicators: Empty name is invalid", "indicator name=\" 
\">/indicator>\nindicator>/indicator>");
-add("wt2html", "Page status indicators: Weird syntaxes that are okay", "indicator name=\"empty\" 
/>\nindicator 
name=\"name\">/indicator>");
-add("wt2html", "Page status indicators: Torture test", "indicator name=\"01\">hello 
world/indicator>\nindicator name=\"02\">[[Main 
Page]]/indicator>\nindicator 
name=\"03\">[[File:Foobar.jpg|25px|link=]]/indicator>\nindicator 
name=\"04\">[[File:Foobar.jpg|25px]]/indicator>\nindicator name=\"05\">* foo\n* 
bar/indicator>\nindicator 
name=\"06\">nowiki>foo/nowiki>/indicator>\nindicator name=\"07\"> 
Preformatted/indicator>\nindicator name=\"08\">div>Broken 
tag/indicator>\nindicator name=\"09\">{| 
class=wikitable\n| cell\n|}/indicator>\nindicator 
name=\"10\">Two\n\nparagraphs/indicator>");
 add("wt2html", "T33098 Template which includes system messages which includes 
the template", "Parser
 function implementation for pf_int missing in Parsoid.\nParser function 
implementation for pf_int missing in Parsoid.");
 add("wt2html", "T33490 Turkish: ucfirst 'ix'", "Ix");
 add("wt2html", "T33490 Turkish: ucfırst (with a dotless i)", "{{ucfırst:blah}}");
@@ -344,7 +341,6 @@
 add("wt2wt", "T2529: Uncovered bullet leaving empty list, normally removed by 
tidy", "*** Foo \n{{bullet}}");
 add("wt2wt", "HHP2.1: Heuristics for headings in preprocessor parenthetical 
structures", "{{foo|\n=heading=\n");
 add("wt2wt", "HHP2.2: Heuristics for headings in preprocessor parenthetical 
structures", "{{foo|\n==heading==\n");
-add("wt2wt", "Page status indicators: Empty name is invalid", "\n\n");
 add("wt2wt", "T21052 U+3000 IDEOGRAPHIC SPACE should terminate bracketed 
external links", "[http://www.example.org/ ideograms]\n");
 add("wt2wt", "Ignore pipe between table row attributes", "{|\n| quux\n|- 
id=\"foo\" style=\"color: red\" |\n| bar\n|}");
 add("wt2wt", "2. Bad treebuilder fixup of formatting elt is cleaned up", 
"'''foo'''[[File:Foobar.jpg|thumb|'''caption''']]'''bar'''\n\n[[Image:Foobar.jpg|right|300px]]");
@@ -541,8 +537,6 @@
 add("html2html", "Free external link invading image caption", "http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg\; 
alt=\"180px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[71,135,null,null]}'/>  [/wiki/File:Foobar.jpg]hello\n");
 add("html2html", "Bad images - basic functionality", "\n");
 add("html2html", "Bad images - T18039: text after bad image disappears", "Foo bar\n\nBar
 foo\n");
-add("html2html", "Page status indicators: Weird syntaxes that are okay", "empty=\nname=\n\n\n");
-add("html2html", "Page status indicators: Torture test", "01=hello world\n02=Main Page\n03=http://example.com/images/thumb/3/3a/Foobar.jpg/25px-Foobar.jpg\; 
alt=\"25px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[50,113,null,null]}'/>\n04=http://example.com/images/thumb/3/3a/Foobar.jpg/25px-Foobar.jpg\; 
alt=\"25px-Foobar.jpg\" rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[117,180,null,null]}'/>\n05=\n foo\n bar\n\n06=foo\n07=\nPreformatted\n\n08=Broken tag\n\n09=\n\n 
cell\n\n\n10=\n\nTwo\n\nparagraphs\n\n\n\n\n\n\n\n\n\n\n");
 add("html2html", "T33098 Template which includes system messages which 
includes the template", "Template 
loop detected: Template:Identical\nTemplate loop detected: 
Template:Identical\n");
 add("html2html", "T33490 Turkish: ucfırst (with a dotless i)", "[/index.php?title=%C5%9Eablon:Ucf%C4%B1rst:blahaction=editredlink=1
 Şablon:Ucfırst:blah]\n");
 add("html2html", "T33490 ucfırst (with a dotless i) with English language", 
"[/index.php?title=Template:Ucf%C4%B1rst:blahaction=editredlink=1
 Template:Ucfırst:blah]\n");
@@ -1152,9 +1146,6 @@
 add("html2wt", "formatdate parser function, with default format", "March 24, 2009\n");
 add("html2wt", "Spacing of numbers in formatted 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Inject SetReference dependencies

[Ladsgroup (Code Review)]

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

Change subject: Inject SetReference dependencies
..

Inject SetReference dependencies

Bug: T159026
Change-Id: I758b9dcf76d8441f2d004a58efcb3fec35aa3bdc
---
M repo/Wikibase.php
M repo/includes/Api/SetReference.php
2 files changed, 57 insertions(+), 22 deletions(-)


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

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 46019b7..15d553f 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -394,7 +394,37 @@
);
}
];
-   $wgAPIModules['wbsetreference'] = Wikibase\Repo\Api\SetReference::class;
+   $wgAPIModules['wbsetreference'] = [
+   'class' => Wikibase\Repo\Api\SetReference::class,
+   'factory' => function( ApiMain $mainModule, $moduleName ) {
+   $wikibaseRepo = 
Wikibase\Repo\WikibaseRepo::getDefaultInstance();
+   $apiHelperFactory = $wikibaseRepo->getApiHelperFactory( 
$mainModule->getContext() );
+   $changeOpFactoryProvider = 
$wikibaseRepo->getChangeOpFactoryProvider();
+
+   $modificationHelper = new 
Wikibase\Repo\Api\StatementModificationHelper(
+   $wikibaseRepo->getSnakFactory(),
+   $wikibaseRepo->getEntityIdParser(),
+   $wikibaseRepo->getStatementGuidValidator(),
+   $apiHelperFactory->getErrorReporter( 
$mainModule )
+   );
+
+   return new Wikibase\Repo\Api\SetReference(
+   $mainModule,
+   $moduleName,
+   
$wikibaseRepo->getExternalFormatDeserializerFactory(),
+   $apiHelperFactory->getErrorReporter( 
$mainModule ),
+   
$changeOpFactoryProvider->getStatementChangeOpFactory(),
+   $modificationHelper,
+   $wikibaseRepo->getStatementGuidParser(),
+   function ( $module ) use ( $apiHelperFactory ) {
+   return 
$apiHelperFactory->getResultBuilder( $module );
+   },
+   function ( $module ) use ( $apiHelperFactory ) {
+   return 
$apiHelperFactory->getEntitySavingHelper( $module );
+   }
+   );
+   }
+   ];
$wgAPIModules['wbremovereferences'] = [
'class' => Wikibase\Repo\Api\RemoveReferences::class,
'factory' => function( ApiMain $mainModule, $moduleName ) {
diff --git a/repo/includes/Api/SetReference.php 
b/repo/includes/Api/SetReference.php
index 7721b10..95ea500 100644
--- a/repo/includes/Api/SetReference.php
+++ b/repo/includes/Api/SetReference.php
@@ -61,29 +61,34 @@
/**
 * @param ApiMain $mainModule
 * @param string $moduleName
-* @param string $modulePrefix
+* @param DeserializerFactory $deserializerFactory
+* @param ApiErrorReporter $errorReporter
+* @param StatementChangeOpFactory $statementChangeOpFactory
+* @param StatementModificationHelper $modificationHelper
+* @param StatementGuidParser $guidParser
+* @param callable $resultBuilderInstantiator
+* @param callable $entitySavingHelperInstantiator
 */
-   public function __construct( ApiMain $mainModule, $moduleName, 
$modulePrefix = '' ) {
-   parent::__construct( $mainModule, $moduleName, $modulePrefix );
+   public function __construct(
+   ApiMain $mainModule,
+   $moduleName,
+   DeserializerFactory $deserializerFactory,
+   ApiErrorReporter $errorReporter,
+   StatementChangeOpFactory $statementChangeOpFactory,
+   StatementModificationHelper $modificationHelper,
+   StatementGuidParser $guidParser,
+   callable $resultBuilderInstantiator,
+   callable $entitySavingHelperInstantiator
+   ) {
+   parent::__construct( $mainModule, $moduleName );
 
-   $wikibaseRepo = WikibaseRepo::getDefaultInstance();
-   $apiHelperFactory = $wikibaseRepo->getApiHelperFactory( 
$this->getContext() );
-   $changeOpFactoryProvider = 
$wikibaseRepo->getChangeOpFactoryProvider();
-
-   $this->statementChangeOpFactory = 
$changeOpFactoryProvider->getStatementChangeOpFactory();
-   $this->errorReporter = $apiHelperFactory->getErrorReporter( 
$this );
-   $this->deserializerFactory = 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: move collapseTables.getTableHeader to applib

[Niedzielski (Code Review)]

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

Change subject: Hygiene: move collapseTables.getTableHeader to applib
..

Hygiene: move collapseTables.getTableHeader to applib

Bug: T158309
Change-Id: I86bdbc30e435316cee170f36ac5a69c8b126f547
---
M app/src/main/assets/bundle.js
M www/js/transforms/collapseTables.js
M www/package.json
3 files changed, 70 insertions(+), 77 deletions(-)


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

diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index b68585f..676fc1c 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -760,44 +760,8 @@
 }
 } );
 
},{"../transformer":14,"../utilities":25}],17:[function(require,module,exports){
+var getTableHeader = require("applib").CollapseElement.getTableHeader;
 var transformer = require("../transformer");
-
-/*
-Tries to get an array of table header (TH) contents from a given table.
-If there are no TH elements in the table, an empty array is returned.
-*/
-function getTableHeader( element ) {
-var thArray = [];
-if (element.children === undefined || element.children === null) {
-return thArray;
-}
-for (var i = 0; i < element.children.length; i++) {
-var el = element.children[i];
-if (el.tagName === "TH") {
-// ok, we have a TH element!
-// However, if it contains more than two links, then ignore it, 
because
-// it will probably appear weird when rendered as plain text.
-var aNodes = el.querySelectorAll( "a" );
-if (aNodes.length < 3) {
-// Also ignore it if it's identical to the page title.
-if (el.innerText.length > 0 && el.innerText !== 
window.pageTitle && el.innerHTML !== window.pageTitle) {
-thArray.push(el.innerText);
-}
-}
-}
-//if it's a table within a table, don't worry about it
-if (el.tagName === "TABLE") {
-continue;
-}
-//recurse into children of this element
-var ret = getTableHeader(el);
-//did we get a list of TH from this child?
-if (ret.length > 0) {
-thArray = thArray.concat(ret);
-}
-}
-return thArray;
-}
 
 function handleTableCollapseOrExpandClick() {
 var container = this.parentNode;
@@ -839,7 +803,7 @@
 }
 
 var isInfobox = tables[i].classList.contains( 'infobox' );
-var headerText = getTableHeader(tables[i]);
+var headerText = getTableHeader(tables[i], window.pageTitle);
 if (headerText.length === 0 && !isInfobox) {
 continue;
 }
@@ -899,7 +863,7 @@
 module.exports = {
 handleTableCollapseOrExpandClick: handleTableCollapseOrExpandClick
 };
-},{"../transformer":14}],18:[function(require,module,exports){
+},{"../transformer":14,"applib":26}],18:[function(require,module,exports){
 var transformer = require("../transformer");
 var collapseTables = require("./collapseTables");
 
@@ -1330,4 +1294,66 @@
 firstAncestorWithMultipleChildren: firstAncestorWithMultipleChildren
 };
 
+},{}],26:[function(require,module,exports){
+'use strict';
+
+/**
+  Tries to get an array of table header (TH) contents from a given table. If
+  there are no TH elements in the table, an empty array is returned.
+  @param {!Element} element Table or blob of HTML containing a table?
+  @param {?string} pageTitle
+  @return {!Array}
+*/
+var getTableHeader = function getTableHeader(element, pageTitle) {
+  var thArray = [];
+
+  if (element.children === undefined || element.children === null) {
+return thArray;
+  }
+
+  for (var i = 0; i < element.children.length; i++) {
+var el = element.children[i];
+
+if (el.tagName === 'TH') {
+  // ok, we have a TH element!
+  // However, if it contains more than two links, then ignore it, because
+  // it will probably appear weird when rendered as plain text.
+  var aNodes = el.querySelectorAll('a');
+  if (aNodes.length < 3) {
+// todo: remove nonstandard Element.innerText usage
+// Also ignore it if it's identical to the page title.
+if ((el.innerText && el.innerText.length || el.textContent.length) > 0 
&& el.innerText !== pageTitle && el.textContent !== pageTitle && el.innerHTML 
!== pageTitle) {
+  thArray.push(el.innerText || el.textContent);
+}
+  }
+}
+
+// if it's a table within a table, don't worry about it
+if (el.tagName === 'TABLE') {
+  continue;
+}
+
+// recurse into children of this element
+var ret = getTableHeader(el, pageTitle);
+
+// did we get a list of TH from this child?
+if (ret.length > 0) {
+  thArray = thArray.concat(ret);
+}
+  }
+
+  return thArray;
+};
+
+var CollapseElement = {
+  

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Revert "Set minimum requirement of websocket-client"

[Tim Landscheidt (Code Review)]

Hello Anoopchandu18, John Vandenberg, jenkins-bot, Xqt,

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

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

to review the following change.


Change subject: Revert "Set minimum requirement of websocket-client"
..

Revert "Set minimum requirement of websocket-client"

Pywikibot does not depend on a particular version of websocket-client;
in fact it does not even interact directly with its API.  Stating a
requirement on a particular version because some bug was fixed there
has the disadvantage that it disallows previous versions to be used
where the bug did not occur (< 0.27.0), and it also prevents
backporting fixes (0.27.1 or 0.27.0~local_patch).

This change reverts commit b96e7f57905751c08a0b5c5197d47dff3bcfe182.

Change-Id: Ie2ba76cf0280dc095539c6b2648adc5e67085782
---
M requirements.txt
M setup.py
2 files changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/07/339807/1

diff --git a/requirements.txt b/requirements.txt
index 0aeb72d..9b4400a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -54,9 +54,6 @@
 google >= 1.7
 socketIO-client<0.6.1
 
-# websocket-client>=0.33 is required by socketIO-client (T114913)
-websocket-client>=0.33
-
 # scripts/script_wui.py:
 crontab
 
diff --git a/setup.py b/setup.py
index f688df5..06f3f03 100644
--- a/setup.py
+++ b/setup.py
@@ -61,8 +61,7 @@
 'mwparserfromhell': ['mwparserfromhell>=0.3.3'],
 'Tkinter': ['Pillow'],
 # 0.6.1 supports socket.io 1.0, but WMF is using 0.9 (T91393 and T85716)
-# websocket-client>=0.33 is required by socketIO-client (T114913)
-'rcstream': ['socketIO-client<0.6.1', 'websocket-client>=0.33'],
+'rcstream': ['socketIO-client<0.6.1'],
 'security': ['requests[security]'],
 'mwoauth': ['mwoauth>=0.2.4'],
 'html': ['BeautifulSoup4'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2ba76cf0280dc095539c6b2648adc5e67085782
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Anoopchandu18 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: login.py: Recognise * in config.usernames

[Dalba (Code Review)]

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

Change subject: login.py: Recognise * in config.usernames
..

login.py: Recognise * in config.usernames

If there is an '*' in config.usernames, expand it to all languages
that are found in the English site of that family.

Task: T110411
Change-Id: I4b52b118d8e68752b047ad2021b9dff45666aef2
---
M scripts/login.py
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/06/339806/1

diff --git a/scripts/login.py b/scripts/login.py
index 67efa1b..36fc72b 100755
--- a/scripts/login.py
+++ b/scripts/login.py
@@ -160,6 +160,13 @@
 namedict = config.sysopnames
 else:
 namedict = config.usernames
+for fam in namedict.copy():
+if '*' in namedict[fam]:
+user = namedict[fam]['*']
+namedict[fam] = dict(
+(lang, user)
+for lang in pywikibot.Site('en', fam).languages()
+)
 else:
 site = pywikibot.Site()
 namedict = {site.family.name: {site.code: None}}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: [WIP] Start LexemeValidatorFactory

[Ladsgroup (Code Review)]

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

Change subject: [WIP] Start LexemeValidatorFactory
..

[WIP] Start LexemeValidatorFactory

Things to do:
 - Fix other tests
 - Add tests for the validator
 - (optional) Move the methods to a dedicated class for code reusablity

Bug: T158780
Change-Id: Ib046d6ade16fd826813906d7dbc80f219ef3caa4
---
M WikibaseLexeme.entitytypes.php
M src/Validators/LexemeValidatorFactory.php
M tests/phpunit/mediawiki/Validators/LexemeValidatorFactoryTest.php
3 files changed, 90 insertions(+), 14 deletions(-)


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

diff --git a/WikibaseLexeme.entitytypes.php b/WikibaseLexeme.entitytypes.php
index 7566b13..e5d9ae2 100644
--- a/WikibaseLexeme.entitytypes.php
+++ b/WikibaseLexeme.entitytypes.php
@@ -128,7 +128,8 @@
new TermChangeOpSerializationValidator( 
$wikibaseRepo->getTermsLanguages() ),
new LexemeValidatorFactory(
1000, // TODO: move to setting, 
at least change to some reasonable hard-coded value
-   
$wikibaseRepo->getTermValidatorFactory()
+   
$wikibaseRepo->getTermValidatorFactory(),
+   
$wikibaseRepo->getDefaultValidatorBuilders()
),
$wikibaseRepo->getStringNormalizer()
)
diff --git a/src/Validators/LexemeValidatorFactory.php 
b/src/Validators/LexemeValidatorFactory.php
index cf59d14..bf8fa64 100644
--- a/src/Validators/LexemeValidatorFactory.php
+++ b/src/Validators/LexemeValidatorFactory.php
@@ -2,8 +2,9 @@
 
 namespace Wikibase\Lexeme\Validators;
 
-use ValueValidators\NullValidator;
 use ValueValidators\ValueValidator;
+use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\Repo\ValidatorBuilders;
 use Wikibase\Repo\Validators\CompositeValidator;
 use Wikibase\Repo\Validators\RegexValidator;
 use Wikibase\Repo\Validators\StringLengthValidator;
@@ -29,14 +30,25 @@
private $termValidatorFactory;
 
/**
+* @var ValidatorBuilders
+*/
+   private $validatorBuilders;
+
+   /**
 * @param int $maxTermLength max string length for lemma term
 * @param TermValidatorFactory $termValidatorFactory
+* @param ValidatorBuilders $validatorBuilders
 */
-   public function __construct( $maxTermLength, TermValidatorFactory 
$termValidatorFactory ) {
+   public function __construct(
+   $maxTermLength,
+   TermValidatorFactory $termValidatorFactory,
+   ValidatorBuilders $validatorBuilders
+   ) {
Assert::parameterType( 'integer', $maxTermLength, '$maxLength' 
);
 
$this->maxTermLength = $maxTermLength;
$this->termValidatorFactory = $termValidatorFactory;
+   $this->validatorBuilders = $validatorBuilders;
}
 
/**
@@ -65,8 +77,10 @@
 * @return ValueValidator
 */
public function getLanguageValidator() {
-   // TODO: Implement this
-   return new NullValidator();
+   return new CompositeValidator(
+   $this->validatorBuilders->buildItemValidators(),
+   true
+   );
}
 
 }
diff --git a/tests/phpunit/mediawiki/Validators/LexemeValidatorFactoryTest.php 
b/tests/phpunit/mediawiki/Validators/LexemeValidatorFactoryTest.php
index 02baee7..44e2253 100644
--- a/tests/phpunit/mediawiki/Validators/LexemeValidatorFactoryTest.php
+++ b/tests/phpunit/mediawiki/Validators/LexemeValidatorFactoryTest.php
@@ -3,9 +3,14 @@
 namespace Wikibase\Lexeme\Tests\Validators;
 
 use InvalidArgumentException;
+use ValueValidators\Error;
+use ValueValidators\Result;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
+use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\Lexeme\Validators\LexemeValidatorFactory;
 use Wikibase\Repo\Tests\ChangeOp\ChangeOpTestMockProvider;
+use Wikibase\Repo\ValidatorBuilders;
+use Wikibase\Repo\Validators\EntityExistsValidator;
 use Wikibase\Repo\Validators\TermValidatorFactory;
 
 /**
@@ -22,7 +27,7 @@
 */
public function testGivenInvalidMaxLength_constructorThrowsException( 
$maxLength ) {
$this->setExpectedException( InvalidArgumentException::class );
-   new LexemeValidatorFactory( $maxLength, 
$this->getTermValidatorFactory() );
+   $this->getLexemeValidatorFactory( $maxLength );
}
 
public function invalidConstructorArgsProvider() {
@@ -43,10 +48,9 @@
$dupeDetector
);
 
-   

[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: switch index redirect from 2015 to 2016

[Dzahn (Code Review)]

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

Change subject: switch index redirect from 2015 to 2016
..


switch index redirect from 2015 to 2016

After content for 2016 has been uploaded and checked,
switch the index redirect from 2015 (when it was the
special URL for the 15th birthday) to the regular 2016
location.

Bug: T151798
Change-Id: I50f5cdaf99e005e8a3257423d5de748a6b141639
---
M index.html
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/index.html b/index.html
index d7f3f1a..2f2d35e 100644
--- a/index.html
+++ b/index.html
@@ -3,9 +3,9 @@
 
 
 
-Wikimedia Foundation Annual Report 2015
+Wikimedia Foundation Annual Report 2016
 
-https://15.wikipedia.org;>
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50f5cdaf99e005e8a3257423d5de748a6b141639
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/annualreport
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: switch index redirect from 2015 to 2016

[Dzahn (Code Review)]

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

Change subject: switch index redirect from 2015 to 2016
..

switch index redirect from 2015 to 2016

After content for 2016 has been uploaded and checked,
switch the index redirect from 2015 (when it was the
special URL for the 15th birthday) to the regular 2016
location.

Bug: T151798
Change-Id: I50f5cdaf99e005e8a3257423d5de748a6b141639
---
M index.html
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/annualreport 
refs/changes/04/339804/1

diff --git a/index.html b/index.html
index d7f3f1a..2f2d35e 100644
--- a/index.html
+++ b/index.html
@@ -3,9 +3,9 @@
 
 
 
-Wikimedia Foundation Annual Report 2015
+Wikimedia Foundation Annual Report 2016
 
-https://15.wikipedia.org;>
+
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50f5cdaf99e005e8a3257423d5de748a6b141639
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/annualreport
Gerrit-Branch: master
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]: annualreport: add X-Frame-Options header to Apache config

[Dzahn (Code Review)]

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

Change subject: annualreport: add X-Frame-Options header to Apache config
..


annualreport: add X-Frame-Options header to Apache config

As recommended by Darian Patrick in T151798#3053857
add X-Frame-Options header with DENY, to prevent click jacking
attacks.

Bug: T151798
Change-Id: I867f4ed771816fa2f546b96f3ae6dd0f855fb90e
---
M modules/annualreport/files/annual.wikimedia.org
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/annualreport/files/annual.wikimedia.org 
b/modules/annualreport/files/annual.wikimedia.org
index 2b16bed..568e8de 100644
--- a/modules/annualreport/files/annual.wikimedia.org
+++ b/modules/annualreport/files/annual.wikimedia.org
@@ -11,6 +11,8 @@
 LogLevel warn
 CustomLog /var/log/apache2/access.log wmf
 
+Header always append X-Frame-Options DENY
+
 
 Require all granted
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I867f4ed771816fa2f546b96f3ae6dd0f855fb90e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dpatrick 
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]: annualreport: add X-Frame-Options header to Apache config

[Dzahn (Code Review)]

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

Change subject: annualreport: add X-Frame-Options header to Apache config
..

annualreport: add X-Frame-Options header to Apache config

As recommended by Darian Patrick in T151798#3053857
add X-Frame-Options header with DENY, to prevent click jacking
attacks.

Bug: T151798
Change-Id: I867f4ed771816fa2f546b96f3ae6dd0f855fb90e
---
M modules/annualreport/files/annual.wikimedia.org
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/339803/1

diff --git a/modules/annualreport/files/annual.wikimedia.org 
b/modules/annualreport/files/annual.wikimedia.org
index 2b16bed..568e8de 100644
--- a/modules/annualreport/files/annual.wikimedia.org
+++ b/modules/annualreport/files/annual.wikimedia.org
@@ -11,6 +11,8 @@
 LogLevel warn
 CustomLog /var/log/apache2/access.log wmf
 
+Header always append X-Frame-Options DENY
+
 
 Require all granted
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I867f4ed771816fa2f546b96f3ae6dd0f855fb90e
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]: [WIP] mediawiki: Add cache-warmup to maintenance

[Krinkle (Code Review)]

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

Change subject: [WIP] mediawiki: Add cache-warmup to maintenance
..

[WIP] mediawiki: Add cache-warmup to maintenance

* Ensure nodejs is installed on the maintenance host (terbium, wasat).
* Ensure warmup script is installed.

FIXME:

* Verify that changing request host in Node.js works with
  our setup or figure a different way (e.g. text-lb has invalid cert).
  With curl we use --resolve 'en.wikipedia.org:443:' which
  works. Is there a Node equiv?

* Decide how to fetch list of servers (conftool?)

* Decide concurrency.

Bug: T156922
Change-Id: I95ba0ace6daefb135af43019e0ebce741875b4ea
---
A modules/mediawiki/files/maintenance/mediawiki-cache-warmup/README.md
A modules/mediawiki/files/maintenance/mediawiki-cache-warmup/urls-cluster.txt
A modules/mediawiki/files/maintenance/mediawiki-cache-warmup/urls-server.txt
A modules/mediawiki/files/maintenance/mediawiki-cache-warmup/util.js
A modules/mediawiki/files/maintenance/mediawiki-cache-warmup/warmup.js
A modules/mediawiki/manifests/maintenance/cache_warmup.pp
6 files changed, 468 insertions(+), 0 deletions(-)


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

diff --git 
a/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/README.md 
b/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/README.md
new file mode 100644
index 000..67961eb
--- /dev/null
+++ b/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/README.md
@@ -0,0 +1,28 @@
+### Usage
+
+```sh
+node warmup.js urls-cluster.txt spread
+
+node warmup.js urls-server.txt clone-debug
+```
+
+
+### Output
+```
+$ node warmup.js
+
+Usage: node warmup.js [targets] [mode]
+
+ - targets Path to a text file containing newline-separated list of urls, 
may contain %server or %mobileServer.
+ - modeOne of "spread" (via load-balancer) or "clone" (send each url 
to all servers)
+
+$ node warmup.js urls-server.txt clone-debug
+...
+[2017-02-02T01:05:29.414Z] Request 
https://jbo.wiktionary.org/w/load.php?debug=false=jquery%2Cmediawiki=scripts
+[2017-02-02T01:05:29.422Z] Request 
https://ne.wikibooks.org/w/load.php?debug=false=jquery%2Cmediawiki=scripts
+Statistics:
+- timing: min = 0.134s | max = 28.894s | avg = 1.040s | total = 46s
+- concurrency: min = 0 | max = 49 | avg = 48
+
+Done!
+```
diff --git 
a/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/urls-cluster.txt 
b/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/urls-cluster.txt
new file mode 100644
index 000..4274a3b
--- /dev/null
+++ 
b/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/urls-cluster.txt
@@ -0,0 +1,10 @@
+# Purpose: Root redirect
+https://%server/
+# Purpose: Main Page, Skin cache, Sidebar cache, Localisation cache
+https://%server/wiki/Main_Page
+# Purpose: MobileFrontend, Main Page
+https://%mobileServer/wiki/Main_Page
+# Purpose: Login page
+https://%server/wiki/Special:UserLogin
+# Purpose: API, Recent changes
+https://%server/w/api.php?format=json=query=recentchanges
diff --git 
a/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/urls-server.txt 
b/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/urls-server.txt
new file mode 100644
index 000..790fa05
--- /dev/null
+++ b/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/urls-server.txt
@@ -0,0 +1,4 @@
+# Purpose: APC for ResourceLoader
+https://%server/w/load.php?debug=false=startup=scripts
+https://%server/w/load.php?debug=false=jquery%2Cmediawiki=scripts
+https://%server/w/load.php?debug=false=site%7Csite.styles
diff --git a/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/util.js 
b/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/util.js
new file mode 100644
index 000..82862c9
--- /dev/null
+++ b/modules/mediawiki/files/maintenance/mediawiki-cache-warmup/util.js
@@ -0,0 +1,268 @@
+var http = require( 'http' ),
+   https = require( 'https' ),
+   url = require( 'url' );
+
+/**
+ * @param {string} url
+ * @return {Promise}
+ */
+function fetchHttpsUrl( url ) {
+   return new Promise( function ( resolve, reject ) {
+   var req = https.get( url, function ( resp ) {
+   var data = '';
+   resp.on( 'data', function ( chunk ) {
+   data += chunk;
+   } );
+   resp.on( 'end', function() {
+   resolve( data );
+   } );
+   } );
+   req.on( 'error', reject );
+   } );
+}
+
+/**
+ * @param {string|Object} options
+ * @return {Promise}
+ */
+function fetchUrl( options ) {
+   var request;
+   if ( typeof options === 'string' ) {
+   options = url.parse( options );
+   }
+   request = options.protocol === 'https:' ? https : http;
+   

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Update GUI

[jenkins-bot (Code Review)]

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

Change subject: Update GUI
..


Update GUI

Change-Id: Ic51a7cf0603600801f8e40b4cf26de3260d73682
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/gui b/gui
index 924105d..6ba92b5 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 924105d3c1eba2ab6297786184d9465e40358d00
+Subproject commit 6ba92b5de8bf4458c8955573e8cb959d75f1c688

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic51a7cf0603600801f8e40b4cf26de3260d73682
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]: Keystonehooks: Sync ldap project groups with keystone projec...

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338918 )

Change subject: Keystonehooks: Sync ldap project groups with keystone project 
membership
..


Keystonehooks: Sync ldap project groups with keystone project membership

Bug: T150091
Change-Id: Ibde67f8dd6c5a4d71a781730e9283b164a3544e4
---
A modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
M modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
2 files changed, 220 insertions(+), 8 deletions(-)

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



diff --git 
a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py 
b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
new file mode 100644
index 000..8f4bced
--- /dev/null
+++ b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
@@ -0,0 +1,169 @@
+# Copyright 2016 Andrew Bogott for the Wikimedia Foundation
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+import ldap
+import ldap.modlist
+
+from keystone import exception
+
+from oslo_log import log as logging
+from oslo_config import cfg
+
+LOG = logging.getLogger('nova.%s' % __name__)
+
+
+def _getLdapInfo(attr, conffile="/etc/ldap.conf"):
+try:
+f = open(conffile)
+except IOError:
+if conffile == "/etc/ldap.conf":
+# fallback to /etc/ldap/ldap.conf, which will likely
+# have less information
+f = open("/etc/ldap/ldap.conf")
+for line in f:
+if line.strip() == "":
+continue
+if line.split()[0].lower() == attr.lower():
+return line.split(None, 1)[1].strip()
+break
+
+
+def _open_ldap():
+ldapHost = _getLdapInfo("uri")
+sslType = _getLdapInfo("ssl")
+
+binddn = cfg.CONF.ldap.user
+bindpw = cfg.CONF.ldap.password
+ds = ldap.initialize(ldapHost)
+ds.protocol_version = ldap.VERSION3
+if sslType == "start_tls":
+ds.start_tls_s()
+
+try:
+ds.simple_bind_s(binddn, bindpw)
+return ds
+except ldap.CONSTRAINT_VIOLATION:
+LOG.debug("LDAP bind failure:  Too many failed attempts.\n")
+except ldap.INVALID_DN_SYNTAX:
+LOG.debug("LDAP bind failure:  The bind DN is incorrect... \n")
+except ldap.NO_SUCH_OBJECT:
+LOG.debug("LDAP bind failure:  "
+  "Unable to locate the bind DN account.\n")
+except ldap.UNWILLING_TO_PERFORM as msg:
+LOG.debug("LDAP bind failure:  "
+  "The LDAP server was unwilling to perform the action"
+  " requested.\nError was: %s\n" % msg[0]["info"])
+except ldap.INVALID_CREDENTIALS:
+LOG.debug("LDAP bind failure:  Password incorrect.\n")
+
+return None
+
+
+# ds is presumed to be an already-open ldap connection
+def _all_groups(ds):
+basedn = cfg.CONF.wmfhooks.ldap_group_base_dn
+allgroups = ds.search_s(basedn, ldap.SCOPE_ONELEVEL)
+return allgroups
+
+
+# ds is presumed to be an already-open ldap connection
+def _get_next_gid_number(ds):
+highest = cfg.CONF.wmfhooks.minimum_gid_number
+for group in _all_groups(ds):
+if 'gidNumber' in group[1]:
+number = int(group[1]['gidNumber'][0])
+if number > highest:
+highest = number
+
+# Fixme:  Check against a hard max gid number limit?
+return highest + 1
+
+
+# ds should be an already-open ldap connection.
+#
+# groupname is the name of the group to create, probably project-
+def _get_ldap_group(ds, groupname):
+basedn = cfg.CONF.wmfhooks.ldap_group_base_dn
+searchdn = "cn=%s,%s" % (groupname, basedn)
+try:
+thisgroup = ds.search_s(searchdn, ldap.SCOPE_BASE)
+return thisgroup
+except ldap.LDAPError:
+return None
+
+
+def delete_ldap_project_group(project_id):
+basedn = cfg.CONF.wmfhooks.ldap_group_base_dn
+groupname = "project-%s" % project_id.encode('utf-8')
+dn = "cn=%s,%s" % (groupname, basedn)
+
+ds = _open_ldap()
+if not ds:
+LOG.error("Failed to connect to ldap; Leak a project group.")
+raise exception.ValidationError()
+
+ds.delete_s(dn)
+
+
+def sync_ldap_project_group(project_id, keystone_assignments):
+groupname = "project-%s" % project_id.encode('utf-8')
+

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hide header_v2 .search-box oly when it's inside header

[Pmiazga (Code Review)]

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

Change subject: Hide header_v2 .search-box oly when it's inside header
..

Hide header_v2 .search-box oly when it's inside header

Changes:
 - adjusted styles for .search-box

Bug: T159012
Change-Id: I397630fc1caeeed1984a89f662a71a8881c6f21b
---
M resources/skins.minerva.base.styles/ui.less
1 file changed, 16 insertions(+), 16 deletions(-)


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

diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index d3bdf61..0301f90 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -101,6 +101,22 @@
}
 }
 
+.feature-header-v2 {
+   .header {
+   .search-box {
+   display: none;
+   width: auto;
+   }
+   }
+}
+
+.feature-header-v2,
+.feature-header-v1 {
+   .header .search-box .search {
+   margin-top: 0;
+   }
+}
+
 .header {
display: table;
width: 100%;
@@ -168,22 +184,6 @@
 
.header-action > * {
min-height: @headerHeight;
-   }
-}
-
-// FIXME: Fold into .header css rules when cache has cleared
-.feature-header-v2 {
-   .search-box {
-   display: none;
-   width: auto;
-   }
-}
-
-// FIXME: Fold into .header css rules when cache has cleared
-.feature-header-v2,
-.feature-header-v1 {
-   .header .search-box .search {
-   margin-top: 0;
}
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Process lemmas in LexemeChangeOpDeserializer

[jenkins-bot (Code Review)]

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

Change subject: Process lemmas in LexemeChangeOpDeserializer
..


Process lemmas in LexemeChangeOpDeserializer

LexemeChangeOpDeserializer uses LemmaChangeOpDeserializer
to process serialized lemma change requests.

Bug: T153677
Bug: T155700
Change-Id: Ie9d8bf69eb1f121d06ad9dfbcf68743531799137
Depends-On: I9654640b2fdd47cb02afbbcae5bb17d447723555
---
M WikibaseLexeme.entitytypes.php
A src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php
D src/ChangeOp/LexemeChangeOpDeserializer.php
M 
tests/phpunit/mediawiki/ChangeOp/Deserialization/LemmaChangeOpDeserializerTest.php
A 
tests/phpunit/mediawiki/ChangeOp/Deserialization/LexemeChangeOpDeserializerTest.php
5 files changed, 120 insertions(+), 33 deletions(-)

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



diff --git a/WikibaseLexeme.entitytypes.php b/WikibaseLexeme.entitytypes.php
index 494fe77..7566b13 100644
--- a/WikibaseLexeme.entitytypes.php
+++ b/WikibaseLexeme.entitytypes.php
@@ -12,6 +12,9 @@
  * @author Amir Sarabadani 
  */
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\Lexeme\ChangeOp\Deserialization\LemmaChangeOpDeserializer;
+use Wikibase\Lexeme\Validators\LexemeValidatorFactory;
+use Wikibase\Repo\ChangeOp\Deserialization\TermChangeOpSerializationValidator;
 use Wikibase\Repo\MediaWikiLanguageDirectionalityLookup;
 use Wikibase\Repo\ParserOutput\FallbackHintHtmlTermRenderer;
 use Wikibase\Repo\WikibaseRepo;
@@ -20,7 +23,7 @@
 use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
 use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\LanguageFallbackChain;
-use Wikibase\Lexeme\ChangeOp\LexemeChangeOpDeserializer;
+use Wikibase\Lexeme\ChangeOp\Deserialization\LexemeChangeOpDeserializer;
 use Wikibase\Lexeme\Content\LexemeContent;
 use Wikibase\Lexeme\Content\LexemeHandler;
 use Wikibase\Lexeme\DataModel\Lexeme;
@@ -116,7 +119,20 @@
// returning a deserializer
'js-deserializer-factory-function' => 
'wikibase.lexeme.getDeserializer',
'changeop-deserializer-callback' => function () {
-   return new LexemeChangeOpDeserializer();
-   }
+   $wikibaseRepo = WikibaseRepo::getDefaultInstance();
+   return new LexemeChangeOpDeserializer(
+   new LemmaChangeOpDeserializer(
+   // TODO: WikibaseRepo should probably 
provide this validator?
+   // TODO: WikibaseRepo::getTermsLanguage 
is not necessarily the list of language codes
+   // that should be allowed as 
"languages" of lemma terms
+   new TermChangeOpSerializationValidator( 
$wikibaseRepo->getTermsLanguages() ),
+   new LexemeValidatorFactory(
+   1000, // TODO: move to setting, 
at least change to some reasonable hard-coded value
+   
$wikibaseRepo->getTermValidatorFactory()
+   ),
+   $wikibaseRepo->getStringNormalizer()
+   )
+   );
+   },
]
 ];
diff --git a/src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php 
b/src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php
new file mode 100644
index 000..833fdea
--- /dev/null
+++ b/src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php
@@ -0,0 +1,42 @@
+
+ */
+class LexemeChangeOpDeserializer implements ChangeOpDeserializer {
+
+   /**
+* @var LemmaChangeOpDeserializer
+*/
+   private $lemmaChangeOpDeserializer;
+
+   public function __construct( LemmaChangeOpDeserializer 
$lemmaChangeOpDeserializer ) {
+   $this->lemmaChangeOpDeserializer = $lemmaChangeOpDeserializer;
+   }
+
+   /**
+* @see ChangeOpDeserializer::createEntityChangeOp
+*
+* @param array[] $changeRequest
+* @return ChangeOp
+*/
+   public function createEntityChangeOp( array $changeRequest ) {
+   $changeOps = new ChangeOps();
+
+   if ( array_key_exists( 'lemmas', $changeRequest ) ) {
+   $changeOps->add( 
$this->lemmaChangeOpDeserializer->createEntityChangeOp( $changeRequest ) );
+   }
+
+   return $changeOps;
+   }
+
+}
diff --git a/src/ChangeOp/LexemeChangeOpDeserializer.php 
b/src/ChangeOp/LexemeChangeOpDeserializer.php
deleted file mode 100644
index 014dbff..000
--- a/src/ChangeOp/LexemeChangeOpDeserializer.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
- */
-class LexemeChangeOpDeserializer implements ChangeOpDeserializer {
-

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Leave data validation in EditEntity to ChangeOp deserializers

[jenkins-bot (Code Review)]

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

Change subject: Leave data validation in EditEntity to ChangeOp deserializers
..


Leave data validation in EditEntity to ChangeOp deserializers

EditEntity should not be whitelisting fields in "data" parameter
as fields may vary depending on what entity types are enabled.

This change makes EditEntity contain only single assumption:
"remove" key should not be part of top-level structure,
ie. "remove" key should always be part of the object related
to the specific field.

Change-Id: I9654640b2fdd47cb02afbbcae5bb17d447723555
---
M repo/includes/Api/EditEntity.php
M repo/tests/phpunit/includes/Api/EditEntityTest.php
2 files changed, 31 insertions(+), 31 deletions(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve



diff --git a/repo/includes/Api/EditEntity.php b/repo/includes/Api/EditEntity.php
index 5da710d..730955d 100644
--- a/repo/includes/Api/EditEntity.php
+++ b/repo/includes/Api/EditEntity.php
@@ -629,29 +629,7 @@
$entityId = $entity->getId();
$title = $entityId === null ? null : 
$this->getTitleLookup()->getTitleForId( $entityId );
 
-   $allowedProps = array(
-   // ignored props
-   'length',
-   'count',
-   'touched',
-   'modified',
-   // checked props
-   'id',
-   'type',
-   'pageid',
-   'ns',
-   'title',
-   'lastrevid',
-   // useful props
-   'labels',
-   'descriptions',
-   'aliases',
-   'sitelinks',
-   'claims',
-   'datatype'
-   );
-
-   $this->checkValidJson( $data, $allowedProps );
+   $this->checkValidJson( $data );
$this->checkEntityId( $data, $entityId );
$this->checkEntityType( $data, $entity );
$this->checkPageIdProp( $data, $title );
@@ -662,9 +640,8 @@
 
/**
 * @param mixed $data
-* @param array $allowedProps
 */
-   private function checkValidJson( $data, array $allowedProps ) {
+   private function checkValidJson( $data ) {
if ( is_null( $data ) ) {
$this->errorReporter->dieError( 'Invalid json: The 
supplied JSON structure could not be parsed or '
. 'recreated as a valid structure', 
'invalid-json' );
@@ -677,8 +654,11 @@
// Catch json_decode returning an indexed array (list).
$this->assertString( $prop, 'Top level structure must 
be a JSON object (no keys found)' );
 
-   if ( !in_array( $prop, $allowedProps ) ) {
-   $this->errorReporter->dieError( "Unknown key in 
json: $prop", 'not-recognized' );
+   if ( $prop === 'remove' ) {
+   $this->errorReporter->dieError(
+   '"remove" should not be a top-level 
key',
+   'not-recognized'
+   );
}
}
}
diff --git a/repo/tests/phpunit/includes/Api/EditEntityTest.php 
b/repo/tests/phpunit/includes/Api/EditEntityTest.php
index 591ff55..9b6e096 100644
--- a/repo/tests/phpunit/includes/Api/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/Api/EditEntityTest.php
@@ -706,8 +706,8 @@
'site' => 'enwiki',
'title' => 'Berlin',
'data' => '{
-   "remove": "",
"claims": [ {
+   "remove": "",
"mainsnak": {
"snaktype": 
"value",
"property": 
"%P56%",
@@ -720,9 +720,8 @@
),
'e' => array( 'exception' => array(
'type' => ApiUsageException::class,
-   'code' => 'not-recognized',
-   'message' => 'Unknown key in json: 
remove' )
-   )
+   'code' => 'invalid-claim',
+   ) )
   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [wip] RCFilters UI: Scroll to filter when selected

[Mooeypoo (Code Review)]

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

Change subject: [wip] RCFilters UI: Scroll to filter when selected
..

[wip] RCFilters UI: Scroll to filter when selected

Change-Id: I416c324eec4bc35ae9b1e0aeabd2897da0158d95
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js
7 files changed, 150 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/339800/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
index 94da3ac..21953da 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
@@ -16,6 +16,10 @@
}
}
 
+   &-selected {
+   background-color: #eaf3ff; // Accent90 AAA
+   }
+
&-label {
&-title {
font-weight: bold;
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index cf03932..fc05649 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -91,6 +91,14 @@
};
 
/**
+* Emit a click event when the capsule is clicked so we can aggregate 
this
+* in the parent (the capsule)
+*/
+   mw.rcfilters.ui.CapsuleItemWidget.prototype.onClick = function () {
+   this.emit( 'click' );
+   };
+
+   /**
 * Override the event listening to the item close button click
 */
mw.rcfilters.ui.CapsuleItemWidget.prototype.onCloseClick = function () {
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index 2bd2f0e..cd3191c 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -32,6 +32,7 @@
this.controller = controller;
this.model = model;
this.filterInput = filterInput;
+   this.isSelecting = false;
 
this.topScrollOffset = config.topScrollOffset || 10;
 
@@ -55,6 +56,7 @@
highlightChange: 'onModelHighlightChange'
} );
this.popup.connect( this, { toggle: 'onPopupToggle' } );
+   this.aggregate( { click: 'capsuleItemClick' } );
 
// Add the filterInput as trigger
this.filterInput.$input
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js
index f858ab0..a750c44 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js
@@ -19,6 +19,7 @@
 
this.controller = controller;
this.model = model;
+   this.filters = {};
 
// Mixin constructors
OO.ui.mixin.GroupWidget.call( this, config );
@@ -36,6 +37,7 @@
 
this.$element
.addClass( 'mw-rcfilters-ui-filterGroupWidget' )
+   .addClass( 'mw-rcfilters-ui-filterGroupWidget-name-' + 
this.model.getName() )
.append(
this.$label,
this.$group
@@ -59,12 +61,28 @@
);
};
 
+   /**
+* Get an item widget from its filter name
+*
+* @param {string} filterName Filter name
+* @return {mw.rcfilters.ui.FilterItemWidget} Item widget
+*/
+   mw.rcfilters.ui.FilterGroupWidget.prototype.getItemWidget = function ( 
filterName ) {
+   return this.filters[ filterName ];
+   };
+
+   /**
+* Populate data from the model
+*/
mw.rcfilters.ui.FilterGroupWidget.prototype.populateFromModel = 
function () {

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Remove href attribute (non-js fallback) once the map is inte...

[jenkins-bot (Code Review)]

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

Change subject: Remove href attribute (non-js fallback) once the map is 
interactive
..


Remove href attribute (non-js fallback) once the map is interactive

Bug: T158979
Change-Id: Ib07cb4408e28bacfd7e6335d562c3c0a808b0e81
---
M modules/mapframe/mapframe.js
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/mapframe/mapframe.js b/modules/mapframe/mapframe.js
index 6f7e94b..dfc01cc 100644
--- a/modules/mapframe/mapframe.js
+++ b/modules/mapframe/mapframe.js
@@ -95,6 +95,9 @@
dataGroups: data.overlays,
captionText: data.captionText
} );
+
+   $container.removeAttr( 'href' );
+
mw.track( 'mediawiki.kartographer', {
action: 'view',
isFullScreen: false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib07cb4408e28bacfd7e6335d562c3c0a808b0e81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 
Gerrit-Reviewer: MaxSem 
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...MobileFrontend[master]: Show only search icon inside .header element

[Pmiazga (Code Review)]

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

Change subject: Show only search icon inside .header element
..

Show only search icon inside .header element

Changes:
  - moved input.search declaration into .header section

Bug: T159009
Change-Id: Ic9b394394bb07dfad45cfdb1935040f98ef2960c
---
M resources/skins.minerva.base.styles/ui.less
1 file changed, 21 insertions(+), 21 deletions(-)


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

diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index d3bdf61..41bf0a2 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -52,6 +52,27 @@
// FIXME: Remove when cache clears
width: 100%;
 
+   /* Search */
+   input.search {
+   // FIXME: input's cannot have child elements so not possible to 
use mw-ui-icon-before here
+   // How can we avoid multiple use of magnifying glass icon?
+   .background-image-svg( 'magnifying-glass.svg', 
'magnifying-glass.png' );
+   outline: 0;
+   width: 100%;
+   // FIXME: unable to check but the important may not be needed 
for Nokia S60;
+   background-color: #fff !important; /* remove fennec default 
background also see bug 36490 */
+   // get rid of rounded corners in Safari
+   -webkit-appearance: none;
+
+   // [T139928] Hide all pseudo-elements added to search inputs in 
WebKit.
+   &::-webkit-search-decoration,
+   &::-webkit-search-cancel-button,
+   &::-webkit-search-results-button,
+   &::-webkit-search-results-decoration {
+   display: none;
+   }
+   }
+
.search {
@searchIconSize: 20px;
@searchIconGutter: 6px;
@@ -212,27 +233,6 @@
padding: 0.5em 0.1em;
background: none;  // so that the icon doesn't overlap 
with the placeholder
}
-   }
-}
-
-/* Search */
-input.search {
-   // FIXME: input's cannot have child elements so not possible to use 
mw-ui-icon-before here
-   // How can we avoid multiple use of magnifying glass icon?
-   .background-image-svg( 'magnifying-glass.svg', 'magnifying-glass.png' );
-   outline: 0;
-   width: 100%;
-   // FIXME: unable to check but the important may not be needed for Nokia 
S60;
-   background-color: #fff !important; /* remove fennec default background 
also see bug 36490 */
-   // get rid of rounded corners in Safari
-   -webkit-appearance: none;
-
-   // [T139928] Hide all pseudo-elements added to search inputs in WebKit.
-   &::-webkit-search-decoration,
-   &::-webkit-search-cancel-button,
-   &::-webkit-search-results-button,
-   &::-webkit-search-results-decoration {
-   display: none;
}
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Replace Linker::link() with LinkRenderer in special pages

[jenkins-bot (Code Review)]

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

Change subject: Replace Linker::link() with LinkRenderer in special pages
..


Replace Linker::link() with LinkRenderer in special pages

This fits current MediaWiki version requirement.

Bug: T149346
Change-Id: I386970ca6cb233a3a2aa412e371ed7a4bec4f7c0
---
M includes/specials/SpecialCentralAuth.php
M includes/specials/SpecialGlobalGroupPermissions.php
M includes/specials/SpecialGlobalRenameQueue.php
M includes/specials/SpecialGlobalUserMerge.php
M includes/specials/SpecialMultiLock.php
M includes/specials/SpecialWikiSets.php
6 files changed, 19 insertions(+), 17 deletions(-)

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



diff --git a/includes/specials/SpecialCentralAuth.php 
b/includes/specials/SpecialCentralAuth.php
index c0cc484..2b72f15 100644
--- a/includes/specials/SpecialCentralAuth.php
+++ b/includes/specials/SpecialCentralAuth.php
@@ -344,9 +344,9 @@
$groups = $globalUser->getGlobalGroups();
if ( $groups ) {
$groups = array_map( function ( $group ) {
-   return Linker::link(
+   return $this->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 
'GlobalGroupPermissions', $group ),
-   htmlspecialchars( User::getGroupName( 
$group ) )
+   User::getGroupName( $group )
);
}, $groups );
$attribs['groups'] = $this->getLanguage()->commaList( 
$groups );
diff --git a/includes/specials/SpecialGlobalGroupPermissions.php 
b/includes/specials/SpecialGlobalGroupPermissions.php
index 48494a6..8d1f9fc 100644
--- a/includes/specials/SpecialGlobalGroupPermissions.php
+++ b/includes/specials/SpecialGlobalGroupPermissions.php
@@ -132,14 +132,15 @@
$table .= Html::openElement( 'td' );
$table .= $this->getOutput()->parseInline( 
User::makeGroupLinkWiki( $groupName ) ) . '';
 
+   $linkRenderer = $this->getLinkRenderer();
$links = array(
-   Linker::linkKnown(
+   $linkRenderer->makeKnownLink(
$this->getPageTitle( $groupName ),
-   $this->msg( 
'centralauth-globalgroupperms-management' )->escaped()
+   $this->msg( 
'centralauth-globalgroupperms-management' )->text()
),
-   Linker::linkKnown(
+   $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 
'GlobalUsers', $groupName ),
-   $this->msg( 
'centralauth-globalgroupperms-group-listmembers' )->escaped()
+   $this->msg( 
'centralauth-globalgroupperms-group-listmembers' )->text()
),
);
$table .= $this->msg( 'parentheses' )->rawParams( 
$this->getLanguage()->pipeList( $links ) )->escaped();
@@ -157,9 +158,9 @@
} else {
$table .= $this->msg( 
'centralauth-globalgroupperms-group-wikiset' )
->rawParams(
-   Linker::linkKnown(
+   $linkRenderer->makeKnownLink(

SpecialPage::getTitleFor( 'WikiSets', $wikiset['id'] ),
-   htmlspecialchars( 
$wikiset['name'] )
+   $wikiset['name']
)
)->escaped();
}
@@ -278,9 +279,9 @@
if ( !$this->userCanEdit( $this->getUser() ) ) {
$set = WikiSet::newFromID( $default );
if ( $set ) {
-   return Linker::link(
+   return $this->getLinkRenderer()->makeLink(
SpecialPage::getTitleFor( 'WikiSets', 
$set->getId() ),
-   htmlspecialchars( $set->getName() )
+   $set->getName()
);
} else {
return $this->msg( 
'centralauth-editgroup-nowikiset' )->parse();
diff --git a/includes/specials/SpecialGlobalRenameQueue.php 
b/includes/specials/SpecialGlobalRenameQueue.php

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: Replace Linker::link() with LinkRenderer in special pages

[jenkins-bot (Code Review)]

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

Change subject: Replace Linker::link() with LinkRenderer in special pages
..


Replace Linker::link() with LinkRenderer in special pages

Bug: T149346
Change-Id: Ica15ce994da2039fcbb8c09cc6f88e2bf1a48469
---
M includes/specials/SpecialDisenroll.php
M includes/specials/SpecialEnroll.php
M includes/specials/SpecialManageCourses.php
M includes/specials/SpecialMyCourses.php
4 files changed, 18 insertions(+), 18 deletions(-)

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



diff --git a/includes/specials/SpecialDisenroll.php 
b/includes/specials/SpecialDisenroll.php
index 6e21950..2dfbe2f 100644
--- a/includes/specials/SpecialDisenroll.php
+++ b/includes/specials/SpecialDisenroll.php
@@ -2,7 +2,6 @@
 
 namespace EducationProgram;
 
-use Linker;
 use Html;
 use SpecialPage;
 use Xml;
@@ -98,9 +97,9 @@
 * @since 0.1
 */
protected function showLoginLink() {
-   $this->getOutput()->addHTML( Linker::linkKnown(
+   $this->getOutput()->addHTML( 
$this->getLinkRenderer()->makeKnownLink(
SpecialPage::getTitleFor( 'Userlogin' ),
-   $this->msg( 'ep-enroll-login-and-enroll' )->escaped(),
+   $this->msg( 'ep-enroll-login-and-enroll' )->text(),
[],
[
'returnto' => $this->getPageTitle( 
$this->subPage )->getFullText()
diff --git a/includes/specials/SpecialEnroll.php 
b/includes/specials/SpecialEnroll.php
index e5fb156..c35e71e 100644
--- a/includes/specials/SpecialEnroll.php
+++ b/includes/specials/SpecialEnroll.php
@@ -4,7 +4,6 @@
 
 use UserBlockedError;
 use Html;
-use Linker;
 use Xml;
 use SpecialPage;
 
@@ -207,9 +206,10 @@
$subPage .= '/' . $this->token;
}
 
-   $out->addHTML( Linker::linkKnown(
+   $linkRenderer = $this->getLinkRenderer();
+   $out->addHTML( $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Userlogin' ),
-   $this->msg( 'ep-enroll-login-and-enroll' )->escaped(),
+   $this->msg( 'ep-enroll-login-and-enroll' )->text(),
[],
[
'returnto' => $this->getPageTitle( $subPage 
)->getFullText()
@@ -218,9 +218,9 @@
 
$out->addHTML( '' );
 
-   $out->addHTML( Linker::linkKnown(
+   $out->addHTML( $linkRenderer->makeKnownLink(
SpecialPage::getTitleFor( 'Userlogin' ),
-   $this->msg( 'ep-enroll-signup-and-enroll' )->escaped(),
+   $this->msg( 'ep-enroll-signup-and-enroll' )->text(),
[],
[
'returnto' => $this->getPageTitle( $subPage 
)->getFullText(),
diff --git a/includes/specials/SpecialManageCourses.php 
b/includes/specials/SpecialManageCourses.php
index 0b415be..7d94996 100644
--- a/includes/specials/SpecialManageCourses.php
+++ b/includes/specials/SpecialManageCourses.php
@@ -52,9 +52,9 @@
}
}
} else {
-   $this->getOutput()->addHTML( \Linker::linkKnown(
+   $this->getOutput()->addHTML( 
$this->getLinkRenderer()->makeKnownLink(
\SpecialPage::getTitleFor( 'Userlogin' ),
-   $this->msg( 'ep-mycourses-login-first' 
)->escaped(),
+   $this->msg( 'ep-mycourses-login-first' 
)->text(),
[],
[
'returnto' => $this->getPageTitle( 
$this->subPage )->getFullText()
diff --git a/includes/specials/SpecialMyCourses.php 
b/includes/specials/SpecialMyCourses.php
index fe5093e..dc83f4c 100644
--- a/includes/specials/SpecialMyCourses.php
+++ b/includes/specials/SpecialMyCourses.php
@@ -2,14 +2,15 @@
 
 namespace EducationProgram;
 
-use EducationProgram\Events\Timeline;
+use Html;
+use HtmlArmor;
 use IContextSource;
-use Linker;
 use EducationProgram\Events\EventQuery;
 use EducationProgram\Events\EventStore;
+use EducationProgram\Events\Timeline;
 
 /**
- * Page listing the recent actibvity of the users classmates.
+ * Page listing the recent activity of the users classmates.
  * It works both as a timeline and a dashboard.
  *
  * @since 0.1
@@ -62,9 +63,9 @@
$this->displayTimelines();
}
} else {
-   $this->getOutput()->addHTML( Linker::linkKnown(
+   $this->getOutput()->addHTML( 
$this->getLinkRenderer()->makeKnownLink(
   

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add reporting for which query failed.

[jenkins-bot (Code Review)]

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

Change subject: Add reporting for which query failed.
..


Add reporting for which query failed.

Change-Id: I373ffe029f380086dd6e5cb2e7ee8766a8ac67bb
---
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
1 file changed, 2 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/rdf/RdfRepository.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
index daa291e..5af831f 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
@@ -131,7 +131,7 @@
  * How long to delay after failing first HTTP call, in milliseconds.
  * Next retries would be slower by 2x, 3x, 4x etc. until maxRetries is 
exhausted.
  */
-private int delay = 2000;
+private int delay = 1000;
 
 /**
  * Allow subclass access to the HTTP client.
@@ -621,7 +621,7 @@
 // Increasing delay, with random 10% variation so threads 
won't all get restarts
 // at the same time.
 int retryIn = (int)Math.ceil(delay * (retries + 1) * (1 + 
Math.random() * 0.1));
-log.info("HTTP request failed: {}, retrying in {} ms", e, 
retryIn);
+log.info("HTTP request for {} failed: {}, retrying in {} 
ms", type, e, retryIn);
 retries++;
 try {
 Thread.sleep(retryIn);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I373ffe029f380086dd6e5cb2e7ee8766a8ac67bb
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] wikidata...gui-deploy[production]: Merging from 6ba92b5de8bf4458c8955573e8cb959d75f1c688:

[Smalyshev (Code Review)]

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

Change subject: Merging from 6ba92b5de8bf4458c8955573e8cb959d75f1c688:
..


Merging from 6ba92b5de8bf4458c8955573e8cb959d75f1c688:

Merge "Add SPARQL query as hidden table column to allow filtering"

Change-Id: Id6de0197d16ed98628856d039b9b0637302d22fe
---
M i18n/ar.json
M i18n/bg.json
M i18n/bn.json
M i18n/bs.json
M i18n/ckb.json
M i18n/diq.json
M i18n/ec.json
M i18n/el.json
M i18n/eu.json
M i18n/fa.json
M i18n/it.json
M i18n/ko.json
M i18n/mg.json
M i18n/nb.json
M i18n/ne.json
M i18n/oc.json
M i18n/te.json
M i18n/tr.json
M index.html
D js/wdqs.min.08fc7e50c4c68570d464.js
A js/wdqs.min.270120032baa833ec9b0.js
21 files changed, 23 insertions(+), 23 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6de0197d16ed98628856d039b9b0637302d22fe
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Smalyshev 

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Make updater timeouts configurable

[jenkins-bot (Code Review)]

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

Change subject: Make updater timeouts configurable
..


Make updater timeouts configurable

Change-Id: I35a4e63ed459c4fc5e9cd733dbc3a165b8f2e133
---
M dist/src/script/runUpdate.sh
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
2 files changed, 25 insertions(+), 2 deletions(-)

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



diff --git a/dist/src/script/runUpdate.sh b/dist/src/script/runUpdate.sh
index 07a495c..3df3bb9 100755
--- a/dist/src/script/runUpdate.sh
+++ b/dist/src/script/runUpdate.sh
@@ -3,7 +3,7 @@
 HOST=http://localhost:
 CONTEXT=bigdata
 
-while getopts h:c:n:l:s option
+while getopts h:c:n:l:t:s option
 do
   case "${option}"
   in
@@ -11,6 +11,7 @@
 c) CONTEXT=${OPTARG};;
 n) NAMESPACE=${OPTARG};;
 l) LANGS=${OPTARG};;
+t) TMO=${OPTARG};;
 s) SKIPSITE=1;;
   esac
 done
@@ -22,6 +23,12 @@
 then
   echo "Usage: $0 -n  [-h ] [-c ]"
   exit 1
+fi
+
+if [ -z "$TMO" ]; then
+TIMEOUT_ARG=
+else
+TIMEOUT_ARG="-Dorg.wikidata.query.rdf.tool.rdf.RdfRepository.timeout=$TMO"
 fi
 
 if [ -z "$LANGS" ]; then
@@ -47,4 +54,4 @@
 SPARQL_URL=$HOST/$CONTEXT/namespace/$NAMESPACE/sparql
 AGENT=-javaagent:lib/jolokia-jvm-1.3.1-agent.jar=port=8778,host=localhost
 echo "Updating via $SPARQL_URL"
-java -Xmx2g -cp $CP $LOG $AGENT $MAIN $ARGS --sparqlUrl $SPARQL_URL "$@"
+java -Xmx2g -cp $CP $LOG $TIMEOUT_ARG $AGENT $MAIN $ARGS --sparqlUrl 
$SPARQL_URL "$@"
diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
index f7c0f34..daa291e 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
@@ -27,6 +27,7 @@
 import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -139,6 +140,16 @@
 return client;
 }
 
+/**
+ * HTTP request configuration.
+ */
+private RequestConfig requestConfig;
+
+/**
+ * Request timeout property.
+ */
+public static final String TIMEOUT_PROPERTY = RdfRepository.class + 
".timeout";
+
 public RdfRepository(URI uri, WikibaseUris uris) {
 this.uri = uri;
 this.uris = uris;
@@ -150,6 +161,10 @@
 cleanUnused = loadBody("CleanUnused");
 getRevisions = loadBody("GetRevisions");
 verify = loadBody("verify");
+
+final int timeout = Integer
+.parseInt(System.getProperty(TIMEOUT_PROPERTY, "-1")) * 1000;
+requestConfig = 
RequestConfig.custom().setSocketTimeout(timeout).build();
 }
 
 /**
@@ -576,6 +591,7 @@
  */
 protected  T execute(String type, ResponseHandler responseHandler, 
String sparql) {
 HttpPost post = new HttpPost(uri);
+post.setConfig(requestConfig);
 post.setHeader(new BasicHeader("Content-Type", 
"application/x-www-form-urlencoded; charset=UTF-8"));
 // Note that Blazegraph totally ignores the Accept header for SPARQL
 // updates like this so the response is just html

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35a4e63ed459c4fc5e9cd733dbc3a165b8f2e133
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] wikidata...rdf[master]: Update GUI

[Smalyshev (Code Review)]

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

Change subject: Update GUI
..

Update GUI

Change-Id: Ic51a7cf0603600801f8e40b4cf26de3260d73682
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/gui b/gui
index 924105d..6ba92b5 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 924105d3c1eba2ab6297786184d9465e40358d00
+Subproject commit 6ba92b5de8bf4458c8955573e8cb959d75f1c688

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic51a7cf0603600801f8e40b4cf26de3260d73682
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 6ba92b5de8bf4458c8955573e8cb959d75f1c688:

[Smalyshev (Code Review)]

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

Change subject: Merging from 6ba92b5de8bf4458c8955573e8cb959d75f1c688:
..

Merging from 6ba92b5de8bf4458c8955573e8cb959d75f1c688:

Merge "Add SPARQL query as hidden table column to allow filtering"

Change-Id: Id6de0197d16ed98628856d039b9b0637302d22fe
---
M i18n/ar.json
M i18n/bg.json
M i18n/bn.json
M i18n/bs.json
M i18n/ckb.json
M i18n/diq.json
M i18n/ec.json
M i18n/el.json
M i18n/eu.json
M i18n/fa.json
M i18n/it.json
M i18n/ko.json
M i18n/mg.json
M i18n/nb.json
M i18n/ne.json
M i18n/oc.json
M i18n/te.json
M i18n/tr.json
M index.html
D js/wdqs.min.08fc7e50c4c68570d464.js
A js/wdqs.min.270120032baa833ec9b0.js
21 files changed, 23 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy 
refs/changes/97/339797/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6de0197d16ed98628856d039b9b0637302d22fe
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...Nuke[master]: Move back to old URL parameter names

[jenkins-bot (Code Review)]

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

Change subject: Move back to old URL parameter names
..


Move back to old URL parameter names

Bug: T158502
Change-Id: Idc9d47d2b5331724cad8becc3af702216b0c1ecb
---
M Nuke_body.php
1 file changed, 11 insertions(+), 7 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve



diff --git a/Nuke_body.php b/Nuke_body.php
index 6f5dbc5..6633a69 100644
--- a/Nuke_body.php
+++ b/Nuke_body.php
@@ -23,7 +23,7 @@
}
 
$req = $this->getRequest();
-   $target = trim( $req->getText( 'wpnuke-target', $par ) );
+   $target = trim( $req->getText( 'target', $par ) );
 
// Normalise name
if ( $target !== '' ) {
@@ -39,8 +39,8 @@
inContentLanguage()->text();
$reason = $req->getText( 'wpReason', $msg );
 
-   $limit = $req->getInt( 'wplimit', 500 );
-   $namespace = $req->getVal( 'wpnamespace' );
+   $limit = $req->getInt( 'limit', 500 );
+   $namespace = $req->getVal( 'namespace' );
$namespace = ctype_digit( $namespace ) ? (int)$namespace : null;
 
if ( $req->wasPosted()
@@ -83,25 +83,29 @@
'default' => $userName,
'label' => $this->msg( 'nuke-userorip' 
)->text(),
'type' => 'user',
+   'name' => 'target'
],
'nuke-pattern' => [
'id' => 'nuke-pattern',
'label' => $this->msg( 'nuke-pattern' )->text(),
'maxLength' => 40,
-   'type' => 'text'
+   'type' => 'text',
+   'name' => 'pattern'
],
'namespace' => [
'id' => 'nuke-namespace',
'type' => 'namespaceselect',
'label' => $this->msg( 'nuke-namespace' 
)->text(),
-   'all' => 'all'
+   'all' => 'all',
+   'name' => 'namespace'
],
'limit' => [
'id' => 'nuke-limit',
'maxLength' => 7,
'default' => 500,
'label' => $this->msg( 'nuke-maxpages' 
)->text(),
-   'type' => 'int'
+   'type' => 'int',
+   'name' => 'limit'
]
];
 
@@ -266,7 +270,7 @@
$where['rc_namespace'] = $namespace;
}
 
-   $pattern = $this->getRequest()->getText( 'nuke-pattern' );
+   $pattern = $this->getRequest()->getText( 'pattern' );
if ( !is_null( $pattern ) && trim( $pattern ) !== '' ) {
$where[] = 'rc_title ' . $dbr->buildLike( $pattern );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc9d47d2b5331724cad8becc3af702216b0c1ecb
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Nuke
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add SPARQL query as hidden table column to allow filtering

[jenkins-bot (Code Review)]

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

Change subject: Add SPARQL query as hidden table column to allow filtering
..


Add SPARQL query as hidden table column to allow filtering

Bug:T154768
Change-Id: Ib610e9dde3470df85b005a61cc86ef7dd8eee5ec
---
M wikibase/queryService/ui/QueryExampleDialog.js
1 file changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/wikibase/queryService/ui/QueryExampleDialog.js 
b/wikibase/queryService/ui/QueryExampleDialog.js
index 733039f..0d110b5 100644
--- a/wikibase/queryService/ui/QueryExampleDialog.js
+++ b/wikibase/queryService/ui/QueryExampleDialog.js
@@ -117,7 +117,7 @@
if ( example.category !==  category ) {
category = example.category;
self._$element.find( '.searchable' 
).append( $( '' ).addClass( 'active' )
-   .append( $( '' ).text( category ) ) );
+   .append( $( '' ).text( category ) ) );
}
self._addExample( example.title, example.query, 
example.href, example.tags );
} );
@@ -235,7 +235,7 @@
self._track( 'edit' );
} ),
 
-   source = $( '' ).addClass( 'glyphicon 
glyphicon-eye-open' ).popover(
+   $source = $( '' ).addClass( 'glyphicon 
glyphicon-eye-open' ).popover(
{
placement: 'bottom',
trigger: 'hover',
@@ -244,7 +244,7 @@
content: $( '' ).text( query ),
html: true
} ),
-   preview = $( '' ).addClass( 'glyphicon 
glyphicon-camera' ).clickover(
+   $preview = $( '' ).addClass( 'glyphicon 
glyphicon-camera' ).clickover(
{
placement: 'left',
'global_close': true,
@@ -258,19 +258,19 @@
.click( function() {
self._track( 'preview' );
} );
-   $( '.exampleTable' ).scroll( function() {
-   if ( preview.clickover ) {
-   preview.clickover( 'hide' ).removeAttr( 
'data-clickover-open' );
+
+   $( '.exampleTable' ).scroll( function() {
+   if ( $preview.clickover ) {
+   $preview.clickover( 'hide' ).removeAttr( 
'data-clickover-open' );
}
} );
 
-   tags = $( '' ).text( tags.join( '|' ) ).hide();
-
var example = $( '' );
example.append( $( '' ).append( $link ).append( ' ', $edit 
) );
-   example.append( $( '' ).append( preview ) );
-   example.append( $( '' ).append( source ) );
-   example.append( tags );
+   example.append( $( '' ).append( $preview ) );
+   example.append( $( '' ).append( $source ) );
+   example.append( $( '' ).text( tags.join( '|' ) ).hide() );
+   example.append( $( '' ).text( query ).hide() );
 
this._$element.find( '.searchable' ).append( example );
};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib610e9dde3470df85b005a61cc86ef7dd8eee5ec
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
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] mediawiki/core[master]: Make highlight popup right-aligned

[Catrope (Code Review)]

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

Change subject: Make highlight popup right-aligned
..

Make highlight popup right-aligned

Bug: T149467
Change-Id: I2bb325e7de326ada4a78d1d00f6e11f54f2b7472
Depends-On: I6f2d03ac83aa415fb28715c83337ce6c093c3ecd
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
index 32db0b6..34fa82e 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
@@ -22,6 +22,8 @@
anchor: false,
padded: true,
align: 'backwards',
+   horizontalPosition: 'end',
+   $floatableContainer: this.$element,
width: 290,
$content: this.colorPickerWidget.$element
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bb325e7de326ada4a78d1d00f6e11f54f2b7472
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] wikidata...rdf[master]: Add reporting for which query failed.

[Smalyshev (Code Review)]

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

Change subject: Add reporting for which query failed.
..

Add reporting for which query failed.

Change-Id: I373ffe029f380086dd6e5cb2e7ee8766a8ac67bb
---
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
index daa291e..5af831f 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
@@ -131,7 +131,7 @@
  * How long to delay after failing first HTTP call, in milliseconds.
  * Next retries would be slower by 2x, 3x, 4x etc. until maxRetries is 
exhausted.
  */
-private int delay = 2000;
+private int delay = 1000;
 
 /**
  * Allow subclass access to the HTTP client.
@@ -621,7 +621,7 @@
 // Increasing delay, with random 10% variation so threads 
won't all get restarts
 // at the same time.
 int retryIn = (int)Math.ceil(delay * (retries + 1) * (1 + 
Math.random() * 0.1));
-log.info("HTTP request failed: {}, retrying in {} ms", e, 
retryIn);
+log.info("HTTP request for {} failed: {}, retrying in {} 
ms", type, e, retryIn);
 retries++;
 try {
 Thread.sleep(retryIn);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I373ffe029f380086dd6e5cb2e7ee8766a8ac67bb
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Scroll the capsule to the top of the screen

[jenkins-bot (Code Review)]

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

Change subject: RCFilters UI: Scroll the capsule to the top of the screen
..


RCFilters UI: Scroll the capsule to the top of the screen

When the popup shows up, scroll the capsule widget to the top of
the screen.

Change-Id: I5366a8a0918bda0aabe1c97db252278c36a89347
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
1 file changed, 28 insertions(+), 1 deletion(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index 50b7d15..2bd2f0e 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -11,6 +11,8 @@
 * @param {OO.ui.InputWidget} filterInput A filter input that focuses 
the capsule widget
 * @param {Object} config Configuration object
 * @cfg {jQuery} [$overlay] A jQuery object serving as overlay for 
popups
+* @cfg {number} [topScrollOffset=10] When scrolling the entire widget 
to the top, leave this
+*  much space (in pixels) above the widget.
 */
mw.rcfilters.ui.FilterCapsuleMultiselectWidget = function 
MwRcfiltersUiFilterCapsuleMultiselectWidget( controller, model, filterInput, 
config ) {
var title = new OO.ui.LabelWidget( {
@@ -29,8 +31,9 @@
 
this.controller = controller;
this.model = model;
-
this.filterInput = filterInput;
+
+   this.topScrollOffset = config.topScrollOffset || 10;
 
this.resetButton = new OO.ui.ButtonWidget( {
icon: 'trash',
@@ -51,6 +54,8 @@
itemUpdate: 'onModelItemUpdate',
highlightChange: 'onModelHighlightChange'
} );
+   this.popup.connect( this, { toggle: 'onPopupToggle' } );
+
// Add the filterInput as trigger
this.filterInput.$input
.on( 'focus', this.focus.bind( this ) );
@@ -163,6 +168,28 @@
};
 
/**
+* Respond to popup toggle event
+*
+* @param {boolean} isVisible Popup is visible
+*/
+   mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.onPopupToggle 
= function ( isVisible ) {
+   if ( isVisible ) {
+   this.scrollToTop();
+   }
+   };
+
+   /**
+* Scroll the capsule to the top of the screen
+*/
+   mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.scrollToTop = 
function () {
+   var container = 
OO.ui.Element.static.getClosestScrollableContainer( this.$element[ 0 ], 'y' );
+
+   $( container ).animate( {
+   scrollTop: this.$element.offset().top - 
this.topScrollOffset
+   } );
+   };
+
+   /**
 * Reevaluate the restore state for the widget between setting to 
defaults and clearing all filters
 */

mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.reevaluateResetRestoreState
 = function () {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5366a8a0918bda0aabe1c97db252278c36a89347
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
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 UI: Scroll the capsule to the top of the screen

[Mooeypoo (Code Review)]

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

Change subject: RCFilters UI: Scroll the capsule to the top of the screen
..

RCFilters UI: Scroll the capsule to the top of the screen

When the popup shows up, scroll the capsule widget to the top of
the screen.

Change-Id: I5366a8a0918bda0aabe1c97db252278c36a89347
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
1 file changed, 28 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/339794/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index 50b7d15..eab70dd 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -11,6 +11,8 @@
 * @param {OO.ui.InputWidget} filterInput A filter input that focuses 
the capsule widget
 * @param {Object} config Configuration object
 * @cfg {jQuery} [$overlay] A jQuery object serving as overlay for 
popups
+* @cfg {number} [topScrollOffset] An offset from the top of the 
scrollable container, when
+*  scrolling the entire capsule to the top.
 */
mw.rcfilters.ui.FilterCapsuleMultiselectWidget = function 
MwRcfiltersUiFilterCapsuleMultiselectWidget( controller, model, filterInput, 
config ) {
var title = new OO.ui.LabelWidget( {
@@ -29,8 +31,9 @@
 
this.controller = controller;
this.model = model;
-
this.filterInput = filterInput;
+
+   this.topScrollOffset = config.topScrollOffset || 10;
 
this.resetButton = new OO.ui.ButtonWidget( {
icon: 'trash',
@@ -51,6 +54,8 @@
itemUpdate: 'onModelItemUpdate',
highlightChange: 'onModelHighlightChange'
} );
+   this.popup.connect( this, { toggle: 'onPopupToggle' } );
+
// Add the filterInput as trigger
this.filterInput.$input
.on( 'focus', this.focus.bind( this ) );
@@ -163,6 +168,28 @@
};
 
/**
+* Respond to popup toggle event
+*
+* @param {boolean} isVisible Popup is visible
+*/
+   mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.onPopupToggle 
= function ( isVisible ) {
+   if ( isVisible ) {
+   this.scrollToTop();
+   }
+   };
+
+   /**
+* Scroll the capsule to the top of the screen
+*/
+   mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.scrollToTop = 
function () {
+   var container = 
OO.ui.Element.static.getClosestScrollableContainer( this.$element[ 0 ], 'y' );
+
+   $( container ).animate( {
+   scrollTop: this.$element.offset().top - 
this.topScrollOffset
+   } );
+   };
+
+   /**
 * Reevaluate the restore state for the widget between setting to 
defaults and clearing all filters
 */

mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.reevaluateResetRestoreState
 = function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5366a8a0918bda0aabe1c97db252278c36a89347
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] oojs/ui[master]: Add feedback icon

[Catrope (Code Review)]

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

Change subject: Add feedback icon
..

Add feedback icon

Change-Id: Ie947ebe5d43da25e10119a34a736762b3fff5659
---
M demos/pages/icons.js
M src/themes/apex/icons-interactions.json
A src/themes/apex/images/icons/feedback.svg
M src/themes/mediawiki/icons-interactions.json
A src/themes/mediawiki/images/icons/feedback.svg
5 files changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index d90c4a0..a779d67 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -68,6 +68,7 @@
'browser',
'clear',
'clock',
+   'feedback',
'funnel',
'heart',
'key',
diff --git a/src/themes/apex/icons-interactions.json 
b/src/themes/apex/icons-interactions.json
index 449cb77..7ef5b35 100644
--- a/src/themes/apex/icons-interactions.json
+++ b/src/themes/apex/icons-interactions.json
@@ -20,6 +20,7 @@
} },
"clear": { "file": "images/icons/clear.svg" },
"clock": { "file": "images/icons/clock.svg" },
+   "feedback": { "file": "images/icons/feedback.svg" },
"funnel": { "file": {
"ltr": "images/icons/funnel-ltr.svg",
"rtl": "images/icons/funnel-rtl.svg"
diff --git a/src/themes/apex/images/icons/feedback.svg 
b/src/themes/apex/images/icons/feedback.svg
new file mode 100644
index 000..3f5c0e0
--- /dev/null
+++ b/src/themes/apex/images/icons/feedback.svg
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+   
+
diff --git a/src/themes/mediawiki/icons-interactions.json 
b/src/themes/mediawiki/icons-interactions.json
index e040ffb..869b72b 100644
--- a/src/themes/mediawiki/icons-interactions.json
+++ b/src/themes/mediawiki/icons-interactions.json
@@ -34,6 +34,7 @@
} },
"clear": { "file": "images/icons/clear.svg" },
"clock": { "file": "images/icons/clock.svg" },
+   "feedback": { "file": "images/icons/feedback.svg", "variants": 
[ "progressive" ] },
"funnel": { "file": {
"ltr": "images/icons/funnel-ltr.svg",
"rtl": "images/icons/funnel-rtl.svg"
diff --git a/src/themes/mediawiki/images/icons/feedback.svg 
b/src/themes/mediawiki/images/icons/feedback.svg
new file mode 100644
index 000..3f5c0e0
--- /dev/null
+++ b/src/themes/mediawiki/images/icons/feedback.svg
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+   
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie947ebe5d43da25e10119a34a736762b3fff5659
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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/core[master]: RCFilters UI: Add popup footer with feedback link

[Catrope (Code Review)]

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

Change subject: RCFilters UI: Add popup footer with feedback link
..

RCFilters UI: Add popup footer with feedback link

Bug: T150959
Change-Id: Id10c39222a3d3d65d4ab1d006123f93b9972288f
Depends-On: Ie947ebe5d43da25e10119a34a736762b3fff5659
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
5 files changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/339793/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index abee4a9..098adb6 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1378,6 +1378,7 @@
"rcfilters-invalid-filter": "Invalid filter",
"rcfilters-empty-filter": "No active filters. All contributions are 
shown.",
"rcfilters-filterlist-title": "Filters",
+   "rcfilters-filterlist-feedbacklink": "Provide feedback on the new 
(beta) filters",
"rcfilters-highlightbutton-title": "Highlight results",
"rcfilters-highlightmenu-title": "Select a color",
"rcfilters-filterlist-noresults": "No filters found",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 7665f80..ea280ab 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1564,6 +1564,7 @@
"rcfilters-invalid-filter": "A label for an invalid filter.",
"rcfilters-empty-filter": "Placeholder for the filter list when no 
filters were chosen.",
"rcfilters-filterlist-title": "Title for the filters 
list.\n{{Identical|Filter}}",
+   "rcfilters-filterlist-feedbacklink": "Caption for the link to the 
feedback page about the filters beta feature.",
"rcfilters-highlightbutton-title": "Title for the highlight button used 
to toggle the highlight feature on and off.",
"rcfilters-highlightmenu-title": "Title for the highlight menu used to 
select the highlight color for an individual filter.",
"rcfilters-filterlist-noresults": "Message showing no results found for 
searching a filter.",
diff --git a/resources/Resources.php b/resources/Resources.php
index d6cb43f..2a6562d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1805,6 +1805,7 @@
'rcfilters-invalid-filter',
'rcfilters-empty-filter',
'rcfilters-filterlist-title',
+   'rcfilters-filterlist-feedbacklink',
'rcfilters-filterlist-noresults',
'rcfilters-filtergroup-registration',
'rcfilters-filter-registered-label',
@@ -1851,6 +1852,7 @@
'mediawiki.rcfilters.filters.dm',
'oojs-ui.styles.icons-moderation',
'oojs-ui.styles.icons-editing-core',
+   'oojs-ui.styles.icons-interactions',
],
],
'mediawiki.special' => [
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
index bdc94b3..eb484d5 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -8,6 +8,12 @@
// on the inline style of the popup
margin-top: 2.4em !important;
max-width: 650px;
+
+   .oo-ui-popupWidget-footer {
+   background-color: #f8f9fa;
+   text-align: right;
+   padding: 0.5em;
+   }
}
 
&-search {
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index d46bd4b..db333c9 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -13,6 +13,7 @@
 * @cfg {jQuery} [$overlay] A jQuery object serving as overlay for 
popups
 */
mw.rcfilters.ui.FilterWrapperWidget = function 
MwRcfiltersUiFilterWrapperWidget( controller, model, config ) {
+   var $footer = $( '' );
config = config || {};
 
// Parent
@@ -33,6 +34,16 @@
}
);
 
+   $footer.append(
+   new OO.ui.ButtonWidget( {
+   framed: false,
+   icon: 'feedback',
+   flags: [ 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.13]: resourceloader: Add purgeModuleDeps.php maintenance script

[Krinkle (Code Review)]

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

Change subject: resourceloader: Add purgeModuleDeps.php maintenance script
..

resourceloader: Add purgeModuleDeps.php maintenance script

Based on cleanupRemovedModules.php.

Bug: T158105
Change-Id: I05f650a0cfa8ca647f143a40e1087338adbef6da
---
A maintenance/purgeModuleDeps.php
1 file changed, 59 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/339792/1

diff --git a/maintenance/purgeModuleDeps.php b/maintenance/purgeModuleDeps.php
new file mode 100644
index 000..c924b94
--- /dev/null
+++ b/maintenance/purgeModuleDeps.php
@@ -0,0 +1,59 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ * @author Timo Tijhof
+ */
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Maintenance script to purge the module_deps database cache table.
+ *
+ * @ingroup Maintenance
+ */
+class PurgeModuleDeps extends Maintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->addDescription(
+   'Remove all cache entries for ResourceLoader modules 
from the database' );
+   $this->addOption( 'batchsize', 'Delete rows in batches of this 
size. Default: 500', false, true );
+   }
+
+   public function execute() {
+   $dbw = $this->getDB( DB_MASTER );
+   $limit = max( 1, intval( $this->getOption( 'batchsize', 500 ) ) 
);
+
+   $this->output( "Cleaning up module_deps table...\n" );
+   $i = 1;
+   $modDeps = $dbw->tableName( 'module_deps' );
+   do {
+   $dbw->query( "DELETE FROM $modDeps WHERE LIMIT $limit", 
__METHOD__ );
+   $numRows = $dbw->affectedRows();
+   $this->output( "Batch $i: $numRows rows\n" );
+   $i++;
+   wfWaitForSlaves();
+   } while ( $numRows > 0 );
+   $this->output( "done\n" );
+   }
+}
+
+$maintClass = 'PurgeModuleDeps';
+require_once RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05f650a0cfa8ca647f143a40e1087338adbef6da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.13
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Add purgeModuleDeps.php maintenance script

[Krinkle (Code Review)]

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

Change subject: resourceloader: Add purgeModuleDeps.php maintenance script
..

resourceloader: Add purgeModuleDeps.php maintenance script

Based on cleanupRemovedModules.php.

Bug: T158105
Change-Id: I05f650a0cfa8ca647f143a40e1087338adbef6da
---
A maintenance/purgeModuleDeps.php
1 file changed, 59 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/339791/1

diff --git a/maintenance/purgeModuleDeps.php b/maintenance/purgeModuleDeps.php
new file mode 100644
index 000..c924b94
--- /dev/null
+++ b/maintenance/purgeModuleDeps.php
@@ -0,0 +1,59 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ * @author Timo Tijhof
+ */
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Maintenance script to purge the module_deps database cache table.
+ *
+ * @ingroup Maintenance
+ */
+class PurgeModuleDeps extends Maintenance {
+   public function __construct() {
+   parent::__construct();
+   $this->addDescription(
+   'Remove all cache entries for ResourceLoader modules 
from the database' );
+   $this->addOption( 'batchsize', 'Delete rows in batches of this 
size. Default: 500', false, true );
+   }
+
+   public function execute() {
+   $dbw = $this->getDB( DB_MASTER );
+   $limit = max( 1, intval( $this->getOption( 'batchsize', 500 ) ) 
);
+
+   $this->output( "Cleaning up module_deps table...\n" );
+   $i = 1;
+   $modDeps = $dbw->tableName( 'module_deps' );
+   do {
+   $dbw->query( "DELETE FROM $modDeps WHERE LIMIT $limit", 
__METHOD__ );
+   $numRows = $dbw->affectedRows();
+   $this->output( "Batch $i: $numRows rows\n" );
+   $i++;
+   wfWaitForSlaves();
+   } while ( $numRows > 0 );
+   $this->output( "done\n" );
+   }
+}
+
+$maintClass = 'PurgeModuleDeps';
+require_once RUN_MAINTENANCE_IF_MAIN;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05f650a0cfa8ca647f143a40e1087338adbef6da
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] mediawiki/core[master]: Log a backtrace from the culprit location if headers were al...

[jenkins-bot (Code Review)]

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

Change subject: Log a backtrace from the culprit location if headers were 
already sent
..


Log a backtrace from the culprit location if headers were already sent

Install the backtrace collector very early, so that we can get the
backtrace even if headers were sent from LocalSettings.php.

Bug: T157392
Change-Id: I9bc732b34481c95afb5362e135a87bd4302498e2
---
M autoload.php
M includes/GlobalFunctions.php
A includes/HeaderCallback.php
M includes/Setup.php
M includes/WebResponse.php
M includes/WebStart.php
M includes/libs/HttpStatus.php
M includes/resourceloader/ResourceLoader.php
8 files changed, 77 insertions(+), 32 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index b21310e..fce7891 100644
--- a/autoload.php
+++ b/autoload.php
@@ -852,6 +852,7 @@
'MediaWiki\\Auth\\UsernameAuthenticationRequest' => __DIR__ . 
'/includes/auth/UsernameAuthenticationRequest.php',
'MediaWiki\\Diff\\ComplexityException' => __DIR__ . 
'/includes/diff/ComplexityException.php',
'MediaWiki\\Diff\\WordAccumulator' => __DIR__ . 
'/includes/diff/WordAccumulator.php',
+   'MediaWiki\\HeaderCallback' => __DIR__ . '/includes/HeaderCallback.php',
'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . 
'/includes/interwiki/ClassicInterwikiLookup.php',
'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . 
'/includes/interwiki/InterwikiLookup.php',
'MediaWiki\\Interwiki\\InterwikiLookupAdapter' => __DIR__ . 
'/includes/interwiki/InterwikiLookupAdapter.php',
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 46def53..7a34c74 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1788,6 +1788,7 @@
$wgOut->sendCacheControl();
}
 
+   MediaWiki\HeaderCallback::warnIfHeadersSent();
header( 'Content-type: text/html; charset=utf-8' );
print '' .
'' .
diff --git a/includes/HeaderCallback.php b/includes/HeaderCallback.php
new file mode 100644
index 000..b2ca673
--- /dev/null
+++ b/includes/HeaderCallback.php
@@ -0,0 +1,69 @@
+warning(
+   'Cookies set on {url} with 
Cache-Control "{cache-control}"', [
+   'url' => 
\WebRequest::getGlobalRequestURL(),
+   'cookies' => 
$headers['set-cookie'],
+   'cache-control' => 
$cacheControl ?: '',
+   ]
+   );
+   }
+   }
+
+   // Save a backtrace for logging in case it turns out that 
headers were sent prematurely
+   self::$headersSentException = new \Exception( 'Headers already 
sent from this point' );
+   }
+
+   /**
+* Log a warning message if headers have already been sent. This can be
+* called before flushing the output.
+*/
+   public static function warnIfHeadersSent() {
+   if ( headers_sent() && !self::$messageSent ) {
+   self::$messageSent = true;
+   \MWDebug::warning( 'Headers already sent, should send 
headers earlier than ' .
+   wfGetCaller( 3 ) );
+   $logger = \MediaWiki\Logger\LoggerFactory::getInstance( 
'headers-sent' );
+   $logger->error( 'Warning: headers were already sent 
from the location below', [
+   'exception' => self::$headersSentException,
+   'detection-trace' => new \Exception( 'Detected 
here' ),
+   ] );
+   }
+   }
+}
diff --git a/includes/Setup.php b/includes/Setup.php
index 01ba1e8..72ed1fd 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -521,35 +521,6 @@
 // is complete.
 define( 'MW_SERVICE_BOOTSTRAP_COMPLETE', 1 );
 
-// Install a header callback to prevent caching of responses with cookies 
(T127993)
-if ( !$wgCommandLineMode ) {
-   header_register_callback( function () {
-   $headers = [];
-   foreach ( headers_list() as $header ) {
-   list( $name, $value ) = explode( ':', $header, 2 );
-   $headers[strtolower( trim( $name ) )][] = trim( $value 
);
-   }
-
-   if ( isset( $headers['set-cookie'] ) ) {
-   $cacheControl = isset( $headers['cache-control'] )
-   ? implode( ', ', $headers['cache-control'] )
-   : '';
-
-   if ( !preg_match( 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Migrate to base::service_unit for systemd

[Paladox (Code Review)]

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

Change subject: Phabricator: Migrate to base::service_unit for systemd
..

Phabricator: Migrate to base::service_unit for systemd

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7a6200fab11c4bad51ee0e0163fad17f83fa5a6
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] mediawiki...Kartographer[master]: Remove href attribute (non-js fallback) once the map is inte...

[JGirault (Code Review)]

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

Change subject: Remove href attribute (non-js fallback) once the map is 
interactive
..

Remove href attribute (non-js fallback) once the map is interactive

Bug: T158979
Change-Id: Ib07cb4408e28bacfd7e6335d562c3c0a808b0e81
---
M modules/mapframe/mapframe.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/89/339789/1

diff --git a/modules/mapframe/mapframe.js b/modules/mapframe/mapframe.js
index 6f7e94b..dfc01cc 100644
--- a/modules/mapframe/mapframe.js
+++ b/modules/mapframe/mapframe.js
@@ -95,6 +95,9 @@
dataGroups: data.overlays,
captionText: data.captionText
} );
+
+   $container.removeAttr( 'href' );
+
mw.track( 'mediawiki.kartographer', {
action: 'view',
isFullScreen: false,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib07cb4408e28bacfd7e6335d562c3c0a808b0e81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Move sshd-phab.conf.erb and sshd-phab.service.e...

[Paladox (Code Review)]

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

Change subject: Phabricator: Move sshd-phab.conf.erb and sshd-phab.service.erb 
into initscripts
..

Phabricator: Move sshd-phab.conf.erb and sshd-phab.service.erb into initscripts

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic768898aee9dc86533bd98f6d1281c34866b797a
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] integration/config[master]: Whitelist user Matěj Suchánek <matejsuchane...@gmail.com>

[Urbanecm (Code Review)]

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

Change subject: Whitelist user Matěj Suchánek 
..

Whitelist user Matěj Suchánek 

Matěj is duing some basic coding work and it
will help him if he don't need to ask/wait
for verified+2 to ensure nothing will be broken.

See 
https://gerrit.wikimedia.org/r/#/q/owner:%22Mat%25C4%259Bj+Such%25C3%25A1nek%22 
for his contribs

Change-Id: I6e0144a868df5f0811b96dd653633e754d2704c0
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/88/339788/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c048171..0c52580 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -154,6 +154,7 @@
 | martin\.urbanec@wikimedia\.cz
 | matanya@foss\.co\.il
 | matanya\.moses@gmail\.com
+| matejsuchanek97@gmail\.com
 | matma\.rex@gmail\.com
 | maxsem\.wiki@gmail\.com
 | Megadev44s\.mail@gmail\.com
@@ -409,6 +410,7 @@
- ^martin\.urbanec@wikimedia\.cz$
- ^matanya\.moses@gmail\.com$
- ^matanya@foss\.co\.il$
+   - ^matejsuchanek97@gmail\.com$
- ^matma\.rex@gmail\.com$
- ^Megadev44s\.mail@gmail\.com$ # Zppix
- ^misterstrad@gmail\.com$ # Mr. Stradivarius

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e0144a868df5f0811b96dd653633e754d2704c0
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 

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

[MediaWiki-commits] [Gerrit] wikimedia/annualreport[master]: add 2016 annual report data

[Dzahn (Code Review)]

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

Change subject: add 2016 annual report data
..


add 2016 annual report data

Bug: T151798
Change-Id: I7fab024516ada6b0ba9a6973993ceaaaf7748799
---
A 2016/404.html
A 2016/consider-the-facts.html
A 2016/css/build/flickity.min.css
A 2016/css/build/ie9.css
A 2016/css/build/main.css
A 2016/css/build/main.css.map
A 2016/donors.html
A 2016/fact-1.html
A 2016/fact-10.html
A 2016/fact-2.html
A 2016/fact-3.html
A 2016/fact-4.html
A 2016/fact-5.html
A 2016/fact-6.html
A 2016/fact-7.html
A 2016/fact-8.html
A 2016/fact-9.html
A 2016/financials.html
A 2016/fonts/droidsans-bold-demo.html
A 2016/fonts/droidsans-bold-webfont.woff
A 2016/fonts/droidsans-bold-webfont.woff2
A 2016/fonts/droidsans-demo.html
A 2016/fonts/droidsans-webfont.woff
A 2016/fonts/droidsans-webfont.woff2
A 2016/fonts/generator_config.txt
A 2016/fonts/lora-bold-demo.html
A 2016/fonts/lora-bold-webfont.woff
A 2016/fonts/lora-bold-webfont.woff2
A 2016/fonts/lora-bolditalic-demo.html
A 2016/fonts/lora-bolditalic-webfont.woff
A 2016/fonts/lora-bolditalic-webfont.woff2
A 2016/fonts/lora-italic-demo.html
A 2016/fonts/lora-italic-webfont.woff
A 2016/fonts/lora-italic-webfont.woff2
A 2016/fonts/lora-regular-demo.html
A 2016/fonts/lora-regular-webfont.woff
A 2016/fonts/lora-regular-webfont.woff2
A 2016/fonts/montserrat-bold-demo.html
A 2016/fonts/montserrat-bold-webfont.woff
A 2016/fonts/montserrat-bold-webfont.woff2
A 2016/fonts/montserrat-regular-demo.html
A 2016/fonts/montserrat-regular-webfont.woff
A 2016/fonts/montserrat-regular-webfont.woff2
A 2016/img/2016-factsbook.jpg
A 2016/img/arrow-down-dark.svg
A 2016/img/arrow-left.png
A 2016/img/arrow-nav-right.png
A 2016/img/arrow-right.png
A 2016/img/arrow-table-left.png
A 2016/img/arrow-table-right.png
A 2016/img/arrow-top-of-page-button.svg
A 2016/img/arrow-up.png
A 2016/img/arrow-up.svg
A 2016/img/arrows.svg
A 2016/img/card-arrow-right.svg
A 2016/img/contributors-header-large.jpg
A 2016/img/contributors-header-mobile.jpg
A 2016/img/contributors-header.jpg
A 2016/img/down-arrow.svg
A 2016/img/facebook-logo-dark.svg
A 2016/img/facebook-logo.svg
A 2016/img/fact-cards/1650-languages.jpg
A 2016/img/fact-cards/1650-languagesv3.jpg
A 2016/img/fact-cards/239-people-used-internet-2016.jpg
A 2016/img/fact-cards/87-percent-not-english.jpg
A 2016/img/fact-cards/bios-about-women.jpg
A 2016/img/fact-cards/bios-about-womenv2.jpg
A 2016/img/fact-cards/donate-card.jpg
A 2016/img/fact-cards/ok-globally-understood.jpg
A 2016/img/fact-cards/polar-bear.jpg
A 2016/img/fact-cards/refugees-school-age.jpg
A 2016/img/fact-cards/trillion-photos-2016.jpg
A 2016/img/fact-cards/trillion-photos-2016v2.jpg
A 2016/img/fact-cards/visited-another-country.jpg
A 2016/img/fact-cards/visited-another-countryv2.jpg
A 2016/img/fact-cards/wiki-updated-250.jpg
A 2016/img/fact-cards/wiki-updated-250v2.jpg
A 2016/img/fact-headers/1650-languages.jpg
A 2016/img/fact-headers/1650-languagesv3.jpg
A 2016/img/fact-headers/239-people-used-internet-2016.jpg
A 2016/img/fact-headers/87-percent-not-english-mobile.jpg
A 2016/img/fact-headers/87-percent-not-english.jpg
A 2016/img/fact-headers/bios-about-women.jpg
A 2016/img/fact-headers/bios-about-womenv2.jpg
A 2016/img/fact-headers/dried-lake.jpg
A 2016/img/fact-headers/ok-globally-understood.jpg
A 2016/img/fact-headers/polar-bear-original.jpg
A 2016/img/fact-headers/polar-bear.jpg
A 2016/img/fact-headers/refugees-school-age.jpg
A 2016/img/fact-headers/trillion-photos-2016.jpg
A 2016/img/fact-headers/trillion-photos-2016v2.jpg
A 2016/img/fact-headers/visited-another-country.jpg
A 2016/img/fact-headers/visited-another-countryv2.jpg
A 2016/img/fact-headers/wiki-updated-250.jpg
A 2016/img/fact-headers/wiki-updated-250v2.jpg
A 2016/img/fact-inserts/arctic-death-spiral.jpg
A 2016/img/factsbook.jpg
A 2016/img/favicon.ico
A 2016/img/four-star-logo-light.png
A 2016/img/four-star-logo-light.svg
A 2016/img/four-star-logo.png
A 2016/img/four-star-logo.svg
A 2016/img/hamburger-dark.png
A 2016/img/hamburger-dark.svg
A 2016/img/hamburger-light
A 2016/img/hamburger-light.svg
A 2016/img/impact-card.png
A 2016/img/impact-header-large.jpg
A 2016/img/jimmy-wales-article-card.png
A 2016/img/jimmy-wales-large.jpg
A 2016/img/jimmy-wales-mobile.jpg
A 2016/img/jimmy-wales-signature.svg
A 2016/img/katherine-maher-article-card.png
A 2016/img/katherine-maher-mobile.jpg
A 2016/img/katherine-maher-signature.svg
A 2016/img/katherine-maher.jpg
A 2016/img/mobile-nav-x-dark.svg
A 2016/img/mobile-nav-x-light.svg
A 2016/img/ok-emoji.png
A 2016/img/this-is-wikimedia.jpg
A 2016/img/twitter-logo-dark.svg
A 2016/img/twitter-logo.svg
A 2016/img/up-arrow.png
A 2016/img/up-arrow.svg
A 2016/img/video-bg-fallback.jpg
A 2016/img/wiki-footer-logo.png
A 2016/img/wiki-footer-logo.svg
A 2016/img/wiki-nav-logo-dark.svg
A 2016/img/wiki-nav-logo.svg
A 2016/img/wikimedia-logo-white.svg
M 2016/index.html
A 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Track document visibility in reading depth schema

[jenkins-bot (Code Review)]

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

Change subject: Track document visibility in reading depth schema
..


Track document visibility in reading depth schema

Calculate the number of milliseconds that the page is visible for by
tracking how long the document is hidden for via the Page Visibility API
and subtracting that from the ReadingDepth.totalLength property.

Supporting changes:
* Add the supportsNavigationTiming function to remove the navStart
  module-level variable, which is only used in the logEvent function.
* Add the onLoad and onBeforeUnload functions, so that the order of
  execution can be better documented.

Bug: T155639
Change-Id: I762ec3fc91decf3cffa869dbd783faf62f01329a
---
M modules/ext.wikimediaEvents.readingDepth.js
1 file changed, 122 insertions(+), 21 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.readingDepth.js 
b/modules/ext.wikimediaEvents.readingDepth.js
index 8bd9969..2b5392d 100644
--- a/modules/ext.wikimediaEvents.readingDepth.js
+++ b/modules/ext.wikimediaEvents.readingDepth.js
@@ -34,11 +34,9 @@
}
}
 
-   var msPaused = 0,
+   var pausedAt,
+   msPaused = 0,
perf = window.performance,
-   // This copies logic in mw.now for consistency.
-   // if not defined no events will be logged.
-   navStart = perf && perf.timing && perf.timing.navigationStart,
EVENT = {
pageTitle: config.get( 'wgTitle' ),
namespaceId: config.get( 'wgNamespaceNumber' ),
@@ -51,6 +49,45 @@
};
 
/**
+* Pause the user's page session length timer based on information that 
they
+* have hidden the page, e.g. they opened another tab.
+*
+* If the timer is paused, then NOP.
+*
+* @param {number} [at=mw.now] The time at which the timer was paused
+*/
+   function pause( at ) {
+   if ( !pausedAt ) {
+   pausedAt = at || mw.now();
+   }
+   }
+
+   /**
+* Resume the user's page session length timer.
+*
+* If the timer is running, then NOP.
+*/
+   function resume() {
+   if ( pausedAt ) {
+   // mw.now invokes [window.]performance.now when it's 
available
+   // 
.
+   //
+   // performance.now is specified such that it's not 
subject to system clock
+   // skew or adjustments 
 and
+   // is supported by the same set of browsers as the 
Navigation Timing API
+   // , which, 
we've already noted is
+   // supported by more browsers than the Beacon API
+   // .
+   //
+   // Because this code will only be executed by UA's that 
support the Beacon
+   // API, we can rely on mw.now not to be subject to 
system clock skew or
+   // adjustments.
+   msPaused +=  mw.now() - pausedAt;
+   pausedAt = null;
+   }
+   }
+
+   /**
* Log an event to the Schema:ReadingDepth
*
* @param {string} action a valid value for the action property inside 
the
@@ -58,23 +95,39 @@
*/
function logEvent( action ) {
var now,
-   // will always be defined.
-   domInteractive = perf.timing.domInteractive,
-   fp = getFirstPaintTime( perf ),
+   timing = perf.timing,
+   domInteractive = timing.domInteractive,
+   navigationStart = timing.navigationStart,
+   firstPaint = getFirstPaintTime( perf ),
+
+   // Used while calculating the totalLength and 
visibleLength properties.
+   delta, adjustedEpoch, hiddenFor,
+
data = $.extend( {}, EVENT, {
action: action,
-   domInteractiveTime: domInteractive - navStart,
-   firstPaintTime: fp ? fp - navStart : undefined
-   } ),
-   // time to start measuring from with preference for 
first paint
-   from = fp || domInteractive;
+   domInteractiveTime: domInteractive - 
navigationStart,
+

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Add LanguageChangeOpDeserializer

[Ladsgroup (Code Review)]

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

Change subject: Add LanguageChangeOpDeserializer
..

Add LanguageChangeOpDeserializer

Bug: T155701
Change-Id: Ibda3e8b94a7f17637f4da5a5e54cd76369f1e003
---
A src/ChangeOp/Deserialization/LanguageChangeOpDeserializer.php
A 
tests/phpunit/mediawiki/ChangeOp/Deserialization/LanguageChangeOpDeserializerTest.php
2 files changed, 218 insertions(+), 0 deletions(-)


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

diff --git a/src/ChangeOp/Deserialization/LanguageChangeOpDeserializer.php 
b/src/ChangeOp/Deserialization/LanguageChangeOpDeserializer.php
new file mode 100644
index 000..948fd7a
--- /dev/null
+++ b/src/ChangeOp/Deserialization/LanguageChangeOpDeserializer.php
@@ -0,0 +1,107 @@
+lexemeValidatorFactory = $lexemeValidatorFactory;
+   $this->stringNormalizer = $stringNormalizer;
+   //XXX: Inject this?
+   $this->stringValidator = new StringValidator();
+   }
+
+   /**
+* @see ChangeOpDeserializer::createEntityChangeOp
+*
+* @param array $changeRequest
+*
+* @throws ChangeOpDeserializationException
+*
+* @return ChangeOp
+*/
+   public function createEntityChangeOp( array $changeRequest ) {
+   $changeOps = new ChangeOps();
+
+   $result = $this->stringValidator->validate( 
$changeRequest['language'] );
+   if ( $result->isValid() !== true ) {
+   throw new ChangeOpDeserializationException(
+   'language needs to be string',
+   'invalid-language'
+   );
+   }
+   $languageSerialization = $this->stringNormalizer->cleanupToNFC( 
$changeRequest['language'] );
+
+   if ( $languageSerialization === '' ) {
+   $changeOps->add( new ChangeOpLanguage(
+   null,
+   $this->lexemeValidatorFactory
+   ) );
+   return $changeOps;
+   }
+
+   $itemId = $this->validateItemId( $languageSerialization );
+   // TODO: maybe move creating ChangeOpLanguage instance to some 
kind of factory?
+   $changeOps->add( new ChangeOpLanguage(
+   $itemId,
+   $this->lexemeValidatorFactory
+   ) );
+
+   return $changeOps;
+   }
+
+   /**
+* @param string $idSerialization
+* @return ItemId
+* @throws ChangeOpDeserializationException
+*/
+   private function validateItemId( $idSerialization ) {
+   try {
+   $itemId = new ItemId( $idSerialization );
+   } catch ( InvalidArgumentException $e ) {
+   throw new ChangeOpDeserializationException(
+   'Item id can not be parsed',
+   'invalid-item-id'
+   );
+   }
+
+   return $itemId;
+   }
+
+}
diff --git 
a/tests/phpunit/mediawiki/ChangeOp/Deserialization/LanguageChangeOpDeserializerTest.php
 
b/tests/phpunit/mediawiki/ChangeOp/Deserialization/LanguageChangeOpDeserializerTest.php
new file mode 100644
index 000..26bae10
--- /dev/null
+++ 
b/tests/phpunit/mediawiki/ChangeOp/Deserialization/LanguageChangeOpDeserializerTest.php
@@ -0,0 +1,111 @@
+getMockTermValidatorFactory() ),
+   new StringNormalizer()
+   );
+   }
+
+   public function 
testGivenLanguageSerializationIsNotString_exceptionIsThrown() {
+   $deserializer = $this->newLanguageChangeOpDeserializer();
+
+   $this->setExpectedException( 
ChangeOpDeserializationException::class );
+
+   $deserializer->createEntityChangeOp( [ 'language' => [] ] );
+   }
+
+   public function 
testGivenLanguageSerializationIsInvalid_exceptionIsThrown() {
+
+   $lexemeValidatorFactory = $this->getMockBuilder( 
LexemeValidatorFactory::class )
+   ->disableOriginalConstructor()
+   ->getMock();
+
+   $deserializer = new LanguageChangeOpDeserializer(
+   $lexemeValidatorFactory,
+   new StringNormalizer()
+   );
+
+   $this->setExpectedException( 
ChangeOpDeserializationException::class );
+
+   $deserializer->createEntityChangeOp( [ 'language' => 'invalid 
item id' ] );
+   }
+
+   // TODO: should case of ChangeOp with invalid Term (ie. throwing 
ChangeOpException
+   // when applied on Lexeme object) be also tested here?
+
+   public function 

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Make updater timeouts configurable

[Smalyshev (Code Review)]

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

Change subject: Make updater timeouts configurable
..

Make updater timeouts configurable

Change-Id: I35a4e63ed459c4fc5e9cd733dbc3a165b8f2e133
---
M dist/src/script/runUpdate.sh
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
2 files changed, 25 insertions(+), 2 deletions(-)


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

diff --git a/dist/src/script/runUpdate.sh b/dist/src/script/runUpdate.sh
index 07a495c..3df3bb9 100755
--- a/dist/src/script/runUpdate.sh
+++ b/dist/src/script/runUpdate.sh
@@ -3,7 +3,7 @@
 HOST=http://localhost:
 CONTEXT=bigdata
 
-while getopts h:c:n:l:s option
+while getopts h:c:n:l:t:s option
 do
   case "${option}"
   in
@@ -11,6 +11,7 @@
 c) CONTEXT=${OPTARG};;
 n) NAMESPACE=${OPTARG};;
 l) LANGS=${OPTARG};;
+t) TMO=${OPTARG};;
 s) SKIPSITE=1;;
   esac
 done
@@ -22,6 +23,12 @@
 then
   echo "Usage: $0 -n  [-h ] [-c ]"
   exit 1
+fi
+
+if [ -z "$TMO" ]; then
+TIMEOUT_ARG=
+else
+TIMEOUT_ARG="-Dorg.wikidata.query.rdf.tool.rdf.RdfRepository.timeout=$TMO"
 fi
 
 if [ -z "$LANGS" ]; then
@@ -47,4 +54,4 @@
 SPARQL_URL=$HOST/$CONTEXT/namespace/$NAMESPACE/sparql
 AGENT=-javaagent:lib/jolokia-jvm-1.3.1-agent.jar=port=8778,host=localhost
 echo "Updating via $SPARQL_URL"
-java -Xmx2g -cp $CP $LOG $AGENT $MAIN $ARGS --sparqlUrl $SPARQL_URL "$@"
+java -Xmx2g -cp $CP $LOG $TIMEOUT_ARG $AGENT $MAIN $ARGS --sparqlUrl 
$SPARQL_URL "$@"
diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
index f7c0f34..daa291e 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
@@ -27,6 +27,7 @@
 import org.apache.http.Consts;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -139,6 +140,16 @@
 return client;
 }
 
+/**
+ * HTTP request configuration.
+ */
+private RequestConfig requestConfig;
+
+/**
+ * Request timeout property.
+ */
+public static final String TIMEOUT_PROPERTY = RdfRepository.class + 
".timeout";
+
 public RdfRepository(URI uri, WikibaseUris uris) {
 this.uri = uri;
 this.uris = uris;
@@ -150,6 +161,10 @@
 cleanUnused = loadBody("CleanUnused");
 getRevisions = loadBody("GetRevisions");
 verify = loadBody("verify");
+
+final int timeout = Integer
+.parseInt(System.getProperty(TIMEOUT_PROPERTY, "-1")) * 1000;
+requestConfig = 
RequestConfig.custom().setSocketTimeout(timeout).build();
 }
 
 /**
@@ -576,6 +591,7 @@
  */
 protected  T execute(String type, ResponseHandler responseHandler, 
String sparql) {
 HttpPost post = new HttpPost(uri);
+post.setConfig(requestConfig);
 post.setHeader(new BasicHeader("Content-Type", 
"application/x-www-form-urlencoded; charset=UTF-8"));
 // Note that Blazegraph totally ignores the Accept header for SPARQL
 // updates like this so the response is just html

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35a4e63ed459c4fc5e9cd733dbc3a165b8f2e133
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labtest: Update 'admin' project id

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/339757 )

Change subject: labtest:  Update 'admin' project id
..


labtest:  Update 'admin' project id

Now that we enforce the id == name rule for projects,
the project id is just 'admin'.

Change-Id: I7d3c6ba15c94668a63f0228d90db53e4ab33d70c
---
M hieradata/regex.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 51eaef4..c69afa3 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -544,7 +544,7 @@
 auth_protocol: 'http'
 auth_host: 208.80.153.47
 admin_project_name: 'admin'
-admin_project_id: '93f988e6a8a34da087f5fbec50aca26b'
+admin_project_id: 'admin'
 oath_dbname: 'labtestwiki'
 oath_dbhost: 'labtestweb2001.wikimedia.org'
   designateconfig:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d3c6ba15c94668a63f0228d90db53e4ab33d70c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
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...GlobalUsage[master]: Cleanup

[MaxSem (Code Review)]

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

Change subject: Cleanup
..

Cleanup

* Fix method name case
* Fix PHPDoc
* Add parameter types
* Remove `return true` from hook handlers

Change-Id: Ic993572d64f873f1c0262d7e695298f755268b7f
---
M includes/ApiQueryGlobalUsage.php
M includes/GlobalUsage.php
M includes/GlobalUsageCachePurgeJob.php
M includes/GlobalUsageHooks.php
M includes/GlobalUsageImagePageHooks.php
M includes/GlobalUsageQuery.php
M includes/SpecialGlobalUsage.php
M includes/SpecialGloballyWantedFiles.php
M includes/SpecialMostGloballyLinkedFiles.php
9 files changed, 104 insertions(+), 110 deletions(-)


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

diff --git a/includes/ApiQueryGlobalUsage.php b/includes/ApiQueryGlobalUsage.php
index 1361d87..6870b51 100644
--- a/includes/ApiQueryGlobalUsage.php
+++ b/includes/ApiQueryGlobalUsage.php
@@ -68,7 +68,7 @@
];
if ( isset( $prop['url'] ) ) {
/* We expand the url 
because we don't want protocol relative urls in API results */
-   $result['url'] = 
wfExpandUrl( WikiMap::getForeignUrl( $item['wiki'], $title ), PROTO_CURRENT );
+   $result['url'] = 
wfExpandUrl( WikiMap::getForeignURL( $item['wiki'], $title ), PROTO_CURRENT );
}
if ( isset( $prop['pageid'] ) ) 
{
$result['pageid'] = 
$item['id'];
diff --git a/includes/GlobalUsage.php b/includes/GlobalUsage.php
index 9524221..6233678 100644
--- a/includes/GlobalUsage.php
+++ b/includes/GlobalUsage.php
@@ -23,8 +23,8 @@
/**
 * Construct a GlobalUsage instance for a certain wiki.
 *
-* @param $interwiki string Interwiki prefix of the wiki
-* @param $db IDatabase Database object
+* @param string $interwiki Interwiki prefix of the wiki
+* @param IDatabase $db Database object
 */
public function __construct( $interwiki, IDatabase $db ) {
$this->interwiki = $interwiki;
@@ -34,10 +34,10 @@
/**
 * Sets the images used by a certain page
 *
-* @param $title Title Title of the page
-* @param $images array Array of db keys of images used
-* @param $pageIdFlags int
-* @param $ticket int|null
+* @param Title $title Page title
+* @param array $images Array of db keys of images used
+* @param int $pageIdFlags
+* @param int|null $ticket
 */
public function insertLinks(
Title $title, array $images, $pageIdFlags = 
Title::GAID_FOR_UPDATE, $ticket = null
@@ -66,7 +66,7 @@
 
/**
 * Get all global images from a certain page
-* @param $id int
+* @param int $id
 * @return array
 */
public function getLinksFromPage( $id ) {
@@ -91,9 +91,9 @@
/**
 * Deletes all entries from a certain page to certain files
 *
-* @param $id int Page id of the page
-* @param $to mixed File name(s)
-* @param $ticket int|null
+* @param int $id Page id of the page
+* @param array|null $to File name(s)
+* @param int|null $ticket
 */
public function deleteLinksFromPage( $id, array $to = null, $ticket = 
null ) {
global $wgUpdateRowsPerQuery;
@@ -118,9 +118,9 @@
/**
 * Deletes all entries to a certain image
 *
-* @param $title Title Title of the file
+* @param Title $title File title
 */
-   public function deleteLinksToFile( $title ) {
+   public function deleteLinksToFile( Title $title ) {
$this->db->delete(
'globalimagelinks',
[
@@ -134,7 +134,7 @@
/**
 * Copy local links to global table
 *
-* @param $title Title Title of the file to copy entries from.
+* @param Title $title File to copy entries from
 */
public function copyLocalImagelinks( Title $title ) {
global $wgContLang;
@@ -158,19 +158,18 @@
];
}
 
-   $fname = __METHOD__;
-   DeferredUpdates::addCallableUpdate( function () use ( $insert, 
$fname ) {
-   $this->db->insert( 'globalimagelinks', $insert, $fname, 
[ 'IGNORE' ] );
+   DeferredUpdates::addCallableUpdate( function () use ( $insert ) 
{
+   $this->db->insert( 'globalimagelinks', $insert, 
__METHOD__, [ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labtest: Update 'admin' project id

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339757 )

Change subject: labtest:  Update 'admin' project id
..

labtest:  Update 'admin' project id

Now that we enforce the id == name rule for projects,
the project id is just 'admin'.

Change-Id: I7d3c6ba15c94668a63f0228d90db53e4ab33d70c
---
M hieradata/regex.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/339757/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 51eaef4..c69afa3 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -544,7 +544,7 @@
 auth_protocol: 'http'
 auth_host: 208.80.153.47
 admin_project_name: 'admin'
-admin_project_id: '93f988e6a8a34da087f5fbec50aca26b'
+admin_project_id: 'admin'
 oath_dbname: 'labtestwiki'
 oath_dbhost: 'labtestweb2001.wikimedia.org'
   designateconfig:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Limit filter popup height

[Mooeypoo (Code Review)]

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

Change subject: RCFilters UI: Limit filter popup height
..

RCFilters UI: Limit filter popup height

Bug: T158118
Change-Id: I2f9e8b775b154635aa8b12f44876279173548b99
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
2 files changed, 7 insertions(+), 1 deletion(-)


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

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
index bdc94b3..7749dde 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -8,6 +8,11 @@
// on the inline style of the popup
margin-top: 2.4em !important;
max-width: 650px;
+
+   .oo-ui-popupWidget-popup {
+   overflow-y: auto;
+   padding-right: 0;
+   }
}
 
&-search {
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index d46bd4b..ee1c473 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -44,7 +44,8 @@
popup: {
$content: this.filterPopup.$element,
classes: [ 
'mw-rcfilters-ui-filterWrapperWidget-popup' ],
-   width: 650
+   width: 650,
+   height: 450
}
} );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f9e8b775b154635aa8b12f44876279173548b99
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...Flow[master]: Fix adjacent input widget border radii

[jenkins-bot (Code Review)]

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

Change subject: Fix adjacent input widget border radii
..


Fix adjacent input widget border radii

This does not address the issue with message boxes
above the first input.

Bug: T116573
Change-Id: Ia14c0d8f82b9c46349bfde11f91b28d941c5cb48
---
M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
M modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
M modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
M modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
4 files changed, 26 insertions(+), 1 deletion(-)

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



diff --git a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
index 9fba33c..927c19f 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
@@ -257,6 +257,7 @@
mw.flow.ui.NewTopicWidget.prototype.toggleExpanded = function ( 
expanded ) {
this.expanded = expanded !== undefined ? expanded : 
!this.expanded;
 
+   this.$element.toggleClass( 'flow-ui-newTopicWidget-expanded', 
this.expanded );
this.editor.toggle( this.expanded );
this.anonWarning.toggle( this.expanded );
this.canNotEdit.toggle( this.expanded );
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
index 193a343..bb200fd 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
@@ -61,11 +61,16 @@
}
 }
 
+.flow-ui-newTopicWidget-title.oo-ui-textInputWidget input {
+   border-radius: 0.25em/1.5;
+}
+
 .flow-editor,
 .flow-ui-editorSwitcherWidget {
// Undo border & box-shadow on textarea and re-apply it on the
// div that contains textarea + legal text + switch button
border: 1px solid #ccc;
+   border-radius: 0.25em;
 }
 
 .flow-editor.flow-ui-focused,
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
index 483a16f..174514a 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
@@ -79,6 +79,7 @@
-moz-transition: border 0.2s cubic-bezier( 0.39, 0.575, 0.565, 1 ), 
box-shadow 0.2s cubic-bezier( 0.39, 0.575, 0.565, 1 );
-o-transition: border 0.2s cubic-bezier( 0.39, 0.575, 0.565, 1 ), 
box-shadow 0.2s cubic-bezier( 0.39, 0.575, 0.565, 1 );
transition: border 0.2s cubic-bezier( 0.39, 0.575, 0.565, 1 ), 
box-shadow 0.2s cubic-bezier( 0.39, 0.575, 0.565, 1 );
+   border-radius: 2px;
 }
 
 .flow-editor.flow-ui-focused,
diff --git a/modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less 
b/modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
index dff1da4..f6d23e8 100644
--- a/modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
+++ b/modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
@@ -7,6 +7,11 @@
max-width: none;
 
input {
+   .flow-ui-newTopicWidget-expanded & {
+   border-bottom-left-radius: 0;
+   border-bottom-right-radius: 0;
+   }
+
// Match heading styles
font-size: 1.5em;
font-weight: bold;
@@ -21,7 +26,6 @@
padding: 0.3em 0.3em 0.3em 0.6em;
display: block;
vertical-align: middle;
-   border-radius: 2px;
font-family: inherit;
-webkit-transition: border 0.2s cubic-bezier( 0.39, 
0.575, 0.565, 1 ), box-shadow 0.2s cubic-bezier( 0.39, 0.575, 0.565, 1 );
-moz-transition: border 0.2s cubic-bezier( 0.39, 0.575, 
0.565, 1 ), box-shadow 0.2s cubic-bezier( 0.39, 0.575, 0.565, 1 );
@@ -50,4 +54,18 @@
}
}
}
+
+   &-editor {
+   .flow-editor,
+   .flow-ui-editorSwitcherWidget {
+   margin-top: -1px;
+   border-top-left-radius: 0;
+   border-top-right-radius: 0;
+   }
+   .flow-editor.flow-ui-focused,
+   .flow-ui-editorSwitcherWidget-focused {
+   /* Force above the title widget so border isn't cropped 
*/
+   position: relative;
+   }
+   }
 }

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

[MediaWiki-commits] [Gerrit] mediawiki...eventstreams[master]: Merge from upstream template/master at a354b0e8bbf88123a6c2f...

[Ottomata (Code Review)]

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

Change subject: Merge from upstream template/master at 
a354b0e8bbf88123a6c2fe17693435fb1107b794
..

Merge from upstream template/master at a354b0e8bbf88123a6c2fe17693435fb1107b794

Conflicts:
lib/api-util.js
package.json
routes/ex.js
routes/root.js
routes/v1.js

Change-Id: Ia0cc779e5292bde0ffe287b8bc9c901462c5852a
---
A lib/swagger-ui.js
M package.json
M routes/root.js
M spec.template.yaml
4 files changed, 101 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/eventstreams 
refs/changes/06/339706/1

diff --git a/lib/swagger-ui.js b/lib/swagger-ui.js
new file mode 100644
index 000..a4e41c2
--- /dev/null
+++ b/lib/swagger-ui.js
@@ -0,0 +1,79 @@
+'use strict';
+
+
+const BBPromise = require('bluebird');
+const fs = BBPromise.promisifyAll(require('fs'));
+const path = require('path');
+const HTTPError = require('../lib/util.js').HTTPError;
+
+
+// Swagger-ui helpfully exporting the absolute path of its dist directory
+const docRoot = `${require('swagger-ui').dist}/`;
+
+function processRequest(app, req, res) {
+
+const reqPath = req.query.path || '/index.html';
+const filePath = path.join(docRoot, reqPath);
+
+// Disallow relative paths.
+// Test relies on docRoot ending on a slash.
+if (filePath.substring(0, docRoot.length) !== docRoot) {
+throw new HTTPError({
+status: 404,
+type: 'not_found',
+title: 'File not found',
+detail: `${reqPath} could not be found.`
+});
+}
+
+return fs.readFileAsync(filePath)
+.then((body) => {
+if (reqPath === '/index.html') {
+body = body.toString()
+.replace(/((?:src|href)=['"])/g, '$1?doc=')
+// Some self-promotion
+.replace(//,
+`${app.info.name}`)
+.replace(/[^<]*<\/title>/, 
`${app.info.name}`)
+// Replace the default url with ours, switch off validation &
+// limit the size of documents to apply syntax highlighting to
+.replace(/Sorter: "alpha"/, 'Sorter: "alpha", validatorUrl: 
null, ' +
+'highlightSizeThreshold: 1')
+.replace(/docExpansion: "none"/, 'docExpansion: "list"')
+.replace(/ url: url,/, 'url: "/?spec",');
+}
+
+let contentType = 'text/html';
+if (/\.js$/.test(reqPath)) {
+contentType = 'text/javascript';
+body = body.toString()
+.replace(/underscore-min\.map/, 
'?doc=lib/underscore-min.map');
+} else if (/\.png$/.test(reqPath)) {
+contentType = 'image/png';
+} else if (/\.map$/.test(reqPath)) {
+contentType = 'application/json';
+} else if (/\.ttf$/.test(reqPath)) {
+contentType = 'application/x-font-ttf';
+} else if (/\.css$/.test(reqPath)) {
+contentType = 'text/css';
+body = body.toString().replace(/\.\.\/(images|fonts)\//g, 
'?doc=$1/');
+}
+
+res.setHeader('Content-Type', contentType);
+res.setHeader('content-security-policy', "default-src 'none'; " +
+"script-src 'self' 'unsafe-inline'; connect-src *; " +
+"style-src 'self' 'unsafe-inline'; img-src 'self'; 
font-src 'self';");
+res.send(body.toString());
+})
+.catch({ code: 'ENOENT' }, () => {
+res.status(404)
+.type('not_found')
+.send('not found');
+});
+
+}
+
+module.exports = {
+processRequest
+};
+
diff --git a/package.json b/package.json
index 4e1bd94..bf74eab 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,20 @@
 {
+<<< HEAD
   "name": "eventstreams",
   "version": "0.0.2",
   "description": "Streaming Wikimedia Events via HTTP SSE",
+===
+  "name": "service-template-node",
+  "version": "0.5.0",
+  "description": "A blueprint for MediaWiki REST API services",
+>>> tmpl/master
   "main": "./app.js",
   "scripts": {
 "start": "service-runner",
-"test": "mocha && nsp check",
+"test": "PREQ_CONNECT_TIMEOUT=15 mocha && nsp check",
 "docker-start": "service-runner docker-start",
 "docker-test": "service-runner docker-test",
+"test-build": "service-runner docker-test && service-runner build 
--deploy-repo --force",
 "coverage": "istanbul cover _mocha -- -R spec"
   },
   "repository": {
@@ -42,6 +49,7 @@
 "js-yaml": "^3.7.0",
 "service-runner": "^2.1.11",
 "swagger-router": "^0.5.5",
+"swagger-ui": "git+https://github.com/wikimedia/swagger-ui#master;,
 "node-rdkafka-statsd": "^0.1.0",
 "kafka-sse": 
"git+https://phabricator.wikimedia.org/diffusion/WKSE/kafkasse.git#v0.0.6;
   },
diff --git a/routes/root.js 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fixups to OOUI conversion of SpecialModifyEntity and subclasses

[jenkins-bot (Code Review)]

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

Change subject: Fixups to OOUI conversion of SpecialModifyEntity and subclasses
..


Fixups to OOUI conversion of SpecialModifyEntity and subclasses

Bug: T48248
Change-Id: Idb787f7bd24036eaabe48acccb6c84b1a81c58ad
---
M repo/includes/Specials/SpecialModifyTerm.php
M tests/browser/features/support/modules/special_modify_entity_module.rb
M tests/browser/features/support/modules/special_modify_term_module.rb
M tests/browser/features/support/pages/special_set_label_page.rb
4 files changed, 14 insertions(+), 8 deletions(-)

Approvals:
  Ricordisamoa: Looks good to me, but someone else must approve
  Ladsgroup: Looks good to me, approved
  WMDE-Fisch: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/repo/includes/Specials/SpecialModifyTerm.php 
b/repo/includes/Specials/SpecialModifyTerm.php
index 2f75cc3..860d006 100644
--- a/repo/includes/Specials/SpecialModifyTerm.php
+++ b/repo/includes/Specials/SpecialModifyTerm.php
@@ -186,14 +186,16 @@
'cssclass' => 'wb-input',
'id' => 'wb-modifyterm-value',
'type' => 'text',
-   'default' => $this->getRequest()->getVal( 'value' ) ? 
$this->getRequest()->getVal( 'value' ) : $this->value,
+   'default' => $this->getRequest()->getVal( 'value' ) ?: 
$this->value,
'nodata' => true
);
 
$languageName = Language::fetchLanguageName( 
$this->languageCode, $this->getLanguage()->getCode() );
 
if ( $entity !== null && $this->languageCode !== null && 
$languageName !== '' ) {
-   // Messages: wikibase-setlabel-introfull, 
wikibase-setdescription-introfull,
+   // Messages:
+   // wikibase-setlabel-introfull
+   // wikibase-setdescription-introfull
// wikibase-setaliases-introfull
$intro = $this->msg(
'wikibase-' . strtolower( $this->getName() ) . 
'-introfull',
@@ -219,7 +221,9 @@
'value' => $valueinput
);
} else {
-   // Messages: wikibase-setlabel-intro, 
wikibase-setdescription-intro,
+   // Messages:
+   // wikibase-setlabel-intro
+   // wikibase-setdescription-intro
// wikibase-setaliases-intro
$intro = $this->msg( 'wikibase-' . strtolower( 
$this->getName() ) . '-intro' )->parse();
$formDescriptor = $this->getFormElements( $entity );
@@ -231,7 +235,9 @@
'cssclass' => 'wb-input',
'id' => 'wb-modifyterm-language'
);
-   // Messages: wikibase-setlabel-label, 
wikibase-setdescription-label,
+   // Messages:
+   // wikibase-setlabel-label
+   // wikibase-setdescription-label
// wikibase-setaliases-label
$valueinput['label-message'] = 'wikibase-' . 
strtolower( $this->getName() ) . '-label';
$formDescriptor['value'] = $valueinput;
diff --git 
a/tests/browser/features/support/modules/special_modify_entity_module.rb 
b/tests/browser/features/support/modules/special_modify_entity_module.rb
index 9d6c024..8b21fd4 100644
--- a/tests/browser/features/support/modules/special_modify_entity_module.rb
+++ b/tests/browser/features/support/modules/special_modify_entity_module.rb
@@ -11,5 +11,5 @@
 
   p(:anonymous_edit_warning, class: 'warning')
   p(:error_message, class: 'error')
-  text_field(:id_input_field, css: 'div.wb-input#wb-modifyentity-id 
input.oo-ui-inputWidget-input')
+  text_field(:id_input_field, css: '#wb-modifyentity-id 
.oo-ui-inputWidget-input')
 end
diff --git 
a/tests/browser/features/support/modules/special_modify_term_module.rb 
b/tests/browser/features/support/modules/special_modify_term_module.rb
index 010be0c..a896aed 100644
--- a/tests/browser/features/support/modules/special_modify_term_module.rb
+++ b/tests/browser/features/support/modules/special_modify_term_module.rb
@@ -10,6 +10,6 @@
   include PageObject
   include SpecialModifyEntityModule
 
-  text_field(:language_input_field, css: 'div.wb-input#wb-modifyterm-language 
input.oo-ui-inputWidget-input')
-  text_field(:term_input_field, css: 'div.wb-input#wb-modifyterm-value 
input.oo-ui-inputWidget-input')
+  text_field(:language_input_field, css: '#wb-modifyterm-language 
.oo-ui-inputWidget-input')
+  text_field(:term_input_field, css: '#wb-modifyterm-value 
.oo-ui-inputWidget-input')
 end
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...eventstreams[master]: Merge from upstream template/master at a354b0e8bbf88123a6c2f...

[Ottomata (Code Review)]

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

Change subject: Merge from upstream template/master at 
a354b0e8bbf88123a6c2fe17693435fb1107b794
..


Merge from upstream template/master at a354b0e8bbf88123a6c2fe17693435fb1107b794

Conflicts:
lib/api-util.js
package.json
routes/ex.js
routes/root.js
routes/v1.js

Change-Id: Ia0cc779e5292bde0ffe287b8bc9c901462c5852a
---
A lib/swagger-ui.js
M package.json
M routes/root.js
M spec.template.yaml
4 files changed, 95 insertions(+), 5 deletions(-)

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



diff --git a/lib/swagger-ui.js b/lib/swagger-ui.js
new file mode 100644
index 000..a4e41c2
--- /dev/null
+++ b/lib/swagger-ui.js
@@ -0,0 +1,79 @@
+'use strict';
+
+
+const BBPromise = require('bluebird');
+const fs = BBPromise.promisifyAll(require('fs'));
+const path = require('path');
+const HTTPError = require('../lib/util.js').HTTPError;
+
+
+// Swagger-ui helpfully exporting the absolute path of its dist directory
+const docRoot = `${require('swagger-ui').dist}/`;
+
+function processRequest(app, req, res) {
+
+const reqPath = req.query.path || '/index.html';
+const filePath = path.join(docRoot, reqPath);
+
+// Disallow relative paths.
+// Test relies on docRoot ending on a slash.
+if (filePath.substring(0, docRoot.length) !== docRoot) {
+throw new HTTPError({
+status: 404,
+type: 'not_found',
+title: 'File not found',
+detail: `${reqPath} could not be found.`
+});
+}
+
+return fs.readFileAsync(filePath)
+.then((body) => {
+if (reqPath === '/index.html') {
+body = body.toString()
+.replace(/((?:src|href)=['"])/g, '$1?doc=')
+// Some self-promotion
+.replace(//,
+`${app.info.name}`)
+.replace(/[^<]*<\/title>/, 
`${app.info.name}`)
+// Replace the default url with ours, switch off validation &
+// limit the size of documents to apply syntax highlighting to
+.replace(/Sorter: "alpha"/, 'Sorter: "alpha", validatorUrl: 
null, ' +
+'highlightSizeThreshold: 1')
+.replace(/docExpansion: "none"/, 'docExpansion: "list"')
+.replace(/ url: url,/, 'url: "/?spec",');
+}
+
+let contentType = 'text/html';
+if (/\.js$/.test(reqPath)) {
+contentType = 'text/javascript';
+body = body.toString()
+.replace(/underscore-min\.map/, 
'?doc=lib/underscore-min.map');
+} else if (/\.png$/.test(reqPath)) {
+contentType = 'image/png';
+} else if (/\.map$/.test(reqPath)) {
+contentType = 'application/json';
+} else if (/\.ttf$/.test(reqPath)) {
+contentType = 'application/x-font-ttf';
+} else if (/\.css$/.test(reqPath)) {
+contentType = 'text/css';
+body = body.toString().replace(/\.\.\/(images|fonts)\//g, 
'?doc=$1/');
+}
+
+res.setHeader('Content-Type', contentType);
+res.setHeader('content-security-policy', "default-src 'none'; " +
+"script-src 'self' 'unsafe-inline'; connect-src *; " +
+"style-src 'self' 'unsafe-inline'; img-src 'self'; 
font-src 'self';");
+res.send(body.toString());
+})
+.catch({ code: 'ENOENT' }, () => {
+res.status(404)
+.type('not_found')
+.send('not found');
+});
+
+}
+
+module.exports = {
+processRequest
+};
+
diff --git a/package.json b/package.json
index 4e1bd94..ff9e48f 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,10 @@
   "main": "./app.js",
   "scripts": {
 "start": "service-runner",
-"test": "mocha && nsp check",
+"test": "PREQ_CONNECT_TIMEOUT=15 mocha && nsp check",
 "docker-start": "service-runner docker-start",
 "docker-test": "service-runner docker-test",
+"test-build": "service-runner docker-test && service-runner build 
--deploy-repo --force",
 "coverage": "istanbul cover _mocha -- -R spec"
   },
   "repository": {
@@ -42,6 +43,7 @@
 "js-yaml": "^3.7.0",
 "service-runner": "^2.1.11",
 "swagger-router": "^0.5.5",
+"swagger-ui": "git+https://github.com/wikimedia/swagger-ui#master;,
 "node-rdkafka-statsd": "^0.1.0",
 "kafka-sse": 
"git+https://phabricator.wikimedia.org/diffusion/WKSE/kafkasse.git#v0.0.6;
   },
diff --git a/routes/root.js b/routes/root.js
index 28930cb..42686eb 100644
--- a/routes/root.js
+++ b/routes/root.js
@@ -2,6 +2,7 @@
 
 
 const sUtil = require('../lib/util');
+const swaggerUi = require('../lib/swagger-ui');
 
 
 /**
@@ -31,15 +32,17 @@
 
 /**
  * GET /
- * Main entry point. Currently it only responds if the spec query
+ * 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: install: don't use http install method for bast3002

[Dzahn (Code Review)]

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

Change subject: install: don't use http install method for bast3002
..


install: don't use http install method for bast3002

Using http to get the installer did not work on this host,
there was an error about "file not found" but it scrolls
by really fast and i can't see it on logs so far.

Try using the traditional way.

Is it correct that bast4001 uses file name "lpxelinux.0" while
bast3001 uses file name "pxelinux.0" with both of them using
http and jessie? When do you use which file name?

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

Approvals:
  jenkins-bot: Verified
  Dzahn: 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 dcfd7b5..87c411b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -331,8 +331,6 @@
 fixed-address bast3002.wikimedia.org;
 
 next-server 208.80.154.86; # install1002 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "pxelinux.0";
 }
 
 host bast4001 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie695944f3d47dcb6c799f7b95c57e492daea96a9
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
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]: install: don't use http install method for bast3002

[Dzahn (Code Review)]

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

Change subject: install: don't use http install method for bast3002
..

install: don't use http install method for bast3002

Using http to get the installer did not work on this host,
there was an error about "file not found" but it scrolls
by really fast and i can't see it on logs so far.

Try using the traditional way.

Change-Id: Ie695944f3d47dcb6c799f7b95c57e492daea96a9
---
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/98/339698/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 06fca18..a6321c2 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -331,8 +331,6 @@
 fixed-address bast3002.wikimedia.org;
 
 next-server 208.80.154.86; # install1002 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "pxelinux.0";
 }
 
 host bast4001 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie695944f3d47dcb6c799f7b95c57e492daea96a9
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/core[master]: Use Database::addQuotes instead of hard coded apostrophs

[jenkins-bot (Code Review)]

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

Change subject: Use Database::addQuotes instead of hard coded apostrophs
..


Use Database::addQuotes instead of hard coded apostrophs

Change-Id: I1404d68d7e2b7fde8f9a76c747bc2be0936f7bef
---
M includes/EditPage.php
M includes/WatchedItemQueryService.php
M includes/actions/HistoryAction.php
M includes/logging/LogEventsList.php
M includes/page/Article.php
M includes/page/ImagePage.php
M includes/specials/SpecialUpload.php
7 files changed, 20 insertions(+), 7 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index 34062c0..da1dfbd 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2483,11 +2483,13 @@
}
# Give a notice if the user is editing a deleted/moved page...
if ( !$this->mTitle->exists() ) {
+   $dbr = wfGetDB( DB_REPLICA );
+
LogEventsList::showLogExtract( $wgOut, [ 'delete', 
'move' ], $this->mTitle,
'',
[
'lim' => 10,
-   'conds' => [ "log_action != 'revision'" 
],
+   'conds' => [ 'log_action != ' . 
$dbr->addQuotes( 'revision' ) ],
'showIfEmpty' => false,
'msgKey' => [ 
'recreate-moveddeleted-warn' ]
]
diff --git a/includes/WatchedItemQueryService.php 
b/includes/WatchedItemQueryService.php
index c80e4a5..4ff57c6 100644
--- a/includes/WatchedItemQueryService.php
+++ b/includes/WatchedItemQueryService.php
@@ -401,7 +401,7 @@
if ( !isset( $options['start'] ) && !isset( $options['end'] ) ) 
{
if ( $db->getType() === 'mysql' ) {
// This is an index optimization for mysql
-   $conds[] = "rc_timestamp > ''";
+   $conds[] = 'rc_timestamp > ' . $db->addQuotes( 
'' );
}
}
 
diff --git a/includes/actions/HistoryAction.php 
b/includes/actions/HistoryAction.php
index e8aec1c..b381edc 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -146,6 +146,9 @@
$out->setStatusCode( 404 );
}
$out->addWikiMsg( 'nohistory' );
+
+   $dbr = wfGetDB( DB_REPLICA );
+
# show deletion/move log if there is an entry
LogEventsList::showLogExtract(
$out,
@@ -153,7 +156,7 @@
$this->getTitle(),
'',
[ 'lim' => 10,
-   'conds' => [ "log_action != 'revision'" 
],
+   'conds' => [ 'log_action != ' . 
$dbr->addQuotes( 'revision' ) ],
'showIfEmpty' => false,
'msgKey' => [ 'moveddeleted-notice' ]
]
diff --git a/includes/logging/LogEventsList.php 
b/includes/logging/LogEventsList.php
index 6665336..4382910 100644
--- a/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@ -544,7 +544,8 @@
 * @param string $user The user who made the log entries
 * @param array $param Associative Array with the following additional 
options:
 * - lim Integer Limit of items to show, default is 50
-* - conds Array Extra conditions for the query (e.g. "log_action != 
'revision'")
+* - conds Array Extra conditions for the query
+*   (e.g. 'log_action != ' . $dbr->addQuotes( 'revision' ))
 * - showIfEmpty boolean Set to false if you don't want any output in 
case the loglist is empty
 *   if set to true (default), "No matching items in log" is displayed 
if loglist is empty
 * - msgKey Array If you want a nice box with a message, set this to 
the key of the message.
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 34ff63c..2787c1b 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1171,7 +1171,10 @@
$loggedIn = $this->getContext()->getUser()->isLoggedIn();
if ( $loggedIn || $cache->get( $key ) ) {
$logTypes = [ 'delete', 'move' ];
-   $conds = [ "log_action != 'revision'" ];
+
+   $dbr = wfGetDB( DB_REPLICA );
+
+   $conds = [ 'log_action != ' . $dbr->addQuotes( 
'revision' ) ];
 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T50900: Set mw:Error and provide error info in data-mw for e...

[Arlolra (Code Review)]

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

Change subject: T50900: Set mw:Error and provide error info in data-mw for 
ext/tpl
..

T50900: Set mw:Error and provide error info in data-mw for ext/tpl

Change-Id: I00131350acda113e90bdae7fddd0cd04802b343c
---
M lib/wt2html/tt/ExtensionHandler.js
M lib/wt2html/tt/TemplateHandler.js
M tests/citeParserTests-blacklist.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
5 files changed, 76 insertions(+), 50 deletions(-)


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

diff --git a/lib/wt2html/tt/ExtensionHandler.js 
b/lib/wt2html/tt/ExtensionHandler.js
index 8b70ac8..eb63e25 100644
--- a/lib/wt2html/tt/ExtensionHandler.js
+++ b/lib/wt2html/tt/ExtensionHandler.js
@@ -136,13 +136,27 @@
this.parseExtensionHTML.bind(this, token, cb)
);
} else {
-   /* Convert this into a span with extension content as plain 
text */
+   // Convert this into a span with extension content as plain text
+   var argInfo = Util.getArgInfo(token);
+   var dataMw = argInfo.dict;
+   dataMw.errors = [
+   {
+   key: 'mw-api-extexpand-error',
+   message: 'Could not expand extension source.',
+   },
+   ];
+   if (!token.dataAttribs.tagWidths[1]) {
+   dataMw.body = null;  // Serialize to self-closing.
+   }
var span = new TagTk('span', [
-   new KV('typeof', 'mw:Extension/' + extensionName),
+   new KV('typeof', 'mw:Error mw:Extension/' + 
extensionName),
new KV('about', token.getAttribute('about')),
-   ], token.dataAttribs);
-
-   cb({ tokens: [span, token.getAttribute('source'), new 
EndTagTk('span')] });
+   new KV('data-mw', JSON.stringify(dataMw)),
+   ], {
+   tsr: Util.clone(token.dataAttribs.tsr),
+   tmp: { nativeExt: true },  // Suppress dsr warnings
+   });
+   cb({ tokens: [ span, token.getAttribute('source'), new 
EndTagTk('span') ] });
}
 };
 
diff --git a/lib/wt2html/tt/TemplateHandler.js 
b/lib/wt2html/tt/TemplateHandler.js
index ccb832d..d7026ae 100644
--- a/lib/wt2html/tt/TemplateHandler.js
+++ b/lib/wt2html/tt/TemplateHandler.js
@@ -1082,13 +1082,27 @@
// XXX: store type too (and cache tokens/x-mediawiki)
cb(null, env.pageCache[title] /* , type */);
} else if (!env.conf.parsoid.fetchTemplates) {
-   // TODO: Set mw:Error and provide error info in data-mw
-   // see https://phabricator.wikimedia.org/T50900
-   var tokens = Util.placeholder('Warning: ' +
-   'Page/template fetching disabled, and no cache 
for ' + title);
-   tokens[0].addAttribute('about', '#' + state.wrappedObjectId);
-   tokens.push(this.getEncapsulationInfoEndTag(state));
-   tokens.rank = this.rank;
+   var tokens = [state.token.dataAttribs.src];
+   if (this.options.wrapTemplates) {
+   // FIXME: We've already emitted a start meta to the 
accumulator in
+   // `_encapsulateTemplate`.  We could reach for that and 
modify it,
+   // or refactor to emit it later for all paths, but the 
pragmatic
+   // thing to do is just ignore it and wrap this anew.
+   state.wrappedObjectId = env.newObjectId();
+   tokens = this.getEncapsulationInfo(state, tokens);
+   var argInfo = this.getArgInfo(state);
+   argInfo.dict.errors = [
+   {
+   key: 'mw-api-tplfetch-error',
+   message: 'Page / template fetching 
disabled, and no cache for ' + title,
+   },
+   ];
+   var start = tokens[0];
+   start.dataAttribs.tmp.tplarginfo = 
JSON.stringify(argInfo);
+   var typeOf = start.getAttribute('typeof');
+   start.setAttribute('typeof', 'mw:Error ' + typeOf);
+   tokens.push(this.getEncapsulationInfoEndTag(state));
+   }
parentCB({ tokens: tokens });
} else {
// We are about to start an async request for a template
diff --git a/tests/citeParserTests-blacklist.js 
b/tests/citeParserTests-blacklist.js
index d783f95..b3f1cbd 100644
--- a/tests/citeParserTests-blacklist.js
+++ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dhcp/site: add bast3002

[Dzahn (Code Review)]

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

Change subject: dhcp/site: add bast3002
..


dhcp/site: add bast3002

(re-) add the server formerly known as hooft
as bast3002 in DHCP config.

add to puppet site.pp with the general bastion server
roles but not yet ganglia and prometheus.

Bug: T156506
Change-Id: I75c69da2731548b8f65c7686827e087b6e4da866
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 9907a41..acb67e7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -175,6 +175,12 @@
 }
 }
 
+node 'bast3002.wikimedia.org' {
+role(bastionhost::general)
+
+interface::add_ip6_mapped { 'main': interface => 'eth0', }
+}
+
 # Bastion in California
 node 'bast4001.wikimedia.org' {
 role(bastionhost::general,
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 b48d154..dcfd7b5 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -326,6 +326,15 @@
 filename "pxelinux.0";
 }
 
+host bast3002 {
+hardware ethernet a4:ba:db:30:d7:70;
+fixed-address bast3002.wikimedia.org;
+
+next-server 208.80.154.86; # install1002 (tftp server)
+option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
+filename "pxelinux.0";
+}
+
 host bast4001 {
 hardware ethernet 90:b1:1c:4d:42:49;
 fixed-address bast4001.wikimedia.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75c69da2731548b8f65c7686827e087b6e4da866
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
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]: Update Fresco to 1.1.0

[Dbrant (Code Review)]

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

Change subject: Update Fresco to 1.1.0
..

Update Fresco to 1.1.0

Release notes:
https://github.com/facebook/fresco/releases/tag/v1.1.0
https://github.com/facebook/fresco/releases/tag/v1.0.0
https://github.com/facebook/fresco/releases/tag/v0.14.0

No breaking changes for us.
Note the shoutout to Wikipedia in the 1.0.0 notes :)

Change-Id: I9f2507832c0d3ef18f473f234beae2d65c5b2a52
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index a4e0ce9..c0e83d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -162,7 +162,7 @@
 String supportVersion = '25.1.1'
 String espressoVersion = '2.2.2'
 String butterKnifeVersion = '8.4.0'
-String frescoVersion = '0.13.0'
+String frescoVersion = '1.1.0'
 String testingSupportVersion = '0.5'
 String mockitoCore = 'org.mockito:mockito-core:1.9.5'
 String leakCanaryVersion = '1.5'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f2507832c0d3ef18f473f234beae2d65c5b2a52
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] operations/puppet[production]: dhcp/site: add bast3002

[Dzahn (Code Review)]

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

Change subject: dhcp/site: add bast3002
..

dhcp/site: add bast3002

(re-) add the server formerly known as hooft
as bast3002 in DHCP config.

add to puppet site.pp with the general bastion server
roles but not yet ganglia and prometheus.

Bug: T156506
Change-Id: I75c69da2731548b8f65c7686827e087b6e4da866
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 61ea65d..21c9b2d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -175,6 +175,12 @@
 }
 }
 
+node 'bast3002.wikimedia.org' {
+role(bastionhost::general)
+
+interface::add_ip6_mapped { 'main': interface => 'eth0', }
+}
+
 # Bastion in California
 node 'bast4001.wikimedia.org' {
 role(bastionhost::general,
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 84faaee..7853603 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -326,6 +326,15 @@
 filename "pxelinux.0";
 }
 
+host bast3001 {
+hardware ethernet a4:ba:db:30:d7:70;
+fixed-address bast3002.wikimedia.org;
+
+next-server 208.80.154.86; # install1002 (tftp server)
+option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
+filename "pxelinux.0";
+}
+
 host bast4001 {
 hardware ethernet 90:b1:1c:4d:42:49;
 fixed-address bast4001.wikimedia.org;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75c69da2731548b8f65c7686827e087b6e4da866
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]: shell access for Shreyas Lakhtakia

[RobH (Code Review)]

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

Change subject: shell access for Shreyas Lakhtakia
..

shell access for Shreyas Lakhtakia

This patchset includes creation of a new shell user for Shreyas
Lakhtakia, and also includes access to 'analytics-privatedata-users' and
'researchers'.

Please do NOT merge this patchset unless you have reviewed all the
criteria on the phabricator task T158978.  This includes a required 3
business day wait (no merge sooner than 2017-03-01) as well as other
requirements that must be met before this can go live.

Bug:T158978
Change-Id: I042e1e562b0f52ac70c556a2c82b5e7b39843f63
---
M modules/admin/data/data.yaml
1 file changed, 13 insertions(+), 2 deletions(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index ac87592..1620da3 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -114,7 +114,7 @@
   jminor, etonkovidova, sbisson, addshore, matmarex, elukey,
   nikerabbit, nschaaf, dstrine, joewalsh, mpany, hjiang, jsamra,
   jdittrich, chelsyx, ovasileva, mtizzoni, panisson, paolotti, 
ciro, debt,
-  samwalton9, zareen, fdans, samtar, mlitn]
+  samwalton9, zareen, fdans, samtar, mlitn, shrlak]
   ldap-admins:
 gid: 715
 description: ldap admins
@@ -223,7 +223,7 @@
  This will grant shell access on Hadoop client nodes 
(stat1002) and on
  Hadoop NameNodes.  Some files in HDFS have sensitive data in 
them.
  Those files are group readable by the 
analytics-privatedata-users group.
-members: [dartar, milimetric, dfoy, aude, jforrester, nithum,
+members: [dartar, milimetric, dfoy, aude, jforrester, nithum, shrlak,
   halfak, dr0ptp4kt, bearloga, cwdent, elukey,
   nuria, otto, deskana, zhousquared, arnad, jgonsior,
   bsitzmann, dbrant, ellery, nettrom, leila,
@@ -2461,6 +2461,17 @@
 email: nit...@gmail.com
 expiry_date: 2017-06-15
 expiry_contact: da...@wikimedia.org
+  shrlak:
+ensure: present
+gid: 500
+name: shrlak
+realname: Shreyas Lakhtakia
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQD2rhvzjTJt5Ac349bzg1JI3QIKsulc3Fl9PqeuIsLeudgNOY9yUa4aByj03ajLdF25ctlxQQRQaqHSCcMOD02gNls4NNjnzC8DVVu8Cu9NqoD6mAPTQ2BHWqCZV5sAKyctrJbYvb7X1aRPvc5/VgQl/Y9gdYpoX7tX+N0L9NMN42PUnICmSejvNkFA6U9VOQcahEbXAvwiDShgu50nUn5uG8xpXkDBoltUPSi+MQlKiZn5lpuY0gswh9U8JVmC+QRqwbXqCB20hpF25PZXrYB31aHYmjCZogM/8k3eAi83/Uytah7n/QcWLne2sWkrlLCAWrtopfY3p2uZm330Xz1D
 shreyas@Shreyas-MacBook-Pro.local
+uid: 16523
+email: shreyaslakhta...@gmail.com
+expiry_date: 2017-06-30
+expiry_contact: rstall...@wikimedia.org
 ldap_only_users:
   abartov:
 ensure: present

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I042e1e562b0f52ac70c556a2c82b5e7b39843f63
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]: wikitech: Add a use statement for LoggerFactory

[jenkins-bot (Code Review)]

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

Change subject: wikitech: Add a use statement for LoggerFactory
..


wikitech: Add a use statement for LoggerFactory

Change-Id: I3a951177bbbc43a37e3c290e19772a7a140cd9a2
---
M wmf-config/wikitech.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, but someone else must approve
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index d86b53f..d4e74d6 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -1,6 +1,8 @@
 mergeConfig( [
'loggers' => [
'ldap' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a951177bbbc43a37e3c290e19772a7a140cd9a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
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/mediawiki-config[master]: wikitech: Add a use statement for LoggerFactory

[BryanDavis (Code Review)]

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

Change subject: wikitech: Add a use statement for LoggerFactory
..

wikitech: Add a use statement for LoggerFactory

Change-Id: I3a951177bbbc43a37e3c290e19772a7a140cd9a2
---
M wmf-config/wikitech.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index d86b53f..d4e74d6 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -1,6 +1,8 @@
 mergeConfig( [
'loggers' => [
'ldap' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: (re-)add hooft as bast3002

[Dzahn (Code Review)]

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

Change subject: (re-)add hooft as bast3002
..


(re-)add hooft as bast3002

(re-)add the server formerly known as hooft,
which had this IP and was removed in Ibef2296b6338c9b58,
as bast3002 to replace bast3001 which has disk issues.

After we get 3002 up and running we can shutdown current 3001
and consider adding a CNAME for convenience.

Rename the remaining "hooft" mgmt interface.

Bug: T131560
Change-Id: I0c5999cc179a81d5a8b3e38844ad092af1da74b0
---
M templates/10.in-addr.arpa
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0094102..f53a63b 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -162,7 +162,7 @@
 107 1H  IN PTR  amslvs2.mgmt.esams.wmnet.
 108 1H  IN PTR  amslvs3.mgmt.esams.wmnet.
 109 1H  IN PTR  amslvs4.mgmt.esams.wmnet.
-110 1H  IN PTR  hooft.mgmt.esams.wmnet.
+110 1H  IN PTR  bast3002.mgmt.esams.wmnet.
 111 1H  IN PTR  nescio.mgmt.esams.wmnet.
 112 1H  IN PTR  eeden.mgmt.esams.wmnet.
 113 1H  IN PTR  multatuli.mgmt.esams.wmnet.
diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index cecabe3..14a433c 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -28,7 +28,7 @@
 106 1H IN PTR   nescio.wikimedia.org.
 
 112 1H IN PTR   bast3001.wikimedia.org.
-
+113 1H IN PTR   bast3002.wikimedia.org.
 114 1H IN PTR   multatuli.wikimedia.org.
 
 121 1H IN PTR   eeden.wikimedia.org.
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 6c97193..14ebef1 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -27,6 +27,7 @@
 1.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   eeden.wikimedia.org.
 6.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   nescio.wikimedia.org.
 2.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3001.wikimedia.org.
+3.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3002.wikimedia.org.
 4.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   multatuli.wikimedia.org.
 2.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   maerlant.wikimedia.org.
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index ad1f243..8008f82 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -103,6 +103,8 @@
 bast20011H  IN  2620:0:860:1:208:80:153:5
 bast30011H  IN A91.198.174.112
 bast30011H  IN  2620:0:862:1:91:198:174:112
+bast30021H  IN A91.198.174.113
+bast30021H  IN  2620:0:862:1:91:198:174:113
 bast40011H  IN A198.35.26.5
 bast40011H  IN  2620:0:863:1:198:35:26:5
 californium 1H  IN A208.80.154.147
diff --git a/templates/wmnet b/templates/wmnet
index 49a3016..2761e49 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4111,7 +4111,7 @@
 amslvs3   1H  IN A10.21.0.108
 amslvs4   1H  IN A10.21.0.109
 bast3001  1H  IN A10.21.0.115
-hooft 1H  IN A10.21.0.110
+bast3002  1H  IN A10.21.0.110
 nescio1H  IN A10.21.0.111
 eeden 1H  IN A10.21.0.112
 multatuli 1H  IN A10.21.0.113

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c5999cc179a81d5a8b3e38844ad092af1da74b0
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add bast3002 to network constants

[Dzahn (Code Review)]

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

Change subject: add bast3002 to network constants
..

add bast3002 to network constants

bast3002 is replacing broken bast3001, add it to network
constants for firewall rules and access to bastion hosts.

It might be renamed or CNAMed to 3001 once the current 3001
is down, but first it needs to added next to it.

Bug: T131560
Change-Id: I41697049fe6e25eb322e966ee37ada8c94417c6c
---
M modules/network/manifests/constants.pp
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index a55464c..5a03b4e 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -33,6 +33,8 @@
 '2620:0:860:1:208:80:153:5',# 
bast2001.wikimedia.org
 '91.198.174.112',   # 
bast3001.wikimedia.org
 '2620:0:862:1:91:198:174:112',  # 
bast3001.wikimedia.org
+'91.198.174.113',   # 
bast3002.wikimedia.org
+'2620:0:862:1:91:198:174:113',  # 
bast3002.wikimedia.org
 '198.35.26.5',  # 
bast4001.wikimedia.org
 '2620:0:863:1:198:35:26:5', # 
bast4001.wikimedia.org
 '208.80.154.151',   # iron.wikimedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41697049fe6e25eb322e966ee37ada8c94417c6c
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...MobileFrontend[master]: Hygiene: Remove unused header > .main declaration

[Pmiazga (Code Review)]

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

Change subject: Hygiene: Remove unused header > .main declaration
..

Hygiene: Remove unused header > .main declaration

Changes:
 - removed header.main styles as there is no ".main" element in header

Bug: T158144
Change-Id: I12e80dc10304f5a12c3c23cad7ce1647fb1dc13b
---
M resources/skins.minerva.base.styles/ui.less
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 5f00b36..8c0ac88 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -112,14 +112,9 @@
border-top: 1px solid @colorGray12;
margin-top: @headerMarginTop;
 
-   // button
> div {
width: @headerHeight;
position: relative;
-   }
-
-   // Spinner
-   > div {
vertical-align: middle;
display: table-cell;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Remove unused main class declaration

[Pmiazga (Code Review)]

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

Change subject: Hygiene: Remove unused main class declaration
..

Hygiene: Remove unused main class declaration

Changes:
 - removed .main styles as there is no "main" class element inside header

Bug: T158144
Change-Id: I326c4ec41446daee3604c051d010e1ddbfbe6a9f
---
M resources/skins.minerva.base.styles/ui.less
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index d3bdf61..5f00b36 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -118,8 +118,6 @@
position: relative;
}
 
-   // Search field
-   .main,
// Spinner
> div {
vertical-align: middle;

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: (re-)add hooft as bast3002

[Dzahn (Code Review)]

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

Change subject: (re-)add hooft as bast3002
..

(re-)add hooft as bast3002

(re-)add the server formerly known as hooft,
which had this IP and was removed in Ibef2296b6338c9b58,
as bast3002 to replace bast3001 which has disk issues.

Bug: T131560
Change-Id: I0c5999cc179a81d5a8b3e38844ad092af1da74b0
---
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
3 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/81/339681/1

diff --git a/templates/174.198.91.in-addr.arpa 
b/templates/174.198.91.in-addr.arpa
index cecabe3..61f39c8 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -28,7 +28,7 @@
 106 1H IN PTR   nescio.wikimedia.org.
 
 112 1H IN PTR   bast3001.wikimedia.org.
-
+113 1H IN PTT   bast3002.wikimedia.org.
 114 1H IN PTR   multatuli.wikimedia.org.
 
 121 1H IN PTR   eeden.wikimedia.org.
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 6c97193..14ebef1 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -27,6 +27,7 @@
 1.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   eeden.wikimedia.org.
 6.0.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   nescio.wikimedia.org.
 2.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3001.wikimedia.org.
+3.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   bast3002.wikimedia.org.
 4.1.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   multatuli.wikimedia.org.
 2.2.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR   maerlant.wikimedia.org.
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index ad1f243..8008f82 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -103,6 +103,8 @@
 bast20011H  IN  2620:0:860:1:208:80:153:5
 bast30011H  IN A91.198.174.112
 bast30011H  IN  2620:0:862:1:91:198:174:112
+bast30021H  IN A91.198.174.113
+bast30021H  IN  2620:0:862:1:91:198:174:113
 bast40011H  IN A198.35.26.5
 bast40011H  IN  2620:0:863:1:198:35:26:5
 californium 1H  IN A208.80.154.147

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c5999cc179a81d5a8b3e38844ad092af1da74b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: upgrade to eslint-config-node-services v2.0.1

[Niedzielski (Code Review)]

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

Change subject: Hygiene: upgrade to eslint-config-node-services v2.0.1
..

Hygiene: upgrade to eslint-config-node-services v2.0.1

Upgrade eslint-config-node-services v2.0.1 and eslint v3.11.1 (a
required dependency) and fix offenders.

Change-Id: I9d6466e7869620c98ef5bd7ef26533e77e56a4ee
---
M .eslintrc.yml
M lib/dateUtil.js
M lib/parseSection.js
M lib/parsoid-access.js
M lib/util.js
M package.json
M routes/on-this-day.js
7 files changed, 18 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/80/339680/1

diff --git a/.eslintrc.yml b/.eslintrc.yml
index a372143..bf9f475 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,2 +1 @@
-extends: 'eslint-config-node-services'
-plugins: ['json']
\ No newline at end of file
+extends: node-services
\ No newline at end of file
diff --git a/lib/dateUtil.js b/lib/dateUtil.js
index 3d0c49b..0cf90b4 100644
--- a/lib/dateUtil.js
+++ b/lib/dateUtil.js
@@ -125,9 +125,9 @@
 dateUtil.validate = function(dateString) {
 try {
 const parts = dateString.split("-");
-const year = parseInt(parts[0]);
-const month = parseInt(parts[1]);
-const day = parseInt(parts[2]);
+const year = parseInt(parts[0], 10);
+const month = parseInt(parts[1], 10);
+const day = parseInt(parts[2], 10);
 return dateUtil.isValidDate(dateString, year, month, day)
 && dateUtil.isWithinBounds(year);
 } catch (error) {
diff --git a/lib/parseSection.js b/lib/parseSection.js
index 687833b..c064fbe 100644
--- a/lib/parseSection.js
+++ b/lib/parseSection.js
@@ -14,7 +14,7 @@
 node = nextNode;
 continue;
 } else {
-nextSection.toclevel = parseInt(node.tagName.charAt(1)) - 1;
+nextSection.toclevel = parseInt(node.tagName.charAt(1), 10) - 1;
 nextSection.line = node.innerHTML.trim();
 nextSection.anchor = a.anchorencode(nextSection.line);
 node = node.nextSibling;
diff --git a/lib/parsoid-access.js b/lib/parsoid-access.js
index 28b8cdb..8aaaf04 100644
--- a/lib/parsoid-access.js
+++ b/lib/parsoid-access.js
@@ -96,7 +96,7 @@
 
 if (i !== 0) {
 const className = currentSectionDiv.className;
-currentSection.toclevel = 
parseInt(className.substring('toclevel_'.length));
+currentSection.toclevel = 
parseInt(className.substring('toclevel_'.length), 10);
 currentSection.line = currentSectionDiv.title;
 currentSection.anchor = a.anchorencode(currentSection.line);
 }
diff --git a/lib/util.js b/lib/util.js
index 0fdceeb..dcd1f66 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -83,7 +83,7 @@
 ret.detail = err.detail;
 
 // log the stack trace only for 500 errors
-if (Number.parseInt(ret.status) !== 500) {
+if (Number.parseInt(ret.status, 10) !== 500) {
 ret.stack = undefined;
 }
 
@@ -127,7 +127,7 @@
 BBPromise.try(() => origHandler(req, res, next))
 .catch(next)
 .finally(() => {
-let statusCode = parseInt(res.statusCode) || 500;
+let statusCode = parseInt(res.statusCode, 10) || 500;
 if (statusCode < 100 || statusCode > 599) {
 statusCode = 500;
 }
@@ -204,9 +204,9 @@
 errObj.detail = errObj.detail || errObj.message || errObj.description 
|| '';
 // adjust the log level based on the status code
 let level = 'error';
-if (Number.parseInt(errObj.status) < 400) {
+if (Number.parseInt(errObj.status, 10) < 400) {
 level = 'trace';
-} else if (Number.parseInt(errObj.status) < 500) {
+} else if (Number.parseInt(errObj.status, 10) < 500) {
 level = 'info';
 }
 // log the error
diff --git a/package.json b/package.json
index ffcfcfe..4235e30 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,8 @@
   "devDependencies": {
 "ajv": "^4.7.7",
 "csv-parse": "^1.1.7",
-"eslint": "^3.11.0",
-"eslint-config-node-services": "^1.0.6",
+"eslint": "^3.11.1",
+"eslint-config-node-services": "^2.0.1",
 "eslint-plugin-json": "^1.2.0",
 "extend": "^3.0.0",
 "istanbul": "^0.4.5",
diff --git a/routes/on-this-day.js b/routes/on-this-day.js
index 691bf03..a9d5fe8 100644
--- a/routes/on-this-day.js
+++ b/routes/on-this-day.js
@@ -20,8 +20,8 @@
  * @return {!String}   Day page title. Example, inputs ('5', 
'20') returns 'May_20'
  */
 function titleForDayPageFromMonthDayNumberStrings(monthNumberString, 
dayNumberString, lang) {
-const monthName = languages[lang].monthNames[parseInt(monthNumberString) - 
1];
-const dayNumber = 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: For the mode switch tool, show a different tooltip when disa...

[jenkins-bot (Code Review)]

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

Change subject: For the mode switch tool, show a different tooltip when disabled
..


For the mode switch tool, show a different tooltip when disabled

Bug: T158723
Change-Id: I8c397e9b10c51d78c0b0f18c494ca9f36400d23e
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
4 files changed, 18 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index a5132f7..5a4a5ea 100644
--- a/extension.json
+++ b/extension.json
@@ -319,7 +319,8 @@
"tooltip-ca-editsource",
"tooltip-ca-ve-edit",
"visualeditor-ca-editsource-section",
-   "visualeditor-mweditmodeve-tool"
+   "visualeditor-mweditmodeve-tool",
+   "visualeditor-mweditmodeve-tool-unavailable"
],
"position": "top"
},
@@ -1144,6 +1145,7 @@
"visualeditor-mweditmodeve-showagain",
"visualeditor-mweditmodeve-title",
"visualeditor-mweditmodeve-tool",
+   "visualeditor-mweditmodeve-tool-unavailable",
"visualeditor-mweditmodeve-warning",
"visualeditor-mweditmodewt-popup-body",
"visualeditor-mweditmodewt-popup-title",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 5dfe4c6..9814f50 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -285,6 +285,7 @@
"visualeditor-mweditmodeve-showagain": "Don't show this message again",
"visualeditor-mweditmodeve-title": "Switch to visual editing?",
"visualeditor-mweditmodeve-tool": "Switch to visual editing",
+   "visualeditor-mweditmodeve-tool-unavailable": "Visual editing is not 
available here",
"visualeditor-mweditmodeve-warning": "You are switching to visual 
editing.\nDo you want to continue?",
"visualeditor-mweditmodewt-popup-body": "You can switch back to source 
editing at any time by clicking on this icon.",
"visualeditor-mweditmodewt-popup-title": "You have switched to visual 
editing",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 6a138e3..8cb78fb 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -298,6 +298,7 @@
"visualeditor-mweditmodeve-showagain": "Label for the checkboxes to not 
show one of the 'switched to visual mode' or 'switched to source mode' popups 
again",
"visualeditor-mweditmodeve-title": "Title of dialog to confirm 
switching to visual mode.",
"visualeditor-mweditmodeve-tool": "Label for tool that changes edit 
mode to visual editing.",
+   "visualeditor-mweditmodeve-tool-unavailable": "Label for tool that 
changes edit mode to visual editing when it is not available.",
"visualeditor-mweditmodeve-warning": "Warning message show before 
changing edit mode to visual editing. It may allow the user to keep the changes 
using the message {{msg-mw|Visualeditor-mweditmodesource-warning-switch}}, or 
instaed that they'd need to start source editing from scratch using 
{{msg-mw|Visualeditor-mweditmodesource-warning-switch-discard}}.",
"visualeditor-mweditmodewt-popup-body": "Body text of popup shown after 
switching to visual mode from source mode",
"visualeditor-mweditmodewt-popup-title": "Title of popup shown after 
switching to visual mode from source mode",
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
index 375c7ac..3315472 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
@@ -131,9 +131,21 @@
  * @inheritdoc
  */
 ve.ui.MWEditModeVisualTool.prototype.onUpdateState = function () {
+   var isVisualModeNowAvailable = ve.init.target.isModeAvailable( 'visual' 
);
+
// Parent method
ve.ui.MWEditModeVisualTool.super.prototype.onUpdateState.apply( this, 
arguments );
 
-   this.setDisabled( !ve.init.target.isModeAvailable( 'visual' ) );
+   // Cached for performance
+   if ( this.isVisualModeAvailable !== isVisualModeNowAvailable ) {
+   this.isVisualModeAvailable = isVisualModeNowAvailable;
+
+   this.setDisabled( !isVisualModeNowAvailable );
+   this.setTitle( OO.ui.msg(
+   isVisualModeNowAvailable ?
+   'visualeditor-mweditmodeve-tool' :
+   

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

[jenkins-bot (Code Review)]

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

Change subject: Bump versionCode
..


Bump versionCode

Change-Id: I91dd6ea25d2c136f222462e522ff3a8ff7810e7e
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index 2fae41a..a4e0ce9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 16
 targetSdkVersion 25
-versionCode 189
+versionCode 190
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...wonderbolt[master]: Note about internally referred traffic being miscategorized

[Bearloga (Code Review)]

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

Change subject: Note about internally referred traffic being miscategorized
..


Note about internally referred traffic being miscategorized

Bug: T154722
Change-Id: I57c8878519efd943b476c28de3a50e2989c99307
---
M tab_documentation/traffic_summary.md
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/tab_documentation/traffic_summary.md 
b/tab_documentation/traffic_summary.md
index 5cf797d..b1b7cf6 100644
--- a/tab_documentation/traffic_summary.md
+++ b/tab_documentation/traffic_summary.md
@@ -12,6 +12,7 @@
 --
 - **A**: We switched to a finalized version of the UDF that extracts internal 
traffic (see [T130083](https://phabricator.wikimedia.org/T130083))
 - **B**: On 25 August 2016 we patched the UDF to also look for [Duck Duck 
Go](https://duckduckgo.com) when it processes referer data. That referreral 
data was deleted and backfilled from 26 June 2016. See 
[T143287](https://phabricator.wikimedia.org/T143287) for more details.
+- On 22 February 2016, a bug was introduced and some of the internally 
referred traffic are miscategorized as none. See 
[T148780](https://phabricator.wikimedia.org/T148780) and 
[T154722](https://phabricator.wikimedia.org/T154722) for more details.
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57c8878519efd943b476c28de3a50e2989c99307
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wonderbolt
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 
Gerrit-Reviewer: Bearloga 
Gerrit-Reviewer: Chelsyx 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

[Dbrant (Code Review)]

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

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: I91dd6ea25d2c136f222462e522ff3a8ff7810e7e
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 2fae41a..a4e0ce9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 16
 targetSdkVersion 25
-versionCode 189
+versionCode 190
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91dd6ea25d2c136f222462e522ff3a8ff7810e7e
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] mediawiki...CheckUser[master]: Fix Special:MultiLock link for non-English wikis

[Legoktm (Code Review)]

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

Change subject: Fix Special:MultiLock link for non-English wikis
..

Fix Special:MultiLock link for non-English wikis

In addition to the special page name, we need to make sure the canonical
name is used for the "Special" namespace, so explicitly specify that
instead of using Title at all.

Bug: T158147
Change-Id: If794a76210f96c4628dfbe82f1dab37bc4915714
---
M specials/SpecialCheckUser.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser 
refs/changes/78/339678/1

diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php
index a1d5c0a..268c161 100644
--- a/specials/SpecialCheckUser.php
+++ b/specials/SpecialCheckUser.php
@@ -1160,7 +1160,7 @@
$wgCheckUserCAMultiLock['centralDB'],
// Use canonical name instead of local 
name so that it works
// even if the local language is 
different from central wiki
-   Title::makeTitle( NS_SPECIAL, 
'MultiLock' )->getPrefixedText()
+   'Special:MultiLock'
);
if ( $centralMLUrl === false ) {
throw new Exception( "Could not 
retrieve URL for {$wgCheckUserCAMultiLock['centralDB']}" );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If794a76210f96c4628dfbe82f1dab37bc4915714
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
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...MobileFrontend[master]: Cleanup header cache artifacts

[jenkins-bot (Code Review)]

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

Change subject: Cleanup header cache artifacts
..


Cleanup header cache artifacts

Changes:
 - removed unused styles

Bug: T158144
Change-Id: I6cd012910fb0b5497c3bd09c69a5c5064c9d1ded
---
M resources/mobile.search/SearchOverlay.less
M resources/skins.minerva.base.styles/ui.less
2 files changed, 0 insertions(+), 37 deletions(-)

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



diff --git a/resources/mobile.search/SearchOverlay.less 
b/resources/mobile.search/SearchOverlay.less
index e430038..d92cbc1 100644
--- a/resources/mobile.search/SearchOverlay.less
+++ b/resources/mobile.search/SearchOverlay.less
@@ -125,15 +125,6 @@
&.no-results .search-feedback {
border-top: 0;
}
-
-}
-
-// FIXME: This block is used to support cached HTML for the input margin-top 
rule.
-// Please remove entire block when the cache has cleared for T157987.
-.search-overlay .header .search-box {
-   input.search {
-   margin-top: 0;
-   }
 }
 
 @-webkit-keyframes fadeIn {
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index e8d05a5..d3bdf61 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -120,8 +120,6 @@
 
// Search field
.main,
-   // FIXME: form selector is only necessary until cache has cleared. 
Please remove promptly (T157987)
-   > form,
// Spinner
> div {
vertical-align: middle;
@@ -321,32 +319,6 @@
 .client-nojs {
.section-heading .indicator {
display: none;
-   }
-
-   // FIXME: Remove when cache has cleared (T157987)
-   .header > form {
-   width: auto;
-   vertical-align: middle;
-
-   .button-wrapper,
-   .fulltext-search {
-   background-color: #36c;
-   border-radius: 2px;
-   cursor: pointer;
-   float: right;
-   margin-left: 0.5em;
-   padding: 0.375em 0;
-   }
-
-   > .input-wrapper {
-   overflow: hidden;
-   }
-
-   input.search {
-   margin-right: 0;
-   padding-right: 0.1em;
-   width: 100%;
-   }
}
 
// FIXME: Remove when feature-header-v1 no longer supported

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cd012910fb0b5497c3bd09c69a5c5064c9d1ded
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Pmiazga 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Pmiazga 
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...linux44[master]: Add two subsequently assigned CVE IDs

[Muehlenhoff (Code Review)]

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

Change subject: Add two subsequently assigned CVE IDs
..


Add two subsequently assigned CVE IDs

Change-Id: I1f69ccdd36587e51dac256f2e313c15d6b25d3e8
---
M debian/changelog
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 868f2a2..3474cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.47
   * Update to 4.4.48:
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.48
+- CVE-2016-10208 [3a4b77cd47bb837b8557595ec7425f281f2ca1fe]
   * Update to 4.4.49:
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.49
 - CVE-2017-2618 [0c461cb727d146c9ef2d3e86214f498b78b7d125]
@@ -34,6 +35,7 @@
 - CVE-2017-5970 [34b2cef20f19c87999fff3da4071e66937db9644]
 - CVE-2017-5986 [2dcab598484185dea7ec22219c76dcdd59e3cb90]
 - CVE-2017-5897 [7892032cfe67f4bde6fc2ee967e45a8fbaf33756]
+- CVE-2017-6214 [ccf7abb93af09ad0868ae9033d1ca8108bdaec82]
 
  -- Moritz Muehlenhoff   Mon, 16 Jan 2017 11:17:27 
+0100
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f69ccdd36587e51dac256f2e313c15d6b25d3e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux44
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...linux44[master]: Add two subsequently assigned CVE IDs

[Muehlenhoff (Code Review)]

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

Change subject: Add two subsequently assigned CVE IDs
..

Add two subsequently assigned CVE IDs

Change-Id: I1f69ccdd36587e51dac256f2e313c15d6b25d3e8
---
M debian/changelog
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/linux44 
refs/changes/77/339677/1

diff --git a/debian/changelog b/debian/changelog
index 868f2a2..3474cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.47
   * Update to 4.4.48:
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.48
+- CVE-2016-10208 [3a4b77cd47bb837b8557595ec7425f281f2ca1fe]
   * Update to 4.4.49:
 https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.49
 - CVE-2017-2618 [0c461cb727d146c9ef2d3e86214f498b78b7d125]
@@ -34,6 +35,7 @@
 - CVE-2017-5970 [34b2cef20f19c87999fff3da4071e66937db9644]
 - CVE-2017-5986 [2dcab598484185dea7ec22219c76dcdd59e3cb90]
 - CVE-2017-5897 [7892032cfe67f4bde6fc2ee967e45a8fbaf33756]
+- CVE-2017-6214 [ccf7abb93af09ad0868ae9033d1ca8108bdaec82]
 
  -- Moritz Muehlenhoff   Mon, 16 Jan 2017 11:17:27 
+0100
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f69ccdd36587e51dac256f2e313c15d6b25d3e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux44
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Extend access for flemmerich and psinger

[Muehlenhoff (Code Review)]

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

Change subject: Extend access for flemmerich and psinger
..


Extend access for flemmerich and psinger

MOUs have been extended by half a year.

Change-Id: I2462a7d678b5903eedabc8e5ba67c53c3e81780c
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 03d48c3..ac87592 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2281,7 +2281,7 @@
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDoA+dwV71A3HjSLT1LjxjtXv0fb4/ycQGhqIdqPtulshi5/PZlG3tncFSQpwcOtgbwbRIMUnxhezHdQSUQONTOD02lKOk93dVma4TN6FAkb/ZIK6c9eRU/TQwy3OCXqj6O1CQohVj60kRKBvTKMUpw/oRM9lgTT3USc6UE3Uy8/0eHPiR37nhrA3E5uZ9KgEyIY6z+WCT6inghxEFE+uDFowY/8wwd2Rq4Nsa2F88I7488G1lmZpkye/BtbNbjt3QtLt9Qk8yfJqj8Rpniroxaj1Z+MNvVAXJFK+c4ziwjjAvNHcN9ngsJCURIOlOKgpLahNYofv8OmQ2PpQwGHDj/
 psinger@gobbo
 uid: 15296
 email: philipp.sin...@gesis.org
-expiry_date: 2017-02-24
+expiry_date: 2017-08-24
 expiry_contact: le...@wikimedia.org
   flemmerich:
 ensure: present
@@ -2292,7 +2292,7 @@
   - ssh-rsa 
B3NzaC1yc2EBJQAAAQEAhAOVYD/NaXnew0HlVw4i/3LYT6wn6b8D+5Yun2tWRGd8DaODevafjW0Bzf+XwjSNoRIP52ZRM4Vmhg4H6sL4g31FuMfEVgLwjI0WCTxUxIrR2aGuumXRVYRwLOhFkC2RT7TcjTkDzeMa7DijyDxjI9+/rqCgGHcQwIk/c20VYZ4AzHPpGWqeb2JQblDRu/Jz1enmzUt1rwX/4Kxo/lmkLAtJxzVKgNfn13Acj3BSu1w0DIbPBT7EjKCuzKx7ZthanoYIh+BV5KyErp13AB6dxoxSQNfcIbftBoG6idlUSkEqnzednYoVBQSWa4xNaA2NDbjqpxfbMhERRs8FSn9/iw==
 uid: 15297
 email: florian.lemmer...@gesis.org
-expiry_date: 2017-02-24
+expiry_date: 2017-08-24
 expiry_contact: le...@wikimedia.org
   marostegui:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2462a7d678b5903eedabc8e5ba67c53c3e81780c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Extend access for flemmerich and psinger

[Muehlenhoff (Code Review)]

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

Change subject: Extend access for flemmerich and psinger
..

Extend access for flemmerich and psinger

MOUs have been extended by half a year.

Change-Id: I2462a7d678b5903eedabc8e5ba67c53c3e81780c
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/339676/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index cd40631..de92538 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2281,7 +2281,7 @@
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDoA+dwV71A3HjSLT1LjxjtXv0fb4/ycQGhqIdqPtulshi5/PZlG3tncFSQpwcOtgbwbRIMUnxhezHdQSUQONTOD02lKOk93dVma4TN6FAkb/ZIK6c9eRU/TQwy3OCXqj6O1CQohVj60kRKBvTKMUpw/oRM9lgTT3USc6UE3Uy8/0eHPiR37nhrA3E5uZ9KgEyIY6z+WCT6inghxEFE+uDFowY/8wwd2Rq4Nsa2F88I7488G1lmZpkye/BtbNbjt3QtLt9Qk8yfJqj8Rpniroxaj1Z+MNvVAXJFK+c4ziwjjAvNHcN9ngsJCURIOlOKgpLahNYofv8OmQ2PpQwGHDj/
 psinger@gobbo
 uid: 15296
 email: philipp.sin...@gesis.org
-expiry_date: 2017-02-24
+expiry_date: 2017-08-24
 expiry_contact: le...@wikimedia.org
   flemmerich:
 ensure: present
@@ -2292,7 +2292,7 @@
   - ssh-rsa 
B3NzaC1yc2EBJQAAAQEAhAOVYD/NaXnew0HlVw4i/3LYT6wn6b8D+5Yun2tWRGd8DaODevafjW0Bzf+XwjSNoRIP52ZRM4Vmhg4H6sL4g31FuMfEVgLwjI0WCTxUxIrR2aGuumXRVYRwLOhFkC2RT7TcjTkDzeMa7DijyDxjI9+/rqCgGHcQwIk/c20VYZ4AzHPpGWqeb2JQblDRu/Jz1enmzUt1rwX/4Kxo/lmkLAtJxzVKgNfn13Acj3BSu1w0DIbPBT7EjKCuzKx7ZthanoYIh+BV5KyErp13AB6dxoxSQNfcIbftBoG6idlUSkEqnzednYoVBQSWa4xNaA2NDbjqpxfbMhERRs8FSn9/iw==
 uid: 15297
 email: florian.lemmer...@gesis.org
-expiry_date: 2017-02-24
+expiry_date: 2017-08-24
 expiry_contact: le...@wikimedia.org
   marostegui:
 ensure: present

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: PHP CodeSniffer on CI should only lint HEAD

[Hashar (Code Review)]

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

Change subject: PHP CodeSniffer on CI should only lint HEAD
..

PHP CodeSniffer on CI should only lint HEAD

The Jenkins job mediawiki-core-phpcs-trusty runs PHP CodeSniffer against
every single files. That is one of the slowest jobs we have. We could be
smarter and only run against files changed in the patchset proposed
which would dramatically speed it up.

phpcs supports a bootstrap file that would let us finely tweak it is
state after all arguments and configuration have been processed and just
before the lint actually starts.

Thus, we could shell out to git just like the slave script
git-changed-in-head, grab the files, filter out the one that do not
match phpcs.xml extension:



Pass --bootstrap in phpcs.xml

Add a bootstrap script tests/phpcs/bootstrap-ci.php. Early returns
unless we are on CLI and JENKINS_URL env variable is set.

Get list of files added/modified/changed in HEAD based on
integration/jenkins.git script bin/git-changed-in-head for which I am
the author and licensed under GPL2.0+

Filter out any files that do not match phpcs extensions and use what is
left to override PHPCS built in list of files.

Bug: T158974
Change-Id: I2f492f889594135e37950fcb8e40da0c4d088430
---
M phpcs.xml
A tests/phpcs/bootstrap-ci.php
2 files changed, 47 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/339675/1

diff --git a/phpcs.xml b/phpcs.xml
index 4693b42..e113a1e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -12,6 +12,7 @@


.
+   



diff --git a/tests/phpcs/bootstrap-ci.php b/tests/phpcs/bootstrap-ci.php
new file mode 100644
index 000..101a04e
--- /dev/null
+++ b/tests/phpcs/bootstrap-ci.php
@@ -0,0 +1,46 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Antoine Musso
+ */
+
+# Only run from cli and when using Jenkins
+if ( ! ( PHP_SAPI == 'cli' && isset( $_ENV['JENKINS_URL'] ) ) ) {
+   return;
+}
+
+# From integration/jenkins.git bin/git-changed-in-head
+$_head_files = [];
+exec('git show HEAD --name-only --diff-filter=ACM -m --first-parent 
--format=format:',
+   $_head_files, $_return);
+if ( $_return !== 0 ) {
+   unset( $_head_files );
+   unset( $_return );
+   return;
+}
+
+# Only keep files that matches phpcs.xml extensions.
+$values['files'] = array_filter( $_head_files, function( $file ) use ( $values 
) {
+   $pinfo = pathinfo( $file );
+   return in_array(
+   strtolower( $pinfo['extension'] ), $values['extensions'] );
+} );

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool-data: add first discovery objects

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339674 )

Change subject: conftool-data: add first discovery objects
..

conftool-data: add first discovery objects

Bug: T149617
Change-Id: I117e94dd813b5b631da571e7d5123a5671c9ecc9
---
A conftool-data/discovery/mediawiki.yaml
A conftool-data/discovery/services.yaml
2 files changed, 81 insertions(+), 0 deletions(-)


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

diff --git a/conftool-data/discovery/mediawiki.yaml 
b/conftool-data/discovery/mediawiki.yaml
new file mode 100644
index 000..8cbb81a
--- /dev/null
+++ b/conftool-data/discovery/mediawiki.yaml
@@ -0,0 +1,15 @@
+appserver:
+  apache2: [eqiad, codfw]
+  nginx: [eqiad, codfw]
+api_appserver:
+  apache2: [eqiad, codfw]
+  nginx: [eqiad, codfw]
+imagescaler:
+  apache2: [eqiad, codfw]
+  nginx: [eqiad, codfw]
+swift:
+  swift-fe: [eqiad, codfw]
+  nginx: [eqiad,codfw]
+thumbor:
+  thumbor:
+- eqiad
diff --git a/conftool-data/discovery/services.yaml 
b/conftool-data/discovery/services.yaml
new file mode 100644
index 000..d1f684e
--- /dev/null
+++ b/conftool-data/discovery/services.yaml
@@ -0,0 +1,66 @@
+parsoid:
+  parsoid: [eqiad, codfw]
+elasticsearch:
+  elasticsearch: [eqiad, codfw]
+  elasticsearch-ssl: [eqiad, codfw]
+pdf:
+  ocg: [eqiad]
+sca:
+  zotero:
+- eqiad
+- codfw
+scb:
+  mobileapps:
+- eqiad
+- codfw
+  eventstreams:
+- eqiad
+- codfw
+  mathoid:
+- eqiad
+- codfw
+  graphoid:
+- eqiad
+- codfw
+  citoid:
+- eqiad
+- codfw
+  apertium:
+- eqiad
+- codfw
+  cxserver:
+- eqiad
+- codfw
+  ores:
+- eqiad
+- codfw
+  pdfrender:
+- eqiad
+- codfw
+  trendingedits:
+- eqiad
+- codfw
+restbase:
+  restbase:
+- eqiad
+- codfw
+maps:
+  kartotherian:
+- codfw
+- eqiad
+aqs:
+  aqs:
+- eqiad
+eventbus:
+  eventbus:
+datacenters:
+- eqiad
+- codfw
+wdqs:
+  wdqs:
+- eqiad
+- codfw
+logstash:
+  kibana:
+datacenters:
+- eqiad

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I117e94dd813b5b631da571e7d5123a5671c9ecc9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::conftool::client: add default schema

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339673 )

Change subject: profile::conftool::client: add default schema
..

profile::conftool::client: add default schema

This first schema is for just discovery objects tjat will be used by our
DNS discovery interface and by MediaWiki to populate
ProductionService.php in mediawiki-config.

Bug: T149617
Change-Id: Iad7d71115142727e0f748d81e39fb3e8b1d2597a
---
A modules/profile/files/conftool/schema.yaml
M modules/profile/manifests/conftool/client.pp
2 files changed, 22 insertions(+), 0 deletions(-)


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

diff --git a/modules/profile/files/conftool/schema.yaml 
b/modules/profile/files/conftool/schema.yaml
new file mode 100644
index 000..73ee72c
--- /dev/null
+++ b/modules/profile/files/conftool/schema.yaml
@@ -0,0 +1,13 @@
+# Discovery objects. they will represent a sequence of cluster/service/dc 
combinations
+discovery:
+  path: "discovery"
+  tags:
+- cluster
+- service
+  schema:
+pooled:
+  type: "bool"
+  default: false
+url:
+  type: "string"
+  default: ""
diff --git a/modules/profile/manifests/conftool/client.pp 
b/modules/profile/manifests/conftool/client.pp
index 2a1fcb3..1e617ff 100644
--- a/modules/profile/manifests/conftool/client.pp
+++ b/modules/profile/manifests/conftool/client.pp
@@ -40,4 +40,13 @@
 tcpircbot_port => $tcpircbot_port,
 hosts  => [],
 }
+
+# Conftool schema. Let's assume we will only have one.
+file { '/etc/conftool/schema.yaml':
+ensure => present,
+source => 'puppet:///modules/profile/conftool/schema.yaml',
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad7d71115142727e0f748d81e39fb3e8b1d2597a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool-data: convert to new format

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339672 )

Change subject: conftool-data: convert to new format
..

conftool-data: convert to new format

Change-Id: Iff8acc338127a1d62f411985658473c1724e5352
---
A conftool-data/node/codfw.yaml
A conftool-data/node/eqiad.yaml
A conftool-data/node/esams.yaml
A conftool-data/node/ulsfo.yaml
A conftool-data/service/cache.yaml
A conftool-data/service/mediawiki.yaml
A conftool-data/service/misc.yaml
A conftool-data/service/services.yaml
8 files changed, 1,127 insertions(+), 0 deletions(-)


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

diff --git a/conftool-data/node/codfw.yaml b/conftool-data/node/codfw.yaml
new file mode 100644
index 000..44e6d22
--- /dev/null
+++ b/conftool-data/node/codfw.yaml
@@ -0,0 +1,306 @@
+codfw:
+  appserver:
+mw2090.codfw.wmnet: [apache2,nginx]
+mw2091.codfw.wmnet: [apache2,nginx]
+mw2092.codfw.wmnet: [apache2,nginx]
+mw2093.codfw.wmnet: [apache2,nginx]
+mw2094.codfw.wmnet: [apache2,nginx]
+mw2095.codfw.wmnet: [apache2,nginx]
+mw2096.codfw.wmnet: [apache2,nginx]
+mw2097.codfw.wmnet: [apache2,nginx]
+mw2098.codfw.wmnet: [apache2,nginx]
+mw2100.codfw.wmnet: [apache2,nginx]
+mw2101.codfw.wmnet: [apache2,nginx]
+mw2102.codfw.wmnet: [apache2,nginx]
+mw2103.codfw.wmnet: [apache2,nginx]
+mw2104.codfw.wmnet: [apache2,nginx]
+mw2105.codfw.wmnet: [apache2,nginx]
+mw2106.codfw.wmnet: [apache2,nginx]
+mw2107.codfw.wmnet: [apache2,nginx]
+mw2108.codfw.wmnet: [apache2,nginx]
+mw2109.codfw.wmnet: [apache2,nginx]
+mw2110.codfw.wmnet: [apache2,nginx]
+mw2111.codfw.wmnet: [apache2,nginx]
+mw2112.codfw.wmnet: [apache2,nginx]
+mw2113.codfw.wmnet: [apache2,nginx]
+mw2114.codfw.wmnet: [apache2,nginx]
+mw2115.codfw.wmnet: [apache2,nginx]
+mw2116.codfw.wmnet: [apache2,nginx]
+mw2117.codfw.wmnet: [apache2,nginx]
+mw2163.codfw.wmnet: [apache2,nginx]
+mw2164.codfw.wmnet: [apache2,nginx]
+mw2165.codfw.wmnet: [apache2,nginx]
+mw2166.codfw.wmnet: [apache2,nginx]
+mw2167.codfw.wmnet: [apache2,nginx]
+mw2168.codfw.wmnet: [apache2,nginx]
+mw2169.codfw.wmnet: [apache2,nginx]
+mw2170.codfw.wmnet: [apache2,nginx]
+mw2171.codfw.wmnet: [apache2,nginx]
+mw2172.codfw.wmnet: [apache2,nginx]
+mw2173.codfw.wmnet: [apache2,nginx]
+mw2174.codfw.wmnet: [apache2,nginx]
+mw2175.codfw.wmnet: [apache2,nginx]
+mw2176.codfw.wmnet: [apache2,nginx]
+mw2177.codfw.wmnet: [apache2,nginx]
+mw2178.codfw.wmnet: [apache2,nginx]
+mw2179.codfw.wmnet: [apache2,nginx]
+mw2180.codfw.wmnet: [apache2,nginx]
+mw2181.codfw.wmnet: [apache2,nginx]
+mw2182.codfw.wmnet: [apache2,nginx]
+mw2183.codfw.wmnet: [apache2,nginx]
+mw2184.codfw.wmnet: [apache2,nginx]
+mw2185.codfw.wmnet: [apache2,nginx]
+mw2186.codfw.wmnet: [apache2,nginx]
+mw2187.codfw.wmnet: [apache2,nginx]
+mw2188.codfw.wmnet: [apache2,nginx]
+mw2189.codfw.wmnet: [apache2,nginx]
+mw2190.codfw.wmnet: [apache2,nginx]
+mw2191.codfw.wmnet: [apache2,nginx]
+mw2192.codfw.wmnet: [apache2,nginx]
+mw2193.codfw.wmnet: [apache2,nginx]
+mw2194.codfw.wmnet: [apache2,nginx]
+mw2195.codfw.wmnet: [apache2,nginx]
+mw2196.codfw.wmnet: [apache2,nginx]
+mw2197.codfw.wmnet: [apache2,nginx]
+mw2198.codfw.wmnet: [apache2,nginx]
+mw2199.codfw.wmnet: [apache2,nginx]
+mw2224.codfw.wmnet: [apache2,nginx]
+mw2225.codfw.wmnet: [apache2,nginx]
+mw2226.codfw.wmnet: [apache2,nginx]
+mw2227.codfw.wmnet: [apache2,nginx]
+mw2228.codfw.wmnet: [apache2,nginx]
+mw2229.codfw.wmnet: [apache2,nginx]
+mw2230.codfw.wmnet: [apache2,nginx]
+mw2231.codfw.wmnet: [apache2,nginx]
+mw2232.codfw.wmnet: [apache2,nginx]
+mw2233.codfw.wmnet: [apache2,nginx]
+mw2234.codfw.wmnet: [apache2,nginx]
+mw2235.codfw.wmnet: [apache2,nginx]
+mw2236.codfw.wmnet: [apache2,nginx]
+mw2237.codfw.wmnet: [apache2,nginx]
+mw2238.codfw.wmnet: [apache2,nginx]
+mw2239.codfw.wmnet: [apache2,nginx]
+mw2240.codfw.wmnet: [apache2,nginx]
+mw2241.codfw.wmnet: [apache2,nginx]
+mw2242.codfw.wmnet: [apache2,nginx]
+  api_appserver:
+mw2120.codfw.wmnet: [apache2,nginx]
+mw2121.codfw.wmnet: [apache2,nginx]
+mw2122.codfw.wmnet: [apache2,nginx]
+mw2123.codfw.wmnet: [apache2,nginx]
+mw2124.codfw.wmnet: [apache2,nginx]
+mw2125.codfw.wmnet: [apache2,nginx]
+mw2126.codfw.wmnet: [apache2,nginx]
+mw2127.codfw.wmnet: [apache2,nginx]
+mw2128.codfw.wmnet: [apache2,nginx]
+mw2129.codfw.wmnet: [apache2,nginx]
+mw2130.codfw.wmnet: [apache2,nginx]
+mw2131.codfw.wmnet: [apache2,nginx]
+mw2132.codfw.wmnet: [apache2,nginx]
+mw2133.codfw.wmnet: [apache2,nginx]
+mw2134.codfw.wmnet: [apache2,nginx]
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: varnish: move applayer info back to hiera [WIP, 4/4]

[BBlack (Code Review)]

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

Change subject: varnish: move applayer info back to hiera [WIP, 4/4]
..

varnish: move applayer info back to hiera [WIP, 4/4]

XXX Just maps so far, TODO rest...

Bug: T134404
Change-Id: Ica27010fa9a453aae96810ec52754a75410adfbd
---
M hieradata/role/common/cache/maps.yaml
M modules/role/manifests/cache/maps.pp
2 files changed, 16 insertions(+), 24 deletions(-)


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

diff --git a/hieradata/role/common/cache/maps.yaml 
b/hieradata/role/common/cache/maps.yaml
index 835d136..b2113fa 100644
--- a/hieradata/role/common/cache/maps.yaml
+++ b/hieradata/role/common/cache/maps.yaml
@@ -14,3 +14,16 @@
   codfw: 'eqiad'
   ulsfo: 'codfw'
   esams: 'eqiad'
+cache::app_def_be_opts:
+port:   6533
+connect_timeout:'5s'
+first_byte_timeout: '35s'
+max_connections:1000
+cache::app_directors:
+kartotherian:
+backends:
+eqiad: 'kartotherian.svc.eqiad.wmnet'
+# codfw: 'kartotherian.svc.codfw.wmnet'
+cache::req_handling:
+default:
+director: 'kartotherian'
diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index bbcdc37..0c090a5 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -29,32 +29,11 @@
 'probe' => 'varnish',
 }
 
-$app_def_be_opts = {
-'port'  => 6533,
-'connect_timeout'   => '5s',
-'first_byte_timeout'=> '35s',
-'max_connections'   => 1000,
-}
-
-$app_directors = {
-'kartotherian'   => {
-'backends' => {
-'eqiad' => 'kartotherian.svc.eqiad.wmnet',
-},
-},
-}
-
-$req_handling = {
-'default' => {
-'director' => 'kartotherian',
-},
-}
-
 $common_vcl_config = {
 'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re,
 'ttl_cap'  => '1d',
 'pass_random'  => true,
-'req_handling' => $req_handling,
+'req_handling' => hiera('cache::req_handling'),
 }
 
 $common_runtime_params = ['default_ttl=86400']
@@ -64,8 +43,8 @@
 fe_jemalloc_conf  => 'lg_dirty_mult:8,lg_chunk:17',
 fe_runtime_params => $common_runtime_params,
 be_runtime_params => $common_runtime_params,
-app_directors => $app_directors,
-app_def_be_opts   => $app_def_be_opts,
+app_directors => hiera('cache::app_directors'),
+app_def_be_opts   => hiera('cache::app_def_be_opts'),
 fe_vcl_config => $common_vcl_config,
 be_vcl_config => $common_vcl_config,
 fe_extra_vcl  => [],

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps: make version of nodejs configureable

[Gehel (Code Review)]

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

Change subject: maps: make version of nodejs configureable
..

maps: make version of nodejs configureable

To help test the transition to node 6 let's make it configureable.

maps-test2004 is the first server used to test this transition

Change-Id: Ieec01058fe1230f7a83fd017bed7028802e0bdcb
---
M hieradata/hosts/maps-test2004.yaml
M modules/role/manifests/maps/server.pp
2 files changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/maps-test2004.yaml 
b/hieradata/hosts/maps-test2004.yaml
index 419fb6d..5a26054 100644
--- a/hieradata/hosts/maps-test2004.yaml
+++ b/hieradata/hosts/maps-test2004.yaml
@@ -1,2 +1,3 @@
 cassandra::rack: b5
 do_paging: false
+maps::node_version: 6
diff --git a/modules/role/manifests/maps/server.pp 
b/modules/role/manifests/maps/server.pp
index f79216f..3c604ce 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -19,6 +19,13 @@
 $cassandra_hosts = hiera('cassandra::seeds')
 
 # Stick with nodejs 4.6, kartotherian isn't ready for node 6 yet
+$node_version = hiera('maps::node_version', 4)
+
+$node_package_version = $node_version ? {
+6   => '6.9.1~dfsg-1',
+default => '4.6.0~dfsg-1+wmf2',
+}
+
 package { 'nodejs':
 ensure => '4.6.0~dfsg-1+wmf2',
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Clone only the master branch of mediawiki/core.git by default

[jenkins-bot (Code Review)]

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

Change subject: Clone only the master branch of mediawiki/core.git by default
..


Clone only the master branch of mediawiki/core.git by default

We've been seeing some issues with bad commit references causing the
initial git clone of MediaWiki to fail. Various debugging attempts point
to commits on deployment branches that may have somehow been lost in the
origin repo. Normal MediaWiki development happens on the master branch
and not a release branch, so we can work around this issue by limiting
the initial clone to a single branch.

Bug: T152801
Change-Id: I4939712110c0ac9286b668ca7a4f86440fb28e4f
---
M puppet/hieradata/common.yaml
M puppet/modules/git/manifests/clone.pp
M puppet/modules/mediawiki/manifests/init.pp
3 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 4bf4a2a..a8f40f3 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -236,6 +236,7 @@
 mediawiki::admin_user: Admin
 mediawiki::admin_pass: vagrant
 mediawiki::server_url: 
"http://%{hiera('role::mediawiki::hostname')}%{::port_fragment}"
+mediawiki::branch: master
 
 mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
 mediawiki::apache::php5_site_name: "php5%{hiera('mwv::tld')}"
diff --git a/puppet/modules/git/manifests/clone.pp 
b/puppet/modules/git/manifests/clone.pp
index b2c6334..c82ca52 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -67,7 +67,7 @@
 
 $arg_branch = $branch ? {
 undef   => '',
-default => "--branch '${branch}'"
+default => "--branch '${branch}' --single-branch"
 }
 $arg_recurse = $recurse_submodules ? {
 true=> '--recurse-submodules',
diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index e94d439..8f1f739 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -39,7 +39,7 @@
 #   pages is stored (example: '/srv/pages').
 #
 # [*branch*]
-#   Version to check out
+#   Branch to check out (example: 'master').
 #
 # [*git_depth*]
 #  Git cloning depth - undef for normal, a number for a shallow clone with

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4939712110c0ac9286b668ca7a4f86440fb28e4f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gergő Tisza 
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] operations/puppet[production]: varnish: per-app routing [WIP, 3/4]

[BBlack (Code Review)]

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

Change subject: varnish: per-app routing [WIP, 3/4]
..

varnish: per-app routing [WIP, 3/4]

Change-Id: Ic32b015d68df4a14e43cfbd577e6050d695ecddb
---
M hieradata/labs.yaml
M hieradata/role/common/cache/maps.yaml
M hieradata/role/common/cache/misc.yaml
M hieradata/role/common/cache/text.yaml
M hieradata/role/common/cache/upload.yaml
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/misc.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
M modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
11 files changed, 204 insertions(+), 143 deletions(-)


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

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 7063f40..a500017 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -43,7 +43,7 @@
 
 # Cache-layer stuff
 cache::route_table:
-eqiad: 'direct'
+eqiad: 'eqiad'
 cache::text::nodes:
 eqiad:
   - 'deployment-cache-text04.deployment-prep.eqiad.wmflabs'
diff --git a/hieradata/role/common/cache/maps.yaml 
b/hieradata/role/common/cache/maps.yaml
index eb51d7d..835d136 100644
--- a/hieradata/role/common/cache/maps.yaml
+++ b/hieradata/role/common/cache/maps.yaml
@@ -2,26 +2,15 @@
 cache::cluster: maps
 cache::tune_for_media: true
 # The contents of this hash control our DC->DC routing for varnish backend
-# daemons.  There should be a key for every cache datacenter, and the
-# values can be another datacenter or 'direct', which means contact the
-# applayer directly.
-#
-# Currently, the possible datacenter-name values for non-direct are limited
-# to 'eqiad', and 'codfw' because they're the only ones defined in
-# 'backend_caches' in role::cache::instances.
-#
-# Note that it is possible to create permanent or temporary-race-condition
-# loops by making poor changes to this hash!  Keeping in mind that the
-# state here will be applied to cache daemons asynchronously, the general
-# rules of safety would be:
-# 1. Obviously, a commit should not create actual loops which do not
-#eventually resolve to 'direct'
-# 2. A single commit->deploy should only change one single value at a time
-#unless you're absolutely certain of what you're doing, as changing
-#multiple values could cause a race-condition of intermediate states.
+# daemons.  There should be a key for every cache datacenter.  The values must
+# be a core datacenter (eqiad or codfw), or at least must lead indirectly to
+# a core datacenter when traversing the table recursively.  A loop between
+# the two core datacenters is expected and normal here.  The only reason to
+# edit this is to remove a datacenter from active service (due to fault or
+# maintenance) by routing around it from the edge sites.
 #
 cache::route_table:
-  eqiad: 'direct'
+  eqiad: 'codfw'
   codfw: 'eqiad'
   ulsfo: 'codfw'
   esams: 'eqiad'
diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index 842e8aa..c0b1568 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -1,28 +1,17 @@
 cluster: cache_misc
 cache::cluster: misc
+# note this only affects tlsproxy now, should be moved to param there...
+cache::websocket_support: true
 # The contents of this hash control our DC->DC routing for varnish backend
-# daemons.  There should be a key for every cache datacenter, and the
-# values can be another datacenter or 'direct', which means contact the
-# applayer directly.
-#
-# Currently, the possible datacenter-name values for non-direct are limited
-# to 'eqiad', and 'codfw' because they're the only ones defined in
-# 'backend_caches' in role::cache::instances.
-#
-# Note that it is possible to create permanent or temporary-race-condition
-# loops by making poor changes to this hash!  Keeping in mind that the
-# state here will be applied to cache daemons asynchronously, the general
-# rules of safety would be:
-# 1. Obviously, a commit should not create actual loops which do not
-#eventually resolve to 'direct'
-# 2. A single commit->deploy should only change one single value at a time
-#unless you're absolutely certain of what you're doing, as changing
-#multiple values could cause a race-condition of intermediate states.
+# daemons.  There should be a key for every cache datacenter.  The values must
+# be a core datacenter (eqiad or codfw), or at least must lead indirectly to
+# a core datacenter when traversing the table recursively.  A loop between
+# the two core datacenters is expected and normal here.  The only reason to
+# edit this is to remove a datacenter from active service (due to fault or
+# maintenance) by routing around it from the edge sites.
 #
 cache::route_table:
-  eqiad: 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: varnish: move "apps" data back into manifests [WIP, 1/4]

[BBlack (Code Review)]

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

Change subject: varnish: move "apps" data back into manifests [WIP, 1/4]
..

varnish: move "apps" data back into manifests [WIP, 1/4]

This seems like a regression.  It takes applayer datacenter
routing and moves it from an explicit route in hieradata to an
implicit one in a manifest.  However, it's just the next sane step
in aligning with cache_misc before moving all related data (not
just hostnames and routes, but all of "app_directors") back into
hieradata with proper per-application routing.

It also temporarily breaks beta, which uses the same hieradata (in
labs.yaml), but we'll fix that when it all moves back...

Bug: T134404
Change-Id: Ia29f6a41914bdc6b7e998cd8b5f5b073ff8eb461
---
M hieradata/common/cache/maps.yaml
M hieradata/common/cache/text.yaml
M hieradata/common/cache/upload.yaml
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
6 files changed, 16 insertions(+), 74 deletions(-)


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

diff --git a/hieradata/common/cache/maps.yaml b/hieradata/common/cache/maps.yaml
index 9e7869b..0cb44c0 100644
--- a/hieradata/common/cache/maps.yaml
+++ b/hieradata/common/cache/maps.yaml
@@ -19,9 +19,3 @@
 - 'cp4012.ulsfo.wmnet'
 - 'cp4019.ulsfo.wmnet'
 - 'cp4020.ulsfo.wmnet'
-cache::maps::apps:
-  kartotherian:
-route: 'eqiad'
-backends:
-  codfw: 'kartotherian.svc.codfw.wmnet'
-  eqiad: 'kartotherian.svc.eqiad.wmnet'
diff --git a/hieradata/common/cache/text.yaml b/hieradata/common/cache/text.yaml
index 52c4506..0f727b3 100644
--- a/hieradata/common/cache/text.yaml
+++ b/hieradata/common/cache/text.yaml
@@ -33,44 +33,3 @@
 - 'cp4016.ulsfo.wmnet'
 - 'cp4017.ulsfo.wmnet'
 - 'cp4018.ulsfo.wmnet'
-cache::text::apps:
-  appservers:
-route: 'eqiad'
-backends:
-  eqiad: 'appservers.svc.eqiad.wmnet'
-  codfw: 'appservers.svc.codfw.wmnet'
-  appservers_debug:
-route: 'codfw'
-backends:
-  eqiad: 'hassium.eqiad.wmnet'
-  codfw: 'hassaleh.codfw.wmnet'
-  api:
-route: 'eqiad'
-backends:
-  eqiad: 'api.svc.eqiad.wmnet'
-  codfw: 'api.svc.codfw.wmnet'
-  rendering:
-route: 'eqiad'
-backends:
-  eqiad: 'rendering.svc.eqiad.wmnet'
-  codfw: 'rendering.svc.codfw.wmnet'
-  restbase:
-route: 'eqiad'
-backends:
-  eqiad: 'restbase.svc.eqiad.wmnet'
-  codfw: 'restbase.svc.codfw.wmnet'
-  cxserver:
-route: 'eqiad'
-backends:
-  eqiad: 'cxserver.svc.eqiad.wmnet'
-  codfw: 'cxserver.svc.codfw.wmnet'
-  citoid:
-route: 'eqiad'
-backends:
-  eqiad: 'citoid.svc.eqiad.wmnet'
-  codfw: 'citoid.svc.codfw.wmnet'
-  security_audit:
-route: 'eqiad'
-backends:
-  eqiad: 'appservers.svc.eqiad.wmnet'
-  codfw: 'appservers.svc.codfw.wmnet'
diff --git a/hieradata/common/cache/upload.yaml 
b/hieradata/common/cache/upload.yaml
index 85d02a4..5c7838c 100644
--- a/hieradata/common/cache/upload.yaml
+++ b/hieradata/common/cache/upload.yaml
@@ -42,14 +42,3 @@
 - 'cp4013.ulsfo.wmnet'
 - 'cp4014.ulsfo.wmnet'
 - 'cp4015.ulsfo.wmnet'
-cache::upload::apps:
-  swift:
-route: 'eqiad'
-backends:
-  eqiad: 'ms-fe.svc.eqiad.wmnet'
-  codfw: 'ms-fe.svc.codfw.wmnet'
-  swift_thumbs:
-route: 'eqiad'
-backends:
-  eqiad: 'ms-fe-thumbs.svc.eqiad.wmnet'
-  codfw: 'ms-fe-thumbs.svc.codfw.wmnet'
diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index 881c75c..247fd1b 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -39,7 +39,7 @@
 $apps = hiera('cache::maps::apps')
 $app_directors = {
 'kartotherian'   => {
-'backend' => 
$apps['kartotherian']['backends'][$apps['kartotherian']['route']],
+'backend' => 'kartotherian.svc.eqiad.wmnet',
 },
 }
 
diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index fae2b4f..4303d79 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -44,35 +44,35 @@
 'max_connections'   => 1000,
 }
 
-$apps = hiera('cache::text::apps')
 $app_directors = {
 'appservers'   => {
-'backend' => 
$apps['appservers']['backends'][$apps['appservers']['route']],
+'backend' => 'appservers.svc.eqiad.wmnet',
 },
 'api'  => {
-'backend' => $apps['api']['backends'][$apps['api']['route']],
+'backend' => 'api.svc.eqiad.wmnet',
 },
 'rendering'=> {
-'backend' => 
$apps['rendering']['backends'][$apps['rendering']['route']],
+'backend' => 'rendering.svc.eqiad.wmnet',
 },

[MediaWiki-commits] [Gerrit] operations/puppet[production]: varnish: switch all clusters to req_handling [WIP, 2/4]

[BBlack (Code Review)]

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

Change subject: varnish: switch all clusters to req_handling [WIP, 2/4]
..

varnish: switch all clusters to req_handling [WIP, 2/4]

This also adds "debug_director" to support the text cluster's
unique debug backends logic.

Bug: T134404
Change-Id: I757b420c4791398d947c6e725b5508a7f70db4f3
---
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
M modules/varnish/templates/maps-backend.inc.vcl.erb
M modules/varnish/templates/misc-backend.inc.vcl.erb
M modules/varnish/templates/misc-common.inc.vcl.erb
M modules/varnish/templates/text-backend.inc.vcl.erb
M modules/varnish/templates/text-common.inc.vcl.erb
M modules/varnish/templates/upload-backend.inc.vcl.erb
M modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
M modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
12 files changed, 171 insertions(+), 165 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/339668/1

diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index 247fd1b..f49b4bb 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -36,7 +36,6 @@
 'max_connections'   => 1000,
 }
 
-$apps = hiera('cache::maps::apps')
 $app_directors = {
 'kartotherian'   => {
 'backend' => 'kartotherian.svc.eqiad.wmnet',
@@ -47,6 +46,7 @@
 'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re,
 'ttl_cap'  => '1d',
 'pass_random'  => true,
+'req_handling' => { director => 'kartotherian' },
 }
 
 $common_runtime_params = ['default_ttl=86400']
diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index 4303d79..8b71c85 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -76,12 +76,41 @@
 },
 }
 
+$req_handling = {
+'cxserver.wikimedia.org' => {
+'director' => 'cxserver_backend',
+'caching'  => 'pass',
+},
+'citoid.wikimedia.org'   => {
+'director' => 'citoid_backend',
+'caching'  => 'pass',
+},
+'default'=> {
+'director'   => 'appservers',
+'debug_director' => 'appservers_debug',
+'subpaths' => {
+'^/api/rest_v1/' => {
+'director' => 'restbase_backend'
+},
+'^/w/api\.php'   => {
+'director'   => 'api',
+'debug_director' => 'appservers_debug',
+},
+'^/w/thumb(_handler)?\.php' => {
+'director'   => 'rendering',
+'debug_director' => 'appservers_debug',
+}
+}
+},
+}
+
 $common_vcl_config = {
 'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re,
 'static_host'  => $static_host,
 'top_domain'   => $top_domain,
 'shortener_domain' => $shortener_domain,
 'pass_random'  => true,
+'req_handling' => $req_handling,
 }
 
 $be_vcl_config = $common_vcl_config
diff --git a/modules/role/manifests/cache/upload.pp 
b/modules/role/manifests/cache/upload.pp
index 482f5b4..95ed0c9 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -40,7 +40,6 @@
 'max_connections'   => 1,
 }
 
-$apps = hiera('cache::upload::apps')
 $app_directors = {
 'swift'   => {
 'backend' => 'ms-fe.svc.eqiad.wmnet',
@@ -50,10 +49,20 @@
 },
 }
 
+$req_handling = {
+'director' => 'swift',
+'subpaths' => {
+'^/+[^/]+/[^/]+/thumb/' => {
+director => 'swift_thumbs',
+},
+},
+}
+
 $common_vcl_config = {
 'purge_host_regex' => $::role::cache::base::purge_host_only_upload_re,
 'upload_domain'=> $upload_domain,
 'allowed_methods'  => '^(GET|HEAD|OPTIONS|PURGE)$',
+'req_handling' => $req_handling,
 }
 
 # Note pass_random true in BE, false in FE below.
diff --git a/modules/varnish/templates/maps-backend.inc.vcl.erb 
b/modules/varnish/templates/maps-backend.inc.vcl.erb
index 3c3b110..cc0330c 100644
--- a/modules/varnish/templates/maps-backend.inc.vcl.erb
+++ b/modules/varnish/templates/maps-backend.inc.vcl.erb
@@ -1,11 +1,6 @@
 // Varnish VCL include file for maps backends
 
 sub cluster_be_recv_pre_purge { }
-
-sub cluster_be_recv_applayer_backend {
-   set req.backend_hint = kartotherian.backend();
-}
-
 sub cluster_be_recv 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Repool db1026 after maintenance with low load

[Jcrespo (Code Review)]

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

Change subject: mariadb: Repool db1026 after maintenance with low load
..


mariadb: Repool db1026 after maintenance with low load

Bug: T147747
Change-Id: I7eaf87333adf8cd2733800f2e6b9936bc678036b
---
M wmf-config/db-eqiad.php
1 file changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 06c5d6d..fb4c412 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -140,7 +140,7 @@
],
's5' => [
'db1049' => 0,   # B1 2.8TB  64GB, master
-#  'db1026' => 1,   # B1 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   'db1026' => 1,   # B1 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1045' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1070' => 50,  # D1 2.8TB 160GB, vslow, dump
'db1071' => 50,  # D1 2.8TB 160GB, api
@@ -363,24 +363,24 @@
'db1082' => 1,
],
'watchlist' => [
-#  'db1026' => 1,
-   'db1045' => 1,
+   'db1026' => 1,
+   'db1045' => 10,
],
'recentchanges' => [
-#  'db1026' => 1,
-   'db1045' => 1,
+   'db1026' => 1,
+   'db1045' => 10,
],
'recentchangeslinked' => [
-#  'db1026' => 1,
-   'db1045' => 1,
+   'db1026' => 1,
+   'db1045' => 10,
],
'contributions' => [
-#  'db1026' => 1,
-   'db1045' => 1,
+   'db1026' => 1,
+   'db1045' => 10,
],
'logpager' => [
-#  'db1026' => 1,
-   'db1045' => 1,
+   'db1026' => 1,
+   'db1045' => 10,
],
],
's6' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7eaf87333adf8cd2733800f2e6b9936bc678036b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add new mediawiki-core-composer-test-HEAD-php55lint-trusty test

[Paladox (Code Review)]

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

Change subject: Add new mediawiki-core-composer-test-HEAD-php55lint-trusty test
..

Add new mediawiki-core-composer-test-HEAD-php55lint-trusty test

This is for mediawiki/core and basically merges phpcs test into a test that 
runs phplint.

Change-Id: I6d1bf303b47995feefc8c0531388ffdf6f762b23
---
M jjb/mediawiki.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 37 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/66/339666/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 45c1125..9eed647 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -324,7 +324,7 @@
   - 'mediawiki-core-doxygen-publish'
   - 'mediawiki-core-selenium-jessie'
   - '{name}-php53lint'
-  - '{name}-php55lint'
+  - '{name}-composer-test-HEAD-php55lint-trusty'
   - 'mediawiki-phpunit-{phpflavor}':
   phpflavor:
   - php53
@@ -461,6 +461,38 @@
   failed:
 total-all: 1
 
+- job:
+name: 'mediawiki-core-composer-test-HEAD-php55-trusty'
+node: ci-trusty-wikimedia
+defaults: use-remote-zuul-shallow-clone
+concurrent: true
+properties:
+ - build-discarder:
+ days-to-keep: 15
+triggers:
+ - zuul
+builders:
+ - assert-phpflavor:
+ phpflavor: 'php55'
+ - castor-load
+ - shell: |
+cd $WORKSPACE/src
+rm -fR "$WORKSPACE/log"
+ - composer-validate-package
+ - composer-update:
+dir: '.'
+ - shell: |
+php -v
+/srv/deployment/integration/slave-scripts/bin/git-changed-in-head | 
xargs composer test
+publishers:
+ - castor-save
+ - checkstyle:
+pattern: 'log/checkstyle.xml'
+can-run-on-failed: true
+thresholds:
+  failed:
+total-all: 1
+
 # Phan! (T132636)
 - job:
 name: 'mediawiki-core-php70-phan-jessie'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c048171..3070e72 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1382,14 +1382,13 @@
   - name: rake
 check:
   - mediawiki-core-php53lint
-  - mediawiki-core-php55lint
+  - mediawiki-core-composer-test-HEAD-php55lint-trusty
   - composer-package-validate
 test:
-  - mediawiki-core-phpcs-trusty
+  - mediawiki-core-composer-test-HEAD-php55lint-trusty
   - mediawiki-core-jsduck
   - mediawiki-core-npm-node-6-jessie
   - mediawiki-core-php53lint
-  - mediawiki-core-php55lint
   - mediawiki-phpunit-hhvm-jessie
   - mediawiki-core-qunit-jessie
   - composer-package-validate
@@ -1402,8 +1401,7 @@
   - mediawiki-core-jsduck
   - mediawiki-core-npm-node-6-jessie
   - mediawiki-core-php53lint
-  - mediawiki-core-php55lint
-  - mediawiki-core-phpcs-trusty
+  - mediawiki-core-composer-test-HEAD-php55lint-trusty
   - mediawiki-phpunit-hhvm-jessie
   - mediawiki-phpunit-hhvm-composer
   - mediawiki-phpunit-php53
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index a3bef7f..80a2f7c 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -28,6 +28,7 @@
 'mwext-qunit-jessie',
 'mwext-qunit-composer-jessie',
 'mediawiki-extensions-qunit-jessie',
+'mediawiki-core-composer-test-HEAD-php55lint-trusty',
 )
 
 # Sets a $PHP_BIN variable based on the job name

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d1bf303b47995feefc8c0531388ffdf6f762b23
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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...Wikibase[master]: Make use of PHPs shortcut "$truthy ?: $else" operator

[jenkins-bot (Code Review)]

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

Change subject: Make use of PHPs shortcut "$truthy ?: $else" operator
..


Make use of PHPs shortcut "$truthy ?: $else" operator

Change-Id: I614bdb628546661b970dc605f41bc990e6aadad0
---
M client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
M repo/includes/Specials/SpecialModifyTerm.php
M repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php 
b/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
index 2d5ead9..025ef18 100644
--- a/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
+++ b/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
@@ -70,7 +70,7 @@
return new EntityAccessor(
new ItemIdParser(),
$entityLookup ?: new MockRepository(),
-   $usageAccumulator ? $usageAccumulator : new 
HashUsageAccumulator(),
+   $usageAccumulator ?: new HashUsageAccumulator(),
$entitySerializer,
$propertyDataTypeLookup,
$fallbackChain,
diff --git a/repo/includes/Specials/SpecialModifyTerm.php 
b/repo/includes/Specials/SpecialModifyTerm.php
index 8b57b93..2ce4e47 100644
--- a/repo/includes/Specials/SpecialModifyTerm.php
+++ b/repo/includes/Specials/SpecialModifyTerm.php
@@ -186,7 +186,7 @@
'cssclass' => 'wb-input',
'id' => 'wb-modifyterm-value',
'type' => 'text',
-   'default' => $this->getRequest()->getVal( 'value' ) ? 
$this->getRequest()->getVal( 'value' ) : $this->value,
+   'default' => $this->getRequest()->getVal( 'value' ) ?: 
$this->value,
'nodata' => true
);
 
diff --git a/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php 
b/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
index 476c857..7b489d5 100644
--- a/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
+++ b/repo/includes/Specials/SpecialSetLabelDescriptionAliases.php
@@ -184,7 +184,7 @@
} else {
$intro = $this->msg( 
'wikibase-setlabeldescriptionaliases-intro' )->parse();
$fieldId = 
'wikibase-setlabeldescriptionaliases-language';
-   $languageCode = $this->languageCode ? : 
$this->getLanguage()->getCode();
+   $languageCode = $this->languageCode ?: 
$this->getLanguage()->getCode();
 
$formDescriptor = $this->getFormElements( $entity );
$formDescriptor['language'] = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I614bdb628546661b970dc605f41bc990e6aadad0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
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] operations/puppet[production]: role::pybaltest: fix compilation

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/339660 )

Change subject: role::pybaltest: fix compilation
..


role::pybaltest: fix compilation

Change-Id: Ic5c08c1e00daf5dea5810eac8873b686700e2530
---
M modules/profile/manifests/conftool/master.pp
M modules/role/manifests/pybaltest.pp
2 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/conftool/master.pp 
b/modules/profile/manifests/conftool/master.pp
index 66988d6..42d0d2e 100644
--- a/modules/profile/manifests/conftool/master.pp
+++ b/modules/profile/manifests/conftool/master.pp
@@ -20,7 +20,7 @@
 # We also need to know where the puppet repo is. We cannot require a 
profile
 # here because the puppet classes are not well structured. TODO: fix this
 # and transform the git dir into a parameter
-require ::puppetmaster::gitclone
+require ::puppetmaster::base_repo
 
 file { '/etc/conftool/data':
 ensure => link,
diff --git a/modules/role/manifests/pybaltest.pp 
b/modules/role/manifests/pybaltest.pp
index f907e88..67a5d1e 100644
--- a/modules/role/manifests/pybaltest.pp
+++ b/modules/role/manifests/pybaltest.pp
@@ -19,5 +19,11 @@
 }
 
 # Install conftool-master for conftool testing
+class  { '::puppetmaster::base_repo':
+gitdir   => '/var/lib/git',
+gitowner => 'root',
+}
+
+
 include ::profile::conftool::master
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...discernatron[master]: Include reliability with all scores json export

[EBernhardson (Code Review)]

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

Change subject: Include reliability with all scores json export
..

Include reliability with all scores json export

Change-Id: I03c155ce9cb74529f00890c24861e16f2cc984a5
---
M src/RelevanceScoring/Repository/ScoresRepository.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/discernatron 
refs/changes/65/339665/1

diff --git a/src/RelevanceScoring/Repository/ScoresRepository.php 
b/src/RelevanceScoring/Repository/ScoresRepository.php
index 7200b97..07c8801 100644
--- a/src/RelevanceScoring/Repository/ScoresRepository.php
+++ b/src/RelevanceScoring/Repository/ScoresRepository.php
@@ -114,7 +114,8 @@
 SELECT r.title,
   AVG(s.score) as score,
u_s.score as user_score,
-   SUM(IF(s.score IS NULL, 0, 1)) as num_scores
+   SUM(IF(s.score IS NULL, 0, 1)) as num_scores,
+s.reliable
   FROM ( SELECT r.id, r.title
FROM results r
JOIN results_sources r_s ON r.id = r_s.results_id

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03c155ce9cb74529f00890c24861e16f2cc984a5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/discernatron
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] data-values/value-view[master]: [WIP] [DNM] Made GeoShape configurable

[Aleksey Bekh-Ivanov (WMDE) (Code Review)]

Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339663 )

Change subject: [WIP] [DNM] Made GeoShape configurable
..

[WIP] [DNM] Made GeoShape configurable

TODO make CommonsMediaType also configurable

A step towards making GeoShape view configurable
Bug: T57549

Change-Id: I819892c319d485af777b542292e68dce4f460416
---
M src/experts/GeoShape.js
M src/jquery.valueview.valueview.js
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/data-values/value-view 
refs/changes/63/339663/1

diff --git a/src/experts/GeoShape.js b/src/experts/GeoShape.js
index 3d2a241..09d673a 100644
--- a/src/experts/GeoShape.js
+++ b/src/experts/GeoShape.js
@@ -28,7 +28,7 @@
 
$input.commonssuggester( {
namespace: 'Data',
-   apiUrl: 
'https://commons.wikimedia.org/w/api.php'
+   apiUrl: this._options.commonsApiUrl
} );
 
// Using the inputautoexpand plugin, the position of 
the dropdown needs to be updated
diff --git a/src/jquery.valueview.valueview.js 
b/src/jquery.valueview.valueview.js
index 2c76592..0903442 100644
--- a/src/jquery.valueview.valueview.js
+++ b/src/jquery.valueview.valueview.js
@@ -558,6 +558,7 @@
language: this.options.language,
vocabularyLookupApiUrl: 
this.options.vocabularyLookupApiUrl || null,
contentLanguages: 
this.options.contentLanguages,
+   commonsApiUrl: 
this.options.commonsApiUrl,
messageProvider: 
this.options.messageProvider
}
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I819892c319d485af777b542292e68dce4f460416
Gerrit-PatchSet: 1
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) 

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