[MediaWiki-commits] [Gerrit] Fix date functions for literal arguments - change (wikidata...rdf)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Fix date functions for literal arguments
..

Fix date functions for literal arguments

Bug: T138638
Change-Id: Ie49e52bacf79a08b5bbb60c927c30ac8283faabc
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDateBOp.java
M 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/WikibaseDateUnitTest.java
M gui
3 files changed, 24 insertions(+), 9 deletions(-)


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

diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDateBOp.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDateBOp.java
index 8a5c0b2..994e510 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDateBOp.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/constraints/WikibaseDateBOp.java
@@ -88,16 +88,18 @@
  * @param iv
  * @return Wikibase date object
  */
+@SuppressWarnings("rawtypes")
 private WikibaseDate getWikibaseDate(IV iv) {
-
-return 
WikibaseDate.fromSecondsSinceEpoch(((LiteralExtensionIV)iv).getDelegate().longValue());
-
+if (iv instanceof LiteralExtensionIV) {
+return 
WikibaseDate.fromSecondsSinceEpoch(((LiteralExtensionIV)iv).getDelegate().longValue());
+}
+return 
WikibaseDate.fromString(iv.getValue().stringValue()).cleanWeirdStuff();
 }
 
 /**
  * Get expression value.
  */
-@SuppressWarnings("checkstyle:cyclomaticcomplexity")
+@SuppressWarnings({"rawtypes", "checkstyle:cyclomaticcomplexity"})
 public IV get(final IBindingSet bs) {
 
 final IV left = left().get(bs);
@@ -107,15 +109,14 @@
 throw new SparqlTypeErrorException.UnboundVarException();
 }
 
-if (!(left instanceof LiteralExtensionIV)) {
-return originalOp.get(bs);
-}
-
 if (left.isLiteral()) {
 
 BigdataLiteral bl = (BigdataLiteral) left.getValue();
 if (XSD.DATETIME.equals(bl.getDatatype())) {
-WikibaseDate date = getWikibaseDate(left);
+final WikibaseDate date = getWikibaseDate(left);
+if (date == null) {
+return originalOp.get(bs);
+}
 
 switch (op()) {
 case YEAR:
diff --git 
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/WikibaseDateUnitTest.java
 
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/WikibaseDateUnitTest.java
index 43090e5..9c4b7af 100644
--- 
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/WikibaseDateUnitTest.java
+++ 
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/WikibaseDateUnitTest.java
@@ -31,4 +31,18 @@
 assertThat(result, binds("date", new LiteralImpl("731.0", 
XMLSchema.DOUBLE)));
 }
 
+@Test
+public void dateFunctionQuery() throws QueryEvaluationException {
+TupleQueryResult results = query("SELECT * WHERE {BIND ( 
year(\"-01-01T00:00:00\"^^xsd:dateTime) AS ?date)}");
+BindingSet result = results.next();
+assertThat(result, binds("date", new LiteralImpl("0", 
XMLSchema.INTEGER)));
+}
+
+@Test
+public void dateFunctionQueryYear() throws QueryEvaluationException {
+TupleQueryResult results = query("SELECT * WHERE {BIND ( 
year(\"-1379800-01-01T00:00:00\"^^xsd:dateTime) AS ?date)}");
+BindingSet result = results.next();
+assertThat(result, binds("date", new LiteralImpl("-1379800", 
XMLSchema.INTEGER)));
+}
+
 }
diff --git a/gui b/gui
index 424d8bf..d0f2112 16
--- a/gui
+++ b/gui
-Subproject commit 424d8bf3e3fb6ed9865623ed91f42d94c0050568
+Subproject commit d0f21126475cffe8e93d4f4473e6820e97737f0e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie49e52bacf79a08b5bbb60c927c30ac8283faabc
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] Hygiene: Separate tagline from heading - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Separate tagline from heading
..

Hygiene: Separate tagline from heading

The tagline should be part of the postheadinghtml - as it is not a heading
but appears after the heading.

This caused me lots of confusion when debugging the issue so I'm keen to
correct this mental model.

Change-Id: I4763007d91ae49e7b5098c2ac5d5e3a6bab80011
---
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaBeta.php
2 files changed, 32 insertions(+), 27 deletions(-)


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

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3c6ed58..4776b05 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -605,44 +605,47 @@
];
return $link;
}
-
+   /**
+* Returns the HTML representing the tagline
+* @returns {String} html for tagline
+*/
+   protected function getTaglineHtml() {
+   $tagline = false;
+   if ( $this->isUserPage ) {
+   $fromDate = $this->pageUser->getRegistration();
+   if ( is_string( $fromDate ) ) {
+   $fromDateTs = new MWTimestamp( wfTimestamp( 
TS_UNIX, $fromDate ) );
+   $tagline = $this->msg( 
'mobile-frontend-user-page-member-since',
+   $fromDateTs->format( 'F, Y' ) );
+   }
+   } else {
+   $title = $this->getTitle();
+   if ( $title ) {
+   if ( !$title->isMainPage() && 
$title->inNamespace( NS_MAIN ) ) {
+   $vars = $this->getSkinConfigVariables();
+   $tagline = $vars['wgMFDescription'];
+   }
+   }
+   }
+   return $tagline ?
+   Html::element( 'div', [ 'class' => 'tagline' ], 
$tagline ) : '';
+   }
/**
 * Returns the HTML representing the heading.
 * @returns {String} html for header
 */
protected function getHeadingHtml() {
-   $html = '';
+   $heading = '';
if ( $this->isUserPage ) {
// The heading is just the username without namespace
-   $html = Html::rawElement( 'h1', [ 'id' => 'section_0' ],
-   $this->pageUser->getName() );
-   $fromDate = $this->pageUser->getRegistration();
-   if ( is_string( $fromDate ) ) {
-   $fromDateTs = new MWTimestamp( wfTimestamp( 
TS_UNIX, $fromDate ) );
-   $html .= Html::element( 'div', [ 'class' => 
'tagline', ],
-   $this->msg( 
'mobile-frontend-user-page-member-since',
-   $fromDateTs->format( 'F, Y' ) )
-   );
-   }
+   $heading = $this->pageUser->getName();
} else {
-   $title = $this->getTitle();
$pageTitle = $this->getOutput()->getPageTitle();
-   if ( $title && $pageTitle ) {
-   $html = Html::rawElement( 'h1', [
-   'id' => 'section_0',
-   ], $pageTitle );
-   if ( !$title->isMainPage() && 
$title->inNamespace( NS_MAIN ) ) {
-   $vars = $this->getSkinConfigVariables();
-   $description = $vars['wgMFDescription'];
-   if ( $description ) {
-   $html .= Html::element( 'div', [
-   'class' => 
'tagline',
-   ], $description );
-   }
-   }
+   if ( $pageTitle ) {
+   $heading = $pageTitle;
}
}
-   return $html;
+   return Html::rawElement( 'h1', [ 'id' => 'section_0' ], 
$heading );
}
/**
 * Create and prepare header and footer content
@@ -670,6 +673,7 @@
];
$templateParser = new TemplateParser( __DIR__ );
$tpl->set( 'postheadinghtml',
+   $this->getTaglineHtml() .
  

[MediaWiki-commits] [Gerrit] Make visualeditor-cite-tool-definition.json always exist, re... - change (mediawiki...Cite)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Make visualeditor-cite-tool-definition.json always exist, 
rename to cite-tool-definition.json
..

Make visualeditor-cite-tool-definition.json always exist, rename to 
cite-tool-definition.json

Bug: T138573
Change-Id: I454380c392feea55483d00d4b7eec45bce04ff53
---
M CiteDataModule.php
M modules/ve-cite/i18n/en.json
M modules/ve-cite/i18n/qqq.json
M modules/ve-cite/ve.ui.MWReference.init.js
4 files changed, 19 insertions(+), 1 deletion(-)


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

diff --git a/CiteDataModule.php b/CiteDataModule.php
index e2468a0..0e2d9a3 100644
--- a/CiteDataModule.php
+++ b/CiteDataModule.php
@@ -21,11 +21,19 @@
 
public function getScript( ResourceLoaderContext $context ) {
$citationDefinition = json_decode(
-   $context->msg( 'visualeditor-cite-tool-definition.json' 
)
+   $context->msg( 'cite-tool-definition.json' )
->inContentLanguage()
->plain()
);
 
+   if ( $citationDefinition === null ) {
+   $citationDefinition = json_decode(
+   $context->msg( 
'visualeditor-cite-tool-definition.json' )
+   ->inContentLanguage()
+   ->plain()
+   );
+   }
+
$citationTools = [];
if ( is_array( $citationDefinition ) ) {
foreach ( $citationDefinition as $tool ) {
diff --git a/modules/ve-cite/i18n/en.json b/modules/ve-cite/i18n/en.json
index 263c2f0..a965889 100644
--- a/modules/ve-cite/i18n/en.json
+++ b/modules/ve-cite/i18n/en.json
@@ -16,10 +16,12 @@
"Amir E. Aharoni"
]
},
+   "visualeditor-cite-tool-definition.json": "null",
"visualeditor-cite-tool-name-book": "Book",
"visualeditor-cite-tool-name-journal": "Journal",
"visualeditor-cite-tool-name-news": "News",
"visualeditor-cite-tool-name-web": "Website",
+   "cite-tool-definition.json": "null",
"cite-ve-dialog-reference-editing-reused": "This reference is used $1 
{{PLURAL:$1|times}} on this page.",
"cite-ve-dialog-reference-options-group-label": "Use this group",
"cite-ve-dialog-reference-options-group-placeholder": "General 
references",
diff --git a/modules/ve-cite/i18n/qqq.json b/modules/ve-cite/i18n/qqq.json
index 2abccd3..003eece 100644
--- a/modules/ve-cite/i18n/qqq.json
+++ b/modules/ve-cite/i18n/qqq.json
@@ -26,10 +26,12 @@
"Umherirrender"
]
},
+   "visualeditor-cite-tool-definition.json": "Legacy name for 
cite-tool-definition.json message.",
"visualeditor-cite-tool-name-book": "Title of tool that inserts a 
citation for a book.\n{{Identical|Book}}",
"visualeditor-cite-tool-name-journal": "Title of tool that inserts a 
citation for a journal\n{{Identical|Journal}}",
"visualeditor-cite-tool-name-news": "Title of tool that inserts a 
citation for a news.\n{{Identical|News}}",
"visualeditor-cite-tool-name-web": "Title of tool that inserts a 
citation for a website.\n{{Identical|Website}}",
+   "cite-tool-definition.json": "JSON list of objects detailing each 
citation with name (key referring to a visualeditor-cite-tool-name-x message), 
icon ('ref-cite-book', 'ref-cite-journal', 'ref-cite-news', 'ref-cite-web'), 
and template name",
"cite-ve-dialog-reference-editing-reused": "Text shown at the top of 
the reference dialog when editing a reference that is used multiple 
times.\n\nParameters:\n* $1 - Number of times used. This is always greater than 
1.",
"cite-ve-dialog-reference-options-group-label": "Label for the 
reference group input",
"cite-ve-dialog-reference-options-group-placeholder": "Placeholder for 
the reference group input",
diff --git a/modules/ve-cite/ve.ui.MWReference.init.js 
b/modules/ve-cite/ve.ui.MWReference.init.js
index 46c0cd5..85b113e 100644
--- a/modules/ve-cite/ve.ui.MWReference.init.js
+++ b/modules/ve-cite/ve.ui.MWReference.init.js
@@ -77,6 +77,12 @@
// Must use mw.message to avoid JSON being parsed as 
Wikitext
tools = JSON.parse( mw.message( 
'visualeditor-cite-tool-definition.json' ).plain() );
} catch ( e ) {}
+   if ( !tools ) {
+   try {
+   // Must use mw.message to avoid JSON being 
parsed as Wikitext
+   tools = JSON.parse( mw.message( 
'cite-tool-definition.json' ).plain() );
+   } catch ( e ) {}
+   }
 

[MediaWiki-commits] [Gerrit] Make citoid-template-type-map.json message always exist - change (mediawiki...Citoid)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Make citoid-template-type-map.json message always exist
..

Make citoid-template-type-map.json message always exist

Bug: T138574
Change-Id: I75489d8cf3ab2b8d088f24323e806ab29930caf3
---
M i18n/en.json
M i18n/qqq.json
M modules/ve.ui.Citoid.init.js
3 files changed, 11 insertions(+), 8 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index c8bf905..1fa9b4c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -19,5 +19,6 @@
"citoid-desc": "Provides access points between the citoid service and 
MediaWiki",
"citoid-referencecontextitem-convert-button": "Convert",
"citoid-referencecontextitem-convert-message": "This reference consists 
of just an external link. You can use the 
\"{{int:citoid-referencecontextitem-convert-button}}\" button below to generate 
a properly formatted reference.",
+   "citoid-template-type-map.json": "null",
"citoid-unknown-error": "An unknown error has occured that prevented us 
from creating a citation. Please try again later."
 }
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2b8d75e..635b271 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -28,5 +28,6 @@
"citoid-desc": 
"{{desc|name=Citoid|url=https://www.mediawiki.org/wiki/Citoid}};,
"citoid-referencecontextitem-convert-button": "Label for the button to 
convert a plain reference to a Citoid reference.\n{{Identical|Convert}}",
"citoid-referencecontextitem-convert-message": "Message explaining the 
functionality of the button to convert a plain reference to a Citoid 
reference.",
+   "citoid-template-type-map.json": "JSON object containing mapping of 
different document types to the wiki's template names. Each template must have 
TemplateData defined to map Citoid's fields to the template's fields. Document 
types: book, bookSection, journalArticle, magazineArticle, newspaperArticle, 
thesis, letter, manuscript, interview, film, artwork, webpage, report, bill, 
hearing, patent, statute, email, map, blogPost, instantMessage, forumPost, 
audioRecording, presentation, videoRecording, tvBroadcast, radioBroadcast, 
podcast, computerProgram, conferencePaper, document, encyclopediaArticle, 
dictionaryEntry",
"citoid-unknown-error": "Error message indicating that the service to 
create citations has returned an error or is temporarily malfunctioning, asking 
the user to try again later."
 }
diff --git a/modules/ve.ui.Citoid.init.js b/modules/ve.ui.Citoid.init.js
index 6c1d2db..881ec74 100644
--- a/modules/ve.ui.Citoid.init.js
+++ b/modules/ve.ui.Citoid.init.js
@@ -1,18 +1,19 @@
 ( function () {
-   var i, j, jLen, toolGroups, citeIndex, target;
+   var i, j, jLen, toolGroups, citeIndex, target, map;
 
// Don't create tool unless the configuration message is present
try {
-   JSON.parse( mw.message( 'citoid-template-type-map.json' 
).plain() );
+   map = JSON.parse( mw.message( 'citoid-template-type-map.json' 
).plain() );
} catch ( e ) {
// Temporary hack for T93800
try {
-   JSON.parse( mw.message( 
'citoid-template-type-map-backup.json' ).plain() );
-   } catch ( e2 ) {
-   // Unregister the tool
-   ve.ui.toolFactory.unregister( 
ve.ui.CiteFromIdInspectorTool );
-   return;
-   }
+   map = JSON.parse( mw.message( 
'citoid-template-type-map-backup.json' ).plain() );
+   } catch ( e2 ) {}
+   }
+   if ( !map ) {
+   // Unregister the tool
+   ve.ui.toolFactory.unregister( ve.ui.CiteFromIdInspectorTool );
+   return;
}
 
// HACK: Find the position of the current citation toolbar definition

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

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

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

[MediaWiki-commits] [Gerrit] Add main page card, interactivity for both static cards - change (apps...wikipedia)

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review.

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

Change subject: Add main page card, interactivity for both static cards
..

Add main page card, interactivity for both static cards

Bug: T132339
Bug: T138593
Change-Id: Ic5e5a011b23f66aa2259d6daa5dcd957238ed92b
---
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
A app/src/main/java/org/wikipedia/feed/mainpage/MainPageCard.java
A app/src/main/java/org/wikipedia/feed/mainpage/MainPageCardView.java
A app/src/main/java/org/wikipedia/feed/mainpage/MainPageClient.java
M app/src/main/java/org/wikipedia/feed/model/CardPageItem.java
M app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
A app/src/main/java/org/wikipedia/feed/random/RandomSummaryService.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
M app/src/main/java/org/wikipedia/feed/view/StaticCardView.java
M app/src/main/java/org/wikipedia/util/DateUtil.java
A app/src/main/res/drawable-hdpi/icon_random_48_x_48_dprandom_icon.png
A app/src/main/res/drawable-hdpi/icon_today_48_x_48_dp.png
A app/src/main/res/drawable-mdpi/icon_random_48_x_48_dprandom_icon.png
A app/src/main/res/drawable-mdpi/icon_today_48_x_48_dp.png
A app/src/main/res/drawable-xhdpi/icon_random_48_x_48_dprandom_icon.png
A app/src/main/res/drawable-xhdpi/icon_today_48_x_48_dp.png
A app/src/main/res/drawable-xxhdpi/icon_random_48_x_48_dprandom_icon.png
A app/src/main/res/drawable-xxhdpi/icon_today_48_x_48_dp.png
A app/src/main/res/drawable-xxxhdpi/icon_random_48_x_48_dprandom_icon.png
A app/src/main/res/drawable-xxxhdpi/icon_today_48_x_48_dp.png
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
22 files changed, 215 insertions(+), 6 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 1b477c7..4ab577c 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -7,6 +7,7 @@
 import org.wikipedia.feed.becauseyouread.BecauseYouReadClient;
 import org.wikipedia.feed.continuereading.ContinueReadingClient;
 import org.wikipedia.feed.demo.IntegerListClient;
+import org.wikipedia.feed.mainpage.MainPageClient;
 import org.wikipedia.feed.mostread.MostReadClient;
 import org.wikipedia.feed.random.RandomClient;
 import org.wikipedia.feed.searchbar.SearchClient;
@@ -31,6 +32,7 @@
 addPendingClient(new IntegerListClient());
 addPendingClient(new MostReadClient());
 addPendingClient(new RandomClient());
+addPendingClient(new MainPageClient());
 
 }
 
diff --git a/app/src/main/java/org/wikipedia/feed/mainpage/MainPageCard.java 
b/app/src/main/java/org/wikipedia/feed/mainpage/MainPageCard.java
new file mode 100644
index 000..d312461
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/mainpage/MainPageCard.java
@@ -0,0 +1,22 @@
+package org.wikipedia.feed.mainpage;
+
+import android.support.annotation.NonNull;
+
+import org.wikipedia.Site;
+import org.wikipedia.feed.model.Card;
+
+public class MainPageCard extends Card {
+@NonNull private Site site;
+
+public MainPageCard(@NonNull Site site) {
+this.site = site;
+}
+
+@NonNull @Override public String title() {
+return "";
+}
+
+public Site site() {
+return site;
+}
+}
diff --git 
a/app/src/main/java/org/wikipedia/feed/mainpage/MainPageCardView.java 
b/app/src/main/java/org/wikipedia/feed/mainpage/MainPageCardView.java
new file mode 100644
index 000..96e2fa7
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/mainpage/MainPageCardView.java
@@ -0,0 +1,48 @@
+package org.wikipedia.feed.mainpage;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import org.wikipedia.R;
+import org.wikipedia.WikipediaApp;
+import org.wikipedia.feed.FeedViewCallback;
+import org.wikipedia.feed.view.StaticCardView;
+import org.wikipedia.page.PageTitle;
+import org.wikipedia.staticdata.MainPageNameData;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+public class MainPageCardView extends StaticCardView {
+@NonNull private WikipediaApp app = WikipediaApp.getInstance();
+@Nullable private FeedViewCallback callback;
+
+public MainPageCardView(@NonNull Context context) {
+super(context);
+}
+
+public void set(@NonNull final MainPageCard card) {
+setTitle(String.format(getString(R.string.view_main_page_card_title),
+
WikipediaApp.getInstance().getAppLanguageLocalizedName(card.site().languageCode(;
+
setSubtitle(String.format(getString(R.string.view_main_page_card_subtitle),
+

[MediaWiki-commits] [Gerrit] Check if a page is a special page without creating a new Title - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Check if a page is a special page without creating a new Title
..


Check if a page is a special page without creating a new Title

Follow-up on I65051d198b0916b1968d1a8d2f5a6583ad983461.

Bug: T136617
Change-Id: I069dfb92b513e086a5816f6c8c0d02c19600e339
---
M includes/MobileFrontend.hooks.php
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 05e9c63..8878ca8 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -819,10 +819,7 @@
'media' => 'only screen and (max-width: 
' . $lessVars['deviceWidthTablet'] . ')',
'href' => $context->getMobileUrl( 
$desktopUrl ),
];
-   } elseif (
-   !Title::makeTitleSafe( $title->getNamespace(), 
strtok( $title->getText(), '/' ) )
-   ->equals( SpecialPage::getTitleFor( 
'MobileCite' ) )
-   ) {
+   } elseif ( !$title->isSpecial( 'MobileCite' ) ) {
// Add canonical link to mobile pages (except 
for Special:MobileCite),
// instead of noindex - bug T91183.
$link = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I069dfb92b513e086a5816f6c8c0d02c19600e339
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Align Hovercards' Less to Coding Standards - change (mediawiki...Popups)

[jenkins-bot (Code Review)]

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

Change subject: Align Hovercards' Less to Coding Standards
..


Align Hovercards' Less to Coding Standards

Aligning Hovercards' Less to Coding Standards and also variablize
`linkpreview-title` font-family.

Change-Id: I11f2d71ce50dcd0fe47f3c5c528779e29a81cbc6
---
M resources/ext.popups.renderer/LinkPreview.less
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/resources/ext.popups.renderer/LinkPreview.less 
b/resources/ext.popups.renderer/LinkPreview.less
index 44f6677..4dd2e3b 100644
--- a/resources/ext.popups.renderer/LinkPreview.less
+++ b/resources/ext.popups.renderer/LinkPreview.less
@@ -1,10 +1,10 @@
 @import "minerva.variables";
 
 .drawer.linkpreview {
+   background-color: #fff;
position: fixed;
-   background-color: white;
-   text-align: left;
padding: 0 15px 20px;
+   text-align: left;
 
&.loading {
padding: 10px;
@@ -12,18 +12,18 @@
 }
 
 .linkpreview-overlay {
+   background-color: rgba( 0, 0, 0, 0.1 );
+   background-attachment: fixed;
position: fixed;
top: 0;
left: 0;
height: 100%;
width: 100%;
z-index: @z-indexOverlay;
-   background-color: rgba(0,0,0,0.1);
-   background-attachment: fixed;
 }
 
 .linkpreview-title {
-   font-family: Georgia;
+   font-family: @fontFamilyHeading;
font-size: 22px;
margin-top: 20px;
line-height: 1;
@@ -44,7 +44,7 @@
}
 }
 
-@media all and (min-width: @deviceWidthTablet) {
+@media all and ( min-width: @deviceWidthTablet ) {
.drawer.linkpreview {
padding-left: 30px;
padding-right: 30px;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11f2d71ce50dcd0fe47f3c5c528779e29a81cbc6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jhobs 
Gerrit-Reviewer: Nirzar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] 'Random' feed card layout and view classes - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: 'Random' feed card layout and view classes
..


'Random' feed card layout and view classes

Adds a random card to the feed.  Based on 'static card' layouts and
view classes that can be also be used for the main page card.

Bug: T132339
Change-Id: I0d838cf28f14a3f1619cfc6e9db6e187d7019b00
---
A app/src/main/java/org/wikipedia/feed/DummyClient.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
A app/src/main/java/org/wikipedia/feed/random/RandomCard.java
A app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
A app/src/main/java/org/wikipedia/feed/random/RandomClient.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
A app/src/main/java/org/wikipedia/feed/view/StaticCardView.java
A app/src/main/res/layout/view_static_card.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/strings_no_translate.xml
11 files changed, 195 insertions(+), 0 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/feed/DummyClient.java 
b/app/src/main/java/org/wikipedia/feed/DummyClient.java
new file mode 100644
index 000..b13846f
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/DummyClient.java
@@ -0,0 +1,25 @@
+package org.wikipedia.feed;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.wikipedia.Site;
+import org.wikipedia.feed.model.Card;
+
+import java.util.Collections;
+
+/* A dummy client for providing static cards (main page, random) to the 
FeedCoordinator. */
+public abstract class DummyClient implements FeedClient {
+
+@Override
+public void request(@NonNull Context context, @NonNull Site site, int age,
+@NonNull final FeedClient.Callback cb) {
+cb.success(Collections.singletonList(getNewCard(site)));
+}
+
+@Override
+public void cancel() {
+}
+
+public abstract T getNewCard(Site site);
+}
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 2f0f7aa..1b477c7 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -8,6 +8,7 @@
 import org.wikipedia.feed.continuereading.ContinueReadingClient;
 import org.wikipedia.feed.demo.IntegerListClient;
 import org.wikipedia.feed.mostread.MostReadClient;
+import org.wikipedia.feed.random.RandomClient;
 import org.wikipedia.feed.searchbar.SearchClient;
 
 public class FeedCoordinator extends FeedCoordinatorBase {
@@ -29,6 +30,7 @@
 addPendingClient(new AggregatedFeedContentClient());
 addPendingClient(new IntegerListClient());
 addPendingClient(new MostReadClient());
+addPendingClient(new RandomClient());
 
 }
 
diff --git a/app/src/main/java/org/wikipedia/feed/random/RandomCard.java 
b/app/src/main/java/org/wikipedia/feed/random/RandomCard.java
new file mode 100644
index 000..0c7d4a9
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/random/RandomCard.java
@@ -0,0 +1,24 @@
+package org.wikipedia.feed.random;
+
+import android.support.annotation.NonNull;
+
+import org.wikipedia.Site;
+import org.wikipedia.feed.model.Card;
+
+public class RandomCard extends Card {
+@NonNull private Site site;
+
+public RandomCard(@NonNull Site site) {
+this.site = site;
+}
+
+@Override
+@NonNull
+public String title() {
+return "";
+}
+
+public Site site() {
+return site;
+}
+}
diff --git a/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java 
b/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
new file mode 100644
index 000..389c322
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
@@ -0,0 +1,25 @@
+package org.wikipedia.feed.random;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+
+import org.wikipedia.R;
+import org.wikipedia.WikipediaApp;
+import org.wikipedia.feed.view.StaticCardView;
+
+public class RandomCardView extends StaticCardView {
+public RandomCardView(@NonNull Context context) {
+super(context);
+}
+
+public void set(@NonNull RandomCard card) {
+setTitle(getString(R.string.view_random_card_title));
+
setSubtitle(String.format(getString(R.string.view_random_card_subtitle),
+
WikipediaApp.getInstance().getAppLanguageLocalizedName(card.site().languageCode(;
+}
+
+private String getString(@StringRes int id) {
+return getResources().getString(id);
+}
+}
diff --git a/app/src/main/java/org/wikipedia/feed/random/RandomClient.java 

[MediaWiki-commits] [Gerrit] Add overflow menu to card list items. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Add overflow menu to card list items.
..


Add overflow menu to card list items.

- Provides "save" and "share" options for any item in a card list.

Change-Id: I0f5c55363bd3e575858bc5107728181985b01c25
---
M app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
M app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
M app/src/main/res/layout/view_list_card_item.xml
A app/src/main/res/menu/menu_feed_card_item.xml
4 files changed, 65 insertions(+), 2 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java 
b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
index 6fc7a59..0e23ae3 100644
--- a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
@@ -4,7 +4,9 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.widget.RelativeLayout;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -14,10 +16,11 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class ListCardItemView extends RelativeLayout {
+public class ListCardItemView extends FrameLayout {
 @BindView(R.id.view_list_card_item_image) SimpleDraweeView imageView;
 @BindView(R.id.view_list_card_item_title) TextView titleView;
 @BindView(R.id.view_list_card_item_subtitle) TextView subtitleView;
+@BindView(R.id.view_list_card_item_menu) View menuView;
 
 public ListCardItemView(Context context) {
 super(context);
@@ -25,6 +28,8 @@
 inflate(getContext(), R.layout.view_list_card_item, this);
 setClickable(true);
 ButterKnife.bind(this);
+setLayoutParams(new 
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+ViewGroup.LayoutParams.WRAP_CONTENT));
 }
 
 @NonNull public ListCardItemView setImage(@Nullable Uri uri) {
diff --git 
a/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java 
b/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
index ff1e36f..ed8682e 100644
--- a/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
@@ -4,9 +4,12 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.PopupMenu;
 import android.text.TextUtils;
+import android.view.MenuItem;
 import android.view.View;
 
+import org.wikipedia.R;
 import org.wikipedia.feed.FeedViewCallback;
 import org.wikipedia.page.PageTitle;
 
@@ -24,6 +27,12 @@
 }
 }
 });
+menuView.setOnClickListener(new OnClickListener() {
+@Override
+public void onClick(View v) {
+showOverflowMenu(v);
+}
+});
 }
 
 @NonNull public PageTitleListCardItemView setCallback(@Nullable 
FeedViewCallback callback) {
@@ -38,4 +47,32 @@
 imageView.setImageURI(TextUtils.isEmpty(title.getThumbUrl()) ? null : 
Uri.parse(title.getThumbUrl()));
 return this;
 }
+
+private void showOverflowMenu(View anchorView) {
+PopupMenu menu = new PopupMenu(getContext(), anchorView);
+menu.getMenuInflater().inflate(R.menu.menu_feed_card_item, 
menu.getMenu());
+menu.setOnMenuItemClickListener(new CardMenuClickListener());
+menu.show();
+}
+
+private class CardMenuClickListener implements 
PopupMenu.OnMenuItemClickListener {
+@Override
+public boolean onMenuItemClick(MenuItem item) {
+switch (item.getItemId()) {
+case R.id.menu_feed_card_item_save:
+if (callback != null && title != null) {
+callback.onAddPageToList(title);
+}
+break;
+case R.id.menu_feed_card_item_share:
+if (callback != null && title != null) {
+callback.onSharePage(title);
+}
+break;
+default:
+break;
+}
+return false;
+}
+}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_list_card_item.xml 
b/app/src/main/res/layout/view_list_card_item.xml
index 6d80844..afe4ccc 100644
--- a/app/src/main/res/layout/view_list_card_item.xml
+++ b/app/src/main/res/layout/view_list_card_item.xml
@@ -1,5 +1,6 @@
 http://schemas.android.com/apk/res/android;
+

[MediaWiki-commits] [Gerrit] Add interactivity to Trending Articles card. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Add interactivity to Trending Articles card.
..


Add interactivity to Trending Articles card.

- Make items clickable.
- Hide the footer for now, since it's not yet clear what happens when it's
  clicked.

Change-Id: I453a9274c2354bb5231d0c3b32d13f08e5a12e3e
---
M 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadClient.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadItemCard.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
M app/src/main/java/org/wikipedia/feed/view/PageTitleListCardView.java
M app/src/test/java/org/wikipedia/feed/mostread/MostReadClientTest.java
8 files changed, 65 insertions(+), 32 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
index c0a2aca..95ac568 100644
--- 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -15,20 +15,14 @@
 import java.util.List;
 
 public class BecauseYouReadCardView extends 
PageTitleListCardView {
-@Nullable private FeedViewCallback callback;
 
 public BecauseYouReadCardView(Context context) {
 super(context);
 }
 
-@NonNull public PageTitleListCardView setCallback(@Nullable 
FeedViewCallback callback) {
-this.callback = callback;
-return this;
-}
-
 public void set(@NonNull final BecauseYouReadCard card) {
 header(card);
-set(new RecyclerAdapter(card.items(), callback));
+set(new RecyclerAdapter(card.items(), getCallback()));
 }
 
 private void header(@NonNull final BecauseYouReadCard card) {
diff --git 
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
index c7075d9..c818d45 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
@@ -2,26 +2,29 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import org.wikipedia.R;
+import org.wikipedia.feed.FeedViewCallback;
 import org.wikipedia.feed.demo.IntegerListCard;
 import org.wikipedia.feed.view.CardFooterView;
 import org.wikipedia.feed.view.CardHeaderView;
-import org.wikipedia.feed.view.ListCardItemView;
-import org.wikipedia.feed.view.ListCardView;
+import org.wikipedia.feed.view.PageTitleListCardItemView;
+import org.wikipedia.feed.view.PageTitleListCardView;
 import org.wikipedia.views.DefaultViewHolder;
 
 import java.util.List;
 
-public class MostReadCardView extends ListCardView {
+public class MostReadCardView extends PageTitleListCardView {
 public MostReadCardView(Context context) {
 super(context);
 }
 
 public void set(@NonNull MostReadListCard card) {
 header(card);
-footer(card);
-set(new RecyclerAdapter(card.items()));
+//TODO: add footer when ready.
+//footer(card);
+set(new RecyclerAdapter(card.items(), getCallback()));
 }
 
 private void header(@NonNull MostReadListCard card) {
@@ -40,17 +43,19 @@
 footer(footer);
 }
 
-private static class RecyclerAdapter extends 
ListCardView.RecyclerAdapter {
-RecyclerAdapter(@NonNull List items) {
+private static class RecyclerAdapter extends 
PageTitleListCardView.RecyclerAdapter {
+@Nullable private FeedViewCallback callback;
+
+RecyclerAdapter(@NonNull List items, @Nullable 
FeedViewCallback callback) {
 super(items);
+this.callback = callback;
 }
 
-@Override public void 
onBindViewHolder(DefaultViewHolder holder,
-   int position) {
+@Override
+public void 
onBindViewHolder(DefaultViewHolder holder, int 
position) {
 MostReadItemCard card = item(position);
-holder.getView().setTitle(card.title());
-holder.getView().setSubtitle(card.subtitle());
-holder.getView().setImage(card.image());
+holder.getView().setPageTitle(card.pageTitle());
+holder.getView().setCallback(callback);
 }
 }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/feed/mostread/MostReadClient.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadClient.java
index 

[MediaWiki-commits] [Gerrit] Restore load position override for 'site.styles' module - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Restore load position override for 'site.styles' module
..


Restore load position override for 'site.styles' module

Follows-up 93ed259 which changed the module to be 'site.styles', but
the override was still looking for a module called 'site' (which isn't
listed in that queue anymore).

Bug: T138586
Change-Id: I3052a2e378f804d0d4d117f8ed446fe9b4b59f99
---
M includes/OutputPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  Jforrester: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 53c70d8..5c7203d 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3694,7 +3694,7 @@
if ( !$module ) {
continue;
}
-   if ( $name === 'site' ) {
+   if ( $name === 'site.styles' ) {
// HACK: The site module shouldn't be 
fragmented with a cache group and
// http request. But in order to ensure its 
styles are separated and after the
// ResourceLoaderDynamicStyles marker, pretend 
it is in a group called 'site'.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3052a2e378f804d0d4d117f8ed446fe9b4b59f99
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add interactivity to Continue Reading card. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Add interactivity to Continue Reading card.
..


Add interactivity to Continue Reading card.

Change-Id: I29067aea688e875e3b999089faec50bf20ebb03a
---
M app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
M 
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
M app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
M app/src/main/res/layout/view_card_header_large.xml
5 files changed, 41 insertions(+), 5 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
index b9a765e..f7413c0 100644
--- 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
+++ 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
@@ -7,6 +7,7 @@
 
 import org.wikipedia.feed.model.Card;
 import org.wikipedia.history.HistoryEntry;
+import org.wikipedia.page.PageTitle;
 
 import java.util.concurrent.TimeUnit;
 
@@ -29,6 +30,10 @@
 return TextUtils.isEmpty(entry.getTitle().getThumbUrl()) ? null : 
Uri.parse(entry.getTitle().getThumbUrl());
 }
 
+@NonNull public PageTitle pageTitle() {
+return entry.getTitle();
+}
+
 /** @return The last visit age in days. */
 public long daysOld() {
 long now = System.currentTimeMillis();
diff --git 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
index 46b6df9..a2bb24e 100644
--- 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
@@ -2,19 +2,31 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.PluralsRes;
+import android.view.View;
 
 import org.wikipedia.R;
+import org.wikipedia.feed.FeedViewCallback;
 import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.CardLargeHeaderView;
 import org.wikipedia.feed.view.ListCardView;
 
 public class ContinueReadingCardView extends ListCardView 
{
+private ContinueReadingCard card;
+@Nullable private FeedViewCallback callback;
+
 public ContinueReadingCardView(Context context) {
 super(context);
 }
 
+@NonNull public ContinueReadingCardView setCallback(@Nullable 
FeedViewCallback callback) {
+this.callback = callback;
+return this;
+}
+
 public void set(@NonNull ContinueReadingCard card) {
+this.card = card;
 header(card);
 }
 
@@ -29,7 +41,17 @@
 header(header);
 CardLargeHeaderView largeHeader = new CardLargeHeaderView(getContext())
 .setPageTitle(card.title())
-.setImage(card.image());
+.setImage(card.image())
+.onClickListener(new CardClickListener());
 largeHeader(largeHeader);
 }
+
+private class CardClickListener implements OnClickListener {
+@Override
+public void onClick(View v) {
+if (callback != null) {
+callback.onSelectPage(card.pageTitle());
+}
+}
+}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java 
b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
index e0a85bc..b313c02 100644
--- a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
@@ -21,6 +21,7 @@
 
 public class CardLargeHeaderView extends LinearLayout {
 @BindView(R.id.view_card_header_large_background) View backgroundView;
+@BindView(R.id.view_card_header_large_text_container) View 
textContainerView;
 @BindView(R.id.view_card_header_large_image) FaceAndColorDetectImageView 
imageView;
 @BindView(R.id.view_card_header_large_page_title) TextView pageTitleView;
 @BindView(R.id.view_card_header_large_subtitle) GoneIfEmptyTextView 
subtitleView;
@@ -52,6 +53,11 @@
 return this;
 }
 
+@NonNull public CardLargeHeaderView onClickListener(@Nullable 
OnClickListener listener) {
+textContainerView.setOnClickListener(listener);
+return this;
+}
+
 private void resetBackgroundColor() {
 
backgroundView.setBackgroundColor(getResources().getColor(R.color.gray_background));
 }
diff --git a/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java 

[MediaWiki-commits] [Gerrit] Changed array instances from "array()" to "[..]" - change (mediawiki/core)

[Krishnakeshav (Code Review)]

Krishnakeshav has uploaded a new change for review.

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

Change subject: Changed array instances from "array()" to "[..]"
..

Changed array instances from "array()" to "[..]"

Change-Id: I3184b86fb751724a624f568b6f45599f9340fad4
---
M includes/DefaultSettings.php
1 file changed, 125 insertions(+), 129 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/295969/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 39e22a0..5e771fb 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -284,10 +284,10 @@
  *
  * @par Example:
  * @code
- * $wgLogoHD = array(
+ * $wgLogoHD = [
  * "1.5x" => "path/to/1.5x_version.png",
  * "2x" => "path/to/2x_version.png"
- * );
+ * ];
  * @endcode
  *
  * @since 1.25
@@ -532,7 +532,7 @@
  * The string 'local' signifies the default local file repository.
  *
  * Example:
- * $wgForeignUploadTargets = array( 'shared' );
+ * $wgForeignUploadTargets = [ 'shared' ];
  */
 $wgForeignUploadTargets = [ 'local' ];
 
@@ -755,10 +755,10 @@
  *
  * @par Example:
  * @code
- * $wgMaxUploadSize = array(
+ * $wgMaxUploadSize = [
  * '*' => 250 * 1024,
  * 'url' => 500 * 1024,
- * );
+ * ];
  * @endcode
  * Sets the maximum for all uploads to 250 kB except for upload-by-url, which
  * will have a maximum of 500 kB.
@@ -1321,7 +1321,7 @@
 
 /**
  * Additional XML types we can allow via MIME-detection.
- * array = ( 'rootElement' => 'associatedMimeType' )
+ * array = [ 'rootElement' => 'associatedMimeType' ]
  */
 $wgXMLMimeTypes = [
'http://www.w3.org/2000/svg:svg' => 'image/svg+xml',
@@ -1378,7 +1378,7 @@
  * needs in order to be used as the reference for a given thumbnail. For 
example, with the
  * following buckets:
  *
- * $wgThumbnailBuckets = array ( 128, 256, 512 );
+ * $wgThumbnailBuckets = [ 128, 256, 512 ];
  *
  * and a distance of 50:
  *
@@ -1624,14 +1624,14 @@
  * Default to false or fill an array :
  *
  * @code
- * $wgSMTP = array(
+ * $wgSMTP = [
  * 'host' => 'SMTP domain',
  * 'IDHost'   => 'domain for MessageID',
  * 'port' => '25',
  * 'auth' => [true|false],
  * 'username' => [SMTP username],
  * 'password' => [SMTP password],
- * );
+ * ];
  * @endcode
  */
 $wgSMTP = false;
@@ -2068,7 +2068,7 @@
  *
  * Short names of ExternalStore classes may be specified in an array here:
  * @code
- * $wgExternalStores = array("http","file","custom")...
+ * $wgExternalStores = [ "http","file","custom" ]...
  * @endcode
  *
  * CAUTION: Access to database might lead to code execution
@@ -2081,9 +2081,9 @@
  * @par Example:
  * Create a cluster named 'cluster1' containing three servers:
  * @code
- * $wgExternalServers = array(
- * 'cluster1' => array( 'srv28', 'srv29', 'srv30' )
- * );
+ * $wgExternalServers = [
+ * 'cluster1' => [ 'srv28', 'srv29', 'srv30' ]
+ * ];
  * @endcode
  *
  * Used by LBFactorySimple, may be ignored if $wgLBFactoryConf is set to
@@ -2100,7 +2100,7 @@
  *
  * @par Example:
  * @code
- * $wgDefaultExternalStore = array( 'DB://cluster1', 'DB://cluster2' );
+ * $wgDefaultExternalStore = [ 'DB://cluster1', 'DB://cluster2' ];
  * @endcode
  *
  * @var array
@@ -2744,16 +2744,16 @@
  * @par Example configuration to send purges for upload.wikimedia.org to one
  * multicast group and all other purges to another:
  * @code
- * $wgHTCPRouting = array(
- * '|^https?://upload\.wikimedia\.org|' => array(
+ * $wgHTCPRouting = [
+ * '|^https?://upload\.wikimedia\.org|' => [
  * 'host' => '239.128.0.113',
  * 'port' => 4827,
- * ),
- * '' => array(
+ * ],
+ * '' => [
  * 'host' => '239.128.0.112',
  * 'port' => 4827,
- * ),
- * );
+ * ],
+ * ];
  * @endcode
  *
  * You can also pass an array of hosts to send purges too. This is useful when
@@ -2762,16 +2762,16 @@
  *
  * @par Example of sending purges to multiple hosts:
  * @code
- * $wgHTCPRouting = array(
- * '' => array(
+ * $wgHTCPRouting = [
+ * '' => [
  * // Purges to text caches using multicast
- * array( 'host' => '239.128.0.114', 'port' => '4827' ),
+ * [ 'host' => '239.128.0.114', 'port' => '4827' ],
  * // Purges to a hardcoded list of caches
- * array( 'host' => '10.88.66.1', 'port' => '4827' ),
- * array( 'host' => '10.88.66.2', 'port' => '4827' ),
- * array( 'host' => '10.88.66.3', 'port' => '4827' ),
- * ),
- * );
+ * [ 'host' => '10.88.66.1', 'port' => '4827' ],
+ * [ 'host' => '10.88.66.2', 'port' => '4827' ],
+ * [ 'host' => '10.88.66.3', 'port' => '4827' ],
+ * ],
+ * ];
  * @endcode
  *
  * @since 1.22
@@ -3094,7 +3094,7 @@
  * To allow language-specific main page and community
  * portal:
  * @code
- * 

[MediaWiki-commits] [Gerrit] Add interactivity and design tweaks to Featured Article card. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Add interactivity and design tweaks to Featured Article card.
..


Add interactivity and design tweaks to Featured Article card.

- Made the entire text area of the card clickable, and working.
- Made the Save and Share buttons in the footer work.

Change-Id: Iaaff6f7d53fff52bbc247d69d4325c11a311cc95
---
M app/src/main/java/org/wikipedia/MainActivity.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
M 
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/model/BigPictureCard.java
M app/src/main/java/org/wikipedia/feed/view/BigPictureCardView.java
M app/src/main/java/org/wikipedia/feed/view/FeaturedCardFooterView.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
D app/src/main/res/drawable/ic_bookmark_gray_24dp.xml
D app/src/main/res/drawable/ic_share_gray_24dp.xml
M app/src/main/res/layout/view_big_picture_card.xml
M app/src/main/res/layout/view_card_featured_footer.xml
14 files changed, 219 insertions(+), 108 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/MainActivity.java 
b/app/src/main/java/org/wikipedia/MainActivity.java
index ec48b51..b7a3552 100644
--- a/app/src/main/java/org/wikipedia/MainActivity.java
+++ b/app/src/main/java/org/wikipedia/MainActivity.java
@@ -82,6 +82,7 @@
 import org.wikipedia.useroption.sync.UserOptionContentResolver;
 import org.wikipedia.util.ApiUtil;
 import org.wikipedia.util.FeedbackUtil;
+import org.wikipedia.util.ShareUtil;
 import org.wikipedia.util.log.L;
 import org.wikipedia.views.WikiDrawerLayout;
 import org.wikipedia.widgets.WidgetProviderFeaturedPage;
@@ -848,6 +849,11 @@
 showAddToListDialog(title, AddToReadingListDialog.InvokeSource.FEED);
 }
 
+@Override
+public void onFeedSharePage(PageTitle title) {
+ShareUtil.shareText(this, title);
+}
+
 private void loadMainPageIfNoTabs() {
 loadMainPage(false, TabPosition.CURRENT_TAB, true);
 }
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index d0584ef..067640b 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -52,6 +52,7 @@
 void onFeedVoiceSearchRequested();
 void onFeedSelectPage(PageTitle title);
 void onFeedAddPageToList(PageTitle title);
+void onFeedSharePage(PageTitle title);
 }
 
 public static FeedFragment newInstance() {
@@ -172,6 +173,13 @@
 }
 
 @Override
+public void onSharePage(@NonNull PageTitle title) {
+if (getCallback() != null) {
+getCallback().onFeedSharePage(title);
+}
+}
+
+@Override
 public void onSearchRequested() {
 if (getCallback() != null) {
 getCallback().onFeedSearchRequested();
diff --git a/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java 
b/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
index 5a16e15..af94359 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
@@ -8,6 +8,7 @@
 void onRequestMore();
 void onSelectPage(@NonNull PageTitle title);
 void onAddPageToList(@NonNull PageTitle title);
+void onSharePage(@NonNull PageTitle title);
 void onSearchRequested();
 void onVoiceSearchRequested();
 }
diff --git 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
index 9cf62a8..109024d 100644
--- 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
+++ 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
@@ -37,7 +37,7 @@
 String.format(Locale.ROOT, Prefs.getRestbaseUriFormat(), 
"http", site.authority()));
 AggregatedFeedContentClient.Service service = 
retrofit.create(Service.class);
 call = service.get(DATE.year(), DATE.month(), DATE.date());
-call.enqueue(new CallbackAdapter(cb));
+call.enqueue(new CallbackAdapter(cb, site));
 }
 
 @Override
@@ -67,16 +67,18 @@
 
 private static class CallbackAdapter implements 
retrofit2.Callback {
 @NonNull private final Callback cb;
+@NonNull private final Site site;
 
-CallbackAdapter(@NonNull Callback cb) {
+CallbackAdapter(@NonNull Callback cb, @NonNull Site 

[MediaWiki-commits] [Gerrit] Allow wdqs admins to control wdqs-updater service - change (operations/puppet)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Allow wdqs admins to control wdqs-updater service
..

Allow wdqs admins to control wdqs-updater service

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


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index cfc09c6..2b0bf62 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -367,6 +367,8 @@
 members: [smalyshev, hoo, jzerebecki]
 privileges: ['ALL = NOPASSWD: /usr/sbin/service wdqs-blazegraph *',
  'ALL = NOPASSWD: /usr/sbin/service wdqs-updater *',
+ 'ALL = NOPASSWD: /bin/systemctl enable wdqs-updater',
+ 'ALL = NOPASSWD: /bin/systemctl disable wdqs-updater',
  'ALL = (blazegraph) NOPASSWD: ALL',
  'ALL = NOPASSWD: /bin/journalctl *']
   mailman-admins:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida8b860f256cffbe0d878007930a34c9dfc25ef3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
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] Mark the APIEditBeforeSave hook as deprecated - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Mark the APIEditBeforeSave hook as deprecated
..


Mark the APIEditBeforeSave hook as deprecated

Bug: T137832
Depends-On: I9d0b7e7713c805ebc7bf59f55456e69c6491e265 (AbuseFilter)
Depends-On: I27f244631e9dcd160b70349e5034f2a537ea (ConfirmEdit)
Depends-On: I7b0e1d125b196379dd5bf26658ff642d32ba832a (ProofreadPage)
Depends-On: I97f6a3c20476f1a42e3fadc701df5870a30c790c (SpamBlacklist)
Change-Id: I6947d5373aa33224141f8d21cf3a1ee1f641d952
---
M RELEASE-NOTES-1.28
M docs/hooks.txt
M includes/api/ApiEditPage.php
3 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index c625143..4c075fc 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -53,6 +53,7 @@
 * (T128697) Improved handling of large diffs.
 * [BREAKING CHANGE] $wgExtendedLoginCookies has been removed.  You can
   use or update a custom session provider if needed.
+* Deprecated APIEditBeforeSave hook in favor of EditFilterMergedContent.
 
 == Compatibility ==
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index fa664c3..c0c01f4 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -371,7 +371,8 @@
 &$message: API usage message to die with, as a message key or array
   as accepted by ApiBase::dieUsageMsg.
 
-'APIEditBeforeSave': Before saving a page with api.php?action=edit, after
+'APIEditBeforeSave': DEPRECATED! Use EditFilterMergedContent instead.
+Before saving a page with api.php?action=edit, after
 processing request parameters. Return false to let the request fail, returning
 an error message or an  tag if $resultArr was filled.
 Unlike for example 'EditFilterMergedContent' this also being run on undo.
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index d3d7a4d..00daba9 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -401,7 +401,8 @@
// Run hooks
// Handle APIEditBeforeSave parameters
$r = [];
-   if ( !Hooks::run( 'APIEditBeforeSave', [ $ep, $content, &$r ] ) 
) {
+   // Deprecated in favour of EditFilterMergedContent
+   if ( !Hooks::run( 'APIEditBeforeSave', [ $ep, $content, &$r ], 
'1.28' ) ) {
if ( count( $r ) ) {
$r['result'] = 'Failure';
$apiResult->addValue( null, 
$this->getModuleName(), $r );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6947d5373aa33224141f8d21cf3a1ee1f641d952
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] striker: add some apache aliases - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: striker: add some apache aliases
..


striker: add some apache aliases

Change-Id: If59f8ae8f73b039d3d36b897e2bc9e89404e62ca
---
M puppet/modules/role/templates/striker/apache.conf.erb
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/templates/striker/apache.conf.erb 
b/puppet/modules/role/templates/striker/apache.conf.erb
index 54659a5..5747540 100644
--- a/puppet/modules/role/templates/striker/apache.conf.erb
+++ b/puppet/modules/role/templates/striker/apache.conf.erb
@@ -1,7 +1,9 @@
 ServerName <%= @vhost_name %>
 DocumentRoot <%= @app_dir %>
 
+# Enable wsgi automatic reload magic
 SetEnv DJANGO_DEBUG True
+
 WSGIDaemonProcess striker python-path=<%= @app_dir %>:<%= @venv 
%>/lib/python2.7/site-packages home=<%= @app_dir %> display-name=%{GROUP} 
threads=8
 WSGIProcessGroup striker
 WSGIScriptAlias / <%= @deploy_dir %>/striker/striker/wsgi.py 
process-group=striker
@@ -18,6 +20,8 @@
 
 
 Alias /static/ <%= @app_dir %>/staticfiles/
+Alias /favicon.ico <%= @app_dir %>/staticfiles/img/favicon.ico
+Alias /robots.txt <%= @app_dir %>/staticfiles/robots.txt
 
 /staticfiles>
   Options -Indexes

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If59f8ae8f73b039d3d36b897e2bc9e89404e62ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Design tweaks to feed card headers, based on final mocks. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Design tweaks to feed card headers, based on final mocks.
..


Design tweaks to feed card headers, based on final mocks.

- All cards now have a standardized header.
- The header now accepts a Drawable resource id for its icon, and a color
  for the background circle.

Change-Id: I8fd0edcd125f4e8e8371b28d4108c6787461a9cc
---
M 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M 
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
M app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
M app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
M app/src/main/java/org/wikipedia/feed/view/ListCardView.java
M app/src/main/java/org/wikipedia/feed/view/PageTitleListCardView.java
M app/src/main/res/drawable/ic_most_read.xml
A app/src/main/res/drawable/ic_star_black_24dp.xml
A app/src/main/res/drawable/shape_circle.xml
M app/src/main/res/layout/view_card_header.xml
M app/src/main/res/layout/view_card_header_large.xml
M app/src/main/res/layout/view_list_card.xml
M app/src/main/res/values/colors.xml
16 files changed, 86 insertions(+), 67 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
index c844c85..c0a2aca 100644
--- 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -4,7 +4,9 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import org.wikipedia.R;
 import org.wikipedia.feed.FeedViewCallback;
+import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.CardLargeHeaderView;
 import org.wikipedia.feed.view.PageTitleListCardItemView;
 import org.wikipedia.feed.view.PageTitleListCardView;
@@ -30,12 +32,16 @@
 }
 
 private void header(@NonNull final BecauseYouReadCard card) {
-CardLargeHeaderView header = new CardLargeHeaderView(getContext())
+CardHeaderView header = new CardHeaderView(getContext())
 .setTitle(card.title())
+.setImage(R.drawable.ic_restore_black_24dp)
+.setImageCircleColor(R.color.gray_highlight);
+header(header);
+CardLargeHeaderView largeHeader = new CardLargeHeaderView(getContext())
 .setSubtitle(card.subtitle())
 .setPageTitle(card.pageTitle())
 .setImage(card.image());
-header(header);
+largeHeader(largeHeader);
 }
 
 private static class RecyclerAdapter extends 
PageTitleListCardView.RecyclerAdapter {
diff --git 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
index 3ba580a..46b6df9 100644
--- 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
@@ -5,6 +5,7 @@
 import android.support.annotation.PluralsRes;
 
 import org.wikipedia.R;
+import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.CardLargeHeaderView;
 import org.wikipedia.feed.view.ListCardView;
 
@@ -20,11 +21,15 @@
 private void header(@NonNull ContinueReadingCard card) {
 @PluralsRes int subtitle = 
R.plurals.view_continue_reading_card_subtitle;
 int age = (int) card.daysOld();
-CardLargeHeaderView header = new CardLargeHeaderView(getContext())
+CardHeaderView header = new CardHeaderView(getContext())
 .setTitle(R.string.view_continue_reading_card_title)
 .setSubtitle(getResources().getQuantityString(subtitle, age, 
age))
+.setImage(R.drawable.ic_arrow_forward_black_24dp)
+.setImageCircleColor(R.color.gray_highlight);
+header(header);
+CardLargeHeaderView largeHeader = new CardLargeHeaderView(getContext())
 .setPageTitle(card.title())
 .setImage(card.image());
-header(header);
+largeHeader(largeHeader);
 }
 }
\ No newline at end of file
diff --git 
a/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java 
b/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
index 1b7e03c..66bbad9 100644
--- a/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
+++ 

[MediaWiki-commits] [Gerrit] striker: add some apache aliases - change (mediawiki/vagrant)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: striker: add some apache aliases
..

striker: add some apache aliases

Change-Id: If59f8ae8f73b039d3d36b897e2bc9e89404e62ca
---
M puppet/modules/role/templates/striker/apache.conf.erb
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/67/295967/1

diff --git a/puppet/modules/role/templates/striker/apache.conf.erb 
b/puppet/modules/role/templates/striker/apache.conf.erb
index 54659a5..5747540 100644
--- a/puppet/modules/role/templates/striker/apache.conf.erb
+++ b/puppet/modules/role/templates/striker/apache.conf.erb
@@ -1,7 +1,9 @@
 ServerName <%= @vhost_name %>
 DocumentRoot <%= @app_dir %>
 
+# Enable wsgi automatic reload magic
 SetEnv DJANGO_DEBUG True
+
 WSGIDaemonProcess striker python-path=<%= @app_dir %>:<%= @venv 
%>/lib/python2.7/site-packages home=<%= @app_dir %> display-name=%{GROUP} 
threads=8
 WSGIProcessGroup striker
 WSGIScriptAlias / <%= @deploy_dir %>/striker/striker/wsgi.py 
process-group=striker
@@ -18,6 +20,8 @@
 
 
 Alias /static/ <%= @app_dir %>/staticfiles/
+Alias /favicon.ico <%= @app_dir %>/staticfiles/img/favicon.ico
+Alias /robots.txt <%= @app_dir %>/staticfiles/robots.txt
 
 /staticfiles>
   Options -Indexes

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If59f8ae8f73b039d3d36b897e2bc9e89404e62ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
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] [doc] remove unsupported -f option - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: [doc] remove unsupported -f option
..


[doc] remove unsupported -f option

- -f option is not supported but well known -family option could be used
- -o option does the same as common -lang option

Bug: T137274
Change-Id: Iaa0eb7524baef654687905c0296217ff4e13d6d3
---
M scripts/replicate_wiki.py
1 file changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py
index 44b37af..fd27032 100755
--- a/scripts/replicate_wiki.py
+++ b/scripts/replicate_wiki.py
@@ -5,7 +5,11 @@
 
 Example:
 
-python pwb.py replicate_wiki [-r] -ns 10 -f wikipedia -o nl li fy
+python pwb.py replicate_wiki [-r] -ns 10 -family:wikipedia -o nl li fy
+
+or
+
+python pwb.py replicate_wiki [-r] -ns 10 -family:wikipedia -lang:nl li fy
 
 to copy all templates from an nlwiki to liwiki and fywiki. It will show which
 pages have to be changed if -r is not present, and will only actually write
@@ -26,7 +30,7 @@
 --replace you will only get an overview page)
 
 -ooriginal wiki
---original
+--original(you may use -lang: option instead)
 
 destination_wiki  destination wiki(s)
 
@@ -38,7 +42,7 @@
 """
 #
 # (C) Kasper Souren, 2012-2013
-# (C) Pywikibot team, 2013-2014
+# (C) Pywikibot team, 2013-2016
 #
 # Distributed under the terms of the MIT license.
 #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa0eb7524baef654687905c0296217ff4e13d6d3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mpaa 
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] Swipe to refresh the feed. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Swipe to refresh the feed.
..


Swipe to refresh the feed.

Change-Id: If587bdc0ae50e8d1817e04cee2eebf0d1fece141
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/res/layout/fragment_feed.xml
M app/src/main/res/values/dimens.xml
3 files changed, 32 insertions(+), 7 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index da712e6..d0584ef 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -5,6 +5,7 @@
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -35,6 +36,7 @@
 MainActivityToolbarProvider,
 CallbackFragment {
 @BindView(R.id.feed_app_bar_layout) AppBarLayout appBarLayout;
+@BindView(R.id.feed_swipe_refresh_layout) SwipeRefreshLayout 
swipeRefreshLayout;
 @BindView(R.id.fragment_feed_feed) FeedView feedView;
 @BindView(R.id.feed_toolbar) Toolbar toolbar;
 private Unbinder unbinder;
@@ -75,10 +77,22 @@
 appBarLayout.addOnOffsetChangedListener(headerOffsetChangedListener);
 searchIconShowThresholdPx = (int) 
getResources().getDimension(R.dimen.view_feed_header_height) - 
DimenUtil.getContentTopOffsetPx(getContext());
 
+swipeRefreshLayout.setProgressViewOffset(true,
+(int) 
getResources().getDimension(R.dimen.view_feed_refresh_offset_start),
+(int) 
getResources().getDimension(R.dimen.view_feed_refresh_offset_end));
+swipeRefreshLayout.setOnRefreshListener(new 
SwipeRefreshLayout.OnRefreshListener() {
+@Override
+public void onRefresh() {
+coordinator.reset();
+coordinator.more(app.getSite());
+}
+});
+
 coordinator.setFeedUpdateListener(new 
FeedCoordinator.FeedUpdateListener() {
 @Override
 public void update(List cards) {
 if (isAdded()) {
+swipeRefreshLayout.setRefreshing(false);
 feedView.update();
 }
 }
@@ -180,6 +194,7 @@
 searchIconVisible = shouldShowSearchIcon;
 getActivity().supportInvalidateOptionsMenu();
 }
+swipeRefreshLayout.setEnabled(verticalOffset == 0);
 }
 }
 }
diff --git a/app/src/main/res/layout/fragment_feed.xml 
b/app/src/main/res/layout/fragment_feed.xml
index c8dcdc5..772f582 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -28,6 +28,7 @@
 android:scaleType="centerCrop"
 android:fitsSystemWindows="true"
 android:src="@drawable/feed_app_bar"
+android:contentDescription="@null"
 app:layout_collapseMode="parallax"
 />
 
@@ -42,15 +43,22 @@
 
 
 
-
+app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+
+
+
 
 
diff --git a/app/src/main/res/values/dimens.xml 
b/app/src/main/res/values/dimens.xml
index a124a0d..27c9ece 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -90,6 +90,8 @@
 
 
 260dp
+40dp
+60dp
 229.3dp
 8dp
 5.3dp

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If587bdc0ae50e8d1817e04cee2eebf0d1fece141
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
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] Fetch more feed contents automatically upon scroll. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Fetch more feed contents automatically upon scroll.
..


Fetch more feed contents automatically upon scroll.

This adds the piece of Feed interactivity where it automatically requests
more feed content when the user scrolls down sufficiently far.

Quick implementation note: I put the call to notifyDataSetChanged() into a
Runnable that is posted to the message queue. This is because the request
to fetch more feed contents is made during the view-binding phase of the
RecyclerView. Since some feed cards may return their contents immediately
(in the same thread), it may cause the RecyclerAdapter to be invalidated
while it's still laying out its contents. This will ensure that
notifyDataSetChanged() will get called only when it finishes its previous
layout.

Change-Id: I2667ad4aa4c59260ed117c4624aa413306b6d1ec
---
M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
M app/src/main/java/org/wikipedia/feed/view/FeedView.java
5 files changed, 34 insertions(+), 17 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
index b6ecf36..03a79d0 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
@@ -57,6 +57,10 @@
 requestNextCard(site);
 }
 
+public boolean finished() {
+return pendingClients.isEmpty();
+}
+
 protected abstract void buildScript(int age);
 
 protected void addPendingClient(FeedClient client) {
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index e936b22..da712e6 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -71,7 +71,7 @@
 View view = inflater.inflate(R.layout.fragment_feed, container, false);
 
 unbinder = ButterKnife.bind(this, view);
-feedView.set(coordinator.getCards(), feedCallback);
+feedView.set(coordinator, feedCallback);
 appBarLayout.addOnOffsetChangedListener(headerOffsetChangedListener);
 searchIconShowThresholdPx = (int) 
getResources().getDimension(R.dimen.view_feed_header_height) - 
DimenUtil.getContentTopOffsetPx(getContext());
 
@@ -114,10 +114,9 @@
 public boolean onOptionsItemSelected(MenuItem item) {
 switch (item.getItemId()) {
 case R.id.menu_feed_search:
-
-// TODO: remove
-coordinator.more(app.getSite());
-
+if (getCallback() != null) {
+getCallback().onFeedSearchRequested();
+}
 return true;
 default:
 return super.onOptionsItemSelected(item);
@@ -140,6 +139,11 @@
 
 private class FeedCallback implements FeedViewCallback {
 @Override
+public void onRequestMore() {
+coordinator.more(app.getSite());
+}
+
+@Override
 public void onSelectPage(@NonNull PageTitle title) {
 if (getCallback() != null) {
 getCallback().onFeedSelectPage(title);
diff --git a/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java 
b/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
index 1816d9a..5a16e15 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
@@ -5,6 +5,7 @@
 import org.wikipedia.page.PageTitle;
 
 public interface FeedViewCallback {
+void onRequestMore();
 void onSelectPage(@NonNull PageTitle title);
 void onAddPageToList(@NonNull PageTitle title);
 void onSearchRequested();
diff --git a/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java 
b/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
index af266db..d507588 100644
--- a/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
+++ b/app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
@@ -6,6 +6,7 @@
 import android.support.v7.widget.CardView;
 import android.view.ViewGroup;
 
+import org.wikipedia.feed.FeedCoordinatorBase;
 import org.wikipedia.feed.FeedViewCallback;
 import org.wikipedia.feed.becauseyouread.BecauseYouReadCard;
 import org.wikipedia.feed.becauseyouread.BecauseYouReadCardView;
@@ -23,8 +24,6 @@
 import org.wikipedia.views.DefaultRecyclerAdapter;
 import org.wikipedia.views.DefaultViewHolder;
 
-import java.util.List;
-
 

[MediaWiki-commits] [Gerrit] Improve toolbar overlay when scrolling feed. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Improve toolbar overlay when scrolling feed.
..


Improve toolbar overlay when scrolling feed.

- Now uses the correct attribute to specify the overlay offset of the
  FeedView in relation to the AppBarLayout, and looks better when
  scrolling.
- Now hiding the "search" button in the toolbar until the feed is scrolled
  down sufficiently.

Change-Id: I1d8a4219e27f03fad59eeb25475cc4478d7999b9
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/res/layout/fragment_feed.xml
M app/src/main/res/values/dimens.xml
3 files changed, 27 insertions(+), 6 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index df5c02d..e936b22 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -3,7 +3,7 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.design.widget.CollapsingToolbarLayout;
+import android.support.design.widget.AppBarLayout;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
@@ -23,6 +23,7 @@
 import org.wikipedia.feed.view.FeedView;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.page.PageTitle;
+import org.wikipedia.util.DimenUtil;
 
 import java.util.List;
 
@@ -33,13 +34,16 @@
 public class FeedFragment extends Fragment implements BackPressedHandler,
 MainActivityToolbarProvider,
 CallbackFragment {
+@BindView(R.id.feed_app_bar_layout) AppBarLayout appBarLayout;
 @BindView(R.id.fragment_feed_feed) FeedView feedView;
-@BindView(R.id.feed_collapsing_toolbar_layout) CollapsingToolbarLayout 
collapsingToolbarLayout;
 @BindView(R.id.feed_toolbar) Toolbar toolbar;
 private Unbinder unbinder;
 private WikipediaApp app;
 private FeedCoordinator coordinator;
 private FeedViewCallback feedCallback = new FeedCallback();
+private FeedHeaderOffsetChangedListener headerOffsetChangedListener = new 
FeedHeaderOffsetChangedListener();
+private int searchIconShowThresholdPx;
+private boolean searchIconVisible;
 
 public interface Callback extends CallbackFragment.Callback {
 void onFeedSearchRequested();
@@ -68,6 +72,8 @@
 
 unbinder = ButterKnife.bind(this, view);
 feedView.set(coordinator.getCards(), feedCallback);
+appBarLayout.addOnOffsetChangedListener(headerOffsetChangedListener);
+searchIconShowThresholdPx = (int) 
getResources().getDimension(R.dimen.view_feed_header_height) - 
DimenUtil.getContentTopOffsetPx(getContext());
 
 coordinator.setFeedUpdateListener(new 
FeedCoordinator.FeedUpdateListener() {
 @Override
@@ -91,6 +97,7 @@
 
 @Override
 public void onDestroyView() {
+
appBarLayout.removeOnOffsetChangedListener(headerOffsetChangedListener);
 unbinder.unbind();
 super.onDestroyView();
 }
@@ -98,7 +105,9 @@
 @Override
 public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 menu.clear();
-inflater.inflate(R.menu.menu_feed, menu);
+if (searchIconVisible) {
+inflater.inflate(R.menu.menu_feed, menu);
+}
 }
 
 @Override
@@ -158,4 +167,15 @@
 }
 }
 }
+
+private class FeedHeaderOffsetChangedListener implements 
AppBarLayout.OnOffsetChangedListener {
+@Override
+public void onOffsetChanged(AppBarLayout appBarLayout, int 
verticalOffset) {
+boolean shouldShowSearchIcon = !((searchIconShowThresholdPx + 
verticalOffset) > 0);
+if (shouldShowSearchIcon != searchIconVisible) {
+searchIconVisible = shouldShowSearchIcon;
+getActivity().supportInvalidateOptionsMenu();
+}
+}
+}
 }
diff --git a/app/src/main/res/layout/fragment_feed.xml 
b/app/src/main/res/layout/fragment_feed.xml
index c77a153..c8dcdc5 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -8,13 +8,13 @@
 android:fitsSystemWindows="true">
 
 
 
 
 
 
diff --git a/app/src/main/res/values/dimens.xml 
b/app/src/main/res/values/dimens.xml
index 04b2183..a124a0d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -89,6 +89,7 @@
 12dp
 
 
+260dp
 229.3dp
 8dp
 5.3dp

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

Gerrit-MessageType: merged
Gerrit-Change-Id: 

[MediaWiki-commits] [Gerrit] VisualEditor: Avoid concurrent loading of the regular page t... - change (mediawiki...ProofreadPage)

[jenkins-bot (Code Review)]

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

Change subject: VisualEditor: Avoid concurrent loading of the regular page 
target
..


VisualEditor: Avoid concurrent loading of the regular page target

Bug: T138489
Depends-on: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
Change-Id: I6b2d5a5c2707746db88d3ef0d22c825e7ca6f0e8
---
M extension.json
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
2 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 7769786..cc78d35 100644
--- a/extension.json
+++ b/extension.json
@@ -332,7 +332,7 @@
"Page": true
},
"VisualEditorAvailableContentModels": {
-   "proofread-page": true
+   "proofread-page": "proofread-page"
},
"config": {
"@ProofreadPageNamespaceIds": "Array that contain the ids of 
namespaces used by ProofreadPage",
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 6397a92..ea16f92 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -45,6 +45,13 @@
 
 OO.inheritClass( ve.init.mw.ProofreadPagePageTarget, 
ve.init.mw.DesktopArticleTarget );
 
+/* Static Properties */
+
+/**
+ * @inheritdoc
+ */
+ve.init.mw.ProofreadPagePageTarget.static.name = 'proofread-page';
+
 /* Methods */
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b2d5a5c2707746db88d3ef0d22c825e7ca6f0e8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Template wrapping: Eliminate pathological tpl-range nesting ... - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Template wrapping: Eliminate pathological tpl-range nesting 
scenario
..


Template wrapping: Eliminate pathological tpl-range nesting scenario

wikidata.org/wiki/Wikidata:Database_reports/items_without_claims_categories/enwiki
and other such pages on wikidata have been timing out regularly
for several months now.

It turns out that this was exercising a pathological scenario in
template wrapping.

That page has ~4000 transclusions of the form: {{TR noclaims site|...}}

This transclusion generates a ... which then causes the start
and end-template marker meta tags to lie outside the  which seems
to be causing template ranges to expand to the entire table (that
behavior will be investigated separately to see if we can make it stick
to the  instead).

So, we effectively have ~4K transclusions whose template wrapping
range is identical (the entire table).

Given a set of ranges, the findToplevelNonOverlappingRanges algorithm
tries to find how ranges nest within one another.

Given ranges A & B that overlap perfectly, we could mark A nested in B
or vice versa.  Normally, this shouldn't be an issue since no matter
which one we pick as the "outermost" range, the whole table will get wrapped.

However, the algorithm also has code to prevent nesting cycles.
This cycle detection code encounters pathological behavior on this page.
We have ranges R_1 .. R_4000 where R_n is being marked as nested in R_n+1.
So, you now have this nesting tree that ends up as a long chain from
R_1 ... R_n for all values of n. The cycle-detection code uses this
nesting tree to prevent cyclical nesting and this ends up walking these
n-long paths for every value of n and thus has O(n^2) behavior.

A better nesting tree would be to mark R_2 .. R_4000 as being nested
in R_1. So, given ranges A & B that overlap perfectly, this patch
adds a new test to ensure that B is marked nested in A whenever
B's starting offset is larger than A's offset.

With this fix, the tpl-wrapping code finishes rapidly and the page
parses without a timeout.

Bug: T119883

Change-Id: Iaaa2fc2cf484ce5cca2a2d3a3fa18a0e4e612262
---
M lib/wt2html/pp/processors/wrapTemplates.js
1 file changed, 10 insertions(+), 9 deletions(-)

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



diff --git a/lib/wt2html/pp/processors/wrapTemplates.js 
b/lib/wt2html/pp/processors/wrapTemplates.js
index 88e8d5a..8bae1dc 100644
--- a/lib/wt2html/pp/processors/wrapTemplates.js
+++ b/lib/wt2html/pp/processors/wrapTemplates.js
@@ -418,9 +418,6 @@
// compute their intersection. If this 
intersection has
// another tpl range besides r itself, 
we have a winner!
//
-   // Array A - B functionality that Ruby 
has would have simplified
-   // this code!
-   //
// The code below does the above check 
efficiently.
var sTpls = ranges;
var eTpls = 
DU.getDataParsoid(r.end).tmp.tplRanges;
@@ -430,14 +427,18 @@
for (var j = 0; j < sKeys.length; j++) {
// - Don't record nesting 
cycles.
// - Record the outermost range 
in which 'r' is nested in.
-   var other = sKeys[j];
-   if (other !== r.id
-   && eTpls[other]
-   && 
!introducesCycle(r.id, other, subsumedRanges)) {
+   var otherId = sKeys[j];
+   var other = sTpls[otherId];
+   if (otherId !== r.id
+   && eTpls[otherId]
+   // When we have 
identical ranges, pick the range with
+   // the larger offset to 
be subsumed.
+   && (r.start !== 
other.start || r.end !== other.end || other.startOffset < r.startOffset)
+   && 
!introducesCycle(r.id, otherId, subsumedRanges)) {
foundNesting = true;
if 
(!subsumedRanges.has(r.id)
-   || 
sTpls[other].startOffset < 

[MediaWiki-commits] [Gerrit] Typo in regex: suggestive antipattern. - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Typo in regex: suggestive antipattern.
..


Typo in regex: suggestive antipattern.

Don't dot.

Change-Id: Iff9889f23f84cb87654020fc0a6435a26179a4f1
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e240be1..5f26996 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -606,7 +606,7 @@
   #
 
   # Warning: the files regex are using python re.match() which match at the
-  # beginning of the filename. '.js$' will only match '.js' not 'foo.js'.
+  # beginning of the filename. '\.js$' will only match '.js' not 'foo.js'.
   #
   # See: http://docs.python.org/2/library/re.html#search-vs-match
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff9889f23f84cb87654020fc0a6435a26179a4f1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: 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] travis.yml: Remove hhvm-nightly - change (wikimedia/slimapp)

[jenkins-bot (Code Review)]

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

Change subject: travis.yml: Remove hhvm-nightly
..


travis.yml: Remove hhvm-nightly

hhvm-nightly is only supported on Travis-CI's trusty build images and
then only in the "edge" testing group.

Change-Id: Iecd8661b24e2bab441717185003998df1425cc06
---
M .travis.yml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/.travis.yml b/.travis.yml
index 811c70d..38029a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@
   - "5.6"
   - "7.0"
   - "hhvm"
-  - "hhvm-nightly"
 matrix:
   allow_failures:
 - php: "hhvm"  # need HHVM >= 3.10.0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecd8661b24e2bab441717185003998df1425cc06
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/slimapp
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] travis.yml: Remove hhvm-nightly - change (wikimedia/slimapp)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: travis.yml: Remove hhvm-nightly
..

travis.yml: Remove hhvm-nightly

hhvm-nightly is only supported on Travis-CI's trusty build images and
then only in the "edge" testing group.

Change-Id: Iecd8661b24e2bab441717185003998df1425cc06
---
M .travis.yml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/slimapp 
refs/changes/66/295966/1

diff --git a/.travis.yml b/.travis.yml
index 811c70d..38029a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@
   - "5.6"
   - "7.0"
   - "hhvm"
-  - "hhvm-nightly"
 matrix:
   allow_failures:
 - php: "hhvm"  # need HHVM >= 3.10.0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecd8661b24e2bab441717185003998df1425cc06
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/slimapp
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] Make the header a real header with styles and stuff - change (mediawiki...CollaborationKit)

[jenkins-bot (Code Review)]

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

Change subject: Make the header a real header with styles and stuff
..


Make the header a real header with styles and stuff

Change-Id: Id8b4c3d8c3431dcc81369684d7eb4646dc2033ef
---
M includes/content/CollaborationHubContent.php
M modules/ext.CollaborationKitMainHubViewFile.less
2 files changed, 35 insertions(+), 1 deletion(-)

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



diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index 981ce7e..4c2d4b3 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -286,6 +286,7 @@
}
 
$output->setText(
+   // Add page class
Html::openElement(
'div',
array( 'class' => 'wp-mainpage 
wp-collaborationhub' )
@@ -301,6 +302,7 @@
}
 
$output->setText(
+   // Add page class
Html::openElement(
'div',
array( 'class' => 'wp-subpage 
wp-collaborationhub' )
@@ -345,7 +347,6 @@
return $this->generateList( $title, $options );
}
}
-
 
/**
 * Helper function for fillParserOutput; return HTML for displaying 
lists.
@@ -543,6 +544,7 @@
);
}
$html .= Html::closeElement( 'ul' );
+   $html .= '';
$html .= Html::closeElement( 'div' );
} else {
$html = 'Page not found, ToC not possible';
diff --git a/modules/ext.CollaborationKitMainHubViewFile.less 
b/modules/ext.CollaborationKitMainHubViewFile.less
index 6f49376..a5a850b 100644
--- a/modules/ext.CollaborationKitMainHubViewFile.less
+++ b/modules/ext.CollaborationKitMainHubViewFile.less
@@ -119,3 +119,35 @@
 }
 
 // WTF THERE HAS TO BE A BETTER WAY TO DO THIS
+
+// Mainpage hub layout
+.wp-mainpage {
+   #wp-header-icon {
+   float: left;
+   padding: 0 2em 2em 0;
+   }
+   #wp-header-members {
+   float: right;
+   margin: 0 0 2em 2em;
+   }
+   .wp-toc {
+   clear: both;
+   margin: 1em 0;
+
+   ul {
+   padding: 0;
+   margin: 0;
+   list-style: none;
+   }
+   li {
+   float: left;
+   margin: .5em 1.25em .5em 0;
+   }
+   div {
+   margin: auto;
+   }
+   }
+   .wp-intro{
+   font-size: 115%;
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8b4c3d8c3431dcc81369684d7eb4646dc2033ef
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Isarra 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make the header a real header with styles and stuff - change (mediawiki...CollaborationKit)

[Isarra (Code Review)]

Isarra has uploaded a new change for review.

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

Change subject: Make the header a real header with styles and stuff
..

Make the header a real header with styles and stuff

Change-Id: Id8b4c3d8c3431dcc81369684d7eb4646dc2033ef
---
M includes/content/CollaborationHubContent.php
M modules/ext.CollaborationKitMainHubViewFile.less
2 files changed, 36 insertions(+), 0 deletions(-)


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

diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index 981ce7e..321ff4a 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -286,6 +286,7 @@
}
 
$output->setText(
+   // Add page class
Html::openElement(
'div',
array( 'class' => 'wp-mainpage 
wp-collaborationhub' )
@@ -301,6 +302,7 @@
}
 
$output->setText(
+   // Add page class
Html::openElement(
'div',
array( 'class' => 'wp-subpage 
wp-collaborationhub' )
@@ -543,6 +545,7 @@
);
}
$html .= Html::closeElement( 'ul' );
+   $html .= '';
$html .= Html::closeElement( 'div' );
} else {
$html = 'Page not found, ToC not possible';
@@ -551,6 +554,7 @@
$html = '';
}
 
+
return $html;
}
 
diff --git a/modules/ext.CollaborationKitMainHubViewFile.less 
b/modules/ext.CollaborationKitMainHubViewFile.less
index 6f49376..a5a850b 100644
--- a/modules/ext.CollaborationKitMainHubViewFile.less
+++ b/modules/ext.CollaborationKitMainHubViewFile.less
@@ -119,3 +119,35 @@
 }
 
 // WTF THERE HAS TO BE A BETTER WAY TO DO THIS
+
+// Mainpage hub layout
+.wp-mainpage {
+   #wp-header-icon {
+   float: left;
+   padding: 0 2em 2em 0;
+   }
+   #wp-header-members {
+   float: right;
+   margin: 0 0 2em 2em;
+   }
+   .wp-toc {
+   clear: both;
+   margin: 1em 0;
+
+   ul {
+   padding: 0;
+   margin: 0;
+   list-style: none;
+   }
+   li {
+   float: left;
+   margin: .5em 1.25em .5em 0;
+   }
+   div {
+   margin: auto;
+   }
+   }
+   .wp-intro{
+   font-size: 115%;
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] Whitelist Wikis that use older mp- prefix - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Whitelist Wikis that use older mp- prefix
..


Whitelist Wikis that use older mp- prefix

English Wikipedia uses legacy main page formatting
English Wikipedia uses a table based layout.
It and various other wikis mark their pages up with mp-
prefixes rather than mf- prefixes. (this is badly
documented but apparently supported)

This means that the audit was done incorrectly
Results of re-run of audit are included.

Bug: T138578
Change-Id: Ib6e448b27a9dd7635d325e8f7b0ca9dac32ae5af
---
M dblists/mobilemainpagelegacy.dblist
1 file changed, 77 insertions(+), 0 deletions(-)

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



diff --git a/dblists/mobilemainpagelegacy.dblist 
b/dblists/mobilemainpagelegacy.dblist
index 6624093..99dc557 100644
--- a/dblists/mobilemainpagelegacy.dblist
+++ b/dblists/mobilemainpagelegacy.dblist
@@ -1,34 +1,51 @@
+abwiki
+adywiki
+akwiki
 akwiktionary
 alswiki
 alswikiquote
 alswiktionary
 amwiki
+arcwiki
 arwiki
 arwikibooks
 arwikinews
 arwikisource
+arzwiki
 astwiki
 astwiktionary
+aswiki
 avwiki
 azbwiki
 azwiki
 barwiki
 bawiki
+bclwiki
 bewiki
 bewikisource
+bgwiki
+bhwiki
 biwiktionary
+bjnwiki
 bmwiki
+bnwiki
 bnwikisource
 bowiki
+brwiki
 brwikisource
+bswiki
+bxrwiki
 cawiki
 cawikibooks
+cawikinews
 cawiktionary
 cdowiki
+cewiki
 ckbwiki
 commonswiki
 crwikiquote
 crwiktionary
+cswiki
 cswikiquote
 cswiktionary
 cywiki
@@ -45,10 +62,12 @@
 dewikivoyage
 dewiktionary
 dsbwiki
+dzwiki
 elwiki
 elwikisource
 elwikivoyage
 elwiktionary
+enwiki
 enwikibooks
 enwikinews
 enwikiquote
@@ -57,6 +76,8 @@
 enwikivoyage
 enwiktionary
 eowiki
+eswiki
+eswikinews
 eswikiquote
 eswikisource
 eswikivoyage
@@ -64,6 +85,7 @@
 etwikiquote
 etwikisource
 etwiktionary
+euwiki
 fawiki
 fawikibooks
 fawiktionary
@@ -81,11 +103,21 @@
 frwikivoyage
 frwiktionary
 fywiki
+gagwiki
+ganwiki
+gawiki
+glwiki
+glwikibooks
+glwikiquote
 gnwiktionary
 guwiki
+guwikiquote
 guwikisource
+gvwiki
 hewiki
 hewikivoyage
+hifwiki
+hiwiki
 hiwiktionary
 hrwiki
 hrwikibooks
@@ -94,13 +126,17 @@
 hrwiktionary
 hsbwiki
 huwiki
+hywiki
 idwiki
 idwikibooks
 idwikisource
 idwiktionary
+igwiki
 ilowiki
+iowiki
 iowiktionary
 iswiki
+iswiktionary
 itwiki
 itwikinews
 itwikiquote
@@ -110,38 +146,53 @@
 jawikinews
 jawikisource
 jawiktionary
+jvwiki
 kabwiki
 kawikiquote
+kbdwiki
 kgwiki
+kiwiki
 kmwiki
 kmwikibooks
 knwiki
+kowiki
 kowikibooks
 kowikisource
 krcwiki
 kuwiki
 kwwiki
 kywiki
+lawiki
+lbwiki
 lbwiktionary
 lezwiki
+lmowiki
 lnwiki
+lowiki
+lrcwiki
+ltgwiki
 ltwiktionary
 lvwiki
 mediawikiwiki
 metawiki
 minwiki
 mkwiki
+mkwiktionary
 mlwiki
+mlwikibooks
 mlwikisource
 mlwiktionary
 mnwiki
+mrwiki
 mswiki
 mswikibooks
 mswiktionary
 mtwiki
 mywiki
+mznwiki
 nahwiki
 napwiki
+nawiki
 nawikiquote
 ndswiki
 newiki
@@ -151,9 +202,13 @@
 nlwiktionary
 nnwiki
 nowiki
+nvwiki
+ocwiki
 orwiki
+orwikisource
 orwiktionary
 oswiki
+pawiki
 plwiki
 plwikisource
 plwiktionary
@@ -169,6 +224,7 @@
 rmwiki
 rowiki
 rowikiquote
+ruewiki
 ruwiki
 ruwikibooks
 ruwikinews
@@ -176,28 +232,38 @@
 ruwiktionary
 rwwiki
 sahwiki
+sawiki
+sawikibooks
 scnwiki
 scowiki
 scwiki
 sdwiki
+shwiki
 simplewiki
 simplewiktionary
+siwiki
 siwikibooks
+skwiki
 skwiktionary
 slwiki
+smwiki
 sowiki
 specieswiki
 sqwiki
 sqwikinews
 srwiki
 srwikinews
+stwiki
 suwiki
 suwikiquote
 svwiki
 svwikisource
 svwikivoyage
 svwiktionary
+swwiki
+szlwiki
 tawiki
+tawikinews
 tawikiquote
 tawikisource
 tawiktionary
@@ -207,10 +273,14 @@
 tewikisource
 tgwiki
 thwiki
+thwikisource
 tlwiki
+tnwiki
+trwiki
 trwikibooks
 trwikiquote
 trwiktionary
+ttwiki
 tyvwiki
 ugwiktionary
 ukwiki
@@ -221,17 +291,24 @@
 urwikiquote
 uzwiki
 uzwiktionary
+vecwiki
 vecwikisource
 vecwiktionary
+viwiki
 viwikibooks
 viwikiquote
 viwiktionary
+wuuwiki
+xalwiki
 xhwiki
 yiwiki
+yowiki
 zawiki
+zeawiki
 zhwikibooks
 zhwikinews
 zhwikiquote
 zhwikisource
 zhwikivoyage
 zhwiktionary
+zuwiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6e448b27a9dd7635d325e8f7b0ca9dac32ae5af
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Alex Monk 
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] Added "view table" link to "table was recreated" text - change (mediawiki...Cargo)

[jenkins-bot (Code Review)]

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

Change subject: Added "view table" link to "table was recreated" text
..


Added "view table" link to "table was recreated" text

Change-Id: Ib698897b97d426b1dd3396b589f7f43503fe7bf8
---
M Cargo.php
M extension.json
M libs/ext.cargo.recreatedata.js
M specials/CargoRecreateData.php
4 files changed, 11 insertions(+), 4 deletions(-)

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



diff --git a/Cargo.php b/Cargo.php
index cfde10d..bcdfbbe 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -180,7 +180,8 @@
'dependencies' => 'mediawiki.jqueryMsg',
'messages' => array(
'cargo-recreatedata-tablecreated',
-   'cargo-recreatedata-success'
+   'cargo-recreatedata-success',
+   'cargo-cargotables-viewtablelink'
),
'position' => 'bottom',
'localBasePath' => __DIR__,
diff --git a/extension.json b/extension.json
index 5e8de13..7dfdc8f 100644
--- a/extension.json
+++ b/extension.json
@@ -118,7 +118,8 @@
"dependencies": "mediawiki.jqueryMsg",
"messages": [
"cargo-recreatedata-tablecreated",
-   "cargo-recreatedata-success"
+   "cargo-recreatedata-success",
+   "cargo-cargotables-viewtablelink"
],
"position": "bottom"
},
diff --git a/libs/ext.cargo.recreatedata.js b/libs/ext.cargo.recreatedata.js
index 70f2d1c..51c3fcb 100644
--- a/libs/ext.cargo.recreatedata.js
+++ b/libs/ext.cargo.recreatedata.js
@@ -17,6 +17,7 @@
var cargoScriptPath = dataDiv.attr("cargoscriptpath");
var tableName = dataDiv.attr("tablename");
var isDeclared = dataDiv.attr("isdeclared");
+   var viewTableURL = dataDiv.attr("viewtableurl");
var templateData = jQuery.parseJSON( dataDiv.html() );
 
var numTotalPages = 0;
@@ -66,7 +67,7 @@
recreateData.createJobs( templateNum + 
1, 0, replaceOldRows );
} else {
// We're done.
-   $("#recreateDataProgress").html( "" 
+ mw.msg( 'cargo-recreatedata-success' ) + "" );
+   $("#recreateDataProgress").html( "" 
+ mw.msg( 'cargo-recreatedata-success' ) + "" + mw.msg( 'cargo-cargotables-viewtablelink' ) + "." );
}
}
});
diff --git a/specials/CargoRecreateData.php b/specials/CargoRecreateData.php
index cf82052..eaf8327 100644
--- a/specials/CargoRecreateData.php
+++ b/specials/CargoRecreateData.php
@@ -77,6 +77,9 @@
}
}
 
+   $ct = SpecialPage::getTitleFor( 'CargoTables' );
+   $viewTableURL = $ct->getInternalURL() . '/' . $this->mTableName;
+
// Store all the necesssary data on the page.
$text = Html::element( 'div', array(
'hidden' => 'true',
@@ -90,7 +93,8 @@
'apiurl' => $wgScriptPath . "/api.php",
'cargoscriptpath' => $cgScriptPath,
'tablename' => $this->mTableName,
-   'isdeclared' => $this->mIsDeclared
+   'isdeclared' => $this->mIsDeclared,
+   'viewtableurl' => $viewTableURL
), json_encode( $templateData ) );
 
// Simple form.

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

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

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

[MediaWiki-commits] [Gerrit] Added "view table" link to "table was recreated" text - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Added "view table" link to "table was recreated" text
..

Added "view table" link to "table was recreated" text

Change-Id: Ib698897b97d426b1dd3396b589f7f43503fe7bf8
---
M Cargo.php
M extension.json
M libs/ext.cargo.recreatedata.js
M specials/CargoRecreateData.php
4 files changed, 11 insertions(+), 4 deletions(-)


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

diff --git a/Cargo.php b/Cargo.php
index cfde10d..bcdfbbe 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -180,7 +180,8 @@
'dependencies' => 'mediawiki.jqueryMsg',
'messages' => array(
'cargo-recreatedata-tablecreated',
-   'cargo-recreatedata-success'
+   'cargo-recreatedata-success',
+   'cargo-cargotables-viewtablelink'
),
'position' => 'bottom',
'localBasePath' => __DIR__,
diff --git a/extension.json b/extension.json
index 5e8de13..7dfdc8f 100644
--- a/extension.json
+++ b/extension.json
@@ -118,7 +118,8 @@
"dependencies": "mediawiki.jqueryMsg",
"messages": [
"cargo-recreatedata-tablecreated",
-   "cargo-recreatedata-success"
+   "cargo-recreatedata-success",
+   "cargo-cargotables-viewtablelink"
],
"position": "bottom"
},
diff --git a/libs/ext.cargo.recreatedata.js b/libs/ext.cargo.recreatedata.js
index 70f2d1c..51c3fcb 100644
--- a/libs/ext.cargo.recreatedata.js
+++ b/libs/ext.cargo.recreatedata.js
@@ -17,6 +17,7 @@
var cargoScriptPath = dataDiv.attr("cargoscriptpath");
var tableName = dataDiv.attr("tablename");
var isDeclared = dataDiv.attr("isdeclared");
+   var viewTableURL = dataDiv.attr("viewtableurl");
var templateData = jQuery.parseJSON( dataDiv.html() );
 
var numTotalPages = 0;
@@ -66,7 +67,7 @@
recreateData.createJobs( templateNum + 
1, 0, replaceOldRows );
} else {
// We're done.
-   $("#recreateDataProgress").html( "" 
+ mw.msg( 'cargo-recreatedata-success' ) + "" );
+   $("#recreateDataProgress").html( "" 
+ mw.msg( 'cargo-recreatedata-success' ) + "" + mw.msg( 'cargo-cargotables-viewtablelink' ) + "." );
}
}
});
diff --git a/specials/CargoRecreateData.php b/specials/CargoRecreateData.php
index cf82052..eaf8327 100644
--- a/specials/CargoRecreateData.php
+++ b/specials/CargoRecreateData.php
@@ -77,6 +77,9 @@
}
}
 
+   $ct = SpecialPage::getTitleFor( 'CargoTables' );
+   $viewTableURL = $ct->getInternalURL() . '/' . $this->mTableName;
+
// Store all the necesssary data on the page.
$text = Html::element( 'div', array(
'hidden' => 'true',
@@ -90,7 +93,8 @@
'apiurl' => $wgScriptPath . "/api.php",
'cargoscriptpath' => $cgScriptPath,
'tablename' => $this->mTableName,
-   'isdeclared' => $this->mIsDeclared
+   'isdeclared' => $this->mIsDeclared,
+   'viewtableurl' => $viewTableURL
), json_encode( $templateData ) );
 
// Simple form.

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

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

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

[MediaWiki-commits] [Gerrit] Groups some tasks into sessions to improve performance - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Groups some tasks into sessions to improve performance
..

Groups some tasks into sessions to improve performance

Change-Id: I975a1fd44020e034a7a65b837c8715a97f308831
---
M modules/ve-mw/tests/browser/screenshots.js
1 file changed, 63 insertions(+), 44 deletions(-)


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

diff --git a/modules/ve-mw/tests/browser/screenshots.js 
b/modules/ve-mw/tests/browser/screenshots.js
index 2e062b9..1101ef1 100644
--- a/modules/ve-mw/tests/browser/screenshots.js
+++ b/modules/ve-mw/tests/browser/screenshots.js
@@ -12,16 +12,10 @@
 
test.beforeEach( function () {
driver = new chrome.Driver();
+
driver.manage().timeouts().setScriptTimeout( 2 );
driver.manage().window().setSize( 1200, 800 );
-   } );
 
-   test.afterEach( function () {
-   driver.quit();
-   } );
-
-   function runScreenshotTest( name, clientScript, padding ) {
-   var filename = __dirname + '/screenshots/' + name + '-' 
+ lang + '.png';
driver.get( 
'http://en.wikipedia.beta.wmflabs.org/wiki/PageDoesNotExist?veaction=edit='
 + lang );
driver.wait(
driver.executeAsyncScript(
@@ -53,6 +47,18 @@

boundingRect.height = boundingRect.bottom - boundingRect.top;
}
return 
boundingRect;
+   },
+   collapseToolbar: 
function () {
+   
ve.init.target.toolbar.items.forEach( function ( group ) {
+   if ( 
group.setActive ) {
+   
group.setActive( false );
+   }
+   } );
+   
ve.init.target.actionsToolbar.items.forEach( function ( group ) {
+   if ( 
group.setActive ) {
+   
group.setActive( false );
+   }
+   } );
}
};
 
@@ -74,17 +80,26 @@
} );
} );
}
-   ).then( function () {
-   return driver.executeAsyncScript( 
clientScript ).then( function ( rect ) {
-   return 
driver.takeScreenshot().then( function ( base64Image ) {
-   var imageBuffer;
-   if ( rect ) {
-   imageBuffer = 
new Buffer( base64Image, 'base64' );
-   return 
cropScreenshot( filename, imageBuffer, rect, padding );
-   } else {
-   fs.writeFile( 
filename, base64Image, 'base64' );
-   }
-   } );
+   )
+   );
+   } );
+
+   test.afterEach( function () {
+   driver.quit();
+   } );
+
+   function runScreenshotTest( name, clientScript, padding ) {
+   var filename = __dirname + '/screenshots/' + name + '-' 
+ lang + '.png';
+   driver.wait(
+   driver.executeAsyncScript( clientScript ).then( 
function ( rect ) {
+   return driver.takeScreenshot().then( 
function ( base64Image ) {
+   var imageBuffer;
+   if ( rect ) {
+   

[MediaWiki-commits] [Gerrit] Add overflow menu to card list items. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Add overflow menu to card list items.
..

Add overflow menu to card list items.

- Provides "save" and "share" options for any item in a card list.

Change-Id: I0f5c55363bd3e575858bc5107728181985b01c25
---
M app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
M app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
M app/src/main/res/layout/view_list_card_item.xml
A app/src/main/res/menu/menu_feed_card_item.xml
4 files changed, 65 insertions(+), 2 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java 
b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
index 6fc7a59..0e23ae3 100644
--- a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
@@ -4,7 +4,9 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.widget.RelativeLayout;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -14,10 +16,11 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class ListCardItemView extends RelativeLayout {
+public class ListCardItemView extends FrameLayout {
 @BindView(R.id.view_list_card_item_image) SimpleDraweeView imageView;
 @BindView(R.id.view_list_card_item_title) TextView titleView;
 @BindView(R.id.view_list_card_item_subtitle) TextView subtitleView;
+@BindView(R.id.view_list_card_item_menu) View menuView;
 
 public ListCardItemView(Context context) {
 super(context);
@@ -25,6 +28,8 @@
 inflate(getContext(), R.layout.view_list_card_item, this);
 setClickable(true);
 ButterKnife.bind(this);
+setLayoutParams(new 
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+ViewGroup.LayoutParams.WRAP_CONTENT));
 }
 
 @NonNull public ListCardItemView setImage(@Nullable Uri uri) {
diff --git 
a/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java 
b/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
index ff1e36f..ed8682e 100644
--- a/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
@@ -4,9 +4,12 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.PopupMenu;
 import android.text.TextUtils;
+import android.view.MenuItem;
 import android.view.View;
 
+import org.wikipedia.R;
 import org.wikipedia.feed.FeedViewCallback;
 import org.wikipedia.page.PageTitle;
 
@@ -24,6 +27,12 @@
 }
 }
 });
+menuView.setOnClickListener(new OnClickListener() {
+@Override
+public void onClick(View v) {
+showOverflowMenu(v);
+}
+});
 }
 
 @NonNull public PageTitleListCardItemView setCallback(@Nullable 
FeedViewCallback callback) {
@@ -38,4 +47,32 @@
 imageView.setImageURI(TextUtils.isEmpty(title.getThumbUrl()) ? null : 
Uri.parse(title.getThumbUrl()));
 return this;
 }
+
+private void showOverflowMenu(View anchorView) {
+PopupMenu menu = new PopupMenu(getContext(), anchorView);
+menu.getMenuInflater().inflate(R.menu.menu_feed_card_item, 
menu.getMenu());
+menu.setOnMenuItemClickListener(new CardMenuClickListener());
+menu.show();
+}
+
+private class CardMenuClickListener implements 
PopupMenu.OnMenuItemClickListener {
+@Override
+public boolean onMenuItemClick(MenuItem item) {
+switch (item.getItemId()) {
+case R.id.menu_feed_card_item_save:
+if (callback != null && title != null) {
+callback.onAddPageToList(title);
+}
+break;
+case R.id.menu_feed_card_item_share:
+if (callback != null && title != null) {
+callback.onSharePage(title);
+}
+break;
+default:
+break;
+}
+return false;
+}
+}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_list_card_item.xml 
b/app/src/main/res/layout/view_list_card_item.xml
index 6d80844..afe4ccc 100644
--- a/app/src/main/res/layout/view_list_card_item.xml
+++ b/app/src/main/res/layout/view_list_card_item.xml
@@ -1,5 +1,6 @@
 

[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2016-4 - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Chinese Conversion Table Update 2016-4
..


Chinese Conversion Table Update 2016-4

Update the Chinese conversion table routinely to fix bugs reported from
https://zh.wikipedia.org/wiki/Wikipedia:%E5%AD%97%E8%AF%8D%E8%BD%AC%E6%8D%A2/%E4%BF%AE%E5%A4%8D%E8%AF%B7%E6%B1%82
 .

It is only data changes and only works for Chinese WikiProjects.

Change-Id: I69a61766a9a1aa2cdb58d55434606afabba0e9b9
---
M languages/data/ZhConversion.php
M maintenance/language/zhtable/toCN.manual
M maintenance/language/zhtable/toHK.manual
M maintenance/language/zhtable/toTW.manual
M maintenance/language/zhtable/toTrad.manual
M maintenance/language/zhtable/tradphrases.manual
M maintenance/language/zhtable/tradphrases_exclude.manual
7 files changed, 51 insertions(+), 24 deletions(-)

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



diff --git a/languages/data/ZhConversion.php b/languages/data/ZhConversion.php
index b7943ed..87e957d 100644
--- a/languages/data/ZhConversion.php
+++ b/languages/data/ZhConversion.php
@@ -3567,6 +3567,8 @@
 '于康震' => '于康震',
 '于广洲' => '于廣洲',
 '于廣洲' => '于廣洲',
+'于建嵘' => '于建嶸',
+'于建嶸' => '于建嶸',
 '于式枚' => '于式枚',
 '于从濂' => '于從濂',
 '于從濂' => '于從濂',
@@ -5141,6 +5143,7 @@
 '吊贺迎送' => '弔賀迎送',
 '吊头' => '弔頭',
 '吊鹤' => '弔鶴',
+'引发' => '引發',
 '引斗' => '引鬥',
 '弘历' => '弘曆',
 '弘历史' => '弘歷史',
@@ -5154,6 +5157,7 @@
 '张柏芝' => '張栢芝',
 '张乐于张徐' => '張樂于張徐',
 '張樂于張徐' => '張樂于張徐',
+'強制' => '強制',
 '强制' => '強制',
 '强制作用' => '強制作用',
 '强奸' => '強姦',
@@ -5262,8 +5266,6 @@
 '心系一' => '心繫一',
 '心系世' => '心繫世',
 '心系中' => '心繫中',
-'心系乔' => '心繫乔',
-'心繫乔' => '心繫乔',
 '心系五' => '心繫五',
 '心系京' => '心繫京',
 '心系人' => '心繫人',
@@ -5288,6 +5290,7 @@
 '心系和' => '心繫和',
 '心系哪' => '心繫哪',
 '心系唐' => '心繫唐',
+'心系乔' => '心繫喬',
 '心系嘱' => '心繫囑',
 '心系四' => '心繫四',
 '心系困' => '心繫困',
@@ -5625,7 +5628,6 @@
 '挌斗' => '挌鬥',
 '挑大梁' => '挑大樑',
 '挑斗' => '挑鬥',
-'振荡' => '振蕩',
 '捉奸徒' => '捉奸徒',
 '捉奸细' => '捉奸細',
 '捉奸贼' => '捉奸賊',
@@ -6070,9 +6072,8 @@
 '李連杰' => '李連杰',
 '材干' => '材幹',
 '村落发' => '村落發',
-'村里' => '村裡',
-'村里長' => '村里長',
-'村里长' => '村里長',
+'村里有' => '村裡有',
+'村里的' => '村裡的',
 '杜老志道' => '杜老誌道',
 '杞宋无征' => '杞宋無徵',
 '束发' => '束髮',
@@ -6627,7 +6628,7 @@
 '营干' => '營幹',
 '烩面' => '燴麵',
 '烬余' => '燼餘',
-'爆发指数' => '爆發指數',
+'爆发' => '爆發',
 '争奇斗妍' => '爭奇鬥妍',
 '争奇斗异' => '爭奇鬥異',
 '争奇斗艳' => '爭奇鬥豔',
@@ -6989,6 +6990,7 @@
 '谷保家商' => '穀保家商',
 '谷仓' => '穀倉',
 '谷圭' => '穀圭',
+'谷城县' => '穀城縣',
 '谷场' => '穀場',
 '谷子' => '穀子',
 '谷日' => '穀日',
@@ -7583,6 +7585,7 @@
 '姜老辣' => '薑老辣',
 '姜茶' => '薑茶',
 '姜蓉' => '薑蓉',
+'姜还是老的辣' => '薑還是老的辣',
 '姜饼' => '薑餅',
 '姜黄' => '薑黃',
 '薙发' => '薙髮',
@@ -8433,7 +8436,6 @@
 '里海茨' => '里海茨',
 '里铺' => '里舖',
 '重回' => '重回',
-'重折' => '重摺',
 '重于' => '重於',
 '重罗面' => '重羅麵',
 '重制' => '重製',
@@ -8674,6 +8676,7 @@
 '陈杰' => '陳杰',
 '陳杰' => '陳杰',
 '陈炼' => '陳鍊',
+'陶制' => '陶製',
 '阳春面' => '陽春麵',
 '阳历' => '陽曆',
 '阳历史' => '陽歷史',
@@ -8725,6 +8728,7 @@
 '雪里红' => '雪裡紅',
 '雪里蕻' => '雪裡蕻',
 '云吞' => '雲吞',
+'云吞面' => '雲吞麵',
 '云笈七签' => '雲笈七籤',
 '云里雾里' => '雲裡霧裡',
 '云游' => '雲遊',
@@ -14287,6 +14291,7 @@
 '鼠标' => '滑鼠',
 '汉诺威' => '漢諾瓦',
 '漢诺威' => '漢諾瓦',
+'乌冬面' => '烏龍麵',
 '烤烟' => '烤菸',
 '烤煙' => '烤菸',
 '无烟日' => '無菸日',
@@ -15006,6 +15011,7 @@
 '來著述' => '來著述',
 '來著錄' => '來著錄',
 '侵占' => '侵佔',
+'促著' => '促着',
 '俄占' => '俄佔',
 '保障著' => '保障着',
 '保障著作' => '保障著作',
@@ -15085,8 +15091,6 @@
 '凶殘' => '兇殘',
 '凶殺' => '兇殺',
 '先占' => '先佔',
-'雪鐵龍' => '先進',
-'雪铁龙' => '先進',
 '光著' => '光着',
 '光著作' => '光著作',
 '光著名' => '光著名',
@@ -15275,6 +15279,7 @@
 '咖哩' => '咖喱',
 '麥克風' => '咪高峰',
 '麦克风' => '咪高峰',
+'咬著' => '咬着',
 '哥特式' => '哥德式',
 '哥斯大黎加' => '哥斯達黎加',
 '哪里' => '哪裏',
@@ -16105,7 +16110,8 @@
 '本著述' => '本著述',
 '本著錄' => '本著錄',
 '里瓦尔多' => '李華度',
-'村里' => '村裏',
+'村里有' => '村裏有',
+'村里的' => '村裏的',
 '杜塞道夫' => '杜塞爾多夫',
 '迪拜' => '杜拜',
 '東協助' => '東協助',
@@ -16343,6 +16349,7 @@
 '為著者' => '為著者',
 '為著述' => '為著述',
 '為著錄' => '為著錄',
+'烏龍麵' => '烏冬麵',
 '菸' => '煙',
 '照占' => '照佔',
 '照著' => '照着',
@@ -17768,6 +17775,7 @@
 '麗著者' => '丽著者',
 '麗著述' => '丽著述',
 '麼著' => '么着',
+'烏龍麵' => '乌冬面',
 '樂著' => '乐着',
 '樂著書' => '乐著书',
 '樂著作' => '乐著作',
@@ -17897,7 +17905,9 @@
 '側著述' => '侧著述',
 '可攜式' => '便携式',
 '攜帶型' => '便携式',
+'促著' => '促着',
 '保護著' => '保护着',
+'保鑣' => '保镖',
 '保障著' => '保障着',
 '保障著書' => '保障著书',
 '保障著作' => '保障著作',
@@ -18233,6 +18243,7 @@
 '味著述' => '味著述',
 '咖哩' => '咖喱',
 '諮' => '咨',
+'咬著' => '咬着',
 '響著' => '响着',
 '響著書' => '响著书',
 '響著作' => '响著作',
diff --git a/maintenance/language/zhtable/toCN.manual 
b/maintenance/language/zhtable/toCN.manual
index 6cc3b68..a81422d 100644
--- a/maintenance/language/zhtable/toCN.manual
+++ b/maintenance/language/zhtable/toCN.manual
@@ -64,6 +64,7 @@
 澈底 彻底
 仲介 中介
 卯足 铆足
+保鑣 保镖
 逕庭 径庭
 逕到 径到
 逕取 径取
@@ -2183,6 +2184,8 @@
 記錄著记录着
 紀錄著纪录着
 收錄著收录着
+促著 促着
+咬著 咬着
 三十六著   三十六着
 走為上著   走为上着
 記憶體内存
@@ -2665,3 +2668,4 @@
 行人路權   行人路权
 行人路权   行人路权
 塑膠袋塑料袋
+烏龍麵乌冬面
diff --git a/maintenance/language/zhtable/toHK.manual 

[MediaWiki-commits] [Gerrit] travis.yml changes - change (wikimedia/slimapp)

[jenkins-bot (Code Review)]

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

Change subject: travis.yml changes
..


travis.yml changes

* Include deps when updating codesniffer and phpunit
* Exclude HHVM failures again. The bug is fixed, but only with HHVM >=
  3.10.0 and Travis uses and older version from Ubuntu.
* Add PHP 7 and hhvm-nightly test targets

Change-Id: Iee80414f217f4c73d62dc449c979e7c81d16a2f0
---
M .travis.yml
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/.travis.yml b/.travis.yml
index 46bda53..811c70d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,18 @@
   - "5.4"
   - "5.5"
   - "5.6"
+  - "7.0"
   - "hhvm"
+  - "hhvm-nightly"
+matrix:
+  allow_failures:
+- php: "hhvm"  # need HHVM >= 3.10.0
 sudo: false
 env:
   global:
 - COMPOSER_DISABLE_XDEBUG_WARN=1
 install:
   - composer install
-  - composer update mediawiki/mediawiki-codesniffer phpunit/phpunit
+  - composer update --with-dependencies mediawiki/mediawiki-codesniffer 
phpunit/phpunit
 script:
   - composer test

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee80414f217f4c73d62dc449c979e7c81d16a2f0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/slimapp
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] travis.yml changes - change (wikimedia/slimapp)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: travis.yml changes
..

travis.yml changes

* Include deps when updating codesniffer and phpunit
* Exclude HHVM failures again. The bug is fixed, but only with HHVM >=
  3.10.0 and Travis uses and older version from Ubuntu.
* Add PHP 7 and hhvm-nightly test targets

Change-Id: Iee80414f217f4c73d62dc449c979e7c81d16a2f0
---
M .travis.yml
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/slimapp 
refs/changes/60/295960/1

diff --git a/.travis.yml b/.travis.yml
index 46bda53..811c70d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,18 @@
   - "5.4"
   - "5.5"
   - "5.6"
+  - "7.0"
   - "hhvm"
+  - "hhvm-nightly"
+matrix:
+  allow_failures:
+- php: "hhvm"  # need HHVM >= 3.10.0
 sudo: false
 env:
   global:
 - COMPOSER_DISABLE_XDEBUG_WARN=1
 install:
   - composer install
-  - composer update mediawiki/mediawiki-codesniffer phpunit/phpunit
+  - composer update --with-dependencies mediawiki/mediawiki-codesniffer 
phpunit/phpunit
 script:
   - composer test

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee80414f217f4c73d62dc449c979e7c81d16a2f0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/slimapp
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] Password::hashEquals: Guard against bad input - change (wikimedia/slimapp)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Password::hashEquals: Guard against bad input
..

Password::hashEquals: Guard against bad input

Hoist the is_string() checks made when a native hash_equals
implementation is not available to the top of the function. This will
remove warnings produced by some test cases without altering behavior.

Change-Id: I8c7f71ebd86214e82607d6d86e94a3cec8ebbfd8
---
M src/Auth/Password.php
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/slimapp 
refs/changes/61/295961/1

diff --git a/src/Auth/Password.php b/src/Auth/Password.php
index bd9a202..6ad3244 100644
--- a/src/Auth/Password.php
+++ b/src/Auth/Password.php
@@ -247,18 +247,18 @@
 * @return bool True if the strings are the same, false otherwise
 */
public static function hashEquals( $known, $input ) {
+   if ( !is_string( $known ) ) {
+   return false;
+   }
+   if ( !is_string( $input ) ) {
+   return false;
+   }
+
if ( function_exists( 'hash_equals' ) ) {
return hash_equals( $known, $input );
 
} else {
// hash_equals() polyfill taken from MediaWiki
-   if ( !is_string( $known ) ) {
-   return false;
-   }
-   if ( !is_string( $input ) ) {
-   return false;
-   }
-
$len = strlen( $known );
if ( $len !== strlen( $input ) ) {
return false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c7f71ebd86214e82607d6d86e94a3cec8ebbfd8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/slimapp
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] Make CentralAuth explicitly say which cookies need to be ext... - change (mediawiki...CentralAuth)

[jenkins-bot (Code Review)]

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

Change subject: Make CentralAuth explicitly say which cookies need to be 
extended
..


Make CentralAuth explicitly say which cookies need to be extended

We don't want to rely on a $wg config variable for this (users
shouldn't need to understand cookie implementation details), so change
it to use a code-defined list instead.  This just uses the list
from CookieSessionProvider in core, and adds 'User'.

Bug: T68699
Depends-On: Ia3259846433980408f79d44f665e17e15670e8ee
Change-Id: I229dbc9f097bb0efc5e3e45c6a3b98ffcf9527e2
---
M includes/session/CentralAuthSessionProvider.php
M tests/phpunit/CentralAuthSessionProviderTest.php
2 files changed, 17 insertions(+), 15 deletions(-)

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



diff --git a/includes/session/CentralAuthSessionProvider.php 
b/includes/session/CentralAuthSessionProvider.php
index 13edb07..b867d0e 100644
--- a/includes/session/CentralAuthSessionProvider.php
+++ b/includes/session/CentralAuthSessionProvider.php
@@ -328,7 +328,7 @@
if ( $value === false ) {
$response->clearCookie( $name, $options 
);
} else {
-   $expirationDuration = 
$this->getLoginCookieExpiration( $name );
+   $expirationDuration = 
$this->getLoginCookieExpiration( $name, $remember );
$expiration = $expirationDuration ? 
$expirationDuration + time() : null;
$response->setCookie( $name, 
(string)$value, $expiration, $options );
}
@@ -422,8 +422,13 @@
if ( !$sameCookie ) {
parent::setForceHTTPSCookie( false, $backend, 
$request );
}
-   if ( $backend->shouldRememberUser() ) {
-   $expirationDuration = 
$this->getLoginCookieExpiration( 'forceHTTPS' );
+
+   $shouldRemember = $backend->shouldRememberUser();
+   if ( $shouldRemember ) {
+   $expirationDuration = 
$this->getLoginCookieExpiration(
+   'forceHTTPS',
+   /* $shouldRememberUser */ true
+   );
$expiration = $expirationDuration ? 
$expirationDuration + time() : null;
} else {
$expiration = null;
@@ -478,6 +483,12 @@
return $this->centralCookieOptions['domain'];
}
 
+   protected function getExtendedLoginCookies() {
+   $cookies = parent::getExtendedLoginCookies();
+   $cookies[] = 'User';
+   return $cookies;
+   }
+
public function getRememberUserDuration() {
// CentralAuth needs User and Token cookies to remember the 
user. The fallback to
// sessions needs UserID as well, so if that one has shorter 
expiration, the remember
@@ -485,9 +496,9 @@
// duration in that case.
 
return min(
-   $this->getLoginCookieExpiration( 'User' ),
-   $this->getLoginCookieExpiration( 'Token' ),
-   $this->getLoginCookieExpiration( 'UserID' )
+   $this->getLoginCookieExpiration( 'User', /* 
$shouldRememberUser */ true ),
+   $this->getLoginCookieExpiration( 'Token', /* 
$shouldRememberUser */ true ),
+   $this->getLoginCookieExpiration( 'UserID', /* 
$shouldRememberUser */ true )
) ?: null;
}
 }
diff --git a/tests/phpunit/CentralAuthSessionProviderTest.php 
b/tests/phpunit/CentralAuthSessionProviderTest.php
index a9d4ee9..ff328a4 100644
--- a/tests/phpunit/CentralAuthSessionProviderTest.php
+++ b/tests/phpunit/CentralAuthSessionProviderTest.php
@@ -34,7 +34,6 @@
$config = new HashConfig( [
'CookieExpiration' => 100,
'ExtendedLoginCookieExpiration' => 200,
-   'ExtendedLoginCookies' => [ 'User', 'UserID', 'Token' ],
// these are needed by CookieSessionProvider::getConfig
'SessionName' => null,
'CookiePrefix' => '',
@@ -47,13 +46,5 @@
$provider->setConfig( $config );
 
$this->assertSame( 200, $provider->getRememberUserDuration() );
-
-   $config->set( 'ExtendedLoginCookies', [ 'UserID', 'Token' ] );
-
-   $this->assertSame( 100, $provider->getRememberUserDuration() );
-
-   $config->set( 'ExtendedLoginCookies', [ 'User', 'Token' ] );
-
- 

[MediaWiki-commits] [Gerrit] Extended login: Don't use a $wg config variable, add UserName - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Extended login: Don't use a $wg config variable, add UserName
..


Extended login: Don't use a $wg config variable, add UserName

CentralAuth needs 'User' as well for this to work.  However, this
shows the exact cookie names are an implementation detail that should
not be exposed as a 'wg'.

Instead, use a function in the CookieSessionProvider.  That way,
CentralAuth can override it properly without requiring users to change
$wg's.

I also added UserName. provideSessionInfo will fail to return
session info if UserID and UserName are both set and don't match.

Also, the UserID<->UserName mapping is public, so there is no
additional privacy issue.  Thus, it seems we should expire them
the same time.

Bug: T68699
Change-Id: Ia3259846433980408f79d44f665e17e15670e8ee
---
M RELEASE-NOTES-1.28
M includes/DefaultSettings.php
M includes/session/CookieSessionProvider.php
M tests/phpunit/includes/session/CookieSessionProviderTest.php
4 files changed, 55 insertions(+), 25 deletions(-)

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



diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 6beeac9..c625143 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -51,6 +51,8 @@
 
 === Other changes in 1.28 ===
 * (T128697) Improved handling of large diffs.
+* [BREAKING CHANGE] $wgExtendedLoginCookies has been removed.  You can
+  use or update a custom session provider if needed.
 
 == Compatibility ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f176556..39e22a0 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5818,14 +5818,6 @@
 $wgCookieExpiration = 180 * 86400;
 
 /**
- * The identifiers of the login cookies that can have their lifetimes
- * extended independently of all other login cookies.
- *
- * @var string[]
- */
-$wgExtendedLoginCookies = [ 'UserID', 'Token' ];
-
-/**
  * Default login cookie lifetime, in seconds. Setting
  * $wgExtendLoginCookieExpiration to null will use $wgCookieExpiration to
  * calculate the cookie lifetime. As with $wgCookieExpiration, 0 will make
diff --git a/includes/session/CookieSessionProvider.php 
b/includes/session/CookieSessionProvider.php
index 3df0dae..79fc720 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -221,7 +221,7 @@
if ( $value === false ) {
$response->clearCookie( $key, $options );
} else {
-   $expirationDuration = 
$this->getLoginCookieExpiration( $key );
+   $expirationDuration = 
$this->getLoginCookieExpiration( $key, $session->shouldRememberUser() );
$expiration = $expirationDuration ? 
$expirationDuration + time() : null;
$response->setCookie( $key, (string)$value, 
$expiration, $options );
}
@@ -271,7 +271,10 @@
$response = $request->response();
if ( $set ) {
if ( $backend->shouldRememberUser() ) {
-   $expirationDuration = 
$this->getLoginCookieExpiration( 'forceHTTPS' );
+   $expirationDuration = 
$this->getLoginCookieExpiration(
+   'forceHTTPS',
+   true
+   );
$expiration = $expirationDuration ? 
$expirationDuration + time() : null;
} else {
$expiration = null;
@@ -397,23 +400,40 @@
}
 
public function getRememberUserDuration() {
-   return min( $this->getLoginCookieExpiration( 'UserID' ),
-   $this->getLoginCookieExpiration( 'Token' ) ) ?: null;
+   return min( $this->getLoginCookieExpiration( 'UserID', true ),
+   $this->getLoginCookieExpiration( 'Token', true ) ) ?: 
null;
+   }
+
+   /**
+* Gets the list of cookies that must be set to the 'remember me' 
duration,
+* if $wgExtendedLoginCookieExpiration is in use.
+*
+* @return string[] Array of unprefixed cookie keys
+*/
+   protected function getExtendedLoginCookies() {
+   return [ 'UserID', 'UserName', 'Token' ];
}
 
/**
 * Returns the lifespan of the login cookies, in seconds. 0 means until 
the end of the session.
+*
+* Cookies that are session-length do not call this function.
+*
 * @param string $cookieName
+* @param boolean $shouldRememberUser Whether the user should be 
remembered
+*   long-term
 * @return int Cookie expiration time in seconds; 0 for session 

[MediaWiki-commits] [Gerrit] Add multi-language support for screenshots - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Add multi-language support for screenshots
..

Add multi-language support for screenshots

Change-Id: I1da41cffd946a76e5f09097decbc0a25562c9508
---
M Gruntfile.js
A modules/ve-mw/tests/browser/screenshotLangs.json
M modules/ve-mw/tests/browser/screenshots.js
3 files changed, 379 insertions(+), 259 deletions(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
index 8796fd5..3bc8b84 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -56,10 +56,29 @@
}
},
mochaTest: {
-   screenshots: {
+   'screenshots-en': {
options: {
reporter: 'spec',
-   timeout: 2
+   timeout: 2,
+   require: [
+   function () {
+   /* jshint undef:false */
+   langs = [ 'en' ];
+   }
+   ]
+   },
+   src: [ 
'modules/ve-mw/tests/browser/screenshots.js' ]
+   },
+   'screenshots-all': {
+   options: {
+   reporter: 'spec',
+   timeout: 2,
+   require: [
+   function () {
+   /* jshint undef:false */
+   langs = require( 
'./modules/ve-mw/tests/browser/screenshotLangs.json' ).langs;
+   }
+   ]
},
src: [ 
'modules/ve-mw/tests/browser/screenshots.js' ]
}
@@ -163,7 +182,8 @@
grunt.registerTask( 'fix', [ 'jscs:fix' ] );
grunt.registerTask( 'test', [ 'build', 'lint' ] );
grunt.registerTask( 'test-ci', [ 'git-status' ] );
-   grunt.registerTask( 'screenshots', [ 'mochaTest:screenshots' ] );
+   grunt.registerTask( 'screenshots', [ 'mochaTest:screenshots-en' ] );
+   grunt.registerTask( 'screenshots-all', [ 'mochaTest:screenshots-all' ] 
);
grunt.registerTask( 'default', 'test' );
 
if ( process.env.JENKINS_HOME ) {
diff --git a/modules/ve-mw/tests/browser/screenshotLangs.json 
b/modules/ve-mw/tests/browser/screenshotLangs.json
new file mode 100644
index 000..3697a39
--- /dev/null
+++ b/modules/ve-mw/tests/browser/screenshotLangs.json
@@ -0,0 +1,95 @@
+{
+   "langs": [
+   "ar",
+   "as",
+   "ast",
+   "az",
+   "azb",
+   "bcl",
+   "be-tarask",
+   "bg",
+   "bn",
+   "bs",
+   "ca",
+   "cdo",
+   "ceb",
+   "cs",
+   "cy",
+   "da",
+   "de",
+   "diq",
+   "egl",
+   "el",
+   "eml",
+   "en",
+   "en-gb",
+   "eo",
+   "es",
+   "et",
+   "eu",
+   "fa",
+   "fi",
+   "fo",
+   "fr",
+   "fur",
+   "fy",
+   "gl",
+   "he",
+   "hi",
+   "hif",
+   "hr",
+   "hu",
+   "hy",
+   "id",
+   "ie",
+   "ilo",
+   "it",
+   "ja",
+   "jv",
+   "ka",
+   "km",
+   "kn",
+   "ko",
+   "lb",
+   "lt",
+   "lv",
+   "mai",
+   "mg",
+   "mk",
+   "ml",
+   "mr",
+   "ms",
+   "nap",
+   "nb",
+   "nl",
+   "om",
+   "or",
+   "pa",
+   "pcd",
+   "pl",
+   "ps",
+   "pt",
+   "pt-br",
+   "ro",
+   "ru",
+   "sah",
+   "sco",
+   "sd",
+   "sk",
+   "sl",
+   "sq",
+   "sr",
+   "su",
+   "sv",
+   "ta",
+  

[MediaWiki-commits] [Gerrit] English Wikipedia uses legacy main page formatting - change (operations/mediawiki-config)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: English Wikipedia uses legacy main page formatting
..

English Wikipedia uses legacy main page formatting

English Wikipedia uses a table based layout.
It should have been in the mobilemainpagelegacy.dblist
but was excluded from the results of the audit scripts
due to the fact it uses
mp- prefixes rather than mf- prefixes (this is badly
documented but apparently supported)

I am going to re-run the audit script to check for mp- prefixes
in case other wikis are impacted. I'll fold them into this patch
before SWAT.

Bug: T138578
Change-Id: Ib6e448b27a9dd7635d325e8f7b0ca9dac32ae5af
---
M dblists/mobilemainpagelegacy.dblist
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/dblists/mobilemainpagelegacy.dblist 
b/dblists/mobilemainpagelegacy.dblist
index 6624093..310f236 100644
--- a/dblists/mobilemainpagelegacy.dblist
+++ b/dblists/mobilemainpagelegacy.dblist
@@ -50,6 +50,7 @@
 elwikivoyage
 elwiktionary
 enwikibooks
+enwiki
 enwikinews
 enwikiquote
 enwikisource

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

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

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

[MediaWiki-commits] [Gerrit] Added Dutch translation - change (mediawiki...Gadgets)

[Mbch331 (Code Review)]

Mbch331 has uploaded a new change for review.

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

Change subject: Added Dutch translation
..

Added Dutch translation

Bug T138183
Change-Id: Icf673c64a284942f515d625fec9322be9e5321fc
---
M Gadgets.namespaces.php
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/Gadgets.namespaces.php b/Gadgets.namespaces.php
index 51d906a..bbcf184 100644
--- a/Gadgets.namespaces.php
+++ b/Gadgets.namespaces.php
@@ -142,6 +142,13 @@
NS_GADGET_DEFINITION_TALK => 'گجت_توضیحات_گپ',
 );
 
+$namespaceNames['nl'] = array(
+   NS_GADGET => 'Extensie',
+   NS_GADGET_TALK => 'Overleg extensie',
+   NS_GADGET_DEFINITION => 'Extensie definitie',
+   NS_GADGET_DEFINITION_TALK => 'Extensie definities',
+);
+
 $namespaceNames['or'] = array(
NS_GADGET => 'ଗ୍ୟାଜେଟ',
NS_GADGET_TALK => 'ଗ୍ୟାଜେଟ_ଆଲୋଚନା',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf673c64a284942f515d625fec9322be9e5321fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Mbch331 

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

[MediaWiki-commits] [Gerrit] Fix composer.lock and .travis.yaml for testing on PHP <5.5 - change (wikimedia/slimapp)

[jenkins-bot (Code Review)]

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

Change subject: Fix composer.lock and .travis.yaml for testing on PHP <5.5
..


Fix composer.lock and .travis.yaml for testing on PHP <5.5

The composer.json file was setup properly for testing on older versions
of PHP, but the composer.lock that was committed in 58b42af included
pinned versions that require PHP 5.5+.

Fix this by reset the pinned versions to versions that work with PHP
5.3+ and add a Travis step to upgrade phpunit and mediawiki-codesniffer
to newer versions when the PHP version supports them.

Change-Id: Ic8525031e2fe48960fd6f6413954724f9a6e2820
---
M .travis.yml
M composer.lock
2 files changed, 38 insertions(+), 137 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 6cc9250..46bda53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,12 @@
   - "5.5"
   - "5.6"
   - "hhvm"
-matrix:
-  allow_failures:
-- php: "hhvm" # https://github.com/facebook/hhvm/issues/5836
 sudo: false
+env:
+  global:
+- COMPOSER_DISABLE_XDEBUG_WARN=1
 install:
   - composer install
+  - composer update mediawiki/mediawiki-codesniffer phpunit/phpunit
 script:
   - composer test
diff --git a/composer.lock b/composer.lock
index f674f09..77cd220 100644
--- a/composer.lock
+++ b/composer.lock
@@ -549,26 +549,24 @@
 },
 {
 "name": "mediawiki/mediawiki-codesniffer",
-"version": "v0.7.2",
+"version": "v0.5.1",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-tools-codesniffer.git;,
-"reference": "6b713bcbb9c20a3bdad76f9477458c9b4ae0773b"
+"reference": "e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/6b713bcbb9c20a3bdad76f9477458c9b4ae0773b;,
-"reference": "6b713bcbb9c20a3bdad76f9477458c9b4ae0773b",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50;,
+"reference": "e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50",
 "shasum": ""
 },
 "require": {
-"php": ">= 5.5.9",
-"squizlabs/php_codesniffer": "2.6.0"
+"squizlabs/php_codesniffer": "2.5.0"
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.*",
-"mikey179/vfsstream": "~1.6",
-"phpunit/phpunit": "~4.1"
+"phpunit/phpunit": "~4.8.18"
 },
 "type": "library",
 "notification-url": "https://packagist.org/downloads/;,
@@ -581,138 +579,41 @@
 "codesniffer",
 "mediawiki"
 ],
-"time": "2016-05-28 01:08:59"
-},
-{
-"name": "phpdocumentor/reflection-common",
-"version": "1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/phpDocumentor/ReflectionCommon.git;,
-"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c;,
-"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-"shasum": ""
-},
-"require": {
-"php": ">=5.5"
-},
-"require-dev": {
-"phpunit/phpunit": "^4.6"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0.x-dev"
-}
-},
-"autoload": {
-"psr-4": {
-"phpDocumentor\\Reflection\\": [
-"src"
-]
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Jaap van Otterdijk",
-"email": "opensou...@ijaap.nl"
-}
-],
-"description": "Common reflection classes used by phpdocumentor to 
reflect the code structure",
-"homepage": "http://www.phpdoc.org;,
-"keywords": [
-"FQSEN",
-"phpDocumentor",
-"phpdoc",
-"reflection",
-"static analysis"
-],
-"time": "2015-12-27 

[MediaWiki-commits] [Gerrit] Fix composer.lock and .travis.yaml for testing on PHP <5.5 - change (wikimedia/slimapp)

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Fix composer.lock and .travis.yaml for testing on PHP <5.5
..

Fix composer.lock and .travis.yaml for testing on PHP <5.5

The composer.json file was setup properly for testing on older versions
of PHP, but the composer.lock that was committed in 58b42af included
pinned versions that require PHP 5.5+.

Fix this by reset the pinned versions to versions that work with PHP
5.3+ and add a Travis step to upgrade phpunit and mediawiki-codesniffer
to newer versions when the PHP version supports them.

Change-Id: Ic8525031e2fe48960fd6f6413954724f9a6e2820
---
M .travis.yml
M composer.lock
2 files changed, 38 insertions(+), 137 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/slimapp 
refs/changes/56/295956/1

diff --git a/.travis.yml b/.travis.yml
index 6cc9250..46bda53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,12 @@
   - "5.5"
   - "5.6"
   - "hhvm"
-matrix:
-  allow_failures:
-- php: "hhvm" # https://github.com/facebook/hhvm/issues/5836
 sudo: false
+env:
+  global:
+- COMPOSER_DISABLE_XDEBUG_WARN=1
 install:
   - composer install
+  - composer update mediawiki/mediawiki-codesniffer phpunit/phpunit
 script:
   - composer test
diff --git a/composer.lock b/composer.lock
index f674f09..77cd220 100644
--- a/composer.lock
+++ b/composer.lock
@@ -549,26 +549,24 @@
 },
 {
 "name": "mediawiki/mediawiki-codesniffer",
-"version": "v0.7.2",
+"version": "v0.5.1",
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-tools-codesniffer.git;,
-"reference": "6b713bcbb9c20a3bdad76f9477458c9b4ae0773b"
+"reference": "e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/6b713bcbb9c20a3bdad76f9477458c9b4ae0773b;,
-"reference": "6b713bcbb9c20a3bdad76f9477458c9b4ae0773b",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50;,
+"reference": "e1ee95d0beb1c0eed8d98b6e4aa322130ac04d50",
 "shasum": ""
 },
 "require": {
-"php": ">= 5.5.9",
-"squizlabs/php_codesniffer": "2.6.0"
+"squizlabs/php_codesniffer": "2.5.0"
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.*",
-"mikey179/vfsstream": "~1.6",
-"phpunit/phpunit": "~4.1"
+"phpunit/phpunit": "~4.8.18"
 },
 "type": "library",
 "notification-url": "https://packagist.org/downloads/;,
@@ -581,138 +579,41 @@
 "codesniffer",
 "mediawiki"
 ],
-"time": "2016-05-28 01:08:59"
-},
-{
-"name": "phpdocumentor/reflection-common",
-"version": "1.0",
-"source": {
-"type": "git",
-"url": "https://github.com/phpDocumentor/ReflectionCommon.git;,
-"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c;,
-"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-"shasum": ""
-},
-"require": {
-"php": ">=5.5"
-},
-"require-dev": {
-"phpunit/phpunit": "^4.6"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "1.0.x-dev"
-}
-},
-"autoload": {
-"psr-4": {
-"phpDocumentor\\Reflection\\": [
-"src"
-]
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Jaap van Otterdijk",
-"email": "opensou...@ijaap.nl"
-}
-],
-"description": "Common reflection classes used by phpdocumentor to 
reflect the code structure",
-"homepage": "http://www.phpdoc.org;,
-"keywords": [
-"FQSEN",
-"phpDocumentor",
-"phpdoc",
-"reflection",
-"static analysis"
- 

[MediaWiki-commits] [Gerrit] Update change-propagation to 472767b - change (mediawiki...deploy)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Update change-propagation to 472767b
..


Update change-propagation to 472767b

List of changes:
5f2933e Support per-rule concurrency settings (#64)
f8462df Decode error before constructing a retry message (#65)
3c9177d Restructure config so that indentation matches puppet (#63)
472767b Release v0.3.6 (#66)
xxx Update node module dependencies

Change-Id: Ibc3ddcce21323639c739721a5075d1f03f4e94ae
---
M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
M node_modules/hyperswitch/node_modules/preq/index.js
M node_modules/hyperswitch/node_modules/preq/package.json
M node_modules/hyperswitch/node_modules/swagger-ui/package.json
M 
node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
M 
node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
M node_modules/semver/.travis.yml
M node_modules/semver/package.json
M node_modules/semver/range.bnf
M node_modules/semver/semver.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/wmf-kafka-node/node_modules/snappy/build/Release/obj.target/deps/snappy/snappy.a
M node_modules/wmf-kafka-node/node_modules/snappy/build/Release/snappy.a
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/inherits/package.json
D 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/.npmignore
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/index.js
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/package.json
D 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/test/index.js
M src
21 files changed, 89 insertions(+), 121 deletions(-)

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



diff --git 
a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json 
b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
index 1df24a5..b379b71 100644
--- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
+++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
 "url": "https://github.com/substack/json-stable-stringify/issues;
   },
   "_id": "json-stable-stringify@1.0.0",
-  "_shasum": "aaf6bd9c46475926e62a4caff62d64d2eac70572",
+  "_shasum": "eedc7e57df7dafcc71defa31a4054e4fc4cf6279",
   "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f;
 }
diff --git a/node_modules/hyperswitch/node_modules/preq/index.js 
b/node_modules/hyperswitch/node_modules/preq/index.js
index 405c6ff..ec65eed 100644
--- a/node_modules/hyperswitch/node_modules/preq/index.js
+++ b/node_modules/hyperswitch/node_modules/preq/index.js
@@ -3,6 +3,7 @@
 var P = require('bluebird');
 var url = require('url');
 var util = require('util');
+var querystring = require('querystring');
 
 function setupConnectionTimeout(protocol) {
 var http = require(protocol);
@@ -195,7 +196,12 @@
 };
 
 // Check if we were redirected
-if (self.options.uri !== response.request.uri.href) {
+var origURI = self.options.uri;
+if (self.options.qs && Object.keys(self.options.qs).length) {
+origURI += '?' + querystring.stringify(self.options.qs);
+}
+
+if (origURI !== response.request.uri.href) {
 if (!res.headers['content-location']) {
 // Indicate the redirect via an injected Content-Location
 // header
diff --git a/node_modules/hyperswitch/node_modules/preq/package.json 
b/node_modules/hyperswitch/node_modules/preq/package.json
index 0182b27..0376567 100644
--- a/node_modules/hyperswitch/node_modules/preq/package.json
+++ b/node_modules/hyperswitch/node_modules/preq/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preq",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Yet another promising request wrapper",
   "main": "index.js",
   "scripts": {
@@ -23,18 

[MediaWiki-commits] [Gerrit] Update change-propagation to 472767b - change (mediawiki...deploy)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Update change-propagation to 472767b
..

Update change-propagation to 472767b

List of changes:
5f2933e Support per-rule concurrency settings (#64)
f8462df Decode error before constructing a retry message (#65)
3c9177d Restructure config so that indentation matches puppet (#63)
472767b Release v0.3.6 (#66)
xxx Update node module dependencies

Change-Id: Ibc3ddcce21323639c739721a5075d1f03f4e94ae
---
M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
M node_modules/hyperswitch/node_modules/preq/index.js
M node_modules/hyperswitch/node_modules/preq/package.json
M node_modules/hyperswitch/node_modules/swagger-ui/package.json
M 
node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
M 
node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
M node_modules/semver/.travis.yml
M node_modules/semver/package.json
M node_modules/semver/range.bnf
M node_modules/semver/semver.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/wmf-kafka-node/node_modules/snappy/build/Release/obj.target/deps/snappy/snappy.a
M node_modules/wmf-kafka-node/node_modules/snappy/build/Release/snappy.a
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/readable-stream/node_modules/inherits/package.json
D 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/.npmignore
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/index.js
M 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/package.json
D 
node_modules/wmf-kafka-node/node_modules/snappy/node_modules/node-gyp/node_modules/npmlog/node_modules/gauge/node_modules/has-unicode/test/index.js
M src
21 files changed, 89 insertions(+), 121 deletions(-)


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

diff --git 
a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json 
b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
index 1df24a5..b379b71 100644
--- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
+++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
 "url": "https://github.com/substack/json-stable-stringify/issues;
   },
   "_id": "json-stable-stringify@1.0.0",
-  "_shasum": "aaf6bd9c46475926e62a4caff62d64d2eac70572",
+  "_shasum": "eedc7e57df7dafcc71defa31a4054e4fc4cf6279",
   "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f;
 }
diff --git a/node_modules/hyperswitch/node_modules/preq/index.js 
b/node_modules/hyperswitch/node_modules/preq/index.js
index 405c6ff..ec65eed 100644
--- a/node_modules/hyperswitch/node_modules/preq/index.js
+++ b/node_modules/hyperswitch/node_modules/preq/index.js
@@ -3,6 +3,7 @@
 var P = require('bluebird');
 var url = require('url');
 var util = require('util');
+var querystring = require('querystring');
 
 function setupConnectionTimeout(protocol) {
 var http = require(protocol);
@@ -195,7 +196,12 @@
 };
 
 // Check if we were redirected
-if (self.options.uri !== response.request.uri.href) {
+var origURI = self.options.uri;
+if (self.options.qs && Object.keys(self.options.qs).length) {
+origURI += '?' + querystring.stringify(self.options.qs);
+}
+
+if (origURI !== response.request.uri.href) {
 if (!res.headers['content-location']) {
 // Indicate the redirect via an injected Content-Location
 // header
diff --git a/node_modules/hyperswitch/node_modules/preq/package.json 
b/node_modules/hyperswitch/node_modules/preq/package.json
index 0182b27..0376567 100644
--- a/node_modules/hyperswitch/node_modules/preq/package.json
+++ b/node_modules/hyperswitch/node_modules/preq/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preq",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": 

[MediaWiki-commits] [Gerrit] Change-Prop: Limit the concurrency for ORES - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Change-Prop: Limit the concurrency for ORES
..


Change-Prop: Limit the concurrency for ORES

After restarting change-prop it could put significant load on
ORES which it can't handle, so limit the concurrency to 15
that should result in ~10 req/s to ORES.

Change-Id: I4d3d1e58b403268cab856835592f880e2918a13b
---
M modules/changeprop/templates/config.yaml.erb
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Mobrovac: Looks good to me, but someone else must approve
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/changeprop/templates/config.yaml.erb 
b/modules/changeprop/templates/config.yaml.erb
index 5c8a592..2a4f852 100644
--- a/modules/changeprop/templates/config.yaml.erb
+++ b/modules/changeprop/templates/config.yaml.erb
@@ -219,6 +219,7 @@
   # ORES caching updates
   ores_cache:
 topic: mediawiki.revision_create
+concurrency: 15
 cases:
   - match:
   meta:

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

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

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

[MediaWiki-commits] [Gerrit] Change-Prop: Limit the concurrency for ORES - change (operations/puppet)

[Ppchelko (Code Review)]

Ppchelko has uploaded a new change for review.

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

Change subject: Change-Prop: Limit the concurrency for ORES
..

Change-Prop: Limit the concurrency for ORES

After restarting change-prop it could put significant load on
ORES which it can't handle, so limit the concurrency to 15
that should result in ~10 req/s to ORES.

Change-Id: I4d3d1e58b403268cab856835592f880e2918a13b
---
M modules/changeprop/templates/config.yaml.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/295954/1

diff --git a/modules/changeprop/templates/config.yaml.erb 
b/modules/changeprop/templates/config.yaml.erb
index 5c8a592..2a4f852 100644
--- a/modules/changeprop/templates/config.yaml.erb
+++ b/modules/changeprop/templates/config.yaml.erb
@@ -219,6 +219,7 @@
   # ORES caching updates
   ores_cache:
 topic: mediawiki.revision_create
+concurrency: 15
 cases:
   - match:
   meta:

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4973740..2a2a041 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 4973740..2a2a041
..

Syncronize VisualEditor: 4973740..2a2a041

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/53/295953/1

diff --git a/VisualEditor b/VisualEditor
index 4973740..2a2a041 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4973740ae3ec5cdecac0da88c18368ce37fa7061
+Subproject commit 2a2a041933c958f372f791eef9a163cb9e4ec726

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4973740..2a2a041 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 4973740..2a2a041
..


Syncronize VisualEditor: 4973740..2a2a041

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 4973740..2a2a041 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 4973740ae3ec5cdecac0da88c18368ce37fa7061
+Subproject commit 2a2a041933c958f372f791eef9a163cb9e4ec726

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

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

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

[MediaWiki-commits] [Gerrit] Allow extensions to register a specific target per content m... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Allow extensions to register a specific target per content model
..


Allow extensions to register a specific target per content model

Bug: T138489
Change-Id: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
---
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
3 files changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 873b5ba..5de173e 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -665,12 +665,12 @@
$thumbLimits = $coreConfig->get( 'ThumbLimits' );
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$availableNamespaces = 
ApiVisualEditor::getAvailableNamespaceIds( $veConfig );
-   $availableContentModels = array_keys( array_filter(
+   $availableContentModels = array_filter(
array_merge(
ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableContentModels' ),
$veConfig->get( 
'VisualEditorAvailableContentModels' )
)
-   ) );
+   );
 
$vars['wgVisualEditorConfig'] = [
'disableForAnons' => $veConfig->get( 
'VisualEditorDisableForAnons' ),
diff --git a/extension.json b/extension.json
index 810cb8c..f766546 100644
--- a/extension.json
+++ b/extension.json
@@ -104,7 +104,7 @@
"_merge_strategy": "array_plus"
},
"VisualEditorAvailableContentModels": {
-   "wikitext": true,
+   "wikitext": "article",
"_merge_strategy": "array_plus"
},
"VisualEditorSkinToolbarScrollOffset": [],
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d465750..40996bf 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -137,7 +137,9 @@
.then( function () {
var target;
 
-   target = 
ve.init.mw.targetFactory.create( 'article' );
+   target = 
ve.init.mw.targetFactory.create(
+   conf.contentModels[ 
mw.config.get( 'wgPageContentModel' ) ]
+   );
target.connect( this, {
transformPage: function () {
if ( onlyTabIsVE ) {
@@ -676,7 +678,7 @@
mw.config.get( 'wgTranslatePageTranslation' ) !== 'translation' 
&&
 
// Only for pages with a supported content model
-   conf.contentModels.indexOf( mw.config.get( 'wgPageContentModel' 
) ) !== -1
+   conf.contentModels.hasOwnProperty( mw.config.get( 
'wgPageContentModel' ) )
);
 
// FIXME: We should do this more elegantly

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Typo in regex: suggestive antipattern. - change (integration/config)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Typo in regex: suggestive antipattern.
..

Typo in regex: suggestive antipattern.

Don't dot.

Change-Id: Iff9889f23f84cb87654020fc0a6435a26179a4f1
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/52/295952/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e240be1..5f26996 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -606,7 +606,7 @@
   #
 
   # Warning: the files regex are using python re.match() which match at the
-  # beginning of the filename. '.js$' will only match '.js' not 'foo.js'.
+  # beginning of the filename. '\.js$' will only match '.js' not 'foo.js'.
   #
   # See: http://docs.python.org/2/library/re.html#search-vs-match
 

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

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

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

[MediaWiki-commits] [Gerrit] Change-Prop: Remove the dependencies module. - change (operations/puppet)

[Ppchelko (Code Review)]

Ppchelko has uploaded a new change for review.

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

Change subject: Change-Prop: Remove the dependencies module.
..

Change-Prop: Remove the dependencies module.

The dependencies processing have been experiencing issues
recently. Since we don't rely on it remove the module from
production until the reasons of misbehaviour ae more clear.

Change-Id: I3e2eafa35f09a8cf4b014732b5923234de60b92b
---
M modules/changeprop/templates/config.yaml.erb
1 file changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/295951/1

diff --git a/modules/changeprop/templates/config.yaml.erb 
b/modules/changeprop/templates/config.yaml.erb
index 1dd1fc7..5c8a592 100644
--- a/modules/changeprop/templates/config.yaml.erb
+++ b/modules/changeprop/templates/config.yaml.erb
@@ -16,17 +16,17 @@
   options:
 host: <%= @purge_host %>
 port: <%= @purge_port %>
-/{api:sys}/links:
-  x-modules:
-- path: src/sys/dep_updates.js
-  options:
-templates:
-  mw_api:
-  uri: <%= @mwapi_uri %>
-  headers:
-host: '{{message.meta.domain}}'
-  body:
-formatversion: 2
+#/{api:sys}/links:
+#  x-modules:
+#- path: src/sys/dep_updates.js
+#  options:
+#templates:
+#  mw_api:
+#  uri: <%= @mwapi_uri %>
+#  headers:
+#host: '{{message.meta.domain}}'
+#  body:
+#formatversion: 2
 /{api:sys}/queue:
   x-modules:
 - path: src/sys/kafka.js

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

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

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

[MediaWiki-commits] [Gerrit] Change-Prop: Remove the dependencies module. - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Change-Prop: Remove the dependencies module.
..


Change-Prop: Remove the dependencies module.

The dependencies processing have been experiencing issues
recently. Since we don't rely on it remove the module from
production until the reasons of misbehaviour ae more clear.

Change-Id: I3e2eafa35f09a8cf4b014732b5923234de60b92b
---
M modules/changeprop/templates/config.yaml.erb
1 file changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/modules/changeprop/templates/config.yaml.erb 
b/modules/changeprop/templates/config.yaml.erb
index 1dd1fc7..5c8a592 100644
--- a/modules/changeprop/templates/config.yaml.erb
+++ b/modules/changeprop/templates/config.yaml.erb
@@ -16,17 +16,17 @@
   options:
 host: <%= @purge_host %>
 port: <%= @purge_port %>
-/{api:sys}/links:
-  x-modules:
-- path: src/sys/dep_updates.js
-  options:
-templates:
-  mw_api:
-  uri: <%= @mwapi_uri %>
-  headers:
-host: '{{message.meta.domain}}'
-  body:
-formatversion: 2
+#/{api:sys}/links:
+#  x-modules:
+#- path: src/sys/dep_updates.js
+#  options:
+#templates:
+#  mw_api:
+#  uri: <%= @mwapi_uri %>
+#  headers:
+#host: '{{message.meta.domain}}'
+#  body:
+#formatversion: 2
 /{api:sys}/queue:
   x-modules:
 - path: src/sys/kafka.js

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

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

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

[MediaWiki-commits] [Gerrit] [WIP] Need to lint some yaml - change (integration/config)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: [WIP] Need to lint some yaml
..

[WIP] Need to lint some yaml

We're relying on a big tree of yaml configuration now, and it would be prudent
to lint before merging.  This has already bit us...

FIXME: however, I can't find any yamllint job, or anything that includes a
.ya?ml file filter.  Should we use the puppet lint tasks, or is there nothing
set up yet?

Change-Id: I127633208387d04603b676ab14046f26b0a522fe
---
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/50/295950/1

diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 67033f7..34179f5 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -287,7 +287,7 @@
 
 # List of jobs allowed in check* pipelines
 safe_jobs = [
-'(php5[35]|json|yaml)lint',
+'(php5[35]|json)lint',
 'jshint',
 '.*-(jshint|jsonlint)',
 '.*-(js|shell|php5[35]|)lint',
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e240be1..b36b361 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2248,6 +2248,7 @@
 test:
  - php53lint
  - php55lint
+ # TODO: yamllint
  # TODO: clean up the composer.json, then enable validation here...
  #- composer-validate
  - composer-php53
@@ -2928,6 +2929,7 @@
 check:
   - jsonlint
   - jshint
+  # TODO: needs yamllint.
 test:
   - mwext-donationinterfacecore-REL1_25-testextension-zend53
   - mwext-donationinterfacecore-REL1_26-testextension-zend53

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

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

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

[MediaWiki-commits] [Gerrit] striker: Update configuration - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: striker: Update configuration
..


striker: Update configuration

Switch to new ini based configuration style.

Change-Id: I9c1f89a72698d165dece0e15e3d9c15df7fac46d
---
M puppet/modules/role/manifests/striker.pp
M puppet/modules/role/templates/striker/apache.conf.erb
A puppet/modules/role/templates/striker/striker.ini.erb
D puppet/modules/role/templates/striker/vagrant_settings.py.erb
4 files changed, 69 insertions(+), 87 deletions(-)

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



diff --git a/puppet/modules/role/manifests/striker.pp 
b/puppet/modules/role/manifests/striker.pp
index a5d3bfd..6195d96 100644
--- a/puppet/modules/role/manifests/striker.pp
+++ b/puppet/modules/role/manifests/striker.pp
@@ -101,8 +101,18 @@
 }
 
 # Configure striker
-file { "${app_dir}/vagrant_settings.py":
-content => template('role/striker/vagrant_settings.py.erb'),
+file { '/etc/striker':
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+}
+file { '/etc/striker/striker.ini':
+ensure  => 'present',
+owner   => 'root',
+group   => 'root',
+mode=> '0555',
+content => template('role/striker/striker.ini.erb'),
 require => [
 Git::Clone['striker'],
 Class['::phabricator'],
@@ -122,25 +132,23 @@
 }
 
 exec { 'striker manage.py migrate':
-cwd => $app_dir,
-command => "${venv}/bin/python manage.py migrate",
-environment => 'DJANGO_SETTINGS_MODULE=vagrant_settings',
-require => [
+cwd => $app_dir,
+command => "${venv}/bin/python manage.py migrate",
+require => [
 Mysql::User[$db_user],
-File["${app_dir}/vagrant_settings.py"],
+File['/etc/striker/striker.ini'],
 ],
-onlyif  => "${venv}/bin/python manage.py showmigrations --plan | 
/bin/grep -q '\\[ \\]'",
+onlyif  => "${venv}/bin/python manage.py showmigrations --plan | 
/bin/grep -q '\\[ \\]'",
 }
 
 exec { 'striker manage.py collectstatic':
-cwd => $app_dir,
-command => "${venv}/bin/python manage.py collectstatic --noinput",
-environment => 'DJANGO_SETTINGS_MODULE=vagrant_settings',
-require => [
+cwd => $app_dir,
+command => "${venv}/bin/python manage.py collectstatic --noinput",
+require => [
 Mysql::User[$db_user],
-File["${app_dir}/vagrant_settings.py"],
+File['/etc/striker/striker.ini'],
 ],
-unless  => "${venv}/bin/python manage.py collectstatic --noinput 
--dry-run| grep -q '^0 static'",
+unless  => "${venv}/bin/python manage.py collectstatic --noinput 
--dry-run| grep -q '^0 static'",
 }
 
 apache::site { $vhost_name:
diff --git a/puppet/modules/role/templates/striker/apache.conf.erb 
b/puppet/modules/role/templates/striker/apache.conf.erb
index 58b53ee..54659a5 100644
--- a/puppet/modules/role/templates/striker/apache.conf.erb
+++ b/puppet/modules/role/templates/striker/apache.conf.erb
@@ -1,10 +1,7 @@
 ServerName <%= @vhost_name %>
 DocumentRoot <%= @app_dir %>
 
-SetEnv DJANGO_SETTINGS_MODULE vagrant_settings
-SetEnv DJANGO_LOG_LEVEL DEBUG
 SetEnv DJANGO_DEBUG True
-
 WSGIDaemonProcess striker python-path=<%= @app_dir %>:<%= @venv 
%>/lib/python2.7/site-packages home=<%= @app_dir %> display-name=%{GROUP} 
threads=8
 WSGIProcessGroup striker
 WSGIScriptAlias / <%= @deploy_dir %>/striker/striker/wsgi.py 
process-group=striker
diff --git a/puppet/modules/role/templates/striker/striker.ini.erb 
b/puppet/modules/role/templates/striker/striker.ini.erb
new file mode 100644
index 000..efc194c
--- /dev/null
+++ b/puppet/modules/role/templates/striker/striker.ini.erb
@@ -0,0 +1,47 @@
+# Managed by Puppet.
+# See puppet/modules/role/templates/striker/striker.ini.erb
+
+[secrets]
+# Not so secret secret key
+SECRET_KEY = *xh73ad^#d+v%%rb18wp2ab%sj5xv1t7%bma=^h@g_
+
+[debug]
+DEBUG = true
+
+[ldap]
+SERVER_URI = ldap://127.0.0.1:389
+BIND_USER = <%= scope['::role::ldapauth::writer_dn'] %>
+BIND_PASSWORD = <%= scope['::role::ldapauth::writer_password'] %>
+TLS = false
+
+BASE_DN = <%= scope['::role::ldapauth::base_dn'] %>
+USER_DN_TEMPLATE = cn=%(user)s,<%= scope['::role::ldapauth::user_base_dn'] %>
+STAFF_GROUP_DN = cn=wmf,ou=groups,<%= scope['::role::ldapauth::base_dn'] %>
+SUPERUSER_GROUP_DN = cn=tools.admin,ou=servicegroups,<%= 
scope['::role::ldapauth::base_dn'] %>
+
+TOOLS_MAINTAINER_BASE_DN = ou=people,<%= scope['::role::ldapauth::base_dn'] %>
+TOOLS_TOOL_BASE_DN = ou=servicegroups,<%= scope['::role::ldapauth::base_dn'] %>
+
+[oauth]
+MWURL = <%= scope['::mediawiki::server_url'] %>/w/index.php
+CONSUMER_KEY = <%= @oauth_consumer_key %>

[MediaWiki-commits] [Gerrit] Add some lint tasks for fundraising repos: prepare for Jessie - change (integration/config)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Add some lint tasks for fundraising repos: prepare for Jessie
..

Add some lint tasks for fundraising repos: prepare for Jessie

We're moving to php 5.5+ soon, so I'm adding php55lint in case we're relying on
deprecated code.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/49/295949/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e240be1..c584f16 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2184,14 +2184,18 @@
 check:
   - wikimedia-fundraising-crm-jsonlint
   - php53lint
+  - php55lint
 test:
   - wikimedia-fundraising-crm-jsonlint
   - php53lint
+  - php55lint
   - wikimedia-fundraising-civicrm
+  # TODO: fixups so that we can run composer-validate
   - noop
 gate-and-submit:
   - wikimedia-fundraising-crm-jsonlint
   - php53lint
+  - php55lint
   - wikimedia-fundraising-civicrm
   # Since jobs above might not trigger due to file filtering and
   # wikimedia-fundraising-civicrm is not run on deployment branch, we still
@@ -2202,11 +2206,14 @@
   - name: wikimedia/fundraising/crm/civicrm
 check:
   - php53lint
+  - php55lint
 test:
   - php53lint
+  - php55lint
   - wikimedia-fundraising-civicrm
 gate-and-submit:
   - php53lint
+  - php55lint
   - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/crm/drupal
@@ -,20 +2229,33 @@
   - name: wikimedia/fundraising/crm/vendor
 check:
   - php53lint
+  - php55lint
 test:
   - php53lint
+  - php55lint
   - wikimedia-fundraising-civicrm
 gate-and-submit:
   - php53lint
+  - php55lint
   - wikimedia-fundraising-civicrm
 
   - name: wikimedia/fundraising/php-queue
+check:
+ - php53lint
+ - php55lint
+ - composer-validate
 test:
+ - php53lint
+ - php55lint
  - composer-php53
  - composer-hhvm-trusty
+ - composer-validate
 gate-and-submit:
+ - php53lint
+ - php55lint
  - composer-php53
  - composer-hhvm-trusty
+ - composer-validate
 
   - name: wikimedia/fundraising/slander
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Don't pass string as constructor argument for MediaWikiPageN... - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Don't pass string as constructor argument for 
MediaWikiPageNameNormalizer
..


Don't pass string as constructor argument for MediaWikiPageNameNormalizer

Not needed, breaks adding an actual constructor.

Change-Id: I65295c0e09edbd4abfc9c2d94a2c3d7687990e41
---
M repo/includes/WikibaseRepo.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 5556c68..7074def 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1731,7 +1731,7 @@
public function getCachingCommonsMediaFileNameLookup() {
if ( $this->cachingCommonsMediaFileNameLookup === null ) {
$this->cachingCommonsMediaFileNameLookup = new 
CachingCommonsMediaFileNameLookup(
-   new MediaWikiPageNameNormalizer( 
'https://commons.wikimedia.org/w/api.php' ),
+   new MediaWikiPageNameNormalizer(),
new HashBagOStuff()
);
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65295c0e09edbd4abfc9c2d94a2c3d7687990e41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
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] Match the expected format of 'response' log key - change (mediawiki...EventBus)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Match the expected format of 'response' log key
..


Match the expected format of 'response' log key

All sources that log a 'response' value need to use the same format.
Make EventBus compatible with how Math extension utilizes the response
field.

Bug: T138539
Change-Id: I71bd2ee45c132d698fd8689d86674497bb3fa817
---
M EventBus.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/EventBus.php b/EventBus.php
index cdbc250..f4050e1 100644
--- a/EventBus.php
+++ b/EventBus.php
@@ -71,7 +71,7 @@
 
private function onError( $ret ) {
$message = empty( $ret['error'] ) ? $ret['code'] . ': ' . 
$ret['reason'] : $ret['error'];
-   $context = [ 'response' => $ret['body'] ];
+   $context = [ 'response' => [ 'body' => $ret['body'] ] ];
 
$logger = LoggerFactory::getInstance( 'EventBus' );
$logger->error( "Unable to deliver event: ${message}", $context 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71bd2ee45c132d698fd8689d86674497bb3fa817
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Composer validation fixup - change (wikimedia...php-queue)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Composer validation fixup
..

Composer validation fixup

Change-Id: I25e80d1dc06c61692500531a83eaecefd8d60796
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/php-queue 
refs/changes/48/295948/1

diff --git a/composer.json b/composer.json
index 5e52c7c..f75d7ef 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
 "require": {
 "php": ">=5.3.0",
 "monolog/monolog": "~1.3",
-"clio/clio": "@stable"
+"clio/clio": "0.1.*"
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25e80d1dc06c61692500531a83eaecefd8d60796
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/php-queue
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Fixing Special:CategoryTree by skipping data from request fo... - change (mediawiki...CategoryTree)

[Sethakill (Code Review)]

Sethakill has uploaded a new change for review.

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

Change subject: Fixing Special:CategoryTree by skipping data from request for 
'mode' field.
..

Fixing Special:CategoryTree by skipping data from request for 'mode' field.

Change-Id: Idd4bd03215a52c815d35093a7abce9be64d616a7
Follow-Up: Ib26b471a31b3f957195e02f44230fbc3dd0e3cec
---
M CategoryTreePage.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTree 
refs/changes/47/295947/1

diff --git a/CategoryTreePage.php b/CategoryTreePage.php
index 733e773..6cc7f07 100644
--- a/CategoryTreePage.php
+++ b/CategoryTreePage.php
@@ -119,6 +119,7 @@
 */
function executeInputForm() {
$namespaces = $this->getRequest()->getVal( 'namespaces', '' );
+   //mode may be overriden by namespaces option
$mode = ( $namespaces == '' ? $this->getOption( 'mode' ) : 
CategoryTreeMode::ALL );
if ( $mode == CategoryTreeMode::CATEGORIES ) {
$modeDefault = 'categories';
@@ -145,7 +146,8 @@
'categorytree-mode-pages' => 'pages',
'categorytree-mode-all' => 'all',
],
-   'default' => $modeDefault
+   'default' => $modeDefault,
+   'nodata' => true,
],
 
'namespace' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd4bd03215a52c815d35093a7abce9be64d616a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Sethakill 

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

[MediaWiki-commits] [Gerrit] Hovercards: Improve layout of settings dialog to design spec - change (mediawiki...Popups)

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: Hovercards: Improve layout of settings dialog to design spec
..

Hovercards: Improve layout of settings dialog to design spec

Improving Hovercards' settings dialog to fulfill design specification.

Bug: T138612
Change-Id: I7395e3438836149becdd576942bdaf6f21b4163f
---
M resources/ext.popups.settings.js
M resources/ext.popups.settings.less
M resources/settings.mustache
3 files changed, 33 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/46/295946/1

diff --git a/resources/ext.popups.settings.js b/resources/ext.popups.settings.js
index 85ebea3..48434de 100644
--- a/resources/ext.popups.settings.js
+++ b/resources/ext.popups.settings.js
@@ -85,6 +85,7 @@
} else {
mw.popups.saveEnabledState( false );
$( '#mwe-popups-settings-form' ).hide();
+   $( 'mwe-settings-save' ).hide();
$( '#mwe-popups-settings-help' ).show();
mw.track( 'ext.popups.schemaPopups', $.extend( {}, 
currentLinkLogData, {
action: 'disabled'
diff --git a/resources/ext.popups.settings.less 
b/resources/ext.popups.settings.less
index cc6d0f9..e1873fe 100644
--- a/resources/ext.popups.settings.less
+++ b/resources/ext.popups.settings.less
@@ -4,58 +4,66 @@
position: fixed;
z-index: 1000;
background: #fff;
-   border: 1px solid rgba( 0, 0, 0, 0.1);
-   -moz-box-shadow: 3px 3px 0px 0px rgba( 0, 0, 0, 0.30 );
-   box-shadow: 3px 3px 0px 0px rgba( 0, 0, 0, 0.30 );
width: 600px;
-   padding: 5px;
+   border: 1px solid #9aa0a7;
+   border-radius: 2px;
 
header {
-   height: 50px;
-   border-bottom: 1px solid #c8c8c8;
+   height: 40px;
+   border-bottom: 1px solid #c8ccd1;
+   position: relative;
 
a {
font: 40px sans-serif;
-   font-weight: bold;
line-height: 50px;
text-align: center;
-   color: #999;
+   color: #71777d;
display: block;
width: 50px;
height: 50px;
-   border-right: 1px solid #c8c8c8;
float: left;
cursor: pointer;
+   position: absolute;
+   left: 0;
+   top: 0;
 
&:hover {
text-decoration: none;
+color: #2f3133;
}
}
 
h1 {
margin: 0;
-   padding: 0;
-   padding-left: 10px;
-   font: 20px sans-serif;
-   font-weight: bold;
-   line-height: 58px;
+   padding: 0 50px;
+   font-family: sans-serif;
+   font-size: 18px;
+   line-height: 53px;
border: none;
+text-align: center;
+float: left;
}
+
+button {
+position: absolute;
+right: 10px;
+top: 7px;
+}
}
 
main {
-   margin-top: 15px;
-   margin-left: 50px;
+   padding-top: 40px;
+   margin: 0 auto;
+   width: 300px;
 
p {
color: #999;
font-size: 17px;
margin: 0;
-   padding: 17px 0 17px 10px;
+   margin-bottom: 20px;
}
 
form {
-   margin-left: -48px;
 
img, input, label {
vertical-align: top;
@@ -67,21 +75,21 @@
 
input {
display: inline-block;
-   margin: 0 20px;
+   margin-right: 10px;
}
 
label {
font-size: 12px;
display: inline-block;
-   margin-right: 110px;
line-height: 18px;
-   width: 185px;
+   width: 350px;
 
> span {
color: #000;
font-size: 18px;
font-weight: bold;
  

[MediaWiki-commits] [Gerrit] TranslateDeleteJob: Fix result of errors value when deletion... - change (mediawiki...Translate)

[Glaisher (Code Review)]

Glaisher has uploaded a new change for review.

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

Change subject: TranslateDeleteJob: Fix result of errors value when deletions 
fail
..

TranslateDeleteJob: Fix result of errors value when deletions fail

doDeleteArticle() returns a bool so it isn't very helpful to log this value
as an error. For some reason, it also seems to be either ignored by the
list=logevents API or it's not even inserted. So switch to use
doDeleteArticleReal() which returns a Status object so that we can properly
log the errors. Discovered while looking into T138571.

Change-Id: Ie04b7049accf5db4e79f136135d3c206e504e6a6
---
M tag/TranslateDeleteJob.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/tag/TranslateDeleteJob.php b/tag/TranslateDeleteJob.php
index de4d418..a5e6827 100644
--- a/tag/TranslateDeleteJob.php
+++ b/tag/TranslateDeleteJob.php
@@ -59,11 +59,11 @@
 
$error = '';
$wikipage = new WikiPage( $title );
-   $ok = $wikipage->doDeleteArticle( "{$summary}: $reason", false, 
0, true, $error, $user );
-   if ( !$ok ) {
+   $status = $wikipage->doDeleteArticleReal( "{$summary}: 
$reason", false, 0, true, $error, $user );
+   if ( !$status->isGood() ) {
$params = array(
'target' => $base,
-   'error' => $ok,
+   'errors' => $status->getErrorsArray(),
);
 
$type = $this->getFull() ? 'deletefnok' : 'deletelnok';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie04b7049accf5db4e79f136135d3c206e504e6a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Glaisher 

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

[MediaWiki-commits] [Gerrit] Match the expected format of 'response' log key - change (mediawiki...EventBus)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Match the expected format of 'response' log key
..

Match the expected format of 'response' log key

All sources that log a 'response' value need to use the same format.
Make EventBus compatible with how Math extension utilizes the response
field.

Bug: T138539
Change-Id: I71bd2ee45c132d698fd8689d86674497bb3fa817
---
M EventBus.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus 
refs/changes/44/295944/1

diff --git a/EventBus.php b/EventBus.php
index cdbc250..f4050e1 100644
--- a/EventBus.php
+++ b/EventBus.php
@@ -71,7 +71,7 @@
 
private function onError( $ret ) {
$message = empty( $ret['error'] ) ? $ret['code'] . ': ' . 
$ret['reason'] : $ret['error'];
-   $context = [ 'response' => $ret['body'] ];
+   $context = [ 'response' => [ 'body' => $ret['body'] ] ];
 
$logger = LoggerFactory::getInstance( 'EventBus' );
$logger->error( "Unable to deliver event: ${message}", $context 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71bd2ee45c132d698fd8689d86674497bb3fa817
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
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] Remove duplicate keys from log message - change (mediawiki...Math)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Remove duplicate keys from log message
..


Remove duplicate keys from log message

Bug: T138539
Change-Id: I2289864f20f764e1d9c74a282b3e9d1e1155c11b
---
M MathRestbaseInterface.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/MathRestbaseInterface.php b/MathRestbaseInterface.php
index d2eef4f..c8b1834 100644
--- a/MathRestbaseInterface.php
+++ b/MathRestbaseInterface.php
@@ -401,10 +401,12 @@
}
return $response['body'];
}
+   // Remove "convenience" duplicate keys put in place by 
MultiHttpClient
+   unset( $response[0], $response[1], $response[2], $response[3], 
$response[4] );
$this->log()->error( 'Restbase math server problem:', [
'request' => $request,
'response' => $response,
-   'type' => $type,
+   'math_type' => $type,
'tex' => $this->tex
] );
throw new MWException( "Cannot get $type. Server problem." );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2289864f20f764e1d9c74a282b3e9d1e1155c11b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix Smashpig still triggering composer-php53 - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Fix Smashpig still triggering composer-php53
..


Fix Smashpig still triggering composer-php53

Follow up 5792c7a27, the skip-if is overriden by the generic rule that
applies to ^.*php53.*$  causing the composer-php53 to still be
triggered.

Zuul does not merge skip-if sections. So duplicate the rules slightly.

Add an integration test to make sure the contract is fulfilled.

Change-Id: I3aa1198f70bbb737a834a464045f0b1c30648bae
---
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
2 files changed, 33 insertions(+), 6 deletions(-)

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



diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index b3d5cbf..67033f7 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -459,6 +459,29 @@
 self.assertFalse(check_manager.eventMatches(trusted_event, change))
 self.assertTrue(test_manager.eventMatches(trusted_event, change))
 
+def test_smashpig_deployment_branch_filters(self):
+# Since SmashPig override a generic skip-if set by ^.*php53.*$
+# Make sure it is properly honored.
+test_manager = self.getPipeline('test').manager
+event = zuul.model.TriggerEvent()
+event.type = 'patchset-created'
+
+change = zuul.model.Change('wikimedia/fundraising/SmashPig')
+change.branch = 'deployment'
+
+jobs_tree = [t for (p, t) in
+ self.getPipeline('test').job_trees.iteritems()
+ if p.name == 'wikimedia/fundraising/SmashPig'][0]
+for job in jobs_tree.getJobs():
+if job.name in ['composer-php53', 'composer-hhvm-trusty']:
+self.assertFalse(
+job.changeMatches(change),
+msg='%s should not trigger for branch %s' % (
+job.name, change.branch)
+)
+
+self.assertTrue(test_manager.eventMatches(event, change))
+
 # Make sure rake-jessie is properly filtered
 # https://phabricator.wikimedia.org/T105178
 def test_mediawiki_core_rake_filters(self):
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e756c68..e240be1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -667,12 +667,6 @@
 files:
  - '^composer.json$'
 
-  # Don't run tests on deployment branches where the tests have been removed.
-  - name: ^composer-(php53|hhvm-trusty)$
-skip-if:
- - project: ^wikimedia/fundraising/SmashPig$
-   branch: ^deployment$
-
   - name: ^.*-php53lint$
 files:
  - '^.*\.(php|php5|phtml|inc)$'
@@ -708,6 +702,16 @@
 skip-if:
   - project: '^mediawiki/.*$'
 branch: (?!REL1_2[3-6]|fundraising/REL1_2[3-6]$)
+  - project: ^wikimedia/fundraising/SmashPig$
+branch: ^deployment$
+
+  # Don't run tests on deployment branches where the tests have been removed.
+  # Covered by test_smashpig_deployment_branch_filters
+  - name: ^composer-hhvm-trusty$
+skip-if:
+ - project: ^wikimedia/fundraising/SmashPig$
+   branch: ^deployment$
+
 
   # Jobs testing multiple extensions together
   #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3aa1198f70bbb737a834a464045f0b1c30648bae
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: 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] Make revision tooltips hoverable. - change (mediawiki...RevisionSlider)

[jenkins-bot (Code Review)]

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

Change subject: Make revision tooltips hoverable.
..


Make revision tooltips hoverable.

Bug: T138392
Change-Id: Ic43345839cf8d04486141d24074a4d735c9c5c1f
---
M modules/ext.RevisionSlider.RevisionListView.js
1 file changed, 71 insertions(+), 2 deletions(-)

Approvals:
  WMDE-Fisch: Checked; Looks good to me, but someone else must approve
  WMDE-leszek: Checked; Looks good to me, but someone else must approve
  Addshore: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ext.RevisionSlider.RevisionListView.js 
b/modules/ext.RevisionSlider.RevisionListView.js
index 2d7098d..ffab5e5 100644
--- a/modules/ext.RevisionSlider.RevisionListView.js
+++ b/modules/ext.RevisionSlider.RevisionListView.js
@@ -14,6 +14,16 @@
revisionList: null,
 
/**
+* @type {number}
+*/
+   tooltipTimeout: -1,
+
+   /**
+* @type {jQuery}
+*/
+   currentTooltip: null,
+
+   /**
 * @param {number} revisionTickWidth
 * @return {jQuery}
 */
@@ -21,7 +31,15 @@
var $html = $( '' ).addClass( 'mw-revisions' ),
revs = this.revisionList.getRevisions(),
maxChangeSizeLogged = Math.log( 
this.revisionList.getBiggestChangeSize() ),
-   i, diffSize, tooltip, relativeChangeSize;
+   self = this,
+   i, diffSize, tooltip, relativeChangeSize,
+   showTooltip = function () {
+   self.showTooltip( $( this ) );
+   $( this ).tipsy( 'show' );
+   },
+   hideTooltip = function () {
+   self.hideTooltip( $( this ) );
+   };
 
for ( i = 0; i < revs.length; i++ ) {
diffSize = revs[ i ].getRelativeSize();
@@ -36,7 +54,7 @@
.tipsy( {
gravity: 's',
html: true,
-   fade: true,
+   trigger: 'manual',
className: 
'mw-revision-tooltip'
} )
.append( $( '' )
@@ -51,13 +69,64 @@
.addClass( diffSize > 0 
? 'mw-revision-up' : 'mw-revision-down' )
.append( $( '' 
).addClass( 'mw-revision-border-box' ) )
)
+   .mouseover( showTooltip )
+   .mouseout( hideTooltip )
);
}
 
+   this.keepTooltipsOnHover();
+
return $html;
},
 
/**
+* Hides the current tooltip immediately
+*/
+   hideCurrentTooltip: function () {
+   if ( this.tooltipTimeout !== -1 ) {
+   window.clearTimeout( this.tooltipTimeout );
+   this.currentTooltip.tipsy( 'hide' );
+   }
+   },
+
+   /**
+* Hides the tooltip after 500ms
+*
+* @param {jQuery} $rev
+*/
+   hideTooltip: function ( $rev ) {
+   this.tooltipTimeout = window.setTimeout( function () {
+   $rev.tipsy( 'hide' );
+   }, 500 );
+   },
+
+   /**
+* Hides the previous tooltip and shows the new one
+*
+* @param {jQuery} $rev
+*/
+   showTooltip: function ( $rev ) {
+   this.hideCurrentTooltip();
+   $rev.tipsy( 'show' );
+   this.currentTooltip = $rev;
+   },
+
+   /**
+* Sets event handlers on tooltips so they do not disappear 
when hovering over them
+*/
+   keepTooltipsOnHover: function () {
+   var self = this;
+
+   $( document )
+   .on( 'mouseover', '.mw-revision-tooltip', 

[MediaWiki-commits] [Gerrit] build: Bump grunt-stylelint to v0.4.0 and make pass - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: build: Bump grunt-stylelint to v0.4.0 and make pass
..


build: Bump grunt-stylelint to v0.4.0 and make pass

Change-Id: I00e469cf9b484c9d4d4ad145480fa6e66dd7e8cc
---
M .stylelintrc
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/.stylelintrc b/.stylelintrc
index 6b94db6..62dbeb6 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -10,7 +10,7 @@
"declaration-colon-space-after": [ "always" ],
"declaration-colon-space-before": [ "never" ],
 
-   "font-family-name-quotes": [ "single-unless-keyword" ],
+   "font-family-name-quotes": [ "always-unless-keyword" ],
"font-weight-notation": [ "named-where-possible" ],
 
"function-calc-no-unspaced-operator": true,
@@ -20,7 +20,7 @@
"function-comma-space-before": [ "never" ],
"function-parentheses-newline-inside": [ "never-multi-line" ],
"function-parentheses-space-inside": [ "always" ],
-   "function-url-quotes": [ "none" ],
+   "function-url-quotes": [ "never" ],
"function-whitespace-after": [ "always" ],
}
 }
diff --git a/package.json b/package.json
index 6fde2e0..d96dcf9 100644
--- a/package.json
+++ b/package.json
@@ -14,12 +14,12 @@
 "grunt-jscs": "2.8.0",
 "grunt-jsonlint": "1.0.7",
 "grunt-karma": "0.12.2",
-"grunt-stylelint": "0.3.0",
+"grunt-stylelint": "0.4.0",
 "karma": "0.13.22",
 "karma-chrome-launcher": "0.2.2",
 "karma-firefox-launcher": "0.1.7",
 "karma-qunit": "0.1.9",
 "qunitjs": "1.22.0",
-"stylelint-config-wikimedia": "0.1.0"
+"stylelint-config-wikimedia": "0.2.2"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00e469cf9b484c9d4d4ad145480fa6e66dd7e8cc
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Escape non-ASCII characters in role manifests - change (mediawiki/vagrant)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Escape non-ASCII characters in role manifests
..

Escape non-ASCII characters in role manifests

Bug: T131460
Change-Id: I6bc6447ed00d756b6c6fef3a49989cf6613ef7ca
---
M puppet/modules/role/manifests/contenttranslation.pp
M puppet/modules/role/manifests/echo.pp
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/43/295943/1

diff --git a/puppet/modules/role/manifests/contenttranslation.pp 
b/puppet/modules/role/manifests/contenttranslation.pp
index 7953d2c..5a95c99 100644
--- a/puppet/modules/role/manifests/contenttranslation.pp
+++ b/puppet/modules/role/manifests/contenttranslation.pp
@@ -26,7 +26,7 @@
 # category_keyword: 'Category'
 # high_mt_category: 'MT'
 #   es:
-# category_keyword: 'Categoría'
+# category_keyword: 'Categor\u{00ed}a'
 # high_mt_category: 'MT'
 #
 class role::contenttranslation {
diff --git a/puppet/modules/role/manifests/echo.pp 
b/puppet/modules/role/manifests/echo.pp
index d32bc9f..41bae32 100644
--- a/puppet/modules/role/manifests/echo.pp
+++ b/puppet/modules/role/manifests/echo.pp
@@ -58,7 +58,7 @@
 wiki   => 'fr',
 values => {
 'wgLanguageCode' => 'fr',
-'wgSitename' => 'Wikipédia',
+'wgSitename' => 'Wikip\u{00e9}dia',
 }
 }
 
@@ -68,7 +68,7 @@
 wiki   => 'he',
 values => {
 'wgLanguageCode' => 'he',
-'wgSitename' => 'ויקיפדיה',
+'wgSitename' => 
'\u{05d5}\u{05d9}\u{05e7}\u{05d9}\u{05e4}\u{05d3}\u{05d9}\u{05d4}',
 }
 }
 
@@ -90,7 +90,7 @@
 wiki   => 'zhwikivoyage',
 values => {
 'wgLanguageCode' => 'zh',
-'wgSitename' => '维基导游',
+'wgSitename' => '\u{7ef4}\u{57fa}\u{5bfc}\u{6e38}',
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bc6447ed00d756b6c6fef3a49989cf6613ef7ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Feed: Remove placeholder String fields from AggregatedFeedCo... - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Feed: Remove placeholder String fields from 
AggregatedFeedContent model
..


Feed: Remove placeholder String fields from AggregatedFeedContent model

These add nothing and break aggregated feed content deserialization
every time a new endpoint is added.  Let's just take them out and add
fields as we need them.

Change-Id: I92cb538f3a5e3fea6961ff30f52c4a74fc702452
---
M app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
index 831a0f9..8ba51a7 100644
--- a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
+++ b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
@@ -9,10 +9,6 @@
 @SuppressWarnings("NullableProblems") @NonNull private CardPageItem tfa;
 @SuppressWarnings("NullableProblems") @NonNull private MostReadArticles 
mostread;
 @SuppressWarnings("NullableProblems") @NonNull private CardPageItem random;
-// Note: the below just have placeholder strings for now
-@SuppressWarnings("NullableProblems") @NonNull private String news;
-@SuppressWarnings("NullableProblems") @NonNull private String image;
-@SuppressWarnings("NullableProblems") @NonNull private String video;
 
 public CardPageItem tfa() {
 return tfa;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92cb538f3a5e3fea6961ff30f52c4a74fc702452
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
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] Don't pass string as constructor argument for MediaWikiPageN... - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Don't pass string as constructor argument for 
MediaWikiPageNameNormalizer
..

Don't pass string as constructor argument for MediaWikiPageNameNormalizer

Not needed, breaks adding an actual constructor.

Change-Id: I65295c0e09edbd4abfc9c2d94a2c3d7687990e41
---
M repo/includes/WikibaseRepo.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 5556c68..7074def 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1731,7 +1731,7 @@
public function getCachingCommonsMediaFileNameLookup() {
if ( $this->cachingCommonsMediaFileNameLookup === null ) {
$this->cachingCommonsMediaFileNameLookup = new 
CachingCommonsMediaFileNameLookup(
-   new MediaWikiPageNameNormalizer( 
'https://commons.wikimedia.org/w/api.php' ),
+   new MediaWikiPageNameNormalizer(),
new HashBagOStuff()
);
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65295c0e09edbd4abfc9c2d94a2c3d7687990e41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Add interactivity to Trending Articles card. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Add interactivity to Trending Articles card.
..

Add interactivity to Trending Articles card.

- Make items clickable.
- Hide the footer for now, since it's not yet clear what happens when it's
  clicked.

Change-Id: I453a9274c2354bb5231d0c3b32d13f08e5a12e3e
---
M 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadClient.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadItemCard.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
M app/src/main/java/org/wikipedia/feed/view/PageTitleListCardView.java
7 files changed, 61 insertions(+), 30 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
index c0a2aca..95ac568 100644
--- 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -15,20 +15,14 @@
 import java.util.List;
 
 public class BecauseYouReadCardView extends 
PageTitleListCardView {
-@Nullable private FeedViewCallback callback;
 
 public BecauseYouReadCardView(Context context) {
 super(context);
 }
 
-@NonNull public PageTitleListCardView setCallback(@Nullable 
FeedViewCallback callback) {
-this.callback = callback;
-return this;
-}
-
 public void set(@NonNull final BecauseYouReadCard card) {
 header(card);
-set(new RecyclerAdapter(card.items(), callback));
+set(new RecyclerAdapter(card.items(), getCallback()));
 }
 
 private void header(@NonNull final BecauseYouReadCard card) {
diff --git 
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
index c7075d9..c818d45 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
@@ -2,26 +2,29 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import org.wikipedia.R;
+import org.wikipedia.feed.FeedViewCallback;
 import org.wikipedia.feed.demo.IntegerListCard;
 import org.wikipedia.feed.view.CardFooterView;
 import org.wikipedia.feed.view.CardHeaderView;
-import org.wikipedia.feed.view.ListCardItemView;
-import org.wikipedia.feed.view.ListCardView;
+import org.wikipedia.feed.view.PageTitleListCardItemView;
+import org.wikipedia.feed.view.PageTitleListCardView;
 import org.wikipedia.views.DefaultViewHolder;
 
 import java.util.List;
 
-public class MostReadCardView extends ListCardView {
+public class MostReadCardView extends PageTitleListCardView {
 public MostReadCardView(Context context) {
 super(context);
 }
 
 public void set(@NonNull MostReadListCard card) {
 header(card);
-footer(card);
-set(new RecyclerAdapter(card.items()));
+//TODO: add footer when ready.
+//footer(card);
+set(new RecyclerAdapter(card.items(), getCallback()));
 }
 
 private void header(@NonNull MostReadListCard card) {
@@ -40,17 +43,19 @@
 footer(footer);
 }
 
-private static class RecyclerAdapter extends 
ListCardView.RecyclerAdapter {
-RecyclerAdapter(@NonNull List items) {
+private static class RecyclerAdapter extends 
PageTitleListCardView.RecyclerAdapter {
+@Nullable private FeedViewCallback callback;
+
+RecyclerAdapter(@NonNull List items, @Nullable 
FeedViewCallback callback) {
 super(items);
+this.callback = callback;
 }
 
-@Override public void 
onBindViewHolder(DefaultViewHolder holder,
-   int position) {
+@Override
+public void 
onBindViewHolder(DefaultViewHolder holder, int 
position) {
 MostReadItemCard card = item(position);
-holder.getView().setTitle(card.title());
-holder.getView().setSubtitle(card.subtitle());
-holder.getView().setImage(card.image());
+holder.getView().setPageTitle(card.pageTitle());
+holder.getView().setCallback(callback);
 }
 }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/feed/mostread/MostReadClient.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadClient.java
index c654f7f..f2aa249 100644
--- 

[MediaWiki-commits] [Gerrit] Fix Smashpig still triggering composer-php53 - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Fix Smashpig still triggering composer-php53
..

Fix Smashpig still triggering composer-php53

Follow up 5792c7a27, the skip-if is overriden by the generic rule that
applies to ^.*php53.*$  causing the composer-php53 to still be
triggered.

Move the rule down so it overrides the Generic one for SmashPig.
Add an integration test to make sure the contract is fulfilled.

Change-Id: I3aa1198f70bbb737a834a464045f0b1c30648bae
---
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
2 files changed, 32 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/295940/1

diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index b3d5cbf..67033f7 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -459,6 +459,29 @@
 self.assertFalse(check_manager.eventMatches(trusted_event, change))
 self.assertTrue(test_manager.eventMatches(trusted_event, change))
 
+def test_smashpig_deployment_branch_filters(self):
+# Since SmashPig override a generic skip-if set by ^.*php53.*$
+# Make sure it is properly honored.
+test_manager = self.getPipeline('test').manager
+event = zuul.model.TriggerEvent()
+event.type = 'patchset-created'
+
+change = zuul.model.Change('wikimedia/fundraising/SmashPig')
+change.branch = 'deployment'
+
+jobs_tree = [t for (p, t) in
+ self.getPipeline('test').job_trees.iteritems()
+ if p.name == 'wikimedia/fundraising/SmashPig'][0]
+for job in jobs_tree.getJobs():
+if job.name in ['composer-php53', 'composer-hhvm-trusty']:
+self.assertFalse(
+job.changeMatches(change),
+msg='%s should not trigger for branch %s' % (
+job.name, change.branch)
+)
+
+self.assertTrue(test_manager.eventMatches(event, change))
+
 # Make sure rake-jessie is properly filtered
 # https://phabricator.wikimedia.org/T105178
 def test_mediawiki_core_rake_filters(self):
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e756c68..25e3f59 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -667,12 +667,6 @@
 files:
  - '^composer.json$'
 
-  # Don't run tests on deployment branches where the tests have been removed.
-  - name: ^composer-(php53|hhvm-trusty)$
-skip-if:
- - project: ^wikimedia/fundraising/SmashPig$
-   branch: ^deployment$
-
   - name: ^.*-php53lint$
 files:
  - '^.*\.(php|php5|phtml|inc)$'
@@ -709,6 +703,15 @@
   - project: '^mediawiki/.*$'
 branch: (?!REL1_2[3-6]|fundraising/REL1_2[3-6]$)
 
+  # Don't run tests on deployment branches where the tests have been removed.
+  # MUST BE after the ^.*php53.*$ rule
+  # Covered by test_smashpig_deployment_branch_filters
+  - name: ^composer-(php53|hhvm-trusty)$
+skip-if:
+ - project: ^wikimedia/fundraising/SmashPig$
+   branch: ^deployment$
+
+
   # Jobs testing multiple extensions together
   #
   # TODO stop triggering php53 jobs for the wmf branches

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

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

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

[MediaWiki-commits] [Gerrit] Mock Http in MediaWikiPageNameNormalizerTest and add more te... - change (mediawiki/core)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Mock Http in MediaWikiPageNameNormalizerTest and add more test 
cases
..

Mock Http in MediaWikiPageNameNormalizerTest and add more test cases

Bug: T138570
Change-Id: Ia156ba61afb90c9a3b1a2e1e0bf967056bd87fc8
---
M includes/site/MediaWikiPageNameNormalizer.php
M tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
2 files changed, 81 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/295939/1

diff --git a/includes/site/MediaWikiPageNameNormalizer.php 
b/includes/site/MediaWikiPageNameNormalizer.php
index 2f71736..1a079b4 100644
--- a/includes/site/MediaWikiPageNameNormalizer.php
+++ b/includes/site/MediaWikiPageNameNormalizer.php
@@ -35,6 +35,22 @@
 class MediaWikiPageNameNormalizer {
 
/**
+* @var Http
+*/
+   private $http;
+
+   /**
+* @param Http|null $http
+*/
+   public function __construct( Http $http = null ) {
+   if ( !$http ) {
+   $http = new Http();
+   }
+
+   $this->http = $http;
+   }
+
+   /**
 * Returns the normalized form of the given page title, using the
 * normalization rules of the given site. If the given title is a 
redirect,
 * the redirect weill be resolved and the redirect target is returned.
@@ -85,7 +101,7 @@
 
// Go on call the external site
// @todo we need a good way to specify a timeout here.
-   $ret = Http::get( $url, [], __METHOD__ );
+   $ret = $this->http->get( $url, [], __METHOD__ );
 
if ( $ret === false ) {
wfDebugLog( "MediaWikiSite", "call to external site 
failed: $url" );
diff --git a/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php 
b/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
index 3f67b2b..f9e45d3 100644
--- a/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
+++ b/tests/phpunit/includes/site/MediaWikiPageNameNormalizerTest.php
@@ -29,36 +29,15 @@
  */
 class MediaWikiPageNameNormalizerTest extends PHPUnit_Framework_TestCase {
 
-   protected function setUp() {
-   parent::setUp();
-
-   static $connectivity = null;
-
-   if ( $connectivity === null ) {
-   // Check whether we have (reasonable fast) connectivity
-   $res = Http::get(
-   
'https://www.wikidata.org/w/api.php?action=query=siteinfo=json',
-   [ 'timeout' => 3 ],
-   __METHOD__
-   );
-
-   if ( $res === false || strpos( $res, 
'"sitename":"Wikidata"' ) === false ) {
-   $connectivity = false;
-   } else {
-   $connectivity = true;
-   }
-   }
-
-   if ( !$connectivity ) {
-   $this->markTestSkipped( 
'MediaWikiPageNameNormalizerTest needs internet connectivity.' );
-   }
-   }
-
/**
 * @dataProvider normalizePageTitleProvider
 */
-   public function testNormalizePageTitle( $expected, $pageName ) {
-   $normalizer = new MediaWikiPageNameNormalizer();
+   public function testNormalizePageTitle( $expected, $pageName, 
$getResponse ) {
+   MediaWikiPageNameNormalizerTest_MockHttp::$response = 
$getResponse;
+
+   $normalizer = new MediaWikiPageNameNormalizer(
+   new MediaWikiPageNameNormalizerTest_MockHttp()
+   );
 
$this->assertSame(
$expected,
@@ -67,19 +46,71 @@
}
 
public function normalizePageTitleProvider() {
-   // Note: This makes (very conservative) assumptions about pages 
on Wikidata
-   // existing or not.
+   // Response are taken from:
+   // 
https://www.wikidata.org/w/api.php?action=query=info=1=1=json=…
+   // 
https://sr.wikipedia.org/w/api.php?action=query=info=1=1=json=…
return [
'universe (Q1)' => [
-   'Q1', 'Q1'
+   'Q1',
+   'Q1',
+   
'{"batchcomplete":"","query":{"pages":{"129":{"pageid":129,"ns":0,'
+   . 
'"title":"Q1","contentmodel":"wikibase-item","pagelanguage":"en",'
+   . 
'"pagelanguagehtmlcode":"en","pagelanguagedir":"ltr",'
+   . 
'"touched":"2016-06-23T05:11:21Z","lastrevid":350004448,"length":58001'
],
  

[MediaWiki-commits] [Gerrit] Avoids concurrent loading of the regular VE - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

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

Change subject: Avoids concurrent loading of the regular VE
..

Avoids concurrent loading of the regular VE

Change-Id: I6b2d5a5c2707746db88d3ef0d22c825e7ca6f0e8
Task: T138489
Depends-on: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
---
M extension.json
M modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
2 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/38/295938/1

diff --git a/extension.json b/extension.json
index 7769786..cc78d35 100644
--- a/extension.json
+++ b/extension.json
@@ -332,7 +332,7 @@
"Page": true
},
"VisualEditorAvailableContentModels": {
-   "proofread-page": true
+   "proofread-page": "proofread-page"
},
"config": {
"@ProofreadPageNamespaceIds": "Array that contain the ids of 
namespaces used by ProofreadPage",
diff --git a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js 
b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
index 6397a92..1dffa6c 100644
--- a/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
+++ b/modules/ve/pageTarget/ve.init.mw.ProofreadPagePageTarget.js
@@ -45,6 +45,13 @@
 
 OO.inheritClass( ve.init.mw.ProofreadPagePageTarget, 
ve.init.mw.DesktopArticleTarget );
 
+/* Static Properties */
+
+/**
+ * @inheritdoc
+ */
+ve.init.mw.ArticleTarget.static.name = 'proofread-page';
+
 /* Methods */
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b2d5a5c2707746db88d3ef0d22c825e7ca6f0e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

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

[MediaWiki-commits] [Gerrit] Upgrade support library to 24.0.0 - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Upgrade support library to 24.0.0
..


Upgrade support library to 24.0.0

http://developer.android.com/tools/support-library/index.html

Bug: T138105
Change-Id: If0cc49751d1bfe32656fd612958a3737bdb917a3
---
M app/build.gradle
M project.properties
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index 0e1812d..be96f66 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,7 @@
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_7
 android {
 // Keep version in sync with /project.properties
-compileSdkVersion 23
+compileSdkVersion 24
 
 buildToolsVersion '23.0.3'
 compileOptions {
@@ -160,7 +160,7 @@
 
 String retrofitVersion = '2.0.2'
 String okHttpVersion = '3.3.1'
-String supportVersion = '23.4.0'
+String supportVersion = '24.0.0'
 String espressoVersion = '2.2.2'
 String butterKnifeVersion = '8.0.1'
 String frescoVersion = '0.10.0'
diff --git a/project.properties b/project.properties
index 7b9d7e1..e62c761 100644
--- a/project.properties
+++ b/project.properties
@@ -5,4 +5,4 @@
 #
 # https://phabricator.wikimedia.org/T138506#2404266
 #
-target=23
+target=24

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0cc49751d1bfe32656fd612958a3737bdb917a3
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Hashar 
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] Hack to have Jenkins recognizes the compile SDK version - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Hack to have Jenkins recognizes the compile SDK version
..


Hack to have Jenkins recognizes the compile SDK version

The Wikimedia Jenkins job is able to automatically install the proper
SDK. Unfortunately the Android Emulator plugin does't recognize
android.compileSdkVersion from app/build.gradle instead it:

* Looks for files matching **/default.properties or **/project.properties
* parse the file to find a 'target' value which is then used as the
  Android platform to install

https://phabricator.wikimedia.org/T138506#2404266

Add a project.properties file that has the target platform expected by
the Jenkins plugin.
Add a comment in app/build.gradle to remember to keep the version in
sync.

Bug: T138506
Change-Id: I6be92df22396f87753599981d2800f4157c93936
---
M app/build.gradle
A project.properties
2 files changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index 85f0f1a..0e1812d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,9 @@
 
 final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_7
 android {
+// Keep version in sync with /project.properties
 compileSdkVersion 23
+
 buildToolsVersion '23.0.3'
 compileOptions {
 sourceCompatibility = JAVA_VERSION
diff --git a/project.properties b/project.properties
new file mode 100644
index 000..7b9d7e1
--- /dev/null
+++ b/project.properties
@@ -0,0 +1,8 @@
+# Used by the Jenkins Android Emulator plugin to install the proper SDK
+# automatically. The plugin does not recognize apps/build.gradle
+#
+# Should be kept in sync with android.compileSdkVersion
+#
+# https://phabricator.wikimedia.org/T138506#2404266
+#
+target=23

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6be92df22396f87753599981d2800f4157c93936
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Hashar 
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] Use YAML for DB host for contenttranslation - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Use YAML for DB host for contenttranslation
..


Use YAML for DB host for contenttranslation

Avoid "Warning: Scope(Class[Contenttranslation]): Could not look up
qualified variable '::mysql::grant_host_name'; class ::mysql has not
been evaluated"

Change-Id: Idacb2e0a679a6ae98d9e360d6a79b041fcec5f7a
---
M puppet/hieradata/common.yaml
M puppet/modules/contenttranslation/manifests/init.pp
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 5e20897..c462ff1 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -40,6 +40,7 @@
 contenttranslation::action_template: 
"//$1%{hiera('mediawiki::multiwiki::base_domain')}%{::port_fragment}/w/index.php?title=$2"
 contenttranslation::api_template: 
"//$1%{hiera('mediawiki::multiwiki::base_domain')}%{::port_fragment}/w/api.php"
 contenttranslation::cx_template: 
"//127.0.0.1:%{::contenttranslation::cxserver::port}/v1"
+contenttranslation::database_host: "%{hiera('mysql::grant_host_name')}"
 contenttranslation::database: 'contenttranslation'
 contenttranslation::database_user: "%{hiera('mediawiki::multiwiki::db_user')}"
 contenttranslation::database_password: "%{hiera('mysql::root_password')}"
diff --git a/puppet/modules/contenttranslation/manifests/init.pp 
b/puppet/modules/contenttranslation/manifests/init.pp
index db79284..df356d0 100644
--- a/puppet/modules/contenttranslation/manifests/init.pp
+++ b/puppet/modules/contenttranslation/manifests/init.pp
@@ -87,7 +87,7 @@
 $action_template,
 $api_template,
 $cx_template,
-$database_host = $::mysql::grant_host_name,
+$database_host,
 $database,
 $database_user,
 $database_password,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idacb2e0a679a6ae98d9e360d6a79b041fcec5f7a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Lucie Kaffee 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Run configtest upon config file modification - change (operations...nginx)

[Ema (Code Review)]

Ema has uploaded a new change for review.

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

Change subject: Run configtest upon config file modification
..

Run configtest upon config file modification

We want puppet to fail in case of nginx configuration file errors.
Notify `service nginx configtest` upon configuration file modification.

Change-Id: Id0315273791ee22328ba36076fabe5a2fc8c450a
---
M manifests/init.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/nginx 
refs/changes/37/295937/1

diff --git a/manifests/init.pp b/manifests/init.pp
index 3ffa8df..7194f72 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -57,6 +57,11 @@
 hasrestart => true,
 }
 
+exec { 'nginx-configtest':
+command => 'service nginx configtest',
+refreshonly => true,
+}
+
 file { [ '/etc/nginx/conf.d', '/etc/nginx/sites-available', 
'/etc/nginx/sites-enabled' ]:
 ensure  => ensure_directory($ensure),
 recurse => true,
diff --git a/manifests/site.pp b/manifests/site.pp
index cfcbca1..b985a44 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,6 +39,7 @@
 content => $content,
 source  => $source,
 tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster 
3.6.2+
+notify  => Exec['nginx-configtest'],
 }
 
 file { "/etc/nginx/sites-enabled/${basename}":

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0315273791ee22328ba36076fabe5a2fc8c450a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/nginx
Gerrit-Branch: master
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Allows to register a specific target per content model - change (mediawiki...VisualEditor)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

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

Change subject: Allows to register a specific target per content model
..

Allows to register a specific target per content model

Change-Id: Ic9d2fa34b90afc58f7e31adf38f97a701aac64f9
Task: T138489
---
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
3 files changed, 7 insertions(+), 5 deletions(-)


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

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 873b5ba..5de173e 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -665,12 +665,12 @@
$thumbLimits = $coreConfig->get( 'ThumbLimits' );
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$availableNamespaces = 
ApiVisualEditor::getAvailableNamespaceIds( $veConfig );
-   $availableContentModels = array_keys( array_filter(
+   $availableContentModels = array_filter(
array_merge(
ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableContentModels' ),
$veConfig->get( 
'VisualEditorAvailableContentModels' )
)
-   ) );
+   );
 
$vars['wgVisualEditorConfig'] = [
'disableForAnons' => $veConfig->get( 
'VisualEditorDisableForAnons' ),
diff --git a/extension.json b/extension.json
index 810cb8c..f766546 100644
--- a/extension.json
+++ b/extension.json
@@ -104,7 +104,7 @@
"_merge_strategy": "array_plus"
},
"VisualEditorAvailableContentModels": {
-   "wikitext": true,
+   "wikitext": "article",
"_merge_strategy": "array_plus"
},
"VisualEditorSkinToolbarScrollOffset": [],
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d465750..40996bf 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -137,7 +137,9 @@
.then( function () {
var target;
 
-   target = 
ve.init.mw.targetFactory.create( 'article' );
+   target = 
ve.init.mw.targetFactory.create(
+   conf.contentModels[ 
mw.config.get( 'wgPageContentModel' ) ]
+   );
target.connect( this, {
transformPage: function () {
if ( onlyTabIsVE ) {
@@ -676,7 +678,7 @@
mw.config.get( 'wgTranslatePageTranslation' ) !== 'translation' 
&&
 
// Only for pages with a supported content model
-   conf.contentModels.indexOf( mw.config.get( 'wgPageContentModel' 
) ) !== -1
+   conf.contentModels.hasOwnProperty( mw.config.get( 
'wgPageContentModel' ) )
);
 
// FIXME: We should do this more elegantly

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Drain esams for network maintenance" - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: Revert "Drain esams for network maintenance"
..


Revert "Drain esams for network maintenance"

This reverts commit 96a4b1dcc4db148c43e94f0e9ac62a5228a9d1a1.

Change-Id: Ia24a088dc05172c42e9802b07b47dc9963d61b73
---
M admin_state
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/admin_state b/admin_state
index d338253..7295eeb 100644
--- a/admin_state
+++ b/admin_state
@@ -69,4 +69,3 @@
 # geoip/text-*/ulsfo => UP # ... this overrides the line above completely
 #
 ##
-geoip/generic-map/esams => DOWN

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia24a088dc05172c42e9802b07b47dc9963d61b73
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add interactivity to Continue Reading card. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Add interactivity to Continue Reading card.
..

Add interactivity to Continue Reading card.

Change-Id: I29067aea688e875e3b999089faec50bf20ebb03a
---
M app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
M 
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
M app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
M app/src/main/res/layout/view_card_header_large.xml
5 files changed, 41 insertions(+), 5 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
index b9a765e..f7413c0 100644
--- 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
+++ 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCard.java
@@ -7,6 +7,7 @@
 
 import org.wikipedia.feed.model.Card;
 import org.wikipedia.history.HistoryEntry;
+import org.wikipedia.page.PageTitle;
 
 import java.util.concurrent.TimeUnit;
 
@@ -29,6 +30,10 @@
 return TextUtils.isEmpty(entry.getTitle().getThumbUrl()) ? null : 
Uri.parse(entry.getTitle().getThumbUrl());
 }
 
+@NonNull public PageTitle pageTitle() {
+return entry.getTitle();
+}
+
 /** @return The last visit age in days. */
 public long daysOld() {
 long now = System.currentTimeMillis();
diff --git 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
index 46b6df9..a2bb24e 100644
--- 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
@@ -2,19 +2,31 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.PluralsRes;
+import android.view.View;
 
 import org.wikipedia.R;
+import org.wikipedia.feed.FeedViewCallback;
 import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.CardLargeHeaderView;
 import org.wikipedia.feed.view.ListCardView;
 
 public class ContinueReadingCardView extends ListCardView 
{
+private ContinueReadingCard card;
+@Nullable private FeedViewCallback callback;
+
 public ContinueReadingCardView(Context context) {
 super(context);
 }
 
+@NonNull public ContinueReadingCardView setCallback(@Nullable 
FeedViewCallback callback) {
+this.callback = callback;
+return this;
+}
+
 public void set(@NonNull ContinueReadingCard card) {
+this.card = card;
 header(card);
 }
 
@@ -29,7 +41,17 @@
 header(header);
 CardLargeHeaderView largeHeader = new CardLargeHeaderView(getContext())
 .setPageTitle(card.title())
-.setImage(card.image());
+.setImage(card.image())
+.onClickListener(new CardClickListener());
 largeHeader(largeHeader);
 }
+
+private class CardClickListener implements OnClickListener {
+@Override
+public void onClick(View v) {
+if (callback != null) {
+callback.onSelectPage(card.pageTitle());
+}
+}
+}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java 
b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
index e0a85bc..b313c02 100644
--- a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
@@ -21,6 +21,7 @@
 
 public class CardLargeHeaderView extends LinearLayout {
 @BindView(R.id.view_card_header_large_background) View backgroundView;
+@BindView(R.id.view_card_header_large_text_container) View 
textContainerView;
 @BindView(R.id.view_card_header_large_image) FaceAndColorDetectImageView 
imageView;
 @BindView(R.id.view_card_header_large_page_title) TextView pageTitleView;
 @BindView(R.id.view_card_header_large_subtitle) GoneIfEmptyTextView 
subtitleView;
@@ -52,6 +53,11 @@
 return this;
 }
 
+@NonNull public CardLargeHeaderView onClickListener(@Nullable 
OnClickListener listener) {
+textContainerView.setOnClickListener(listener);
+return this;
+}
+
 private void resetBackgroundColor() {
 
backgroundView.setBackgroundColor(getResources().getColor(R.color.gray_background));
 }
diff --git 

[MediaWiki-commits] [Gerrit] Revert "Drain esams for network maintenance" - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review.

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

Change subject: Revert "Drain esams for network maintenance"
..

Revert "Drain esams for network maintenance"

This reverts commit 96a4b1dcc4db148c43e94f0e9ac62a5228a9d1a1.

Change-Id: Ia24a088dc05172c42e9802b07b47dc9963d61b73
---
M admin_state
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/34/295934/1

diff --git a/admin_state b/admin_state
index d338253..7295eeb 100644
--- a/admin_state
+++ b/admin_state
@@ -69,4 +69,3 @@
 # geoip/text-*/ulsfo => UP # ... this overrides the line above completely
 #
 ##
-geoip/generic-map/esams => DOWN

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia24a088dc05172c42e9802b07b47dc9963d61b73
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Remove unused init event - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Remove unused init event
..


Remove unused init event

Verify with mwgrep.

Change-Id: I41de74be53772ddbf08f20b99186ead0baf202c8
---
M view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
1 file changed, 0 insertions(+), 21 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  Jeroen De Dauw: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js 
b/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
index 1706359..7ea3e6d 100644
--- a/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
+++ b/view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
@@ -44,12 +44,6 @@
 * @param {jQuery.Event}
 * @param {boolean} Whether widget has been dis- oder enabled.
 */
-   /**
-* @event init
-* Triggered after the widget is fully initialized. (`jQuery.Widget` 
native "create" event is
-* triggered after the template DOM is ready and template short-cuts 
are assigned.)
-* @param {jQuery.Event}
-*/
$.widget( 'ui.TemplatedWidget', PARENT, {
/**
 * @see jQuery.Widget.options
@@ -87,21 +81,6 @@
this._createTemplateShortCuts();
 
PARENT.prototype._create.apply( this );
-   },
-
-   /**
-* Initializes any additional widget logic (i.e. child widgets, 
event handlers). DOM
-* creation/manipulation is supposed to be performed in 
`_create` which is run before
-* `_init`. With the `TemplatedWidget`'s base `_init` 
implementation triggering the "init"
-* event, inheriting widgets should call parent's `_init` as 
last action for other
-* components listening to the "init" event can be sure the 
widget in fully initialized.
-*
-* @see jQuery.Widget._init
-* @protected
-*/
-   _init: function() {
-   PARENT.prototype._init.call( this );
-   this._trigger( 'init' );
},
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41de74be53772ddbf08f20b99186ead0baf202c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Heine 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Set SpeedIndex as default metric when picking medianRun - change (performance/WebPageTest)

[jenkins-bot (Code Review)]

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

Change subject: Set SpeedIndex as default metric when picking medianRun
..


Set SpeedIndex as default metric when picking medianRun

By default WebPageTest picks the median run on pageLoadTime. But
we uses fastest run and SpeedIndex as median metrics. Lets default
to SpeedIndex (we use that in our tests today) and log
the right URL so when accessing WebPageTest we get the sorting
we want (sorted by medianRun & median metric).

Bug: T135421
Change-Id: I14f1d6e4e508ba180d7d5e2eb6f086ae3e9e6f19
---
M lib/cli.js
M lib/index.js
2 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/lib/cli.js b/lib/cli.js
index 988242f..81372a6 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -15,6 +15,7 @@
 var DEFAULT_WEBPAGETEST_HOST = 'www.webpagetest.org';
 var DEFAULT_NAMESPACE = 'webpagetest';
 var DEFAULT_MEDIANRUN = 'fastest';
+var DEFAULT_MEDIAN = 'SpeedIndex';
 // Here are the values we collect. Want to add more? Check the JSON that is 
returned:
 // 
https://sites.google.com/a/webpagetest.org/docs/advanced-features/webpagetest-restful-apis
 // #TOC-Sample
@@ -58,6 +59,8 @@
 '[' + DEFAULT_METRICS + ']');
 console.log('   --medianrun  Choose what run to use as median 
(a.k.a pick fastest'
 + 'or median) [' + DEFAULT_MEDIANRUN + ']');
+console.log('   --median Choose the metric used to 
calculate median for'
++ ' multiple runs test [' + DEFAULT_MEDIAN + ']');
 Object.keys(reporters.getReporters()).forEach(function(name) {
 reporters.get(name).help();
 });
@@ -120,7 +123,8 @@
 webPageTestHost: DEFAULT_WEBPAGETEST_HOST,
 metrics: DEFAULT_METRICS,
 namespace: DEFAULT_NAMESPACE,
-medianrun: DEFAULT_MEDIANRUN
+medianrun: DEFAULT_MEDIANRUN,
+median: DEFAULT_MEDIAN
 }
 });
 }
diff --git a/lib/index.js b/lib/index.js
index d0c2ba7..6dd0ef6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -70,7 +70,8 @@
 // make sure we catch that 
https://phabricator.wikimedia.org/T127833
 return bluebird.reject('We got an empty result object from 
WebPageTest');
 }
-console.log('WebPageTest run: ' + data.data.summary);
+console.log('WebPageTest run: ' + data.data.summary + 
'=' +
+  argv.medianrun + '=' + wptOptions.median);
 
 if (argv.verbose) {
 console.log(JSON.stringify(data, null, 1));

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14f1d6e4e508ba180d7d5e2eb6f086ae3e9e6f19
Gerrit-PatchSet: 6
Gerrit-Project: performance/WebPageTest
Gerrit-Branch: master
Gerrit-Owner: Phedenskog 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Phedenskog 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] DO NOT MERGE: Dummy commit for validating Zuul config - change (wikimedia...SmashPig)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: DO NOT MERGE: Dummy commit for validating Zuul config
..

DO NOT MERGE: Dummy commit for validating Zuul config

Change-Id: Ic65d863136274c2c861b8075ca8fa13cf3a754dc
---
A test.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/33/295933/1

diff --git a/test.php b/test.php
new file mode 100644
index 000..b89d843
--- /dev/null
+++ b/test.php
@@ -0,0 +1,3 @@
+https://gerrit.wikimedia.org/r/295933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic65d863136274c2c861b8075ca8fa13cf3a754dc
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] Add mw2246 (videoscaler) to the MW Scap DSH list. - change (operations/puppet)

[Elukey (Code Review)]

Elukey has submitted this change and it was merged.

Change subject: Add mw2246 (videoscaler) to the MW Scap DSH list.
..


Add mw2246 (videoscaler) to the MW Scap DSH list.

Change-Id: I1bad4e52d2ac2d20854ccfeeb99fac699868a14f
---
M modules/scap/files/dsh/group/mediawiki-installation
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/scap/files/dsh/group/mediawiki-installation 
b/modules/scap/files/dsh/group/mediawiki-installation
index 6a0c7b4..315a54d 100644
--- a/modules/scap/files/dsh/group/mediawiki-installation
+++ b/modules/scap/files/dsh/group/mediawiki-installation
@@ -431,6 +431,7 @@
 mw2243.codfw.wmnet
 mw2244.codfw.wmnet
 mw2245.codfw.wmnet
+mw2246.codfw.wmnet
 mw2247.codfw.wmnet
 mw2248.codfw.wmnet
 mw2249.codfw.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bad4e52d2ac2d20854ccfeeb99fac699868a14f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
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] Revert "Edit stash: Support CodeEditor" - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: Revert "Edit stash: Support CodeEditor"
..

Revert "Edit stash: Support CodeEditor"

This reverts commit ebe7205c63482a79940245f81fede4ea9906a894.

Change-Id: I051bd91c60d8f068cb414914e97413f5fc515c85
---
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
2 files changed, 12 insertions(+), 14 deletions(-)


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

diff --git a/resources/Resources.php b/resources/Resources.php
index e31e77e..90510fc 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1417,6 +1417,7 @@
'mediawiki.action.edit.styles',
'jquery.textSelection',
'jquery.byteLimit',
+   'jquery.getAttrs',
'mediawiki.api',
],
'position' => 'top',
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js 
b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 2ae05dd..2069ac5 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
@@ -13,11 +13,7 @@
$form = $( '#editform' ),
$text = $form.find( '#wpTextbox1' ),
$summary = $form.find( '#wpSummary' ),
-   section = $form.find( '#wpSection' ).val(),
-   model = $form.find( '#model' ).val(),
-   format = $form.find( '#format' ).val(),
-   revId = $form.find( '#parentRevId' ).val(),
-   lastText = $text.textSelection( 'getContents' ),
+   data = {},
timer = null;
 
// Send a request to stash the edit to the API.
@@ -29,19 +25,19 @@
}
 
api.getToken( 'csrf' ).then( function ( token ) {
-   lastText = $text.textSelection( 'getContents' );
+   data = $form.serializeObject();
 
pending = api.post( {
action: 'stashedit',
token: token,
title: mw.config.get( 'wgPageName' ),
-   section: section,
+   section: data.wpSection,
sectiontitle: '',
-   text: lastText,
-   summary: $summary.textSelection( 
'getContents' ),
-   contentmodel: model,
-   contentformat: format,
-   baserevid: revId
+   text: data.wpTextbox1,
+   summary: data.wpSummary,
+   contentmodel: data.model,
+   contentformat: data.format,
+   baserevid: data.parentRevId
} );
} );
}
@@ -49,8 +45,9 @@
// Check if edit body text changed since the last stashEdit() 
call or if no edit
// stash calls have yet been made
function isChanged() {
-   var newText = $text.textSelection( 'getContents' );
-   return newText !== lastText;
+   // Normalize line endings to CRLF, like 
$.fn.serializeObject does.
+   var newText = $text.val().replace( /\r?\n/g, '\r\n' );
+   return newText !== data.wpTextbox1;
}
 
function onEditorIdle() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I051bd91c60d8f068cb414914e97413f5fc515c85
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] DO NOT MERGE: Dummy commit for validating Zuul config - change (wikimedia...SmashPig)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: DO NOT MERGE: Dummy commit for validating Zuul config
..

DO NOT MERGE: Dummy commit for validating Zuul config

Change-Id: Ic65d863136274c2c861b8075ca8fa13cf3a754dc
---
A test.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/31/295931/1

diff --git a/test.php b/test.php
new file mode 100644
index 000..b89d843
--- /dev/null
+++ b/test.php
@@ -0,0 +1,3 @@
+https://gerrit.wikimedia.org/r/295931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] Convert Special:CategoryTree to use OOUI. - change (mediawiki...CategoryTree)

[jenkins-bot (Code Review)]

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

Change subject: Convert Special:CategoryTree to use OOUI.
..


Convert Special:CategoryTree to use OOUI.

Bug: T135645
Change-Id: Ib26b471a31b3f957195e02f44230fbc3dd0e3cec
---
M CategoryTreePage.php
1 file changed, 43 insertions(+), 21 deletions(-)

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



diff --git a/CategoryTreePage.php b/CategoryTreePage.php
index cda786c..733e773 100644
--- a/CategoryTreePage.php
+++ b/CategoryTreePage.php
@@ -118,29 +118,51 @@
 * Input form for entering a category
 */
function executeInputForm() {
-   global $wgScript;
-   $thisTitle = SpecialPage::getTitleFor( $this->getName() );
$namespaces = $this->getRequest()->getVal( 'namespaces', '' );
-   //mode may be overriden by namespaces option
$mode = ( $namespaces == '' ? $this->getOption( 'mode' ) : 
CategoryTreeMode::ALL );
-   $modeSelector = Xml::openElement( 'select', array( 'name' => 
'mode' ) );
-   $modeSelector .= Xml::option( wfMessage( 
'categorytree-mode-categories' )->plain(), 'categories', $mode == 
CategoryTreeMode::CATEGORIES );
-   $modeSelector .= Xml::option( wfMessage( 
'categorytree-mode-pages' )->plain(), 'pages', $mode == CategoryTreeMode::PAGES 
);
-   $modeSelector .= Xml::option( wfMessage( 
'categorytree-mode-all' )->plain(), 'all', $mode == CategoryTreeMode::ALL );
-   $modeSelector .= Xml::closeElement( 'select' );
-   $table = Xml::buildForm( array(
-   'categorytree-category' => Xml::input( 'target', 20, 
$this->target, array( 'id' => 'target' ) ) ,
-   'categorytree-mode-label' => $modeSelector,
-   'namespace' => Html::namespaceSelector(
-   array( 'selected' => $namespaces, 'all' => '' ),
-   array( 'name' => 'namespaces', 'id' => 
'namespaces' )
-   )
-   ), 'categorytree-go' );
-   $preTable = Xml::element( 'legend', null, wfMessage( 
'categorytree-legend' )->plain() );
-   $preTable .= Html::Hidden( 'title', 
$thisTitle->getPrefixedDbKey() );
-   $fieldset = Xml::tags( 'fieldset', array(), $preTable . $table 
);
-   $output = $this->getOutput();
-   $output->addHTML( Xml::tags( 'form', array( 'name' => 
'categorytree', 'method' => 'get', 'action' => $wgScript, 'id' => 
'mw-categorytree-form' ), $fieldset ) );
+   if ( $mode == CategoryTreeMode::CATEGORIES ) {
+   $modeDefault = 'categories';
+   } elseif( $mode == CategoryTreeMode::PAGES ) {
+   $modeDefault = 'pages';
+   } else {
+   $modeDefault = 'all';
+   }
+
+   $formDescriptor = [
+   'category' => [
+   'type' => 'title',
+   'name' => 'target',
+   'label-message' => 'categorytree-category',
+   'namespace' => NS_CATEGORY,
+   ],
+
+   'mode' => [
+   'type' => 'select',
+   'name' => 'mode',
+   'label-message' => 'categorytree-mode-label',
+   'options-messages' => [
+   'categorytree-mode-categories' => 
'categories',
+   'categorytree-mode-pages' => 'pages',
+   'categorytree-mode-all' => 'all',
+   ],
+   'default' => $modeDefault
+   ],
+
+   'namespace' => [
+   'type' => 'namespaceselect',
+   'name' => 'namespaces',
+   'label-message' => 'namespace',
+   'all' => '',
+   ],
+   ];
+
+   $form = HTMLForm::factory( 'ooui', $formDescriptor, 
$this->getContext() )
+   ->addHiddenFields( [ 'title' => 
$this->getPageTitle()->getPrefixedDbKey() ] )
+   ->setWrapperLegendMsg( 'categorytree-legend' )
+   ->setSubmitTextMsg( 'categorytree-go' )
+   ->setMethod( 'get' )
+   ->prepareForm()
+   ->displayForm( false );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib26b471a31b3f957195e02f44230fbc3dd0e3cec

[MediaWiki-commits] [Gerrit] Add interactivity and design tweaks to Featured Article card. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Add interactivity and design tweaks to Featured Article card.
..

Add interactivity and design tweaks to Featured Article card.

- Made the entire text area of the card clickable, and working.
- Made the Save and Share buttons in the footer work.

Change-Id: Iaaff6f7d53fff52bbc247d69d4325c11a311cc95
---
M app/src/main/java/org/wikipedia/MainActivity.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
M app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
M 
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/model/BigPictureCard.java
M app/src/main/java/org/wikipedia/feed/view/BigPictureCardView.java
M app/src/main/java/org/wikipedia/feed/view/FeaturedCardFooterView.java
M app/src/main/java/org/wikipedia/feed/view/FeedRecyclerAdapter.java
D app/src/main/res/drawable/ic_bookmark_gray_24dp.xml
D app/src/main/res/drawable/ic_share_gray_24dp.xml
M app/src/main/res/layout/view_big_picture_card.xml
M app/src/main/res/layout/view_card_featured_footer.xml
15 files changed, 219 insertions(+), 112 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/MainActivity.java 
b/app/src/main/java/org/wikipedia/MainActivity.java
index ec48b51..b7a3552 100644
--- a/app/src/main/java/org/wikipedia/MainActivity.java
+++ b/app/src/main/java/org/wikipedia/MainActivity.java
@@ -82,6 +82,7 @@
 import org.wikipedia.useroption.sync.UserOptionContentResolver;
 import org.wikipedia.util.ApiUtil;
 import org.wikipedia.util.FeedbackUtil;
+import org.wikipedia.util.ShareUtil;
 import org.wikipedia.util.log.L;
 import org.wikipedia.views.WikiDrawerLayout;
 import org.wikipedia.widgets.WidgetProviderFeaturedPage;
@@ -848,6 +849,11 @@
 showAddToListDialog(title, AddToReadingListDialog.InvokeSource.FEED);
 }
 
+@Override
+public void onFeedSharePage(PageTitle title) {
+ShareUtil.shareText(this, title);
+}
+
 private void loadMainPageIfNoTabs() {
 loadMainPage(false, TabPosition.CURRENT_TAB, true);
 }
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java 
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index da712e6..45383c6 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -50,6 +50,7 @@
 void onFeedVoiceSearchRequested();
 void onFeedSelectPage(PageTitle title);
 void onFeedAddPageToList(PageTitle title);
+void onFeedSharePage(PageTitle title);
 }
 
 public static FeedFragment newInstance() {
@@ -158,6 +159,13 @@
 }
 
 @Override
+public void onSharePage(@NonNull PageTitle title) {
+if (getCallback() != null) {
+getCallback().onFeedSharePage(title);
+}
+}
+
+@Override
 public void onSearchRequested() {
 if (getCallback() != null) {
 getCallback().onFeedSearchRequested();
diff --git a/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java 
b/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
index 5a16e15..af94359 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedViewCallback.java
@@ -8,6 +8,7 @@
 void onRequestMore();
 void onSelectPage(@NonNull PageTitle title);
 void onAddPageToList(@NonNull PageTitle title);
+void onSharePage(@NonNull PageTitle title);
 void onSearchRequested();
 void onVoiceSearchRequested();
 }
diff --git 
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java 
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
index 831a0f9..8ba51a7 100644
--- a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
+++ b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContent.java
@@ -9,10 +9,6 @@
 @SuppressWarnings("NullableProblems") @NonNull private CardPageItem tfa;
 @SuppressWarnings("NullableProblems") @NonNull private MostReadArticles 
mostread;
 @SuppressWarnings("NullableProblems") @NonNull private CardPageItem random;
-// Note: the below just have placeholder strings for now
-@SuppressWarnings("NullableProblems") @NonNull private String news;
-@SuppressWarnings("NullableProblems") @NonNull private String image;
-@SuppressWarnings("NullableProblems") @NonNull private String video;
 
 public CardPageItem tfa() {
 return tfa;
diff 

[MediaWiki-commits] [Gerrit] [VisualEditor] Add new key to ignore - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [VisualEditor] Add new key to ignore
..


[VisualEditor] Add new key to ignore

Change-Id: I6f1dd083cc651801dc8edc1eb2bb2a6ee96ec6bf
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 993d4a4..214f2b7 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2482,7 +2482,7 @@
 optional = visualeditor-dialog-media-info-ellipsis, 
visualeditor-dialog-media-info-separator
 ignored = accesskey-ca-ve-edit, accesskey-ca-editsource
 ignored = apihelp-visualeditor-param-format, 
apihelp-visualeditoredit-param-watch, apihelp-visualeditoredit-param-wikitext
-ignored = visualeditor-wikitext-warning-link
+ignored = visualeditor-wikitext-warning-link, 
visualeditor-quick-access-characters.json
 prefix = visualeditor-override- | tooltip-ca-edit
 
 VisualEditor user guide screenshots

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f1dd083cc651801dc8edc1eb2bb2a6ee96ec6bf
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] diamond TCP collector: add TFO-related metrics - change (operations/puppet)

[Ema (Code Review)]

Ema has submitted this change and it was merged.

Change subject: diamond TCP collector: add TFO-related metrics
..


diamond TCP collector: add TFO-related metrics

The diamond TCP collector exposes a configuration option allowing to
specify additional TCP metrics to be reported.

This commit adds the following TFO-related metrics:

- TCPFastOpenActive
- TCPFastOpenActiveFail
- TCPFastOpenPassive
- TCPFastOpenPassiveFail
- TCPFastOpenCookieReqd
- TCPFastOpenListenOverflow
- TCPSynRetrans
- TCPOrigDataSent

See https://wikitech.wikimedia.org/wiki/TCP_Fast_Open for an explanation
of those.

Bug: T108827
Change-Id: I78253380f4dee42085bcb2925b2a281e6cafae34
---
M modules/diamond/manifests/init.pp
1 file changed, 18 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved



diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index f3de736..bb489c1 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -117,7 +117,24 @@
 
 diamond::collector { 'Network': }
 
-diamond::collector { 'TCP': }
+diamond::collector { 'TCP':
+settings => {
+allowed_names => [
+  'ListenOverflows', 'ListenDrops',
+  'TCPLoss', 'TCPTimeouts',
+  'TCPFastRetrans', 'TCPLostRetransmit',
+  'TCPForwardRetrans', 'TCPSlowStartRetrans',
+  'CurrEstab', 'TCPAbortOnMemory',
+  'TCPBacklogDrop', 'AttemptFails',
+  'EstabResets', 'InErrs',
+  'ActiveOpens', 'PassiveOpens',
+  'TCPFastOpenActive', 'TCPFastOpenActiveFail',
+  'TCPFastOpenPassive', 'TCPFastOpenPassiveFail',
+  'TCPFastOpenListenOverflow', 'TCPFastOpenCookieReqd',
+  'TCPSynRetrans', 'TCPOrigDataSent'
+]
+}
+}
 
 diamond::collector { 'Ntpd': }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78253380f4dee42085bcb2925b2a281e6cafae34
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tlsproxy: document safe/unsafe TFO usage - change (operations/puppet)

[Ema (Code Review)]

Ema has submitted this change and it was merged.

Change subject: tlsproxy: document safe/unsafe TFO usage
..


tlsproxy: document safe/unsafe TFO usage

Mention that using TFO is not necessarily always safe, with references
to the relevant RFC section.

Bug: T108827
Change-Id: I7309033da3c2673985940b716e5f8133be7f3617
---
M modules/tlsproxy/templates/localssl.erb
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index 553c7eb..9c6dd3f 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -9,6 +9,9 @@
 
 # SSL proxying
 server {
+   # Enabling TCP Fast Open is safe for HTTP over TLS. There is no 
idempotency
+   # concern replaying TLS Client Hello.
+   # https://tools.ietf.org/html/rfc7413#section-6.3.2
listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " : "" 
%>ssl http2;
listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport fastopen=#{fastopen_pending_max} " : "" %>ssl http2;
ssl on;
@@ -62,6 +65,10 @@
 }
 <% if @redir_port -%>
 server {
+   # Enable TCP Fast Open for http -> https redirects since there are no
+   # idempotency concerns with HTTPS.
+   # Note that TFO is *not* safe in general for non-TLS HTTP. See
+   # https://tools.ietf.org/html/rfc7413#section-6.3.1
listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " 
: "" %>;
listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport fastopen=#{fastopen_pending_max} " : "" %>;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;

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

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

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

[MediaWiki-commits] [Gerrit] Add mw2246 (videoscaler) to the MW Scap DSH list. - change (operations/puppet)

[Elukey (Code Review)]

Elukey has uploaded a new change for review.

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

Change subject: Add mw2246 (videoscaler) to the MW Scap DSH list.
..

Add mw2246 (videoscaler) to the MW Scap DSH list.

Change-Id: I1bad4e52d2ac2d20854ccfeeb99fac699868a14f
---
M modules/scap/files/dsh/group/mediawiki-installation
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/295930/1

diff --git a/modules/scap/files/dsh/group/mediawiki-installation 
b/modules/scap/files/dsh/group/mediawiki-installation
index 6a0c7b4..315a54d 100644
--- a/modules/scap/files/dsh/group/mediawiki-installation
+++ b/modules/scap/files/dsh/group/mediawiki-installation
@@ -431,6 +431,7 @@
 mw2243.codfw.wmnet
 mw2244.codfw.wmnet
 mw2245.codfw.wmnet
+mw2246.codfw.wmnet
 mw2247.codfw.wmnet
 mw2248.codfw.wmnet
 mw2249.codfw.wmnet

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

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

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

[MediaWiki-commits] [Gerrit] Don't run PHPUnit on SmashPig's deployment branch - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Don't run PHPUnit on SmashPig's deployment branch
..


Don't run PHPUnit on SmashPig's deployment branch

Cos the tests have been removed.

Adds some other stuff to make us look fancy and burn through CPUs.

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 46bd5c5..e756c68 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -667,6 +667,12 @@
 files:
  - '^composer.json$'
 
+  # Don't run tests on deployment branches where the tests have been removed.
+  - name: ^composer-(php53|hhvm-trusty)$
+skip-if:
+ - project: ^wikimedia/fundraising/SmashPig$
+   branch: ^deployment$
+
   - name: ^.*-php53lint$
 files:
  - '^.*\.(php|php5|phtml|inc)$'
@@ -2232,10 +2238,20 @@
   - name: tox-jessie
 
   - name: wikimedia/fundraising/SmashPig
+check:
+ - php53lint
+ - php55lint
 test:
+ - php53lint
+ - php55lint
+ # TODO: clean up the composer.json, then enable validation here...
+ #- composer-validate
  - composer-php53
  - composer-hhvm-trusty
 gate-and-submit:
+ - php53lint
+ - php55lint
+ #- composer-validate
  - composer-php53
  - composer-hhvm-trusty
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74c28db0c49be58edee072875ff5b7ca3faceac1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Pcoombe 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make composer validation happier - change (wikimedia...SmashPig)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Make composer validation happier
..

Make composer validation happier

Loosen some seemingly unnecessary exact version constraints.  This might be
wrong, however, cos we're stuck with a strange manual version sync situation
between a few of our components.

TODO: T138595 in order to complete validation successfully.

Change-Id: I06979d0d835d216ffc63ddb303e48201dc054ab9
---
M composer.json
M composer.lock
2 files changed, 206 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/28/295928/1

diff --git a/composer.json b/composer.json
index 031151a..ee9c854 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
 "description": "The open source PHP flexible payments library and 
frontend/backend mediator.",
 "keywords": ["payments", "donations"],
 "homepage": "http://smashpig.org;,
-"license": "GPLv2",
+"license": "GPL-2.0",
 "authors": [
 {
 "name": "Katie Horn",
@@ -26,10 +26,10 @@
 "coderkungfu/php-queue": "dev-master",
 "fusesource/stomp-php": "2.*",
 "php": ">=5.3.3",
-"phpmailer/phpmailer": "5.2.6",
+"phpmailer/phpmailer": "5.2.*",
 "symfony/event-dispatcher": ">=2.1,<2.4-dev",
 "symfony/http-foundation": ">=2.1,<2.4-dev",
-"symfony/yaml": "2.8.3",
+"symfony/yaml": "2.8.*",
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master"
 },
"require-dev": {
diff --git a/composer.lock b/composer.lock
index f1832e0..7b8e9d4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "ecdf8b11e31e5c0587ca94375f3c03b2",
-"content-hash": "d718c925a69add0e5dd2034e9c829a5e",
+"hash": "a2a91ba6cccb7f805f3c4ccdac433744",
+"content-hash": "4feaa2574734d8bfb98c8daabb344586",
 "packages": [
 {
 "name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -280,16 +280,16 @@
 },
 {
 "name": "phpmailer/phpmailer",
-"version": "v5.2.6",
+"version": "v5.2.16",
 "source": {
 "type": "git",
 "url": "https://github.com/PHPMailer/PHPMailer.git;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df"
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/4d9434e394496a5bb7acd9e73046587184b413df;,
-"reference": "4d9434e394496a5bb7acd9e73046587184b413df",
+"url": 
"https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a;,
+"reference": "1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a",
 "shasum": ""
 },
 "require": {
@@ -297,14 +297,21 @@
 },
 "require-dev": {
 "phpdocumentor/phpdocumentor": "*",
-"phpunit/phpunit": "*"
+"phpunit/phpunit": "4.7.*"
+},
+"suggest": {
+"league/oauth2-google": "Needed for Google XOAUTH2 
authentication"
 },
 "type": "library",
 "autoload": {
 "classmap": [
 "class.phpmailer.php",
+"class.phpmaileroauth.php",
+"class.phpmaileroauthgoogle.php",
+"class.smtp.php",
 "class.pop3.php",
-"class.smtp.php"
+"extras/EasyPeasyICS.php",
+"extras/ntlm_sasl_client.php"
 ]
 },
 "notification-url": "https://packagist.org/downloads/;,
@@ -329,7 +336,7 @@
 }
 ],
 "description": "PHPMailer is a full-featured email creation and 
transfer class for PHP",
-"time": "2013-04-11 16:45:39"
+"time": "2016-06-06 09:09:37"
 },
 {
 "name": "psr/log",
@@ -541,16 +548,16 @@
 },
 {
 "name": "symfony/yaml",
-"version": "v2.8.3",
+"version": "v2.8.7",
 "source": {
 "type": "git",
 "url": "https://github.com/symfony/yaml.git;,
-"reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995"
+"reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34"
 },
 "dist": {
 "type": "zip",
-"url": 

[MediaWiki-commits] [Gerrit] Restore mobile formatting for enwiki mdot - change (operations/mediawiki-config)

[Dr0ptp4kt (Code Review)]

Dr0ptp4kt has uploaded a new change for review.

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

Change subject: Restore mobile formatting for enwiki mdot
..

Restore mobile formatting for enwiki mdot

Change-Id: I5e642d90586b678fbec58370dd277b0eeb76d2a5
Bug: T138425
---
M dblists/mobilemainpagelegacy.dblist
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/dblists/mobilemainpagelegacy.dblist 
b/dblists/mobilemainpagelegacy.dblist
index 6624093..acdc3dd 100644
--- a/dblists/mobilemainpagelegacy.dblist
+++ b/dblists/mobilemainpagelegacy.dblist
@@ -49,6 +49,7 @@
 elwikisource
 elwikivoyage
 elwiktionary
+enwiki
 enwikibooks
 enwikinews
 enwikiquote

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

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

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